summaryrefslogtreecommitdiff
path: root/macros/latex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-09-11 03:01:50 +0000
committerNorbert Preining <norbert@preining.info>2022-09-11 03:01:50 +0000
commitbb79bee25708a6a19a8fc4f1edb988b74b08d292 (patch)
tree2b91c8ca273490a16aeae08a473bd97b17f38f6a /macros/latex
parent0948049e9079ec6f512bf68a247495f36237d06e (diff)
CTAN sync 202209110301
Diffstat (limited to 'macros/latex')
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/README.md3
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-doc.pdfbin348965 -> 655136 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-doc.tex63
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-leftframetitle.pdfbin0 -> 314951 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-sidebar.pdfbin0 -> 329247 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/doc/beamer-amurmaple-test.pdfbin0 -> 315595 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/tex/beamerthemeAmurmaple.sty281
-rw-r--r--macros/latex/contrib/gentombow/LICENSE2
-rw-r--r--macros/latex/contrib/gentombow/README.md4
-rw-r--r--macros/latex/contrib/gentombow/bounddvi-en.tex2
-rw-r--r--macros/latex/contrib/gentombow/bounddvi.tex2
-rw-r--r--macros/latex/contrib/gentombow/gentombow-ja.pdfbin174085 -> 178279 bytes
-rw-r--r--macros/latex/contrib/gentombow/gentombow-ja.tex1
-rw-r--r--macros/latex/contrib/gentombow/gentombow.pdfbin150209 -> 163295 bytes
-rw-r--r--macros/latex/contrib/gentombow/gentombow.sty4
-rw-r--r--macros/latex/contrib/gentombow/gentombow.tex1
-rw-r--r--macros/latex/contrib/gentombow/pxgentombow.sty2
-rw-r--r--macros/latex/contrib/gentombow/pxgentombow.tex2
18 files changed, 258 insertions, 109 deletions
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/README.md b/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/README.md
index 8ef8c1579d..60a13236aa 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/README.md
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/README.md
@@ -12,6 +12,9 @@ This Beamer theme is a suitable theme for my use of Beamer in applied mathematic
See the [PDF file](doc/beamer-amurmaple-doc.pdf).
+## CTAN
+
+Package avaliable on the CTAN: [https://ctan.org/pkg/beamerthemeamurmaple](https://ctan.org/pkg/beamerthemeamurmaple).
## Local installation
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 02313f5b23..4c97107a1f 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 3b07affb7b..c389f6479e 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
@@ -16,7 +16,8 @@
% This work has the LPPL maintenance status "author-maintained".
\documentclass[10pt,aspectratio=169,english]{beamer}
-\usepackage[charter]{mathdesign}
+%\usepackage[charter]{mathdesign}
+\usepackage{xcharter-otf}
\usepackage{hologo}
\usepackage{luamesh}
@@ -24,7 +25,8 @@
\usepackage{pgfpages}
\usepackage{tcolorbox}
\usepackage{biblatex}
-%\hypersetup{colorlinks=true}
+\usepackage{cleveref}
+% \hypersetup{colorlinks=true}
\tcbuselibrary{listings,breakable}
\tcbuselibrary{documentation}
@@ -54,7 +56,7 @@ delaunay,
morekeywords={usetheme,definecolor, beamerbutton, beamerskipbutton,
beamerreturnbutton, structure, alert, sectionpage, mail, webpage,
collaboration, subtitle, institute, titlegraphic, sepframe, includegraphics,
- thanksframe, inserttitlegraphic, framesection, boxalert,appendix}
+ thanksframe, inserttitlegraphic, framesection, boxalert,appendix,logo}
% frame=tb
}
@@ -112,10 +114,10 @@ delaunay,
\title[Amurmaple documentation]{Amurmaple Beamer Theme}
\author[M.~Chupin]{Maxime Chupin}
-\subtitle{documentation\quad v.1.0}
+\subtitle{documentation\quad v.1.1}
\institute[CNRS]{CNRS\\
University of Paris-Dauphine}
-\date{Mai 28, 2022}
+\date{September 10, 2022}
\titlegraphic{\includegraphics[width=4cm]{logo.png}}
\mail{chupin@ceremade.dauphine.fr}
\webpage{www.ceremade.dauphine.fr/~chupin/}
@@ -148,7 +150,8 @@ Obviously, we refer to the documentation of the Beamer class for details, and we
will assume in this little documentation that the reader is familiar with the
Beamer class.
\end{information}
-
+Thanks to Denis Bitouzé for the tests and recommendations to improve this
+theme.
\end{frame}
@@ -184,7 +187,7 @@ Beamer class.
\subsection{Theme Options}
-\begin{frame}[fragile]{Theme Options}
+\begin{frame}[fragile,allowframebreaks]{Theme Options}
There are some options available :
\begin{description}
\item[nogauge:] that suppresses the gauge at the top of the vertical side bar
@@ -193,15 +196,40 @@ Beamer class.
the current slide ;
\item[delaunay:] that produces a Delaunay mesh of random points in
the ``structure'' slides (title, section, etc.). \alert{This option can only be
- used with \hologo{LuaLaTeX}} and depends on the
- package~\lstinline{luamesh}\footfullcite{Luamesh};
- \item[amurmapleblue:] that changes the main color (\lstinline+structure+) to a
+ used with \hologo{LuaLaTeX}} and depends on the
+ package~\lstinline{luamesh}\footfullcite{Luamesh};
+ \framebreak
+ \item[sidebar:] that provides a \emph{sidebar} as shown below\footnote{In
+ general, we strongly recommend the use of the \texttt{aspectratio=169} option of
+ beamer, but even more strongly with the \texttt{sidebar} option.}.
+ \begin{center}
+ \includegraphics[width=0.5\linewidth,page=13]{beamer-amurmaple-sidebar}
+ \end{center}
+ \item[sidebarwidth=\meta{value} (with dimension):] when using the sidebar option, you can
+ adjust the sidebar width (default 58pt).
+ \framebreak
+ \item[rule:] that add a rule between the color areas in the different
+ slides: title (see p.~\cref{title}), section and part (see p.~\ref{sectionpart}),
+ \lstinline+sepframe+ frame(see p.~\ref{sepframe}), thanks frame (see p.~\ref{thanks}), as
+ well as classical slides, between the left bar (sidebar or not) and the
+ text area.
+ \begin{center}
+ \includegraphics[width=0.4\linewidth,page=1]{beamer-amurmaple-test}\quad\includegraphics[width=0.4\linewidth,page=4]{beamer-amurmaple-test}
+ \par\itshape Examples using the \lstinline+rule+ option.
+ \end{center}
+ \item[rulecolor=\meta{color}:] that allows to choose the color for the
+ 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}
For example, these slides are produced with the following call\footnote{We use
- the \texttt{charter} font family of \texttt{mathdesign} with the serif Beamer theme.}:
+ the \emph{Bitstream Charter} font family provided by the package
+ \emph{Xcharter-Math} with the serif Beamer theme. \fullcite{xcharter-math}.}:
\begin{CodePreambule}
\usetheme[nomail,delaunay]{Amurmaple}
\end{CodePreambule}
@@ -348,7 +376,7 @@ can see below
\end{Code}
\end{lrbox}
-\begin{frame}[fragile]{Section and Part Frames}
+\begin{frame}[fragile]{Section and Part Frames}\label{sectionpart}
The standard \texttt{section page} and \texttt{part page} have been modified.
The following code produce the next slide (the part slide is not generated
@@ -396,7 +424,7 @@ can see below
\sepframe
-\begin{frame}[fragile,allowframebreaks]{Title Page}
+\begin{frame}[fragile,allowframebreaks]{Title Page}\label{title}
As shown in this document, the title page has been customized.
In addition to the classic commands for making the title page, the Amurmaple
theme provides new commands.
@@ -412,6 +440,11 @@ can see below
for the presented work.
\end{itemize}
+ The \lstinline+\logo+ command can be used to add a logo to each slide. In the
+ standard theme, the logo is put in the bottom right corner of the slide, just
+ above the page numbering. When the option \lstinline+sidebar+, the logo is put
+ a the bottom of the side bar (above the gauge if it is used).
+
\framebreak
Here the example used to generate this documentation.
@@ -434,7 +467,7 @@ University of Paris-Dauphine}
\sepframe
-\begin{frame}[fragile]{\texttt{sepframe} command}
+\begin{frame}[fragile]{\texttt{sepframe} command}\label{sepframe}
\bigskip
\begin{docCommand}{sepframe}{\oarg{title=\meta{mytitle},image=\meta{my image}}}
The newcommand \lstinline+\sepframe+ is provided by the Amurmaple theme. This
@@ -464,7 +497,7 @@ The result is the next frame.
\sepframe[title={My title},image={\includegraphics[width=5cm]{logo.png}}]
-\begin{frame}[fragile]{\texttt{thanksframe} command}
+\begin{frame}[fragile]{\texttt{thanksframe} command}\label{thanks}
\begin{docCommand}{thanksframe}{\marg{thanking message}}
The newcommand \lstinline+\thanksframe+ is provided by the Amurmaple
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
new file mode 100644
index 0000000000..edc42d6790
--- /dev/null
+++ 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
new file mode 100644
index 0000000000..0b6905d5d8
--- /dev/null
+++ 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
new file mode 100644
index 0000000000..4cf71ff44f
--- /dev/null
+++ 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 6167a9d3f7..f908d772f1 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/tex/beamerthemeAmurmaple.sty
+++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemeamurmaple/tex/beamerthemeAmurmaple.sty
@@ -16,24 +16,50 @@
% This work has the LPPL maintenance status "author-maintained".
\NeedsTeXFormat{LaTeX2e}[2021-11-15]
-\ProvidesPackage{beamerthemeAmurmaple}[2022/05/28 v.1.0 Theme for the Beamer
+\ProvidesPackage{beamerthemeAmurmaple}[2022/09/10 v.1.1 Theme for the Beamer
class]%
-\newif\ifbeamer@nogauge
-\beamer@nogaugetrue
-\DeclareOptionBeamer{nogauge}{\beamer@nogaugefalse}
-\newif\ifbeamer@nomail
-\beamer@nomailtrue
-\DeclareOptionBeamer{nomail}{\beamer@nomailfalse}
-\newif\ifbeamer@delaunay
-\beamer@delaunayfalse
-\DeclareOptionBeamer{delaunay}{\beamer@delaunaytrue}
-\newif\ifbeamer@amurmapleblue
-\beamer@amurmaplebluefalse
-\DeclareOptionBeamer{amurmapleblue}{\beamer@amurmaplebluetrue}
-\newif\ifbeamer@amurmaplegreen
-\beamer@amurmaplegreenfalse
-\DeclareOptionBeamer{amurmaplegreen}{\beamer@amurmaplegreentrue}
+
+% some colors
+\definecolor{AmurmapleRed}{rgb}{0.6,0.,0.}
+\definecolor{AmurmapleOrange}{RGB}{230,108,17}
+\definecolor{AmurmapleBlue}{RGB}{55,119,231}
+\definecolor{AmurmapleGreen}{rgb}{0.1,0.4,0.1}
+
+\colorlet{Amurmaple@structure}{AmurmapleRed}
+\colorlet{Amurmaple@alert}{AmurmapleOrange}
+\colorlet{Amurmaple@info}{AmurmapleBlue}
+\colorlet{Amurmaple@example}{AmurmapleGreen}
+\colorlet{Amurmaple@rule}{black}
+
+\def\amurmaple@sidebarwidth{58pt}
+
+\newif\ifbeamer@am@nogauge
+\beamer@am@nogaugetrue
+\DeclareOptionBeamer{nogauge}{\beamer@am@nogaugefalse}
+\newif\ifbeamer@am@nomail
+\beamer@am@nomailtrue
+\DeclareOptionBeamer{nomail}{\beamer@am@nomailfalse}
+\newif\ifbeamer@am@delaunay
+\beamer@am@delaunayfalse
+\DeclareOptionBeamer{delaunay}{\beamer@am@delaunaytrue}
+\newif\ifbeamer@am@amurmapleblue
+\beamer@am@amurmaplebluefalse
+\DeclareOptionBeamer{amurmapleblue}{\beamer@am@amurmaplebluetrue}
+\newif\ifbeamer@am@amurmaplegreen
+\beamer@am@amurmaplegreenfalse
+\DeclareOptionBeamer{amurmaplegreen}{\beamer@am@amurmaplegreentrue}
+\newif\ifbeamer@am@sidebar
+\beamer@am@sidebarfalse
+\DeclareOptionBeamer{sidebarwidth}{\def\amurmaple@sidebarwidth{#1}}
+\DeclareOptionBeamer{sidebar}{\beamer@am@sidebartrue}
+\newif\ifbeamer@am@leftframetitle
+\beamer@am@leftframetitlefalse
+\DeclareOptionBeamer{leftframetitle}{\beamer@am@leftframetitletrue}
+\newif\ifbeamer@am@rule
+\beamer@am@rulefalse
+\DeclareOptionBeamer{rule}{\beamer@am@ruletrue}
+\DeclareOptionBeamer{rulecolor}{\colorlet{Amurmaple@rule}{#1}}
\ProcessOptionsBeamer
\RequirePackage{tcolorbox}
@@ -45,20 +71,31 @@ class]%
-\ifbeamer@delaunay
+\ifbeamer@am@delaunay
\ifLuaTeX
\else
\errmessage{Delaunay option only available with luaLaTeX}
\fi
\fi
+%sidebar
+\ifbeamer@am@sidebar
+ \useoutertheme[height=0pt,width=\amurmaple@sidebarwidth,hideothersubsections]{sidebar}
+\fi
% dimensions
\ExplSyntaxOn
-\dim_const:Nn \c_amurmaple_barre_dim { 15pt }
+\ifbeamer@am@sidebar
+ \dim_const:Nn \c_amurmaple_barre_dim { \beamer@sidebarwidth }
+\else
+ \dim_const:Nn \c_amurmaple_barre_dim { 15pt }
+\fi
\dim_const:Nn \c_amurmaple_margin {10pt}
-\tl_set:Nx \l_amurmaple_margin_left { \dim_eval:n { \c_amurmaple_barre_dim+\c_amurmaple_margin } }
-
+\ifbeamer@am@sidebar
+ \tl_set:Nx \l_amurmaple_margin_left { \dim_eval:n {\c_amurmaple_margin } }
+\else
+ \tl_set:Nx \l_amurmaple_margin_left { \dim_eval:n { \c_amurmaple_barre_dim+\c_amurmaple_margin } }
+\fi
\setbeamersize
{
text~ margin~ left=\l_amurmaple_margin_left,
@@ -122,25 +159,16 @@ class]%
\usetikzlibrary{quotes,angles}
\usetikzlibrary{automata}
\usetikzlibrary{arrows}
+\usetikzlibrary{calc}
-% some colors
-\definecolor{AmurmapleRed}{rgb}{0.6,0.,0.}
-\definecolor{AmurmapleOrange}{RGB}{230,108,17}
-\definecolor{AmurmapleBlue}{RGB}{55,119,231}
-\definecolor{AmurmapleGreen}{rgb}{0.1,0.4,0.1}
-
-\colorlet{Amurmaple@structure}{AmurmapleRed}
-\colorlet{Amurmaple@alert}{AmurmapleOrange}
-\colorlet{Amurmaple@info}{AmurmapleBlue}
-\colorlet{Amurmaple@example}{AmurmapleGreen}
-%
-\ifbeamer@amurmapleblue
+% colors
+\ifbeamer@am@amurmapleblue
\colorlet{Amurmaple@structure}{AmurmapleBlue!80!black}
\colorlet{Amurmaple@alert}{AmurmapleOrange}
\colorlet{Amurmaple@info}{AmurmapleRed}
\colorlet{Amurmaple@example}{AmurmapleGreen}
\fi
-\ifbeamer@amurmaplegreen
+\ifbeamer@am@amurmaplegreen
\colorlet{Amurmaple@structure}{AmurmapleGreen!80!black}
\colorlet{Amurmaple@alert}{AmurmapleOrange}
\colorlet{Amurmaple@info}{AmurmapleRed}
@@ -162,48 +190,93 @@ class]%
\setbeamercolor{mail}{fg=structure!60}
\setbeamertemplate{subsection in toc}
- {\leavevmode\leftskip=2em\rule{0.6em}{0.6em}\hskip0.5em\inserttocsubsection\par}
-
+{\leavevmode\leftskip=2em\rule{0.6em}{0.6em}\hskip0.5em\inserttocsubsection\par}
-\def\amurmaple@gauge{%
+\newlength{\gauge@step}
+\NewDocumentCommand{\amurmaple@gauge}{o}{%
+ \def\amurmaple@gaugewidth{40pt}%
+ \IfNoValueF{#1}{%
+ \def\amurmaple@gaugewidth{#1}%
+ }%
+ % \def\gauge@step{\numexpr\numexpr\amurmaple@gaugewidth-2pt\relax/10\relax}%
+ \setlength{\gauge@step}{(\amurmaple@gaugewidth-2pt)/10}%
\def\pourc{\numexpr(10*\insertframenumber/\insertmainframenumber)}%
- \def\xj{\numexpr(4.95*\pourc)}
+ \def\xj{\numexpr(4.95*\pourc)}%
%\resetcolorseries[9]{PiedDePage}%
- \begin{tikzpicture}[x=0.7cm,y=0.7cm]
- \draw[color=white] (-.1,-.1)--(1.6,-.1)--(1.6,.2)--(-.1,.2)--cycle;
+ \begin{tikzpicture}[x=0.7cm,y=0.7cm]%
+ \draw[color=white] (0pt,-2pt)--(\amurmaple@gaugewidth,-2pt)--(\amurmaple@gaugewidth,4pt)--(0pt,4pt)--cycle;%
\foreach \i in {0,...,10}{%
\ifnum\i<\pourc%
\fill[color=white]%PiedDePage!!+]
- (0+0.15*\i,0)--(0.15+0.15*\i,0)--(0.15+0.15*\i,.1)--(0+0.15*\i,.1)--cycle;
- \fi
- }
- \end{tikzpicture}
+ (\the\gauge@step*\i+1pt,-1pt)--(\the\gauge@step+\the\gauge@step*\i+1pt,-1pt)--(\the\gauge@step+\the\gauge@step*\i+1pt,3pt)--(0+\the\gauge@step*\i+1pt,3pt)--cycle;%
+ \fi%
+ }%
+ \end{tikzpicture}%
}
% background
+\ifbeamer@am@sidebar
+ \setbeamercolor{sidebar}{fg=white}
+ \setbeamercolor{author in sidebar}{fg=black!20!white}
+ \setbeamercolor{title in sidebar}{fg=white}
+ \setbeamercolor{section in sidebar}{bg=black!30!structure,fg=white}
+ \setbeamercolor{subsection in sidebar}{bg=black!30!structure,fg=white}
+ \setbeamerfont{subsection in sidebar}{size=\scriptsize}
+ \setbeamerfont{subsection in sidebar}{size=\tiny}
+ \setbeamerfont{title in sidebar}{size=\small}
+ \setbeamerfont{author in sidebar}{size=\tiny}
+\fi
\ExplSyntaxOn
\setbeamertemplate{background}%
{%
- \hypersetup{linkcolor=white}
- \begin{tikzpicture}[remember~picture,overlay]
- \fill[Amurmaple@structure]
- (current~page.south~west) rectangle ([xshift=\c_amurmaple_barre_dim]current~
- page.north~west);
- \node[anchor=north~west,rotate=90,color=white] at (current~page.south~west)
- (title) {\scriptsize\insertshorttitle\quad---\quad \insertshortauthor
- \ifbeamer@nomail
- \quad \texttt{\amurmaple@printmail}
- \fi
- };
- \ifbeamer@nogauge
- \ifnum\insertframenumber>\insertmainframenumber % gauge only in main part
- \else
- \node[anchor=north~east,rotate=90,color=white] at (current~page.north~west)
- (gauge) {\amurmaple@gauge};
- \fi
+ \hypersetup{linkcolor=white}%
+ \begin{tikzpicture}[remember~picture,overlay]%
+ \fill[Amurmaple@structure]%
+ (current~page.south~west) rectangle ([xshift=\c_amurmaple_barre_dim]current~%
+ page.north~west);%
+ \ifbeamer@am@rule
+ \fill[Amurmaple@rule]%
+ ([xshift=\c_amurmaple_barre_dim]current~page.south~west) rectangle ([xshift=\c_amurmaple_barre_dim+1pt]current~%
+ page.north~west);%
\fi
- \end{tikzpicture}
-}
+ \ifbeamer@am@sidebar%
+ \node[anchor=south,color=black!40] at ($(current~page.south)+(0.5\c_amurmaple_barre_dim,0)$)%
+ (title) {\small%
+ \ifbeamer@am@nomail%
+ \texttt{\amurmaple@printmail}%
+ \fi%
+ };%
+ \ifbeamer@am@nogauge%
+ \ifnum\insertframenumber>\insertmainframenumber % gauge only in main part
+ \else%
+ %\newlength{\amurmaple@gaugesidebarwidth}
+ %\setlength{\amurmaple@gaugesidebarwidth}{\beamer@sidebarwidth-15pt}
+ \node[anchor=south~west,color=white,inner~sep=0pt] at ([xshift=3pt,yshift=5pt]current~page.south~west)%
+ (gauge) {\amurmaple@gauge[\the\beamer@sidebarwidth-6pt]};%
+ \fi%
+ \fi%
+ \ifx\logo\empty%
+ \else%
+ \node [anchor=south~west,inner~sep=0pt] at ($(current~page.south~west)+(0,0.5)$)%
+ (logo) {\insertlogo};%
+ \fi%
+ \else%
+ \node[anchor=north~west,rotate=90,color=white] at (current~page.south~west)%
+ (title) {\scriptsize\insertshorttitle\quad---\quad \insertshortauthor%
+ \ifbeamer@am@nomail%
+ \quad \texttt{\amurmaple@printmail}%
+ \fi%
+ };%
+ \ifbeamer@am@nogauge%
+ \ifnum\insertframenumber>\insertmainframenumber % gauge only in main part%
+ \else%
+ \node[anchor=north~east,rotate=90,color=white] at (current~page.north~west)%
+ (gauge) {\amurmaple@gauge};%
+ \fi%
+ \fi%
+ \fi%
+ \end{tikzpicture}%
+}%
\ExplSyntaxOff
%
%
@@ -287,7 +360,7 @@ class]%
\fill[white]
([yshift=15pt]current~page.west) rectangle (current~page.north~
east);
- \ifbeamer@delaunay
+ \ifbeamer@am@delaunay
\ifLuaTeX
\amurmaple@buildpoints
\amurmaple@buildmesh
@@ -296,6 +369,11 @@ class]%
\fill[structure]
([yshift=15pt]current~page.west)~rectangle~(current~page.south~
east);
+ \ifbeamer@am@rule
+ \fill[Amurmaple@rule]
+ ([yshift=15pt]current~page.west)~rectangle~([yshift=10pt]current~page.
+ east);
+ \fi
\node[anchor=east]~
at~([yshift=-35pt,xshift=-20pt]current~page.north~east)~(author)~
{\parbox[t]{.6\paperwidth}{\raggedleft%
@@ -359,7 +437,7 @@ class]%
\fill[white]
([yshift=15pt]current page.west) rectangle (current page.north
east);
- \ifbeamer@delaunay
+ \ifbeamer@am@delaunay
\ifLuaTeX
\amurmaple@buildpoints
\amurmaple@buildmesh
@@ -368,6 +446,10 @@ class]%
\fill[structure]
([yshift=15pt]current page.west) rectangle (current page.south
east);
+ \ifbeamer@am@rule
+ \fill[Amurmaple@rule]
+ ([yshift=15pt]current page.west) rectangle ([yshift=10pt]current page.east);
+ \fi
\node[anchor=east, font=\huge, text width=0.95\linewidth,align=right]
at ([yshift=-50pt,xshift=-20pt]current page.north east) (section)
{ Section \insertsectionnumber: \bfseries\textcolor{structure}{\insertsection}};
@@ -384,7 +466,10 @@ class]%
\fill[structure]
([yshift=15pt]current page.west) rectangle (current page.north
east);
-
+ \ifbeamer@am@rule
+ \fill[Amurmaple@rule]
+ ([yshift=15pt]current page.west) rectangle ([yshift=10pt]current page.east);
+ \fi
\node[anchor=north]
at ([yshift=-20pt]current page.north) (section)
{\Large\textcolor{white}{Part~\insertpartnumber}};
@@ -397,25 +482,42 @@ class]%
% frame title
+\ExplSyntaxOn
\setbeamercolor{frametitle}{fg=structure}
\setbeamerfont{frametitle}{size=\bfseries\Large}
\setbeamertemplate{frametitle}{%
- \raggedleft
- \usebeamerfont{frametitle}\insertframetitle%
- \vphantom{g}% To avoid fluctuations per frame
- \par
- \raggedleft
- \vspace*{-0.3cm}
- \rule{0.5\paperwidth}{2pt}\hspace*{-1cm}%%
- \par
- \raggedleft
- \vspace*{-0.3cm}%
- {\ifx\insertframesubtitle\@empty%
- \else%
- \usebeamerfont{framesubtitle}\insertframesubtitle%
- \fi}%
- \par
+ \ifbeamer@am@leftframetitle
+ \usebeamerfont{frametitle}\insertframetitle%
+ \vphantom{g}% To avoid fluctuations per frame
+ \par%
+ \vspace*{-0.3cm}%
+ \hspace*{-\c_amurmaple_margin}\rule{0.5\paperwidth}{2pt}%%
+ \par%
+ \vspace*{-0.3cm}%
+ {\ifx\insertframesubtitle\@empty%
+ \else%
+ \usebeamerfont{framesubtitle}\insertframesubtitle%
+ \fi}%
+ \par%
+ \else
+ \raggedleft
+ \usebeamerfont{frametitle}\insertframetitle%
+ \vphantom{g}% To avoid fluctuations per frame
+ \par
+ \raggedleft
+ \vspace*{-0.3cm}
+ \rule{0.5\paperwidth}{2pt}\hspace*{-1cm}%%
+ \par
+ \raggedleft
+ \vspace*{-0.3cm}%
+ {\ifx\insertframesubtitle\@empty%
+ \else%
+ \usebeamerfont{framesubtitle}\insertframesubtitle%
+ \fi}%
+ \par
+ \fi
}
+\ExplSyntaxOff
%%%%%%%%%%%%%%
%%% commands
@@ -430,15 +532,15 @@ class]%
}}
% new one a subtitle inside a frame
+\ExplSyntaxOn
\NewDocumentCommand{\framesection}{m}{
\medskip
\noindent{\large\bfseries\textcolor{structure}{#1}}\par\vspace*{-0.2cm}
- \hspace*{-0.5cm}{\color{structure}\rule{0.4\paperwidth}{2pt}}\par\smallskip%
+ \hspace*{-\c_amurmaple_margin}{\color{structure}\rule{0.4\paperwidth}{2pt}}\par\smallskip%
}
% new one define a separation frame with a title and the TOC
%% key/value
-\ExplSyntaxOn
\keys_define:nn { amurmaple/sepframe } {
title .tl_set:N = \l_sepframetitle_tl ,
image .tl_set:N = \l_sepframeimage_tl
@@ -462,7 +564,7 @@ class]%
\setbeamercolor{background~canvas}{bg=white}
\begin{frame}[noframenumbering,plain]
\begin{tikzpicture}[remember~picture,overlay]
- \ifbeamer@delaunay
+ \ifbeamer@am@delaunay
\ifLuaTeX
\amurmaple@buildpoints
\amurmaple@buildmesh
@@ -471,6 +573,11 @@ class]%
\fill[structure]
([yshift=15pt]current~page.west) rectangle (current~page.south~
east);
+ \ifbeamer@am@rule
+ \fill[Amurmaple@rule]
+ ([yshift=15pt]current~page.west)~rectangle~([yshift=10pt]current~page.
+ east);
+ \fi
\node[anchor=east,text~width = 0.75\linewidth, font=\huge\bfseries,align=right]
at ([yshift=-50pt,xshift=-20pt]current~page.north~east) (section)
{\textcolor{structure}{\amurmaple@septitle}};
@@ -511,7 +618,7 @@ class]%
}
\begin{frame}[noframenumbering,plain]
\begin{tikzpicture}[remember picture,overlay]
- \ifbeamer@delaunay
+ \ifbeamer@am@delaunay
\ifLuaTeX
\amurmaple@buildpoints
\amurmaple@buildmesh
@@ -520,6 +627,10 @@ class]%
\fill[structure]
([yshift=15pt]current page.west) rectangle (current page.south
east);
+ \ifbeamer@am@rule
+ \fill[Amurmaple@rule]
+ ([yshift=15pt]current page.west) rectangle ([yshift=10pt]current page.east);
+ \fi
\node[anchor=east,text width = 0.95\linewidth, font=\huge\bfseries,align=right]
at ([yshift=50pt,xshift=-20pt]current page.south east) (section)
{\textcolor{white}{#2}};
@@ -626,4 +737,4 @@ class]%
\setbeamercolor{block title example}{fg=Amurmaple@example}
\mode
-<all> \ No newline at end of file
+<all>
diff --git a/macros/latex/contrib/gentombow/LICENSE b/macros/latex/contrib/gentombow/LICENSE
index 9661ce7b8d..3c621a33c0 100644
--- a/macros/latex/contrib/gentombow/LICENSE
+++ b/macros/latex/contrib/gentombow/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2016-2020 Hironobu Yamashita
+Copyright (c) 2016-2022 Hironobu Yamashita
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/macros/latex/contrib/gentombow/README.md b/macros/latex/contrib/gentombow/README.md
index 94cbdbdac0..c1be49df54 100644
--- a/macros/latex/contrib/gentombow/README.md
+++ b/macros/latex/contrib/gentombow/README.md
@@ -26,7 +26,7 @@ All packages except bounddvi.sty works with the followings:
Set papersize special to DVI file.
Can be used on LaTeX/pLaTeX/upLaTeX (with DVI output mode)
with dvips or dvipdfmx drivers.
- Old version (v6.0) was written by Koichi INOU in 2004
+ Old version (v6.0) was written by Koichi INOUE in 2004
(https://www.ma.ns.tcu.ac.jp/Pages/TeX/bounddvi.sty.html),
and incorporated into this bundle by his courtesy.
@@ -66,6 +66,6 @@ the 3-clause BSD license (see [LICENSE](./LICENSE)).
## Release Date
-2020-10-14
+2022-09-10
Hironobu Yamashita
diff --git a/macros/latex/contrib/gentombow/bounddvi-en.tex b/macros/latex/contrib/gentombow/bounddvi-en.tex
index 82046f888a..df981f44d4 100644
--- a/macros/latex/contrib/gentombow/bounddvi-en.tex
+++ b/macros/latex/contrib/gentombow/bounddvi-en.tex
@@ -5,7 +5,7 @@
% The package documentation (this file) was
% written by Hironobu Yamashita.
-\documentclass[a4paper]{article}
+\documentclass[a4paper,dvipdfmx]{article}
\usepackage{doc}
\usepackage{bounddvi}
\GetFileInfo{bounddvi.sty}
diff --git a/macros/latex/contrib/gentombow/bounddvi.tex b/macros/latex/contrib/gentombow/bounddvi.tex
index 198bbb7fb9..3382688718 100644
--- a/macros/latex/contrib/gentombow/bounddvi.tex
+++ b/macros/latex/contrib/gentombow/bounddvi.tex
@@ -6,7 +6,7 @@
% パッケージ作者 (v1.0--v6.0):東京都市大学(旧称・武蔵工業大学)井上浩一
% 修正版 (v7.0--) および本ドキュメント:山下弘展 (Hironobu Yamashita)
-\documentclass[a4paper]{jsarticle}
+\documentclass[a4paper,dvipdfmx]{jsarticle}
\usepackage{doc}
\usepackage{bounddvi}
\GetFileInfo{bounddvi.sty}
diff --git a/macros/latex/contrib/gentombow/gentombow-ja.pdf b/macros/latex/contrib/gentombow/gentombow-ja.pdf
index ee94b6c132..d0bed9845b 100644
--- a/macros/latex/contrib/gentombow/gentombow-ja.pdf
+++ b/macros/latex/contrib/gentombow/gentombow-ja.pdf
Binary files differ
diff --git a/macros/latex/contrib/gentombow/gentombow-ja.tex b/macros/latex/contrib/gentombow/gentombow-ja.tex
index 411aad1db2..fc5fd95541 100644
--- a/macros/latex/contrib/gentombow/gentombow-ja.tex
+++ b/macros/latex/contrib/gentombow/gentombow-ja.tex
@@ -454,6 +454,7 @@ $30\,\mathrm{mm}$にしたいとき\footnote{ここでは「本文の領域以
かったバグの修正
\item 2019/07/21 v0.9k \textsf{pdfx}パッケージとの整合性をとる改良
\item 2020/10/14 v0.9l \textsf{plautopatch}からトンボ対策パッチを取り込み
+ \item 2022/09/10 v0.9m 用紙\verb+c4+のサイズ誤りを修正(\textsf{libpaper}ライブラリ由来)
\end{itemize}
\end{document}
diff --git a/macros/latex/contrib/gentombow/gentombow.pdf b/macros/latex/contrib/gentombow/gentombow.pdf
index 178bab4c52..e16d43e15d 100644
--- a/macros/latex/contrib/gentombow/gentombow.pdf
+++ b/macros/latex/contrib/gentombow/gentombow.pdf
Binary files differ
diff --git a/macros/latex/contrib/gentombow/gentombow.sty b/macros/latex/contrib/gentombow/gentombow.sty
index bcd8093f50..b7bf637c7f 100644
--- a/macros/latex/contrib/gentombow/gentombow.sty
+++ b/macros/latex/contrib/gentombow/gentombow.sty
@@ -8,7 +8,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{gentombow}
- [2020/10/14 v0.9l Generate crop mark 'tombow']
+ [2022/09/10 v0.9m Generate crop mark 'tombow']
\def\pxgtmb@pkgname{gentombow}
\@namedef{ver@pxgentombow.sty}{}% fake
@@ -430,7 +430,7 @@
\pxgtmb@addpapersize[a6]{c7}{81mm}{114mm}
\pxgtmb@addpapersize[a5]{c6}{114mm}{162mm}
\pxgtmb@addpapersize[a4]{c5}{162mm}{229mm}
-\pxgtmb@addpapersize[a3]{c4}{229mm}{354mm}
+\pxgtmb@addpapersize[a3]{c4}{229mm}{324mm}
\pxgtmb@addpapersize[a2]{c3}{324mm}{458mm}
\pxgtmb@addpapersize[a1]{c2}{458mm}{648mm}
\pxgtmb@addpapersize[a0]{c1}{648mm}{917mm}
diff --git a/macros/latex/contrib/gentombow/gentombow.tex b/macros/latex/contrib/gentombow/gentombow.tex
index d0bc4523ab..68e994be76 100644
--- a/macros/latex/contrib/gentombow/gentombow.tex
+++ b/macros/latex/contrib/gentombow/gentombow.tex
@@ -302,6 +302,7 @@ please load \textsf{gentombow} after \textsf{geometry}.
considered by \verb+/TrimBox+.
\item 2019/07/21 v0.9k Support \textsf{pdfx} package.
\item 2020/10/14 v0.9l Import tombow-related patches from \textsf{plautopatch}.
+ \item 2022/09/10 v0.9m Fix \verb+c4+ paper size (bug inherited from \textsf{libpaper}).
\end{itemize}
\end{document}
diff --git a/macros/latex/contrib/gentombow/pxgentombow.sty b/macros/latex/contrib/gentombow/pxgentombow.sty
index bd94b4bcee..6dce912de2 100644
--- a/macros/latex/contrib/gentombow/pxgentombow.sty
+++ b/macros/latex/contrib/gentombow/pxgentombow.sty
@@ -8,7 +8,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{pxgentombow}
- [2020/10/14 v0.9l Generate crop mark 'tombow']
+ [2022/09/10 v0.9m Generate crop mark 'tombow']
\PackageWarningNoLine{pxgentombow}{%
Package `pxgentombow' is now superseded by\MessageBreak
`gentombow', use `gentombow' instead}
diff --git a/macros/latex/contrib/gentombow/pxgentombow.tex b/macros/latex/contrib/gentombow/pxgentombow.tex
index 8a8c2616bd..c384ef302b 100644
--- a/macros/latex/contrib/gentombow/pxgentombow.tex
+++ b/macros/latex/contrib/gentombow/pxgentombow.tex
@@ -3,7 +3,7 @@
\epTeXinputencoding utf8 % ensure utf-8 encoding for platex
\fi
-\documentclass[a4paper]{jsarticle}
+\documentclass[a4paper,dvipdfmx]{jsarticle}
\usepackage{doc}
\usepackage{pxgentombow}
\usepackage{bounddvi}