From 964a2d4f61e066388beb5d776bf9c163a3f4fd98 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sat, 19 Mar 2022 03:00:55 +0000 Subject: CTAN sync 202203190300 --- .../contrib/create-theorem/create-theorem-doc.pdf | Bin 117260 -> 117509 bytes .../contrib/create-theorem/create-theorem-doc.tex | 9 ++- .../contrib/create-theorem/create-theorem.sty | 78 +++++++++++++-------- macros/latex/contrib/easybook/easybook.dtx | 24 ++++--- macros/latex/contrib/easybook/easybook.pdf | Bin 591500 -> 591566 bytes macros/latex/contrib/easybook/easybook.tex | 6 +- macros/latex/contrib/gzt/doc/french/gzt-fr.pdf | Bin 541777 -> 546057 bytes macros/latex/contrib/gzt/source/gzt.dtx | 18 +++-- macros/latex/contrib/media9/ChangeLog | 5 ++ macros/latex/contrib/media9/doc/media9.pdf | Bin 3748609 -> 3747996 bytes macros/latex/contrib/media9/media9.sty | 8 +-- macros/latex/contrib/media9/pdfbase.sty | 25 ++++--- macros/luatex/generic/luaotfload/NEWS | 5 ++ macros/luatex/generic/luaotfload/README.md | 4 +- macros/luatex/generic/luaotfload/filegraph.pdf | Bin 40007 -> 40007 bytes .../generic/luaotfload/luaotfload-auxiliary.lua | 4 +- .../generic/luaotfload/luaotfload-colors.lua | 4 +- .../luatex/generic/luaotfload/luaotfload-conf.pdf | Bin 77520 -> 77694 bytes .../luaotfload/luaotfload-configuration.lua | 4 +- .../generic/luaotfload/luaotfload-database.lua | 4 +- .../generic/luaotfload/luaotfload-diagnostics.lua | 4 +- .../luatex/generic/luaotfload/luaotfload-dvi.lua | 4 +- .../generic/luaotfload/luaotfload-embolden.lua | 4 +- .../generic/luaotfload/luaotfload-fallback.lua | 4 +- .../generic/luaotfload/luaotfload-features.lua | 6 +- .../generic/luaotfload/luaotfload-filelist.lua | 4 +- .../generic/luaotfload/luaotfload-glyphlist.lua | 4 +- .../generic/luaotfload/luaotfload-harf-define.lua | 9 ++- .../generic/luaotfload/luaotfload-harf-plug.lua | 4 +- .../luaotfload/luaotfload-harf-var-cff2.lua | 4 +- .../luaotfload/luaotfload-harf-var-t2-writer.lua | 4 +- .../generic/luaotfload/luaotfload-harf-var-ttf.lua | 4 +- .../luatex/generic/luaotfload/luaotfload-init.lua | 4 +- .../luatex/generic/luaotfload/luaotfload-latex.pdf | Bin 493487 -> 494195 bytes .../generic/luaotfload/luaotfload-letterspace.lua | 4 +- .../generic/luaotfload/luaotfload-loaders.lua | 4 +- .../luatex/generic/luaotfload/luaotfload-log.lua | 4 +- .../luatex/generic/luaotfload/luaotfload-main.tex | 10 ++- .../generic/luaotfload/luaotfload-multiscript.lua | 4 +- .../generic/luaotfload/luaotfload-notdef.lua | 4 +- .../generic/luaotfload/luaotfload-parsers.lua | 4 +- .../generic/luaotfload/luaotfload-resolvers.lua | 4 +- .../generic/luaotfload/luaotfload-scripts.lua | 4 +- .../generic/luaotfload/luaotfload-status.lua | 60 ++++++++-------- .../generic/luaotfload/luaotfload-suppress.lua | 4 +- .../luatex/generic/luaotfload/luaotfload-szss.lua | 4 +- macros/luatex/generic/luaotfload/luaotfload-tool.1 | 2 +- .../luatex/generic/luaotfload/luaotfload-tool.lua | 4 +- .../luatex/generic/luaotfload/luaotfload-tool.pdf | Bin 76788 -> 76968 bytes .../luatex/generic/luaotfload/luaotfload-tool.rst | 4 +- .../generic/luaotfload/luaotfload-tounicode.lua | 4 +- .../generic/luaotfload/luaotfload-unicode.lua | 4 +- macros/luatex/generic/luaotfload/luaotfload.conf.5 | 2 +- .../luatex/generic/luaotfload/luaotfload.conf.rst | 4 +- macros/luatex/generic/luaotfload/luaotfload.lua | 4 +- macros/luatex/generic/luaotfload/luaotfload.sty | 2 +- macros/luatex/generic/luaotfload/scripts-demo.pdf | Bin 21673 -> 21673 bytes .../generic/luaotfload/shaper-demo-graphite.pdf | Bin 8548 -> 8548 bytes macros/luatex/generic/luaotfload/shaper-demo.pdf | Bin 8469 -> 8469 bytes macros/xetex/generic/xetexko/ChangeLog | 7 ++ macros/xetex/generic/xetexko/README | 2 +- macros/xetex/generic/xetexko/xetexko-doc.pdf | Bin 258539 -> 260637 bytes macros/xetex/generic/xetexko/xetexko-doc.tex | 8 ++- macros/xetex/generic/xetexko/xetexko.sty | 19 +++-- 64 files changed, 247 insertions(+), 186 deletions(-) (limited to 'macros') diff --git a/macros/latex/contrib/create-theorem/create-theorem-doc.pdf b/macros/latex/contrib/create-theorem/create-theorem-doc.pdf index c61567791b..4f64d0b5d5 100644 Binary files a/macros/latex/contrib/create-theorem/create-theorem-doc.pdf and b/macros/latex/contrib/create-theorem/create-theorem-doc.pdf differ diff --git a/macros/latex/contrib/create-theorem/create-theorem-doc.tex b/macros/latex/contrib/create-theorem/create-theorem-doc.tex index 3a726e50e1..526eb15385 100644 --- a/macros/latex/contrib/create-theorem/create-theorem-doc.tex +++ b/macros/latex/contrib/create-theorem/create-theorem-doc.tex @@ -85,7 +85,7 @@ \begin{document} -\def\PackageVersion{2022/03/11} +\def\PackageVersion{2022/03/18} \title{\createtheorempackage{}\\\smallskip\itshape Initializing theorem-like environments with multilingual support} \author{Jinwen XU} @@ -311,7 +311,7 @@ The previous two commands are especially useful for package or class writers, wh Supported keys are: \vspace{-.2\baselineskip} \begin{itemize} - \item \commandoption{name style}\lstinline| = |\meta{configuration} + \item \commandoption{name}\lstinline| = |\meta{configuration} and \commandoption{name style}\lstinline| = |\meta{configuration} \begin{itemize} \item Same as \lstinline|\NameTheorem{|\meta{name of environment}\lstinline|}{|\meta{configuration}\lstinline|}|. \item Note that this configuration can overwrite those already specified in \lstinline|\NameTheorem|. @@ -435,12 +435,11 @@ In each case, the two environments \texttt{idea} and \texttt{idea*} share the sa \section{Known issues} \begin{itemize} - \item The current mechanism does not work well for German, a problem originated in the package \textsf{crefthe}. The author plans to adopt a more refined approach in later versions so as to support the various situations in German. - \item If the option ``\packageoption{name in link}'' is enabled, the ``\packageoption{name as is}'' mode shall take longer time to produce the final result, for the current implementation uses \lstinline|\regexpatchcmd| to patch some of the referencing formats, which is not very efficient. + \item The current mechanism does not work well for German, a problem originated in the package \textsf{crefthe}. The author plans to adopt a more refined approach in a later version so as to support the various grammatical situations in German. \item There may be inaccuracies in the translation of those preset names. \end{itemize} -% \medskip +\medskip If you run into any issues or have ideas for improvement, feel free to discuss on: \begin{center} \url{https://github.com/Jinwen-XU/create-theorem/issues} diff --git a/macros/latex/contrib/create-theorem/create-theorem.sty b/macros/latex/contrib/create-theorem/create-theorem.sty index b0371749b8..b86af841ee 100644 --- a/macros/latex/contrib/create-theorem/create-theorem.sty +++ b/macros/latex/contrib/create-theorem/create-theorem.sty @@ -13,7 +13,7 @@ \RequirePackage{l3keys2e} \ProvidesExplPackage {create-theorem} - {2022/03/11} {} + {2022/03/18} {} {Initializing theorem-like environments with multilingual support} \keys_define:nn { create-theorem } @@ -605,6 +605,10 @@ { env-not-created } { The~theorem-like~environment~"#1"~cannot~be~created,~an~environment~with~the~same~name~has~already~existed. } +\msg_new:nnn { create-theorem } + { env-not-named } + { The~theorem-like~environment~"#1"~cannot~be~created,~you~have~to~name~it~before~initialization. } + \cs_new:Nn \crthm_create_theorem:nn { \cs_if_exist:cTF { #1 } @@ -636,44 +640,56 @@ } } { - \group_begin: - \bool_if:NT \l__crthm_creating_apply_style_bool - { - \exp_after:wN \theoremstyle \exp_after:wN { \l__crthm_creating_apply_style_tl } - } - \bool_if:NTF \l__crthm_creating_numberless_bool - { - \newtheorem*{ #1 _crthm_regional } { \tl_use:c { g_crthm_name_heading_ #1 _ \languagename _tl } } - } - { - \newtheorem { #1 _crthm_regional } [#1] { \tl_use:c { g_crthm_name_heading_ #1 _ \languagename _tl } } - } - \group_end: - \NewDocumentEnvironment { #1 } { O{} } - % In "regionalref" mode, the counter received by the referencing system is "#1 _crthm_regional" - % while in "originalref" mode, the counter received is "#1 _crthm_original_\languagename" + \cs_if_exist:cTF { c@ #1 } { - \tl_if_blank:eTF { ##1 } + \group_begin: + \bool_if:NTF \l__crthm_creating_apply_style_bool { - \begin{ #1 _crthm_regional } + \exp_args:No \theoremstyle { \l__crthm_creating_apply_style_tl } } { - \begin{ #1 _crthm_regional }[##1] + \tl_if_exist:cT { c_crthm_theorem_style_preset_ #1 _tl } + { + \exp_args:Nv \theoremstyle { c_crthm_theorem_style_preset_ #1 _tl } + } } - \bool_if:NF \l__crthm_regionalref_bool - { - \addtocounter { #1 _crthm_original_\languagename } { -1 } - \refstepcounter { #1 _crthm_original_\languagename } - } - } - { - \end{ #1 _crthm_regional } + \bool_if:NTF \l__crthm_creating_numberless_bool + { + \newtheorem*{ #1 _crthm_regional } { \tl_use:c { g_crthm_name_heading_ #1 _ \languagename _tl } } + } + { + \newtheorem { #1 _crthm_regional } [#1] { \tl_use:c { g_crthm_name_heading_ #1 _ \languagename _tl } } + } + \group_end: + \NewDocumentEnvironment { #1 } { O{} } + % In "regionalref" mode, the counter received by the referencing system is "#1 _crthm_regional" + % while in "originalref" mode, the counter received is "#1 _crthm_original_\languagename" + { + \tl_if_blank:eTF { ##1 } + { + \begin{ #1 _crthm_regional } + } + { + \begin{ #1 _crthm_regional }[##1] + } + \bool_if:NF \l__crthm_regionalref_bool + { + \addtocounter { #1 _crthm_original_\languagename } { -1 } + \refstepcounter { #1 _crthm_original_\languagename } + } + } + { + \end{ #1 _crthm_regional } + } + \bool_if:NT \l__crthm_creating_create_starred_bool + { + \newtheorem*{ #1 * } { \tl_use:c { g_crthm_name_heading_ #1 _ \languagename _tl } } + } + \keys_set:nn { create-theorem-creating / counter-management } { #2 } } - \bool_if:NT \l__crthm_creating_create_starred_bool { - \newtheorem*{ #1 * } { \tl_use:c { g_crthm_name_heading_ #1 _ \languagename _tl } } + \msg_error:nnn { create-theorem } { env-not-named } { #1 } } - \keys_set:nn { create-theorem-creating / counter-management } { #2 } } } diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx index 023419294b..bae091e2c1 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}{2022/03/13}{1.648} +\ProvidesExplClass{easybook}{2022/03/18}{1.65} {Easily typesetting Chinese theses or books} \bool_set_false:N \l__eb_compile_draft_bool @@ -303,7 +303,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e}[2020/10/01] \RequirePackage{l3keys2e,etoolbox} -\ProvidesExplPackage{easybase}{2022/03/13}{1.648} +\ProvidesExplPackage{easybase}{2022/03/18}{1.65} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -2322,7 +2322,7 @@ } % %<*tcolorbox> -\ProvidesExplFile{eb-tcolorbox.cfg}{2022/03/13}{1.648} +\ProvidesExplFile{eb-tcolorbox.cfg}{2022/03/18}{1.65} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 @@ -2377,22 +2377,24 @@ colback = #2,colbacktitle = #2, tc-easybox,#4 } -\DeclareTColorBox{ebparbox}{sO{RoyalBlue}d()O{}} +\DeclareTColorBox{ebparbox}{sO{RoyalBlue}D(){}O{}} { borderline~west = {3pt}{0pt}{#2}, IfBooleanTF = {#1} { + colback = white, + top = 0pt,bottom = 0pt,right = 0pt, + pad~at~break* = 0pt + }{ colback = #2,colbacktitle = #2, opacityback = 0.2,opacitybacktitle = 0.2, - IfValueTF = {#3}{title = #3,top = 0pt}{top = 0.5\baselineskip}, - bottom = 0.5\baselineskip,toptitle = 0.5\baselineskip, + top = \tl_if_blank:nTF {#3} { 0.5\baselineskip } { 0pt }, + bottom = 0.5\baselineskip, + toptitle = 0.5\baselineskip, right = 8pt - }{ - colback = white, - IfValueT = {#3}{title = #3}, - top = 0pt,bottom = 0pt,right = 0pt }, - coltitle = #2,tc-ebparbox,#4 + title = #3,coltitle = #2, + tc-ebparbox,#4 } \DeclareTotalTCBox{\ebfbox}{O{Green}mO{}} { diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf index 47bef555cf..0df829c25a 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 af3aed2162..b147f94983 100644 --- a/macros/latex/contrib/easybook/easybook.tex +++ b/macros/latex/contrib/easybook/easybook.tex @@ -21,8 +21,8 @@ name = easybook, color-scheme = blue, title = EASYBOOK使用手册, - version = v1.648, - date = 2022/03/13, + version = v1.65, + date = 2022/03/18, authors = 瞿毅, info = 简便地排版中文学位论文或书籍, email = q1jx@foxmail.com, @@ -1121,7 +1121,7 @@ \end{easybox} \end{ctexexam} \environment{ebparbox}[\sarg\oarg{颜色名}\darg{段落标题}\oarg{配置选项}] - 环境 \env{ebparbox} 用法与 \env{easybox} 类似,同样带有三个可选参数。盒子的左边带有一条粗竖线,\meta{颜色名} 选项可以自定义这条竖线颜色,使用星号参数则盒子带有竖线颜色的浅色背景。 + 环境 \env{ebparbox} 用法与 \env{easybox} 类似,同样带有三个可选参数。盒子的左边带有一条粗竖线,背景颜色为竖线颜色的浅色。\meta{颜色名} 选项可以设置竖线的颜色。使用星号参数则盒子无背景颜色。 \end{environments} \begin{commands} diff --git a/macros/latex/contrib/gzt/doc/french/gzt-fr.pdf b/macros/latex/contrib/gzt/doc/french/gzt-fr.pdf index 53f04a5010..3b85f1192e 100644 Binary files a/macros/latex/contrib/gzt/doc/french/gzt-fr.pdf and b/macros/latex/contrib/gzt/doc/french/gzt-fr.pdf differ diff --git a/macros/latex/contrib/gzt/source/gzt.dtx b/macros/latex/contrib/gzt/source/gzt.dtx index ce19443f14..7cad88ccd7 100644 --- a/macros/latex/contrib/gzt/source/gzt.dtx +++ b/macros/latex/contrib/gzt/source/gzt.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -% File: gzt.dtx Copyright (C) 2014-2021 by +% File: gzt.dtx Copyright (C) 2014-2022 by % Denis Bitouzé % % It may be distributed and/or modified under the conditions of the @@ -94,7 +94,7 @@ $quote_filenames = 0; % This field contains the version of the package. % The value is optional. % The value is restricted to 32 characters. -\version{1.1.1 2021-12-16} +\version{1.1.2 2022-03-18} % ------------------------------------------------------------------------- % This field contains the name of the author(s). % The value is optional. @@ -154,7 +154,7 @@ $quote_filenames = 0; % The value is a URL. % The value is restricted to 255 characters. % Multiple values are allowed. -\development{} +\development{https://github.com/dbitouze/gzt/} % ------------------------------------------------------------------------- % This field contains the update indicator; true for update. % The value is optional. @@ -214,6 +214,11 @@ France”](https://smf.emath.fr/les-publications/la-gazette): % \end{macrocode} # [Unreleased] +# [1.1.2] - 2022-03-18 + +## Changed +Feminization added in a string. + # [1.1.1] - 2021-12-16 ## Fixed @@ -325,8 +330,8 @@ Gazette de la Société Mathématique de France”](https://smf.emath.fr/les-pub \fi % %<*class|class-article|install> -\def\gztfileversion{1.1.1} -\def\gztfiledate{2021-12-16} +\def\gztfileversion{1.1.2} +\def\gztfiledate{2022-03-18} % %<*install> \input l3docstrip.tex @@ -466,6 +471,7 @@ Running "make install" installs the files in the local TeX tree. % \changes{v1.0.1}{2021-02-14}{Nineth CTAN version.} % \changes{v1.1.0}{2021-11-30}{Tenth CTAN version.} % \changes{v1.1.1}{2021-12-16}{Eleventh CTAN version.} +% \changes{v1.1.2}{2022-03-18}{Twelfth CTAN version.} % % \begin{abstract} % This bundle provides two classes and \Pkg{biblatex} styles for the French journal @@ -1891,7 +1897,7 @@ Running "make install" installs the files in the local TeX tree. % \end{macrocode} % For the authors instructions. % \begin{macrocode} -\tl_const:Nn \c_@@_authors_instructions_string_tl {Instructions~ aux~ auteurs} +\tl_const:Nn \c_@@_authors_instructions_string_tl {Instructions~ aux~ autrices~ et~ auteurs} % \end{macrocode} % For the preliminary versions sent to authors for checking. % \begin{macrocode} diff --git a/macros/latex/contrib/media9/ChangeLog b/macros/latex/contrib/media9/ChangeLog index 075328178d..455df93cc4 100644 --- a/macros/latex/contrib/media9/ChangeLog +++ b/macros/latex/contrib/media9/ChangeLog @@ -1,3 +1,8 @@ +2022-03-18 + * v1.24 : media9.sty + * v0.54 : pdfbase.sty + * fix : pdftex primitive replacements for luatex fixed (pdfbase.sty) + 2021-10-18 * v1.23 : media9.sty * new : SHOWTRANSPARENT and SECTIONCAPPING entries for 3D cross sections diff --git a/macros/latex/contrib/media9/doc/media9.pdf b/macros/latex/contrib/media9/doc/media9.pdf index 79ef9c35a2..9f4ede4536 100644 Binary files a/macros/latex/contrib/media9/doc/media9.pdf and b/macros/latex/contrib/media9/doc/media9.pdf differ diff --git a/macros/latex/contrib/media9/media9.sty b/macros/latex/contrib/media9/media9.sty index a40d6fbe52..2c4db16dc2 100644 --- a/macros/latex/contrib/media9/media9.sty +++ b/macros/latex/contrib/media9/media9.sty @@ -41,8 +41,8 @@ \RequirePackage{l3keys2e} -\def\g@mix@date@tl{2021/10/18} -\def\g@mix@version@tl{1.23} +\def\g@mix@date@tl{2022/03/18} +\def\g@mix@version@tl{1.24} \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesExplPackage{media9}{\g@mix@date@tl}{\g@mix@version@tl} @@ -2431,8 +2431,8 @@ \RequirePackage{l3keys2e} -\def\g@mix@date@tl{2021/10/18} -\def\g@mix@version@tl{1.23} +\def\g@mix@date@tl{2022/03/18} +\def\g@mix@version@tl{1.24} \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesExplPackage{media9}{\g@mix@date@tl}{\g@mix@version@tl} diff --git a/macros/latex/contrib/media9/pdfbase.sty b/macros/latex/contrib/media9/pdfbase.sty index e0783c2c17..a5cc1dcb44 100644 --- a/macros/latex/contrib/media9/pdfbase.sty +++ b/macros/latex/contrib/media9/pdfbase.sty @@ -158,8 +158,8 @@ \RequirePackage{l3keys2e} -\def\g@pbs@date@tl{2021/09/12} -\def\g@pbs@version@tl{0.53} +\def\g@pbs@date@tl{2022/03/18} +\def\g@pbs@version@tl{0.54} \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl} @@ -277,10 +277,10 @@ \cs_set_protected:Npn\pdfdest{\pdfextension~dest~} \cs_set_protected:Npn\pdfliteral{\pdfextension~literal~} \cs_set_protected:Npn\pdfcatalog{\pdfextension~catalog~} - \cs_set:Npn\pdflastlink{\numexpr\pdffeedback~lastlink\relax} - \cs_set:Npn\pdflastobj{\numexpr\pdffeedback~lastobj\relax} - \cs_set:Npn\pdflastannot{\numexpr\pdffeedback~lastannot\relax} - \cs_set:Npn\pdfpageref{\numexpr\pdffeedback~pageref\relax} + \cs_set_protected:Npn\pdflastlink{\numexpr\pdffeedback~lastlink\relax} + \cs_set_protected:Npn\pdflastobj{\numexpr\pdffeedback~lastobj\relax} + \cs_set_protected:Npn\pdflastannot{\numexpr\pdffeedback~lastannot\relax} + \cs_set:Npn\pdfpageref{\pdffeedback~pageref} \cs_set:Npx\pdfpageresources{\pdfvariable~pageresources} \cs_set_eq:NN\pdfximage\saveimageresource \cs_set_eq:NN\pdfrefximage\useimageresource @@ -1515,8 +1515,8 @@ \RequirePackage{l3keys2e} -\def\g@pbs@date@tl{2021/09/12} -\def\g@pbs@version@tl{0.53} +\def\g@pbs@date@tl{2022/03/18} +\def\g@pbs@version@tl{0.54} \NeedsTeXFormat{LaTeX2e}[2020-10-01] \ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl} @@ -1622,7 +1622,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %commands for creating PDF objects, annots etc. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - \sys_if_output_pdf:TF{ %in LuaTeX-0.95.0, pdfTeX primitives got new names \bool_lazy_and:nnT{ @@ -1638,10 +1637,10 @@ \cs_set_protected:Npn\pdfendlink{\pdfextension~endlink\relax} \cs_set_protected:Npn\pdfdest{\pdfextension~dest~} \cs_set_protected:Npn\pdfliteral{\pdfextension~literal~} - \cs_set:Npn\pdflastlink{\numexpr\pdffeedback~lastlink\relax} - \cs_set:Npn\pdflastobj{\numexpr\pdffeedback~lastobj\relax} - \cs_set:Npn\pdflastannot{\numexpr\pdffeedback~lastannot\relax} - \cs_set:Npn\pdfpageref{\numexpr\pdffeedback~pageref\relax} + \cs_set_protected:Npn\pdflastlink{\numexpr\pdffeedback~lastlink\relax} + \cs_set_protected:Npn\pdflastobj{\numexpr\pdffeedback~lastobj\relax} + \cs_set_protected:Npn\pdflastannot{\numexpr\pdffeedback~lastannot\relax} + \cs_set:Npn\pdfpageref{\pdffeedback~pageref} \cs_set_eq:NN\pdfximage\saveimageresource \cs_set_eq:NN\pdfrefximage\useimageresource \cs_set_eq:NN\pdflastximage\lastsavedimageresourceindex diff --git a/macros/luatex/generic/luaotfload/NEWS b/macros/luatex/generic/luaotfload/NEWS index 3945ef2f89..7c6c57eefb 100644 --- a/macros/luatex/generic/luaotfload/NEWS +++ b/macros/luatex/generic/luaotfload/NEWS @@ -1,5 +1,10 @@ Change History -------------- +2022-03-18 luaotfload v3.21 + + * Fix performance regression introduced in version 3.19. + * More reliably support TrueType based variable fonts in harf mode. + 2022-02-27 luaotfload v3.20 * A bug in luaotfload-tool has been corrected. diff --git a/macros/luatex/generic/luaotfload/README.md b/macros/luatex/generic/luaotfload/README.md index ff3302131f..57be111ba2 100644 --- a/macros/luatex/generic/luaotfload/README.md +++ b/macros/luatex/generic/luaotfload/README.md @@ -1,8 +1,8 @@ # The Luaotfload Package -VERSION: 3.20 +VERSION: 3.21 -DATE: 2022-02-27 +DATE: 2022-03-18 ## Description diff --git a/macros/luatex/generic/luaotfload/filegraph.pdf b/macros/luatex/generic/luaotfload/filegraph.pdf index d18d43f57d..fd38f172d8 100644 Binary files a/macros/luatex/generic/luaotfload/filegraph.pdf and b/macros/luatex/generic/luaotfload/filegraph.pdf differ diff --git a/macros/luatex/generic/luaotfload/luaotfload-auxiliary.lua b/macros/luatex/generic/luaotfload/luaotfload-auxiliary.lua index 379ad5bb78..b34c56508e 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-auxiliary.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-auxiliary.lua @@ -6,8 +6,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-auxiliary", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / auxiliary functions", license = "GPL v2.0" } diff --git a/macros/luatex/generic/luaotfload/luaotfload-colors.lua b/macros/luatex/generic/luaotfload/luaotfload-colors.lua index 8371de7222..05248b2a82 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-colors.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-colors.lua @@ -5,8 +5,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-colors", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / color", license = "GPL v2.0", author = "Khaled Hosny, Elie Roux, Philipp Gesang, Dohyun Kim, David Carlisle", diff --git a/macros/luatex/generic/luaotfload/luaotfload-conf.pdf b/macros/luatex/generic/luaotfload/luaotfload-conf.pdf index 4abde8cbb9..187f6d6542 100644 Binary files a/macros/luatex/generic/luaotfload/luaotfload-conf.pdf and b/macros/luatex/generic/luaotfload/luaotfload-conf.pdf differ diff --git a/macros/luatex/generic/luaotfload/luaotfload-configuration.lua b/macros/luatex/generic/luaotfload/luaotfload-configuration.lua index b970ce353e..5a7205ba69 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-configuration.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-configuration.lua @@ -7,8 +7,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-configuration", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / config file reader", license = "GPL v2.0" } diff --git a/macros/luatex/generic/luaotfload/luaotfload-database.lua b/macros/luatex/generic/luaotfload/luaotfload-database.lua index 8d981a3f2c..ff43b97505 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-database.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-database.lua @@ -5,8 +5,8 @@ do -- block to avoid to many local variables error assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-database", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / database", license = "GPL v2.0", author = "Khaled Hosny, Elie Roux, Philipp Gesang, Marcel Krüger", diff --git a/macros/luatex/generic/luaotfload/luaotfload-diagnostics.lua b/macros/luatex/generic/luaotfload/luaotfload-diagnostics.lua index 230384f981..e0403d932c 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-diagnostics.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-diagnostics.lua @@ -7,8 +7,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-diagnostics", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload-tool submodule / diagnostics", license = "GPL v2.0" } diff --git a/macros/luatex/generic/luaotfload/luaotfload-dvi.lua b/macros/luatex/generic/luaotfload/luaotfload-dvi.lua index 75f6564d42..3991eb110d 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-dvi.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-dvi.lua @@ -6,8 +6,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-dvi", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / DVI", license = "GPL v2.0", author = "Marcel Krüger", diff --git a/macros/luatex/generic/luaotfload/luaotfload-embolden.lua b/macros/luatex/generic/luaotfload/luaotfload-embolden.lua index bca6eb45d8..5699611da3 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-embolden.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-embolden.lua @@ -5,8 +5,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-embolden", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / embolden", license = "GPL v2.0", author = "Marcel Krüger" diff --git a/macros/luatex/generic/luaotfload/luaotfload-fallback.lua b/macros/luatex/generic/luaotfload/luaotfload-fallback.lua index b45f454576..d9a85b7578 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-fallback.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-fallback.lua @@ -5,8 +5,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-fallback", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / fallback", license = "GPL v2.0", author = "Marcel Krüger" diff --git a/macros/luatex/generic/luaotfload/luaotfload-features.lua b/macros/luatex/generic/luaotfload/luaotfload-features.lua index d297061a7d..01c04becb1 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-features.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-features.lua @@ -5,8 +5,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-features", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / features", license = "GPL v2.0", author = "Hans Hagen, Khaled Hosny, Elie Roux, Philipp Gesang, Marcel Krüger", @@ -840,7 +840,7 @@ local normalize_lookup = setmetatable({}, {__index = function(t, f) local function result(head) return normalize_func(head, f, characters, true) end - t[fontdir] = result + t[f] = result return result end}) -- When this is loaded as part of luaotfload-tool, then we can't access nodes diff --git a/macros/luatex/generic/luaotfload/luaotfload-filelist.lua b/macros/luatex/generic/luaotfload/luaotfload-filelist.lua index d0b1530830..191e6fd81b 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-filelist.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-filelist.lua @@ -6,8 +6,8 @@ if luaotfload_module then luaotfload_module { name = "luaotfload-filelist", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / filelist", license = "GPL v2.0" } end diff --git a/macros/luatex/generic/luaotfload/luaotfload-glyphlist.lua b/macros/luatex/generic/luaotfload/luaotfload-glyphlist.lua index f291b2d60e..b13d9db86f 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-glyphlist.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-glyphlist.lua @@ -1,8 +1,8 @@ if luaotfload_module then luaotfload_module { name = "luaotfload-glyphlist", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / autogenerated glyphlist", copyright = "derived from https://raw.githubusercontent.com/adobe-type-tools/agl-aglfn/master/glyphlist.txt", original = "Adobe Glyph List, version 2.0, September 20, 2002", diff --git a/macros/luatex/generic/luaotfload/luaotfload-harf-define.lua b/macros/luatex/generic/luaotfload/luaotfload-harf-define.lua index add95cdf68..d311020cd4 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-harf-define.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-harf-define.lua @@ -5,8 +5,8 @@ do -- block to avoid to many local variables error assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-harf-define", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / HarfBuzz font loading", license = "GPL v2.0", author = "Khaled Hosny, Marcel Krüger", @@ -541,8 +541,11 @@ luatexbase.add_to_callback('glyph_stream_provider', function(fid, cid, kind, oci elseif extents_hbfont then glyph_stream_mapping[ocid] = cid glyph_stream_mapping_inverse[cid] = ocid + local h_advance = extents_hbfont:get_glyph_h_advance(ocid) + local v_advance = extents_hbfont:get_glyph_v_advance(ocid) + assert(h_advance and v_advance) local extents = extents_hbfont:get_glyph_extents(ocid) - return extents.width, extents.x_bearing, extents.height, extents.y_bearing + return h_advance, extents and extents.x_bearing or 0, v_advance, 0 -- The last value should be get_glyph_v_origin(ocid).y - extents.y_bearing else return cb(fid, cid, kind, ocid) end diff --git a/macros/luatex/generic/luaotfload/luaotfload-harf-plug.lua b/macros/luatex/generic/luaotfload/luaotfload-harf-plug.lua index 222c4334e8..be05980a49 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-harf-plug.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-harf-plug.lua @@ -4,8 +4,8 @@ ----------------------------------------------------------------------- assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-harf-plug", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / HarfBuzz shaping", license = "GPL v2.0", author = "Khaled Hosny, Marcel Krüger", diff --git a/macros/luatex/generic/luaotfload/luaotfload-harf-var-cff2.lua b/macros/luatex/generic/luaotfload/luaotfload-harf-var-cff2.lua index 38fa6b57d9..e9cff0c1ad 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-harf-var-cff2.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-harf-var-cff2.lua @@ -5,8 +5,8 @@ do assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-harf-var-cff2", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / CFF2 table processing", license = "GPL v2.0", author = "Marcel Krüger", diff --git a/macros/luatex/generic/luaotfload/luaotfload-harf-var-t2-writer.lua b/macros/luatex/generic/luaotfload/luaotfload-harf-var-t2-writer.lua index 5964b61865..7b44822e59 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-harf-var-t2-writer.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-harf-var-t2-writer.lua @@ -5,8 +5,8 @@ do assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-harf-var-t2-writer", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / Type 2 charstring writer", license = "GPL v2.0", author = "Marcel Krüger", diff --git a/macros/luatex/generic/luaotfload/luaotfload-harf-var-ttf.lua b/macros/luatex/generic/luaotfload/luaotfload-harf-var-ttf.lua index 41fb412102..7835466757 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-harf-var-ttf.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-harf-var-ttf.lua @@ -5,8 +5,8 @@ do assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-harf-var-ttf", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / gvar table processing", license = "GPL v2.0", author = "Marcel Krüger", diff --git a/macros/luatex/generic/luaotfload/luaotfload-init.lua b/macros/luatex/generic/luaotfload/luaotfload-init.lua index 3d00816e1a..8cb2b5ad3d 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-init.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-init.lua @@ -7,8 +7,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-init", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / initialization", license = "GPL v2.0" } diff --git a/macros/luatex/generic/luaotfload/luaotfload-latex.pdf b/macros/luatex/generic/luaotfload/luaotfload-latex.pdf index 61e35f01a4..966f94bea2 100644 Binary files a/macros/luatex/generic/luaotfload/luaotfload-latex.pdf and b/macros/luatex/generic/luaotfload/luaotfload-latex.pdf differ diff --git a/macros/luatex/generic/luaotfload/luaotfload-letterspace.lua b/macros/luatex/generic/luaotfload/luaotfload-letterspace.lua index bb5a4a5e70..311279f09d 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-letterspace.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-letterspace.lua @@ -5,8 +5,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-letterspace", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / letterspacing", license = "GPL v2.0", copyright = "PRAGMA ADE / ConTeXt Development Team", diff --git a/macros/luatex/generic/luaotfload/luaotfload-loaders.lua b/macros/luatex/generic/luaotfload/luaotfload-loaders.lua index ca3730f00d..fcae6e6d9e 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-loaders.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-loaders.lua @@ -8,8 +8,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-loaders", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / callback handling", license = "GPL v2.0" } diff --git a/macros/luatex/generic/luaotfload/luaotfload-log.lua b/macros/luatex/generic/luaotfload/luaotfload-log.lua index c4ecd75075..8622b465ef 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-log.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-log.lua @@ -6,8 +6,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-log", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / logging", license = "GPL v2.0", author = "Khaled Hosny, Elie Roux, Philipp Gesang", diff --git a/macros/luatex/generic/luaotfload/luaotfload-main.tex b/macros/luatex/generic/luaotfload/luaotfload-main.tex index d48481a744..9db7f4c75d 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-main.tex +++ b/macros/luatex/generic/luaotfload/luaotfload-main.tex @@ -32,7 +32,7 @@ \beginfrontmatter \setdocumenttitle {The \identifier{luaotfload} package} - \setdocumentdate {2022-02-27 v3.20} + \setdocumentdate {2022-03-18 v3.21} \setdocumentauthor {LaTeX3 Project\\ Elie Roux · Khaled Hosny · Philipp Gesang · Ulrike Fischer · Marcel Krüger\\ Home: \hyperlink {https://github.com/latex3/luaotfload}} @@ -62,6 +62,14 @@ Supported is the \identifier{luatex} versions of a current TeXLive 2019 (and a c \endsection \beginsection{Changes} +\beginsubsection {New in version 3.21 (by Ulrike Fischer/Marcel Krüger)} +\begin{itemize} + \item Fix performance regression introduced in version 3.19. + \item More reliably support TrueType based variable fonts in \texttt{harf} + mode. +\end{itemize} +\endsubsection + \beginsubsection {New in version 3.20 (by Ulrike Fischer/Marcel Krüger)} \begin{itemize} \item A bug in luaotfload-tool has been corrected. diff --git a/macros/luatex/generic/luaotfload/luaotfload-multiscript.lua b/macros/luatex/generic/luaotfload/luaotfload-multiscript.lua index 9b3b3fd836..c315698a56 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-multiscript.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-multiscript.lua @@ -5,8 +5,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-multiscript", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / multiscript", license = "GPL v2.0", author = "Marcel Krüger" diff --git a/macros/luatex/generic/luaotfload/luaotfload-notdef.lua b/macros/luatex/generic/luaotfload/luaotfload-notdef.lua index e32521daea..fb763390f1 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-notdef.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-notdef.lua @@ -5,8 +5,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-notdef", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / notdef", license = "GPL v2.0", author = "Marcel Krüger" diff --git a/macros/luatex/generic/luaotfload/luaotfload-parsers.lua b/macros/luatex/generic/luaotfload/luaotfload-parsers.lua index da41fa8b30..6219525a7f 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-parsers.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-parsers.lua @@ -7,8 +7,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-parsers", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / parsers", license = "GPL v2.0" } diff --git a/macros/luatex/generic/luaotfload/luaotfload-resolvers.lua b/macros/luatex/generic/luaotfload/luaotfload-resolvers.lua index 5d3f456739..0034010817 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-resolvers.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-resolvers.lua @@ -11,8 +11,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-resolvers", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / resolvers", license = "GPL v2.0" } diff --git a/macros/luatex/generic/luaotfload/luaotfload-scripts.lua b/macros/luatex/generic/luaotfload/luaotfload-scripts.lua index 2accacfd64..60b6f603dc 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-scripts.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-scripts.lua @@ -5,8 +5,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-script", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / Script helpers", license = "CC0 1.0 Universal", author = "Marcel Krüger" diff --git a/macros/luatex/generic/luaotfload/luaotfload-status.lua b/macros/luatex/generic/luaotfload/luaotfload-status.lua index 02286a891b..5bd21db80c 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-status.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-status.lua @@ -56,44 +56,44 @@ return { { "fontloader-reference.lua", "066680a4fe38fad14eb27f56d4616104" }, { "fontloader-basics-gen.lua", "4bc43036e9796fccb0b8869f4b05bf2e" }, { "mktests", "918cb50be9ee8bd645ac1a27dc501e8c" }, - { "mkstatus", "a49a287defff8b8241faedb7c6a45621" }, + { "mkstatus", "1ad0366dc654e0d374b13acb88bdc195" }, { "mkcharacters", "bfca0e96e1e351afe7077502f9595af9" }, { "mkglyphlist", "7a8a8fdc0eac7fac2f13ec8f4e8e7aa9" }, { "mkimport", "7d62f1042e548f8b9368f26b9ba4be5c" }, - { "luaotfload-glyphlist.lua", "37275559314b6ced2c01f0d0e58fd68f" }, + { "luaotfload-glyphlist.lua", "990d281cc4c46f219d34f2104bf31409" }, { "luaotfload-characters.lua", "76415ca3ede312cad6e09038323489ae" }, - { "luaotfload-dvi.lua", "17763f980ea431ef33578799e36121bd" }, - { "luaotfload-tounicode.lua", "861919847a52fcbe4e625c8cda7826a2" }, - { "luaotfload-unicode.lua", "5c90a8c752518c7eae0aa21f5d4e6cb5" }, - { "luaotfload-resolvers.lua", "a3a547c332dcc51885b6611debcecb53" }, - { "luaotfload-parsers.lua", "90411c0301b37730abb40a8b49507c8f" }, - { "luaotfload-fallback.lua", "febc05a8a5701b4e9b73a9a24e994f33" }, - { "luaotfload-szss.lua", "256bc3115f09638b0acdf4f59b06e4d1" }, - { "luaotfload-scripts.lua", "9356ba71cf8a174e8e592213aa680297" }, - { "luaotfload-multiscript.lua", "8f77beea00a1319d53e10ce95f6cc561" }, - { "luaotfload-loaders.lua", "b0b23c070c570d81a32913d2afc1bb2a" }, - { "luaotfload-harf-plug.lua", "098a6a6f9c17d2a99a76ce890e8c9dc6" }, - { "luaotfload-harf-define.lua", "0d8692db5d29664eb32e6c5fb25b049f" }, - { "luaotfload-notdef.lua", "c323ab19ea5e81c5c9c4bbbc6d62839a" }, - { "luaotfload-embolden.lua", "50aa1bdac170cdb287345b9532520cbf" }, - { "luaotfload-letterspace.lua", "79d2efd35a43d1bfba84ce7c5a211680" }, - { "luaotfload-features.lua", "2348361d796bde017da72421a0e68ce6" }, - { "luaotfload-database.lua", "d37c8efaed4dbe9bb566cbd8e9ba9216" }, - { "luaotfload-configuration.lua", "cfdee94e34f3294b8ef627086ac464a3" }, - { "luaotfload-colors.lua", "01070f297400b9d0bb94a321b16a3cc6" }, - { "luaotfload-auxiliary.lua", "2a69d5f008d6c79b703ea6bd88f545f3" }, - { "luaotfload-filelist.lua", "261c4306787e506da0ca5c15b09913f5" }, - { "luaotfload-tool.lua", "252bdfdf017c7b2a1e1a92d129de05c2" }, - { "luaotfload-diagnostics.lua", "146886b07d0f4f57b82ed77407d32066" }, - { "luaotfload-log.lua", "7856e6afce049f6196ef94b2d2057ff6" }, - { "luaotfload-init.lua", "3c3b19cd2f8bbbd8bdbc99c50535bff7" }, + { "luaotfload-dvi.lua", "8ddc7ee49050bcef1682c054f00d3bf5" }, + { "luaotfload-tounicode.lua", "fb7b0f47a74b414177bea5f982abf1de" }, + { "luaotfload-unicode.lua", "65c7651d19fe06ec17196c22c533f768" }, + { "luaotfload-resolvers.lua", "7fd3c8d3d5a76c89227110177e7979f3" }, + { "luaotfload-parsers.lua", "a7eb408eae165d6a61d11a705cab1b98" }, + { "luaotfload-fallback.lua", "e218dc2d291d024f2d1b45da766f6cfc" }, + { "luaotfload-szss.lua", "5d97cb13052848afe1aba7e7ebc1469c" }, + { "luaotfload-scripts.lua", "b987b6592183d5cc5ec858d5792cc381" }, + { "luaotfload-multiscript.lua", "3f88fec616eb7b3f56fc5932a0f1e4d8" }, + { "luaotfload-loaders.lua", "e9f98d4904d245facab3932c505ea0f8" }, + { "luaotfload-harf-plug.lua", "09076cf26ee8160a8eb667c6be500069" }, + { "luaotfload-harf-define.lua", "16079aa19c3862e2e8f6b8cb91cf037a" }, + { "luaotfload-notdef.lua", "c06af0d71ab75a68f3445ecc6fa4e7b3" }, + { "luaotfload-embolden.lua", "04466a99226e5724ef9287ec1a28263a" }, + { "luaotfload-letterspace.lua", "000b624f54d934aff044862b7a64d4e2" }, + { "luaotfload-features.lua", "26ff83b26be22a1962db807b51a362dc" }, + { "luaotfload-database.lua", "315be26e69005984329b81aa331e1365" }, + { "luaotfload-configuration.lua", "5b294133cd45a4a6f4b94388dbfc2964" }, + { "luaotfload-colors.lua", "5989cddee9b5371697c559ec201e27e7" }, + { "luaotfload-auxiliary.lua", "56ff5ca809e974b5630cdce6d287982d" }, + { "luaotfload-filelist.lua", "007dac159b4407ea6cb04dbfbc4d4c87" }, + { "luaotfload-tool.lua", "c3dcd23a9eb499b5878381b6ec01d8c9" }, + { "luaotfload-diagnostics.lua", "90d352ac043f299aa343830084deaa00" }, + { "luaotfload-log.lua", "22964216fb42c7b07623fc43da5149ac" }, + { "luaotfload-init.lua", "8acaf9e42a9c9fa1c398a0944d1a4d50" }, { "luaotfload-main.lua", "b19c9cc34cf1d676c39f872cfb41aef6" }, }, ["notes"]={ ["committer"]="Marcel Fabian Krüger ", - ["description"]="v3.20/2022-02-27", + ["description"]="v3.21/2022-03-18", ["loader"]="fontloader-2022-02-24.lua", - ["revision"]="b6b01d231706a79c8456c4c890d62a65897b49e1", - ["timestamp"]="2022-02-27 14:15:30 +0100", + ["revision"]="f3b4cee7b284e3e9d780315400166c53a4579f55", + ["timestamp"]="2022-03-18 14:09:12 +0100", }, } \ No newline at end of file diff --git a/macros/luatex/generic/luaotfload/luaotfload-suppress.lua b/macros/luatex/generic/luaotfload/luaotfload-suppress.lua index b0ba8dccc1..71698946c3 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-suppress.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-suppress.lua @@ -5,8 +5,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-suppress", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / suppress", license = "GPL v2.0", author = "Marcel Krüger" diff --git a/macros/luatex/generic/luaotfload/luaotfload-szss.lua b/macros/luatex/generic/luaotfload/luaotfload-szss.lua index 6786226257..b1d77704cc 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-szss.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-szss.lua @@ -5,8 +5,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-szss", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / Special feature handling", license = "GPL v2.0", author = "Marcel Krüger" diff --git a/macros/luatex/generic/luaotfload/luaotfload-tool.1 b/macros/luatex/generic/luaotfload/luaotfload-tool.1 index d0f56801c6..a450459d7a 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-tool.1 +++ b/macros/luatex/generic/luaotfload/luaotfload-tool.1 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH LUAOTFLOAD-TOOL 1 "2022-02-27" "3.20" "text processing" +.TH LUAOTFLOAD-TOOL 1 "2022-03-18" "3.21" "text processing" .SH NAME luaotfload-tool \- generate and query the Luaotfload font names database . diff --git a/macros/luatex/generic/luaotfload/luaotfload-tool.lua b/macros/luatex/generic/luaotfload/luaotfload-tool.lua index 6be778a69a..c8125a8bef 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-tool.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-tool.lua @@ -9,8 +9,8 @@ local ProvidesLuaModule = { name = "luaotfload-tool", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload-tool / database functionality", license = "GPL v2.0" } diff --git a/macros/luatex/generic/luaotfload/luaotfload-tool.pdf b/macros/luatex/generic/luaotfload/luaotfload-tool.pdf index 4862fd03f1..931621cfc4 100644 Binary files a/macros/luatex/generic/luaotfload/luaotfload-tool.pdf and b/macros/luatex/generic/luaotfload/luaotfload-tool.pdf differ diff --git a/macros/luatex/generic/luaotfload/luaotfload-tool.rst b/macros/luatex/generic/luaotfload/luaotfload-tool.rst index d407a5fba5..b81c87731d 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-tool.rst +++ b/macros/luatex/generic/luaotfload/luaotfload-tool.rst @@ -6,9 +6,9 @@ generate and query the Luaotfload font names database ----------------------------------------------------------------------- -:Date: 2022-02-27 +:Date: 2022-03-18 :Copyright: GPL v2.0 -:Version: 3.20 +:Version: 3.21 :Manual section: 1 :Manual group: text processing diff --git a/macros/luatex/generic/luaotfload/luaotfload-tounicode.lua b/macros/luatex/generic/luaotfload/luaotfload-tounicode.lua index 9ef921ffd0..155ffb2d94 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-tounicode.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-tounicode.lua @@ -5,8 +5,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-tounicode", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / tounicode", license = "GPL v2.0", author = "Hans Hagen, Khaled Hosny, Elie Roux, Philipp Gesang, Marcel Krüger", diff --git a/macros/luatex/generic/luaotfload/luaotfload-unicode.lua b/macros/luatex/generic/luaotfload/luaotfload-unicode.lua index d63d16989c..c20c81ef8e 100644 --- a/macros/luatex/generic/luaotfload/luaotfload-unicode.lua +++ b/macros/luatex/generic/luaotfload/luaotfload-unicode.lua @@ -5,8 +5,8 @@ assert(luaotfload_module, "This is a part of luaotfload and should not be loaded independently") { name = "luaotfload-unicode", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "luaotfload submodule / Unicode helpers", license = "CC0 1.0 Universal", author = "Marcel Krüger" diff --git a/macros/luatex/generic/luaotfload/luaotfload.conf.5 b/macros/luatex/generic/luaotfload/luaotfload.conf.5 index 272a3abd54..e8445359ca 100644 --- a/macros/luatex/generic/luaotfload/luaotfload.conf.5 +++ b/macros/luatex/generic/luaotfload/luaotfload.conf.5 @@ -1,6 +1,6 @@ .\" Man page generated from reStructuredText. . -.TH LUAOTFLOAD.CONF 5 "2022-02-27" "3.20" "text processing" +.TH LUAOTFLOAD.CONF 5 "2022-03-18" "3.21" "text processing" .SH NAME luaotfload.conf \- Luaotfload configuration file . diff --git a/macros/luatex/generic/luaotfload/luaotfload.conf.rst b/macros/luatex/generic/luaotfload/luaotfload.conf.rst index c40088b5b5..3682a5789a 100644 --- a/macros/luatex/generic/luaotfload/luaotfload.conf.rst +++ b/macros/luatex/generic/luaotfload/luaotfload.conf.rst @@ -6,9 +6,9 @@ Luaotfload configuration file ----------------------------------------------------------------------- -:Date: 2022-02-27 +:Date: 2022-03-18 :Copyright: GPL v2.0 -:Version: 3.20 +:Version: 3.21 :Manual section: 5 :Manual group: text processing diff --git a/macros/luatex/generic/luaotfload/luaotfload.lua b/macros/luatex/generic/luaotfload/luaotfload.lua index 20eaad3eff..5b65b364d8 100644 --- a/macros/luatex/generic/luaotfload/luaotfload.lua +++ b/macros/luatex/generic/luaotfload/luaotfload.lua @@ -20,8 +20,8 @@ local authors = "\z -- version number is used below! local ProvidesLuaModule = { name = "luaotfload", - version = "3.20", --TAGVERSION - date = "2022-02-27", --TAGDATE + version = "3.21", --TAGVERSION + date = "2022-03-18", --TAGDATE description = "Lua based OpenType font support", author = authors, copyright = authors, diff --git a/macros/luatex/generic/luaotfload/luaotfload.sty b/macros/luatex/generic/luaotfload/luaotfload.sty index 2426c2e0f5..e5dba96300 100644 --- a/macros/luatex/generic/luaotfload/luaotfload.sty +++ b/macros/luatex/generic/luaotfload/luaotfload.sty @@ -39,7 +39,7 @@ \fi \ifdefined\ProvidesPackage \ProvidesPackage{luaotfload}% - [2022/02/27 v3.20 OpenType layout system] + [2022/03/18 v3.21 OpenType layout system] \fi \directlua{ if xpcall(function ()% diff --git a/macros/luatex/generic/luaotfload/scripts-demo.pdf b/macros/luatex/generic/luaotfload/scripts-demo.pdf index 1f04d9d7bc..b534b64a68 100644 Binary files a/macros/luatex/generic/luaotfload/scripts-demo.pdf and b/macros/luatex/generic/luaotfload/scripts-demo.pdf differ diff --git a/macros/luatex/generic/luaotfload/shaper-demo-graphite.pdf b/macros/luatex/generic/luaotfload/shaper-demo-graphite.pdf index ce126ad4b1..d78a09c63b 100644 Binary files a/macros/luatex/generic/luaotfload/shaper-demo-graphite.pdf and b/macros/luatex/generic/luaotfload/shaper-demo-graphite.pdf differ diff --git a/macros/luatex/generic/luaotfload/shaper-demo.pdf b/macros/luatex/generic/luaotfload/shaper-demo.pdf index 18a3c1b69f..78e4d82361 100644 Binary files a/macros/luatex/generic/luaotfload/shaper-demo.pdf and b/macros/luatex/generic/luaotfload/shaper-demo.pdf differ diff --git a/macros/xetex/generic/xetexko/ChangeLog b/macros/xetex/generic/xetexko/ChangeLog index 22a650bf49..9970cbd0e1 100644 --- a/macros/xetex/generic/xetexko/ChangeLog +++ b/macros/xetex/generic/xetexko/ChangeLog @@ -1,3 +1,10 @@ +2022-03-18 Dohyun Kim + + Version 4.1 + + * assign U+223C (tilde operator) to \XeTeXcharclassSY (cjksymbols) + * avoid possible clash with unicode-math package + 2021-09-06 Dohyun Kim Version 4.0 diff --git a/macros/xetex/generic/xetexko/README b/macros/xetex/generic/xetexko/README index 01eef1e851..d7ba29eb91 100644 --- a/macros/xetex/generic/xetexko/README +++ b/macros/xetex/generic/xetexko/README @@ -1,4 +1,4 @@ -XeTeX-ko Package version 4.0 (2021/09/06) +XeTeX-ko Package version 4.1 (2022/03/18) ========================================= XeTeX-ko is a macro package for Xe(La)TeX which supports typesetting diff --git a/macros/xetex/generic/xetexko/xetexko-doc.pdf b/macros/xetex/generic/xetexko/xetexko-doc.pdf index fa9b3a3056..8d0a45ea56 100644 Binary files a/macros/xetex/generic/xetexko/xetexko-doc.pdf and b/macros/xetex/generic/xetexko/xetexko-doc.pdf differ diff --git a/macros/xetex/generic/xetexko/xetexko-doc.tex b/macros/xetex/generic/xetexko/xetexko-doc.tex index 97260f2f4d..4b5f98663d 100644 --- a/macros/xetex/generic/xetexko/xetexko-doc.tex +++ b/macros/xetex/generic/xetexko/xetexko-doc.tex @@ -74,7 +74,7 @@ \title{\xetexko\ 간단 매뉴얼} \author{Dohyun Kim \normalsize <\texttt{nomos at ktug org}> \and \normalsize <\url{http://github.com/dohyunkim/xetexko}>} -\date{Version 4.0\quad 2021/09/06} +\date{Version 4.1\quad 2022/03/18} \maketitle \begin{quote}\small @@ -709,6 +709,12 @@ microtype 패키지의 protrusion 기능이 잘 작동하지 않는 경우가 \begin{small}\linespread{1.2}\selectfont \begin{description}\itemsep=0pt + \item[v4.1] 2022-03-18 + \begin{itemize} + \item U+223C \hparen{\texttt{^^^^223c}}를 + \verb|cjksymbols|에 할당함으로써 + 한글 폰트로 찍히는 게 기본값이 되었다. + \end{itemize} \item[v4.0] 2021-09-06 \begin{itemize} \item \xetexko 가 제공하는 대부분의 기능은 폰트 인코딩이 diff --git a/macros/xetex/generic/xetexko/xetexko.sty b/macros/xetex/generic/xetexko/xetexko.sty index afd0ee6283..0548643eed 100644 --- a/macros/xetex/generic/xetexko/xetexko.sty +++ b/macros/xetex/generic/xetexko/xetexko.sty @@ -1,6 +1,6 @@ % xetexko.sty % -% Copyright (c) 2013-2021 Dohyun Kim +% Copyright (c) 2013-2022 Dohyun Kim % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c @@ -16,7 +16,7 @@ \ifdefined\ProvidesPackage \NeedsTeXFormat{LaTeX2e}[2021/06/01] - \ProvidesPackage{xetexko}[2021/09/06 v4.0 typesetting Korean with XeTeX] + \ProvidesPackage{xetexko}[2022/03/18 v4.1 typesetting Korean with XeTeX] \else \ifdefined\@tempcnta\else \newcount\@tempcnta \fi \ifdefined\@sptoken \else @@ -137,7 +137,6 @@ \XeTeXcharclass "2015=\XeTeXcharclassLD % ― HORIZONTAL BAR \XeTeXcharclass "2025=\XeTeXcharclassLD % ‥ TWO DOT LEADER \XeTeXcharclass "2026=\XeTeXcharclassLD % … HORIZONTAL ELLIPSIS -\XeTeXcharclass "FF5E=\XeTeXcharclassLD % ~ FULLWIDTH TILDE : KS symbol \XeTeXcharclass "3003=\XeTeXcharclassLD % 〃 DITTO MARK : KS symbol % 결락기호 \XeTeXcharclass "25A1=\XeTeXcharclassID % □ @@ -161,6 +160,7 @@ \XeTeXcharclass "21D2=\XeTeXcharclassSY % ⇒ \XeTeXcharclass "21D4=\XeTeXcharclassSY % ⇔ \XeTeXcharclass "2225=\XeTeXcharclassSY % ∥ +\XeTeXcharclass "223C=\XeTeXcharclassSY % ∼ TILDE OPERATOR \XeTeXcharclass "226A=\XeTeXcharclassSY % ≪ 꽉찬 전각! 어디에 배정해야 하나? \XeTeXcharclass "226B=\XeTeXcharclassSY % ≫ 꽉찬 전각! 어디에 배정해야 하나? \XeTeXcharclass "2299=\XeTeXcharclassSY % ⊙ @@ -241,6 +241,7 @@ \XeTeXcharclass "FF04 = \XeTeXcharclassSY % $ \XeTeXcharclass "FF05 = \XeTeXcharclassSY % % \XeTeXcharclass "FF3C = \XeTeXcharclassSY % \ +\XeTeXcharclass "FF5E = \XeTeXcharclassSY % ~ FULLWIDTH TILDE : KS symbol \XeTeXcharclass "FFE0 = \XeTeXcharclassSY % ¢ \XeTeXcharclass "FFE1 = \XeTeXcharclassSY % £ \XeTeXcharclass "FFE5 = \XeTeXcharclassSY % ¥ @@ -2029,10 +2030,6 @@ \AddToHook{env/picture/begin}{% \latinalphs\latinparens\latinpuncts\latincolons\latinhyphens } -\AddToHook{selectfont}{% - \XeKo@hanja@selectfont - \XeKo@hangul@selectfont - } \def\XeKo@hangul@selectfont{% \ifdefined\XeKo@in@selectfont\else \ifdefined\xetexkohangulfont @@ -2066,6 +2063,14 @@ \fi } \ExplSyntaxOn +\AddToHook{selectfont} +{ + \fontspec_if_current_script:nTF {math} {} % unless unicode-math font + { + \XeKo@hanja@selectfont + \XeKo@hangul@selectfont + } +} \tl_new:N \l_xtxko_font_opts_tl \tl_new:N \l_xtxko_rest_opts_tl \keys_define:nn { xtxko-font } -- cgit v1.2.3