CTAN sync 202108140301

12 files changed, 158 insertions, 152 deletions

diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 39acbc59f9..d114859b14 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -8,7 +8,7 @@
 %<*class>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2021/08/11}{1.28L}
+\ProvidesExplClass{easybook}{2021/08/13}{1.28N}
   {Typeset Chinese theses or books}
 
 \bool_set_false:N \l__eb_compile_draft_bool
@@ -292,7 +292,7 @@
 %<*package>
 \NeedsTeXFormat{LaTeX2e}[2020/10/01]
 \RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/08/11}{1.28L}
+\ProvidesExplPackage{easybase}{2021/08/13}{1.28N}
   {Typeset Chinese theses or books}
 
 \cs_generate_variant:Nn \dim_add:Nn { NV,Nv }
@@ -363,13 +363,13 @@
       }
       { \IfFileExists{#1.sty}{\RequirePackage{#1}}{} }
   }
-\cs_new_protected:Npn \eb_if_package_reload:nF #1#2
+\cs_new_protected:Npn \eb_if_package_loaded:nF #1#2
   {
     \@ifpackageloaded{#1}
-      {\msg_warning:nnn { easybase } { package-reload } {#1}}
+      {\msg_warning:nnn { easybase } { package-loaded } {#1}}
       {#2\disable@package@load{#1}{}}
   }
-\msg_new:nnn { easybase } { package-reload }
+\msg_new:nnn { easybase } { package-loaded }
   {
     The~macro~package~#1~has~been~reloaded. \\
     Please~pass~the~arguments~by \\
@@ -381,7 +381,7 @@
     \PassOptionsToPackage{#1}{#2}
     \eb_clist_map_inline:nn {#2}
       {
-        \eb_if_package_reload:nF {##1}
+        \eb_if_package_loaded:nF {##1}
           { \eb@usepackage@save{##1} }
       }
   }
@@ -2068,16 +2068,16 @@
     numsep .initial:n = 0.5em,
     label .tl_set:N   = \eb@tc@exercise@label,
     enumitem .code:n  = \setexerlist{#1},
-    tcolorbox .code:n = \tcbappstyle{exercise}{#1}
+    tcolorbox .code:n = \addtcbstyle{exercise}{#1}
   }
 \cs_new_protected:Npn \setexercise #1
   { \keys_set:nn { eb/exercise } {#1} }
-\NewDocumentCommand{\tcbappstyle}{smm}
-  {
-    \IfBooleanTF{#1}
-      {\tcbset{tc-#2/.style = {#3}}}
-      {\tcbset{tc-#2/.append~style = {#3}}}
-  }
+\cs_new_protected:Npn \addtcbstyle #1#2
+  { \tcbset{tc-#1/.append~style = {#2}} }
+\cs_new_protected:Npn \newtcbstyle #1#2
+  { \tcbset{tc-#1/.style = {#2}} }
+\cs_new_protected:Npn \tcbappstyle
+  { \@ifstar{\newtcbstyle}{\addtcbstyle} }
 \ctex_at_end_package:nn { tcolorbox }
   {
     \eb_package_date_check:nn { tcolorbox } { 2020/10/09 }
@@ -2396,11 +2396,11 @@
   }
 %</package>
 %<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/08/11}{1.28L}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/08/13}{1.28N}
   {Customization of tcolorbox for easybook}
 
 \tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }
-\tcbappstyle*{theorem}
+\newtcbstyle{theorem}
   {
     enhanced~jigsaw,pad~at~break* = 3pt,
     opacityback = 0,
@@ -2411,7 +2411,7 @@
     top = \eb@tc@line@skip,bottom = \eb@tc@line@skip,
     middle = \eb@tc@line@skip
   }
-\tcbappstyle*{outline}
+\newtcbstyle{outline}
   {
     enhanced,nofloat,
     tikznode~boxed~title,
@@ -2424,14 +2424,14 @@
     arc = 3pt,
     left = 2pc,right = 2pc,top = 1.5pc,bottom = 1pc
   }
-\tcbappstyle*{exercise}
+\newtcbstyle{exercise}
   {
     blank,on~line,center,
     sharpish~corners,
     fontupper         = \Large\sffamily,
     beforeafter~skip  = 3.75ex plus .2ex minus .1ex
   }
-\tcbappstyle*{easybox}
+\newtcbstyle{easybox}
   {
     enhanced~jigsaw,pad~at~break* = 3pt,
     center~title,
@@ -2445,7 +2445,7 @@
     titlerule = 0pt,
     beforeafter~skip = 1.75ex plus .2ex minus .1ex
   }
-\tcbappstyle*{ebparbox}
+\newtcbstyle{ebparbox}
   {
     frame~hidden,
     enhanced~jigsaw,pad~at~break* = 3pt,
@@ -2455,15 +2455,15 @@
     middle = \eb@tc@line@skip,bottomtitle = \eb@tc@line@skip,
     beforeafter~skip = 1.75ex plus .2ex minus .1ex
   }
-\tcbappstyle*{ebemph}{on~line,blank}
-\tcbappstyle*{eblink}
+\newtcbstyle{ebemph}{on~line,blank}
+\newtcbstyle{eblink}
   {
     standard~jigsaw,on~line,
     top = 1.5pt,bottom = 1.5pt,left = 1.5pt,right = 1.5pt,
     boxrule = 0.75pt,arc = 1pt,
     opacityback = 0.2
   }
-\tcbappstyle*{ebfbox}
+\newtcbstyle{ebfbox}
   {
     on~line,sharpish~corners,
     top = 2pt,bottom = 2pt,left = 1pt,right = 1pt,
diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf
index 2c45fb8204..3bdcdbb92e 100644
--- a/macros/latex/contrib/easybook/easybook.pdf
+++ b/macros/latex/contrib/easybook/easybook.pdf
diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex
index 1bb507066c..341d3127cb 100644
--- a/macros/latex/contrib/easybook/easybook.tex
+++ b/macros/latex/contrib/easybook/easybook.tex
@@ -11,8 +11,8 @@
   {
     name      = easybook,
     title     = EASYBOOK 使用手册,
-    version   = v1.28L,
-    date      = 2021/08/11,
+    version   = v1.28N,
+    date      = 2021/08/13,
     authors   = 瞿毅,
     info      = 排版简体中文学位论文和书籍,
     email     = quee123@foxmail.com,
@@ -48,6 +48,7 @@
   {\IfBooleanF{#1}{\color{cnltxblue}}#3\ifblank{#2}{}{\ttfamily[#2]}}
 \newcommand{\splitmeta}[2][\texttt{,}]
   {
+    \clist_clear:N \l_tmpa_clist
     \clist_map_inline:nn {#2}
       { \clist_put_right:Nn \l_tmpa_clist { \meta{##1} } }
     \clist_use:Nn \l_tmpa_clist {#1}
@@ -447,7 +448,7 @@
   \keyval-{caption}{数值}\Default{1.1}
   图片、表格和代码题注的行距因子。
   \keyval-{footnote}{数值}\Default{1.1}
-  脚注整体内容的行距因子，可以使用 \option{fntext-form} 的代码覆盖每个脚注单独的行距，从而与不同脚注的段落间距不同。
+  脚注内容整体的行距因子，可以使用 \option{fntext-form} 的代码覆盖每个脚注单独的行距，从而与不同脚注的段落间距不同。
   \begin{ctexexam}
   \spread{footnote = 1.3}
   \hdrset{fntext-form = \linespread{1.2}\selectfont}
@@ -563,7 +564,7 @@
   \begin{itemize}
   \item 中英文模式下标题不同，英文标题为可选项，默认为首字母大写的 \meta{环境名}。
   \item 自动定义交叉引用的格式，引用标签前缀为定理标题名称。
-  \item 定理盒子选项 \keyis-{thmbox}{true} 仍然生效，此时 \meta{盒子风格} 用于设置定理盒子风格的名称，它需要 \pkg*{tcolorbox} 的 \cs*{tcbset} 接口命令或 \cs{tcbappstyle} 设定，默认为 \code{tc-theorem}。
+  \item 定理盒子选项 \keyis-{thmbox}{true} 仍然生效，此时 \meta{盒子风格} 为定理盒子风格的名称，它需要由新建盒子风格命令 \cs{newtcbstyle} 定义，默认为 \code{tc-theorem}。
   \item 默认使用 \code{easy-theorem} 定理样式，可在最后一个选项使用 \option*{style} 更改样式。
   \end{itemize}
   \command{declaretheoremstyle}[\oarg{键值列表1}\marg{定理样式名}\oarg{键值列表2}]
@@ -581,9 +582,9 @@
   \tcolorboxenvironment{定理环境名}{tc-theorem}
 \end{ctexexam}
 
-使用 \cs{tcbappstyle} 命令调整开启定理盒子时默认的样式，第一个参数为 \code{theorem}，关于命令的介绍在小节 \ref{subsec:box}。
+使用 \cs{addtcbstyle} 命令调整开启定理盒子时默认的样式，第一个参数为 \code{theorem}，关于命令的介绍在小节 \ref{subsec:box}。
 \begin{ctexexam}
-  \tcbappstyle{theorem}{colback = GreenYellow}
+  \addtcbstyle{theorem}{colback = GreenYellow}
 \end{ctexexam}
 
 定义一个新的定理样式可用于 \cs{declaretheorem} 的 \option*{style} 选项：
@@ -901,10 +902,10 @@
   \environment{exercise}[\sarg\parg\oarg{键值列表1}\darg{键值列表2}\oarg{键值列表3}]
   习题环境的标题使用 \cs*{tcbox} 行内盒子包装样式，内容则使用 \env{enumerate} 列表环境。它有 5 个可选参数，应当注意用法。当使用星号参数时标题不进行编号，使用 \parg{} 号参数时不使用预置标题，此时 \meta{键值列表1} 除了 \option{label} 选项失效。\par
 
-  \meta{键值列表2} 包括 \pkg*{tcolorbox} 的盒子样式选项，例如 \option*{boxsep} 和 \option*{fontupper} 等，也可以使用下述 \option{tcolorbox} 选项。在这里可以使用 \cs{tcbappstyle} 命令设置标题选项 \meta{键值列表2} 的值，第一个参数为 \code{exercise}。
+  \meta{键值列表2} 包括 \pkg*{tcolorbox} 的盒子样式选项，例如 \option*{boxsep} 和 \option*{fontupper} 等，也可以使用下述 \option{tcolorbox} 选项。在这里可以使用 \cs{addtcbstyle} 命令设置标题选项 \meta{键值列表2} 的值，第一个参数为 \code{exercise}。
   \begin{ctexexam}
   \tcphantomifname{\markright{\UseCounter{tcbcounter}{\quad 习题}}}{}
-  \tcbappstyle{exercise}{boxsep = 5pt}
+  \addtcbstyle{exercise}{boxsep = 5pt}
   \exerprologue{习题前的一段文本}
   \begin{exercise}+[color = LightSkyBlue](after skip = 2pc)[itemsep = 1ex]
     \item 第一题
@@ -944,12 +945,13 @@
 \subsection{盒子}
 \label{subsec:box}
 使用盒子以及小节 \ref{subsec:exercise} 中的 \env{exercise} 环境需要在导言区\textbf{手动载入} \pkg*{tcolorbox} 宏包，它们 \meta{配置选项} 的键值列表同样由 \pkg*{tcolorbox} 提供支持，具体选项可见宏包文档的 Option Keys 一节，可以进行边距、字体及背景颜色等各种个性化设置，一些配置会覆盖预设。
-
 \begin{commands}
-  \command{tcbappstyle}[\sarg\marg{风格名称}\marg{键值列表}]
-  这是一个 \pkg*{tcolorbox} 宏包盒子风格定义命令，带有星号的命令可以\textbf{新建或重置}一个名为 \code{tc-}\meta{风格名称} 的盒子风格，否则是修改\textbf{已存在}的风格。这个命令可以调整以下即将介绍的预置盒子风格，对于预置盒子来说参数 \meta{风格名称} 即为它们对应的环境或命令名。
+  \command{newtcbstyle}[\marg{风格名称}\marg{键值列表}]
+  新建或重置一个名为 \code{tc-}\meta{风格名称} 的 \pkg*{tcolorbox} 宏包盒子风格，可以与 \cs{addtcbstyle} 命令联用。
+  \command{addtcbstyle}[\marg{风格名称}\marg{键值列表}]
+  修改已存在的 \pkg*{tcolorbox} 宏包盒子风格。这个命令可以调整以下即将介绍的预置盒子风格，对于预置盒子来说参数 \meta{风格名称} 即为它们对应的环境或命令名。
   \begin{ctexexam}
-  \tcbappstyle*{mytcb} % 新建一个盒子风格tc-mytcb
+  \newtcbstyle{mytcb} % 新建一个盒子风格tc-mytcb
     {
       colback = Snow,colframe = LimeGreen,coltext = Coral,
       fontupper = \bfseries,arc = 6pt,
@@ -969,14 +971,14 @@
 \subsubsection{摘要盒子}
 \begin{environments}
   \environment{outline}[\oarg{键值列表1}\darg{标题名称}\oarg{键值列表2}]
-  摘要盒子 \env{outline} 可用于章前摘要，它的标题是可选参数，默认标题是摘要。\meta{键值列表2} 是摘要盒子样式选项，可以使用 \cs{tcbappstyle} 命令对它进行全局设置，命令第一个参数为 \code{outline}。
+  摘要盒子 \env{outline} 可用于章前摘要，它的标题是可选参数，默认标题是摘要。\meta{键值列表2} 是摘要盒子样式选项，可以使用 \cs{addtcbstyle} 命令对它进行全局设置，命令第一个参数为 \code{outline}。
 \end{environments}
 
 \begin{commands}
   \command{setoutlinelist}[\marg{键值列表1}]
   \meta{键值列表1} 与 \pkg*{enumitem} 宏包中列表配置选项相同，可以设置摘要条目的各种距离，要对它进行全局设置可以使用 \cs{setoutlinelist} 命令。
   \begin{ctexexam}
-  \tcbappstyle{outline}{arc = 6pt}
+  \addtcbstyle{outline}{arc = 6pt}
   \begin{outline}[leftmargin = *](摘要标题)
     \item 摘要内容1
     \item 摘要内容2
@@ -987,7 +989,7 @@
 \subsubsection{段落盒子}
 \begin{environments}
   \environment{easybox}[\sarg\oarg{颜色名}\darg{段落标题}\oarg{配置选项}]
-  环境 \env{easybox} 创建一个带有三个可选参数的扁平盒子。使用星号参数时给盒子添加边框，\meta{颜色名} 选项设置背景颜色，\meta{段落标题} 选项可以设置标题，默认无标题。如果 \meta{配置选项} 较长且希望在原有基础上更改为全局固定的样式，可以使用 \cs{tcbappstyle} 命令设置，命令第一个参数为 \code{easybox}。
+  环境 \env{easybox} 创建一个带有三个可选参数的扁平盒子。使用星号参数时给盒子添加边框，\meta{颜色名} 选项设置背景颜色，\meta{段落标题} 选项可以设置标题，默认无标题。如果 \meta{配置选项} 较长且希望在原有基础上更改为全局固定的样式，可以使用 \cs{addtcbstyle} 命令设置，命令第一个参数为 \code{easybox}。
   \begin{ctexexam}
   \begin{easybox}*[DarkCyan](段落标题)
     上半盒子内容
diff --git a/macros/latex/contrib/hvlogos/Changes b/macros/latex/contrib/hvlogos/Changes
index 4658700720..a1b985f0e7 100644
--- a/macros/latex/contrib/hvlogos/Changes
+++ b/macros/latex/contrib/hvlogos/Changes
@@ -1,2 +1,5 @@
 hvlogos.sty:    
+0.02 2021-08-13  - fix for \tikz which is reserved by package tikz
+                   renamed to \tikzlogo
+                 - added logos for Purdue University
 0.01 2021-07-30  - first CTAN version
diff --git a/macros/latex/contrib/hvlogos/doc/hvlogos-doc.pdf b/macros/latex/contrib/hvlogos/doc/hvlogos-doc.pdf
index c56c7e9522..d44fb7affd 100644
--- a/macros/latex/contrib/hvlogos/doc/hvlogos-doc.pdf
+++ b/macros/latex/contrib/hvlogos/doc/hvlogos-doc.pdf
diff --git a/macros/latex/contrib/hvlogos/doc/hvlogos-doc.tex b/macros/latex/contrib/hvlogos/doc/hvlogos-doc.tex
index 77e83e2b21..1adcd9633f 100644
--- a/macros/latex/contrib/hvlogos/doc/hvlogos-doc.tex
+++ b/macros/latex/contrib/hvlogos/doc/hvlogos-doc.tex
@@ -12,7 +12,8 @@
 \def\LPack#1{\texttt{#1}\index{#1@\texttt{#1} -- package}}
 
 \title{\texttt{hvlogos} -- Print \TeX-related Logos}
-\author{Herbert Voß}
+\author{Herbert Voß\thanks{Thanks to
+Heiko Oberdiek, Mark Senn}}
 \begin{document}
 \maketitle
 
@@ -56,7 +57,7 @@ The package \LPack{hvlogos} loads by default the packages
 \Lcs{Dante} && \rlap{\Dante} \\
 \Lcs{DANTE} && \DANTE \\
 \Lcs{dtk} && \dtk \\
-\Lcs{DTK}\footnote{Quotes depends on the current language setting.} && \DTK \\[5pt]
+\Lcs{DTK}\footnote{Quotes depend on the current language setting.} && \DTK \\[5pt]
 
 \Lcs{emTeX} && \emTeX\\
 \Lcs{eTeX} && \eTeX\\
@@ -101,7 +102,9 @@ The package \LPack{hvlogos} loads by default the packages
 \Lcs{PiCTeX} && \PiCTeX \\
 \Lcs{plainTeX} && \plainTeX \\
 \Lcs{PostScript} & \Lcs{PS}& \PostScript \\
-\Lcs{PSTricks}  & \Lcs{pstricks}& \PSTricks\\[5pt]
+\Lcs{PSTricks}  & \Lcs{pstricks}& \PSTricks\\
+\Lcs{PurdueThesis} & \Lcs{purduethesis} & \PurdueThesis\\
+\Lcs{PuTh} & \Lcs{puth} & \PuTh \\[5pt]
 
 \Lcs{SageTeX} && \SageTeX \\
 \Lcs{SLiTeX} && \SLiTeX \\[5pt]
@@ -110,7 +113,7 @@ The package \LPack{hvlogos} loads by default the packages
 \Lcs{TeXivht} && \TeX4ht \\
 \Lcs{TeXLive} && \TeXLive\\[5pt]
 
-\Lcs{tikz} & \Lcs{TikZ}& \tikz \\
+\Lcs{TikZ} & \Lcs{tikzlogo}& \tikzlogo \\
 \Lcs{TTH} && \TTH \\
 \Lcs{TUG} && \TUG\\
 \Lcs{TUGboat} && \TUGboat \\[5pt]
diff --git a/macros/latex/contrib/hvlogos/latex/hvlogos.sty b/macros/latex/contrib/hvlogos/latex/hvlogos.sty
index 11116a6a99..c55b7e4ed7 100644
--- a/macros/latex/contrib/hvlogos/latex/hvlogos.sty
+++ b/macros/latex/contrib/hvlogos/latex/hvlogos.sty
@@ -2,8 +2,7 @@
 %%
 %% This is file `hvlogos.sty',
 %%
-%% Copyright (C) 2021
-%% Herbert Voss
+%% Copyright (C) 2021  Herbert Voss
 %%
 %% This program can be redistributed and/or modified under the terms
 %% of the LaTeX Project Public License Distributed from CTAN archives
@@ -11,7 +10,7 @@
 %
 %
 % -------------------------------------
-\ProvidesPackage{hvlogos}[2021/07/28 v. 0.01 Logos (hv)]
+\ProvidesPackage{hvlogos}[2021/08/13 v. 0.02 Logos (hv)]
 %
 \newif\if@dtk@newengine \@dtk@newenginetrue 
 %
@@ -70,12 +69,14 @@
 \def\amsmath{\AMS\textsf{math}}
 \def\AmSLaTeX{\mbox{\textsf{AMS}-\hologo{LaTeX}}}
 \def\AmSTeX{\mbox{\textsf{AMS}-\hologo{TeX}}}
-\def\biber{\textsf{biber}}
-\def\Biber{\textsf{Biber}}
-\def\BibTeX{\@ifnextchar8\@@BibTeX\@BibTeX}
+\DeclareRobustCommand\Biber{\textsf{Biber}}
+\let\biber\Biber
+\DeclareRobustCommand\BibTeX{\@ifnextchar8\@@BibTeX\@BibTeX}
 \def\@BibTeX{{\hologoLogoSetup{BibTeX}{variant=sc}\hologo{BibTeX}}}
 \def\BibTeXacht{{\hologoLogoSetup{BibTeX8}{variant=sc}\hologo{BibTeX8}}}
 \def\@@BibTeX8{\hologo{BibTeX8}}
+\DeclareRobustCommand\BibLaTeX{Bib\hologo{LaTeX}}
+\let\biblatex\BibLaTeX
 \def\ConTeXt{\hologo{ConTeXt}}
 \let\context\ConTeXt
 \def\emTeX{\hologo{emTeX}}
@@ -142,9 +143,9 @@
 %
 \newcommand\BibTool{\textsc{Bib\hskip-.1em
         T\hskip-.15emo\hskip-.05emo\hskip-.05eml}\xspace}
-\def\tikz{\textsf{Ti\textit{k}Z}}
+\def\tikzlogo{\textsf{Ti\textit{k}Z}}
 \def\ALEPH{\ensuremath{\aleph}}
-\let\TikZ\tikz
+\let\TikZ\tikzlogo
 
 \def\eV{e.\kern-0.1em V\kern-0.18em.}
 \def\d@nte{\@ifnextchar.%
@@ -179,8 +180,6 @@
 \def\pgftikz{\textsf{pgf/Ti\textit{k}Z}}
 \def\TeXLive{\TeX{}Live\xspace}
 
-\def\BibLaTeX{Bib\hologo{LaTeX}}
-\let\biblatex\BibLaTeX
 \def\CTAN{\texttt{CTAN}\xspace}
 
 \def\PSTricks{\textsf{PSTricks}\xspace}
@@ -197,4 +196,12 @@
 %
 \def\macOS{\textsf{macOS}\xspace}
 
+\def\PurdueThesis{P\kern-0.15ex urdue\kern-0.05ex T\kern-0.1ex hesis}
+\let\purduethesis = \PurdueThesis
+\def\PuTh{P\kern-0.15ex u\kern-0.05ex T\kern-0.1ex h}
+\let\puth = \PuTh
+
+
+
+
 \endinput
diff --git a/macros/latex/contrib/media9/ChangeLog b/macros/latex/contrib/media9/ChangeLog
index 7114b7fdfd..74b9b9979e 100644
--- a/macros/latex/contrib/media9/ChangeLog
+++ b/macros/latex/contrib/media9/ChangeLog
@@ -1,3 +1,8 @@
+2021-08-13
+	* v1.20 : media9.sty
+	* v0.51 : pdfbase.sty
+	* fix : xforms code (dvips) cleared up
+
 2021-07-29
 	* v1.19 : media9.sty
 	* v0.50 : pdfbase.sty
diff --git a/macros/latex/contrib/media9/doc/media9.pdf b/macros/latex/contrib/media9/doc/media9.pdf
index 5ea35a9beb..3aa066cb7a 100644
--- a/macros/latex/contrib/media9/doc/media9.pdf
+++ b/macros/latex/contrib/media9/doc/media9.pdf
diff --git a/macros/latex/contrib/media9/doc/media9.tex b/macros/latex/contrib/media9/doc/media9.tex
index af3142cdec..a7942ef584 100644
--- a/macros/latex/contrib/media9/doc/media9.tex
+++ b/macros/latex/contrib/media9/doc/media9.tex
@@ -785,7 +785,7 @@ parameter & description\\\hline\hline
 \end{figure}
 
 \begin{figure}[bp]
-\savebox{\keyshift}{\keys{\shift+}}%
+\savebox{\keyshift}{\keys{\shift}}%
 \savebox{\spacebar}{\keys{\unexpanded{\makebox[2\width][c]{Space}}}}%
 \centering
 \begin{Verbatim}
diff --git a/macros/latex/contrib/media9/media9.sty b/macros/latex/contrib/media9/media9.sty
index dee003d3ef..3638888bc6 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/07/29}
-\def\g@mix@version@tl{1.19}
+\def\g@mix@date@tl{2021/08/13}
+\def\g@mix@version@tl{1.20}
 
 \NeedsTeXFormat{LaTeX2e}[2020-10-01]
 \ProvidesExplPackage{media9}{\g@mix@date@tl}{\g@mix@version@tl}
@@ -2409,8 +2409,8 @@
 
 \RequirePackage{l3keys2e}
 
-\def\g@mix@date@tl{2021/07/29}
-\def\g@mix@version@tl{1.19}
+\def\g@mix@date@tl{2021/08/13}
+\def\g@mix@version@tl{1.20}
 
 \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 b61b8b56aa..56d9a0b603 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/07/29}
-\def\g@pbs@version@tl{0.50}
+\def\g@pbs@date@tl{2021/08/13}
+\def\g@pbs@version@tl{0.51}
 
 \NeedsTeXFormat{LaTeX2e}[2020-10-01]
 \ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl}
@@ -1071,7 +1071,7 @@
         output.
       }
 
-      \cs_new_protected_nopar:Nn\pbs_pdfxform:nnnnn{% #1, #3 not used
+      \cs_new_protected_nopar:Nn\pbs_pdfxform:nnnnn{% #1, #3 not used as
         \mode_leave_vertical:        % resources are managed automatically
         %rescale box to fit within the papersize while distilling
         \tl_gset:cx{scale_{pbs@obj\int_use:N\g_pbs_obj_int}}{\fp_eval:n{min(1.0,
@@ -1099,66 +1099,59 @@
         %additional dict entries
         \tl_set:Nx\l_tmpa_tl{#4} \tl_trim_spaces:N\l_tmpa_tl
         \pbs_special:n{
-          gsave~
-          currentpoint~/pbs@cury~exch~def~/pbs@curx~exch~def~
           %translate graphics to upper left page corner, so we have the whole
           %clipbox (i. e. page area) available for distilling; outlying parts
           %get clipped
           {
+            gsave~currentpoint~ % put graphic's ref point coords on the stack
             initclip~ % restore default clipping path (page device/whole page)
-            clippath~pathbbox~newpath~pop~pop~ % top-left coordinates
+            clippath~pathbbox~newpath~pop~pop~ %page device top-left coordinates
             isls {
               landplus90 {
                 % pkg geometry with landscape option
-                exch~pbs@curx~sub~\l_pbs_height_tl~add~
-                exch~pbs@cury~sub
+                exch~\l_pbs_height_tl~add~exch
               }{
                 % landscape as class option
-                exch~pbs@curx~sub~\l_pbs_depth_tl~add~
-                exch~pbs@cury~sub~\l_pbs_width_tl~add
+                exch~\l_pbs_depth_tl~add~
+                exch~\l_pbs_width_tl~add
               } ifelse
             }{
               % portrait
-              exch~pbs@curx~sub~
-              exch~pbs@cury~sub~\l_pbs_depth_tl~add
-            } ifelse~translate
-          }?pdfmark~
-          %move origin (0,0) to the current position
-          gsave~pbs@curx~pbs@cury~translate~
-          %distill graphics to XObject
-          mark~
-            /_objdef~{pbs@obj\int_use:N\g_pbs_obj_int}~
-            /BBox~[ % rotated BBoxes; o = reference point = origin (0,0),
-              isls { % x = top-left page corner, vert. coord downwards positive
-                landplus90 {            %        x----o-+
-                  % geometry with landscape      |    | |
-                  \l_pbs_height_tl~neg~ % llx    |    | |
-                  \l_pbs_width_tl~      % lly    |    | |
-                  \l_pbs_depth_tl~0 % urx ury    +----+-+
+              \l_pbs_depth_tl~add
+            } ifelse~translate~ % move origin (0,0) to page location as shown
+            mark~ % distill graphics to XObject                          below
+              /_objdef~{pbs@obj\int_use:N\g_pbs_obj_int}~
+              /BBox~[  % rotated BBoxes; o = origin (0,0), x = top-left page
+                isls { % corner, vert. coord downwards positive
+                  landplus90 {            %        x----o-+
+                    % geometry with landscape      |    | |
+                    \l_pbs_height_tl~neg~ % llx    |    | |
+                    \l_pbs_width_tl~      % lly    |    | |
+                    \l_pbs_depth_tl~0 % urx ury    +----+-+
+                  }{
+                    % landscape as class option        x-+----+
+                    \l_pbs_depth_tl~neg~0~ % llx lly   | |    |
+                    \l_pbs_height_tl~      % urx       | |    |
+                    \l_pbs_width_tl~neg    % ury       | |    |
+                  } ifelse                 %           +-o----+
                 }{
-                  % landscape as class option        x-+----+
-                  \l_pbs_depth_tl~neg~0~ % llx lly   | |    |
-                  \l_pbs_height_tl~      % urx       | |    |
-                  \l_pbs_width_tl~neg    % ury       | |    |
-                } ifelse                 %           +-o----+
-              }{
-                % portrait                       x----------+
-                0~\l_pbs_height_tl~  % llx lly   |          |
-                \l_pbs_width_tl~     % urx       o----------+
-                \l_pbs_depth_tl~neg  % ury       |          |
-              } ifelse               %           |          |
-            ]                        %           +----------+
-            %insert additional dict entries (the Distiller way)
-            \str_if_eq:eeF{\l_tmpa_tl}{}{
-              product~(Distiller)~search~{pop~pop~pop~\l_tmpa_tl}{pop}ifelse~
-            }
-          /BP~pdfmark~grestore~
-          % content transformations required for appearances, cf. BBox
-          { % orientations above
-            pbs@curx~pbs@cury~2~copy~translate~1~
-            -1~scale~                                % upside-down (mirrored)
+                  % portrait                       x----------+
+                  0~\l_pbs_height_tl~  % llx lly   |          |
+                  \l_pbs_width_tl~     % urx       o----------+
+                  \l_pbs_depth_tl~neg  % ury       |          |
+                } ifelse               %           |          |
+              ]                        %           +----------+
+              %insert additional dict entries (the Distiller way)
+              \str_if_eq:eeF{\l_tmpa_tl}{}{
+                product~(Distiller)~search~{pop~pop~pop~\l_tmpa_tl}{pop}ifelse~
+              }
+            /BP~pdfmark~
+            % content transformations required for appearances, cf. BBox
+            % orientations above
+            1~-1~scale~                              % upside-down (mirrored)
             isls {90~landplus90 {neg} if~rotate} if~ % rotated
-            neg~exch~neg~exch~translate
+            %finally, move the graphic's ref point (still on the stack) to (0,0)
+            exch~neg~exch~neg~translate
           }?pdfmark
         }
         \box_set_wd:Nn#5{\c_zero_dim}
@@ -1522,8 +1515,8 @@
 
 \RequirePackage{l3keys2e}
 
-\def\g@pbs@date@tl{2021/07/29}
-\def\g@pbs@version@tl{0.50}
+\def\g@pbs@date@tl{2021/08/13}
+\def\g@pbs@version@tl{0.51}
 
 \NeedsTeXFormat{LaTeX2e}[2020-10-01]
 \ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl}
@@ -2385,7 +2378,7 @@
         output.
       }
 
-      \cs_new_protected_nopar:Nn\pbs_pdfxform:nnnnn{% #1, #3 not used
+      \cs_new_protected_nopar:Nn\pbs_pdfxform:nnnnn{% #1, #3 not used as
         \mode_leave_vertical:        % resources are managed automatically
         %rescale box to fit within the papersize while distilling
         \tl_gset:cx{scale_{pbs@obj\int_use:N\g_pbs_obj_int}}{\fp_eval:n{min(1.0,
@@ -2413,66 +2406,59 @@
         %additional dict entries
         \tl_set:Nx\l_tmpa_tl{#4} \tl_trim_spaces:N\l_tmpa_tl
         \pbs_special:n{
-          gsave~
-          currentpoint~/pbs@cury~exch~def~/pbs@curx~exch~def~
           %translate graphics to upper left page corner, so we have the whole
           %clipbox (i. e. page area) available for distilling; outlying parts
           %get clipped
           {
+            gsave~currentpoint~ % put graphic's ref point coords on the stack
             initclip~ % restore default clipping path (page device/whole page)
-            clippath~pathbbox~newpath~pop~pop~ % top-left coordinates
+            clippath~pathbbox~newpath~pop~pop~ %page device top-left coordinates
             isls {
               landplus90 {
                 % pkg geometry with landscape option
-                exch~pbs@curx~sub~\l_pbs_height_tl~add~
-                exch~pbs@cury~sub
+                exch~\l_pbs_height_tl~add~exch
               }{
                 % landscape as class option
-                exch~pbs@curx~sub~\l_pbs_depth_tl~add~
-                exch~pbs@cury~sub~\l_pbs_width_tl~add
+                exch~\l_pbs_depth_tl~add~
+                exch~\l_pbs_width_tl~add
               } ifelse
             }{
               % portrait
-              exch~pbs@curx~sub~
-              exch~pbs@cury~sub~\l_pbs_depth_tl~add
-            } ifelse~translate
-          }?pdfmark~
-          %move origin (0,0) to the current position
-          gsave~pbs@curx~pbs@cury~translate~
-          %distill graphics to XObject
-          mark~
-            /_objdef~{pbs@obj\int_use:N\g_pbs_obj_int}~
-            /BBox~[ % rotated BBoxes; o = reference point = origin (0,0),
-              isls { % x = top-left page corner, vert. coord downwards positive
-                landplus90 {            %        x----o-+
-                  % geometry with landscape      |    | |
-                  \l_pbs_height_tl~neg~ % llx    |    | |
-                  \l_pbs_width_tl~      % lly    |    | |
-                  \l_pbs_depth_tl~0 % urx ury    +----+-+
+              \l_pbs_depth_tl~add
+            } ifelse~translate~ % move origin (0,0) to page location as shown
+            mark~ % distill graphics to XObject                          below
+              /_objdef~{pbs@obj\int_use:N\g_pbs_obj_int}~
+              /BBox~[  % rotated BBoxes; o = origin (0,0), x = top-left page
+                isls { % corner, vert. coord downwards positive
+                  landplus90 {            %        x----o-+
+                    % geometry with landscape      |    | |
+                    \l_pbs_height_tl~neg~ % llx    |    | |
+                    \l_pbs_width_tl~      % lly    |    | |
+                    \l_pbs_depth_tl~0 % urx ury    +----+-+
+                  }{
+                    % landscape as class option        x-+----+
+                    \l_pbs_depth_tl~neg~0~ % llx lly   | |    |
+                    \l_pbs_height_tl~      % urx       | |    |
+                    \l_pbs_width_tl~neg    % ury       | |    |
+                  } ifelse                 %           +-o----+
                 }{
-                  % landscape as class option        x-+----+
-                  \l_pbs_depth_tl~neg~0~ % llx lly   | |    |
-                  \l_pbs_height_tl~      % urx       | |    |
-                  \l_pbs_width_tl~neg    % ury       | |    |
-                } ifelse                 %           +-o----+
-              }{
-                % portrait                       x----------+
-                0~\l_pbs_height_tl~  % llx lly   |          |
-                \l_pbs_width_tl~     % urx       o----------+
-                \l_pbs_depth_tl~neg  % ury       |          |
-              } ifelse               %           |          |
-            ]                        %           +----------+
-            %insert additional dict entries (the Distiller way)
-            \str_if_eq:eeF{\l_tmpa_tl}{}{
-              product~(Distiller)~search~{pop~pop~pop~\l_tmpa_tl}{pop}ifelse~
-            }
-          /BP~pdfmark~grestore~
-          % content transformations required for appearances, cf. BBox
-          { % orientations above
-            pbs@curx~pbs@cury~2~copy~translate~1~
-            -1~scale~                                % upside-down (mirrored)
+                  % portrait                       x----------+
+                  0~\l_pbs_height_tl~  % llx lly   |          |
+                  \l_pbs_width_tl~     % urx       o----------+
+                  \l_pbs_depth_tl~neg  % ury       |          |
+                } ifelse               %           |          |
+              ]                        %           +----------+
+              %insert additional dict entries (the Distiller way)
+              \str_if_eq:eeF{\l_tmpa_tl}{}{
+                product~(Distiller)~search~{pop~pop~pop~\l_tmpa_tl}{pop}ifelse~
+              }
+            /BP~pdfmark~
+            % content transformations required for appearances, cf. BBox
+            % orientations above
+            1~-1~scale~                              % upside-down (mirrored)
             isls {90~landplus90 {neg} if~rotate} if~ % rotated
-            neg~exch~neg~exch~translate
+            %finally, move the graphic's ref point (still on the stack) to (0,0)
+            exch~neg~exch~neg~translate
           }?pdfmark
         }
         \box_set_wd:Nn#5{\c_zero_dim}