summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/beamer/CHANGELOG.md26
-rw-r--r--macros/latex/contrib/beamer/base/beamer.cls11
-rw-r--r--macros/latex/contrib/beamer/base/beamerarticle.sty2
-rw-r--r--macros/latex/contrib/beamer/base/beamerbaseauxtemplates.sty18
-rw-r--r--macros/latex/contrib/beamer/base/beamerbaseboxes.sty3
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasecompatibility.sty17
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasefont.sty2
-rw-r--r--macros/latex/contrib/beamer/base/beamerbaseframecomponents.sty6
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasenotes.sty7
-rw-r--r--macros/latex/contrib/beamer/base/beamerbasetoc.sty2
-rw-r--r--macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothbars.sty70
-rw-r--r--macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothtree.sty69
-rw-r--r--macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdfbin324864 -> 343839 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdfbin531884 -> 547580 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdfbin425313 -> 441722 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-animations.tex9
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-color.tex1
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-compatibility.tex29
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-elements.tex3
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-emulation.tex1
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-fonts.tex3
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-frames.tex10
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-globalstructure.tex136
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-graphics.tex1
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-guidelines.tex1
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-installation.tex36
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-interaction.tex25
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-introduction.tex5
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-license.tex1
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-localstructure.tex1
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-macros.tex1
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-nonpresentation.tex18
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-notes.tex16
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-overlays.tex1
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-solutions.tex1
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-themes.tex1
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-transparencies.tex1
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-tricks.tex1
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-tutorial.tex1
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-twoscreens.tex1
-rw-r--r--macros/latex/contrib/beamer/doc/beamerug-workflow.tex15
-rw-r--r--macros/latex/contrib/beamer/doc/beameruserguide.pdfbin1840486 -> 2251200 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/beameruserguide.tex4
-rw-r--r--macros/latex/contrib/beamer/doc/emulation-examples/beamerexample-foils.tex4
-rw-r--r--macros/latex/contrib/beamer/doc/emulation-examples/beamerexample-prosper.tex5
-rw-r--r--macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic1.jpgbin36833 -> 861 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic2.jpgbin4290 -> 1634 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic3.jpgbin40020 -> 471 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic4.jpgbin27790 -> 613 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic5.jpgbin49011 -> 435 bytes
-rw-r--r--macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic6.jpgbin27779 -> 1244 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx145
-rw-r--r--macros/latex/contrib/easybook/easybook.pdfbin577839 -> 579388 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.tex31
-rw-r--r--macros/latex/contrib/media4svg/ChangeLog5
-rw-r--r--macros/latex/contrib/media4svg/README.md2
-rw-r--r--macros/latex/contrib/media4svg/example/beamer-example-1.svg134
-rw-r--r--macros/latex/contrib/media4svg/example/beamer-example-2.svg86
-rw-r--r--macros/latex/contrib/media4svg/example/beamer-example-3.svg80
-rw-r--r--macros/latex/contrib/media4svg/example/beamer-example-4.svg244
-rw-r--r--macros/latex/contrib/media4svg/example/beamer-example.tex28
-rw-r--r--macros/latex/contrib/media4svg/media4svg.sty19
-rw-r--r--macros/latex/contrib/univie-ling/README7
-rw-r--r--macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx19
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdfbin454611 -> 454894 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex3
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdfbin449239 -> 449280 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex3
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdfbin452978 -> 452989 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex3
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdfbin340523 -> 340662 bytes
-rw-r--r--macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex3
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls2
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls2
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls2
-rw-r--r--macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls7
-rw-r--r--macros/latex/required/babel/base/README.md20
-rw-r--r--macros/latex/required/babel/base/babel.dtx205
-rw-r--r--macros/latex/required/babel/base/babel.ins2
-rw-r--r--macros/latex/required/babel/base/babel.pdfbin847060 -> 847722 bytes
-rw-r--r--macros/latex/required/babel/base/bbcompat.dtx2
81 files changed, 885 insertions, 734 deletions
diff --git a/macros/latex/contrib/beamer/CHANGELOG.md b/macros/latex/contrib/beamer/CHANGELOG.md
index 72e7a2204e..35d499eb0b 100644
--- a/macros/latex/contrib/beamer/CHANGELOG.md
+++ b/macros/latex/contrib/beamer/CHANGELOG.md
@@ -8,6 +8,29 @@ a major and minor version only.
## [Unreleased]
+## [v3.64]
+
+### Added
+
+- new continuation count template "singleframecheck" which will only show the continuation count if a break actually occurs (see #423)
+- new templated for lined note pages (#704)
+
+### Changed
+
+- added `aspectratio=2013` class option setting the frames' aspect ratio to 20:13 (see #497)
+- Remove redefinition of `\addtocontents` (see #698)
+- patched macros from the `pdfpages` package to automaticlly remove the frame background for the included pages
+- transparent shadows for smoothbars outer theme (see #717)
+- transparent shadows for smoothtree outer theme (see #720)
+- added new beamer option "show only slides with notes", the old class option "notes=onlyslideswithnotes" now gives an obsolete warning like all the other note options (see #724)
+- make footnotetext and footnoterule adapt to the current column with (see #713)
+- using `mathversion{sf}` for the kpfonts package (fix #711)
+
+### Fixed
+
+- solved font-dependant problem with shadow boxes (partial fix for #647)
+- adding hook rule for polyglossia to compensate for the different execution order of the new hook system (see #706)
+
## [v3.63]
### Changed
@@ -142,7 +165,8 @@ a major and minor version only.
- Support for `noxcolor` with `beamerarticle` (see #483)
- Treatment of mixed overlay/alert specifications
-[Unreleased]: https://github.com/josephwright/beamer/compare/v3.63...HEAD
+[Unreleased]: https://github.com/josephwright/beamer/compare/v3.64...HEAD
+[v3.64]: https://github.com/josephwright/beamer/compare/v3.63...v3.64
[v3.63]: https://github.com/josephwright/beamer/compare/v3.62...v3.63
[v3.62]: https://github.com/josephwright/beamer/compare/v3.61...v3.62
[v3.61]: https://github.com/josephwright/beamer/compare/v3.60...v3.61
diff --git a/macros/latex/contrib/beamer/base/beamer.cls b/macros/latex/contrib/beamer/base/beamer.cls
index 135969d997..ed9def1156 100644
--- a/macros/latex/contrib/beamer/base/beamer.cls
+++ b/macros/latex/contrib/beamer/base/beamer.cls
@@ -12,7 +12,7 @@
% See the file doc/licenses/LICENSE for more details.
\ProvidesClass{beamer}
- [2021/05/26 v3.63 A class for typesetting presentations]
+ [2021/10/18 v3.64 A class for typesetting presentations]
% Setup modes and check for article option
% Also loads packages required by both beamer and beamerarticle
@@ -188,6 +188,8 @@
\nofiles
}
\def\beamer@notesaction@onlyslideswithnotes{%
+ \ClassWarning{beamer}{This option is obsolete. Use beamer option
+ ``show only slides with notes'' instead.}%
\beamer@notestrue
\beamer@frameswithnotesonlytrue
\nofiles
@@ -296,7 +298,10 @@
\setlength\beamer@paperheight{9.60cm}
\DeclareOptionBeamer{aspectratio}[43]{%
- \ifnum#1=1610 %
+ \ifnum#1=2013 %
+ \setlength\beamer@paperwidth{14.00cm}%
+ \setlength\beamer@paperheight{9.10cm}%
+ \else\ifnum#1=1610 %
\setlength\beamer@paperwidth{16.00cm}%
\setlength\beamer@paperheight{10.00cm}%
\else\ifnum#1=169 %
@@ -317,7 +322,7 @@
\else\ifnum#1=141 %
\setlength\beamer@paperwidth{14.85cm}%
\setlength\beamer@paperheight{10.50cm}%
- \fi\fi\fi\fi\fi\fi\fi
+ \fi\fi\fi\fi\fi\fi\fi\fi
}
\RequirePackage[%
diff --git a/macros/latex/contrib/beamer/base/beamerarticle.sty b/macros/latex/contrib/beamer/base/beamerarticle.sty
index 195e49a0e3..e58341d73e 100644
--- a/macros/latex/contrib/beamer/base/beamerarticle.sty
+++ b/macros/latex/contrib/beamer/base/beamerarticle.sty
@@ -12,7 +12,7 @@
% See the file doc/licenses/LICENSE for more details.
\ProvidesPackage{beamerarticle}
- [2021/05/26 v3.63 beamer input in article mode]
+ [2021/10/18 v3.64 beamer input in article mode]
% Setup modes and check for article option
% Also loads packages required by both beamer and beamerarticle
diff --git a/macros/latex/contrib/beamer/base/beamerbaseauxtemplates.sty b/macros/latex/contrib/beamer/base/beamerbaseauxtemplates.sty
index 28cfebc886..c77970cd31 100644
--- a/macros/latex/contrib/beamer/base/beamerbaseauxtemplates.sty
+++ b/macros/latex/contrib/beamer/base/beamerbaseauxtemplates.sty
@@ -536,9 +536,11 @@
\defbeamertemplate{frametitle continuation}{from second}[1][\insertcontinuationtext]
{\expandafter\ifnum\insertcontinuationcount>1\relax#1\fi}
-
-
-
+\defbeamertemplate{frametitle continuation}{singleframecheck}[1][\insertcontinuationcountroman]{%
+ \ifnum \numexpr\beamer@endpageofframe+1-\beamer@startpageofframe\relax > 1
+ #1
+ \fi%
+}
% Bibliography items
@@ -809,7 +811,15 @@
\insertnote
}
-
+\defbeamertemplate{note page}{lined}[1][6]{%
+ \vfill%
+ \beamer@tempcount=1%
+ \loop%
+ \hrulefill\vfill%
+ \advance\beamer@tempcount by 1%
+ \ifnum\beamer@tempcount<#1%
+ \repeat%
+}
%
% Theorem templates
diff --git a/macros/latex/contrib/beamer/base/beamerbaseboxes.sty b/macros/latex/contrib/beamer/base/beamerbaseboxes.sty
index 8124dc318c..fa40600490 100644
--- a/macros/latex/contrib/beamer/base/beamerbaseboxes.sty
+++ b/macros/latex/contrib/beamer/base/beamerbaseboxes.sty
@@ -167,7 +167,8 @@
\pgfpathrectangle{\pgfpoint{4bp}{8bp}}{\pgfpoint{\bmb@boxwidth-0.2bp}{\bmb@boxheight-2bp}}
\pgfusepath{fill}
\end{pgfscope}
- \end{pgfpicture}
+ \end{pgfpicture}%
+ \hskip4bp%
}%
\fi%
\bmb@temp=\bmb@width%
diff --git a/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty b/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty
index 17ac0b45f0..02abbad55a 100644
--- a/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty
+++ b/macros/latex/contrib/beamer/base/beamerbasecompatibility.sty
@@ -57,6 +57,13 @@
\AddToHook{env/document/begin}[beamer]{\beamer@firstminutepatches}%
\AddToHook{env/document/begin}[beamer]{%
\@ifpackageloaded{paralist}{\RequirePackage{beamerpatchparalist}}{}%
+ \@ifpackageloaded{pdfpages}{%
+ % Patching pdfpages package to avoid the included pages from being covered by the background canvas
+ \AddToHook{cmd/includepdf/before}[beamer]{\begingroup\setbeamercolor{background canvas}{bg=}}%
+ \AddToHook{cmd/includepdf/after}[beamer]{\endgroup}%
+ \AddToHook{cmd/includepdfmerge/before}[beamer]{\begingroup\setbeamercolor{background canvas}{bg=}}%
+ \AddToHook{cmd/includepdfmerge/after}[beamer]{\endgroup}%
+ }{}%
}%
\AddToHook{begindocument/end}[beamer]%need to be later than spanish.ldf?
{%
@@ -70,7 +77,7 @@
\ifbeamer@ignorenonframe
\expandafter\mode\expandafter*%
\fi
- }
+ }%
}
{%
\let\beamer@origdocument\document
@@ -234,6 +241,14 @@
\providecommand\ext@figure{}
%
+% Fix for polyglossia
+% https://github.com/josephwright/beamer/issues/706
+%
+\IfFormatAtLeastTF{2020-10-01}{%
+ \DeclareHookRule{begindocument/end}{beamer}{after}{polyglossia}%
+}{}
+
+%
% Obsolete commands from old versions of beamer
%
\mode
diff --git a/macros/latex/contrib/beamer/base/beamerbasefont.sty b/macros/latex/contrib/beamer/base/beamerbasefont.sty
index 01fdd9b6bb..0a82f35c35 100644
--- a/macros/latex/contrib/beamer/base/beamerbasefont.sty
+++ b/macros/latex/contrib/beamer/base/beamerbasefont.sty
@@ -188,7 +188,7 @@
% supress for mathtime serif and math minion serif
\@ifpackageloaded{arevmath}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}%
\@ifpackageloaded{hvmath}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}%
- \@ifpackageloaded{kpfonts}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}%
+ \@ifpackageloaded{kpfonts}{\ifbeamer@sansmath\mathversion{sf}\else\beamer@suppressreplacementstrue\fi}{}%
\@ifpackageloaded{lucidabr}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}%
\@ifpackageloaded{lmodern}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}%
\@ifpackageloaded{lucimatx}{\ifbeamer@sansmath\else\beamer@suppressreplacementstrue\fi}{}%
diff --git a/macros/latex/contrib/beamer/base/beamerbaseframecomponents.sty b/macros/latex/contrib/beamer/base/beamerbaseframecomponents.sty
index 66f6e5314c..d4437e81fe 100644
--- a/macros/latex/contrib/beamer/base/beamerbaseframecomponents.sty
+++ b/macros/latex/contrib/beamer/base/beamerbaseframecomponents.sty
@@ -315,7 +315,7 @@
\global\setbox\@mpfootins\vbox{%
\unvbox\@mpfootins
\reset@font\footnotesize
- \hsize0.85\paperwidth
+ \hsize\columnwidth
\@parboxrestore
\protected@edef\@currentlabel
{\csname p@mpfootnote\endcsname\@thefnmark}%
@@ -356,6 +356,10 @@
\@footnotemark\beamer@footnotetext#2}%
\fi%
\beamer@next}
+
+\renewcommand{\footnoterule}{%
+ \kern -3\p@ \hrule width .4\columnwidth \kern 2.6\p@%
+}
\mode
<article>
diff --git a/macros/latex/contrib/beamer/base/beamerbasenotes.sty b/macros/latex/contrib/beamer/base/beamerbasenotes.sty
index 736d9f950b..c8f611e8c6 100644
--- a/macros/latex/contrib/beamer/base/beamerbasenotes.sty
+++ b/macros/latex/contrib/beamer/base/beamerbasenotes.sty
@@ -50,7 +50,12 @@
\nofiles
}
-
+\defbeameroption{show only slides with notes}[]%
+{
+ \beamer@notestrue
+ \beamer@frameswithnotesonlytrue
+ \nofiles
+}
%
% Notes
diff --git a/macros/latex/contrib/beamer/base/beamerbasetoc.sty b/macros/latex/contrib/beamer/base/beamerbasetoc.sty
index 0ea5318a59..6b003e80e3 100644
--- a/macros/latex/contrib/beamer/base/beamerbasetoc.sty
+++ b/macros/latex/contrib/beamer/base/beamerbasetoc.sty
@@ -91,8 +91,6 @@
\vfill}%
}
-\renewcommand\addcontentsline[3]{\addtocontents{#1}{\protect\contentsline{#2}{#3}}}
-
\def\beamer@tocaction@show#1{\usebeamertemplate**{#1}}
\def\beamer@tocaction@shaded#1{\usebeamertemplate**{#1 shaded}}
\def\beamer@tocaction@hide#1{}
diff --git a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothbars.sty b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothbars.sty
index 0a68ff0598..385ad307eb 100644
--- a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothbars.sty
+++ b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothbars.sty
@@ -35,22 +35,19 @@
\ifbeamer@sb@subsection
\pgfdeclareverticalshading{beamer@barshade}{\the\paperwidth}{%
- color(0ex)=(global.bg);%
- color(1ex)=(subsection in head/foot.bg);%
- color(3.25ex)=(subsection in head/foot.bg);%
- color(4.25ex)=(section in head/foot.bg);%
- color(9.75ex)=(section in head/foot.bg)%
+ color(0ex)=(subsection in head/foot.bg);%
+ color(2.25ex)=(subsection in head/foot.bg);%
+ color(3.25ex)=(section in head/foot.bg);%
+ color(8.75ex)=(section in head/foot.bg)%
}
\pgfdeclareverticalshading{beamer@aboveframetitle}{\the\paperwidth}{%
color(0ex)=(frametitle.bg);%
- color(1ex)=(frametitle.bg);%
- color(2ex)=(subsection in head/foot.bg)
+ color(1ex)=(subsection in head/foot.bg)
}
\else
\pgfdeclareverticalshading{beamer@barshade}{\the\paperwidth}{%
- color(0ex)=(global.bg);%
- color(1ex)=(section in head/foot.bg);%
- color(7ex)=(section in head/foot.bg)%
+ color(0ex)=(section in head/foot.bg);%
+ color(6ex)=(section in head/foot.bg)%
}
\pgfdeclareverticalshading{beamer@aboveframetitle}{\the\paperwidth}{%
color(0ex)=(frametitle.bg);%
@@ -58,11 +55,15 @@
color(2ex)=(section in head/foot.bg)
}
\fi
-
- \pgfdeclareverticalshading{beamer@belowframetitle}{\the\paperwidth}{%
- color(0ex)=(global.bg);%
- color(1ex)=(frametitle.bg)
- }
+
+ \begingroup
+ \selectcolormodel{gray}
+ \pgfdeclareverticalshading{beamer@belowframetitle}{\the\paperwidth}{%
+ color(0ex)=(pgftransparent!100);%
+ color(1ex)=(pgftransparent!0)
+ }
+ \pgfdeclarefading{beamer@belowframetitlemask}{\pgfuseshading{beamer@belowframetitle}}
+ \endgroup
}
}
@@ -70,10 +71,25 @@
\defbeamertemplate*{headline}{smoothbars theme}
{%
\pgfuseshading{beamer@barshade}%
+ \vskip-0.05ex%
+ \begin{beamercolorbox}[wd=\paperwidth,ht=1ex,dp=0ex]{empty}
+ \begin{pgfpicture}
+ \begin{pgfscope}%
+ \ifbeamer@sb@subsection%
+ \pgfsetfillcolor{subsection in head/foot.bg}%
+ \else%
+ \pgfsetfillcolor{section in head/foot.bg}%
+ \fi%
+ \pgfpathrectangle{\pgfpoint{-.5\paperwidth}{-0.5ex}}{\pgfpoint{\paperwidth}{1ex}}%
+ \pgfsetfading{beamer@belowframetitlemask}{}%
+ \pgfusepath{fill}%
+ \end{pgfscope}%
+ \end{pgfpicture}%
+ \end{beamercolorbox}%
\ifbeamer@sb@subsection%
\vskip-9.75ex%
\else%
- \vskip-7ex%
+ \vskip-6.85ex%
\fi%
\begin{beamercolorbox}[ignorebg,ht=2.25ex,dp=3.75ex]{section in head/foot}
\insertnavigation{\paperwidth}
@@ -90,13 +106,15 @@
\defbeamertemplate*{frametitle}{smoothbars theme}
{%
\nointerlineskip%
+ \vskip-0.19ex%
\usebeamerfont{headline}%
- \begin{beamercolorbox}[wd=\paperwidth,ht=1.5ex,dp=0ex,vmode]{empty}
+ \begin{beamercolorbox}[wd=\paperwidth,ht=1ex,dp=1ex,vmode]{empty}
\pgfuseshading{beamer@aboveframetitle}%
\end{beamercolorbox}%
- \vskip-.5ex%
+ \vskip-1ex%
\nointerlineskip%
\begin{beamercolorbox}[wd=\paperwidth,leftskip=.3cm,rightskip=.3cm plus1fil,vmode]{frametitle}
+ \vskip0.5ex%
\usebeamerfont*{frametitle}\strut\insertframetitle%
\ifx\insertframesubtitle\@empty%
\strut\par%
@@ -104,11 +122,19 @@
\par{\usebeamerfont*{framesubtitle}{\usebeamercolor[fg]{framesubtitle}\strut\insertframesubtitle}\strut\par}%
\fi%%
\usebeamerfont{headline}%
- \vskip.5ex
+ \vskip0.05ex%
\end{beamercolorbox}%
- \nointerlineskip
- \begin{beamercolorbox}[wd=\paperwidth,ht=.5ex,dp=0ex]{empty}
- \pgfuseshading{beamer@belowframetitle}%
+ \nointerlineskip%
+ \vskip-0.05ex%
+ \begin{beamercolorbox}[wd=\paperwidth,ht=1ex,dp=0ex]{empty}
+ \begin{pgfpicture}
+ \begin{pgfscope}%
+ \pgfsetfillcolor{frametitle.bg}%
+ \pgfpathrectangle{\pgfpoint{-.5\paperwidth}{-.5ex}}{\pgfpoint{\paperwidth}{1ex}}%
+ \pgfsetfading{beamer@belowframetitlemask}{}%
+ \pgfusepath{fill}%
+ \end{pgfscope}%
+ \end{pgfpicture}%
\end{beamercolorbox}%
}
diff --git a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothtree.sty b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothtree.sty
index 6af2e39505..fc6c9937de 100644
--- a/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothtree.sty
+++ b/macros/latex/contrib/beamer/base/themes/outer/beamerouterthemesmoothtree.sty
@@ -23,33 +23,47 @@
\usebeamercolor{frametitle}
\pgfdeclareverticalshading{beamer@treeshade}{\the\paperwidth}{%
- color(0ex)=(normal text.bg);%
- color(1ex)=(subsection in head/foot.bg);%
- color(3.25ex)=(subsection in head/foot.bg);%
- color(4.25ex)=(section in head/foot.bg);%
- color(6.5ex)=(section in head/foot.bg);%
- color(7.5ex)=(title in head/foot.bg);%
- color(10.25ex)=(title in head/foot.bg)%
+ color(0ex)=(subsection in head/foot.bg);%
+ color(2.25ex)=(subsection in head/foot.bg);%
+ color(3.25ex)=(section in head/foot.bg);%
+ color(5.5ex)=(section in head/foot.bg);%
+ color(6.5ex)=(title in head/foot.bg);%
+ color(9.25ex)=(title in head/foot.bg)%
}
\pgfdeclareverticalshading{beamer@aboveframetitle}{\the\paperwidth}{%
color(0ex)=(frametitle.bg);%
- color(1ex)=(frametitle.bg);%
- color(2ex)=(subsection in head/foot.bg)
- }
-
- \pgfdeclareverticalshading{beamer@belowframetitle}{\the\paperwidth}{%
- color(0ex)=(normal text.bg);%
- color(1ex)=(frametitle.bg)
+ color(1ex)=(subsection in head/foot.bg)
}
+
+ \begingroup
+ \selectcolormodel{gray}
+ \pgfdeclareverticalshading{beamer@belowframetitle}{\the\paperwidth}{%
+ color(0ex)=(pgftransparent!100);%
+ color(1ex)=(pgftransparent!0)
+ }
+ \pgfdeclarefading{beamer@belowframetitlemask}{\pgfuseshading{beamer@belowframetitle}}
+ \endgroup
+
}
}
\defbeamertemplate*{headline}{smoothtree theme}
{%
\pgfuseshading{beamer@treeshade}%
- \vskip-10.25ex%
- \begin{beamercolorbox}[wd=\paperwidth,ht=2.125ex,dp=1.125ex,ignorebg,%
+ \vskip-0.05ex%
+ \begin{beamercolorbox}[wd=\paperwidth,ht=1ex,dp=0ex]{empty}
+ \begin{pgfpicture}
+ \begin{pgfscope}%
+ \pgfsetfillcolor{subsection in head/foot.bg}%
+ \pgfpathrectangle{\pgfpoint{-.5\paperwidth}{-0.5ex}}{\pgfpoint{\paperwidth}{1ex}}%
+ \pgfsetfading{beamer@belowframetitlemask}{}%
+ \pgfusepath{fill}%
+ \end{pgfscope}%
+ \end{pgfpicture}%
+ \end{beamercolorbox}%
+ \vskip-9.15ex%
+ \begin{beamercolorbox}[wd=\paperwidth,ht=1.125ex,dp=1.125ex,ignorebg,%
leftskip=.3cm,rightskip=.3cm plus1fil]{title in head/foot}
\usebeamerfont{title in head/foot}\insertshorttitle
\end{beamercolorbox}
@@ -63,18 +77,20 @@
\usebeamerfont{subsection in head/foot}%
\hskip12pt\insertsubsectionhead
\end{beamercolorbox}
+ \vskip-0.4ex%
}
\defbeamertemplate*{frametitle}{smoothtree theme}
{%
\nointerlineskip%
+ \vskip-0.05ex%
\usebeamerfont{headline}%
- \begin{beamercolorbox}[wd=\paperwidth,ht=1.5ex,dp=0ex]{empty}
+ \begin{beamercolorbox}[wd=\paperwidth,ht=0.85ex,dp=0ex]{empty}
\pgfuseshading{beamer@aboveframetitle}%
- \end{beamercolorbox}%
- \vskip-.5ex%
+ \end{beamercolorbox}
\nointerlineskip%
\begin{beamercolorbox}[wd=\paperwidth,leftskip=.935cm,rightskip=.3cm plus1fil]{frametitle}
+ \vskip-1.2ex%
\usebeamerfont*{frametitle}\strut\insertframetitle%
\ifx\insertframesubtitle\@empty%
\strut\par%
@@ -82,12 +98,19 @@
\par{\usebeamerfont*{framesubtitle}{\usebeamercolor[fg]{framesubtitle}\strut\insertframesubtitle}\strut\par}%
\fi%%
\usebeamerfont{headline}%
- \vskip.5ex
\end{beamercolorbox}%
\nointerlineskip
- \begin{beamercolorbox}[wd=\paperwidth,ht=.5ex,dp=0ex]{empty}
- \pgfuseshading{beamer@belowframetitle}%
- \end{beamercolorbox}%
+ \vskip-0.2ex%
+ \begin{beamercolorbox}[wd=\paperwidth,ht=1ex,dp=0ex]{empty}
+ \begin{pgfpicture}
+ \begin{pgfscope}%
+ \pgfsetfillcolor{frametitle.bg}%
+ \pgfpathrectangle{\pgfpoint{-.5\paperwidth}{-0.5ex}}{\pgfpoint{\paperwidth}{1ex}}%
+ \pgfsetfading{beamer@belowframetitlemask}{}%
+ \pgfusepath{fill}%
+ \end{pgfscope}%
+ \end{pgfpicture}%
+ \end{beamercolorbox}%
}
diff --git a/macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdf b/macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdf
index 8ee04e39a8..09da4c74c6 100644
--- a/macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdf
+++ b/macros/latex/contrib/beamer/doc/beamerexample-conference-talk.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdf b/macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdf
index 69bf38c2bf..95425d5d64 100644
--- a/macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdf
+++ b/macros/latex/contrib/beamer/doc/beamerexample-lecture-beamer-version.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdf b/macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdf
index 427b268ee3..caadeb41cc 100644
--- a/macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdf
+++ b/macros/latex/contrib/beamer/doc/beamerexample-lecture-print-version.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/beamerug-animations.tex b/macros/latex/contrib/beamer/doc/beamerug-animations.tex
index 7aa470883a..7d3a6df962 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-animations.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-animations.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2012,2013,2015 by Vedran Mileti\'c, Joseph Wright
@@ -406,11 +407,13 @@ Since there is no direct way of stopping the playback of a sound, the following
There are a number of commands that can be used to specify what effect should be used when the current slide is presented. Consider the following example:
\begin{verbatim}
-\frame{\pgfuseimage{youngboy}}
-\frame{
+\begin{frame}
+ \pgfuseimage{youngboy}
+\end{frame}
+\begin{frame}
\transdissolve
\pgfuseimage{man}
-}
+\end{frame}
\end{verbatim}
The command |\transdissolve| causes the slide of the second frame to be shown in a ``dissolved way.'' Note that the dissolving is a property of the second frame, not of the first one. We could have placed the command anywhere on the frame.
diff --git a/macros/latex/contrib/beamer/doc/beamerug-color.tex b/macros/latex/contrib/beamer/doc/beamerug-color.tex
index 2413c38967..8bb86f25c9 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-color.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-color.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2012,2013,2015 by Vedran Mileti\'c, Joseph Wright
diff --git a/macros/latex/contrib/beamer/doc/beamerug-compatibility.tex b/macros/latex/contrib/beamer/doc/beamerug-compatibility.tex
index 535562600f..82cf4a002a 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-compatibility.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-compatibility.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2012,2015 by Vedran Mileti\'c, Joseph Wright
@@ -178,31 +179,9 @@ When using certain packages or classes together with the |beamer| class, extra o
\end{package}
\begin{package}{{pdfpages}}
- Commands like |\includepdf| only work \emph{outside} frames as they produce pages ``by themselves.'' You may also wish to say
-\begin{verbatim}
-\setbeamercolor{background canvas}{bg=}
-\end{verbatim}
- when you use such a command since the background (even a white background) will otherwise be printed over the image you try to include.
-
- \example
-\begin{verbatim}
-\begin{document}
-\begin{frame}
- \titlepage
-\end{frame}
-
-{
- \setbeamercolor{background canvas}{bg=}
- \includepdf{somepdfimages.pdf}
-}
-
-\begin{frame}
- A normal frame.
-\end{frame}
-\end{document}
-\end{verbatim}
-\end{package}
-
+ Commands like |\includepdf| only work \emph{outside} frames as they produce pages ``by themselves.''
+\end{package}
+
\begin{package}{{\normalfont\meta{professional font package}}}
\beamernote
If you use a professional font package, \beamer's internal redefinition of how variables are typeset may interfere with the font package's superior way of typesetting them. In this case, you should use the class option |professionalfonts| to suppress any font substitution. See Section~\ref{section-substition} for details.
diff --git a/macros/latex/contrib/beamer/doc/beamerug-elements.tex b/macros/latex/contrib/beamer/doc/beamerug-elements.tex
index cf05fe2a37..795ad42bdc 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-elements.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-elements.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2012,2014,2015 by Vedran Mileti\'c, Joseph Wright
@@ -415,7 +416,7 @@ Your answer is \usebeamertemplate*{answer}.
}
...
-\setbeamertemplate{background canvas}{myshading}{red!10}{blue!10}
+\setbeamertemplate{background canvas}[my shading]{red!10}{blue!10}
%% Defines the shading myshading right here. Subsequent calls to
%% \usebeamertemplate{background canvas} will yield
%% ``\pgfuseshading{myshading}''.
diff --git a/macros/latex/contrib/beamer/doc/beamerug-emulation.tex b/macros/latex/contrib/beamer/doc/beamerug-emulation.tex
index 0e2f6d551e..e0ab98f8c3 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-emulation.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-emulation.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2015 by Vedran Mileti\'c, Joseph Wright
diff --git a/macros/latex/contrib/beamer/doc/beamerug-fonts.tex b/macros/latex/contrib/beamer/doc/beamerug-fonts.tex
index a001e152d7..1d044cc6f2 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-fonts.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-fonts.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2015 by Vedran Mileti\'c, Joseph Wright
@@ -31,7 +32,7 @@ The following font themes only change certain font attributes, they do not choos
\end{fontthemeexample}
\begin{fontthemeexample*}{professionalfonts}
- This font theme does not really change any fonts. Rather, it \emph{suppresses} certain internal replacements performed by \beamer. If you use ``professional fonts'' (fonts that you buy and that come with a complete set of every symbol in all modes), you do not want \beamer\ to meddle with the fonts you use. \beamer\ normally replaces certain character glyphs in mathematical text by more appropriate versions. For example, \beamer\ will normally replace glyphs such that the italic characters from the main font are used for variables in mathematical text. If your professional font package takes care of this already, \beamer's meddling should be switched off. Note that \beamer's substitution is automatically turned off if one of the following packages is loaded: |arevmath|, |hvmath|, |kpfonts|, |lmodern|, |lucidabr|, |lucimatx|, |mathastext|, |mathpmnt|, |mathpple|, |mathtime|, |mtpro|, and |mtpro2|. It is also turned off when |unicode-math| is loaded for the use of Unicode math fonts. If your favorite professional font package is not among these, use the |professionalfonts| option (and write us an email, so that the package can be added).
+ This font theme does not really change any fonts. Rather, it \emph{suppresses} certain internal replacements performed by \beamer. If you use ``professional fonts'' (fonts that you buy and that come with a complete set of every symbol in all modes), you do not want \beamer\ to meddle with the fonts you use. \beamer\ normally replaces certain character glyphs in mathematical text by more appropriate versions. For example, \beamer\ will normally replace glyphs such that the italic characters from the main font are used for variables in mathematical text. If your professional font package takes care of this already, \beamer's meddling should be switched off. Note that \beamer's substitution is automatically turned off if one of the following packages is loaded: |arevmath|, |hvmath|, |kpfonts|, |lmodern|, |lucidabr|, |lucimatx|, |mathastext|, |mathpmnt|, |mathpple|, |mathtime|, |mtpro|, and |mtpro2|. It is also turned off when |unicode-math| is loaded for the use of Unicode math fonts. If your favorite professional font package is not among these, use the |professionalfonts| theme (and open an issue in our github bug tracker, so that the package can be added).
\end{fontthemeexample*}
\begin{fontthemeexample}[\oarg{options}]{serif}
diff --git a/macros/latex/contrib/beamer/doc/beamerug-frames.tex b/macros/latex/contrib/beamer/doc/beamerug-frames.tex
index b045c4b8fe..de4449ad7d 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-frames.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-frames.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2013,2015 by Vedran Mileti\'c, Joseph Wright
@@ -95,6 +96,9 @@ A presentation consists of a series of frames. Each frame consists of a series o
\itemoption{from second}{\oarg{text}}
Installs a template that inserts \meta{text} from the second page of a frame on. By default, the text inserted is |\insertcontinuationtext|, which in turn is |(cont.)| by default.
+
+ \itemoption{singleframecheck}{\oarg{text}}
+ Installs a template that inserts \meta{text} starting from the first page, but only if one or more frame breaks occur in the frame. By default, the text inserted is |\insertcontinuationcountroman|, which will show the continuation count as Roman number.
\end{templateoptions}
The following inserts are available:
\begin{templateinserts}
@@ -834,7 +838,7 @@ By clicking on the document title in a navigation bar (not all themes show it),
\subsubsection{The Navigation Symbols}
\label{section-navigation-symbols}
-Navigation symbols are small icons that are shown on every slide by default. The following symbols are shown:
+Navigation symbols are small icons that are shown on every slide in |beamer| mode by default. The following symbols are shown:
\begin{enumerate}
\item
A slide icon, which is depicted as a single rectangle. To the left and right of this symbol, a left and right arrow are shown.
@@ -1116,6 +1120,10 @@ The size of a frame is actually the ``paper size'' of a \beamer\ presentation, a
To change ``paper size'' and aspect ratio, you can use the following class options:
+\begin{classoption}{aspectratio=2013}
+ Sets aspect ratio to 20:13, and frame size to 140\,mm by 91\,mm.
+\end{classoption}
+
\begin{classoption}{aspectratio=1610}
Sets aspect ratio to 16:10, and frame size to 160\,mm by 100\,mm.
\end{classoption}
diff --git a/macros/latex/contrib/beamer/doc/beamerug-globalstructure.tex b/macros/latex/contrib/beamer/doc/beamerug-globalstructure.tex
index c76500d76f..175ec3ab15 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-globalstructure.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-globalstructure.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2012,2013,2015 by Vedran Mileti\'c, Joseph Wright
@@ -21,9 +22,9 @@ You can use the |\titlepage| command to insert a title page into a frame. By def
\begin{command}{\titlepage}
Inserts the text of a title page into the current frame.
\example
- |\frame{\titlepage}|
+ |\begin{frame}\titlepage\end{frame}|
\example
- |\frame[plain]{\titlepage}| for a titlepage that fills the whole frame.
+ |\begin{frame}[plain]\titlepage\end{frame}| for a titlepage that fills the whole frame.
\begin{element}{title page}\yes\yes\yes
This template is invoked when the |\titlepage| command is used.
@@ -51,7 +52,7 @@ For compatibility with other classes, in |article| mode the following command is
\begin{command}{\maketitle}
\beamernote
- If used inside a frame, it has the same effect as |\titlepage|. If used outside a frame, it has the same effect as |\frame{\titlepage}|; in other words, a frame is added if necessary.
+ If used inside a frame, it has the same effect as |\titlepage|. If used outside a frame, it has the same effect as |\begin{frame}\titlepage\end{frame}|; in other words, a frame is added if necessary.
\end{command}
Before you invoke the title page command, you must specify all elements you wish to be shown. This is done using the following commands:
@@ -214,17 +215,22 @@ In order to create a line break in the table of contents (usually not a good ide
\begin{verbatim}
\section{Summary}
- \frame{This frame is not shown in the navigation bar}
+ \begin{frame}
+ This frame is not shown in the navigation bar
+ \end{frame}
\subsection*{}
- \frame{This frame is shown in the navigation bar, but no subsection
- entry is shown.}
+ \begin{frame}
+ This frame is shown in the navigation bar, but no subsection entry is shown.
+ \end{frame}
\subsection*{A subsection}
- \frame{Normal frame, shown in navigation bar. The subsection name is
- also shown in the navigation bar, but not in the table of contents.}
+ \begin{frame}
+ Normal frame, shown in navigation bar. The subsection name is
+ also shown in the navigation bar, but not in the table of contents.
+ \end{frame}
\end{verbatim}
\end{command}
@@ -306,9 +312,13 @@ Often, you may want a certain type of frame to be shown directly after a section
\begin{verbatim}
\section{A section}
- \frame{\sectionpage}
+ \begin{frame}
+ \sectionpage
+ \end{frame}
- \frame{Some text.}
+ \begin{frame}
+ Some text.
+ \end{frame}
\end{verbatim}
\begin{element}{section page}\yes\no\no
@@ -371,36 +381,48 @@ To create a new part, use the |\part| command. All sections and subsections foll
\example
\begin{verbatim}
\begin{document}
- \frame{\titlepage}
+ \begin{frame}
+ \titlepage
+ \end{frame}
\section*{Outlines}
\subsection{Part I: Review of Previous Lecture}
- \frame{
+ \begin{frame}
\frametitle{Outline of Part I}
- \tableofcontents[part=1]}
+ \tableofcontents[part=1]
+ \end{frame}
\subsection{Part II: Today's Lecture}
- \frame{
+ \begin{frame}
\frametitle{Outline of Part II}
- \tableofcontents[part=2]}
+ \tableofcontents[part=2]
+ \end{frame}
\part{Review of Previous Lecture}
- \frame{\partpage}
+ \begin{frame}
+ \partpage
+ \end{frame}
\section[Previous Lecture]{Summary of the Previous Lecture}
\subsection{Topics}
- \frame{...}
+ \begin{frame}...\end{frame}
\subsection{Learning Objectives}
- \frame{...}
+ \begin{frame}...\end{frame}
\part{Today's Lecture}
- \frame{\partpage}
+ \begin{frame}
+ \partpage
+ \end{frame}
\section{Topic A}
- \frame{\tableofcontents[currentsection]}
+ \begin{frame}
+ \tableofcontents[currentsection]
+ \end{frame}
\subsection{Foo}
- \frame{...}
+ \begin{frame}...\end{frame}
\section{Topic B}
- \frame{\tableofcontents[currentsection]}
+ \begin{frame}
+ \tableofcontents[currentsection]
+ \end{frame}
\subsection{bar}
- \frame{...}
+ \begin{frame}...\end{frame}
\end{document}
\end{verbatim}
\end{command}
@@ -408,7 +430,7 @@ To create a new part, use the |\part| command. All sections and subsections foll
\begin{command}{\partpage}
Works like |\titlepage|, only that the current part, not the current presentation is ``advertised.''
\example
- |\frame{\partpage}|
+ |\begin{frame}\partpage\end{frame}|
\begin{element}{part page}\yes\no\no
This template is invoked when the |\partpage| command is used.
@@ -441,7 +463,11 @@ To create a new part, use the |\part| command. All sections and subsections foll
\example
\begin{verbatim}
-\AtBeginPart{\frame{\partpage}}
+\AtBeginPart{
+ \begin{frame}
+ \partpage
+ \end{frame}
+}
\end{verbatim}
\end{command}
@@ -495,7 +521,11 @@ By default, the |\lecture| command has no other effect. It does not create any f
\example
\begin{verbatim}
-\AtBeginLecture{\frame{\Large Today's Lecture: \insertlecture}}
+\AtBeginLecture{
+ \begin{frame}
+ \Large Today's Lecture: \insertlecture
+ \end{frame}
+}
\end{verbatim}
\articlenote
@@ -513,22 +543,28 @@ You can create a table of contents using the command |\tableofcontents|. Unlike
\example
\begin{verbatim}
\section*{Outline}
-\frame{\tableofcontents}
+\begin{frame}
+ \tableofcontents
+\end{frame}
\section{Introduction}
-\frame{\tableofcontents[currentsection]}
+\begin{frame}
+ \tableofcontents[currentsection]
+\end{frame}
\subsection{Why?}
-\frame{...}
-\frame{...}
+\begin{frame}...\end{frame}
+\begin{frame}...\end{frame}
\subsection{Where?}
-\frame{...}
+\begin{frame}...\end{frame}
\section{Results}
-\frame{\tableofcontents[currentsection]}
+\begin{frame}
+ \tableofcontents[currentsection]
+\end{frame}
\subsection{Because}
-\frame{...}
+\begin{frame}...\end{frame}
\subsection{Here}
-\frame{...}
+\begin{frame}...\end{frame}
\end{verbatim}
The following options can be given:
@@ -728,22 +764,38 @@ You can add an appendix to your talk by using the |\appendix| command. You shoul
\example
\begin{verbatim}
\begin{document}
-\frame{\titlepage}
+\begin{frame}
+ \titlepage
+\end{frame}
\section*{Outline}
-\frame{\tableofcontents}
+\begin{frame}
+ \tableofcontents
+\end{frame}
\section{Main Text}
-\frame{Some text}
+\begin{frame}
+ Some text
+\end{frame}
\section*{Summary}
-\frame{Summary text}
+\begin{frame}
+ Summary text
+\end{frame}
\appendix
\section{\appendixname}
-\frame{\tableofcontents}
+\begin{frame}
+ \tableofcontents
+\end{frame}
\subsection{Additional material}
-\frame{Details}
-\frame{Text omitted in main talk.}
+\begin{frame}
+ Details
+\end{frame}
+\begin{frame}
+ Text omitted in main talk.
+\end{frame}
\subsection{Even more additional material}
-\frame{More details}
+\begin{frame}
+ More details
+\end{frame}
\end{document}
\end{verbatim}
\end{command}
diff --git a/macros/latex/contrib/beamer/doc/beamerug-graphics.tex b/macros/latex/contrib/beamer/doc/beamerug-graphics.tex
index e9d59575fe..6e230fd42b 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-graphics.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-graphics.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2013,2015 by Vedran Mileti\'c, Joseph Wright
diff --git a/macros/latex/contrib/beamer/doc/beamerug-guidelines.tex b/macros/latex/contrib/beamer/doc/beamerug-guidelines.tex
index 36a994a397..8f901e1334 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-guidelines.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-guidelines.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2012,2015 by Vedran Mileti\'c, Joseph Wright
diff --git a/macros/latex/contrib/beamer/doc/beamerug-installation.tex b/macros/latex/contrib/beamer/doc/beamerug-installation.tex
index bbee47a559..f335f992a6 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-installation.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-installation.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010,2013,2015 by Vedran Mileti\'c, Joseph Wright
% Copyright 2016 by Joseph Wright
@@ -49,31 +50,16 @@ In \TeX\ Live, use the |tlmgr| tool to install the packages called |beamer|, |pg
For MiK\TeX\ and pro\TeX t, use the update wizard or package manager to install the (latest versions of the) packages called |beamer|, |pgf|, and |xcolor|.
+\subsubsection{Linux distributions}
-\subsubsection{Debian and Ubuntu}
-
-The command ``|aptitude install latex-beamer|'' should do the trick. If necessary, the packages |pgf| and |latex-xcolor| will be automatically installed. Sit back and relax. In detail, the following packages are installed:
-\begin{verbatim}
-http://packages.debian.org/latex-beamer
-http://packages.debian.org/pgf
-http://packages.debian.org/latex-xcolor
-\end{verbatim}
-
-Debian 5.0 ``lenny'' includes \TeX\ Live 2007, and version 6.0 ``squeeze'' will include \TeX\ Live 2009. This also allows you to manually install newer versions of \beamer\ (into your local directory, see below) without having to update any other \LaTeX\ packages.
-
-Ubuntu 8.04, 9.04 and 9.10 include \TeX\ Live 2007, and version 10.04 includes \TeX\ Live 2009.
-
-
-\subsubsection{Fedora}
-
-Fedora 9, 10, 11, 12 and 13 include \TeX\ Live 2007, which includes \beamer. It can be installed by running the command ``|yum install texlive-texmf-latex|''. As with Debian, this allows you to manually install newer versions of \beamer\ into your local directory (explained below).
-
-Jindrich Novy provides \TeX\ Live 2010 |rpm| packages for Fedora 12 and 13, at
-\begin{verbatim}
-http://fedoraproject.org/wiki/Features/TeXLive
-\end{verbatim}
-Fedora 14 will contain \TeX\ Live 2010 once it's released.
+Most linux distributions provide pre-packaged bundles of \TeX{} Live. It is probably easiest to install a full (or at least recommended) scheme of \TeX{} Live, but if you only want to install \beamer:
+\begin{itemize}
+\item
+ Ubuntu/Debian: |apt install texlive-latex-recommended|
+\item
+ Fedora: |dnf install texlive-beamer|
+\end{itemize}
\subsection{Installation in a texmf Tree}
@@ -90,9 +76,9 @@ The package contains a bunch of files; |beamer.cls| is one of these files and ha
When you ask \TeX\ to use a certain class or package, it usually looks for the necessary files in so-called |texmf| trees. These trees are simply huge directories that contain these files. By default, \TeX\ looks for files in three different |texmf| trees:
\begin{itemize}
\item
- The root |texmf| tree, which is usually located at |/usr/share/texmf/|, |/usr/local/texlive/texmf/|, |c:\texmf\|, or |c:\texlive\texmf\|.
+ The root |texmf| tree, which is usually located at |/usr/share/texmf/|, |/usr/local/texlive/texmf/|, |C:\texmf\|, or |C:\texlive\texmf\|.
\item
- The local |texmf| tree, which is usually located at |/usr/local/share/texmf/|,\\ |/usr/local/texlive/texmf-local/|, |c:\localtexmf\|, or |c:\texlive\texmf-local\|.
+ The local |texmf| tree, which is usually located at |/usr/local/share/texmf/|,\\ |/usr/local/texlive/texmf-local/|, |C:\localtexmf\|, or |C:\texlive\texmf-local\|.
\item
Your personal |texmf| tree, which is usually located in your home directory at |~/texmf/| or |~/Library/texmf/|.
\end{itemize}
diff --git a/macros/latex/contrib/beamer/doc/beamerug-interaction.tex b/macros/latex/contrib/beamer/doc/beamerug-interaction.tex
index 59e40801bd..4469b82c28 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-interaction.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-interaction.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2013,2015 by Vedran Mileti\'c, Joseph Wright
@@ -106,7 +107,7 @@ The following commands can be used to specify in an abstract way what a button w
\example
\begin{verbatim}
-\frame{
+\begin{frame}
\begin{theorem}
...
\end{theorem}
@@ -119,7 +120,7 @@ The following commands can be used to specify in an abstract way what a button w
...
\end{proof}
\end{overprint}
-}
+\end{frame}
\end{verbatim}
\end{command}
@@ -128,8 +129,7 @@ The following commands can be used to specify in an abstract way what a button w
\example
\begin{verbatim}
-\frame<1>[label=mytheorem]
-{
+\begin{frame}<1>[label=mytheorem]
\begin{theorem}
...
\end{theorem}
@@ -143,7 +143,7 @@ The following commands can be used to specify in an abstract way what a button w
\end{proof}
\hfill\hyperlink{mytheorem<1>}{\beamerreturnbutton{Return}}
\end{overprint}
-}
+\end{frame}
\appendix
\againframe<2>{mytheorem}
\end{verbatim}
@@ -218,19 +218,17 @@ Sometimes you may wish some slides of a frame to be shown in your main talk, but
\example
\begin{verbatim}
-\frame<1-2>[label=myframe]
-{
+\begin{frame}<1-2>[label=myframe]
\begin{itemize}
\item<alert@1> First subject.
\item<alert@2> Second subject.
\item<alert@3> Third subject.
\end{itemize}
-}
+\end{frame}
-\frame
-{
+\begin{frame}
Some stuff explaining more on the second matter.
-}
+\end{frame}
\againframe<3>{myframe}
\end{verbatim}
@@ -239,8 +237,7 @@ Sometimes you may wish some slides of a frame to be shown in your main talk, but
\example
\begin{verbatim}
-\frame<1>[label=Cantor]
-{
+\begin{frame}<1>[label=Cantor]
\frametitle{Main Theorem}
\begin{Theorem}
@@ -259,7 +256,7 @@ Sometimes you may wish some slides of a frame to be shown in your main talk, but
\hfill\hyperlink{Cantor<1>}{\beamerreturnbutton{Return}}
\end{overprint}
-}
+\end{frame}
...
\appendix
diff --git a/macros/latex/contrib/beamer/doc/beamerug-introduction.tex b/macros/latex/contrib/beamer/doc/beamerug-introduction.tex
index 3f2399f83d..c46e8842e2 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-introduction.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-introduction.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2012,2013,2015 by Vedran Mileti\'c, Joseph Wright
@@ -13,7 +14,7 @@
\section{Introduction}
-\beamer\ is a \LaTeX\ class for creating presentations that are held using a projector, but it can also be used to create transparency slides. Preparing presentations with \beamer\ is different from preparing them with \textsc{wysiwyg} programs like OpenOffice.org Impress, Apple Keynote, KOffice KPresenter or Microsoft PowerPoint. A \beamer\ presentation is created like any other \LaTeX\ document: It has a preamble and a body, the body contains |\section|s and |\subsection|s, the different slides (called \emph{frames} in \beamer) are put in environments, they are structured using |itemize| and |enumerate| environments, and so on. The obvious disadvantage of this approach is that you have to know \LaTeX\ in order to use \beamer. The advantage is that if you know \LaTeX, you can use your knowledge of \LaTeX\ also when creating a presentation, not only when writing papers.
+\beamer\ is a \LaTeX\ class for creating presentations that are held using a projector, but it can also be used to create transparency slides. Preparing presentations with \beamer\ is different from preparing them with \textsc{wysiwyg} programs like Libre-/OpenOffice.org Impress, Apple Keynote, KOffice KPresenter or Microsoft PowerPoint. A \beamer\ presentation is created like any other \LaTeX\ document: It has a preamble and a body, the body contains |\section|s and |\subsection|s, the different slides (called \emph{frames} in \beamer) are put in environments, they are structured using |itemize| and |enumerate| environments, and so on. The obvious disadvantage of this approach is that you have to know \LaTeX\ in order to use \beamer. The advantage is that if you know \LaTeX, you can use your knowledge of \LaTeX\ also when creating a presentation, not only when writing papers.
\subsection{Main Features}
@@ -155,7 +156,7 @@ When you need help with \beamer, please do the following:
\item
Read the user guide, at least the part that has to do with your problem.
\item
- If that does not solve the problem, try searching \href{http://tex.stackexchange.com}{TeX-sx (\texttt{tex.stackexchange.com})}.
+ If that does not solve the problem, try searching one of the \TeX{} related question and answer sites like \href{https://tex.stackexchange.com}{\texttt{tex.stackexchange.com}}, \href{https://latex.org/forum/}{\texttt{latex.org}} or \href{https://topanswers.xyz/tex}{\texttt{topanswers.xyz/tex}}.
Perhaps someone has already reported a similar problem and someone has found a solution.
\item
If you find no answers there, or if you are sure you have found a bug in
diff --git a/macros/latex/contrib/beamer/doc/beamerug-license.tex b/macros/latex/contrib/beamer/doc/beamerug-license.tex
index c3f3eff396..05f59f3d59 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-license.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-license.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2015 by Vedran Mileti\'c, Joseph Wright
diff --git a/macros/latex/contrib/beamer/doc/beamerug-localstructure.tex b/macros/latex/contrib/beamer/doc/beamerug-localstructure.tex
index 3eb55d03e3..845ecda4da 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-localstructure.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-localstructure.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2012--2015 by Vedran Mileti\'c, Joseph Wright
diff --git a/macros/latex/contrib/beamer/doc/beamerug-macros.tex b/macros/latex/contrib/beamer/doc/beamerug-macros.tex
index a097076dac..5375f93079 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-macros.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-macros.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2013,2015 by Vedran Mileti\'c, Joseph Wright
diff --git a/macros/latex/contrib/beamer/doc/beamerug-nonpresentation.tex b/macros/latex/contrib/beamer/doc/beamerug-nonpresentation.tex
index ea2c228ab7..728741b317 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-nonpresentation.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-nonpresentation.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2012,2014,2015 by Vedran Mileti\'c, Joseph Wright
@@ -314,9 +315,11 @@ The command actually comes in three ``flavors,'' which only slightly differ in s
\begin{verbatim}
\mode<article>{Extra detail mentioned only in the article version.}
-\mode
-<beamer| trans>
-{\frame{\tableofcontents[currentsection]}}
+\mode<beamer| trans>{
+ \begin{frame}
+ \tableofcontents[currentsection]
+ \end{frame}
+}
\end{verbatim}
\end{command}
@@ -352,10 +355,11 @@ The second flavor of the |\mode| command takes no argument. ``No argument'' mean
This text is typeset only in |article| mode.
\verb!verbatim text is ok {!
-\mode
-<presentation>
-{ % this text is inserted only in presentation mode
-\frame{\tableofcontents[currentsection]}}
+\mode<presentation>{% this text is inserted only in presentation mode
+ \begin{frame}
+ \tableofcontents[currentsection]
+ \end{frame}
+}
Here we are back to article mode stuff. This text
is not inserted in presentation mode
diff --git a/macros/latex/contrib/beamer/doc/beamerug-notes.tex b/macros/latex/contrib/beamer/doc/beamerug-notes.tex
index d80a235dd8..a54dc4ecff 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-notes.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-notes.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2012,2013,2015 by Vedran Mileti\'c, Joseph Wright
@@ -16,7 +17,7 @@ A \emph{note} is text that is intended as a reminder to yourself of what you sho
\subsection{Specifying Note Contents}
-To add a note to a slide or a frame, use the |\note| command. This command can be used both inside and outside frames, but it has quite different behaviors then: Inside frames, |\note| commands accumulate and append a single note page after the current slide; outside frames each |\note| directly inserts a single note page with the given parameter as contents. Using the |\note| command inside frames is usually preferably over using them outside, since only commands issued inside frames profit from the class option |onlyslideswithnotes|, see below.
+To add a note to a slide or a frame, use the |\note| command. This command can be used both inside and outside frames, but it has quite different behaviors then: Inside frames, |\note| commands accumulate and append a single note page after the current slide; outside frames each |\note| directly inserts a single note page with the given parameter as contents. Using the |\note| command inside frames is usually preferably over using them outside, since only commands issued inside frames profit from the option |show only slides with notes|.
Inside a frame, the effect of |\note|\meta{text} is the following: When you use it somewhere inside the frame on a specific slide, a note page is created after the slide, containing the \meta{text}. Since you can add an overlay specification to the |\note| command, you can specify after which slide the note should be shown. If you use multiple |\note| commands on one slide, they ``accumulate'' and are all shown on the same note.
@@ -60,7 +61,7 @@ In the following, the syntax and effects of the |\note| command \emph{inside} fr
Next, the syntax and effects of the |\note| command \emph{outside} frames are described:
\begin{command}{\note\oarg{options}\marg{note text}}
- Outside frames, this command creates a note page. This command is \emph{not} affected by the option |notes=onlyframeswithnotes|, see below.
+ Outside frames, this command creates a note page. This command is \emph{not} affected by the option |show only slides with notes|.
The following \meta{options} may be given:
\begin{itemize}
@@ -72,7 +73,9 @@ Next, the syntax and effects of the |\note| command \emph{outside} frames are de
\example
\begin{verbatim}
-\frame{some text}
+\begin{frame}
+some text
+\end{frame}
\note{Talk no more than 1 minute.}
\note[enumerate]
@@ -97,6 +100,8 @@ The following element dictates how the note pages are rendered:
The option produces an output that is similar to the default, only more fits onto each note page at the price of legibility.
\itemoption{plain}{}
Just inserts the note text, no fancy hints.
+ \itemoption{lined}{\oarg{number}}
+ Instead of printing the note text, this option fills the note page with lines on which the audience can write their own notes on. \meta{number} specifies how many lines will be shown, the default is 6 lines.
\end{templateoptions}
The following two inserts are useful for note pages:
\begin{itemize}
@@ -208,7 +213,10 @@ Since you normally do not wish the notes to be part of your presentation, you mu
\end{verbatim}
\end{beameroption}
-
\begin{beameroption}{show only notes}{}
Include only the notes in the output file and suppresses all frames. This options is useful for printing them. If you specify this command, the |.aux| and |.toc| files are \emph{not} updated. So, if you add a section and re\TeX\ your presentation, this will not be reflected in the navigation bars (which you do not see anyway since only notes are output).
\end{beameroption}
+
+\begin{beameroption}{show only slides with notes}{}
+ Include only slides in the output file that have an accompanying note page. Slides without notes will be excluded. If you specify this command, the |.aux| and |.toc| files are \emph{not} updated. So, if you add a section and re\TeX\ your presentation, this will not be reflected in the navigation bars.
+\end{beameroption}
diff --git a/macros/latex/contrib/beamer/doc/beamerug-overlays.tex b/macros/latex/contrib/beamer/doc/beamerug-overlays.tex
index 7eea250dc5..57a8546f9b 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-overlays.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-overlays.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2011--2015 by Vedran Mileti\'c, Joseph Wright
diff --git a/macros/latex/contrib/beamer/doc/beamerug-solutions.tex b/macros/latex/contrib/beamer/doc/beamerug-solutions.tex
index 50bdc1a554..0763e220ac 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-solutions.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-solutions.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2013,2015 by Vedran Mileti\'c, Joseph Wright
diff --git a/macros/latex/contrib/beamer/doc/beamerug-themes.tex b/macros/latex/contrib/beamer/doc/beamerug-themes.tex
index 3d54536d28..7704c13c99 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-themes.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-themes.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2012,2015 by Vedran Mileti\'c, Joseph Wright
diff --git a/macros/latex/contrib/beamer/doc/beamerug-transparencies.tex b/macros/latex/contrib/beamer/doc/beamerug-transparencies.tex
index 34e3ad69a1..10d7054613 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-transparencies.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-transparencies.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2015 by Vedran Mileti\'c, Joseph Wright
diff --git a/macros/latex/contrib/beamer/doc/beamerug-tricks.tex b/macros/latex/contrib/beamer/doc/beamerug-tricks.tex
index 4cbda81d10..add83ca2b6 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-tricks.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-tricks.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2015 by Vedran Mileti\'c, Joseph Wright
diff --git a/macros/latex/contrib/beamer/doc/beamerug-tutorial.tex b/macros/latex/contrib/beamer/doc/beamerug-tutorial.tex
index 5f2dccc9b5..b65e841449 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-tutorial.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-tutorial.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010,2011,2013,2015 by Vedran Mileti\'c, Joseph Wright
% Copyright 2018 by Louis Stuart, Joseph Wright
diff --git a/macros/latex/contrib/beamer/doc/beamerug-twoscreens.tex b/macros/latex/contrib/beamer/doc/beamerug-twoscreens.tex
index 7865d75934..e053e2ee48 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-twoscreens.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-twoscreens.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2012,2015 by Vedran Mileti\'c, Joseph Wright
diff --git a/macros/latex/contrib/beamer/doc/beamerug-workflow.tex b/macros/latex/contrib/beamer/doc/beamerug-workflow.tex
index d50dea12e4..9ad622052c 100644
--- a/macros/latex/contrib/beamer/doc/beamerug-workflow.tex
+++ b/macros/latex/contrib/beamer/doc/beamerug-workflow.tex
@@ -1,3 +1,4 @@
+% !TeX root = beameruserguide.tex
% Copyright 2003--2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2011--2013,2015 by Vedran Mileti\'c, Joseph Wright
@@ -136,13 +137,17 @@ Second, you can use the following command:
\begin{verbatim}
\includeonlyframes{example1,example3}
-\frame[label=example1]
-{This frame will be included. }
+\begin{frame}[label=example1]
+This frame will be included.
+\end{frame}
-\frame[label=example2]
-{This frame will not be included. }
+\begin{frame}[label=example2]
+This frame will not be included.
+\end{frame}
-\frame{This frame will not be included.}
+\begin{frame}
+This frame will not be included.
+\end{frame}
\againframe{example1} % Will be included
\end{verbatim}
diff --git a/macros/latex/contrib/beamer/doc/beameruserguide.pdf b/macros/latex/contrib/beamer/doc/beameruserguide.pdf
index d9e213862f..4a307329c0 100644
--- a/macros/latex/contrib/beamer/doc/beameruserguide.pdf
+++ b/macros/latex/contrib/beamer/doc/beameruserguide.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/beameruserguide.tex b/macros/latex/contrib/beamer/doc/beameruserguide.tex
index b440db32f5..3ddbee05e1 100644
--- a/macros/latex/contrib/beamer/doc/beameruserguide.tex
+++ b/macros/latex/contrib/beamer/doc/beameruserguide.tex
@@ -13,8 +13,8 @@
\documentclass{ltxdoc}
-\def\beamerugversion{3.63}
-\def\beamerugpgfversion{1.00}
+\def\beamerugversion{3.64}
+\def\beamerugpgfversion{3.1.7}
\def\beamerugxcolorversion{2.00}
\usepackage{cmap}
diff --git a/macros/latex/contrib/beamer/doc/emulation-examples/beamerexample-foils.tex b/macros/latex/contrib/beamer/doc/emulation-examples/beamerexample-foils.tex
index 8c208c7503..0d3c0a0e42 100644
--- a/macros/latex/contrib/beamer/doc/emulation-examples/beamerexample-foils.tex
+++ b/macros/latex/contrib/beamer/doc/emulation-examples/beamerexample-foils.tex
@@ -33,9 +33,9 @@
\begin{document}
-\frame{
+\begin{frame}
\maketitle
-}
+\end{frame}
\foilhead{A first frame}
diff --git a/macros/latex/contrib/beamer/doc/emulation-examples/beamerexample-prosper.tex b/macros/latex/contrib/beamer/doc/emulation-examples/beamerexample-prosper.tex
index 6aad848d79..ac27d66594 100644
--- a/macros/latex/contrib/beamer/doc/emulation-examples/beamerexample-prosper.tex
+++ b/macros/latex/contrib/beamer/doc/emulation-examples/beamerexample-prosper.tex
@@ -63,8 +63,7 @@
\subsection{A subsection}
-\frame
-{
+\begin{frame}
\frametitle{A frame created using the \texttt{frame} command.}
\begin{itemize}[<+->]
@@ -72,7 +71,7 @@
\item The emulation is intended only to make recycling slides
easier, not to install a whole new syntax for beamer.
\end{itemize}
-}
+\end{frame}
\begin{notes}{Notes for these slides}
My notes for these slides.
diff --git a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic1.jpg b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic1.jpg
index 7fbce74d3e..a97f0e3d65 100644
--- a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic1.jpg
+++ b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic1.jpg
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic2.jpg b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic2.jpg
index 958a7f288b..78dada67f5 100644
--- a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic2.jpg
+++ b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic2.jpg
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic3.jpg b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic3.jpg
index 67c4bce95c..8c3282ad20 100644
--- a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic3.jpg
+++ b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic3.jpg
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic4.jpg b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic4.jpg
index fd6c9c1b22..64adaf5d9b 100644
--- a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic4.jpg
+++ b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic4.jpg
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic5.jpg b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic5.jpg
index 0a18dc5a73..1e203002e8 100644
--- a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic5.jpg
+++ b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic5.jpg
Binary files differ
diff --git a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic6.jpg b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic6.jpg
index fb451d9195..9a2d23dc25 100644
--- a/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic6.jpg
+++ b/macros/latex/contrib/beamer/doc/examples/a-lecture/beamerexample-lecture-pic6.jpg
Binary files differ
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index a7d77a29ae..eed7155bee 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}{2021/10/18}{1.3O}
+\ProvidesExplClass{easybook}{2021/10/18}{1.3P}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -319,7 +319,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/10/18}{1.3O}
+\ProvidesExplPackage{easybase}{2021/10/18}{1.3P}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -868,7 +868,28 @@
{ \tl_set:Nn \l__eb_footnote_choice_tl {#1} }
}
}
+\cs_new_protected:Npn \eb_fn_shift_set:nnn #1#2#3
+ {
+ \str_if_eq:nnTF {#1} { match }
+ {
+ \tl_set:cv { l__eb_fn#2_#3shift_tl }
+ { l__spb_super_script_#3shift_dim }
+ }
+ { \tl_set:cn { l__eb_fn#2_#3shift_tl } {#1} }
+ }
+\cs_new_protected:Npn \eb_fn_format_set:nn #1#2
+ {
+ \str_if_eq:nnTF {#1} { match }
+ { \bool_set_true:c { l__eb_fn#2_format_match_bool } }
+ {
+ \bool_set_false:c { l__eb_fn#2_format_match_bool }
+ \tl_set:cn { l__eb_fn#2_format_tl } {#1}
+ }
+ }
+
\bool_new:N \l__eb_fnpara_bottom_bool
+\tl_new:N \l__eb_fnmate_format_tl
+\tl_new:N \l__eb_fncust_format_tl
\clist_new:N \l__eb_footnote_mulchoice_clist
\ctex_define:nn { hdrset }
{
@@ -880,14 +901,14 @@
fnparindent .initial:n = 2em,
fnpara-form .tl_set:N = \l__eb_fnpara_format_tl,
- fnmark-pos .tl_set:N = \l__eb_fnmark_position_tl,
- fnmark-pos .initial:n = super,
+ fntext-pos .tl_set:N = \l__eb_fntext_position_tl,
+ fntext-pos .initial:n = super,
fntext-code .code:n = \eb_assign_fnmark_code:n {#1},
fntext-code .initial:n =
- { ,\tl_if_eq:NnF \l__eb_fnmark_position_tl { super } { \space } },
- fnmark-form .tl_set:N = \l__eb_fnmark_format_tl,
- fncust-form .tl_set:N = \l__eb_fncust_format_tl,
- fnboth-form .meta:n = { fnmark-form = #1,fncust-form = #1 },
+ { ,\tl_if_eq:NnF \l__eb_fntext_position_tl { super } { \space } },
+ fnmate-form .code:n = \eb_fn_format_set:nn {#1} { mate },
+ fncust-form .code:n = \eb_fn_format_set:nn {#1} { cust },
+ fnboth-form .meta:n = { fnmate-form = #1,fncust-form = #1 },
footnotetype .multichoices:nn =
{ default,hang,bottom,para,flush }
@@ -895,6 +916,13 @@
footnotetype .value_required:n = true,
footnotetype .initial:n = hang,
+ fnmark-vshift .code:n = \eb_fn_shift_set:nnn {#1} { mark } { v },
+ fnmark-hshift .code:n = \eb_fn_shift_set:nnn {#1} { mark } { h },
+ fntext-vshift .code:n = \eb_fn_shift_set:nnn {#1} { text } { v },
+ fnmark-vshift .initial:n = 0pt,
+ fnmark-hshift .initial:n = 0pt,
+ fntext-vshift .initial:n = 0pt,
+
fnmark-num .choices:nn =
{ plain,pifont,pifont*,pifont-sans,pifont-sans* }
{ \eb_fnmark_normal_label_set:nn {#1} { the@footnote } },
@@ -968,6 +996,7 @@
}
}
}
+
\cs_new_protected:Npn \eb_footnote_direct_hang:
{
\hbox_set:Nn \l_tmpa_box
@@ -1028,15 +1057,7 @@
\@ifpackagewith{footmisc}{hang}
{\cs_set_eq:NN \@makefntext \eb@makefntext}{}
}
-\eb_at_end_patch_cmd:nnn { \@footnotetext,\@mpfootnotetext }
- { \reset@font }
- {
- \linespread{\fp_use:N \l__eb_spread_footnote_fp}
- \selectfont\ignorespaces
- \l__eb_subfont_footnote_tl
- }
-\ProvideDocumentCommand{\super}{d()mo}{\textsuperscript{#2}}
-\providecommand{\spbset}{\use_none:n}
+
\cs_set_protected:Npn \footref #1
{
\group_begin:
@@ -1067,6 +1088,13 @@
\@footnotemark
}
}
+\eb_at_end_patch_cmd:nnn { \@footnotetext,\@mpfootnotetext }
+ { \reset@font }
+ {
+ \linespread{\fp_use:N \l__eb_spread_footnote_fp}
+ \selectfont\ignorespaces
+ \l__eb_subfont_footnote_tl
+ }
\ctex_at_end_package:nn { hyperref }
{
\cs_set:Npn \@xfootnotemark [#1]
@@ -1078,22 +1106,45 @@
\H@@footnotemark
}
}
+
+\ProvideDocumentCommand{\super}{od()mo}{\textsuperscript{#3}}
+\providecommand{\spbset}{\use_none:n}
\NewDocumentCommand{\eb@fnmark@super}{sm}
{
\IfBooleanTF{#1}
- {\super{#2}[0pt]}
- {\super(\l__eb_fnmark_format_tl){#2}[0pt]}
+ {\super[\l__eb_fntext_vshift_tl]{#2}[0pt]}
+ {
+ \super[\l__eb_fnmark_vshift_tl]
+ (\l__eb_fnmate_format_tl){#2}
+ [\l__eb_fnmark_hshift_tl]
+ }
}
\cs_new_protected:Npn \eb_fnmark_format_initial:
{
- \spbset{super-format = { },nohshift}
+ \bool_if:NF \l__eb_fnmate_format_match_bool
+ { \spbset{super-format = { }} }
\tl_use:N \l__eb_subfont_footnote_tl
}
+\bool_set_true:N \l__eb_normal_footnote_bool
+\bool_new:N \l__eb_fnmate_format_match_bool
+\bool_new:N \l__eb_fncust_format_match_bool
+\cs_new_protected:Npn \eb_fn_format_if_match:T #1
+ {
+ \bool_if:NTF \l__eb_normal_footnote_bool
+ { \bool_if:NT \l__eb_fnmate_format_match_bool {#1} }
+ { \bool_if:NT \l__eb_fncust_format_match_bool {#1} }
+ }
+\cs_new_protected:Npn \eb_fn_set_eq_format:
+ {
+ \tl_set_eq:NN
+ \l__eb_fnmate_format_tl \l__spb_super_script_formati_tl
+ }
\cs_set:Npn \@makefnmark
{
\hbox:n
{
\eb_fnmark_format_initial:
+ \eb_fn_format_if_match:T { \eb_fn_set_eq_format: }
\tl_if_eq:NnTF \@mpfn { footnote }
{ \eb@fnmark@super{\eb@thefnmark} }
{ \eb@fnmark@super{\@thefnmark} }
@@ -1104,15 +1155,18 @@
\hbox:n
{
\eb_fnmark_format_initial:
- \tl_if_eq:NnT \l__eb_fnmark_position_tl { super }
- { \eb@fnmark@super* }
+ \tl_use:N \l__eb_fnmark_before_tl
+ \tl_if_eq:NnTF \l__eb_fntext_position_tl { super }
{
- \tl_use:N \l__eb_fnmark_before_tl
- {\l__eb_fnmark_format_tl{\@thefnmark}}
- \tl_use:N \l__eb_fnmark_after_tl
+ \eb_fn_format_if_match:T { \tl_clear:N \l__eb_fnmate_format_tl }
+ \eb@fnmark@super*
}
+ { \eb_fn_format_if_match:T { \eb_fn_set_eq_format: } }
+ {\l__eb_fnmate_format_tl{\@thefnmark}}
+ \tl_use:N \l__eb_fnmark_after_tl
}
}
+
\tl_clear:N \@thefnmark
\tl_new:N \eb@thefnmark
\cs_new:Npn \eb@@makefnmark #1#2
@@ -1128,8 +1182,12 @@
\cs_new_protected:Npn \eb_fncust_format_initial:
{
% \hdrset{fntext-code = { }}
- \tl_set_eq:NN
- \l__eb_fnmark_format_tl \l__eb_fncust_format_tl
+ \bool_set_false:N \l__eb_normal_footnote_bool
+ \bool_if:NF \l__eb_fncust_format_match_bool
+ {
+ \tl_set_eq:NN
+ \l__eb_fnmate_format_tl \l__eb_fncust_format_tl
+ }
}
\NewDocumentCommand{\Footnote}{O{#2}mm}
{
@@ -1163,6 +1221,19 @@
\seq_put_right:Nn \c__ctex_headings_seq { table }
\seq_put_right:Nn \c__ctex_headings_seq { lstlisting }
\seq_remove_duplicates:N \c__ctex_headings_seq
+\cs_new_protected:Npn \eb_titletoc_hang_fix:n #1
+ {
+ \bool_if:NT \eb@titletoc@hang@fix@bool
+ {
+ \contentspush
+ {
+ \bool_if:NT \l__eb_toc_number_color_bool
+ { \color{ctex@toc@number} }
+ \thecontentslabel
+ \hspace{\use:c { eb@toc@#1@numsep }}
+ }
+ }
+ }
\cs_new_protected:Npn \eb_toc_assign_keys:n #1
{
\ctex_define:n { tocset/#1 .meta:nn = { ctex/tocset/#1 } {##1} }
@@ -1181,18 +1252,7 @@
\titlecontents{#1}
[\dim_use:c { l__eb_toc_#1_indent_dim }]
{\tl_use:c { l__eb_toc_#1_format_tl }}
- {
- \bool_if:NT \eb@titletoc@hang@fix@bool
- {
- \contentspush
- {
- \bool_if:NT \l__eb_toc_number_color_bool
- { \color{ctex@toc@number} }
- \thecontentslabel
- \hspace{\use:c { eb@toc@#1@numsep }}
- }
- }
- }{}
+ {\eb_titletoc_hang_fix:n {#1}}{}
{\tl_use:c { l__eb_toc_#1_rule_tl }}
}
\seq_map_function:NN
@@ -2187,8 +2247,7 @@
\LoadPackage[backend = biber]{biblatex}
\clist_map_function:NN \l__eb_bib_datafile_clist \addbibresource
\tl_gset:Nn \blx@default@theheading { bibintoc }
- \defbibheading{bibintoc}[\bibname]
- {\eb_biber_title_level_spec:n {##1}}
+ \defbibheading{bibintoc}[\bibname]{\eb_biber_title_level_spec:n {##1}}
\skip_zero:N \bibitemsep
}
\eb_at_end_preamble:n
@@ -2292,6 +2351,7 @@
linktype/colors .code:n =
{
\bool_set_true:N \l__eb_toc_number_color_bool
+ \colorlet{ctex@toc@number}{ctex@link}
\eb_put_hyperref:n { colorlinks }
},
linktype/various .meta:n = linktype/colors,
@@ -2337,7 +2397,6 @@
linkcol-all .code:n =
{ \eb_define_link_color:n { \exp_not:n {#1} } }
}
-\colorlet{ctex@toc@number}{ctex@link}
\ctex_define:nx { style }
{
color .choice:,
@@ -2422,7 +2481,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/18}{1.3O}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/10/18}{1.3P}
{Customization of tcolorbox for easybook}
\tl_gset:Nn \eb@tc@line@skip { 0.5\baselineskip }
diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf
index a6c182352e..fb49ff7e2f 100644
--- a/macros/latex/contrib/easybook/easybook.pdf
+++ b/macros/latex/contrib/easybook/easybook.pdf
Binary files differ
diff --git a/macros/latex/contrib/easybook/easybook.tex b/macros/latex/contrib/easybook/easybook.tex
index 209ca5efe6..8e26df50a9 100644
--- a/macros/latex/contrib/easybook/easybook.tex
+++ b/macros/latex/contrib/easybook/easybook.tex
@@ -20,7 +20,7 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK 使用手册,
- version = v1.3O,
+ version = v1.3P,
date = 2021/10/18,
authors = 瞿毅,
info = 排版简体中文学ä½è®ºæ–‡å’Œä¹¦ç±,
@@ -79,6 +79,7 @@
\newsplitarg[\spemmeta]{\spemcoarg}{[}{]}
\renewcommand{\cnltx@package@abstract@width}{0.85\linewidth}
\newcommand{\noitemsep}{\setlength{\itemsep}{0ex}}
+\newcommand{\black}[1]{\textcolor{black}{#1}}
\renewcommand{\cmltx@list@setup}
{
\setlength{\leftmargin}{0em}
@@ -386,7 +387,7 @@
统一调整页眉ã€å®šç†ç›’å­ä»¥åŠä»£ç æ¡†ç­‰çº¿æ¡çš„粗细。
\keybool{uppercase}\Default{true}
使用 \cs*{rightmark} åŠ \cs*{leftmark} 标题标记命令获å–标题内容时英文是å¦å¤§å†™ã€‚
- \kvsplit{brackets}{左括å·,å³æ‹¬å·}\Default{\Carg{(,)}}
+ \kvsplit{brackets}{左括å·,å³æ‹¬å·}\Default{\Carg{(\black{,})}}
设置行间公å¼ç¼–å·æ ‡ç­¾çš„括å·ï¼Œä»¥è‹±æ–‡é€—å·åˆ†éš”,分别代表左å³æ‹¬å·ã€‚
\kvsplit*{figurepath}{\meta{路径å1}\code{\}\{}\meta{路径å2}}\Default
设置æ’入图片的文件夹路径å,å¯ä»¥æœ‰å¤šä¸ªè·¯å¾„å,æ¯ä¸ªè·¯å¾„包å«åœ¨æ‹¬å·åˆ†éš”,åªæœ‰ä¸€ä¸ªè·¯å¾„时需è¦åŒ…å«åœ¨ä¸¤å±‚括å·å†…。
@@ -442,7 +443,7 @@
\keychoice{linktype}{edge,colors,none}\Module{refset}\Default{edge}
超链接类型,\code{edge} 使超链接形å¼ä¸ºè¾¹æ¡†ï¼Œ\code{colors} 使超链接字体为彩色,\code{none} 关闭超链接边框与颜色,此时 \option{linkcolor} 选项无效。
\keychoice{linkcolor}{fresh,cutepink,navyblue,crimson}\Default{navyblue}
- 超链接颜色样å¼ï¼Œé¢„置了四ç§è¶…链接颜色风格。
+ 超链接颜色样å¼ï¼Œé¢„置了四ç§è¶…链接颜色风格。为使相关颜色能够正确显示,\option{linkcolor} 选项应当在 \option{linktype} å‰ä½¿ç”¨ã€‚
\begin{commands}
\command{DeclareLinkColor}[\splitmarg{风格å称,ctex@link,ctex@url,ctex@cite}]
å¯ä»¥ä½¿ç”¨ \cs{DeclareLinkColor} 命令声明新的超链接颜色样å¼ï¼Œå®ƒçš„å‚数以英文逗å·åˆ†éš”,第一部分为颜色风格å称,åŽé¢ä¸‰éƒ¨åˆ†ä¸º \code{HTML} 颜色代ç ï¼Œæž„æˆè¶…链接颜色。
@@ -709,7 +710,7 @@
\hdrset{footnotetype = default,footnotetype = bottom}
\hdrset{footnotetype = {hang,bottom}}
\end{ctexexam}
- \keychoice{fnmark-pos}{normal,super}\Default{super}
+ \keychoice{fntext-pos}{normal,super}\Default{super}
设置脚注内容标记的ä½ç½®ï¼Œæ­£å¸¸æ–‡æœ¬æˆ–是上标形å¼ã€‚
\keychoice{fnmark-num}{plain,pifont,pifont*,pisans,pisans*,short num}\Default{plain}
脚注正文标记编å·çš„ç±»åž‹ï¼Œé»˜è®¤ä¸ºåŽŸç”Ÿæ ·å¼ \code{plain},还å¯ä»¥æ”¹ä¸º \code{pifont} çš„å„个版本,从左往å³ä¾æ¬¡ä¸ºæ™®é€šç‰ˆã€é˜´æ–‡è¡¬çº¿ç‰ˆã€é˜³æ–‡æ— è¡¬çº¿ç‰ˆå’Œé˜´æ–‡æ— è¡¬çº¿ç‰ˆï¼Œç¼ºç‚¹æ˜¯å®ƒä»¬çš„ç¼–å·ä»…包括 1-10。
@@ -723,20 +724,26 @@
脚注内容标记编å·çš„类型,用法与 \option{fnmark-num} 一样,所以脚注内容与正文标记编å·æ ¼å¼\textbf{å¯ä»¥ä¸åŒ}。
\keychoice{fnboth-num}{plain,pifont,pifont*,pisans,pisans*,short num}\Default{plain}
åŒæ—¶è®¾å®šè„šæ³¨æ­£æ–‡æ ‡è®°ç¼–å· \option{fnmark-num} ä¸Žè„šæ³¨å†…å®¹æ ‡è®°ç¼–å· \option{fntext-num} 的类型。目å‰è„šæ³¨ç¼–å·æ ¼å¼é€‰é¡¹å¯¹äºŽè¿·ä½ é¡µçŽ¯å¢ƒ \env*{minipage} 无效,其中的脚注ä¿æŒé»˜è®¤è‹±æ–‡å­—æ¯çš„ç¼–å·å½¢å¼ã€‚
- \keyval-{fnmark-form}{æ ¼å¼ä»£ç }\Default
- 脚注标记的格å¼ï¼Œä¸€èˆ¬é…åˆé€‰é¡¹ \keyis-{fnmark-num}{plain} 使用,例如é…åˆ \pkg*{circledsteps} å®åŒ…的带圈符å·å‘½ä»¤ \cs*{Circled} 给脚注标记添加圆圈:
+ \keychoice{fnmark-vshift}{fixed length,match}\Default{0pt}
+ 脚注正文标记的垂直å移,å¯ä»¥è®¾ä¸ºåˆšæ€§é•¿åº¦ï¼Œæˆ–用 \code{match} åŒ¹é… \option*{super-vshift} 全局的值。
+ \keychoice{fnmark-hshift}{fixed length,match}\Default{0pt}
+ 脚注正文标记的水平å移,å¯ä»¥è®¾ä¸ºåˆšæ€§é•¿åº¦ï¼Œæˆ–用 \code{match} åŒ¹é… \option*{super-hshift} 全局的值。
+ \keychoice{fntext-vshift}{fixed length,match}\Default{0pt}
+ 脚注内容标记的垂直å移,å¯ä»¥è®¾ä¸ºåˆšæ€§é•¿åº¦ï¼Œæˆ–用 \code{match} åŒ¹é… \option*{super-vshift} 全局的值。
+ \keychoice{fnmate-form}{format code,match}\Default
+ 默认脚注标记的格å¼ï¼Œ\code{match} å¯ä»¥åŒ¹é… \option*{super-format} 全局的值。一般é…åˆé€‰é¡¹ \keyis-{fnmark-num}{plain} 使用,例如é…åˆ \pkg*{circledsteps} å®åŒ…的带圈符å·å‘½ä»¤ \cs*{Circled} 给脚注标记添加圆圈:
\begin{ctexexam}
\usepackage{circledsteps}
\hdrset
{
- fnmark-pos = normal,
- fnmark-form = \tiny\Circled
+ fntext-pos = normal,
+ fnmate-form = \tiny\Circled
}
\end{ctexexam}
- \keyval-{fncust-form}{æ ¼å¼ä»£ç }\Default
- å•ç‹¬è®¾å®šè‡ªå®šä¹‰è„šæ³¨æ ‡è®°çš„æ ¼å¼ï¼Œè‡ªå®šä¹‰è„šæ³¨çš„命令与用法è§å°èŠ‚ \ref{subsubsec:custom footnotes}。
- \keyval-{fnboth-form}{æ ¼å¼ä»£ç }\Default
- åŒæ—¶è®¾å®šè„šæ³¨æ ‡è®° \option{fnmark-form} 和自定义脚注标记 \option{fncust-form} çš„æ ¼å¼ã€‚标记格å¼é€‰é¡¹å«æœ‰å­—体命令会覆盖 \module*{subfont/}\option{footnote} 的设置,最åŽä¸€ä¸ªæ ¼å¼å‘½ä»¤å¯ä»¥å¸¦æœ‰ä¸€ä¸ªå‚数接å—脚注标记。
+ \keychoice{fncust-form}{format code,match}\Default
+ å•ç‹¬è®¾å®šè‡ªå®šä¹‰è„šæ³¨æ ‡è®°çš„æ ¼å¼ï¼Œ\code{match} å¯ä»¥åŒ¹é… \option*{super-format} 全局的值。自定义脚注的命令与用法è§å°èŠ‚ \ref{subsubsec:custom footnotes}。
+ \keychoice{fnboth-form}{format code,match}\Default
+ åŒæ—¶è®¾å®šé»˜è®¤è„šæ³¨æ ‡è®° \option{fnmate-form} 和自定义脚注标记 \option{fncust-form} çš„æ ¼å¼ï¼Œä¸¤ç§è„šæ³¨æ ‡è®°åŒ¹é…ä¸Šæ ‡æ ¼å¼ \option*{super-format} 的值是独立的,使用 \code{match} 则å¯ä»¥åŒæ—¶åŒ¹é…。标记格å¼é€‰é¡¹å«æœ‰å­—体命令会覆盖 \module*{subfont/}\option{footnote} 的设置,最åŽä¸€ä¸ªæ ¼å¼å‘½ä»¤å¯ä»¥å¸¦æœ‰ä¸€ä¸ªå‚数接å—脚注标记。
\keyval-{fnpara-form}{æ ¼å¼ä»£ç }\Default
脚注内容的格å¼ï¼Œåœ¨æ­¤è®¾ç½®å­—体命令会覆盖 \module*{subfont/}\option{footnote} 的设置,最åŽä¸€ä¸ªæ ¼å¼å‘½ä»¤å¯ä»¥å¸¦æœ‰ä¸€ä¸ªå‚数接å—脚注内容。
\kvsplit{fntext-code}{å‰ä»£ç ,åŽä»£ç }\newline
diff --git a/macros/latex/contrib/media4svg/ChangeLog b/macros/latex/contrib/media4svg/ChangeLog
index df819583a4..d07906419e 100644
--- a/macros/latex/contrib/media4svg/ChangeLog
+++ b/macros/latex/contrib/media4svg/ChangeLog
@@ -1,3 +1,8 @@
+2021-10-19
+ * v0.6
+ * fix: non-conforming SVG id attribute values
+ * new: lose focus by pressing "Tab" key
+
2021-01-25
* v0.5
* fix: migrating to lthooks (2020/10/01 latex format)
diff --git a/macros/latex/contrib/media4svg/README.md b/macros/latex/contrib/media4svg/README.md
index e1031e975f..3bbbcc9183 100644
--- a/macros/latex/contrib/media4svg/README.md
+++ b/macros/latex/contrib/media4svg/README.md
@@ -1,6 +1,6 @@
# The `media4svg` LaTeX Package
-Version 0.5, 2021/01/25
+Version 0.6, 2021/10/19
© 2020--today, Alexander Grahn
diff --git a/macros/latex/contrib/media4svg/example/beamer-example-1.svg b/macros/latex/contrib/media4svg/example/beamer-example-1.svg
index e090301cde..954b178bf9 100644
--- a/macros/latex/contrib/media4svg/example/beamer-example-1.svg
+++ b/macros/latex/contrib/media4svg/example/beamer-example-1.svg
@@ -1,26 +1,28 @@
<?xml version='1.0' encoding='UTF-8'?>
-<!-- This file was generated by dvisvgm 2.10.1 -->
+<!-- This file was generated by dvisvgm 2.11.1 -->
<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' viewBox='-72 -72 453.543293 255.118107'>
<defs>
<script type='text/javascript'>
<![CDATA[
-function $(id) {return document.getElementById("msvg@"+id.toString().trim());};
+function $(id) {return document.getElementById("msvg_"+id.toString().trim());};
]]>
</script>
</defs>
<style type='text/css'>
-<![CDATA[@font-face{font-family:ec-lmtt9;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
-@font-face{font-family:ec-lmr10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
-@font-face{font-family:ec-lmr12;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
-@font-face{font-family:ec-lmss9;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAJMAA0AAAAABVQAAAH1AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkoIBBEICoE8gTMLDAABNgIkAxQEIAWCJgcsG1oEIC4KbGP4aCGKX9ItF43GoU40Gt6rE1k8/P/++PY599335Ul2h5mgPGtCgiNKE0pDVIPiNNnXftu7+yEh/RG/asJLEJNQGFImFI0aO5UErHrq2FrjeeXzv3haTqlYgRoV5e5cfmBTfETV+bk6r24iY5y2a/+rS6wd+5CUSQh4+/h4D957X8nxyFlxVyWv5WvcwOPiEzuSVAuAAICdpyoDwBLVMvxfVcvHIAAFBeMxsJYQGE8yG7QaIS1R/R9c///mUwBESwAikRJwAq/45wZcnpKXQfwvQQXdaDENzAXQYCEOUjZNX/RGT+1r9vfU7r7ort3vut3Ywrv1XYrepqeU3L2vZ8qDzgefJ3cww+VOZYv5k0Z/Bl2ofq8n47AQ/qb+jD2Ah2HR0ktH45dDW98zUlIoUKAKvWjjT+D4MkOwbJPDTwws/d3ZU77sQhemQE7Jx+iUIMjHOJzbgJyCAQBqnJcDYhtkFr+hjaHqlyARAisZADqdwkCqegUopmtgoOpxX4BWp+eKaLqkbigrNkqxapzj1tagswuW9vZiuHBxv4+B9dZWDsMLO2NDxGGwkAQZ6tNN9QTq8CO7ow6rsuGjI7LvxkNyDIsSGvZ1F8kax9dt/T60AfsN7exNnWtiu2V4lrTbhgXXHKsNAFKrK6e3GiUDAAAA) format('woff2');}
-@font-face{font-family:ec-lmr9;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
-@font-face{font-family:ec-lmss8;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAATAAA0AAAAACOgAAARrAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwoIBBEICodQhhkLHAABNgIkAzIEIAWCJgc8Gy4HUZQwThrEj4TMTR/NEqFRwulybiu17DaKh/k1Hqq1z9c9s/thL8AoVBSBuvIhKB9JIFSEi1Asvw6yTPlU3MEP72kvnZMZ6YTCg5RMyqSTmpMxAfcJOP+lAf7+1OC/Z6Hct0+xsaxiLVmBxty2BjU1XESh5V3Y85ZwAvXKVMOaN8rIer1M2241wfvn90LAh6rfx+Gn4N/dYR95MvZryPv5Eg+LXfyxJ5LUFAgT7szJc/45APYoL5rTDpKyyquwZJmSy53o1lchsJysC8BC6mS09vATIEq8TJQ8pcqnBXo31qJZlYeuueySM04XRBUtwZ1IJBfBecFWDbrF9DjqY2Dol3TGyPXW5DUgppVgBlgKrAexEsR5ACp2YoBUr1rVqh6qzopBrc6MjozmxuIYxvzoxZYYi5m8PCvOMiO6ZkYdH2Q4I4aHP57oEMB0KAOlsoSeQpXrjIfTCCGdQNGmezgJKxBntSszNhh1D69gWFS1Kx0DCqVbJoOmXds5heixSTyrUoLJzrj46c4owITEAJolASOkkhrSDiE0Cdm0z924IBoj9hARKjHKl6Y7k8wlRMtr1wUM3G+D1Il6u6YRGvUOEFqvFjMrLF1a7QjjpCNuMobQ47OjkCid2DlFZx87dawawx6Cisx1dGccgmYX16exXbV3TgADO01PdVRT786ysNO+DkFG5/nzmCcVTz7DuxK6WF2eW3J156NNCKkngQj+bPHMgba4Q42D24yrjLc1du3NhC2HjhSe8zpXdPDsVuAVB4w9opy9fLw+75Ivl2+Cwlcx+1YWqVZRJvezDqyMT/bMiiIO4YficiK9YPnLAXIwLT8nMCA7J3WIGig+d7C05OTBYniMh1LpoWSkvVxQOD/WKkBoG8VYo5vg4shyj3Yr9WJbxxF7WJaaHPssY49JJS5UzxU2b4pg2iWv3ZGRuWVHVlIEWy4gWJDgnZCK+AX1y34PcbazD+INAYPGfIkIE/WnoqCsDB+JfRvHQept5eW8PaJje4TznrlUV4H6hgU+bse5Jpb1tuHXpgkzrO35XGUmLd8s1W5ju2UzWaVb75X1MvZ4wajt2YOpHqHBUe3kZ2c+KbSckBNpMEn4/zQ1ZUdQXogzJ249+fFFdNSSrVlkUHKau3WVgVnHYx+3mHQfAAB4gADb7aGCrLe8B+La5qdFl/QgUKDx4JU2JjrEU0MQrLi6anm6mtv/Plb+Pis/xMppfo6yCn0JgnwyzZeU/0OOBDloLC5jAuIYyHlS8n+nMkNmXqOiWU38I46v1sGXN80NYsVDMMN+8iARAvuwAOg7B4FxY0wHivVSmGqNziP2rb6niqgDaUhRKw7SxDUWos9tzXbFFSWWWEICrlxdskQC9itTaql6v0p5KDgeFg6cCxwlm9PSIIB5hFHuhHk4NS74WZfSr8yj8L0sDu6CU9lOWbzWgCd04jq901UBxu9hpSUKMtdx3GxJ+LRev4fFgawp2G0HkMRoBkKaz4Yd/vpVP0FCRIsFAA==) format('woff2');}
-text.f0 {font-family:ec-lmtt9;font-size:8.966376px}
-text.f1 {font-family:ec-lmss8;font-size:7.471995px}
-text.f2 {font-family:ec-lmss9;font-size:8.966376px}
-text.f3 {font-family:ec-lmr9;font-size:8.966376px}
-text.f4 {font-family:ec-lmr12;font-size:14.346196px}
-text.f9 {font-family:ec-lmr10;font-size:10.909088px}
+<![CDATA[@font-face{font-family:nf0;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAKUAA0AAAAABcAAAAJAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoIsggALDAABNgIkAxIEIAWCEQdDG58EAC4KY2NlvHeub+wv1e4QNIngebv/qnO7+w2g/j8aPo0Ri06lBcNRtEK+jjYdZUtESrCw0f4fgB8M22B66walCYrLwE25oisY53ov/oPRJ8wk3Xugm8BEZqgzd4SSZNQ2O1Tx+vr+JQR8/e6TF+Dx7fWd2v7IdsV1Beli+hiX3b/jxDONSCRFOwC6AmD+1rmb+dVr1/+zMms15jwByJBhoABTZAID5UrkcsGvwa/osgCiQgAiIQEAQntvSzqB+J8ECtAeFczDYkCOqgSSlOeDI9Ydik750vyJ9puef82lXS49bFx4MJ2XPf+60567eJtvn2fLnUs/fdftV1nS+eK9OH9/uyy+/QpTTc225y+4FXrplJaX2r30TfnJ8k/+u3hcefz900bPBz2ncamh0n39h4+HfnXy1GOPBeuryHfoGyDc40P8wx6UmcEo0NSQ8x6CN0Jtypttcj8136gUj1Q4S5QJzMCCAtiV+KdA8cuBYPL3Xy5f12XKX207ZN/u5XP9/2W2K2tFWwkEWStZVoYEJHIAcl71lsTyr0CgMEQCCSEwQxXQ1lYBkja6CpAprRSg0MEtASoyd2UibyfpjE5kZuhLFHo79VhFxesW2mKbI3bb4CB/G5syzz57HZZfPWibLUpNVXWlSUp7bfVNw0SjCKgDzbapwaeSFN88uG1L2azWy0nl3q2+05g4qlEfdZtustQWBx2yw3LLUkNVnZeaolGtW0o2wRrS8dxdIKRIkbXfcPDgvmPXk9ZBZZ9T) format('woff2');}
+@font-face{font-family:ec-lmtt9;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
+@font-face{font-family:ec-lmr9;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
+@font-face{font-family:ec-lmss8;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAATMAA0AAAAACOwAAAR2AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwoIBBEICodQhhkLHAABNgIkAzIEIAWCKQc8GzEHIB6FcbPzoNLEd6YsOhz5T+9Vf24F053qLJkeIQM7GWlB8BN+BM/zf8P73+8kYR5RoGmAJUWBLBzoCAYygvEm8vsfQLrr/52quW+hBI9iY1nEErIAjY61bQ1qariISsunQAtS8AnUV6YaVrdhCK/+oAvqTAng/PC9ABAAj46+XQ4AbxbXqHM3JY/mQwL2ZKcAzCp1+vJHaYBlK5gidwbytuQGAP7612b/eynLUdxxiwh3pIMRTQ5S/RKIugNaaUIg85ckRZ5itbropq/+TYDejTvvnKMO2mazTdZYHWEF9QAxQgHA6BBtASOSkDLKgRoWgJXil3A2fDl7RgCgJgYAVADQDuAMNAG0AwAAEaBjAIARz6JIFk0qNCbrUWhEnNY1ozakUAtyIA+yUaM22ZhU4pIqGhMrKimHb398OQjPMpkC9ZrwVLGJ6qxnZIx/rCgSn/UEw4qxwAU1QJfP2sK5V4ELvIECQqNfVZhenPmU5OATPKEKznhmUfGz+gPgMQcBDZvg6/iw4+S8SxNM1N8Je/08aNCIITDUAtumZ/Un9kFGT7U46dCO3o3xPtSc9YwmKNY2TWh9gqt5vdUEsR5cNP6+GT+kCY+GH6D08XjmUzp72aplxzifBbVOUGYWkcI4TXjGZ53YswJsqJ/wdBBi9MFexmZ6niS6tJ8/z/6yrHynXS25ql+NndK11av8jsb4WIOC/pkS24CLRYvO3JnW4WiHaWeuzq3FlEVLeq6LW9dr4dqpCDhSHh7qEh6XEPfzLLm/fBY9/wXzhvdqdLRLx/11C4YXl8fW5RmLtEVFDblxGPq7bd6p6t6QmlLfUHm3y+3e6xb27bNyYW8c1jK7VGeauZ5SWnZgoUtKsHseG9WqJMJbj86P6hvn61pkzNGdm/l51nWIeWL1x7GXPc9NyrF7lI+eUVM7ZUZdWY6vlJIeVBJfUklJabfE3zPCPTzTAu6C3TzRyOnY5G1IWl1NQpjnRT+v8fEuceHTcy5Pzwmf87IyMqjJuNeB+C6/baFivFvgiargGlfPQH9hqKp750qPif2aO4vWyd9trWvmxOGB+9qFlTGZ6XmXzJ/DA81g58dSSFO7if/frmJGWreMcL+iseaPH/LzBk2tM9PKq6Jdj7btfPlwQlRBdQIA4ADBdz7oIOJrwAFZeq2RAjMREEAy8bxM/wygpwYBCNj1x5DqxlG/Wrjw/ln5ITq1wFzKUQAWDAAQsPf/gcryfwDYB+GDbKUX7ADQArARFfm/utSgNtsgEi8c5T+Eluec4NvpFBcUKkYAVQoZADAAIUAcHQAAFl0RAGAkNgQABC6qEACQcKtBAEBmcRIC6qxgFFBZQYZmrKSVyefKmtiO3voYZJAw6H0OGhQGpOinr8F0v4G66UITQOdHE0HTRT2fpR6A9hduCcgPBbQD+MPvumZdPbBbFy1A99MitC71Pnksbcw/3Mffz+e1rgAYV2egQXokL2n8E0bwdT3bX/dD4ijCLQEwvE4FEKYFNx4C108nSZMhXyEAAA==) format('woff2');}
+@font-face{font-family:ec-lmr10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
+@font-face{font-family:ec-lmss9;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAJMAA0AAAAABVgAAAH3AAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkoIBBEICoE8gTMLDAABNgIkAxQEIAWCKQcsG10EERWbZyC+PKDHbjUSGQ97GhVe1JV+cYX+ZjNlyBPJSN6Ph3/Wvt33ZuavSsI1qUjmkM2jlsL+Bo0QJVoTi9sEdbpcZ94hHW2/7ntHGYIqrL6HCVj1lMa1senj258ylLbxf+yMuyhLJKNQfix+BjYc4keUzp9X5+kmMsY5N716ghFMXPkUETQJAR//+hy+dLItxiOnxjMVeT/f4SEeF99YJKkqAAQA7Dy/7izmW190/z8czjoIQIECowRYqxAYpTQNNaWQ5lv/H1z//yEBEDUCEIkUgBN4hX8uoeTxeQPxX4IKNKOGiZgBKDFHgpRl2Rat0VK1lftbqua2aK6aPzV7uCWbtV2P1rKlKLl7X8v4l40vv49z0JyXO9+3euVNnR9h466uf18/uWjBqgWDE/7GHvAmzF060FD6p1r1mZEihQIFVEIPtRjqOL4cCCbtGPhEx9LBxpbixy4sYTw5PutolCDIOg7nNsjxAgBQxRXjIbaRWfyGEwKVdgkSIbDSHECj8wKkSqsAhcmOC1Bp8VqAmkZvFaJskpqhrLBZN6v0u7W1Ruj0u9xKCbh6rSqA9V6PL72wLYlcp2igNImpVqAmZIIUee0MvjqKlt8r6V05mFN8JGtYiKlciTlgv7SV07wiM3R4mbRbVxh7LDcASKOqOMCpVwMA) format('woff2');}
+@font-face{font-family:ec-lmr12;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
+text.f4 {font-family:ec-lmtt9;font-size:8.966376px}
+text.f5 {font-family:ec-lmss8;font-size:7.471995px}
+text.f6 {font-family:ec-lmss9;font-size:8.966376px}
+text.f7 {font-family:ec-lmr9;font-size:8.966376px}
+text.f8 {font-family:ec-lmr12;font-size:14.346196px}
+text.f9 {font-family:nf0;font-size:10.909088px}
+text.f10 {font-family:ec-lmr10;font-size:10.909088px}
]]>
</style>
<g id='page1'>
@@ -31,7 +33,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</script>
</defs>
<rect x='-71.999989' y='-71.999989' height='255.118106' width='453.543292' fill='#fff'/>
-<text class='f4' x='20.991396' y='-36.786748'>
+<text class='f8' x='20.991396' y='-35.844009'>
<tspan fill='#3333b3'>Presen</tspan>
<tspan fill='#3333b3' x='61.452587'>tation</tspan>
<tspan fill='#3333b3' x='102.814193'>example</tspan>
@@ -41,7 +43,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
<tspan fill='#3333b3' x='215.583696'>edded</tspan>
<tspan fill='#3333b3' x='256.164999'>video</tspan>
</text>
-<text class='f9' x='73.348038' y='-19.725772'>
+<text class='f10' x='73.348038' y='-18.783033'>
<tspan fill='#3333b3'>Use</tspan>
<tspan fill='#3333b3' x='94.317851'>a</tspan>
<tspan fill='#3333b3' x='103.408752'>W</tspan>
@@ -51,7 +53,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
<tspan fill='#3333b3' x='168.681506'>and</tspan>
<tspan fill='#3333b3' x='189.893486'>press</tspan>
</text>
-<g stroke-miterlimit='10' transform='translate(226.756681,-23.30713)scale(0.996264,-0.996264)'>
+<g stroke-miterlimit='10' transform='translate(226.756681,-22.364391)scale(0.996264,-0.996264)'>
<g fill='#3333b3' stroke='#3333b3'>
<g stroke-width='0.4'>
<g stroke='#4c4c4c'>
@@ -62,11 +64,11 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
<g transform='translate(-7.27423,-2.6519)'>
-<g stroke='none' transform='scale(-1.00375,1.00375)translate(226.756681,-23.30713)scale(-1,-1)'>
+<g stroke='none' transform='scale(-1.00375,1.00375)translate(226.756681,-22.364391)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
-<text class='f2' x='226.756681' y='-23.30713'>F11</text>
+<text class='f6' x='226.756681' y='-22.364391'>F11</text>
</g>
</g>
</g>
@@ -77,16 +79,16 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f9' x='139.582264' y='18.182487'>AlexG<tspan x='110.438258' y='59.570449'>25th</tspan>
-<tspan x='135.286796'>Jan</tspan>
-<tspan x='152.10502'>uary</tspan>
-<tspan x='177.287008'>2021</tspan>
+<text class='f10' x='139.582264' y='19.125226'>AlexG<tspan x='110.362401' y='60.513188'>19th</tspan>
+<tspan x='135.210939'>Octob</tspan>
+<tspan x='164.60524'>er</tspan>
+<tspan x='177.362879'>2021</tspan>
</text>
-<rect x='-43.653545' y='87.08414' height='.3985' width='119.056331'/>
-<text class='f3' x='-43.653545' y='102.302052'>Na<tspan x='-32.391712'>vigate</tspan>
+<rect x='-43.653545' y='86.37709' height='.3985' width='119.056331'/>
+<text class='f7' x='-43.653545' y='101.595001'>Na<tspan x='-32.391712'>vigate</tspan>
<tspan x='-4.998105'>with</tspan>
</text>
-<g stroke-miterlimit='10' transform='translate(31.040003,99.358439)scale(0.996264,-0.996264)'>
+<g stroke-miterlimit='10' transform='translate(31.040003,98.651389)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke='#4c4c4c'>
@@ -97,11 +99,11 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
<g transform='translate(-12.90393,-2.17967)'>
-<g stroke='none' transform='scale(-1.00375,1.00375)translate(31.040003,99.358439)scale(-1,-1)'>
+<g stroke='none' transform='scale(-1.00375,1.00375)translate(31.040003,98.651389)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
-<text class='f1' x='31.040003' y='99.358439'>P<tspan x='35.891707'>ageUp</tspan>
+<text class='f5' x='31.040003' y='98.651389'>P<tspan x='35.891707'>ageUp</tspan>
</text>
</g>
</g>
@@ -113,8 +115,8 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f3' x='49.159296' y='102.302052'>&amp;</text>
-<g stroke-miterlimit='10' transform='translate(74.588879,99.358439)scale(0.996264,-0.996264)'>
+<text class='f7' x='49.159296' y='101.595001'>&amp;</text>
+<g stroke-miterlimit='10' transform='translate(74.588879,98.651389)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke='#4c4c4c'>
@@ -125,11 +127,11 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
<g transform='translate(-13.04713,-2.17967)'>
-<g stroke='none' transform='scale(-1.00375,1.00375)translate(74.588879,99.358439)scale(-1,-1)'>
+<g stroke='none' transform='scale(-1.00375,1.00375)translate(74.588879,98.651389)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
-<text class='f1' x='74.588879' y='99.358439'>P<tspan x='79.440584'>ageDn</tspan>
+<text class='f5' x='74.588879' y='98.651389'>P<tspan x='79.440584'>ageDn</tspan>
</text>
</g>
</g>
@@ -141,12 +143,12 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f3' x='89.779047' y='102.302052'>,<tspan x='95.410746'>toggle</tspan>
+<text class='f7' x='89.779047' y='101.595001'>,<tspan x='95.410746'>toggle</tspan>
<tspan x='122.548311'>F</tspan>
<tspan x='127.795308'>ull-Screen</tspan>
<tspan x='170.31652'>with</tspan>
</text>
-<g stroke-miterlimit='10' transform='translate(199.738462,99.358439)scale(0.996264,-0.996264)'>
+<g stroke-miterlimit='10' transform='translate(199.738462,98.651389)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke='#4c4c4c'>
@@ -157,11 +159,11 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
<g transform='translate(-6.26295,-2.17967)'>
-<g stroke='none' transform='scale(-1.00375,1.00375)translate(199.738462,99.358439)scale(-1,-1)'>
+<g stroke='none' transform='scale(-1.00375,1.00375)translate(199.738462,98.651389)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
-<text class='f1' x='199.738462' y='99.358439'>F11</text>
+<text class='f5' x='199.738462' y='98.651389'>F11</text>
</g>
</g>
</g>
@@ -172,7 +174,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f3' x='208.169796' y='102.302052'>.<tspan x='-43.653545' y='120.981971'>T</tspan>
+<text class='f7' x='208.169796' y='101.595001'>.<tspan x='-43.653545' y='120.274921'>T</tspan>
<tspan x='-37.765957'>o</tspan>
<tspan x='-30.086438'>build</tspan>
<tspan x='-6.535404'>this</tspan>
@@ -183,62 +185,26 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
<tspan x='101.643449'>source,</tspan>
<tspan x='132.436952'>run:</tspan>
</text>
-<text class='f0' x='-43.653545' y='133.186236'>dvilualatex<tspan x='12.834672'>beamer-example</tspan>
-<tspan x='-43.653545' y='144.14514'>dvilualatex</tspan>
+<text class='f4' x='-43.653545' y='132.479186'>dvilualatex<tspan x='12.834672'>beamer-example</tspan>
+<tspan x='-43.653545' y='143.43809'>dvilualatex</tspan>
<tspan x='12.834672'>beamer-example</tspan>
-<tspan x='-43.653545' y='155.104044'>dvisvgm</tspan>
+<tspan x='-43.653545' y='154.396994'>dvisvgm</tspan>
<tspan x='-5.994738'>--bbox=papersize</tspan>
<tspan x='74.030241'>--font-format=woff2</tspan>
<tspan x='168.177279'>--zoom=-1</tspan>
<tspan x='215.25079'>--page=-</tspan>
<tspan x='257.616949'>--output=%f-%0p.svg</tspan>
<tspan x='351.763986'>\</tspan>
-<tspan x='281.1528' y='166.062948'>beamer-example</tspan>
+<tspan x='281.1528' y='165.355898'>beamer-example</tspan>
+</text>
+<text class='f9' x='357.755493' y='-60.858816'>
+<tspan fill='#bfbfbf'>ï </tspan>
</text>
-<g stroke-miterlimit='10' transform='translate(354.729351,-63.97284)scale(0.996264,-0.996264)'>
-<g fill='#c0c0c0' stroke='#c0c0c0'>
-<g stroke-width='0.4'>
-<g fill='#fff' stroke='#fff'>
-<path d='M -1.0 -5.5 M -1.0 -5.5 L -1.0 5.5 L 10.0 5.5 L 10.0 -5.5 Z M 10.0 5.5'/>
-</g>
-<g stroke-width='1.6'>
-<path d='M 0.6 0.0 L 9.0 0.0' fill='none'/>
-<g transform='matrix(-1.0,0.0,0.0,-1.0,4.50002,0.0)'>
-<g stroke-dasharray='none' stroke-dashoffset='0.0'>
- <g stroke-linejoin='round'>
- <g stroke-linecap='round'>
- <path d=' M 0.0 4.70001 L 4.70001 0.0 L 0.0 -4.70001 ' fill='none'/>
- </g>
- </g>
- </g>
-</g>
-</g>
-</g>
-</g>
-</g>
<a xlink:href='beamer-example-2.svg' xlink:title='beamer-example-2.svg'>
-<rect fill='none' stroke='#adade0' stroke-width='.5' x='366.739688' y='-70.151548' width='12.955168' height='12.35741'/>
-<g stroke-miterlimit='10' transform='translate(369.032966,-63.97284)scale(0.996264,-0.996264)'>
-<g fill='#aeaee1' stroke='#aeaee1'>
-<g stroke-width='0.4'>
-<g fill='#fff' stroke='#fff'>
-<path d='M -1.0 -5.5 M -1.0 -5.5 L -1.0 5.5 L 10.0 5.5 L 10.0 -5.5 Z M 10.0 5.5'/>
-</g>
-<g stroke-width='1.6'>
-<path d='M -1.0 0.0 L 7.4 0.0' fill='none'/>
-<g transform='translate(3.49998,0.0)'>
-<g stroke-dasharray='none' stroke-dashoffset='0.0'>
- <g stroke-linejoin='round'>
- <g stroke-linecap='round'>
- <path d=' M 0.0 4.70001 L 4.70001 0.0 L 0.0 -4.70001 ' fill='none'/>
- </g>
- </g>
- </g>
-</g>
-</g>
-</g>
-</g>
-</g>
+<rect fill='none' stroke='#adade0' stroke-width='.5' x='369.149393' y='-70.904267' width='10.545452' height='11.909088'/>
+<text class='f9' x='369.649393' y='-60.858816'>
+<tspan fill='#adade0'>ï¡</tspan>
+</text>
</a>
</g>
</svg> \ No newline at end of file
diff --git a/macros/latex/contrib/media4svg/example/beamer-example-2.svg b/macros/latex/contrib/media4svg/example/beamer-example-2.svg
index 531d7cb33b..d346676b36 100644
--- a/macros/latex/contrib/media4svg/example/beamer-example-2.svg
+++ b/macros/latex/contrib/media4svg/example/beamer-example-2.svg
@@ -1,22 +1,24 @@
<?xml version='1.0' encoding='UTF-8'?>
-<!-- This file was generated by dvisvgm 2.9.1 -->
+<!-- This file was generated by dvisvgm 2.11.1 -->
<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' viewBox='-72 -72 453.543293 255.118107'>
<defs>
<script type='text/javascript'>
<![CDATA[
-function $(id) {return document.getElementById("msvg@"+id.toString().trim());};
+function $(id) {return document.getElementById("msvg_"+id.toString().trim());};
]]>
</script>
</defs>
<style type='text/css'>
-<![CDATA[@font-face{font-family:ec-lmtt10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
-@font-face{font-family:ec-lmri10;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAP8AA0AAAAAB4QAAAOoAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAglIIBBEICoVQhHALDgABNgIkAxgEIAWCLwcuGy4GIB6HsWN6SUYyQttrPcCOIFkjZ/fgERRwgSUgaGIjCIQCEraOUNZVoqxqquoe/u87/TutZ2tsKmxcg8lX30kK+gH4k1EA//N/ucNFY4l8uuf3fIMd6ZzNoVulF0igF25aFlikxRhqL2DK2tWu8lJsjMV4ibq7CAHf9twbBuD7u5DevBvlLdQN4uQdkYMA7sk4fgPTy5HNgmnDhfvPeGcBOK220J7lSMhRIBiWFiUd6IR3R8ClA8QsAxo1SpxWrHa2GCaYPLQTsoyagBskkuofUAWm9BEq8r1Gsx5AzAYRUINWNOMfQPQBUGIJEVBKWZaToRipKAQRVVt5lBBvPskfxAKVQ1d2YcGRScSPJYSBSwfHxoYQ/xIWXAHeVUJ4/TKK4a3v23VqHuOn1w8eXCKEh6HxChb0q1zBAsRnX0f8c1gQNVnDR65iDE9rqPAI4ZD63E5CCDyNuH7gDRBC7dihqd6q9vUoplNEjSt8+L6DW7eOoUr+JhYsA091BXhXdK5gwSbi68fOoR1PdKKGgaed1cnREkwl+Mhs3/r6MNA6q8FX/mH2+4WeI2cJYezO64j2QGr0GXkm7gx1OVdsTELsrnQMY1FRz25M00rB3TS+Og4/b8TiE8eouKnRRr+AHC+HXI4oXjCjmbPQ7FUmr/rW1NN1RklSt1sLOM+6sHzTZkujJjs1XVVVpxln+3uWCY6xIfvMou1DPG/RrHaVf2S4Yvnmra6vXqtpmakXBliaiePfclr3Tae0DmhdmXUpDKE8NLa4iXoeaWu/8FPNoMNQ69wBl2ZReFGry1FVfKMoc26dpUOrf2yS5Gz4zkj3qPnSL8npT6d71e5xq74iM8hA4+usIXZcPrhNxXiNpnVvNaRZFHc0HbYgm53UdNXVPZhtXGc9qib10KxlNFWaYb3XDADPESxdvUNSzF/WdgnxHwgXFTECKoqKG/62REwlDL0zQvDlYGZXqrzTfymi+HOU/BLa7FfRAJFRAI0SBPng/1dIKFhg9r5oACAAQB0XgQaIPQDxFSoKlsgchkgItWPEQCIE1qMAaHQGAqnWLkBhUrqCSoun+2tN3oOoKJukViAo7KQKKv3azq51W4MixSrkY2KAS5cr8plN/lalSlS9vkKubCQWCgPJASlbJuvZjquczRoTizUWRhXBZ6vQ9orcbJJFMUgHMjvTmsiEU7Y1k2V9uykDOCpbhUr55D0SkzCFV+YqJsUA4hwWXAMgWVb/JDrdLkwC) format('woff2');}
-@font-face{font-family:ec-lmr10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
-@font-face{font-family:ec-lmr12;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAARgAA0AAAAACFgAAAQKAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgmoIBBEICoZ0hVgLFgABNgIkAygEIAWCJgc2G70GQB4FbuwMO1HJ+WaCragoeJ7HTf/cCPLSemBK95g4TNwpM5F0nkxUvrsQfX/bd/0CiSMLmonTALPA05gTiCAo/zsK5v+ax1Hi94+O5Fp8QFEp3CATLoKoslkF0HC0N0GbbTZla8GCGEOdp72ioJYCBPDybe8dAnj7u/57zt5Sr9UubBi3cTcQUIq8GpUBnbY7gJEF2GLg0W0SkPnK1P+3MiIPiAHBcJjFV5mNYpJN2nqWniBPhCEkY7LpZpn71f9A8CTEp/6/1inHHXW4CKKwZAChigQwKCE4pv/H6oEQwoggaVHHS2Y5ID8CQAFwQXnICLICABZIMwAYrM1q7PWbVV3iEpMScaSY1s2VDuLYuVbGsdVSGerX5NbLrHOzY+KeI+dUebng/OUKo/fvDw6WG3v06N1OvvhXxB5KcBkeUv4rrHs1KKV0X1f+AeVfuOu618TrcvV5J3i2wmH42FO+e8Mryr/tuddEcoOD4r2GKucEr9/fJKPOvn737d7Zrx6v4Ih/QczIrY3rnOKiEzQb411R/qV1lxXfVfFAbMzy1ZgYT1d7SmZd/Vf8zHVeg4eDTteSzym+u08p8V5v8ZRPJB0o8RVQnLDOPdfJfegaySORI5/px7KPpZ/anhgp/byE/rYoMvqubx4J90/0ScyfPm5+ovqZcRO/nNpmijts9Hs9x7/+dXXMqUlZjfG+Em7x3fcHZNeWjR2zvOxC467dtkW3LYq9en+PnA0HPi83sMWYoujearVLH7nBfY4Ds1wn0qp8v0a13JN2lWHtimOFk/IGZ+dlhi3aMGb82vXD6nRJttPt1n9Xs49wv5NXo0Jx12yIH2/Yr2TeZsW7ejUK9LYmiRv7dStsMTL+VHHsntp3u/FrivnjJtv0rOux5Ti1HjDwRp56ddzqzdnhq7fct2ZdqTCZN6ZPZPyJmp331Oh432PfjPCnfTsJE7q/ecvCeY0KChbP7zaye/NWH6XquvvzC/bHandp0bLRyCpdejdZ2D/Rv6de1TSwFpPQ83iyhi6yjQTAjUKD+aawxbeNbwzZ7yiUaagXYBO21cvhkPxzIPLLAgTb6z72zNj8tr9GHPPzO1mvov/rPJ0HQIQBjNqitr/HiLwHMB5ilFc1kyRANvCrXhRNtbqZkiogOU/3lZJoKhKgdGQBMsCisSHp3hAxhQAw2HI0NqbqRgE2x2FLCFH/dkzSohgUGJh6KgK2OG/bkALnmWW2BRppjFnngkaNobu55lgkfX+BqSbTGktrSGtNm2yiFFJvjzWR0i2pGWlo5QNaqPqCqZN143RD3VpPnphKolHcTVKCNfWYVQ0yJltgoemJY1qjZA5ed/M3SjckqZNgJYBhONWvqpVb6aGnvgYY7AEAAA==) format('woff2');}
-text.f4 {font-family:ec-lmr12;font-size:14.346196px}
-text.f5 {font-family:ec-lmtt10;font-size:10.909088px}
-text.f7 {font-family:ec-lmri10;font-size:10.909088px}
-text.f9 {font-family:ec-lmr10;font-size:10.909088px}
+<![CDATA[@font-face{font-family:nf0;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAKUAA0AAAAABcAAAAJAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoIsggALDAABNgIkAxIEIAWCEQdDG58EAC4KY2NlvHeub+wv1e4QNIngebv/qnO7+w2g/j8aPo0Ri06lBcNRtEK+jjYdZUtESrCw0f4fgB8M22B66walCYrLwE25oisY53ov/oPRJ8wk3Xugm8BEZqgzd4SSZNQ2O1Tx+vr+JQR8/e6TF+Dx7fWd2v7IdsV1Beli+hiX3b/jxDONSCRFOwC6AmD+1rmb+dVr1/+zMms15jwByJBhoABTZAID5UrkcsGvwa/osgCiQgAiIQEAQntvSzqB+J8ECtAeFczDYkCOqgSSlOeDI9Ydik750vyJ9puef82lXS49bFx4MJ2XPf+60567eJtvn2fLnUs/fdftV1nS+eK9OH9/uyy+/QpTTc225y+4FXrplJaX2r30TfnJ8k/+u3hcefz900bPBz2ncamh0n39h4+HfnXy1GOPBeuryHfoGyDc40P8wx6UmcEo0NSQ8x6CN0Jtypttcj8136gUj1Q4S5QJzMCCAtiV+KdA8cuBYPL3Xy5f12XKX207ZN/u5XP9/2W2K2tFWwkEWStZVoYEJHIAcl71lsTyr0CgMEQCCSEwQxXQ1lYBkja6CpAprRSg0MEtASoyd2UibyfpjE5kZuhLFHo79VhFxesW2mKbI3bb4CB/G5syzz57HZZfPWibLUpNVXWlSUp7bfVNw0SjCKgDzbapwaeSFN88uG1L2azWy0nl3q2+05g4qlEfdZtustQWBx2yw3LLUkNVnZeaolGtW0o2wRrS8dxdIKRIkbXfcPDgvmPXk9ZBZZ9T) format('woff2');}
+@font-face{font-family:ec-lmtt10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
+@font-face{font-family:ec-lmri10;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAQAAA0AAAAAB4gAAAOpAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAglIIBBEICoVQhHALDgABNgIkAxgEIAWCMgcuGzEGUZQuShTiZ0Lmpodm5VAucSgRESXbSimHbNSi/uHZePh+7fXc+/ZvEBSBhPGoCFR0UgKjgcYDCldhq+tqSVZ1qoD3+PeySeuXGtkKWdTiQdlKPOlPdPzXHuD8X07/oLst8ukEN9iRzsYaulXaGmjhphuWZVqMofYCpvx5vWa5dNCU8JyM7X9fCHi38bEL8KHttMc8HXkrmnCTd/IQcC8N4xNmVCTrhRqDz+NLTokALiop8o2h8OyBMyxXam6sE+6XQ/HHZRlo1y5xUZaSxrF451lnA9w8akL2SCQ1P2ALvvIRWtL3ms4yIBoJatCNTnwFiBEAKiziAJWUVTUfohET3oG3eqqTLu6LUMKODkRJHL66hqijA9iOEJztMXmot7cT23EZUVfhNZx94woWXDu3tXZ6DKHBG4cOTeLsI2AHotokriIK22FwA9txHlGBAy04GojRNSQjUYuzO6VHV3E2lAltg+04Wz6kc7C3LH+D5RSKgX0EjkQ7tLjYixXsWEDUFJSchlcVriJqAduhHDKK7XikENgFqTUz0FOTgwKOTrbm5roA1lsNXP2HmW2zHbrP4eyQ1RsYrYev5zlxNvQseSWFq5eHi+IPZkyIKpn2yuqJ2GmGFYWiFxWIWy2WDB3sqXB1T3Y0TzHkRDr/ZZPHqxxzhSWPaDrYDIvxKorJgeFQIxLmd9RVqzSVUpSUtBy2MruvG24R4r2lFWTm7XCbpreW94lhg4SRs83rN1JyWtIZ7rpa3OiBkFy35qDcQbmrI9YZ3qS9zH5bzsgjTczGf0mp1KvKnT9oXcUJWyWKhpKib0UFzs+xFGhlTzQirVTfqyke0578zTs9iOJO0yc1yqJMTxWZbyOqyMK0Y0lCfZYmd3/Gm5+BhPkDdYgqSylFaWl7scx9RlZKZHHM4RHdIDInXn9TCwCvA5ZWVni5fGEt83C/9yhODiujgriteJMn/grG3hlD8LDD/GeMsOU3Prx8Pkp+yXTzrbhnD9AuQZCPmm/CCws0n4o7DABQx3U0QByAeCu/sARklwAYaqe4QCIENpAAtLsEA6nWK0CxIIFIS5dX52sd3gCnqDqkblxS7JMkLaOou2uDFmTKki8NEwPcuJmfxjSlm3JkK3x9vhRJCCwkBoI5QpIE+rO9LDKZ2QZkQNaYhQk+XLXK8fyUJIJFMghzIilBH8p2m0wzfTOtf8M5BHAiSb4CafgdAhMzBw/NRUySAdgFWHEFgKT5+j/R8TZf4QAAAA==) format('woff2');}
+@font-face{font-family:ec-lmr10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
+@font-face{font-family:ec-lmr12;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAARcAA0AAAAACFwAAAQHAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgmoIBBEICoZ0hVgLFgABNgIkAygEIAWCKQc2G8AGIB6FcbNzhIhKE9+ZQtStRZAs09m94tI6tXEpDT0zs4wcwE2jABoeHBoYmMDgdFwqqj78e/rntk42p3O2dHLaiXiQiqfkAfSfUAX/8385/v9fyxLooougLR7Qv0HNDdRZY4IkvAjGGpitARRGvQStN1sOy8ggBJ1XryiolRDwas+TecDrWS2WZ/+IOzENFflQchA8grR4iw8JsKwqgDy2ADtc3WZ2ADR+h5T7H6suj9GAQCwFWsYnwY0paDOZI9CpWao1dNRVD71/x/8AsAPyqf+bL7v4wvOpEJASNQRDIkHSR1Aq/D9lBWqaaAbatTjeTA4FxP9I0Ar6wTBEHxC7ACixSAJSuRpza1zKvIkD0RB3QhN72NSSJBNabimrouXUYFIh+GL3etwzNU0OBpqsovDlxNXrnRtnzxbnOjYvXHiQtibCBiKvgLgenlPCLYy5LVajujHG6RglrDmw5Q4xpG+8SouXnefDRwMlMNtuUcKeK3cIsRTnEsOdtEq0ePeovopaeffg3vDc24udaSKsIdLS7fN+FYUntBjZZNhACevGrLdcG0kIkgtKl097QXbpS6rGBN8SqrYYwk6KqZvRNdIEZhZFEcNdCocIKMVmJd8CWrXlYOPz6eaH9tEuUC14w52pORN6YTJbTwoNLPfZTtV44NMpZRGbz/bt2tKX9V7R0v6+c3wnprLxSU7r3Y/ekE7ojT6tAqXd4uOnxTWjjc1NQ41rdBmZk9STBmhuH822MM9561gS3WSnnunlX31qG3MFc3owtCrWqZD3Y5bKPSoT7TW2HazKavpUVQ4wN7WONlUGpGsTuUTTF18+xVHaysfZPqNGgW9seKF7n/EUG27wseEm6dnthZm20fUOF+w1h/wPMg6b7PGD1U/ielyQySKqfXHJdry43TJyfE3tyAlHRo2pxukMTfmq1iW+aTN8Uo6c+VQndPncAdLc/fUZorTibWwG9s2sz4qKfRESyMy2tpmt8U+PjuHrPdLz9P2L2KIcbkREZSYpKWex1oezmxwL8JRgaW2HUoZPuu0K+SNLIpVgD5RCOfb7FeTPgcgvEwTXv+rcZuuEr8209O2trF/v/495MY+BZkkSnsKO96jLJ0C+RMhurdEdWiDOgXzDLjl4xU5Mhg20+2wfuCcHFwSttsigBYx+toQCaHYL+FRpNxUpLGgiK20e9681e4ZClGqkVoCKwgk7ZGWQeddat3W401M/PB3cPejH64ADvfUyQP1+P511xNEJFY4Th9NRu5BUziHlxdIKCAe6iA4P39Biqt2vc0dOFxrOxXEd20P60FYUHxvCh4c8awWABvP99Ne1OV2ObWjBK29hPjQcja0oVwaQxNr6u2r1ZdlyFChW5hgA) format('woff2');}
+text.f2 {font-family:ec-lmtt10;font-size:10.909088px}
+text.f3 {font-family:ec-lmri10;font-size:10.909088px}
+text.f8 {font-family:ec-lmr12;font-size:14.346196px}
+text.f9 {font-family:nf0;font-size:10.909088px}
+text.f10 {font-family:ec-lmr10;font-size:10.909088px}
]]>
</style>
<g id='page2'>
@@ -27,11 +29,11 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</script>
</defs>
<rect x='-71.999989' y='-71.999989' height='255.118106' width='453.543292' fill='#fff'/>
-<text class='f4' x='-63.495975' y='-50.743793'>
+<text class='f8' x='-63.495975' y='-50.743793'>
<tspan fill='#3333b3'>Video</tspan>
<tspan fill='#3333b3' x='-23.310372'>ï¬le</tspan>
</text>
-<text class='f9' x='-43.653545' y='-25.961954'>Em<tspan x='-27.441878'>b</tspan>
+<text class='f10' x='-43.653545' y='-25.961954'>Em<tspan x='-27.441878'>b</tspan>
<tspan x='-21.078306'>edded</tspan>
<tspan x='10.436767'>lo</tspan>
<tspan x='19.224624'>cal</tspan>
@@ -41,14 +43,14 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
<tspan x='108.345603'>pac</tspan>
<tspan x='124.406187'>kage</tspan>
</text>
-<text class='f7' x='149.557993' y='-25.961954'>mwe</text>
-<text class='f5' x='-43.653545' y='-3.446381'>\includemedia[width=24em,height=13.5em]{}{example-movie.mp4}</text>
+<text class='f3' x='149.557993' y='-25.961954'>mwe</text>
+<text class='f2' x='-43.653545' y='-3.446381'>\includemedia[width=24em,height=13.5em]{}{example-movie.mp4}</text>
<g transform='translate(23.862603,156.213196) scale(-1,-1) translate(23.862603,156.213196) scale(-1)'>
</g>
-<svg height='0' id='msvg@kbdCtrl@0' onfocus='' onkeydown='event.preventDefault();event.stopPropagation();switch(event.key){case" ":if($("0").paused){$("0").play();}else{$("0").pause();}break;case"ArrowUp":if(event.ctrlKey){$("0").muted=false;}else{try{$("0").volume+=0.02;}catch(e){}}break;case"ArrowDown":if(event.ctrlKey){$("0").muted=true;}else{try{$("0").volume-=0.02;}catch(e){}}break;case"ArrowLeft":if(event.ctrlKey){$("0").currentTime-=$("0").duration/10;}else{$("0").currentTime-=$("0").duration/100;}break;case"ArrowRight":if(event.ctrlKey){$("0").currentTime+=$("0").duration/10;}else{$("0").currentTime+=$("0").duration/100;}break;case"Home":$("0").currentTime=0;break;case"End":$("0").currentTime=$("0").duration;break;case"F11":if($("0").requestFullscreen){$("0").requestFullscreen();}break;}' width='0'/>
+<svg height='0' id='msvg_kbdCtrl_0' onfocus='' onkeydown='event.preventDefault();event.stopPropagation();switch(event.key){case" ":if($("0").paused){$("0").play();}else{$("0").pause();}break;case"ArrowUp":if(event.ctrlKey){$("0").muted=false;}else{try{$("0").volume+=0.02;}catch(e){}}break;case"ArrowDown":if(event.ctrlKey){$("0").muted=true;}else{try{$("0").volume-=0.02;}catch(e){}}break;case"ArrowLeft":if(event.ctrlKey){$("0").currentTime-=$("0").duration/10;}else{$("0").currentTime-=$("0").duration/100;}break;case"ArrowRight":if(event.ctrlKey){$("0").currentTime+=$("0").duration/10;}else{$("0").currentTime+=$("0").duration/100;}break;case"Home":$("0").currentTime=0;break;case"End":$("0").currentTime=$("0").duration;break;case"F11":if($("0").requestFullscreen){$("0").requestFullscreen();}break;case"Tab":event.target.blur();break;}' width='0'/>
<foreignObject height='147.27267' ontouchstart='event.preventDefault();event.stopPropagation();if($("0").paused){$("0").play();}else{$("0").pause();}return;' style='cursor: pointer;' transform='translate(23.862603,8.940526)' width='261.81812'>
-<video height='100%' id='msvg@0' onclick='event.stopPropagation();' oncontextmenu='event.stopPropagation();' onkeydown='event.preventDefault();event.stopPropagation();switch(event.key){case" ":if(event.target.paused){event.target.play();}else{event.target.pause();}break;case"ArrowUp":if(event.ctrlKey){event.target.muted=false;}else{try{event.target.volume+=0.02;}catch(e){}}break;case"ArrowDown":if(event.ctrlKey){event.target.muted=true;}else{try{event.target.volume-=0.02;}catch(e){}}break;case"ArrowLeft":if(event.ctrlKey){event.target.currentTime-=event.target.duration/10;}else{event.target.currentTime-=event.target.duration/100;}break;case"ArrowRight":if(event.ctrlKey){event.target.currentTime+=event.target.duration/10;}else{event.target.currentTime+=event.target.duration/100;}break;case"Home":event.target.currentTime=0;break;case"End":event.target.currentTime=event.target.duration;break;case"F11":if(event.target.requestFullscreen){event.target.requestFullscreen();}break;}' onmousedown='event.preventDefault();event.stopPropagation();if(event.button==0)event.target.pause();' onmouseup='event.preventDefault();event.stopPropagation();if(event.button==0)event.target.play();' onplaying='$("kbdCtrl@0").focus();event.target.focus();' width='100%' x='0' xmlns='http://www.w3.org/1999/xhtml' y='0'>
+<video height='100%' id='msvg_0' onclick='event.stopPropagation();' oncontextmenu='event.stopPropagation();' onkeydown='event.preventDefault();event.stopPropagation();switch(event.key){case" ":if(event.target.paused){event.target.play();}else{event.target.pause();}break;case"ArrowUp":if(event.ctrlKey){event.target.muted=false;}else{try{event.target.volume+=0.02;}catch(e){}}break;case"ArrowDown":if(event.ctrlKey){event.target.muted=true;}else{try{event.target.volume-=0.02;}catch(e){}}break;case"ArrowLeft":if(event.ctrlKey){event.target.currentTime-=event.target.duration/10;}else{event.target.currentTime-=event.target.duration/100;}break;case"ArrowRight":if(event.ctrlKey){event.target.currentTime+=event.target.duration/10;}else{event.target.currentTime+=event.target.duration/100;}break;case"Home":event.target.currentTime=0;break;case"End":event.target.currentTime=event.target.duration;break;case"F11":if(event.target.requestFullscreen){event.target.requestFullscreen();}break;case"Tab":event.target.blur();break;}' onmousedown='event.preventDefault();event.stopPropagation();if(event.button==0)event.target.pause();' onmouseup='event.preventDefault();event.stopPropagation();if(event.button==0)event.target.play();' onplaying='$("kbdCtrl_0").focus();event.target.focus();' width='100%' x='0' xmlns='http://www.w3.org/1999/xhtml' y='0'>
<source src='data:audio/mpeg;base64,
AAAAIGZ0eXBpc29tAAACAGlzb21pc28yYXZjMW1wNDEAAAAIZnJlZQACn0NtZGF0AAACrgYF//+q3EXpvebZSLeWLNgg2SPu
73gyNjQgLSBjb3JlIDE0OCByMjc5NSBhYWE5YWE4IC0gSC4yNjQvTVBFRy00IEFWQyBjb2RlYyAtIENvcHlsZWZ0IDIwMDMt
@@ -2757,52 +2759,16 @@ AG1kaXJhcHBsAAAAAAAAAAAAAAAALWlsc3QAAAAlqXRvbwAAAB1kYXRhAAAAAQAAAABMYXZmNTcuNzEu
</video>
</foreignObject>
<a xlink:href='beamer-example-1.svg' xlink:title='beamer-example-1.svg'>
-<rect fill='none' stroke='#adade0' stroke-width='.5' x='352.436072' y='-70.151548' width='12.955168' height='12.35741'/>
-<g stroke-miterlimit='10' transform='translate(354.729351,-63.97284)scale(0.996264,-0.996264)'>
-<g fill='#aeaee1' stroke='#aeaee1'>
-<g stroke-width='0.4'>
-<g fill='#fff' stroke='#fff'>
-<path d='M -1.0 -5.5 M -1.0 -5.5 L -1.0 5.5 L 10.0 5.5 L 10.0 -5.5 Z M 10.0 5.5'/>
-</g>
-<g stroke-width='1.6'>
-<path d='M 0.6 0.0 L 9.0 0.0' fill='none'/>
-<g transform='matrix(-1.0,0.0,0.0,-1.0,4.50002,0.0)'>
-<g stroke-dasharray='none' stroke-dashoffset='0.0'>
- <g stroke-linejoin='round'>
- <g stroke-linecap='round'>
- <path d=' M 0.0 4.70001 L 4.70001 0.0 L 0.0 -4.70001 ' fill='none'/>
- </g>
- </g>
- </g>
-</g>
-</g>
-</g>
-</g>
-</g>
+<rect fill='none' stroke='#adade0' stroke-width='.5' x='357.255493' y='-70.904267' width='10.545452' height='11.909088'/>
+<text class='f9' x='357.755493' y='-60.858816'>
+<tspan fill='#adade0'>ï </tspan>
+</text>
</a>
<a xlink:href='beamer-example-3.svg' xlink:title='beamer-example-3.svg'>
-<rect fill='none' stroke='#adade0' stroke-width='.5' x='366.739688' y='-70.151548' width='12.955168' height='12.35741'/>
-<g stroke-miterlimit='10' transform='translate(369.032966,-63.97284)scale(0.996264,-0.996264)'>
-<g fill='#aeaee1' stroke='#aeaee1'>
-<g stroke-width='0.4'>
-<g fill='#fff' stroke='#fff'>
-<path d='M -1.0 -5.5 M -1.0 -5.5 L -1.0 5.5 L 10.0 5.5 L 10.0 -5.5 Z M 10.0 5.5'/>
-</g>
-<g stroke-width='1.6'>
-<path d='M -1.0 0.0 L 7.4 0.0' fill='none'/>
-<g transform='translate(3.49998,0.0)'>
-<g stroke-dasharray='none' stroke-dashoffset='0.0'>
- <g stroke-linejoin='round'>
- <g stroke-linecap='round'>
- <path d=' M 0.0 4.70001 L 4.70001 0.0 L 0.0 -4.70001 ' fill='none'/>
- </g>
- </g>
- </g>
-</g>
-</g>
-</g>
-</g>
-</g>
+<rect fill='none' stroke='#adade0' stroke-width='.5' x='369.149393' y='-70.904267' width='10.545452' height='11.909088'/>
+<text class='f9' x='369.649393' y='-60.858816'>
+<tspan fill='#adade0'>ï¡</tspan>
+</text>
</a>
</g>
</svg> \ No newline at end of file
diff --git a/macros/latex/contrib/media4svg/example/beamer-example-3.svg b/macros/latex/contrib/media4svg/example/beamer-example-3.svg
index febba64f7f..9417dd11fb 100644
--- a/macros/latex/contrib/media4svg/example/beamer-example-3.svg
+++ b/macros/latex/contrib/media4svg/example/beamer-example-3.svg
@@ -1,20 +1,22 @@
<?xml version='1.0' encoding='UTF-8'?>
-<!-- This file was generated by dvisvgm 2.9.1 -->
+<!-- This file was generated by dvisvgm 2.11.1 -->
<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' viewBox='-72 -72 453.543293 255.118107'>
<defs>
<script type='text/javascript'>
<![CDATA[
-function $(id) {return document.getElementById("msvg@"+id.toString().trim());};
+function $(id) {return document.getElementById("msvg_"+id.toString().trim());};
]]>
</script>
</defs>
<style type='text/css'>
-<![CDATA[@font-face{font-family:ec-lmtt10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
-@font-face{font-family:ec-lmr10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
-@font-face{font-family:ec-lmr12;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAUcAA0AAAAACXgAAATIAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgnIIBBEICokIhzYLGAABNgIkAywEIAWCJgc4G6kHUZQuTh/ix2HsjL4hpE6Xpk01BGMtDb47/iOo36/seX/3OMj/KlFIsBcCtCkfFUVgVCoSJYKjQbws2Zxs7ubeZHeC2n+nMx8A+h8gNur8X/M06OyfwLcTObsmOKDKBVWI7k10QEVUQZFWQM3DUQLSBmDbrTW0FBLaaKfzFQU1FwKe73k9Bi++RA6cwyNVxXVF0oX0FJegEG/0sgJSLEPM8NCZdePWYra9mfb/QRanPZq5hTIMtVWim/1oZMHMdEMN66DZSjbYYpvd9v5XaGvv7+ZMmzBu2FCBKFFGkBMJidSBM/PXUCiiDOUqoFIV2n9tOoD4rwSqQXO0JQ4Q9wEFdJdEY/ip90yFwvBoGM2j2ROhAGKoCGjYV5OGmtAAYlFpEQaLokoOkSFq6hAiO3SZiYktykcC796F3B0kBTC/Hoiw6xACazFvABHZAIUx77F+GrDzJsPnMX90FqawCAlzo6Mqo5jffXv/diALyQYoGg/49QCcQOQWYG/ziSCRYVWPIbLmwJY7kPPbeBXzl9XGAXjJIUJtu4XInit3IJTmR3PrYQoW3z1qx6CVdw/udS+9Pa2GIVkDhadOC7GrVlVwyOA2dLCOXZ/cCOVdlP2JkFuhfgSRW5p3EDl3aIxCMChlAAk6d49yAdD6uQvRt41BhjW/RZgtnNVJ3mczyIUIsMcQgcIYIohu3fIHWIjdvn+39xiFcBViwOr1w4BVTUqZgBzWHQq/Wi15eBjzGqmjoxv3Yp0JiYk32meSzlheYmSxuKGEq5u61kCWZKhXquiThIww+dwk55DhklIzmrKrEigKquwoOruyKrttFtT5MC2TLr4nPz8+a6h3dYP8zdnR7VViMhqkn7XVrfaVTXtkBoRpuwUG2QRxv+3x06ikzgWZGc0L1tj6B3RJdtUp3T4aJLVo5K1KtFOGguSgnnHiqW3UFTBSRmEJF9UIGyNqVlQrwUNRST5PJjapikmoW5SR3bkwwcRPx0PbY+EXQzrsKJYxUFP0TxID32nrCEHVUkRbcwZy2l129PaIAHmnVOULikqHjA9SypsUgRqtxXnI7IvI/y0V4RTg/ls+p1q3SPx/WBQuXeRnltVus6f7Y+P6absu7QOhUYxdeNVHdRdw4XZW+9Kk5PZlRzrYxHKtXEaYRPaMoe+AgfeRM59SSNHnPBDQ6qLs5JAm8K9Q7aa79ymDSM/K71SCslFjK1HWbtF76iDf++nj3RZ0vmpGheTKUlS2mpnUB7Y7MSMz6M63zl4tudVVSO08MT786kDN5uB26DH0TnnBZ9uXFV9KRJYUC5ZhRcWeKIs/A49XDgS//cTTVjRw/12Bs7c37GGN/3/M1NIDVEgEKSrFcBuLM2vIWgm06erYpBZiGumZzinXMe5qHw3VZj3l8UH7OKJxKmos6h7MVAAJITBSd0CFOuEAimp0EWY6WQqLqt0YXabCQ5koVEqqAJiZqDEsau7EumUaummzLXbqpTebt+zs1ZvxttlqN/v4ndYpyfXWXU+5wXIla3QLNQzpProp3G4XvKfnW2Gk8c51pbx395754Ly0plsWVYr26cZ53Z4oGzFfyU67bMiczvXKFvJmX7lX956yhs1WBwmFq//K7dfPBBNNNdNsCywC) format('woff2');}
-text.f4 {font-family:ec-lmr12;font-size:14.346196px}
-text.f5 {font-family:ec-lmtt10;font-size:10.909088px}
-text.f9 {font-family:ec-lmr10;font-size:10.909088px}
+<![CDATA[@font-face{font-family:nf0;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAKUAA0AAAAABcAAAAJAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoIsggALDAABNgIkAxIEIAWCEQdDG58EAC4KY2NlvHeub+wv1e4QNIngebv/qnO7+w2g/j8aPo0Ri06lBcNRtEK+jjYdZUtESrCw0f4fgB8M22B66walCYrLwE25oisY53ov/oPRJ8wk3Xugm8BEZqgzd4SSZNQ2O1Tx+vr+JQR8/e6TF+Dx7fWd2v7IdsV1Beli+hiX3b/jxDONSCRFOwC6AmD+1rmb+dVr1/+zMms15jwByJBhoABTZAID5UrkcsGvwa/osgCiQgAiIQEAQntvSzqB+J8ECtAeFczDYkCOqgSSlOeDI9Ydik750vyJ9puef82lXS49bFx4MJ2XPf+60567eJtvn2fLnUs/fdftV1nS+eK9OH9/uyy+/QpTTc225y+4FXrplJaX2r30TfnJ8k/+u3hcefz900bPBz2ncamh0n39h4+HfnXy1GOPBeuryHfoGyDc40P8wx6UmcEo0NSQ8x6CN0Jtypttcj8136gUj1Q4S5QJzMCCAtiV+KdA8cuBYPL3Xy5f12XKX207ZN/u5XP9/2W2K2tFWwkEWStZVoYEJHIAcl71lsTyr0CgMEQCCSEwQxXQ1lYBkja6CpAprRSg0MEtASoyd2UibyfpjE5kZuhLFHo79VhFxesW2mKbI3bb4CB/G5syzz57HZZfPWibLUpNVXWlSUp7bfVNw0SjCKgDzbapwaeSFN88uG1L2azWy0nl3q2+05g4qlEfdZtustQWBx2yw3LLUkNVnZeaolGtW0o2wRrS8dxdIKRIkbXfcPDgvmPXk9ZBZZ9T) format('woff2');}
+@font-face{font-family:ec-lmtt10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
+@font-face{font-family:ec-lmr10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
+@font-face{font-family:ec-lmr12;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAUgAA0AAAAACXwAAATKAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgnIIBBEICokIhzYLGAABNgIkAywEIAWCKQc4G6wHUZQvTg7i52EM7tFKiBK0WNROjtui3WyUv8c/3sfz3+/Hb+1z3/siAl4h0TSpZpLYdEIUm04pJp3OkPBIItLs6F3zZ8F3wQOeI5hHaohZ7hD3pPWk7vLXPtX8jwUo4fH5v+bpv6OzfwLfTuTs2jhqjRU+m+1NdEBFFJFWQM3DUQLSBmB704mVgy1SmOrmriiouRD4ePr7Wvi28qL51Tk1kkd66na9w11I5gfOCyl/I+x46KlLSXUAzhhozP8wJXXafJi3sXfNCG64Q5SBU5EpVlu7M+o1a9epz8B/yKi7v221yXrrrLKyEFoGCJjCU+QO3uavoesxgEFDMGyE7H9zDQP5rwKjYAFYA7kF8gLQYQc91WjuKk2r6/bGKvaxiyYkswCOfrXxrMU7pB/vjioSQ9wpY2UltfEiVo57iOvXH7a/nPzmDZJfYzMg6j4wkPZiDHuI6o2wsh/pEzVq3yaQtvmvukfUK1tQiYSxvrxmjcMaop56de4YWCJlPzIsBHUfAKy8BOmVqgWtKDlexcru84dfIznhwBOiPnJaB1DGCnX0JVZOP36NkLm6Jrc+TOHMN1cEEe94c+FMeParTU4EKbuR/tQRPWnnqpJTK+T9Be6V9oUOIOsQ5Xgikrc7X8bKS9fXWLl7cS2F0aCwN1LY8abmCmB11y5E3zeGRCnopSIelkNvqHGHoBZhkK5iBekThBF++TIRiJ507Nyp6DEa0U4swq59q0By1JWsRzKxHYq6y6l41SqiupSuWXPgDHFfb7L+K3NbdzvkoWhJjH1MwiOc3ZZXmabHlBp+LqrIsK7VzUhb1dIaSFNCl8ZW0yVQdHVnVzVtFvrixJENYfE3fv50x8fzyX7rF1vWHOsysnBRlkm8R3e8ZdnHQNCnhZne1Qru/bZPX3J0kzMrK4Zn7uYTkxaaLuyze3UlxWz26m8OudMrbExXePppbx6lHsPqNoqYhDlmcb7UFkO3oihbO+s6i3xdl1jUN7uienJWkX+CexQTNesXHzrjCrHwdrJN1BnB7zSbpemah2lW9rZiFgr0sawk6+ml9vdt7S76XaDsD9qCE+0mR1mczar/2yxrelLk39Y13R5Nxv9npHHeIj+zJTM2hV6WX7CMFhYy59NzRCGz60dzA7j/qmp8nq54fP7lCUmL1ypXZJhUb/aJX+4de/n2TyVK0891kDQaZj99apkmscNxEb3orD1kR3f+ThXZ+w6OKvbBfGYY/L6Mvhach2imOsfEtKoedTrl6jnPoOWcSkQHHJi7uD6iwcSsR07OXDxD4Jo9AJ7Ezt3HBzu/+Af6rxrZSvHgDe8Vf3AgfxqRV0YI782TP1VaRv4eGm0/b9iDzvz/sTnVaQwpEOrleRsljQW0ZYgc/GiucwfkOKgPAorhmRM2xIp7YzH5gSbjbMrQDIRRpxiAQgT7hQAw5BIESm+MStdsVwH1Rj3uPmDIW026YWUEQM0RNqi3YPa6A6bsdUO7Hhwe3LjZw/EAB3Tq0Nd9fI9G9Ri8ECxGOEa9WsFDDQfkhKkdwAJeoTAHvhbGyvc01jN8CMuEM/W1wXlULY0LC+bY4KfKEMCFmurRqzm5Op2e0Asv9/m5EBYS+wBLACjiG/0xt9UuKVJlypVPqxgAAA==) format('woff2');}
+text.f2 {font-family:ec-lmtt10;font-size:10.909088px}
+text.f8 {font-family:ec-lmr12;font-size:14.346196px}
+text.f9 {font-family:nf0;font-size:10.909088px}
+text.f10 {font-family:ec-lmr10;font-size:10.909088px}
]]>
</style>
<g id='page3'>
@@ -25,72 +27,36 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</script>
</defs>
<rect x='-71.999989' y='-71.999989' height='255.118106' width='453.543292' fill='#fff'/>
-<text class='f4' x='-63.495975' y='-50.743793'>
+<text class='f8' x='-63.495975' y='-50.743793'>
<tspan fill='#3333b3'>Remote</tspan>
<tspan fill='#3333b3' x='-11.797129'>video</tspan>
</text>
-<text class='f9' x='-43.653545' y='-31.381632'>Video<tspan x='-12.441459'>streamed</tspan>
+<text class='f10' x='-43.653545' y='-31.381632'>Video<tspan x='-12.441459'>streamed</tspan>
<tspan x='34.315995'>from</tspan>
<tspan x='60.103437'>URL</tspan>
</text>
-<text class='f5' x='-43.653545' y='-8.86606'>\includemedia[width=24em,height=13.5em,url]{}{%<tspan x='-43.653545' y='4.683137'>https://interactive-examples.mdn.mozilla.net/media/cc0-videos/flower.webm}</tspan>
+<text class='f2' x='-43.653545' y='-8.86606'>\includemedia[width=24em,height=13.5em,url]{}{%<tspan x='-43.653545' y='4.683137'>https://interactive-examples.mdn.mozilla.net/media/cc0-videos/flower.webm}</tspan>
</text>
<g transform='translate(23.862603,164.342714) scale(-1,-1) translate(23.862603,164.342714) scale(-1)'>
</g>
-<svg height='0' id='msvg@kbdCtrl@1' onfocus='' onkeydown='event.preventDefault();event.stopPropagation();switch(event.key){case" ":if($("1").paused){$("1").play();}else{$("1").pause();}break;case"ArrowUp":if(event.ctrlKey){$("1").muted=false;}else{try{$("1").volume+=0.02;}catch(e){}}break;case"ArrowDown":if(event.ctrlKey){$("1").muted=true;}else{try{$("1").volume-=0.02;}catch(e){}}break;case"ArrowLeft":if(event.ctrlKey){$("1").currentTime-=$("1").duration/10;}else{$("1").currentTime-=$("1").duration/100;}break;case"ArrowRight":if(event.ctrlKey){$("1").currentTime+=$("1").duration/10;}else{$("1").currentTime+=$("1").duration/100;}break;case"Home":$("1").currentTime=0;break;case"End":$("1").currentTime=$("1").duration;break;case"F11":if($("1").requestFullscreen){$("1").requestFullscreen();}break;}' width='0'/>
+<svg height='0' id='msvg_kbdCtrl_1' onfocus='' onkeydown='event.preventDefault();event.stopPropagation();switch(event.key){case" ":if($("1").paused){$("1").play();}else{$("1").pause();}break;case"ArrowUp":if(event.ctrlKey){$("1").muted=false;}else{try{$("1").volume+=0.02;}catch(e){}}break;case"ArrowDown":if(event.ctrlKey){$("1").muted=true;}else{try{$("1").volume-=0.02;}catch(e){}}break;case"ArrowLeft":if(event.ctrlKey){$("1").currentTime-=$("1").duration/10;}else{$("1").currentTime-=$("1").duration/100;}break;case"ArrowRight":if(event.ctrlKey){$("1").currentTime+=$("1").duration/10;}else{$("1").currentTime+=$("1").duration/100;}break;case"Home":$("1").currentTime=0;break;case"End":$("1").currentTime=$("1").duration;break;case"F11":if($("1").requestFullscreen){$("1").requestFullscreen();}break;case"Tab":event.target.blur();break;}' width='0'/>
<foreignObject height='147.27267' ontouchstart='event.preventDefault();event.stopPropagation();if($("1").paused){$("1").play();}else{$("1").pause();}return;' style='cursor: pointer;' transform='translate(23.862603,17.070044)' width='261.81812'>
-<video height='100%' id='msvg@1' onclick='event.stopPropagation();' oncontextmenu='event.stopPropagation();' onkeydown='event.preventDefault();event.stopPropagation();switch(event.key){case" ":if(event.target.paused){event.target.play();}else{event.target.pause();}break;case"ArrowUp":if(event.ctrlKey){event.target.muted=false;}else{try{event.target.volume+=0.02;}catch(e){}}break;case"ArrowDown":if(event.ctrlKey){event.target.muted=true;}else{try{event.target.volume-=0.02;}catch(e){}}break;case"ArrowLeft":if(event.ctrlKey){event.target.currentTime-=event.target.duration/10;}else{event.target.currentTime-=event.target.duration/100;}break;case"ArrowRight":if(event.ctrlKey){event.target.currentTime+=event.target.duration/10;}else{event.target.currentTime+=event.target.duration/100;}break;case"Home":event.target.currentTime=0;break;case"End":event.target.currentTime=event.target.duration;break;case"F11":if(event.target.requestFullscreen){event.target.requestFullscreen();}break;}' onmousedown='event.preventDefault();event.stopPropagation();if(event.button==0)event.target.pause();' onmouseup='event.preventDefault();event.stopPropagation();if(event.button==0)event.target.play();' onplaying='$("kbdCtrl@1").focus();event.target.focus();' width='100%' x='0' xmlns='http://www.w3.org/1999/xhtml' y='0'>
+<video height='100%' id='msvg_1' onclick='event.stopPropagation();' oncontextmenu='event.stopPropagation();' onkeydown='event.preventDefault();event.stopPropagation();switch(event.key){case" ":if(event.target.paused){event.target.play();}else{event.target.pause();}break;case"ArrowUp":if(event.ctrlKey){event.target.muted=false;}else{try{event.target.volume+=0.02;}catch(e){}}break;case"ArrowDown":if(event.ctrlKey){event.target.muted=true;}else{try{event.target.volume-=0.02;}catch(e){}}break;case"ArrowLeft":if(event.ctrlKey){event.target.currentTime-=event.target.duration/10;}else{event.target.currentTime-=event.target.duration/100;}break;case"ArrowRight":if(event.ctrlKey){event.target.currentTime+=event.target.duration/10;}else{event.target.currentTime+=event.target.duration/100;}break;case"Home":event.target.currentTime=0;break;case"End":event.target.currentTime=event.target.duration;break;case"F11":if(event.target.requestFullscreen){event.target.requestFullscreen();}break;case"Tab":event.target.blur();break;}' onmousedown='event.preventDefault();event.stopPropagation();if(event.button==0)event.target.pause();' onmouseup='event.preventDefault();event.stopPropagation();if(event.button==0)event.target.play();' onplaying='$("kbdCtrl_1").focus();event.target.focus();' width='100%' x='0' xmlns='http://www.w3.org/1999/xhtml' y='0'>
<source src='https://interactive-examples.mdn.mozilla.net/media/cc0-videos/flower.webm' type='audio/mpeg'/>
</video>
</foreignObject>
<a xlink:href='beamer-example-2.svg' xlink:title='beamer-example-2.svg'>
-<rect fill='none' stroke='#adade0' stroke-width='.5' x='352.436072' y='-70.151548' width='12.955168' height='12.35741'/>
-<g stroke-miterlimit='10' transform='translate(354.729351,-63.97284)scale(0.996264,-0.996264)'>
-<g fill='#aeaee1' stroke='#aeaee1'>
-<g stroke-width='0.4'>
-<g fill='#fff' stroke='#fff'>
-<path d='M -1.0 -5.5 M -1.0 -5.5 L -1.0 5.5 L 10.0 5.5 L 10.0 -5.5 Z M 10.0 5.5'/>
-</g>
-<g stroke-width='1.6'>
-<path d='M 0.6 0.0 L 9.0 0.0' fill='none'/>
-<g transform='matrix(-1.0,0.0,0.0,-1.0,4.50002,0.0)'>
-<g stroke-dasharray='none' stroke-dashoffset='0.0'>
- <g stroke-linejoin='round'>
- <g stroke-linecap='round'>
- <path d=' M 0.0 4.70001 L 4.70001 0.0 L 0.0 -4.70001 ' fill='none'/>
- </g>
- </g>
- </g>
-</g>
-</g>
-</g>
-</g>
-</g>
+<rect fill='none' stroke='#adade0' stroke-width='.5' x='357.255493' y='-70.904267' width='10.545452' height='11.909088'/>
+<text class='f9' x='357.755493' y='-60.858816'>
+<tspan fill='#adade0'>ï </tspan>
+</text>
</a>
<a xlink:href='beamer-example-4.svg' xlink:title='beamer-example-4.svg'>
-<rect fill='none' stroke='#adade0' stroke-width='.5' x='366.739688' y='-70.151548' width='12.955168' height='12.35741'/>
-<g stroke-miterlimit='10' transform='translate(369.032966,-63.97284)scale(0.996264,-0.996264)'>
-<g fill='#aeaee1' stroke='#aeaee1'>
-<g stroke-width='0.4'>
-<g fill='#fff' stroke='#fff'>
-<path d='M -1.0 -5.5 M -1.0 -5.5 L -1.0 5.5 L 10.0 5.5 L 10.0 -5.5 Z M 10.0 5.5'/>
-</g>
-<g stroke-width='1.6'>
-<path d='M -1.0 0.0 L 7.4 0.0' fill='none'/>
-<g transform='translate(3.49998,0.0)'>
-<g stroke-dasharray='none' stroke-dashoffset='0.0'>
- <g stroke-linejoin='round'>
- <g stroke-linecap='round'>
- <path d=' M 0.0 4.70001 L 4.70001 0.0 L 0.0 -4.70001 ' fill='none'/>
- </g>
- </g>
- </g>
-</g>
-</g>
-</g>
-</g>
-</g>
+<rect fill='none' stroke='#adade0' stroke-width='.5' x='369.149393' y='-70.904267' width='10.545452' height='11.909088'/>
+<text class='f9' x='369.649393' y='-60.858816'>
+<tspan fill='#adade0'>ï¡</tspan>
+</text>
</a>
</g>
</svg> \ No newline at end of file
diff --git a/macros/latex/contrib/media4svg/example/beamer-example-4.svg b/macros/latex/contrib/media4svg/example/beamer-example-4.svg
index 745f1e666e..f8b5473420 100644
--- a/macros/latex/contrib/media4svg/example/beamer-example-4.svg
+++ b/macros/latex/contrib/media4svg/example/beamer-example-4.svg
@@ -1,26 +1,28 @@
<?xml version='1.0' encoding='UTF-8'?>
-<!-- This file was generated by dvisvgm 2.9.1 -->
+<!-- This file was generated by dvisvgm 2.11.1 -->
<svg version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' viewBox='-72 -72 453.543293 255.118107'>
<defs>
<script type='text/javascript'>
<![CDATA[
-function $(id) {return document.getElementById("msvg@"+id.toString().trim());};
+function $(id) {return document.getElementById("msvg_"+id.toString().trim());};
]]>
</script>
</defs>
<style type='text/css'>
-<![CDATA[@font-face{font-family:cmr10;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAKoAA0AAAAABdAAAAJUAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoJQgkMLCgABNgIkAxAEIAWCGgcqG9AEIIaH5+36OvdVtceoHqE54NLMjAhE9idfMQPUk7eGPS/BAHzagMK0aN4lHgZa+rz2/RgX8ITSaMTtzcyKiZraNu1KIp1CwFvPf3obfPT9Tje27sg2jeuUSFekV3FVoio+141EUqoBCADY5agtj8Bcc9P3g7L90vdWIQAZMkwTYJ1MYJpcgVwuMHcwKMwOPhVAlAlAJCQACPNT+NZmOhcxGEggB1XUcQjOB+RoSaCa5/NidCaHRaM0PN+LCupn3xqX3lK/YtzbqO31Mvm2S95pXPme2uh1a+fxx9yk4m4unnj8EVfc//Dj71763hOPPICR33HJ2/Ujybf3pe+u8UTzjtodXxRD+wy1Hh06v1x9pVp7bcuDzjlulx02nrN279P22mfvU9eu3O6MPdZvvu3CHXftefOuqyp+n378rx8/36ua39sfvuVBw7fq35TXFm501A47bXTkwpdvsIRc8vSe25+xYtVJ4KnQXvd0Jfdd76ly6WNJzxICIRNKyG6W498qxpsDwaRNLt/m4JHrfqs2si93A6PNwYasmr5HVQJB+n6wwX7ZppBVBa6VZ5tqQrYpUbFKILePKkgIgU20AFVHCZBUjBIg03SAACUNtwhQVvK4TOQ1yQiIMLOZSbBkgov2ldXdbTdHOtqZTnCo0/itzM1WTnaSM6ZXTnO0IxV6WjoKaxQOd6LTdFUFfUt19Sw1iB3ssSVoOO3oI4teq1OsKQ4/8bQuOP2l3d7S87iOvRzpNKc7NqC30NXS4V4U7LY6gsV3+ImndTukfa6yc4QjrgI=) format('woff2');}
-@font-face{font-family:ec-lmss8;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAI8AA0AAAAABSgAAAHoAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoEcgSALCgABNgIkAxAEIAWCJgcqGzkEIJ6DcUNfQhQlojRi0ri/r7N+iYf/3+/bPufe90clzeBNLOKJRSSJWOhDZCaS+KUh3icUzBokSeLP//+53S/tt4W0If7ezDKlcGgiEhcaeZ1QaMx/kJWJ4CQ+eHO80QgG4PsdoEA+2AVLKNJpz84lSSjQRCLPON2ml48QYWPFPIoIGoWAJ/fegzdfut6ao2yOr4a8lo+xYJeKD/BDkpo+AAEAe86O54DVhsVqb5Jd50EACgpmCLCVEpihLQNVFVjd5k/cviSA6BCASCSglM+h6K+yPD+AaJOggl5UzILlACrWkSBrnQzTDNW9pun/WvUPlqvzyMH5OTOUcwuiDG1ZXvd2P25x/yL/m1d1ui1udfPATgLgZli/9d9Tfd50s9O8RbgkZWCBDeW9TvwNFHcWCPb9fj04NrL1G1M+bbW/XN7K/1mjV4Iguy0Hy2Yg/xMAgFo2c4CyGcpmJYFqigSJENiJAfQ6S4DUGBSgWGVKgMaAGwJ09LqviNon9QNJsZtFGtOqtR2jfi47uLnJ4PKV2y0Ddjk5ug9PXK0s2ALMYyvYFmbIUkWkQ8QXoIQ8Fz8Zgfm6WtgBe3ZhL06RCkNJSH5A950J2Gvh6majXLb5mAfvjnqfPaj6OHOKCq6aByoNFTHRHQY=) format('woff2');}
-@font-face{font-family:ec-lmss9;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAW8AA0AAAAACtgAAAVnAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwoIBBEICosEiFoLKgABNgIkA1AEIAWCJgdKG5sIII7EOBbyD5UBQhDPf5v+nLsQ2YVSMSVSJWmJE3EWaZ2I1TXUXKg/Ffmr5L80wPD3s2E0RmKGaJEN6P1Vhm08wVmk0Jo2zgs+sxQ4EDzmA8AzZzNVWgRlkHEZvgbiRYAAvBv5YjfAp38UbRNPi3LIZqyg1qi7wDo6Ll+SIAoUVo1dWXjXkuqsSiCBmVrjx30YqV7jGTenxpxtjYjldhlEC7WPNqchGlEkkIGHHEzKqGIq05n5WECYLEoFE78be9pTnnTDaacccdihhFNKokDQRhSg0CCo1VC0YI0iGpUYJGLRDRt/FPYGjoaNaEwT6Kd2UvMAeSwFQFMAegJOkP2gGgMAFsCJAkB1u4XZLap59FssdukkDrHN0V7SogG2u4HYpYlEi0W6STNwvUN0MaSpGFa7JbAydLvoQu/prMtXb2KfEnhtwHV9beADCQc/NNYNvOEKvjIooq99j3r/+8a6wTeLHaKHxC42MfyG2Cz2ORQ0NJu4w6orm6avVcaU8AeeQOQdCX8YW/cH70Q+yLQu7czrN7r5b7xP/XumSMD3Plz9UOxauHt9ft/s2/DeAiG9QYxA/e7TXU+DG96Q8JsfvmhQEQizf5CT9bIreOcVvXPObtVVAXNkqOlTrrU0KsLpsJ2uz1EN2L36sWnN+37DqlsMhxa223zXkBddGYErbpw5sAd1mF0LO4UrwunLH0qg/gq97wPqQ+AW29sH3Jdbmy7PjlSNvJfrn4lgReItfa2IIbro6Biq3lgX7LQ3Zu8PHV8Y/oLzhru+ull66jJ3cfWjerefkX2tuSvy16WWZfkyfXPnZZpZvrKBC8Z/6QhmnDw1eO3Tb2/fFqoL1a5NPZvzLMMKKlvJQzPN/LH7vxLwvHXtCzpO9DxzLeQanDb4/86/icmcSKjf8H6hSChneE4IniiqmfKossWeO736lWSllRWkOgJMyXX0qQ7PKU6qzP8+70ez6ShXap8BpfmpcypLHYHJmYsqly4OcLJTXllZnlnYx+rJ6u/rZUvovUztTh/aN8mbXJsW373Eu65Bw9jYf5w9ve1abvEbmmMAZ7taPbmJwZTCMTkZnuo857U6W9ZL7wyoXrjpicVrQsOL43gyUtI9bVAgv2bVM1Wrcv0Z7gGmd32zCxVJg0tNMziy1JVsPs/ZT+oWJeSNDc5dU1ZRv2ZssCDempk7wHT7x0mm+86DpzMznD2yE23pHI2UREr4otfBDaPdpW1Lq0a78rMLnzH/S0oIDmi7qcthsXfWvTztPtDxl+CbTyuWbRg3Zvn6yvIVy0ePXb6izBvrNUcmD/OOKvX6TVeyz1fK71+MHbHGE8pLii9ZbP51q7hwyopKL9nB0NzCj2ZnuErGeihenDNV0saMynum5P2CqtEe8LdqcChxQPCPze7NS/KWDHf7WRMoyu0KwBUhbujVaAu/J16Jsn6mETQFEKSGtAI8EiUPVpR8ZgEEHiUuvzrOMfT/GEP78WFzqsljt/pCvQbEoCAImADAZKQWPxL1BTflW5rKBDoBSCEoxUi1hXRVxzhVyBAfrk/GKX8wSF6mq2pCkNjfhf/xavGUmsAUVbQXo6aMa6+dQRMEaEpvLAAoQBAgFectnlyNNBVWbCpPoyujeVYM9pyPIoabaIglFoUOxNPIoTHPSnPCj0bRkBNMZBIzmIELJk6aMcMFHqYwmZni+0+nhio6koiTeDqSREeqqKBfqAGw9h/VBBLpx1DxNv6Fhu2eXlPVMdEZ3zGpY1VFvyqQVuvfLyGx3xtzFAJbbTozqKsMzfaEak6+XIxOcMZT1UW2KUBxdjcFBCXe252e9KIPg8jEQzY5FFNCKV5M/AQBAA==) format('woff2');}
-@font-face{font-family:ec-lmtt10;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAARoAA0AAAAACFgAAAQRAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgloIBBEICocIhX8LFgABNgIkAxwEIAWCLwc2G9EGAB6FcSys06msN99DBvE8btm8n8BCsi7ZiuNVWzGlYgbVO65mJ+IGhXqXB61pjWsT4JX+/8Tlwh9UG3D7Bs8y/Tmbi8YUTSAKLIzWpLExsDzwLtDY0iFscqsZtBUXAQLwyu3vnwJ45/vqo4fdouLkEDZQZ6h7gMikKB/gU1tAxZ2cBAsfrb2iOUDQmv6OptDe2djtRO0o5krBRl4Wh+uMBwYOFIqgJZZb8wNbllk1RPTCp558PGtL7CA0gAIUJyEXjBopHdv4FzEOJzStsI2ARBPBBpgamAwZBdIyXQfcFABqK+j8Ol0fLJniEacYMlJmLSumLU5vPrgZwZBx5rHUG0e8LqFLHnnDjHDRTL1GNMyrhwfY8ZoZeeOBCyQYOnHCMLTQ2YZxJjtMU7FqXEQZNgwHttao+4QBYOIz5g2Qvw7E5U9Cr58ZuhZpad7xat7KG5HXmL9Vrr59HmuUHLHjx5cokONChU9fVVwpGGpudmVewGrhcZNy5IqTUoOSeff5da/eee0pdlx311O3jbnssruuYsezxpnNJ04YZ156DHbJSMFzVH7jnhvO6Yi5XAMcS+6491K+dvvZZ4tUjDWBcagPVTRW7Yu9IYVnO87+3Hq89XH3S0tyB8a/UXVPyfTOztnpL8bMHuiZ7GTknEorOz6la2SgOLN0UMe2cJe3LG/Ej05ezov//qHY8H+ZH2adP7wgf1j4qxC7V9mwfKJ5BcNHfXkoXD07IXbrrwllurRrzChiLjBBV2Numl1d5B7ypOeToTN1+Gm3jpc33b0hfOVZsat7w3a2873Z9qKa/hVkLZpV27psn1l8vs7Zn3pWXrC4dkDmh1nLhuUXkK0bUwdeyTY8v2D48q1V3SuaZGNy0t4Unt6y8MLMWWZv7IiMl2Z0txgj/45PjMuLKxqen9l46zRvSdLClYvisvfFvLxnzCWff7gpJf+P6cHc1mnPJlsCfVdm3Tam2lWUFNl1MJEHt8bmxiUm/Osyc9WfiTn5zw4YwqXJlUvrXdT/LLdwfUuH17X+Oqtm+qauoqkA3CR49uYYne/8N9lt70KtphAVpEE2xCBpl3+xVtRXI4DAVx/O7OpJmPybw9S+eIj7AbFRoc4GHCgABNTZ0b+1FwegHjrsuoqjEOWx83crM1EsE1hKZRHAYDYdAAUIAkznBgAO5hEAFHbiEQA0BusjANgwuQABwI6TB9AQ3YkiFrBLo1yay0a6vU+wk+wallhqjTV8vFjy1qzxeaHYcsusGZ9fZb65LH5uXpaJLHMFudwp3fQAFx8/Fz/vOcdPajWzV82fa/ndXmuiNTfoyoTiWsDl87teeaWgeVdfZbWF2TMWX0aRd8D9fG4vmWUi9gLqUVwy/sA6uViNOvWaNGsBAAAA) format('woff2');}
-@font-face{font-family:ec-lmr10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
-@font-face{font-family:ec-lmr12;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAWgAA0AAAAACiAAAAVLAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwIIBBEICooQiCwLHAABNgIkAzQEIAWCJgc8GzsIUZQuUh3kR0LmpkZ7CSWWGMoS4zzcvqP4Px7q9+N3du97X8yTeNVkkn5WxEIjFIaQIEQaielUSESNJBo0+/9x07+v9ZfWg56GhppDauaUitjI5slMmIoj30TyfxZgnvvZMm0DGn3bG0ESDCiqLMoyDIooIilpNLC9AdUVGJ4f26mIN+FQc3olBHw6954W8Pm7/DVZ/4iPaKWafJGX8ZINiO+gCBNSXShoAffF/bSWcLOJQv+PUp3nfOhKUzLNGIZ+rgpDNXP1s30cmKpcaKKi1q3PoGET/wU4ofe9bbdddtpsE60N1hQKumgg8BKJxN3ApJD+VQX9D2jU1EyLVmjDak3nBBD/ZcKx7X1GgAkQb4hfisQKy0woVyVzqZ0oq2osHCM4XsAO+SAZIpAzYpjClk53QRGIMLc1Kw9XhH9mDdgGCP4gmGkOYAz7Cd4TYe4QQgRfYdBoTxzQYWzKbiAIXn/wJKVCGDQcQuy2Y37PMKcDzUH+MGLx5sddOAB0ULie4I2uW6+qDfYfPo7KNTrMPUPs6cuX7+8XgYrF3FpyR44yOIzXL/dmkXBDcRswp+s94vH145vRx50ayBNKf+6Z9SJbfkMX4uGnXWfK8W7j5fNEzaf6rRICcfuQeSnMhHqPUtijfF0bsbuk1zD34IqWxKgTgomwL0bEGgkeQKeahicZUbkmQMeVH2ODb/NJR6GNvYa50oFIl5M4BgV7QHPQmA6j5TPVDcwhUwJhhHW6VCBMNCcvnh2qvg31WrMczoKGLK1mpSwBpPN7JVXaLVrt2uJipA5z+4RCfsNhxB7iDoDmKcFX1BgJ+SarTZ/R9yrvBTXvWz+/R1VEkUy/zFnWz5DUQF//AP+j/XSwauHpWmcfqcn/SZIg3kH6Ll0flCT53kQGb1ZGCiOTclOPu8njk6jsuJI0hWDEo9XJl/n3XblPYlK8D48WNyaFNSijglMUn7ofo3HbSZHLLiY5O9HXs8DDdeDq2qpdH6hg3ag1tkiV/JSu8I8ob2mPkZZd2iWQJ0v/Uvg6tXqMCBSVSfEVkwuvTc4t97zg1DZuBuu7ScIqSpyn8Ca3m7uWxTkLHFvsiiv7y8uG59c3zZlX5psij6Pj5n3nReVcJ+w8Jc6plRbwB8Uspbs5TDFzPW3opQx1sqDwJFhTrmyc3YU89a82eW7tln/moLZFHWXb09Oh1KriklU9Fl3KLihncvu/RtvAI33jzKLKqpnF12Y1FQ0/xdbnWDVt80pe7Zl47d431Vz7ty3QOCtuci1z60V9CwYZfrKsuYkiQ7NfY2t+XE8EDpmSkPPsHIadIW0qShgRVitL7RUvo5ZdEEJ+fN+PZJnQe2yKEwYqc6Pgx1XUzaBCRL30ta5X/91rD6XSCGpVXiOi/DdvWNsz/+ORfh9PE+SVorRbXJpidtrNwbFE1kzKArzzAvuOHJSmJEsCwNuAlc1TlmZ+Kk9amH8hyKYm/BaYgjHnt7ZbxJ+IRa+MELxXDjU22Mf+biLKj7NGv57/oanKc2iS9MNH+Ph9VOcmyFtIsZ/2eEIOiFOQr83HV+AWp83GaRPhQJ40OgnJYoZLTnFK87NBaLfDDCRCYFcQAE3uQ+29tTYUUMypBWqtXg1u0OSdIqpmqQUGFAecgNoAdtcGXfZ6qscgBSV4+mxQoQTY06fXcNPjB7VRoykFCUGLRlNTCexTjLsYgbQisIoNUcKHy6Dag21qWhkUQkfTalXgSASEnglsUAZe3tYCuKQ2aEjHiF00xcg08JihtCIoBEaqhYFVAZAKbfsvwtNsSJUuU4EixcpUqAUA) format('woff2');}
-text.f2 {font-family:ec-lmss9;font-size:8.966376px}
-text.f4 {font-family:ec-lmr12;font-size:14.346196px}
-text.f5 {font-family:ec-lmtt10;font-size:10.909088px}
-text.f6 {font-family:ec-lmss8;font-size:7.970112px}
-text.f8 {font-family:cmr10;font-size:10.909088px}
-text.f9 {font-family:ec-lmr10;font-size:10.909088px}
+<![CDATA[@font-face{font-family:nf0;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAKUAA0AAAAABcAAAAJAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoIsggALDAABNgIkAxIEIAWCEQdDG58EAC4KY2NlvHeub+wv1e4QNIngebv/qnO7+w2g/j8aPo0Ri06lBcNRtEK+jjYdZUtESrCw0f4fgB8M22B66walCYrLwE25oisY53ov/oPRJ8wk3Xugm8BEZqgzd4SSZNQ2O1Tx+vr+JQR8/e6TF+Dx7fWd2v7IdsV1Beli+hiX3b/jxDONSCRFOwC6AmD+1rmb+dVr1/+zMms15jwByJBhoABTZAID5UrkcsGvwa/osgCiQgAiIQEAQntvSzqB+J8ECtAeFczDYkCOqgSSlOeDI9Ydik750vyJ9puef82lXS49bFx4MJ2XPf+60567eJtvn2fLnUs/fdftV1nS+eK9OH9/uyy+/QpTTc225y+4FXrplJaX2r30TfnJ8k/+u3hcefz900bPBz2ncamh0n39h4+HfnXy1GOPBeuryHfoGyDc40P8wx6UmcEo0NSQ8x6CN0Jtypttcj8136gUj1Q4S5QJzMCCAtiV+KdA8cuBYPL3Xy5f12XKX207ZN/u5XP9/2W2K2tFWwkEWStZVoYEJHIAcl71lsTyr0CgMEQCCSEwQxXQ1lYBkja6CpAprRSg0MEtASoyd2UibyfpjE5kZuhLFHo79VhFxesW2mKbI3bb4CB/G5syzz57HZZfPWibLUpNVXWlSUp7bfVNw0SjCKgDzbapwaeSFN88uG1L2azWy0nl3q2+05g4qlEfdZtustQWBx2yw3LLUkNVnZeaolGtW0o2wRrS8dxdIKRIkbXfcPDgvmPXk9ZBZZ9T) format('woff2');}
+@font-face{font-family:cmr10;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAKwAA0AAAAABdQAAAJZAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoJQgkMLCgABNgIkAxAEIAWCHQcqG9MEAB6HsXukhFiJSVm9j5sIILu+r+6e9QlIhRREzGjTo0IyRfwulzP7/zX4/eZhniyaP0PMJqp4/KvLpLRIWstQctr6+5vamBbwAvDHHyhMi/Iu8TDQ0jFtbYwLOKE0ijjmdqeY1bIkm7VdkpJNCHD7Z4fhqYtMvT6k0WG3HHFrvIHt6VLhBR4iUa4EIADApBXNO0B3vvihljcnfpABAZCQ0I4MDKMQ0I5SJ5DJBHSv1fC1tWdkQMgTACEiAkCcjzIc2jluAqFWE0EGiihjEdgCIMMAclDMsh6hcTXXC5Vc/WwGpZQ3HArVg+Wtze4AN2OTcYd0t7LtfqgOIW2i9Wmtww6kt1x793vq3KV71fuXz58G33dJd8rLyTGzes/JGZ2Plo6+7FR3VEcu1G3JF68XSzfHX6xetgZlb/5wcnB0+J1P92Z7xXo3NNwW+G97wfDRl35/ejGjmJ0YWn/8AtOEoeus1HvEw2BUug9t9i55SNem92cpt70AXA0GDvsrZN5zNZ97IvIpQiYSkQMDNR/+NTLcWYbA5GNvLi+0DPterKRX26Fv59qtVIwfQFEEgfiBf8ZJGg2kogAAyNJoLiCNhjRahgyZWbQgIggYhQAoWkEGooJGZCDp4oIM5FQcEUBezlVJyEqiBshKMo5DyWnhZ1le2UlT3Hs09+baBL4rswITfPowm++ZeHTPSSAYpxynW+8muE7ksmLAPGEIHN5bApZMHu+dgjBnznn7PuFF4NkYih3KRcAM9yamnoPanTiCwd3IzQlDwOBYun7CGRD3OkvPECxREQAAAA==) format('woff2');}
+@font-face{font-family:ec-lmtt10;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAARkAA0AAAAACFwAAAQPAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgloIBBEICocIhX8LFgABNgIkAxwEIAWCMgc2G9QGIB6FcSys06msN99DBhHRllUPcrDAuRsRMy55g5i+iBsU6l0etKY1rk2AV/r/8385vUHXWEDbN3iW6f+/MQeNKZpAFFgYjbUwsPPA7wUaW+bGiIlZEFjfrdvcBJB/+JsAAXjl9vdPArx3dNrW14uyyUEMoM5S9wAumJMPyGEFoCJmbn2B0e5rmAfYretvtx+jnY3RzK273OEv8X6ntNP1FAMNEwqF3TIrrfuhClZY04P7wiefeCxoXYwg0oUCFLfBBa6OuB5D+RceJjMyKqbNgLiTkBrur+sLSQcZwvWiTCqIOl16uEivT5BgyRKzaJImdXvRYrDpB7uSZndozqP+N/Z5XRyXPPKGxcVF1X+NELZX+wvses3ieuOBC8TuOH5c03SOszXNyS6LRSG/zcWBhuzt3Tatx3nMYqy2N3DmOnhb+MTxunPksmtocNerYYtvuF5j4em7+vYt3C8hwseO7RB7bSMFTl2VW97uGBz0tL2g+mOOWRRcV5yQFJSC79acr9557cl9r7vrqdsKLrvsrqvY9azmHDx+XHNeehRazBX13KPwxj03nDMh2+UEdjS2695LYfn2s88WSRjNAQHoYskZJUuzNyTmbNPZn0c/Pvx45kvLwuM83+i4p6l6fLw+8EWP+riscjNpczKg5VjFRFpeY3Bz/NiOuYnslojUH828HOH5/UPWuf+CPww5PyUqMnnuKwc6qiU5EndEVEr6lwfnOuu9rNt/9WqhEhkF6WK7wAIeA26q72zITHwy65Ok6k855dX08pa7N81d+ZmbmNy0EzW/V29s6JpdJeKGuu7hFcfU8fkG86z/3gh7Y3ds8IchK5Ij46d6CnownQwpkVEpK7d3TK4akM2+Pmf48fS2xRcG11mmralBL9VMDmlpf3t62yJsDSmRwf23VmU3+SxevcQWeqbHy6cXXPL5h1v8Iv+otocPVz3ra4jN3BlyW0FnRoOPa88Bbx7cbg23eXv9m2EJV396h0U+G1tcl8b2Xdrr4f8v2ivQOzTB+4Z/reuq3jLRUAnATULW3uyh57vcm4yGdzVKpwBD6AgD4GNG+VelRH01Agjckxry9JRX+W8mi+6LFe4HWN1CnQ2YUAAIqLPdfxvNBqBWDqle2YiBED0+rUUpKyWiNQshgEY9PQAKEASolgkATCwgACiMeCIA6EhkJwAYsHAxAoARMw+jQ/RmFFZQFTraBSgMBHK+wYiv61lmuXXWyZGNZW/dupxsaLTSCusK82ssNF+0XJmyRSsVbT67DG8LJchRAgGejeeWc+XgP7WgjV+zcH50bmZ2dGn0fHtGKKjGckoyoCPjy9coGDTfGmstjg/HM8Z08xu4U05mNrG9jNgOqHUc1+xiOLxRlx69BgwaAgA=) format('woff2');}
+@font-face{font-family:ec-lmss8;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAJAAA0AAAAABSwAAAHrAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgkIIBBEICoEcgSALCgABNgIkAxAEIAWCKQcqGzwEIC4GnDJupahcikhjGk3dix5N/3zX4uH/9/u2z7n3vVFJhibtj48kTSQRC30mMhPaX5RC1VJMGyQWiTZi1Zz7SVxchCrhPRRI1xhA8h1PIFQ1Nkmscb/G/AdZWQjigzd5G80mMgB/faBAPmYXLKFIpz07lyShQBOJPON0m14+QkSOFfMoImgUAt79f4If5xtjrTlKF3sN+SxfYd0uFb/I0EjNEIAAgLP3sg3APsFibV8u+x6AABQULGCgRxdYYNgBqiqwbzt/4u3PGBAtAYhEAkr5HIr+KjtzC2I7CSoYRMUi2Amg4iANZK2zYTZj9dxIM/xvdXi0rK7J0bWVkbFcWY8ydnjnc7D/e12ITni8LnJ5x4GeOIAX4VDvPVD9VbbNd4RLMgYW2DDebWMjUNyZIei93fm4PtH7zyx/ttpf7tyWW/nEoARB9re5VDogtwQAoJaOHSgdlE4GQzVHA4kQOI4ADLqHgdQYFaDYq4SBxojnArQGvVREHZKGgbQ4w6KNebu1rUkvTwzNzSXhydP5PAmcMDaySE/MtDXZKESwSbNpqgtbqhNESvEECKBiRcJfRubqWbtpUyRsaVuzHtbhKCFTYSnCd54KOKdpZq4rXraRiICnR70kAWEPd2+Ha66aZyoNFTHRGQcA) format('woff2');}
+@font-face{font-family:ec-lmr10;src:url(data:application/x-font-woff2;base64,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) format('woff2');}
+@font-face{font-family:ec-lmss9;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAW0AA0AAAAACtwAAAVfAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwoIBBEICosEiFoLKgABNgIkA1AEIAWCKQdKG54IIB6FcbMTh4gqivjOlG204YiHh2P/nnt/ZFC0RxXYpwLLRYFOpHEim0aBjt/Pv5v+uZFKQprOnJphVehGnYoTax0qIlOYufCmpn97y39pgOHvZ7pIjMQM0SIb0PurLNp4grNIoTVtnBd8ZilwIHjMB4C31O7E8tQrX4QAfLU9XQj4PtfErJ5GyaKZUALyFXYIeKOOx0/qwAASWQSDYnjXg4u4EgDTWoq6Fvzk5GUn0RxF1tG9E/7UhgKBUPFoK2c4O2oxDBJwzEo1aNJSEBA6jlys5ruxE447Zp+NNlhlpRWFSSJKAYImkQCSmqCyiHwxshTsKZUTq0BVyeCPoqaWdW6ArrpRP3UgOwFEQQnQDDAETIB4C7IRgGJgAgaQ3kYsbMSmKfQXEwxyCRbJbMQnemnQdzshBnULe0Qgj+gBXM8iCtGoe9AkQ4iVTjGIErhdCVOSsTdhbsTLQXupyeJdZJXu0VOC92mliyE2avJtsAh36Cmh/6WziDIhBskQLdBIRjDtKkDj+0RZksJkOLUWo+utdw2i7Say3qOtCdJB211O66I2XdnnIey7A5bbu8IifwdcuYcY3Oo9vICbuQHwLUGQXgnoM8vCje4bgRuuIuu1e+doKD4js93lybyglQ5e1CFnGZLCBJgog92Po1ajoPghGmwDr+NRERkjtcasuSPQJEXQLG7db+WPIYcojCZcsW/TskWwOYzBrUihYiv70j0kWo7QcweAOhIYYb0xwvjs5Gh0KiTL4zavfyakYs1+ajJCNKIQBRQ6LfQUyWWxw+K38rNZZxX79JayHtGRY/TpZf8segFyxsjEcclTIs1xfCzf0RnLxfHm4GFVz1gpZv2G0MknbsydY6o0VUyO3JxwCobslPRB/3NR3DvPXyEaru95CvJLw8k9Jm1oVOifwc+Ig/bPpoCsAJPNlJCVYAL4klZe/6+k16KDPgEZcVHmlEhWhPpN1u/C2p6uK0l+k/SO656rjfQLykyObC/JZMW62BElo0eKsN4lyWxO4lL9SENcIO8jU4+MwRZGD/bXGcMrolSeGcYpTs4Vjj8V3sYBvWcJNM4G2exOGhI1UkRqfkKMoSxJsadSFnf+ZlDZ8BlHR04yZaUr4ZgtwzMqREwun3CydEKiEKMP4oxTe2wr1oVmcpyUk6kN587A5oeVI9RJBVLHJHOxZVKBlKIiYxODOL1QiGL1B/+eiI1ReMVrZNGw2pZhy4CnPsun5ekz+2eW5mmT41NPcr91aimo/wy3lYhx3fbACfSBiL8EvHxUPGZaYf7YqSVF48bmFYwdZzY6Grmc8CHG3EyjwGnDeT4TvjwtyJ5kMCXpVBkjue/701Prx5UYIf7c1JF6vy1Gm1FggPTbhAYUlZ+bdDLjTkppngHgtMNphSZI+jpTP3NU0qgsvQCTxLREdwC8Q6Cc2W1PwBfNLjvy8RYexwAEgSNIAA/bob8ViT4zAgL8+3N1QCE7+H85jb+72JzqVtDn07wMlMMAEdgFAAw5RaqR8oeT8i3NUQ0ugNgFyIScnAVLWQmFmbqA31sfThFfhcQF7tlNQav9bv4wFqlk7gImgsHA1QgXhfq1zdANApr5IgASCAhYoDjFk8qgRiLJNrlFPBRwS9CWni/l4CAUQcWOgKGA4uKSdOWSehr7qB1nG+FSrWbNtODyqrlZC7CmXp2W1fdvUq6UnIaCipyOXKliAaR6AEFNC1bgKrimqqEGf0ODsLupvFSuUajkOnlpcYAcaKtLrQ1QqwLumiMAZ6XWpFmlcIidTqADXl6MVitUINgJZgqANHU2AwFbvdeTNx9+QsQyiJcgXYZMRhyBBAA=) format('woff2');}
+@font-face{font-family:ec-lmr12;src:url(data:application/x-font-woff2;base64,d09GMgABAAAAAAWgAA0AAAAACiQAAAVMAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cBlYAgwIIBBEICooQiCwLHAABNgIkAzQEIAWCKQc8Gz4Io6KMTkYh/rmQzYm1TmEYYQhtdDGETTUswlIEF76jH94XQbKkze6Vb63ZqkoFhW5dOIQhSBxBKNxbEBYUtkkUDtn+f9z072v9pfWgp6Gh5oGaOaUiNrJ5MhOm4sg3kf4HqJ9dAZoTx/Iz7R/o2/6eIAkeKKosKg2KqHsbjUcD2w0oEgznY9siuytiTLwIAV/OfdfCt7W32+rlEZ9jpYp8lR/x2lTFD0yYkDOrApSA/+bDtJb8ySYKWpTqPOcTmaGoDaNA5EtdxGQzt3+2lwNTpZuaqKh16zNo2MR/QeB637fZbZedNttEa4M1hZYtaoIokUjCDVwKyt+qwP8BDRqbaNYCrcygqZwA4r/SotuWDAPjIN4Tv7WlJdaZjPpK2SiTnZLBzMyFo2B2yIcMgZwpjcYWUO0iAmFua1aePyL8M2vANkDwB8FMcwBj2E/wnghzhxAi+AqDRnvigA5jU3YDQfD6gycpFcKg4RBitx3ze4Y5HWgO8ocRizc/JvEA6GDZeoI3um69Gm6w//BxVK7RYe4ZYk9fvnx/vwhULObWkjsahMFjvH6ZzyHhxPgNmNPx5zy+fnwz+pjWQp4I5nPPkiCy5TeQyBVUXVeW493Gy+fHBj7Vb5UQiNuHzEthLvR7gsYeLI4GI3aX9BrmHlzRkhjR4EykbJyINRI8gEk1Ea9kROWaAB1XfowNvs0nHYU29hrmSqUoF5S8iAr2gOZgbDuMFtBeNzCHTAmEEdbpUhEmmpMXz4o1tyHegeVwFjRkaTUrZQlINb9XUqXdotWubR+M1GFun1DIbziM2EPcAdA8JfiKGiMhb7XpM2fpe5X3gpr3rZ/foyqiSGW/zFnWrySpgb7+AftH++lg1cLTtc4+UpP/kyRBvIP0Xbo+KEnyvYkM3qyMFEYm5aYed5PHJ1HZcSVpjGDEo9XJV/nvu3KfxKR4Hx4tbkwKa1BEBacwn7ofo3HbSZHLLmVydqKvZ4GH68DVtVW7PlDBulFrbJEq+Smd8Y8ob2mPkZZd2iWQJ0v/YnydWj1GBExlUnzF5MJrk3PLPS84tY2bwfpukrCKEucx3uR2c9eyOGeBY4tdcWV/ednw/PqmOfPKfFPkcXTcvO+8qJzrhJ2nxDm10gL+oJRL6W4OU8q5njb0UiV1sqDwJFhTrmyc3YU89a82eW7tln/moLZFVPX29HQotaq4ZBVn26XsgnJlbv/X4CnwSN84s6iyambxtVlNxdBPsfU5Vk3bvJJXeyZeu/dNNdf+bQs0zoqbXMvcelHfApnZJ8uamygytP41tubH9UTgkCkJOc/OYdgZ0qaihBFhtbLUXvEyatkFIeTH9/1Ilgm9x6Y4YaAiNwp+XEXdDCpE1Etf63r13732UCqNoFblNSLKf/OGtT3zPx7p9/E0QV4pCrvFpSlmp90cHEtkzaQswDsvsO/IQWlKcg0ArsPG7qmG0i/FdV19HSMWKcagClQlxrvr+FOg4y0jBG/+nPq0wT72jUTx87SxrPt/aKryHBolTGKQGPE8qnMT5D1Iez9t8YwcEJcg31qOr7jFaTNx2ng4JE86uozJYoZLQ3JK8wUQ2hwwA3WoWOlQEACNHkIEwUqrUVZhTj2r0uLd6lqjDwpRNknNGFbhjBOr0m/+XWudDniuxyCGAjx/McgoAI706TU8+PKD2qjRFIKEoEWjqakEssoRJEaUZAAZglTEFRjw7bI4HjzYpqYVQSF0NK1WBeqRjOUxUYFMSOA1rgfgVp4YNKRDuY/GKDTAo4bOTFAIKDaCuD4AUmts+014nx2p0mUqUKRYmQq1) format('woff2');}
+text.f0 {font-family:ec-lmss8;font-size:7.970112px}
+text.f1 {font-family:cmr10;font-size:10.909088px}
+text.f2 {font-family:ec-lmtt10;font-size:10.909088px}
+text.f6 {font-family:ec-lmss9;font-size:8.966376px}
+text.f8 {font-family:ec-lmr12;font-size:14.346196px}
+text.f9 {font-family:nf0;font-size:10.909088px}
+text.f10 {font-family:ec-lmr10;font-size:10.909088px}
]]>
</style>
<g id='page4'>
@@ -31,14 +33,14 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</script>
</defs>
<rect x='-71.999989' y='-71.999989' height='255.118106' width='453.543292' fill='#fff'/>
-<text class='f4' x='-63.495975' y='-50.743793'>
+<text class='f8' x='-63.495975' y='-50.743793'>
<tspan fill='#3333b3'>Pla</tspan>
<tspan fill='#3333b3' x='-43.402798'>y</tspan>
<tspan fill='#3333b3' x='-36.37901'>er</tspan>
<tspan fill='#3333b3' x='-19.990946'>con</tspan>
<tspan fill='#3333b3' x='.689801'>trol</tspan>
</text>
-<text class='f9' x='-43.653545' y='-32.685079'>The<tspan x='-21.229552'>standard</tspan>
+<text class='f10' x='-43.653545' y='-32.685079'>The<tspan x='-21.229552'>standard</tspan>
<tspan x='24.315891'>pla</tspan>
<tspan x='38.558207'>y</tspan>
<tspan x='44.012972'>er</tspan>
@@ -47,8 +49,8 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
<tspan x='97.770755'>(option</tspan>
<tspan x='135.952665'>‘</tspan>
</text>
-<text class='f5' x='138.982945' y='-32.685079'>controls</text>
-<text class='f9' x='184.801081' y='-32.685079'>’)<tspan x='195.710271'>tak</tspan>
+<text class='f2' x='138.982945' y='-32.685079'>controls</text>
+<text class='f10' x='184.801081' y='-32.685079'>’)<tspan x='195.710271'>tak</tspan>
<tspan x='210.862133'>e</tspan>
<tspan x='219.347038'>a</tspan>
<tspan x='228.43794'>lot</tspan>
@@ -168,10 +170,10 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
<tspan x='150.346366'>pressed.</tspan>
</text>
<rect x='-43.653545' y='76.704758' height='.3985' width='177.108381'/>
-<text class='f9' x='-37.675945' y='86.58765'>Command<tspan x='63.733564' y='86.58765'>Shortcut</tspan>
+<text class='f10' x='-37.675945' y='86.58765'>Command<tspan x='63.733564' y='86.58765'>Shortcut</tspan>
</text>
<rect x='-43.653545' y='90.652439' height='.3985' width='177.108381'/>
-<text class='f9' x='-37.675945' y='102.323456'>T<tspan x='-30.706495'>oggle</tspan>
+<text class='f10' x='-37.675945' y='102.323456'>T<tspan x='-30.706495'>oggle</tspan>
<tspan x='-2.827677'>Pla</tspan>
<tspan x='12.778275'>y/P</tspan>
<tspan x='31.111759'>ause</tspan>
@@ -191,7 +193,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
-<text class='f2' x='114.03611' y='98.742098'>Space</text>
+<text class='f6' x='114.03611' y='98.742098'>Space</text>
</g>
</g>
</g>
@@ -202,7 +204,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f9' x='-37.675945' y='116.098657'>Increase<tspan x='4.536229'>v</tspan>
+<text class='f10' x='-37.675945' y='116.098657'>Increase<tspan x='4.536229'>v</tspan>
<tspan x='9.990994'>olume</tspan>
</text>
<g stroke-miterlimit='10' transform='translate(72.114626,112.5173)scale(0.996264,-0.996264)'>
@@ -215,22 +217,24 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
<path d='M 6.79814 5.95204 L -6.79814 5.95204 C -7.57927 5.95204 -8.2125 5.31882 -8.2125 4.53769 L -8.2125 -4.53769 C -8.2125 -5.31882 -7.57927 -5.95204 -6.79814 -5.95204 L 6.79814 -5.95204 C 7.57927 -5.95204 8.2125 -5.31882 8.2125 -4.53769 L 8.2125 4.53769 C 8.2125 5.31882 7.57927 5.95204 6.79814 5.95204 Z M -8.2125 -5.95204'/>
</g>
</g>
-<g transform='translate(-2.60005,-2.6519)'>
+<g transform='translate(-0.20001,-2.6519)'>
<g stroke='none' transform='scale(-1.00375,1.00375)translate(72.114626,112.5173)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
<g fill='black'>
-<g stroke='#000' stroke-miterlimit='10' transform='translate(74.704964,112.5173)scale(0.996264,-0.996264)'>
+<g stroke='#000' stroke-miterlimit='10' transform='translate(72.313891,112.5173)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke-width='0.40002'>
-<path d='M 0.0 -0.79999 L 0.0 6.19994' fill='none'/>
-<g transform='matrix(0.0,1.0,-1.0,0.0,0.0,6.39995)'>
-<g stroke-dasharray='none' stroke-dashoffset='0.0'>
+<path d='M 0.0 -0.79999 L 0.0 6.13994' fill='none'/>
+<g transform='matrix(0.0,1.0,-1.0,0.0,0.0,6.13994)'>
+<g stroke-width='0.32'>
+ <g stroke-dasharray='none' stroke-dashoffset='0.0'>
<g stroke-linecap='round'>
<g stroke-linejoin='round'>
- <path d=' M -2.08003 2.40004 C -1.70001 0.95999 -0.8532 0.28 0.0 0.0 C -0.8532 -0.28 -1.70001 -0.95999 -2.08003 -2.40004 ' fill='none'/>
+ <path d=' M -1.19998 1.59998 C -1.09998 0.99998 0.0 0.09999 0.29999 0.0 C 0.0 -0.09999 -1.09998 -0.99998 -1.19998 -1.59998 ' fill='none'/>
+ </g>
</g>
</g>
</g>
@@ -250,7 +254,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f9' x='-37.675945' y='129.873859'>Decrease<tspan x='7.718435'>v</tspan>
+<text class='f10' x='-37.675945' y='129.873859'>Decrease<tspan x='7.718435'>v</tspan>
<tspan x='13.1732'>olume</tspan>
</text>
<g stroke-miterlimit='10' transform='translate(72.114626,126.292501)scale(0.996264,-0.996264)'>
@@ -263,22 +267,24 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
<path d='M 6.79814 5.95204 L -6.79814 5.95204 C -7.57927 5.95204 -8.2125 5.31882 -8.2125 4.53769 L -8.2125 -4.53769 C -8.2125 -5.31882 -7.57927 -5.95204 -6.79814 -5.95204 L 6.79814 -5.95204 C 7.57927 -5.95204 8.2125 -5.31882 8.2125 -4.53769 L 8.2125 4.53769 C 8.2125 5.31882 7.57927 5.95204 6.79814 5.95204 Z M -8.2125 -5.95204'/>
</g>
</g>
-<g transform='translate(-2.60005,-2.6519)'>
+<g transform='translate(-0.20001,-2.6519)'>
<g stroke='none' transform='scale(-1.00375,1.00375)translate(72.114626,126.292501)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
<g fill='black'>
-<g stroke='#000' stroke-miterlimit='10' transform='translate(74.704964,126.292501)scale(0.996264,-0.996264)'>
+<g stroke='#000' stroke-miterlimit='10' transform='translate(72.313891,126.292501)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke-width='0.40002'>
-<path d='M 0.0 6.4749 L 0.0 -0.52502' fill='none'/>
-<g transform='matrix(0.0,-1.0,1.0,0.0,0.0,-0.72504)'>
-<g stroke-dasharray='none' stroke-dashoffset='0.0'>
+<path d='M 0.0 6.4749 L 0.0 -0.46503' fill='none'/>
+<g transform='matrix(0.0,-1.0,1.0,0.0,0.0,-0.46503)'>
+<g stroke-width='0.32'>
+ <g stroke-dasharray='none' stroke-dashoffset='0.0'>
<g stroke-linecap='round'>
<g stroke-linejoin='round'>
- <path d=' M -2.08003 2.40004 C -1.70001 0.95999 -0.8532 0.28 0.0 0.0 C -0.8532 -0.28 -1.70001 -0.95999 -2.08003 -2.40004 ' fill='none'/>
+ <path d=' M -1.19998 1.59998 C -1.09998 0.99998 0.0 0.09999 0.29999 0.0 C 0.0 -0.09999 -1.09998 -0.99998 -1.19998 -1.59998 ' fill='none'/>
+ </g>
</g>
</g>
</g>
@@ -298,7 +304,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f9' x='-37.675945' y='143.64906'>Unm<tspan x='-14.646098'>ute</tspan>
+<text class='f10' x='-37.675945' y='143.64906'>Unm<tspan x='-14.646098'>ute</tspan>
<tspan x='4.141899'>audio</tspan>
</text>
<g stroke-miterlimit='10' transform='translate(73.207147,140.067703)scale(0.996264,-0.996264)'>
@@ -316,7 +322,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
-<text class='f2' x='73.207147' y='140.067703'>Ctrl</text>
+<text class='f6' x='73.207147' y='140.067703'>Ctrl</text>
</g>
</g>
</g>
@@ -327,7 +333,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f6' x='83.771702' y='142.474844'>+</text>
+<text class='f0' x='83.771702' y='142.474844'>+</text>
<g stroke-miterlimit='10' transform='translate(99.830029,140.067703)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
@@ -338,22 +344,24 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
<path d='M 6.79814 5.95204 L -6.79814 5.95204 C -7.57927 5.95204 -8.2125 5.31882 -8.2125 4.53769 L -8.2125 -4.53769 C -8.2125 -5.31882 -7.57927 -5.95204 -6.79814 -5.95204 L 6.79814 -5.95204 C 7.57927 -5.95204 8.2125 -5.31882 8.2125 -4.53769 L 8.2125 4.53769 C 8.2125 5.31882 7.57927 5.95204 6.79814 5.95204 Z M -8.2125 -5.95204'/>
</g>
</g>
-<g transform='translate(-2.60005,-2.6519)'>
+<g transform='translate(-0.20001,-2.6519)'>
<g stroke='none' transform='scale(-1.00375,1.00375)translate(99.830029,140.067703)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
<g fill='black'>
-<g stroke='#000' stroke-miterlimit='10' transform='translate(102.420367,140.067703)scale(0.996264,-0.996264)'>
+<g stroke='#000' stroke-miterlimit='10' transform='translate(100.029294,140.067703)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke-width='0.40002'>
-<path d='M 0.0 -0.79999 L 0.0 6.19994' fill='none'/>
-<g transform='matrix(0.0,1.0,-1.0,0.0,0.0,6.39995)'>
-<g stroke-dasharray='none' stroke-dashoffset='0.0'>
+<path d='M 0.0 -0.79999 L 0.0 6.13994' fill='none'/>
+<g transform='matrix(0.0,1.0,-1.0,0.0,0.0,6.13994)'>
+<g stroke-width='0.32'>
+ <g stroke-dasharray='none' stroke-dashoffset='0.0'>
<g stroke-linecap='round'>
<g stroke-linejoin='round'>
- <path d=' M -2.08003 2.40004 C -1.70001 0.95999 -0.8532 0.28 0.0 0.0 C -0.8532 -0.28 -1.70001 -0.95999 -2.08003 -2.40004 ' fill='none'/>
+ <path d=' M -1.19998 1.59998 C -1.09998 0.99998 0.0 0.09999 0.29999 0.0 C 0.0 -0.09999 -1.09998 -0.99998 -1.19998 -1.59998 ' fill='none'/>
+ </g>
</g>
</g>
</g>
@@ -373,7 +381,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f9' x='-37.675945' y='157.424262'>Mute<tspan x='-8.887583'>audio</tspan>
+<text class='f10' x='-37.675945' y='157.424262'>Mute<tspan x='-8.887583'>audio</tspan>
</text>
<g stroke-miterlimit='10' transform='translate(73.207147,153.842904)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
@@ -390,7 +398,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
-<text class='f2' x='73.207147' y='153.842904'>Ctrl</text>
+<text class='f6' x='73.207147' y='153.842904'>Ctrl</text>
</g>
</g>
</g>
@@ -401,7 +409,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f6' x='83.771702' y='156.250046'>+</text>
+<text class='f0' x='83.771702' y='156.250046'>+</text>
<g stroke-miterlimit='10' transform='translate(99.830029,153.842904)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
@@ -412,22 +420,24 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
<path d='M 6.79814 5.95204 L -6.79814 5.95204 C -7.57927 5.95204 -8.2125 5.31882 -8.2125 4.53769 L -8.2125 -4.53769 C -8.2125 -5.31882 -7.57927 -5.95204 -6.79814 -5.95204 L 6.79814 -5.95204 C 7.57927 -5.95204 8.2125 -5.31882 8.2125 -4.53769 L 8.2125 4.53769 C 8.2125 5.31882 7.57927 5.95204 6.79814 5.95204 Z M -8.2125 -5.95204'/>
</g>
</g>
-<g transform='translate(-2.60005,-2.6519)'>
+<g transform='translate(-0.20001,-2.6519)'>
<g stroke='none' transform='scale(-1.00375,1.00375)translate(99.830029,153.842904)scale(-1,-1)'>
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
<g fill='black'>
-<g stroke='#000' stroke-miterlimit='10' transform='translate(102.420367,153.842904)scale(0.996264,-0.996264)'>
+<g stroke='#000' stroke-miterlimit='10' transform='translate(100.029294,153.842904)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke-width='0.40002'>
-<path d='M 0.0 6.4749 L 0.0 -0.52502' fill='none'/>
-<g transform='matrix(0.0,-1.0,1.0,0.0,0.0,-0.72504)'>
-<g stroke-dasharray='none' stroke-dashoffset='0.0'>
+<path d='M 0.0 6.4749 L 0.0 -0.46503' fill='none'/>
+<g transform='matrix(0.0,-1.0,1.0,0.0,0.0,-0.46503)'>
+<g stroke-width='0.32'>
+ <g stroke-dasharray='none' stroke-dashoffset='0.0'>
<g stroke-linecap='round'>
<g stroke-linejoin='round'>
- <path d=' M -2.08003 2.40004 C -1.70001 0.95999 -0.8532 0.28 0.0 0.0 C -0.8532 -0.28 -1.70001 -0.95999 -2.08003 -2.40004 ' fill='none'/>
+ <path d=' M -1.19998 1.59998 C -1.09998 0.99998 0.0 0.09999 0.29999 0.0 C 0.0 -0.09999 -1.09998 -0.99998 -1.19998 -1.59998 ' fill='none'/>
+ </g>
</g>
</g>
</g>
@@ -447,7 +457,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f9' x='-37.675945' y='171.199463'>T<tspan x='-30.706495'>oggle</tspan>
+<text class='f10' x='-37.675945' y='171.199463'>T<tspan x='-30.706495'>oggle</tspan>
<tspan x='-2.827677'>F</tspan>
<tspan x='3.384674'>ull-Screen</tspan>
</text>
@@ -466,7 +476,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
-<text class='f2' x='73.172396' y='167.618106'>F11</text>
+<text class='f6' x='73.172396' y='167.618106'>F11</text>
</g>
</g>
</g>
@@ -478,14 +488,14 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
<rect x='154.771657' y='76.704758' height='.3985' width='174.684548'/>
-<text class='f9' x='160.749256' y='86.58765'>Command<tspan x='259.734933' y='86.58765'>Shortcut</tspan>
+<text class='f10' x='160.749256' y='86.58765'>Command<tspan x='259.734933' y='86.58765'>Shortcut</tspan>
</text>
<rect x='154.771657' y='90.652439' height='.3985' width='174.684548'/>
-<text class='f9' x='160.749256' y='102.323456'>Seek<tspan x='185.901062'>bac</tspan>
+<text class='f10' x='160.749256' y='102.323456'>Seek<tspan x='185.901062'>bac</tspan>
<tspan x='201.961647'>k</tspan>
<tspan x='211.355816'>1</tspan>
</text>
-<text class='f8' x='218.628912' y='102.323456'>%</text>
+<text class='f1' x='218.628919' y='102.323456'>%</text>
<g stroke-miterlimit='10' transform='translate(268.115994,98.742098)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
@@ -506,12 +516,14 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke-width='0.40002'>
-<path d='M 0.0 2.0 L -6.99992 2.0' fill='none'/>
-<g transform='matrix(-1.0,0.0,0.0,-1.0,-7.19994,2.0)'>
-<g stroke-dasharray='none' stroke-dashoffset='0.0'>
+<path d='M 0.0 2.0 L -6.93993 2.0' fill='none'/>
+<g transform='matrix(-1.0,0.0,0.0,-1.0,-6.93993,2.0)'>
+<g stroke-width='0.32'>
+ <g stroke-dasharray='none' stroke-dashoffset='0.0'>
<g stroke-linecap='round'>
<g stroke-linejoin='round'>
- <path d=' M -2.08003 2.40004 C -1.70001 0.95999 -0.8532 0.28 0.0 0.0 C -0.8532 -0.28 -1.70001 -0.95999 -2.08003 -2.40004 ' fill='none'/>
+ <path d=' M -1.19998 1.59998 C -1.09998 0.99998 0.0 0.09999 0.29999 0.0 C 0.0 -0.09999 -1.09998 -0.99998 -1.19998 -1.59998 ' fill='none'/>
+ </g>
</g>
</g>
</g>
@@ -531,11 +543,11 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f9' x='160.749256' y='116.098657'>Seek<tspan x='185.901062'>forw</tspan>
+<text class='f10' x='160.749256' y='116.098657'>Seek<tspan x='185.901062'>forw</tspan>
<tspan x='206.537108'>ard</tspan>
<tspan x='225.961282'>1</tspan>
</text>
-<text class='f8' x='233.234378' y='116.098657'>%</text>
+<text class='f1' x='233.234385' y='116.098657'>%</text>
<g stroke-miterlimit='10' transform='translate(268.115994,112.5173)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
@@ -556,12 +568,14 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke-width='0.40002'>
-<path d='M 0.0 2.0 L 6.99992 2.0' fill='none'/>
-<g transform='translate(7.19994,2.0)'>
-<g stroke-dasharray='none' stroke-dashoffset='0.0'>
+<path d='M 0.0 2.0 L 6.93993 2.0' fill='none'/>
+<g transform='translate(6.93993,2.0)'>
+<g stroke-width='0.32'>
+ <g stroke-dasharray='none' stroke-dashoffset='0.0'>
<g stroke-linecap='round'>
<g stroke-linejoin='round'>
- <path d=' M -2.08003 2.40004 C -1.70001 0.95999 -0.8532 0.28 0.0 0.0 C -0.8532 -0.28 -1.70001 -0.95999 -2.08003 -2.40004 ' fill='none'/>
+ <path d=' M -1.19998 1.59998 C -1.09998 0.99998 0.0 0.09999 0.29999 0.0 C 0.0 -0.09999 -1.09998 -0.99998 -1.19998 -1.59998 ' fill='none'/>
+ </g>
</g>
</g>
</g>
@@ -581,11 +595,11 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f9' x='160.749256' y='129.873859'>Seek<tspan x='185.901062'>bac</tspan>
+<text class='f10' x='160.749256' y='129.873859'>Seek<tspan x='185.901062'>bac</tspan>
<tspan x='201.961647'>k</tspan>
<tspan x='211.355816'>10</tspan>
</text>
-<text class='f8' x='224.083448' y='129.873859'>%</text>
+<text class='f1' x='224.083463' y='129.873859'>%</text>
<g stroke-miterlimit='10' transform='translate(269.208516,126.292501)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
@@ -601,7 +615,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
-<text class='f2' x='269.208516' y='126.292501'>Ctrl</text>
+<text class='f6' x='269.208516' y='126.292501'>Ctrl</text>
</g>
</g>
</g>
@@ -612,7 +626,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f6' x='279.773071' y='128.699643'>+</text>
+<text class='f0' x='279.773071' y='128.699643'>+</text>
<g stroke-miterlimit='10' transform='translate(295.831398,126.292501)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
@@ -633,12 +647,14 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke-width='0.40002'>
-<path d='M 0.0 2.0 L -6.99992 2.0' fill='none'/>
-<g transform='matrix(-1.0,0.0,0.0,-1.0,-7.19994,2.0)'>
-<g stroke-dasharray='none' stroke-dashoffset='0.0'>
+<path d='M 0.0 2.0 L -6.93993 2.0' fill='none'/>
+<g transform='matrix(-1.0,0.0,0.0,-1.0,-6.93993,2.0)'>
+<g stroke-width='0.32'>
+ <g stroke-dasharray='none' stroke-dashoffset='0.0'>
<g stroke-linecap='round'>
<g stroke-linejoin='round'>
- <path d=' M -2.08003 2.40004 C -1.70001 0.95999 -0.8532 0.28 0.0 0.0 C -0.8532 -0.28 -1.70001 -0.95999 -2.08003 -2.40004 ' fill='none'/>
+ <path d=' M -1.19998 1.59998 C -1.09998 0.99998 0.0 0.09999 0.29999 0.0 C 0.0 -0.09999 -1.09998 -0.99998 -1.19998 -1.59998 ' fill='none'/>
+ </g>
</g>
</g>
</g>
@@ -658,11 +674,11 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f9' x='160.749256' y='143.64906'>Seek<tspan x='185.901062'>forw</tspan>
+<text class='f10' x='160.749256' y='143.64906'>Seek<tspan x='185.901062'>forw</tspan>
<tspan x='206.537108'>ard</tspan>
<tspan x='225.961282'>10</tspan>
</text>
-<text class='f8' x='238.688914' y='143.64906'>%</text>
+<text class='f1' x='238.688929' y='143.64906'>%</text>
<g stroke-miterlimit='10' transform='translate(269.208516,140.067703)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
@@ -678,7 +694,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
-<text class='f2' x='269.208516' y='140.067703'>Ctrl</text>
+<text class='f6' x='269.208516' y='140.067703'>Ctrl</text>
</g>
</g>
</g>
@@ -689,7 +705,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f6' x='279.773071' y='142.474844'>+</text>
+<text class='f0' x='279.773071' y='142.474844'>+</text>
<g stroke-miterlimit='10' transform='translate(295.831398,140.067703)scale(0.996264,-0.996264)'>
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
@@ -710,12 +726,14 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
<g fill='#000' stroke='#000'>
<g stroke-width='0.4'>
<g stroke-width='0.40002'>
-<path d='M 0.0 2.0 L 6.99992 2.0' fill='none'/>
-<g transform='translate(7.19994,2.0)'>
-<g stroke-dasharray='none' stroke-dashoffset='0.0'>
+<path d='M 0.0 2.0 L 6.93993 2.0' fill='none'/>
+<g transform='translate(6.93993,2.0)'>
+<g stroke-width='0.32'>
+ <g stroke-dasharray='none' stroke-dashoffset='0.0'>
<g stroke-linecap='round'>
<g stroke-linejoin='round'>
- <path d=' M -2.08003 2.40004 C -1.70001 0.95999 -0.8532 0.28 0.0 0.0 C -0.8532 -0.28 -1.70001 -0.95999 -2.08003 -2.40004 ' fill='none'/>
+ <path d=' M -1.19998 1.59998 C -1.09998 0.99998 0.0 0.09999 0.29999 0.0 C 0.0 -0.09999 -1.09998 -0.99998 -1.19998 -1.59998 ' fill='none'/>
+ </g>
</g>
</g>
</g>
@@ -735,7 +753,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f9' x='160.749256' y='157.424262'>Seek<tspan x='185.901062'>to</tspan>
+<text class='f10' x='160.749256' y='157.424262'>Seek<tspan x='185.901062'>to</tspan>
<tspan x='199.234516'>b</tspan>
<tspan x='205.598088'>eginning</tspan>
</text>
@@ -754,7 +772,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
-<text class='f2' x='273.196673' y='153.842904'>Home</text>
+<text class='f6' x='273.196673' y='153.842904'>Home</text>
</g>
</g>
</g>
@@ -765,7 +783,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
</g>
-<text class='f9' x='160.749256' y='171.199463'>Seek<tspan x='185.901062'>to</tspan>
+<text class='f10' x='160.749256' y='171.199463'>Seek<tspan x='185.901062'>to</tspan>
<tspan x='199.234516'>end</tspan>
</text>
<g stroke-miterlimit='10' transform='translate(269.453873,167.618106)scale(0.996264,-0.996264)'>
@@ -783,7 +801,7 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
<g fill='#000'>
<g stroke='none'>
<g fill='black'>
-<text class='f2' x='269.453873' y='167.618106'>End</text>
+<text class='f6' x='269.453873' y='167.618106'>End</text>
</g>
</g>
</g>
@@ -795,49 +813,13 @@ text.f9 {font-family:ec-lmr10;font-size:10.909088px}
</g>
</g>
<a xlink:href='beamer-example-3.svg' xlink:title='beamer-example-3.svg'>
-<rect fill='none' stroke='#adade0' stroke-width='.5' x='352.436072' y='-70.151548' width='12.955168' height='12.35741'/>
-<g stroke-miterlimit='10' transform='translate(354.729351,-63.97284)scale(0.996264,-0.996264)'>
-<g fill='#aeaee1' stroke='#aeaee1'>
-<g stroke-width='0.4'>
-<g fill='#fff' stroke='#fff'>
-<path d='M -1.0 -5.5 M -1.0 -5.5 L -1.0 5.5 L 10.0 5.5 L 10.0 -5.5 Z M 10.0 5.5'/>
-</g>
-<g stroke-width='1.6'>
-<path d='M 0.6 0.0 L 9.0 0.0' fill='none'/>
-<g transform='matrix(-1.0,0.0,0.0,-1.0,4.50002,0.0)'>
-<g stroke-dasharray='none' stroke-dashoffset='0.0'>
- <g stroke-linejoin='round'>
- <g stroke-linecap='round'>
- <path d=' M 0.0 4.70001 L 4.70001 0.0 L 0.0 -4.70001 ' fill='none'/>
- </g>
- </g>
- </g>
-</g>
-</g>
-</g>
-</g>
-</g>
+<rect fill='none' stroke='#adade0' stroke-width='.5' x='357.255493' y='-70.904267' width='10.545452' height='11.909088'/>
+<text class='f9' x='357.755493' y='-60.858816'>
+<tspan fill='#adade0'>ï </tspan>
+</text>
</a>
-<g stroke-miterlimit='10' transform='translate(369.032966,-63.97284)scale(0.996264,-0.996264)'>
-<g fill='#c0c0c0' stroke='#c0c0c0'>
-<g stroke-width='0.4'>
-<g fill='#fff' stroke='#fff'>
-<path d='M -1.0 -5.5 M -1.0 -5.5 L -1.0 5.5 L 10.0 5.5 L 10.0 -5.5 Z M 10.0 5.5'/>
-</g>
-<g stroke-width='1.6'>
-<path d='M -1.0 0.0 L 7.4 0.0' fill='none'/>
-<g transform='translate(3.49998,0.0)'>
-<g stroke-dasharray='none' stroke-dashoffset='0.0'>
- <g stroke-linejoin='round'>
- <g stroke-linecap='round'>
- <path d=' M 0.0 4.70001 L 4.70001 0.0 L 0.0 -4.70001 ' fill='none'/>
- </g>
- </g>
- </g>
-</g>
-</g>
-</g>
-</g>
-</g>
+<text class='f9' x='369.649393' y='-60.858816'>
+<tspan fill='#bfbfbf'>ï¡</tspan>
+</text>
</g>
</svg> \ No newline at end of file
diff --git a/macros/latex/contrib/media4svg/example/beamer-example.tex b/macros/latex/contrib/media4svg/example/beamer-example.tex
index f5654af427..c00834d218 100644
--- a/macros/latex/contrib/media4svg/example/beamer-example.tex
+++ b/macros/latex/contrib/media4svg/example/beamer-example.tex
@@ -12,9 +12,7 @@
% mouse cursor autohide on idle
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\usepackage[totpages]{zref}
-\usepackage{atbegshi}
-\usepackage{tikz}
-\usepgflibrary{arrows.meta}
+\usepackage{fontawesome5}
\setbeamertemplate{navigation symbols}{}
\def\navBtnSize{9pt}
\def\navBtnLnWd{1.6pt}
@@ -54,30 +52,16 @@
}%
\AtBeginShipoutUpperLeftForeground{%
\raisebox{-\dimexpr\height+0.5ex\relax}[0pt][0pt]{\makebox[\paperwidth][r]{%
- \color{structure!40!}%
+ \normalsize\color{structure!40!}%
\ifnum\thepage>1%
- \href{\jobname-\the\numexpr\thepage-1\relax.svg}{%
- \tikz{
- \filldraw[black!0!] (-1pt,-\dimexpr\navBtnSize/2+1pt\relax)
- rectangle (\dimexpr\navBtnSize+1pt\relax,\dimexpr\navBtnSize/2+1pt\relax);
- \draw[{Straight Barb[round]}-,line width=\navBtnLnWd] (-1pt,0)--(\navBtnSize,0);}}%
+ \href{\jobname-\the\numexpr\thepage-1\relax.svg}{\faArrowLeft}%
\else%
- \textcolor{lightgray}{\tikz{
- \filldraw[black!0!] (-1pt,-\dimexpr\navBtnSize/2+1pt\relax)
- rectangle (\dimexpr\navBtnSize+1pt\relax,\dimexpr\navBtnSize/2+1pt\relax);
- \draw[{Straight Barb[round]}-,line width=\navBtnLnWd] (-1pt,0)--(\navBtnSize,0);}}%
+ \textcolor{lightgray}{\faArrowLeft}%
\fi\hspace{0.5ex}%
\ifnum\thepage<\ztotpages%
- \href{\jobname-\the\numexpr\thepage+1\relax.svg}{%
- \tikz{
- \filldraw[black!0!] (-1pt,-\dimexpr\navBtnSize/2+1pt\relax)
- rectangle (\dimexpr\navBtnSize+1pt\relax,\dimexpr\navBtnSize/2+1pt\relax);
- \draw[-{Straight Barb[round]},line width=\navBtnLnWd] (-1pt,0)--(\navBtnSize,0);}}%
+ \href{\jobname-\the\numexpr\thepage+1\relax.svg}{\faArrowRight}%
\else%
- \textcolor{lightgray}{\tikz{
- \filldraw[black!0!] (-1pt,-\dimexpr\navBtnSize/2+1pt\relax)
- rectangle (\dimexpr\navBtnSize+1pt\relax,\dimexpr\navBtnSize/2+1pt\relax);
- \draw[-{Straight Barb[round]},line width=\navBtnLnWd] (-1pt,0)--(\navBtnSize,0);}}%
+ \textcolor{lightgray}{\faArrowRight}%
\fi%
\hspace{0.5ex}%
}}%
diff --git a/macros/latex/contrib/media4svg/media4svg.sty b/macros/latex/contrib/media4svg/media4svg.sty
index f5460deed6..8d20eafca5 100644
--- a/macros/latex/contrib/media4svg/media4svg.sty
+++ b/macros/latex/contrib/media4svg/media4svg.sty
@@ -25,9 +25,10 @@
\RequirePackage{l3keys2e}
-\def\g@msvg@date@tl{2021/01/25}
-\def\g@msvg@version@tl{0.5}
+\def\g@msvg@date@tl{2021/10/19}
+\def\g@msvg@version@tl{0.6}
+\NeedsTeXFormat{LaTeX2e}[2020-10-01]
\ProvidesExplPackage{media4svg}{\g@msvg@date@tl}{\g@msvg@version@tl}
{multimedia inclusion with dvisvgm}
@@ -199,7 +200,7 @@
\special{dvisvgm:raw {?nl}
\tl_if_blank:VT\g_msvg_controls_tl{
<svg~
- id='msvg@kbdCtrl@\g_msvg_id_tl'~
+ id='msvg_kbdCtrl_\g_msvg_id_tl'~
width='0'~
height='0'~
onfocus=''~
@@ -246,6 +247,9 @@
$("\g_msvg_id_tl").requestFullscreen();
}
break;
+ case "Tab":
+ event.target.blur();
+ break;
}
'
></svg>{?nl}
@@ -269,12 +273,12 @@
>{?nl}
<video~
x="0"~y="0"~
- id='msvg@\g_msvg_id_tl'~
+ id='msvg_\g_msvg_id_tl'~
width='100\msvg_percent:'~height='100\msvg_percent:'~
\g_msvg_controls_tl\g_msvg_autoplay_tl\g_msvg_loop_tl\g_msvg_muted_tl
\tl_if_blank:VT\g_msvg_controls_tl{
onplaying=' % in Chrome, keyboard control
- $("kbdCtrl@\g_msvg_id_tl").focus();% via separate <svg> element
+ $("kbdCtrl_\g_msvg_id_tl").focus();% via separate <svg> element
event.target.focus(); % Firefox
'~
onkeydown='
@@ -320,6 +324,9 @@
event.target.requestFullscreen();
}
break;
+ case "Tab":
+ event.target.blur();
+ break;
}
'~
onclick='event.stopPropagation();'~
@@ -776,7 +783,7 @@
<script~type="text/javascript">{?nl}
<![CDATA[{?nl}
function~$(id)~{
- return~document.getElementById("msvg@"+id.toString().trim());
+ return~document.getElementById("msvg_"+id.toString().trim());
};{?nl}
]]>{?nl}
</script>
diff --git a/macros/latex/contrib/univie-ling/README b/macros/latex/contrib/univie-ling/README
index 87baa1affc..b11a83f845 100644
--- a/macros/latex/contrib/univie-ling/README
+++ b/macros/latex/contrib/univie-ling/README
@@ -80,6 +80,13 @@ also have a look at the example files.
== CHANGES ==
+V. 1.15 (2021-10-19)
+ - univie-ling.bbx:
+ * Output url date only if url is given (not with DOI).
+ * Fix emphasizing of journal title.
+ - univie-ling-wlg.cls:
+ * Allow for slanted/bold TIPA.
+
V. 1.14 (2021-09-01)
- univie-ling-paper.cls:
* Do not overwrite user-set \texttype with default value.
diff --git a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
index 0862f1f1f4..80f31592f5 100644
--- a/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
+++ b/macros/latex/contrib/univie-ling/biblatex-univie-ling/univie-ling.bbx
@@ -36,7 +36,7 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesFile{univie-ling.bbx}[2021/09/01 v1.14 biblatex bibliography style]
+\ProvidesFile{univie-ling.bbx}[2021/10/13 v1.15dev biblatex bibliography style]
% Load base style (authoryear)
\RequireBibliographyStyle{authoryear}
@@ -258,7 +258,7 @@
\renewbibmacro*{journal}{%
\iffieldundef{journaltitle}
{}
- {\printtext[issuetitle]{%
+ {\printtext[mkbibemph]{%
\printfield{journaltitle}%
\setunit{\subtitlepunct}%
\printfield{journalsubtitle}}}}
@@ -427,13 +427,16 @@
}
\renewbibmacro*{url+urldate}{%
- \printfield{url}%
- \iffieldundef{urlyear}%
+ \iffieldundef{url}%
{}%
- {\setunit*{\addspace}%
- \printtext[parens]{\bibstring{urlseen}
- \mkbibdateunified{urlyear}{urlmonth}{urlday}}}%
- }
+ {
+ \printfield{url}%
+ \iffieldundef{urlyear}%
+ {}%
+ {\setunit*{\addspace}%
+ \printtext[parens]{\bibstring{urlseen} \mkbibdateunified{urlyear}{urlmonth}{urlday}}}%
+ }%
+}
\renewbibmacro*{series+number}{%
\iffieldundef{series}
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
index 4cda010d9a..b905cb673e 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
index db86a378ae..a563962d7e 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-expose.tex
@@ -63,7 +63,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.14, 2021/09/01}
+\date{Version 1.15, 2021/10/19}
\maketitle
@@ -319,6 +319,7 @@ Templates are provided as well:
\section{Release History}
\begin{description}
+ \item 2021/10/19 (v.\,1.15) No change to this class.
\item 2021/09/01 (v.\,1.14) No change to this class.
\item 2020/11/11 (v.\,1.13) No change to this class.
\item 2020/06/25 (v.\,1.12) No change to this class.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
index 36e277eb0c..324d3672f6 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
index 1526c3304a..6af218292c 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-paper.tex
@@ -59,7 +59,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.14, 2021/09/01}
+\date{Version 1.15, 2021/10/19}
\maketitle
@@ -343,6 +343,7 @@ Templates are provided as well:
\section{Release History}
\begin{itemize}
+ \item 2021/10/19 (v.\,1.15) No change to this class.
\item 2021/09/01 (v.\,1.14) Do not overwrite \jmacro{texttype} set by user with default value.
\item 2020/11/11 (v.\,1.13) No change to this class.
\item 2020/06/25 (v.\,1.12) No change to this class.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
index e734f2514b..aa5b23ee90 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
index dec3028054..247ac26797 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-thesis.tex
@@ -59,7 +59,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.14, 2021/09/01}
+\date{Version 1.15, 2021/10/19}
\maketitle
@@ -367,6 +367,7 @@ Templates are provided as well:
\section{Release History}
\begin{itemize}
+ \item 2021/10/19 (v.\,1.15) No change to this class.
\item 2021/09/01 (v.\,1.14) No change to this class.
\item 2020/11/11 (v.\,1.13) No change to this class.
\item 2020/06/25 (v.\,1.12) No change to this class.
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
index a4ea625bf3..9a63ce24f0 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.pdf
Binary files differ
diff --git a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
index 8bc27ee14e..fabc1db69c 100644
--- a/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
+++ b/macros/latex/contrib/univie-ling/doc/univie-ling-wlg.tex
@@ -59,7 +59,7 @@
\author{\texorpdfstring{Jürgen Spitzmüller%
\thanks{Please report issues via \protect\url{https://github.com/jspitz/univie-ling}.}}{Jürgen Spitzmüller}}
-\date{Version 1.14, 2021/09/01}
+\date{Version 1.15, 2021/10/19}
\maketitle
@@ -232,6 +232,7 @@ A template is provided as well: \url{https://github.com/jspitz/univie-ling/raw/m
\raggedright
\begin{itemize}
+ \item 2021/10/19 (v.\,1.15) Allow for slanted/bold IPA.
\item 2021/09/01 (v.\,1.14) Update editorial board.
\item 2020/11/11 (v.\,1.13)
\begin{itemize}
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
index 796f0f503c..83353bfbe3 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-expose.cls
@@ -31,7 +31,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-expose}[2021/09/01 v1.14 Univie Linguistic Exposes (JSp)]
+\ProvidesPackage{univie-ling-expose}[2021/10/19 v1.15 Univie Linguistic Exposes (JSp)]
\RequirePackage{xkeyval}
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
index a342dd5c4b..7deb27f764 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-paper.cls
@@ -31,7 +31,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-paper}[2021/09/01 v1.14 Univie Linguistic Papers (JSp)]
+\ProvidesPackage{univie-ling-paper}[2021/10/19 v1.15 Univie Linguistic Papers (JSp)]
\RequirePackage{xkeyval}
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
index 8fc0eab3aa..5449db234a 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-thesis.cls
@@ -31,7 +31,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-thesis}[2021/09/01 v1.14 Univie Linguistic Theses (JSp)]
+\ProvidesPackage{univie-ling-thesis}[2021/10/19 v1.15 Univie Linguistic Theses (JSp)]
\RequirePackage{xkeyval}
diff --git a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
index 972b527319..5b789ac810 100644
--- a/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
+++ b/macros/latex/contrib/univie-ling/tex/univie-ling-wlg.cls
@@ -32,7 +32,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{univie-ling-wlg}[2021/09/01 v1.14 WLG journal layout (JSp)]
+\ProvidesPackage{univie-ling-wlg}[2021/10/19 v1.15 WLG journal layout (JSp)]
%% ============================================================
@@ -167,6 +167,11 @@
\else
% Crimson
\RequirePackage[osf]{cochineal}
+% Enable bold and slanted in IPA
+\AtBeginDocument{%
+ \@ifpackageloaded{tipa}{%
+ \DeclareFontFamilySubstitution{T3}{Cochineal-TOsF}{cmr}}{}
+}
\fi
% Hyperlinks
diff --git a/macros/latex/required/babel/base/README.md b/macros/latex/required/babel/base/README.md
index 7a150533d2..848148e3af 100644
--- a/macros/latex/required/babel/base/README.md
+++ b/macros/latex/required/babel/base/README.md
@@ -1,4 +1,4 @@
-## Babel 3.64
+## Babel 3.65
This package manages culturally-determined typographical (and other)
rules, and hyphenation patterns for a wide range of languages. Many
@@ -8,9 +8,9 @@ is a set of ini files for about 250 languages.
The latest stable version is available on <https://ctan.org/pkg/babel>.
-Changes in version 3.64 are described in:
+Changes in version 3.65 are described in:
-https://latex3.github.io/babel/news/whats-new-in-babel-3.64.html
+https://latex3.github.io/babel/news/whats-new-in-babel-3.65.html
Apart from the manual, you can find information on some aspects of babel at:
@@ -46,6 +46,9 @@ respective authors.
### Summary of Latest changes
```
+3.65 2021-10-19
+ * Fixes a severe bug with 'spanish' introduced in 3.64 (#154).
+
3.64 2021-10-13
* Added a few counters to CJK.
* Restored the previous behavior of \selectlanguage with
@@ -55,17 +58,6 @@ respective authors.
- name.babel in ini files set inconsistently (#149).
* Now babel.def and babel.sty are separate files (for
Plain-based formats and LaTeX, respectively).
-
-3.63 2021-07-22
- * Fixes a severe bug with CJK and XeTeX introduced in 3.62.
-
-3.62 2021-07-19
- * No more errors with unknown languages in aux file.
- * Preliminary support for \AddToHook.
- * Tentative extension for provide=.
- * Fixes:
- - Locale dependent quotes with CJK (#131).
- - Babel and hyperref prevent changes to the \LaTeX logo (#138).
```
### Previous changes
diff --git a/macros/latex/required/babel/base/babel.dtx b/macros/latex/required/babel/base/babel.dtx
index 6fe5db94f2..0444c526a7 100644
--- a/macros/latex/required/babel/base/babel.dtx
+++ b/macros/latex/required/babel/base/babel.dtx
@@ -32,7 +32,7 @@
%
% \iffalse
%<*filedriver>
-\ProvidesFile{babel.dtx}[2021/10/13 v3.64 The Babel package]
+\ProvidesFile{babel.dtx}[2021/10/19 v3.65 The Babel package]
\documentclass{ltxdoc}
\GetFileInfo{babel.dtx}
\usepackage{fontspec}
@@ -5026,8 +5026,8 @@ help from Bernd Raichle, for which I am grateful.
% \section{Tools}
%
% \begin{macrocode}
-%<<version=3.64>>
-%<<date=2021/10/13>>
+%<<version=3.65>>
+%<<date=2021/10/19>>
% \end{macrocode}
%
% \textbf{Do not use the following macros in \texttt{ldf} files. They
@@ -5696,11 +5696,7 @@ help from Bernd Raichle, for which I am grateful.
\ifin@
\expandafter\bbl@tempa\CurrentOption\bbl@tempa
\else
- \bbl@xin@{,\CurrentOption,}{,\bbl@language@opts,}%
- \ifin@
- \bbl@exp{\\\bbl@replace\\\bbl@language@opts{,\CurrentOption,}{}}%
- \fi
- \edef\bbl@language@opts{\bbl@language@opts,\CurrentOption,}
+ \bbl@add@list\bbl@language@opts{\CurrentOption}%
\fi}
% \end{macrocode}
%
@@ -5812,7 +5808,9 @@ help from Bernd Raichle, for which I am grateful.
%
% \begin{macrocode}
\ifx\bbl@opt@main\@nnil\else
- \edef\bbl@language@opts{\bbl@language@opts,\bbl@opt@main,}
+ \edef\bbl@language@opts{%
+ \ifx\bbl@language@opts\@empty\else\bbl@language@opts,\fi
+ \bbl@opt@main}
\fi
% \end{macrocode}
%
@@ -12007,69 +12005,49 @@ help from Bernd Raichle, for which I am grateful.
\fi
% \end{macrocode}
%
-% Recognizing global options in packages not having a closed set of
-% them is not trivial, as for them to be processed they must be defined
-% explicitly. So, package options not yet taken into account and stored
-% in |bbl@language@opts| are assumed to be existing languages (note
-% this list also contains the language given with |main| as the last
-% element). If not declared above, the names of the option and the file
-% are the same. There are two steps -- first process option names and
-% collect the result, which then do the actual declarations.
%
-% To allow multiple overlapping replacements, commas in
-% |\bbl@language@opts| are doubled.
+% Recognizing global options in packages not having a closed set of
+% them is not trivial, as for them to be processed they must be
+% defined explicitly. So, package options not yet taken into
+% account and stored in |bbl@language@opts| are assumed to be
+% languages (note this list also contains the language given with
+% |main|). If not declared above, the names of the option and the
+% file are the same.
%
% \begin{macrocode}
-\let\bbl@elt\relax
-\let\bbl@tempe\@empty
-\bbl@foreach\@classoptionslist{%
- \bbl@xin@{,#1,$}{\bbl@language@opts$}% Match last
- \ifin@\else
- \bbl@xin@{,#1,}{\bbl@language@opts}% Match non-last
- \ifin@
- \bbl@replace\bbl@language@opts{,#1,}{,,}%
- \edef\bbl@tempe{\bbl@tempe\bbl@elt{3}{#1}}%
- \else
- \babel@savecnt\z@ % Use as temp
- \ifnum\bbl@iniflag<\thr@@ % Optimization: 3 = always ini
- \IfFileExists{#1.ldf}{\advance\babel@savecnt\@ne}{}%
- \fi
- \ifnum\bbl@iniflag>\z@ % Optimization: 0 = always ldf
- \IfFileExists{babel-#1.tex}{\advance\babel@savecnt\tw@}{}%
- \fi
- \ifnum\babel@savecnt>\z@
- \edef\bbl@tempe{\bbl@tempe\bbl@elt{\the\babel@savecnt}{#1}}%
- \fi
- \fi
- \fi}
-%
-\let\bbl@savemain\@empty
+\let\bbl@tempc\relax
\bbl@foreach\bbl@language@opts{%
- \edef\bbl@tempe{\bbl@tempe\bbl@elt{3}{#1}}}
-\def\bbl@elt#1#2#3{%
- \ifx#3\relax % if last
- \bbl@ifunset{ds@#2}{}%
- {\bbl@exp{\def\\\bbl@savemain{\\\DeclareOption{#2}{\[ds@#2]}}}}%
- \bbl@add\bbl@savemain{\bbl@elt{#1}{#2}}% Save main
- \DeclareOption{#2}{}%
- \else
- \ifnum\bbl@iniflag<\tw@ % other as ldf
- \ifodd#1\relax % Class: if ldf exists 1,3. Package: always 3
- \bbl@ifunset{ds@#2}%
- {\DeclareOption{#2}{\bbl@load@language{#2}}}%
- {}%
- \fi
- \else % other as ini
- \ifnum#1>\@ne % % Class: if ini exists 2,3. Package: always 3
- \DeclareOption{#2}{%
- \bbl@ldfinit
- \babelprovide[import]{#2}%
- \bbl@afterldf{}}%
- \fi
- \fi
- \fi
- #3}
-\bbl@tempe\relax % \relax catches last
+ \ifcase\bbl@iniflag % Default
+ \bbl@ifunset{ds@#1}%
+ {\DeclareOption{#1}{\bbl@load@language{#1}}}%
+ {}%
+ \or % provide=*
+ \@gobble % case 2 same as 1
+ \or % provide+=*
+ \bbl@ifunset{ds@#1}%
+ {\IfFileExists{#1.ldf}{}%
+ {\IfFileExists{babel-#1.tex}{}{\@namedef{ds@#1}{}}}}%
+ {}%
+ \bbl@ifunset{ds@#1}%
+ {\def\bbl@tempc{#1}%
+ \DeclareOption{#1}{%
+ \ifnum\bbl@iniflag>\@ne
+ \bbl@ldfinit
+ \babelprovide[import]{#1}%
+ \bbl@afterldf{}%
+ \else
+ \bbl@load@language{#1}%
+ \fi}}%
+ {}%
+ \or % provide*=*
+ \def\bbl@tempc{#1}%
+ \bbl@ifunset{ds@#1}%
+ {\DeclareOption{#1}{%
+ \bbl@ldfinit
+ \babelprovide[import]{#1}%
+ \bbl@afterldf{}}}%
+ {}%
+ \fi}
% \end{macrocode}
%
% Now, we make sure an option is explicitly declared for any language
@@ -12078,7 +12056,54 @@ help from Bernd Raichle, for which I am grateful.
% accessing the file system just to see if the option could be a
% language.
%
+% \begin{macrocode}
+\let\bbl@tempb\@nnil
+\let\bbl@clsoptlst\@classoptionslist
+\bbl@foreach\@classoptionslist{%
+ \bbl@ifunset{ds@#1}%
+ {\IfFileExists{#1.ldf}%
+ {\def\bbl@tempb{#1}%
+ \DeclareOption{#1}{%
+ \ifnum\bbl@iniflag>\@ne
+ \bbl@ldfinit
+ \babelprovide[import]{#1}%
+ \bbl@afterldf{}%
+ \else
+ \bbl@load@language{#1}%
+ \fi}}%
+ {\IfFileExists{babel-#1.tex}%
+ {\def\bbl@tempb{#1}%
+ \ifnum\bbl@iniflag>\z@
+ \DeclareOption{#1}{%
+ \ifnum\bbl@iniflag>\@ne
+ \bbl@ldfinit
+ \babelprovide[import]{#1}%
+ \bbl@afterldf{}%
+ \fi}%
+ \fi}%
+ {}}}%
+ {}}
+% \end{macrocode}
+%
% If a main language has been set, store it for the third pass.
+%
+% \begin{macrocode}
+\ifnum\bbl@iniflag=\z@\else
+ \ifx\bbl@opt@main\@nnil
+ \ifx\bbl@tempc\relax
+ \let\bbl@opt@main\bbl@tempb
+ \else
+ \let\bbl@opt@main\bbl@tempc
+ \fi
+ \fi
+\fi
+\ifx\bbl@opt@main\@nnil\else
+ \expandafter
+ \let\expandafter\bbl@loadmain\csname ds@\bbl@opt@main\endcsname
+ \expandafter\let\csname ds@\bbl@opt@main\endcsname\@empty
+\fi
+% \end{macrocode}
+%
% And we are done, because all options for this pass has been
% declared. Those already processed in the first pass are just
% ignored.
@@ -12120,27 +12145,31 @@ help from Bernd Raichle, for which I am grateful.
and a package option. Use 'main=\bbl@tempc' as\\%
option. Reported}%
\fi
-\fi
-\def\bbl@elt#1#2{% main
- \ifodd\bbl@iniflag % as ini = 1(=), 3(*=)
- \ifnum#1>\@ne % % Class: if ini exists 2,3. Package: always 3
- \def\CurrentOption{#2}% Directly, because luatexbase
- \bbl@ldfinit
- \babelprovide[\bbl@opt@provide,main,import]{#2}%
- \bbl@afterldf{}%
- \DeclareOption{#2}{}%
- \fi
- \else % as ldf = 0(no), 2(+=)
- \ifodd#1\relax % Class: if ldf exists 1,3. Package: always 3
- \bbl@ifunset{ds@#2}%
- {\DeclareOption{#2}{\bbl@load@language{#2}}}%
- {}%
- \ExecuteOptions{#2}%
+\else
+ \ifodd\bbl@iniflag % case 1,3
+ \bbl@ldfinit
+ \let\CurrentOption\bbl@opt@main
+ \ifx\bbl@opt@provide\@nnil
+ \bbl@exp{\\\babelprovide[import,main]{\bbl@opt@main}}%
+ \else
+ \bbl@exp{\\\bbl@forkv{\@nameuse{@raw@opt@babel.sty}}}{%
+ \bbl@xin@{,provide,}{,#1,}%
+ \ifin@
+ \def\bbl@opt@provide{#2}%
+ \bbl@replace\bbl@opt@provide{;}{,}%
+ \fi}%
+ \bbl@exp{%
+ \\\babelprovide[\bbl@opt@provide,import,main]{\bbl@opt@main}}%
\fi
- \fi}
-\bbl@savemain
-\DeclareOption*{}%
-\ProcessOptions*
+ \bbl@afterldf{}%
+ \else % case 0,2
+ \chardef\bbl@iniflag\z@ % Force ldf
+ \expandafter\let\csname ds@\bbl@opt@main\endcsname\bbl@loadmain
+ \ExecuteOptions{\bbl@opt@main}
+ \DeclareOption*{}%
+ \ProcessOptions*
+ \fi
+\fi
\def\AfterBabelLanguage{%
\bbl@error
{Too late for \string\AfterBabelLanguage}%
diff --git a/macros/latex/required/babel/base/babel.ins b/macros/latex/required/babel/base/babel.ins
index ae4bbb527c..473f06dfa7 100644
--- a/macros/latex/required/babel/base/babel.ins
+++ b/macros/latex/required/babel/base/babel.ins
@@ -26,7 +26,7 @@
%% and covered by LPPL is defined by the unpacking scripts (with
%% extension .ins) which are part of the distribution.
%%
-\def\filedate{2021/10/13}
+\def\filedate{2021/10/19}
\def\batchfile{babel.ins}
\input docstrip.tex
diff --git a/macros/latex/required/babel/base/babel.pdf b/macros/latex/required/babel/base/babel.pdf
index 36efb6e78f..7345ad7b76 100644
--- a/macros/latex/required/babel/base/babel.pdf
+++ b/macros/latex/required/babel/base/babel.pdf
Binary files differ
diff --git a/macros/latex/required/babel/base/bbcompat.dtx b/macros/latex/required/babel/base/bbcompat.dtx
index d45cedea36..c81d3ae4e7 100644
--- a/macros/latex/required/babel/base/bbcompat.dtx
+++ b/macros/latex/required/babel/base/bbcompat.dtx
@@ -30,7 +30,7 @@
%
% \iffalse
%<*dtx>
-\ProvidesFile{bbcompat.dtx}[2021/10/13 v3.64]
+\ProvidesFile{bbcompat.dtx}[2021/10/19 v3.65]
%</dtx>
%
%% File 'bbcompat.dtx'