summaryrefslogtreecommitdiff
path: root/macros/latex/contrib
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2024-02-08 03:01:02 +0000
committerNorbert Preining <norbert@preining.info>2024-02-08 03:01:02 +0000
commitbaa694429155689a0e8bba804206961689e0a606 (patch)
treee7074074037b2817025ce6abfeddc286d6b1eff7 /macros/latex/contrib
parent50fcb5024d3243d7e1601abf72b5f4444dd618b6 (diff)
CTAN sync 202402080301
Diffstat (limited to 'macros/latex/contrib')
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/CHANGELOG.md2
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/README.md36
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamercolorthemefocus.sty4
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerfontthemefocus.sty4
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerinnerthemefocus.sty6
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerouterthemefocus.sty13
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerthemefocus.sty6
-rw-r--r--[-rwxr-xr-x]macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo.pdfbin42671 -> 42671 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo.tex2
-rw-r--r--[-rwxr-xr-x]macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo/demo-typeset.jpgbin45868 -> 45868 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/LICENSE2
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/README.md7
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-black.pdfbin0 -> 362165 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-blue.pdfbin0 -> 362787 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-doc.pdfbin631666 -> 1627435 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-doc.tex71
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-green.pdfbin0 -> 362482 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-leftframetitle.pdfbin318798 -> 336774 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-sidebar.pdfbin344913 -> 378979 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-test.pdfbin320313 -> 362637 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/tex/beamerthemeAmurmaple.sty27
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx14
-rw-r--r--macros/latex/contrib/easybook/easybook.pdfbin596404 -> 598005 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.tex18
-rw-r--r--macros/latex/contrib/siunitx/CHANGELOG.md12
-rw-r--r--macros/latex/contrib/siunitx/siunitx-code.pdfbin647826 -> 647453 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx-compound.dtx11
-rw-r--r--macros/latex/contrib/siunitx/siunitx.dtx2
-rw-r--r--macros/latex/contrib/siunitx/siunitx.pdfbin705443 -> 705436 bytes
29 files changed, 136 insertions, 101 deletions
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/CHANGELOG.md b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/CHANGELOG.md
index d3ae57ada4..0e8ce04747 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/CHANGELOG.md
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/CHANGELOG.md
@@ -1 +1 @@
-Use Fira font also for math.
+Fix numbering of "focus" slides.
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/README.md b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/README.md
index a131b97bb8..e23ec03aab 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/README.md
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/README.md
@@ -1,9 +1,9 @@
-# Focus v3.3.0
+# Focus v3.4.0
A presentation theme for LaTeX Beamer that aims at a clean and minimalist design,
so to minimize distractions and put the focus directly on the content.
This package is available through the [CTAN](https://ctan.org/pkg/beamertheme-focus) in
-most LaTeX distributions such as [MiKTeX](https://ctan.org/pkg/miktex) and [TeXLive](https://ctan.org/pkg/texlive).
+most LaTeX distributions such as [MiKTeX](https://ctan.org/pkg/miktex) and [TeX Live](https://ctan.org/pkg/texlive).
Requires the packages [appendixnumberbeamer](https://ctan.org/pkg/appendixnumberbeamer),
[fira](https://ctan.org/pkg/fira) and [PGF/TikZ](https://ctan.org/pkg/pgf)
@@ -13,16 +13,16 @@ Demo
----
A full demo is available. Refer to `focus-demo.tex` and `focus-demo.pdf`.
-![](https://github.com/elauksap/focustheme/blob/master/focus-demo/demo-titlepage.jpg)
-![](https://github.com/elauksap/focustheme/blob/master/focus-demo/demo-subsectionpage.jpg)
-![](https://github.com/elauksap/focustheme/blob/master/focus-demo/demo-typeset.jpg)
-![](https://github.com/elauksap/focustheme/blob/master/focus-demo/demo-focus.jpg)
-![](https://github.com/elauksap/focustheme/blob/master/focus-demo/demo-references.jpg)
-![](https://github.com/elauksap/focustheme/blob/master/focus-demo/demo-appendix.jpg)
+![](https://github.com/pcafrica/focus-beamertheme/blob/main/focus-demo/demo-titlepage.jpg)
+![](https://github.com/pcafrica/focus-beamertheme/blob/main/focus-demo/demo-subsectionpage.jpg)
+![](https://github.com/pcafrica/focus-beamertheme/blob/main/focus-demo/demo-typeset.jpg)
+![](https://github.com/pcafrica/focus-beamertheme/blob/main/focus-demo/demo-focus.jpg)
+![](https://github.com/pcafrica/focus-beamertheme/blob/main/focus-demo/demo-references.jpg)
+![](https://github.com/pcafrica/focus-beamertheme/blob/main/focus-demo/demo-appendix.jpg)
Download
========
-Download the latest release by following [this](https://github.com/elauksap/focustheme/releases) link.
+Download the latest release by following [this](https://github.com/pcafrica/focus-beamertheme/releases) link.
Instructions
============
@@ -49,7 +49,7 @@ For example:
```
produces the following ice-blue color theme.
-![](https://github.com/elauksap/focustheme/blob/master/focus-demo/demo-titlepage-color.jpg)
+![](https://github.com/pcafrica/focus-beamertheme/blob/main/focus-demo/demo-titlepage-color.jpg)
Customize the footline
----------------------
@@ -95,6 +95,8 @@ This can be changed by using the option _nofirafonts_:
\usetheme[nofirafonts]{focus}
```
+> **Warning**: if XeTeX returns an error about the font not being found, please follow the instructions at the [TeX Live Guide, section 3.4.4](https://www.tug.org/texlive/doc/texlive-en/texlive-en.html#x1-330003.4.4).
+
License
=======
This software is released under the [GNU GPL v3.0 License](https://www.gnu.org/licenses/gpl-3.0.en.html).
@@ -109,14 +111,8 @@ Contact information are available to registered users on my Github profile page.
Contributors
============
-Focus was initially created and designed by [Pasquale Africa](https://github.com/elauksap).
-
-The following people deserve appreciation and acknowledgment for improving the template with
-additions and modifications (in alphabetical order):
-
-- [max](https://github.com/imntl)
-- [MonsieurPi](https://github.com/MonsieurPi)
-- [SFr682k](https://github.com/SFr682k)
-- [Zortaniac](https://github.com/Zortaniac)
+Focus was initially created and designed by [Pasquale Africa](https://github.com/pcafrica).
-A more detailed contribution list is found [here](https://github.com/elauksap/focus-beamertheme/graphs/contributors).
+Many other people deserve appreciation and acknowledgment for improving the template with
+additions and modifications. Please find a detailed list of contributors
+[here](https://github.com/pcafrica/focus-beamertheme/graphs/contributors).
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamercolorthemefocus.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamercolorthemefocus.sty
index 657b4eba80..22592e2490 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamercolorthemefocus.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamercolorthemefocus.sty
@@ -1,7 +1,7 @@
-% Copyright (C) 2018-2022 Pasquale Claudio Africa and the LaTeX community.
+% Copyright (C) 2018 - 2024 Pasquale Claudio Africa and the LaTeX community.
% A full list of contributors can be found at
%
-% https://github.com/elauksap/focus-beamertheme
+% https://github.com/pcafrica/focus-beamertheme
%
% This file is part of beamerthemefocus.
%
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerfontthemefocus.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerfontthemefocus.sty
index e87abb1e1a..ac85907f35 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerfontthemefocus.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerfontthemefocus.sty
@@ -1,7 +1,7 @@
-% Copyright (C) 2018-2022 Pasquale Claudio Africa and the LaTeX community.
+% Copyright (C) 2018 - 2024 Pasquale Claudio Africa and the LaTeX community.
% A full list of contributors can be found at
%
-% https://github.com/elauksap/focus-beamertheme
+% https://github.com/pcafrica/focus-beamertheme
%
% This file is part of beamerthemefocus.
%
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerinnerthemefocus.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerinnerthemefocus.sty
index bb04821be1..c47554ec71 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerinnerthemefocus.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerinnerthemefocus.sty
@@ -1,7 +1,7 @@
-% Copyright (C) 2018-2022 Pasquale Claudio Africa and the LaTeX community.
+% Copyright (C) 2018 - 2024 Pasquale Claudio Africa and the LaTeX community.
% A full list of contributors can be found at
%
-% https://github.com/elauksap/focus-beamertheme
+% https://github.com/pcafrica/focus-beamertheme
%
% This file is part of beamerthemefocus.
%
@@ -40,7 +40,7 @@
\usebeamercolor{frametitle}\colorlet{focus@@temp}{bg}%
\begin{tikzpicture}[overlay, remember picture]
\fill[color=focus@@temp] (current page.north west) rectangle ([shift = {(0, -0.45\paperheight)}] current page.north east);
- \end{tikzpicture}
+ \end{tikzpicture}
}
\vspace{-1.65\baselineskip}
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerouterthemefocus.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerouterthemefocus.sty
index f61fec9585..598fe27ece 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerouterthemefocus.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerouterthemefocus.sty
@@ -1,7 +1,7 @@
-% Copyright (C) 2018-2022 Pasquale Claudio Africa and the LaTeX community.
+% Copyright (C) 2018 - 2024 Pasquale Claudio Africa and the LaTeX community.
% A full list of contributors can be found at
%
-% https://github.com/elauksap/focus-beamertheme
+% https://github.com/pcafrica/focus-beamertheme
%
% This file is part of beamerthemefocus.
%
@@ -183,7 +183,7 @@
\ifnum\value{realframenumber}>0%
\begin{tikzpicture}[inner xsep=0.5em, inner ysep=0.5ex]
\clip (0,0) rectangle ++(\paperwidth,\the\focus@pbar@height);
- \fill[footline.fg] (0,0) rectangle ++(\paperwidth,\the\focus@pbar@height);
+ \fill[footline.fg, opacity=0, text opacity=1] (0,0) rectangle ++(\paperwidth,\the\focus@pbar@height);
\ifx\focus@footlineinfo\empty%
\else%
@@ -205,11 +205,6 @@
% Empty footline.
\defbeamertemplate{footline}{none}{}
-% Empty footline for noframenumbering.
-\defbeamertemplate{footline}{noframenumbering}{
- \addtocounter{framenumber}{-1}
-}
-
\DeclareOptionBeamer{numbering}{\def\beamer@focus@numbering{#1}}
\ExecuteOptionsBeamer{numbering=progressbar}
@@ -278,7 +273,7 @@
% Enable noframenumbering option.
\define@key{beamerframe}{noframenumbering}[true]{%
- \setbeamertemplate{footline}[noframenumbering]%
+ \addtocounter{framenumber}{-1}
\setlength{\focus@pbar@height}{0cm}%
\focus@calculatefootheight%
}
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerthemefocus.sty b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerthemefocus.sty
index 9bd962a9c7..e981a6a126 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerthemefocus.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/beamerthemefocus.sty
@@ -1,7 +1,7 @@
-% Copyright (C) 2018-2022 Pasquale Claudio Africa and the LaTeX community.
+% Copyright (C) 2018 - 2024 Pasquale Claudio Africa and the LaTeX community.
% A full list of contributors can be found at
%
-% https://github.com/elauksap/focus-beamertheme
+% https://github.com/pcafrica/focus-beamertheme
%
% This file is part of beamerthemefocus.
%
@@ -19,7 +19,7 @@
% along with beamerthemefocus. If not, see <http://www.gnu.org/licenses/>.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerthemefocus}[2022/03/09 v3.3.0 Focus Beamer theme]
+\ProvidesPackage{beamerthemefocus}[2024/02/07 v3.4.0 Focus Beamer theme]
\mode<presentation>
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo.pdf b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo.pdf
index 6a81ce1763..6a81ce1763 100755..100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo.tex b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo.tex
index 616b1765b7..4449b796e7 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo.tex
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo.tex
@@ -2,7 +2,7 @@
% !BIB TS-program = bibtex
% Full instructions available at:
-% https://github.com/elauksap/focus-beamertheme
+% https://github.com/pcafrica/focus-beamertheme
\documentclass{beamer}
\usetheme{focus}
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo/demo-typeset.jpg b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo/demo-typeset.jpg
index fdd037fc98..fdd037fc98 100755..100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo/demo-typeset.jpg
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-focus/focus-demo/demo-typeset.jpg
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/LICENSE b/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/LICENSE
index ffd12ae975..4dd5d1f1ea 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/LICENSE
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2022 Maxime CHUPIN
+Copyright 2024 Maxime CHUPIN
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/README.md b/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/README.md
index 76cab58637..b0b7157fed 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/README.md
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/README.md
@@ -7,7 +7,12 @@ This Beamer theme is a suitable theme for my use of Beamer in applied mathematic
```latex
\usetheme{Amurmaple}
```
+## Preview
+![AmurmapleRed](img/beamer-amurmaple-doc.png)![AmurmapleRed2](img/beamer-amurmaple-doc-2.png)
+![AmurmapleBlack](img/beamer-amurmaple-black.png)![AmurmapleBlack2](img/beamer-amurmaple-black-2.png)
+![AmurmapleBlue](img/beamer-amurmaple-blue.png)![AmurmapleBlue2](img/beamer-amurmaple-blue-2.png)
+![AmurmapleGreen](img/beamer-amurmaple-green.png)![AmurmapleGreen2](img/beamer-amurmaple-green-2.png)
## Documentation
See the [PDF file](doc/beamer-amurmaple-doc.pdf).
@@ -22,7 +27,7 @@ Paste the file `beamerthemeAmurmaple.sty` in your local `~/texmf/tex/latex/contr
## Licence
-Copyright (C) 2023 by Maxime CHUPIN
+Copyright (C) 2024 by Maxime CHUPIN
<chupin at ceremade.dauphine.fr>
This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license or (at your option) any later version. The latest version of this license is in [http://www.latex-project.org/lppl.txt](http://www.latex-project.org/lppl.txt) and version 1.3 or later is part of all distributions of LaTeXversion 2005/12/01 or later.
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-black.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-black.pdf
new file mode 100644
index 0000000000..9d85022f45
--- /dev/null
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-black.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-blue.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-blue.pdf
new file mode 100644
index 0000000000..b6bbc6d359
--- /dev/null
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-blue.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-doc.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-doc.pdf
index 2a3e760726..33b990248d 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-doc.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-doc.tex b/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-doc.tex
index 9dcd18f6da..4810140210 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-doc.tex
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-doc.tex
@@ -113,10 +113,10 @@ delaunay,
\title[Amurmaple documentation]{Amurmaple Beamer Theme}
\author[M.~Chupin]{Maxime Chupin}
-\subtitle{documentation\quad v.1.2}
+\subtitle{documentation\quad v.1.3}
\institute[CNRS]{CNRS\\
University of Paris-Dauphine}
-\date{January 30, 2023}
+\date{February 7, 2024}
\titlegraphic{\includegraphics[width=4cm]{logo.png}}
\mail{chupin@ceremade.dauphine.fr}
\webpage{www.ceremade.dauphine.fr/~chupin/}
@@ -179,7 +179,8 @@ theme.
\item \lstinline+xfp+;
\item \lstinline+expl3+;
\item \lstinline+iftex+;
- \item \lstinline+tikz+.
+ \item \lstinline+tikz+;
+ \item \lstinline+fontawesome5+.
\end{itemize}
\end{multicols}
\end{itemize}
@@ -225,12 +226,8 @@ theme.
rule of the \lstinline+rule+ option (default black).
\item[leftframetitle:] that aligns the \lstinline+frametitle+ to the left of
the slide.
- \framebreak
- \item[amurmapleblue:] that changes the main color (\lstinline+structure+) to a
- certain blue (see slide~\ref{sl:color}) ;
- \item[amurmaplegreen:] that changes the main color (\lstinline+structure+) to a
- certain green (see slide~\ref{sl:color});
- \end{description}
+ \end{description}
+
For example, these slides are produced with the following call\footnote{We use
the \emph{Bitstream Charter} font family provided by the package
\emph{Xcharter-Math} with the serif Beamer theme. \fullcite{xcharter-math}.}:
@@ -239,6 +236,40 @@ theme.
\end{CodePreambule}
\end{frame}
+\section{Color Options}
+
+\sepframe
+
+\begin{frame}[allowframebreaks,fragile]{Color Options}\label{sec:coloroptions}
+ Amurmaple theme provides differents color themes that we can chose calling
+ one of the following options. The different color themes are illustrated after.
+\begin{description}
+ \item[amurmapleblue:] that changes the main color (\lstinline+structure+) to a
+certain blue (see slide~\ref{sl:color}) ;
+\item[amurmaplegreen:] that changes the main color (\lstinline+structure+) to a
+certain green (see slide~\ref{sl:color});
+\item[amurmapleblack:] that changes the main color (\lstinline+structure+) to a
+certain black (see slide~\ref{sl:color}).
+\end{description}
+\framebreak
+\framesection{\texttt{amurmapleblue} illustration}
+\begin{center}
+ \includegraphics[width=0.4\linewidth,page=1]{beamer-amurmaple-blue}\quad\includegraphics[width=0.4\linewidth,page=4]{beamer-amurmaple-blue}
+ \par\itshape Examples using the \lstinline+amurmapleblue+ option.
+\end{center}
+\framebreak
+\framesection{\texttt{amurmaplegreen} illustration}
+\begin{center}
+ \includegraphics[width=0.4\linewidth,page=1]{beamer-amurmaple-green}\quad\includegraphics[width=0.4\linewidth,page=4]{beamer-amurmaple-green}
+ \par\itshape Examples using the \lstinline+amurmaplegreen+ option.
+\end{center}
+\framebreak
+\framesection{\texttt{amurmapleblack} illustration}
+\begin{center}
+ \includegraphics[width=0.4\linewidth,page=1]{beamer-amurmaple-black}\quad\includegraphics[width=0.4\linewidth,page=4]{beamer-amurmaple-black}
+ \par\itshape Examples using the \lstinline+amurmapleblack+ option.
+\end{center}
+\end{frame}
\section{Classical Beamer Tools}
@@ -249,6 +280,7 @@ theme.
This theme provides some colors :
\begin{Code}
\definecolor{AmurmapleRed}{rgb}{0.6,0.,0.}
+\definecolor{AmurmapleBlack}{rgb}{0.17,0.17,0.17}
\definecolor{AmurmapleOrange}{RGB}{230,108,17}
\definecolor{AmurmapleBlue}{RGB}{55,119,231}
\definecolor{AmurmapleGreen}{rgb}{0.1,0.4,0.1}
@@ -263,27 +295,8 @@ used for the math definition (see slide~\ref{sl:definition}) and for the
\lstinline+block title example+ Beamer color, the
\textcolor{AmurmapleBlue}{\lstinline+AmurmapleBlue+} for the new environment
\lstinline+information+ (see slide~\ref{sl:information}) and \textcolor{AmurmapleRemarkColor}{\lstinline+AmurmapleRemarkColor+} for the \lstinline+remark+ environment (see slide~\pageref{sl:remark}).
-\framebreak
-
-\framesection{Color Theme Option}\label{sl:color}
-
-This theme provides two theme options to change the color settings:
-\begin{description}
-\item[amurmapleblue] that sets \texttt{AmurmapleBlue!80!black} as \texttt{structure}
- color ;
-\item[amurmaplegreen] that sets \texttt{AmurmapleGreen!80!black} as \texttt{structure}
- color.
-\end{description}
-In fact, internally, four colors are defined: \lstinline+Amurmaple@structure+,
-\lstinline+Amurmaple@alert+, \lstinline+Amurmaple@info+ and
-\lstinline+Amurmaple@example+.
-
-The color theme option is used as follows
-\begin{Code}
- \usetheme[amurmapleblue]{amurmaple}
-\end{Code}
-Note that the \lstinline+AmurmapleRemarkColor+ is not modified.
+Of course, these definitions depend on the chosen color theme (see page~\pageref{sec:coloroptions})
\end{frame}
\subsection{Classical commands}
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-green.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-green.pdf
new file mode 100644
index 0000000000..0e98b9c05a
--- /dev/null
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-green.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-leftframetitle.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-leftframetitle.pdf
index 23c39a39bb..5a3083bb0e 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-leftframetitle.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-leftframetitle.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-sidebar.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-sidebar.pdf
index 3d24e70165..ffa31ab696 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-sidebar.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-sidebar.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-test.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-test.pdf
index 77ee04f0e6..f34211f533 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-test.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-test.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/tex/beamerthemeAmurmaple.sty b/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/tex/beamerthemeAmurmaple.sty
index 99f6b58c89..ddcd68711c 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/tex/beamerthemeAmurmaple.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/tex/beamerthemeAmurmaple.sty
@@ -1,4 +1,4 @@
-% Copyright (C) 2023 by Maxime CHUPIN
+% Copyright (C) 2024 by Maxime CHUPIN
% <chupin at ceremade.dauphine.fr>
% -------------------------------------------------------
%
@@ -16,12 +16,13 @@
% This work has the LPPL maintenance status "author-maintained".
\NeedsTeXFormat{LaTeX2e}[2021-11-15]
-\ProvidesPackage{beamerthemeAmurmaple}[2023/01/30 v.1.2 Theme for the Beamer
+\ProvidesPackage{beamerthemeAmurmaple}[2024/02/07 v.1.3 Theme for the Beamer
class]%
% some colors
\definecolor{AmurmapleRed}{rgb}{0.6,0.,0.}
+\definecolor{AmurmapleBlack}{rgb}{0.17,0.17,0.17}
\definecolor{AmurmapleOrange}{RGB}{230,108,17}
\definecolor{AmurmapleBlue}{RGB}{55,119,231}
\definecolor{AmurmapleGreen}{rgb}{0.1,0.4,0.1}
@@ -50,6 +51,9 @@ class]%
\newif\ifbeamer@am@amurmaplegreen
\beamer@am@amurmaplegreenfalse
\DeclareOptionBeamer{amurmaplegreen}{\beamer@am@amurmaplegreentrue}
+\newif\ifbeamer@am@amurmapleblack
+\beamer@am@amurmapleblackfalse
+\DeclareOptionBeamer{amurmapleblack}{\beamer@am@amurmapleblacktrue}
\newif\ifbeamer@am@sidebar
\beamer@am@sidebarfalse
\DeclareOptionBeamer{sidebarwidth}{\def\amurmaple@sidebarwidth{#1}}
@@ -73,7 +77,7 @@ class]%
\RequirePackage{expl3}
\RequirePackage{iftex}
\RequirePackage{pgfpages}
-
+\RequirePackage{fontawesome5}
\ifbeamer@am@delaunay
@@ -213,6 +217,13 @@ class]%
\colorlet{Amurmaple@info}{AmurmapleRed}
\colorlet{Amurmaple@example}{AmurmapleBlue}
\fi
+\ifbeamer@am@amurmapleblack
+\colorlet{Amurmaple@structure}{AmurmapleBlack}
+\colorlet{Amurmaple@alert}{AmurmapleOrange}
+\colorlet{Amurmaple@info}{AmurmapleRed}
+\colorlet{Amurmaple@example}{AmurmapleBlue}
+\setbeamercolor{description item}{bg=white,fg=Amurmaple@info}
+\fi
\setbeamercolor{structure}{fg=Amurmaple@structure}
\setbeamercolor{itemize item}{fg=structure!60}
@@ -343,8 +354,8 @@ class]%
% itemize enumerate
-\setbeamertemplate{itemize item}{$\blacktriangleright$}
-\setbeamertemplate{itemize subitem}{\small$\blacktriangleright$}
+\setbeamertemplate{itemize item}{\faAngleRight}
+\setbeamertemplate{itemize subitem}{\faAngleDoubleRight}
\setbeamertemplate{enumerate item}
{
\hbox{%
@@ -710,9 +721,9 @@ class]%
%
}
-\newcommand\amurmaple@info{\raisebox{-1mm}{\tikz{\node[circle,fill=Amurmaple@info,align=center,text
- width=1em,inner sep = 0.0mm]
- {\rmfamily\itshape\bfseries\color{white} i};}}}
+\newcommand\amurmaple@info{\raisebox{-0.8mm}{
+ \Large\textcolor{Amurmaple@info}{\faInfoCircle}%
+}}%
\NewDocumentEnvironment{information}{o}{%
\tcbset{leftrule=1mm,rightrule=0mm,toprule=0mm, bottomrule=0mm,%
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index b059543407..944bc72ec4 100644
--- a/macros/latex/contrib/easybook/easybook.dtx
+++ b/macros/latex/contrib/easybook/easybook.dtx
@@ -15,7 +15,7 @@
%<*class>
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{l3keys2e}
-\ProvidesExplClass{easybook}{2024/02/06}{2024w}
+\ProvidesExplClass{easybook}{2024/02/08}{2024x}
{Easily typesetting Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -297,7 +297,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2021/11/15]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2024/02/06}{2024w}
+\ProvidesExplPackage{easybase}{2024/02/08}{2024x}
{Easily typesetting Chinese theses or books}
\cs_generate_variant:Nn \dim_set:Nn { NV }
@@ -852,7 +852,7 @@
fnafterindent .initial:n = 2em,
fnparskip .skip_set:N = \fnparskip,
fnparskip .initial:n = 0ex plus .1ex,
- fnpara-formatat .tl_set:N = \l__eb_fnpara_format_tl,
+ fnpara-format .tl_set:N = \l__eb_fnpara_format_tl,
fntext-pos .tl_set:N = \l__eb_fntext_position_tl,
fntext-pos .initial:n = super,
fntext-code .code:n = \eb_assign_fntext_code:n {#1},
@@ -993,9 +993,10 @@
}
}
}
-\cs_set:Npn \@makefntext #1
+\cs_new_protected:Npn \deffntpara #1
+ { \cs_set:Npn \@makefntext ##1 {#1} }
+\deffntpara
{
- \group_begin:
\str_case:Vn \l__eb_footnote_value_tl
{
{ hang } { \use_i:nn }
@@ -1007,7 +1008,6 @@
\dim_set:NV \parindent \fnafterindent
\l__eb_fnpara_format_tl{#1}
\tl_if_eq:NnT \l__eb_footnote_value_tl { hang } { \par }
- \group_end:
}
\eb_seq_map_inline:nn { \@footnotetext,\@mpfootnotetext }
{
@@ -2304,7 +2304,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/06}{2024w}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2024/02/08}{2024x}
{Customization of tcolorbox for easybook}
\cs_set_protected:Npn \addtotcbstyle #1#2
diff --git a/macros/latex/contrib/easybook/easybook.pdf b/macros/latex/contrib/easybook/easybook.pdf
index d928e66ce5..ccc80a9691 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 43bad1ffe7..feaac7dcc5 100644
--- a/macros/latex/contrib/easybook/easybook.tex
+++ b/macros/latex/contrib/easybook/easybook.tex
@@ -23,8 +23,8 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK使用手册,
- version = v2024w,
- date = 2024/02/06,
+ version = v2024x,
+ date = 2024/02/08,
authors = 瞿毅,
info = 简便地排版中文学位论文或书籍,
email = toquyi@163.com,
@@ -435,7 +435,7 @@
\begin{options}
\keychoice{linktype}{\fbox{edge},colors,none}
超链接类型。\code{edge} 使超链接形式为边框,\code{colors} 使超链接字体为彩色,\code{none} 关闭超链接边框与颜色,此时 \option{linkcolor} 选项无效。
- \keychoice{linkcolor}{fresh,cutepink,\fbox{DarkBlue},crimson}
+ \keychoice{linkcolor}{fresh,cutepink,\fbox{navyblue},crimson}
超链接颜色样式。预置了四种超链接颜色风格。为使相关颜色能够正确显示,选项 \option{linkcolor} 应当在 \option{linktype} 前使用。
\begin{commands}
\command{DeclareLinkColor}[\splitmarg{风格名称,颜色1,颜色2,颜色3}]
@@ -757,7 +757,9 @@
定义脚注正文标记的格式,与正文标记编号命令 \cs{theupfootnote} 配合使用。
\command{defdownfntmark}[\marg{脚注内容标记格式}]
定义脚注内容标记的格式,与内容标记编号命令 \cs{thedownfootnote} 配合使用。
- \command{notminipage}[\marg{普通页内容}\marg{迷你页内容}]\newtag[Chg]%
+ \command{deffntpara}[\marg{脚注段落文本格式}]\newtag%
+ 定义脚注段落文本的格式的命令。脚注段落文本由脚注内容标记和文本两部分组成,段落格式定义中参数 \code{\#1} 代表内容文本。
+ \command{notminipage}[\marg{普通页内容}\marg{迷你页内容}]
用于在定义脚注标记的命令中判断当前脚注是否处于迷你页而输出不同的内容。
\command{theupfootnote}
保存正文标记编号类型选项 \option{fnmark-num} 指定的正文标记。
@@ -767,6 +769,7 @@
\begin{ctexexam}
\defupfntmark{\super[vmove = 2pt]{\theupfootnote}}
\defdownfntmark{\notminipage{\textcolor{blue}{\thedownfootnote}}{}}
+ \deffntpara{\makebox[2em][r]{\thefootnote}#1}
\end{ctexexam}
\keychoice{fncustom-format}{\textcolor{SlateGray}{format code},match}
单独设定自定义脚注标记的格式,选项 \code{match} 可以匹配 \option{spcmd} 全局的值。自定义脚注内容和正文标记的命令与用法可以见下方和\ref{exam:custom footnote markers} 的介绍。
@@ -782,7 +785,7 @@
\keychoice{fnboth-format}{\textcolor{SlateGray}{format code},match}
同时设定默认脚注标记 \option{fnmarktext-format} 和自定义脚注标记 \option{fncustom-format} 的格式。两种脚注标记匹配上标格式 \option{spcmd} 的值是独立的,使用 \code{match} 则可以同时匹配。标记格式选项含有字体命令会覆盖 \option{footnote} 的设置,最后一个格式命令可以带有一个参数接受脚注标记。
\keyval{fnpara-format}{格式代码}
- 脚注内容的格式。在此设置字体命令会覆盖 \option{footnote} 的设置,最后一个格式命令可以带有一个参数接受脚注内容。
+ 脚注内容文本的格式。在此设置字体命令会覆盖 \option{footnote} 的设置,最后一个格式命令可以带有一个参数接受脚注内容文本。
\kvsplit{fntext-code}{前代码,后代码}
可以用 \meta{前代码} 与 \meta{后代码} 额外增加脚注内容标记前后的代码。也可以只有前部分,\meta{前代码} 中最后一个格式命令可以带有一个参数接受脚注内容标记。由于脚注标记处于水平模式,可以配合盒子命令设置脚注内容标记的对齐方式,或在标记与脚注首行间插入一点距离。
\begin{ctexexam}
@@ -977,7 +980,7 @@
作用于局部范围的英文目录标题条目钩子,代码在标题加入目录前执行,可以插入条目标题定义命令临时改变英文目录中条目的格式,带有星号参数的命令会重置之前的代码。这个命令设置英文目录条目的标题格式具有最高优先级,放置在导言区或 \cs{bichapter} 等双语标题命令前生效。举一个在英文目录节标题条目编号前添加 \code{Section} 字符串的例子:
\begin{ctexexam}
\BeforeAddBitoc{\ctexset{section/name = Section\space}}
- \bisection{zhtitle}{entitle}
+ \bisection{中文标题}{English title}
\end{ctexexam}
\end{commands}
@@ -1351,11 +1354,12 @@
\shortversion{v = 1.638,date = 2022/03/04,changes = 增加目录条目样式选项注册命令 \cs{RegisterTocName}。}
\shortversion{v = 1.644,date = 2022/03/10,changes = 增加浮动环境目录声明命令 \cs{DeclareFloatList} 配合 \pkg*{caption} 宏包。}
\shortversion{v = 1.682,date = 2022/05/01,changes = 将迷你页判断命令 \cs{notminipage} 改为被保护命令兼容 \pkg*{circledtext} 宏包。}
- \begin{version}[v = 2024w,date = 2024/02/06,simple]
+ \begin{version}[v = 2024x,date = 2024/02/08,simple]
\item 核对依赖宏包的更新改动,优化使用手册的内容细节。
\item 修复图表等浮动环境题注目录中条目标签编号的计数器值显示错误问题。
\item 修复附录命令 \cs{appendix} 的可选参数设置英文目录中条目名字和编号失效的问题。
\item 新增目录风格定义命令 \cs{SetTocStyle} 和使用命令 \cs{UseTocStyle}。
+ \item 新增脚注段落文本格式定义命令 \cs{deffntpara}。
\end{version}
\end{changelog}
\nocite{*}
diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md
index e6cccfce52..fcdd23876f 100644
--- a/macros/latex/contrib/siunitx/CHANGELOG.md
+++ b/macros/latex/contrib/siunitx/CHANGELOG.md
@@ -7,12 +7,19 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
## [Unreleased]
+## [v3.3.11] - 2024-02-07
+
+### Fixed
+- Formatting of units with separated uncertainties in 'compound' structures
+ when unit is not repeated (see issue
+ [\#717](https://github.com/josephwright/siunitx/issues/717))
+
## [v3.3.10] - 2024-01-25
### Changed
- Load `color` package in `begindocument/before` hook
- Normalize exponents when `exponent-mode = threshold` (see issue
- [\#716](https://github.com/josephwright/siunitx/issues/711))
+ [\#711](https://github.com/josephwright/siunitx/issues/711))
### Fixed
- Prevent accidental expansion of `\mathord` (see issue
@@ -2060,7 +2067,8 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
### Added
- First public testing release (as `si`)
-[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.3.10...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.3.11...HEAD
+[v3.3.11]: https://github.com/josephwright/siunitx/compare/v3.3.10...v3.3.11
[v3.3.10]: https://github.com/josephwright/siunitx/compare/v3.3.9...v3.3.10
[v3.3.9]: https://github.com/josephwright/siunitx/compare/v3.3.8...v3.3.9
[v3.3.8]: https://github.com/josephwright/siunitx/compare/v3.3.7...v3.3.8
diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf
index 8b1fb01210..06b482440b 100644
--- a/macros/latex/contrib/siunitx/siunitx-code.pdf
+++ b/macros/latex/contrib/siunitx/siunitx-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/siunitx-compound.dtx b/macros/latex/contrib/siunitx/siunitx-compound.dtx
index 4083e3ac47..a6f1ccac76 100644
--- a/macros/latex/contrib/siunitx/siunitx-compound.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-compound.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% File: siunitx-compound.dtx Copyright (C) 2018-2021,2023 Joseph Wright
+% File: siunitx-compound.dtx Copyright (C) 2018-2021,2023,2024 Joseph Wright
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -1032,9 +1032,12 @@
{ \@@_uncert_bracket:nnw {#1#2#3#4#5#6} {#7#8} #9 \q_stop }
\cs_new:Npn \@@_uncert_bracket:nnw #1#2 #3 \q_nil #4 \q_nil #5 \q_stop
{
- \bool_lazy_or:nnTF
- { \tl_if_blank_p:n {#2#3} }
- { ! \tl_if_blank_p:n {#5} }
+ \bool_lazy_any:nTF
+ {
+ { ! \l_@@_unit_repeat_bool }
+ { \tl_if_blank_p:n {#2#3} }
+ { ! \tl_if_blank_p:n {#5} }
+ }
{ \exp_not:n {#1#2#3#4#5} }
{
\exp_not:V \l_@@_bracket_open_tl
diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx
index fb2dc9b5af..4d6874c512 100644
--- a/macros/latex/contrib/siunitx/siunitx.dtx
+++ b/macros/latex/contrib/siunitx/siunitx.dtx
@@ -121,7 +121,7 @@
%
% Identify the package and give the over all version information.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2024-01-25} {3.3.10}
+\ProvidesExplPackage {siunitx} {2024-02-07} {3.3.11}
{A comprehensive (SI) units package}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf
index 9c6da0ea29..825cef3f2d 100644
--- a/macros/latex/contrib/siunitx/siunitx.pdf
+++ b/macros/latex/contrib/siunitx/siunitx.pdf
Binary files differ