summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-09-07 03:03:54 +0000
committerNorbert Preining <norbert@preining.info>2021-09-07 03:03:54 +0000
commita7ef56f18421a8ffb9d34c16ff9f017e45e4e6d3 (patch)
tree7e5c6afbefbbbf312f0d8db33fd0884924a5f227 /macros
parentb63aa636b82853ca4885c1e90c619cdbcfa72730 (diff)
CTAN sync 202109070303
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/README.md35
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/frames.tex280
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.pdfbin417185 -> 418373 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.tex2
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.dtx66
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.pdfbin356603 -> 362222 bytes
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamercolorthemetrigon.dtx80
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerfontthemetrigon.dtx2
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerinnerthemetrigon.dtx45
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerouterthemetrigon.dtx2
-rw-r--r--macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerthemetrigon.dtx2
-rw-r--r--macros/latex/contrib/crumbs/crumbs.pdfbin332170 -> 332623 bytes
-rw-r--r--macros/latex/contrib/crumbs/crumbs.sty70
-rw-r--r--macros/latex/contrib/crumbs/crumbs.tex9
-rw-r--r--macros/latex/contrib/easybook/README.md14
-rw-r--r--macros/latex/contrib/easybook/easybook.dtx6
-rw-r--r--macros/latex/contrib/easybook/easybook.pdfbin590672 -> 578392 bytes
-rw-r--r--macros/latex/contrib/easybook/easybook.tex47
-rw-r--r--macros/latex/contrib/siunitx/CHANGELOG.md10
-rw-r--r--macros/latex/contrib/siunitx/siunitx-code.pdfbin1512131 -> 1512430 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx-print.dtx44
-rw-r--r--macros/latex/contrib/siunitx/siunitx.dtx2
-rw-r--r--macros/latex/contrib/siunitx/siunitx.pdfbin636196 -> 636993 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx.tex7
-rw-r--r--macros/latex/contrib/uwa-colours/README19
-rw-r--r--macros/latex/contrib/uwa-colours/uwa-colours.dtx273
-rw-r--r--macros/latex/contrib/uwa-colours/uwa-colours.ins58
-rw-r--r--macros/latex/contrib/uwa-colours/uwa-colours.pdfbin0 -> 127395 bytes
-rw-r--r--macros/xetex/generic/xetexko/ChangeLog10
-rw-r--r--macros/xetex/generic/xetexko/README2
-rw-r--r--macros/xetex/generic/xetexko/xetexko-doc.pdfbin255775 -> 258539 bytes
-rw-r--r--macros/xetex/generic/xetexko/xetexko-doc.tex8
-rw-r--r--macros/xetex/generic/xetexko/xetexko.sty78
33 files changed, 963 insertions, 208 deletions
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/README.md b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/README.md
index 649600b187..5a98084061 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/README.md
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/README.md
@@ -19,14 +19,16 @@ high degree of customization.
The main design focuses on triangular shapes for major layout elements and noise
minimization for the main body of the work.
-The theme will be made available directly from CTAN and Overleaf once finished
-(hopefully).
+The theme is now available on [CTAN](https://ctan.org/pkg/beamertheme-trigon)
+and will be shared as a template on [Overleaf](https://www.overleaf.com)
+shortly.
Feature requests, issues and pull requests are welcome.
## Features
- Multiple style variations for title, section and regular slides
+- Dark theme
- Many convenient options (numbering style, toggle section slides, title font changes,...)
- Looks better on 16:9 format, but supports 4:3 as well
- Lightweight (does not require lots of additional packages)
@@ -52,6 +54,35 @@ Default Style | Example alternative style
## Installation
+To install a stable version of this theme, please refer to update instructions
+of your TeX distribution. Trigon has been on
+[CTAN](https://ctan.org/pkg/beamertheme-trigon) since March 2021. For users of
+typical TeX distributions (TexLive, MacTeX, MikTeX), simply updating your
+package list should install trigon on your system.
+
+If you want to use the cutting-edge development version of Trigon, you can
+install it manually by following these steps:
+1. **Download the source** using a `git clone` of the [Trigon
+ repository](https://gitlab.com/thlamb/beamertheme-trigon) or as a [zip
+ archive](https://gitlab.com/thlamb/beamertheme-trigon/-/archive/master/beamertheme-trigon-master.zip)
+2. **Compile the style files** by running `make sty` inside the downloaded
+ directory. (Or run LaTeX directly on `source/trigontheme.ins`.)
+3. **Move the resulting `*.sty` files** to the folder containing your
+ presentation. To use Trigon with many presentations, run `make install` or
+ move the `*.sty` files to a folder in your TeX path instead.
+4. **Use the theme** by declaring `\usetheme{trigon}` in the preamble of your
+ document.
+
+### Overleaf
+Trigon is not yet included in default TexLive installations. Therefore, it is
+not natively available on [Overleaf](https://overleaf.com) (it should be
+included at the end of Q3 2021). In the meantime, a template project was made
+and will be kept updated with the current master version. To use it, follow
+[this link](https://www.overleaf.com/read/dvbnhdcbfknk), copy the project
+(menu/copy project) and modify it to your needs.
+
+Once the theme will be properly included to Overleaf, a basic template will be
+added to the Overleaf theme gallery.
## Usage
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/frames.tex b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/frames.tex
new file mode 100644
index 0000000000..5c38f0636d
--- /dev/null
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/frames.tex
@@ -0,0 +1,280 @@
+%--------------------------------------
+% Create title frame
+\titleframe
+
+%--------------------------------------
+% Table of contents
+\begin{frame}{Overview}
+ \setbeamertemplate{section in toc}[sections numbered]
+ \tableofcontents[hideallsubsections]
+\end{frame}
+
+
+%==============================================
+\section{Introduction}
+%==============================================
+\begin{frame}{\insertsectionhead}
+ \framesubtitle{A short introduction to Trigon}
+ \themename is a modern, elegant and versatile theme for Beamer, inspired by
+ the
+ \href{https://github.com/matze/mtheme}{\textsc{metropolis} theme} from Matthias
+ Vogelgesang.
+ \vfill
+ \themename comes with lots of nice extra features
+ \begin{itemize}
+ \item Multiple style variations for title, section and normal slides
+ \item Simple customization of theme colors
+ \item Lots of convenient options to tweak the design
+ \end{itemize}
+\end{frame}
+
+
+%==============================================
+\section{Layout}
+%==============================================
+
+\subsection{Layout variations}
+
+\begin{frame}[fragile=singleslide]{\insertsectionhead}
+ \framesubtitle{\insertsubsectionhead}
+ The general style for the title, section and regular frames can be changed
+ easily with simple options. Here are some examples for the title page
+ \begin{figure}[ht!]
+ \begin{subfigure}[b]{0.3\textwidth}
+ \frame{\includegraphics[width=\textwidth]{screenshots/layout_example-03.jpg}}
+ \caption*{plain}
+ \end{subfigure}
+ \hspace{\fill}
+ \begin{subfigure}[b]{0.3\textwidth}
+ \frame{\includegraphics[width=\textwidth]{screenshots/layout_example-02.jpg}}
+ \caption*{style1}
+ \end{subfigure}
+ \hspace{\fill}
+ \begin{subfigure}[b]{0.3\textwidth}
+ \frame{\includegraphics[width=\textwidth]{screenshots/layout_example-01.jpg}}
+ \caption*{style2 (default)}
+ \end{subfigure}
+ \end{figure}
+\end{frame}
+
+%--------------------------------------
+\subsection{Fonts}
+
+\begin{frame}
+ \frametitle{\insertsectionhead}
+ \framesubtitle{\insertsubsectionhead}
+ This theme is using \textit{Source Sans Pro} font for all elements by default.
+ This can be disabled by providing the option \texttt{usesourcefonts=false}.
+ \vfill
+ Emphasis can be added by using \textbf{bold} typeface, \textit{italic},
+ \alert{alert} or {\color{tPrim}{simple colors}}.
+ \vfill
+ Equations are typsetted with this font as well
+ \begin{equation*}
+ F(x|\mu,s) = \int_{-\infty}^x s^{-1}\left(1+e^{-\frac{v-\mu}{s}}\right)^{-2} e^{-\frac{v-\mu}{s}}\;\mathsf{d}v = \frac{1}{1+e^{-\frac{x-\mu}{s}}}
+ \end{equation*}
+\end{frame}
+
+
+%==============================================
+\section{Elements}
+%==============================================
+\subsection{Charts}
+\begin{frame}{\insertsectionhead}
+ \framesubtitle{\insertsubsectionhead}
+ \begin{columns}[c, onlytextwidth]
+ \column{0.47\textwidth}
+ Use the theme color \texttt{tPrim}, \texttt{tSec}, \texttt{tGrey} and
+ \texttt{tAccent} to have charts directly fit the main theme of presentation.
+ \vfill
+ \begin{itemize}
+ \item Easy variants using \texttt{color!x} to lighten or darken the colors
+ \end{itemize}
+ \hfill
+ \column{0.47\textwidth}
+ \center
+ \resizebox{0.9\textwidth}{!}{%
+ \begin{tikzpicture}
+ \pie[color={tPrim, tPrim!75, tPrim!50, tPrim!25},
+ rotate=90, hide number, text= legend]
+ {50/tPrim, 32/tPrim!75, 16/tPrim!50, 2/tPrim!25}
+ \end{tikzpicture}
+ }
+ \end{columns}
+\end{frame}
+
+\subsection{Lists}
+\begin{frame}{\insertsectionhead}
+ \framesubtitle{\insertsubsectionhead}
+ \begin{columns}[T,onlytextwidth]
+ \column{0.28\textwidth}
+ Items
+ \begin{itemize}
+ \item Item 1
+ \begin{itemize}
+ \item Subitem 1
+ \item Subitem 2
+ \end{itemize}
+ \item Item 2
+ \item Item 3
+ \end{itemize}
+
+ \column{0.42\textwidth}
+ Enumerations
+ \begin{enumerate}
+ \item The Fellowship of the Ring,
+ \item The Two Towers,
+ \item The Return of the King.
+ \end{enumerate}
+
+ \column{0.30\textwidth}
+ Descriptions
+ \begin{description}
+ \item[Trigon] Modern. \item[Default] Outdated.
+ \end{description}
+ \end{columns}
+\end{frame}
+
+%--------------------------------------
+\subsection{Figures}
+\begin{frame}
+ \frametitle{\insertsectionhead}
+ \framesubtitle{\insertsubsectionhead}
+
+ \begin{figure}
+ \newcounter{density}
+ \setcounter{density}{20}
+ \begin{tikzpicture}
+ \def\couleur{tAccent}
+ \def\color{tSec}
+ \path[coordinate] (0,0) coordinate(A)
+ ++( 60:5cm) coordinate(B)
+ ++(-60:5cm) coordinate(C);
+ \path[coordinate] (0,0) coordinate(D)
+ ++(60:5cm) coordinate(E)
+ ++(180:5cm) coordinate(F);
+ \draw[fill=\couleur!\thedensity] (A) -- (B) -- (C) -- cycle;
+ \draw[fill=\color!\thedensity] (D) -- (E) -- (F) -- cycle;
+ \foreach \x in {1,...,15}{%
+ \pgfmathsetcounter{density}{\thedensity+10}
+ \setcounter{density}{\thedensity}
+ \path[coordinate] coordinate(X) at (A){};
+ \path[coordinate] (A) -- (B) coordinate[pos=.15](A)
+ -- (C) coordinate[pos=.15](B)
+ -- (X) coordinate[pos=.15](C);
+ \draw[fill=\couleur!\thedensity] (A)--(B)--(C)--cycle;
+ }
+ \setcounter{density}{20}
+ \foreach \x in {1,...,15}{%
+ \pgfmathsetcounter{density}{\thedensity+10}
+ \setcounter{density}{\thedensity}
+ \path[coordinate] coordinate(X) at (D){};
+ \path[coordinate] (D) -- (E) coordinate[pos=.15](D)
+ -- (F) coordinate[pos=.15](E)
+ -- (X) coordinate[pos=.15](F);
+ \draw[fill=\color!\thedensity] (D)--(E)--(F)--cycle;
+ }
+ \end{tikzpicture}
+ \caption{Rotated triangles from
+ \href{http://www.texample.net/tikz/examples/rotated-triangle/}{texample.net}.}
+ \end{figure}
+\end{frame}
+
+%--------------------------------------
+\subsection{Tables}
+\begin{frame}
+ \frametitle{\insertsectionhead}
+ \framesubtitle{\insertsubsectionhead}
+ \begin{table}[H]
+ \centering
+ \caption{A nice table example}
+ \begin{tabular}{@{} lccc @{}}
+ \toprule
+ & \textbf{Velocity} & \textbf{Angle} & \textbf{Vertical force} \\
+ & $U$ & $\alpha$ & $F_z$ \\
+ & [m/s] & [$^\circ$] & [N] \\
+ \midrule
+ 2D simulation & 9 & 2 & 9.23 \\
+ 3D simulation & 10.0 & 3 & 15.039 \\
+ Experiment A & 11.31 & 2.5 & 13.2 \\
+ Experiment B & 11.26 & 2.7 & 12.6 \\
+ Experiment C & 11.33 & 2.47 & 13.6 \\
+ \bottomrule
+ \end{tabular}
+ \end{table}
+
+\end{frame}
+
+%--------------------------------------
+\subsection{Blocks}
+\begin{frame}
+ \frametitle{\insertsectionhead}
+ \framesubtitle{\insertsubsectionhead}
+ \begin{block}{Regular block}
+ Just a regular block
+ \end{block}
+ \begin{alertblock}{Alert block}
+ Some important thing
+ \end{alertblock}
+ \begin{exampleblock}{Example block}
+ No difference with regular block to avoid excessive distraction
+ \end{exampleblock}
+\end{frame}
+
+%--------------------------------------
+\subsection{Frame footer}
+{
+\setbeamertemplate{frame footer}{My custom footer}
+\begin{frame}[fragile]
+ \frametitle{\insertsectionhead}
+ \framesubtitle{\insertsubsectionhead}
+ \themename defines a custom beamer template to add a text to the footer. It can be set via
+ \begin{verbatim}\setbeamertemplate{frame footer}{My custom footer}\end{verbatim}
+\end{frame}
+}
+
+\begin{frame}{References}
+ Some references to showcase [allowframebreaks] \cite{knuth92,ConcreteMath,Simpson,Er01,greenwade93}
+\end{frame}
+
+%==============================================
+\section{Conclusion}
+%==============================================
+\begin{frame}{Summary}
+
+ Get the source of this theme and the demo presentation from
+
+ \begin{center}\url{gitlab.com/thlamb/beamertheme-trigon}\end{center}
+
+ As for \textsc{metropolis}, \themename is licensed under a
+ \href{http://creativecommons.org/licenses/by-sa/4.0/}{Creative Commons
+ Attribution-ShareAlike 4.0 International License}.
+
+ \begin{center}\ccbysa\end{center}
+
+\end{frame}
+
+%==============================================
+%\begin{frame}[standout]
+% Questions?
+%\end{frame}
+
+\appendix
+
+\begin{frame}[fragile]{Backup slides}
+ Sometimes, it is useful to add slides at the end of your presentation to
+ refer to during audience questions.
+
+ The best way to do this is to include the \verb|appendixnumberbeamer|
+ package in your preamble and call \verb|\appendix| before your backup slides.
+
+ \themename will automatically turn off slide numbering and progress bars for
+ slides in the appendix.
+\end{frame}
+
+\begin{frame}[allowframebreaks]{References}
+
+ \bibliography{demo}
+ \bibliographystyle{abbrv}
+
+\end{frame}
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.pdf b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.pdf
index 5ba9ff31de..b68674e1b7 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.tex b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.tex
index 9ac49cfa97..8b9e68a4ba 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.tex
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/demo/trigon_demo.tex
@@ -10,7 +10,7 @@
% Image for the title page (use includegraphics option to properly size/place it)
\titlegraphic{\includegraphics[height=\paperheight]{library.jpg}}
-\usetheme[sectionstyle=style2]{trigon}
+\usetheme[background=light,sectionstyle=style2]{trigon}
% Define logos to use (comment if no logo)
\biglogo{trigon_full.pdf} % Used on titlepage only
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.dtx b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.dtx
index e40dd1431f..f7d6503a2d 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.dtx
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.dtx
@@ -111,7 +111,7 @@
\themename found its origin and inspiration in the graphical guidelines
resulting from the visual identity overhaul of the
-\href{https://www.uliege.be}{Univeristy of Liège} (Belgium).\\
+\href{https://www.uliege.be}{University of Liège} (Belgium).\\
Although directly inspired from these guidelines, \themename was stripped out of
any mention or specificities related the University and its faculties. This
makes the \themename theme perfectly suitable for many different contexts.
@@ -130,6 +130,26 @@ Any feature request, issue report or merge requests are welcome.
%% ------------------------------------
\section{Getting Started}
+\subsection{Installing from CTAN}
+The latest stable version of \themename is available on
+\href{https://ctan.org/pkg/beamertheme-trigon}{CTAN} and should now be part of
+the usual \TeX\ distibutions (\TeX\ Live, Mac\TeX\ , Mik\TeX\ ), under the name
+\textit{beamertheme-trigon}. It means that if your distribution is kept
+up-to-date, the package should normally be already installed on your system. If
+this is not the case, consider updating the packages of your Tex distribution.
+
+For \TeX\ Live and Mac\TeX\ users, this usually means running
+\begin{lstlisting}
+tlmgr update --all
+\end{lstlisting}
+, or if administrative privileges are required
+\begin{lstlisting}
+sudo tlmgr update --all
+\end{lstlisting}
+
+For Mik\TeX\ users, please refer to \href{https://miktex.org/howto/update-miktex}{the official Mik\TeX\ documentation}.
+
+
\subsection{Installing from Gitlab}
If you want to use the cutting-edge development version of \themename, you can
@@ -163,14 +183,17 @@ options for advanced users:
\end{description}
-\subsection{Other install methods}
+\subsection{Overleaf}
+As of the writing of this documentation (September 5,2021), the theme is not yet
+natively supported on Overleaf. It will be added once they update their package
+list, which is planned for end of Q3 2021
+(\href{https://gitlab.com/thlamb/beamertheme-trigon/-/issues/1#note_558034187}{see
+discussion on that topic}).
-\themename will be proposed for integration on \href{https://www.ctan.org}{CTAN}
-shortly. It will then hopefully be integrated to texlive, miktex, etc. In the
-meantime, only the installation from Gitlab is possible.
+In the meantime, a \href{https://www.overleaf.com/read/dvbnhdcbfknk}{template
+project} was created on Overleaf so users can just copy this project and use
+that as a basis for their own presentation.
-Once accepted on CTAN, the theme will also be made available on
-\href{https://www.overleaf.com}{Overleaf}.
\subsection{A Minimal Example}
@@ -243,6 +266,11 @@ Vogelgesang, many of \textsc{Metropolis} options are also available in
\subsubsection{Main theme}
+\DescribeOption{background}{light,dark}{light}{%
+ Provides the option to have a dark background and light foreground instead of
+ the reverse.
+}
+
\DescribeOption{titleformat}%
{regular, smallcaps, allsmallcaps, allcaps}
{regular}{
@@ -254,7 +282,7 @@ Vogelgesang, many of \textsc{Metropolis} options are also available in
}
\DescribeOption{usesourcefonts}{true,false}{true}{%
- Choses if the |sourcesanspro| font package should be loaded |true| or not
+ Chooses if the |sourcesanspro| font package should be loaded |true| or not
|false|.
}
@@ -342,14 +370,15 @@ Vogelgesang, many of \textsc{Metropolis} options are also available in
and |example|.
}
-\DescribeOption{headingcolor}{black, theme}{black}{
+\DescribeOption{headingcolor}{default, theme}{default}{
Controls weather the color of all headings (title page, frame title, etc.)
- should be in |black| in a slightly darker shade of the theme color |theme|.
+ should be in black (|default|) or in a slightly darker shade of the theme
+ color |theme|.
}
-\DescribeOption{textgcolor}{black, theme}{black}{
- Controls weather the color of the regular text elements should be in |black|
- in a slightly darker shade of the theme color |theme|.
+\DescribeOption{textgcolor}{default, theme}{default}{
+ Controls weather the color of the regular text elements should be in black
+ (|default|) or in a slightly darker shade of the theme color |theme|.
}
\subsubsection{Font theme}
@@ -369,7 +398,7 @@ Vogelgesang, many of \textsc{Metropolis} options are also available in
The included \themename color theme is used by default, but its colors can be
easily changed to suit your tastes. All of the theme's styles are defined in
-terms of four colors:
+terms of a few main colors:
\begin{itemize}
\item |tPrim| The primary theme color, used for main triangle elements, and
for headings and text if the appropriate options are selected.
@@ -378,6 +407,10 @@ terms of four colors:
\item |tAccent| The accent color, used mostly for alerted text.
\item |tGrey| A grey color, used for background elements (triangles, blocks,
etc.).
+ \item |tTxt| The default text color.
+ \item |tBg| The default background color.
+ \item |tGreyBg| A tint of grey to use for the triangle elements.
+ \item |tTheme| A tint of the |tPrim| color to use for some triangle elements.
\end{itemize}
An easy way to customize the theme is to redefine these colors using
@@ -385,8 +418,7 @@ An easy way to customize the theme is to redefine these colors using
\begin{lstlisting}
\colorlet{tPrim}{ ... }
\colorlet{tSec}{ ... }
- \colorlet{tAccent}{ ... }
- \colorlet{tGrey}{ ... }
+ ...
\end{lstlisting}
in your preamble.
@@ -439,7 +471,7 @@ only alphabetic characters and do not require the expansion of any macros.
\section{License}
\themename is licensed under the terms of the
-\href{https://creativecommons.org/licenses/by-sa/4.0/}{Creative Commons
+\href{https://creativecommons.org/licenses/by-sa/4.0/}{Creative Commons
Attribution-ShareAlike 4.0} license.
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.pdf b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.pdf
index 417c09721a..9e7a19cc6c 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.pdf
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/docs/trigontheme.pdf
Binary files differ
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamercolorthemetrigon.dtx b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamercolorthemetrigon.dtx
index 521869762e..15e5a94897 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamercolorthemetrigon.dtx
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamercolorthemetrigon.dtx
@@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamercolorthemetrigon}[2021/03/25 v0.5.0 Trigon color theme]
+\ProvidesPackage{beamercolorthemetrigon}[2021/09/06 v0.6.0 Trigon color theme]
%</package>
% \fi
% \CheckSum{0}
@@ -35,15 +35,27 @@
%
%
% \subsubsection{Options}
+% \begin{macro}{colors}
+% Provides the option to have a dark background and light foreground instead
+% of the reverse.
+% \begin{macrocode}
+\pgfkeys{
+ /trigon/color/background/.cd,
+ .is choice,
+ dark/.code=\trigon@colors@dark,
+ light/.code=\trigon@colors@light
+}
+% \end{macrocode}
+% \end{macro}
%
% \begin{macro}{headingcolor}
% Select the color to use for all headings (title, section, frame, etc.).
% \begin{macrocode}
-\def\headcol{black}
+\def\headcol{tDefaulttxt}
\pgfkeys{
/trigon/color/headingcolor/.cd,
.is choice,
- black/.code=\def\headcol{black},
+ default/.code=\def\headcol{tTxt},
theme/.code=\def\headcol{tPrim}
}
% \end{macrocode}
@@ -56,8 +68,8 @@
\pgfkeys{
/trigon/color/textcolor/.cd,
.is choice,
- black/.code=\def\txtcol{black},
- theme/.code=\def\txtcol{tPrim!50!black}
+ default/.code=\def\txtcol{tTxt},
+ theme/.code=\def\txtcol{tPrim!50!tTxt}
}
% \end{macrocode}
% \end{macro}
@@ -78,9 +90,10 @@
% \begin{macrocode}
\newcommand{\trigon@color@setdefaults}{
\pgfkeys{/trigon/color/.cd,
+ background=light,
block=fill,
- headingcolor=black,
- textcolor=black
+ headingcolor=default,
+ textcolor=default
}
}
% \end{macrocode}
@@ -89,20 +102,43 @@
% \subsubsection{Base colors}
%
% \begin{macrocode}
-\definecolor{tPrim}{HTML}{00707F} % Green-Blue
-\definecolor{tSec}{HTML}{5FA4B0} % Green-Blue light
-\definecolor{tAccent}{HTML}{F07F3C} % Orange
-\definecolor{tGrey}{HTML}{E6E6E1} % Grey-Beige
+\definecolor{tGreenBlue}{HTML}{00707F}
+\definecolor{tGreenBlueLight}{HTML}{5FA4B0}
+\definecolor{tOrange}{HTML}{F07F3C}
+\definecolor{tYellowOrange}{HTML}{F8AA00}
+\definecolor{tBeigePale}{HTML}{E6E6E1}
+\definecolor{tBeige}{HTML}{C6C0B4}
+\definecolor{tDarkBg}{HTML}{232931}
+\definecolor{tDarkFg}{HTML}{EEEEEE}
+\definecolor{tLightBg}{HTML}{FFFFFF}
% \end{macrocode}
%
% \subsubsection{Derived elements}
%
% All the elements are set using the base colors defined here above.
% \begin{macrocode}
-\setbeamercolor{background canvas}{bg=white}
-\setbeamercolor{normal text}{fg=\txtcol, bg= }
+\newcommand{\trigon@colors@dark}{
+ \colorlet{tPrim}{tGreenBlueLight}
+ \colorlet{tSec}{tGreenBlue}
+ \colorlet{tAccent}{tYellowOrange}
+ \colorlet{tTxt}{tDarkFg}
+ \colorlet{tBg}{tDarkBg}
+ \colorlet{tGreyBg}{tGrey!7!tBg}
+}
+\newcommand{\trigon@colors@light}{
+ \colorlet{tPrim}{tGreenBlue}
+ \colorlet{tSec}{tGreenBlue}
+ \colorlet{tAccent}{tOrange}
+ \colorlet{tTxt}{black}
+ \colorlet{tBg}{tLightBg}
+ \colorlet{tGreyBg}{tGrey!25!tBg}
+}
+\colorlet{tGrey}{tBeige}
+\colorlet{tTheme}{tGreenBlue}
+\setbeamercolor{background canvas}{bg=tBg}
+\setbeamercolor{normal text}{fg=\txtcol, bg=tBg}
+\setbeamercolor{example text}{fg=tPrim}
\setbeamercolor{alerted text}{fg=tAccent}
-\setbeamercolor{example text}{fg=tSec}
\setbeamercolor{title}{fg=\headcol, bg= , parent=normal text}
\setbeamercolor{titlelike}{use=title, parent=title}
@@ -116,7 +152,7 @@
% \end{macrocode}
%
%
-% Block environments such as |theorem| and |example| have a |tGrey| background
+% Block environments such as |theorem| and |example| have a grey-tinted background
% color by default. The option |block=transparent| removes the background color.
% \begin{macrocode}
\newcommand{\trigon@block@transparent}{
@@ -134,7 +170,7 @@
\setbeamercolor{block title}{%
use=normal text,
fg=normal text.fg,
- bg=normal text.bg!80!fg
+ bg=normal text.bg!80!normal text.fg
}
\setbeamercolor{block body}{
use={block title, normal text},
@@ -158,18 +194,18 @@
%
% The color of other smaller elements is defined as follows
% \begin{macrocode}
-\setbeamercolor{footnote}{fg=normal text.fg!90}
+\setbeamercolor{footnote}{fg=normal text.fg!90!normal text.bg}
\setbeamercolor{footnote mark}{fg=.}
-\setbeamercolor{footline}{fg=normal text.fg!50, parent=normal text}
-\setbeamercolor{caption}{fg=black!60, parent=normal text}
+\setbeamercolor{footline}{fg=normal text.fg!50!normal text.bg, parent=normal text}
+\setbeamercolor{caption}{fg=normal text.fg!60!normal text.bg, parent=normal text}
-\setbeamercolor{itemize item}{fg=tPrim, parent=normal text}
+\setbeamercolor{itemize item}{use=example text, parent=example text}
\setbeamercolor{itemize subitem}{use=itemize item, parent=itemize item}
\setbeamercolor{itemize subsubitem}{use=itemize item, parent=itemize item}
-\setbeamercolor{enumerate item}{fg=tPrim, parent=normal text}
+\setbeamercolor{enumerate item}{use=example text, parent=example text}
\setbeamercolor{enumerate subitem}{use=enumerate item, parent=enumerate item}
\setbeamercolor{enumerate subsubitem}{use=enumerate item, parent=enumerate item}
-\setbeamercolor{description item}{fg=tPrim, parent=normal text}
+\setbeamercolor{description item}{use=example text, parent=example text}
% \end{macrocode}
%
% \subsubsection{Process package options}
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerfontthemetrigon.dtx b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerfontthemetrigon.dtx
index fcc9ed34a3..74e5ee3965 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerfontthemetrigon.dtx
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerfontthemetrigon.dtx
@@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerfontthemetrigon}[2021/03/25 v0.5.0 Trigon font theme]
+\ProvidesPackage{beamerfontthemetrigon}[2021/09/06 v0.6.0 Trigon font theme]
%</package>
% \fi
% \CheckSum{0}
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerinnerthemetrigon.dtx b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerinnerthemetrigon.dtx
index c234dfc343..60344f6d4b 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerinnerthemetrigon.dtx
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerinnerthemetrigon.dtx
@@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerinnerthemetrigon}[2021/03/25 v0.5.0 Trigon inner theme]
+\ProvidesPackage{beamerinnerthemetrigon}[2021/09/06 v0.6.0 Trigon inner theme]
%</package>
% \fi
% \CheckSum{0}
@@ -79,9 +79,12 @@
\pgfkeys{
/trigon/inner/slidestyle/.cd,
.is choice,
- blank/.code=\def\slidestyle{blank},
- style1/.code=\def\slidestyle{smallcornertriangle},
+ blank/.code=\def\slidestyle{blank}
+ \setbeamertemplate{background}[\slidestyle],
+ style1/.code=\def\slidestyle{smallcornertriangle}
+ \setbeamertemplate{background}[\slidestyle],
cyber/.code=\def\slidestyle{cyberbottom}
+ \setbeamertemplate{background}[\slidestyle]
}
% \end{macrocode}
% \end{macro}
@@ -221,7 +224,7 @@
\defbeamertemplate{background}{smallcornertriangle}{
\begin{tikzpicture}[blend group=multiply]
\useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
- \leftColorTriangle{0.62\paperwidth}{0}{tGrey!30}
+ \leftColorTriangle{0.62\paperwidth}{0}{tGrey!30!tBg}
\end{tikzpicture}
}
% \end{macrocode}
@@ -232,10 +235,10 @@
% frames when the appropriate option is selected).
% \begin{macrocode}
\defbeamertemplate{background}{cyberbottom}{
-\tikzstyle{cyberVertex}=[scale=1,draw=tGrey!60,circle,fill=white]
-\tikzstyle{cyberVertex2}=[scale=0.5,draw=tGrey!60,circle,fill=tGrey!60]
-\tikzstyle{cyberEdge} = [draw,color=tGrey!60]
-\begin{tikzpicture}[blend group=multiply]
+\tikzstyle{cyberVertex}=[scale=1,draw=tGreyBg,circle,fill=tBg]
+\tikzstyle{cyberVertex2}=[scale=0.5,draw=tGreyBg,circle,fill=tGreyBg]
+\tikzstyle{cyberEdge} = [draw,color=tGreyBg]
+\begin{tikzpicture}%[blend group=multiply]
\useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
\foreach \pos/\name in {
{(-0.05\paperwidth,0.75\paperheight)/0},
@@ -278,16 +281,16 @@
\begin{tikzpicture}
\useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
\begin{scope}[blend group=multiply]
- \path[fill=tPrim]\leftTriangle{0.5\paperwidth}{0};
- \topColorTriangle{0.73\paperwidth}{0.70\paperheight}{tGrey!30};
+ \path[fill=tTheme]\leftTriangle{0.5\paperwidth}{0};
+ \topColorTriangle{0.73\paperwidth}{0.70\paperheight}{tGrey!30!tBg};
\ifx\inserttitlegraphic\@empty
- \leftColorTriangle{0.73\paperwidth}{0.70\paperheight}{tPrim}
+ \leftColorTriangle{0.73\paperwidth}{0.70\paperheight}{tTheme}
\else
\path[clip]\leftTriangle{0.73\paperwidth}{0.70\paperheight};
\node[anchor=north west, inner sep=0pt, outer sep=0pt] at (0,\the\paperheight) {\inserttitlegraphic};
\fi
\end{scope}
- \path[fill=white]\rightTriangle{0.45\paperwidth}{\the\paperheight};
+ \path[fill=tBg]\rightTriangle{0.45\paperwidth}{\the\paperheight};
\ifx\logbig\@empty \else
\node[anchor=north east,inner sep=0mm] at
(.96*\the\paperwidth,.96*\the\paperheight) {\includegraphics[width=0.28\textwidth]{\logbig}};
@@ -303,12 +306,12 @@
\defbeamertemplate{background}{titlesmallimage}{
\begin{tikzpicture}[blend group=multiply]
\useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
- \leftColorTriangle{0.58\paperwidth}{0}{tGrey!30}
+ \leftColorTriangle{0.58\paperwidth}{0}{tGrey!30!tBg}
\ifx\logbig\@empty \else
\node[anchor=north east,inner sep=0mm] at (.94*\the\paperwidth,.94*\the\paperheight) {\includegraphics[width=0.33\textwidth]{\logbig}};
\fi
\ifx\inserttitlegraphic\@empty
- \leftColorTriangle{0.58\paperwidth}{\the\paperheight}{tPrim}
+ \leftColorTriangle{0.58\paperwidth}{\the\paperheight}{tTheme}
\else
\path[clip]\leftTriangle{0.58\paperwidth}{\the\paperheight};
\node[anchor=north west, inner sep=0pt, outer sep=0pt] at (0,\the\paperheight) {\inserttitlegraphic};
@@ -325,7 +328,7 @@
\defbeamertemplate{background}{bottomtrianglescolor}{
\begin{tikzpicture}[blend group=multiply]
\useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
- \leftColorTriangle{0.62\paperwidth}{0}{tPrim}
+ \leftColorTriangle{0.62\paperwidth}{0}{tTheme}
\rightColorTriangle{0.38\paperwidth}{0}{tSec}
\end{tikzpicture}
}
@@ -339,8 +342,8 @@
\defbeamertemplate{background}{bottomtrianglesbw}{
\begin{tikzpicture}[blend group=multiply]
\useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
- \leftColorTriangle{0.62\paperwidth}{0}{tPrim}
- \rightColorTriangle{0.38\paperwidth}{0}{tGrey}
+ \leftColorTriangle{0.62\paperwidth}{0}{tTheme}
+ \rightColorTriangle{0.38\paperwidth}{0}{tGrey!30!tBg}
\end{tikzpicture}
}
% \end{macrocode}
@@ -352,8 +355,8 @@
\defbeamertemplate{background}{bigtriangles}{
\begin{tikzpicture}[blend group=multiply]
\useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
- \leftColorTriangle{0.80\paperwidth}{0.62\paperheight}{tPrim}
- \rightColorTriangle{0.68\paperwidth}{0.58\paperheight}{tGrey}
+ \leftColorTriangle{0.80\paperwidth}{0.62\paperheight}{tTheme}
+ \rightColorTriangle{0.68\paperwidth}{0.58\paperheight}{tGrey!30!tBg}
\end{tikzpicture}
}
% \end{macrocode}
@@ -365,8 +368,8 @@
\defbeamertemplate{background}{lefttriangles}{
\begin{tikzpicture}[blend group=multiply]
\useasboundingbox (0,0) rectangle(\the\paperwidth,\the\paperheight);
- \leftColorTriangle{0.52\paperwidth}{\the\paperheight}{tPrim}
- \leftColorTriangle{0.775\paperwidth}{0}{tGrey}
+ \leftColorTriangle{0.52\paperwidth}{\the\paperheight}{tTheme}
+ \leftColorTriangle{0.775\paperwidth}{0}{tGrey!30!tBg}
\end{tikzpicture}
}
% \end{macrocode}
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerouterthemetrigon.dtx b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerouterthemetrigon.dtx
index e8302d4e23..41ab019fc5 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerouterthemetrigon.dtx
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerouterthemetrigon.dtx
@@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerouterthemetrigon}[2021/03/25 v0.5.0 Trigon outer theme]
+\ProvidesPackage{beamerouterthemetrigon}[2021/09/06 v0.6.0 Trigon outer theme]
%</package>
% \fi
% \CheckSum{0}
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerthemetrigon.dtx b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerthemetrigon.dtx
index 1cd8f763f6..b12e1dc7e8 100644
--- a/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerthemetrigon.dtx
+++ b/macros/latex/contrib/beamer-contrib/themes/beamertheme-trigon/source/beamerthemetrigon.dtx
@@ -13,7 +13,7 @@
% \iffalse
%<*package>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{beamerthemetrigon}[2021/03/25 v0.5.0 Trigon Beamer theme]
+\ProvidesPackage{beamerthemetrigon}[2021/09/06 v0.6.0 Trigon Beamer theme]
%</package>
% \fi
% \CheckSum{0}
diff --git a/macros/latex/contrib/crumbs/crumbs.pdf b/macros/latex/contrib/crumbs/crumbs.pdf
index f930fb6401..51b6922ad5 100644
--- a/macros/latex/contrib/crumbs/crumbs.pdf
+++ b/macros/latex/contrib/crumbs/crumbs.pdf
Binary files differ
diff --git a/macros/latex/contrib/crumbs/crumbs.sty b/macros/latex/contrib/crumbs/crumbs.sty
index 9c29b5dc78..89126af2fb 100644
--- a/macros/latex/contrib/crumbs/crumbs.sty
+++ b/macros/latex/contrib/crumbs/crumbs.sty
@@ -21,7 +21,7 @@
% SOFTWARE.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{crumbs}[2021/09/04 0.1.0 Navigation Crumbs]
+\ProvidesPackage{crumbs}[2021/09/06 0.2.1 Navigation Crumbs]
\RequirePackage{etoolbox}
@@ -49,44 +49,44 @@
\fi
}
+\NewCommandCopy\crumbsoldsection\section
+\renewcommand\section[2][]{
+ \def\temp{#1}
+ \ifx\crumbs\empty
+ \appendtofile{\jobname.crumbs}{
+ \back ifx \back crumbs \back empty
+ \back gappto \back crumbs{\back setcounter{crumbi}{0}}
+ \back fi
+ \back gappto\back crumbs{\back stepcounter{crumbi}\back crumb{\ifx\temp\empty #2\else #1\fi}{#2}}
+ }
+ \fi
+ \crumbsoldsection{#2}
+}
+
+\NewCommandCopy\crumbsoldsubsection\subsection
+\renewcommand\subsection[2][]{
+ \def\temp{#1}
+ \ifx\crumbs\empty
+ \appendtofile{\jobname.crumbs}{
+ \back ifcsname crumbs\romannumeral\the\value{section}\back endcsname\back else
+ \back expandafter\back newcommand\back csname crumbs\romannumeral\the\value{section}\back endcsname{%
+ \back setcounter{subcrumbi}{0}
+ }
+ \back fi
+ \back expandafter\back gappto\back csname crumbs\romannumeral\the\value{section}\back endcsname{%
+ \back stepcounter{subcrumbi}
+ \back subcrumb{\ifx\temp\empty #2\else #1\fi}{#2}
+ }
+ }
+ \fi
+ \crumbsoldsubsection{#2}
+}
+
\newcommand\crumb[2]{#1}
\newcommand\subcrumb[2]{#1}
\newcommand*\crumbs{}
\newcounter{crumbi}
\newcounter{subcrumbi}
-\AtBeginDocument{
- \let\oldsection\section%
- \renewcommand\section[2][]{
- \def\temp{#1}
- \ifx\crumbs\empty
- \appendtofile{\jobname.crumbs}{
- \back ifx \back crumbs \back empty
- \back gappto \back crumbs{\back setcounter{crumbi}{0}}
- \back fi
- \back gappto\back crumbs{\back stepcounter{crumbi}\back crumb{\ifx\temp\empty #2\else #1\fi}{#2}}
- }
- \fi
- \oldsection{#2}
- }%
- \let\oldsubsection\subsection
- \renewcommand\subsection[2][]{
- \def\temp{#1}
- \ifx\crumbs\empty
- \appendtofile{\jobname.crumbs}{
- \back ifcsname crumbs\romannumeral\the\value{section}\back endcsname\back else
- \back expandafter\back newcommand\back csname crumbs\romannumeral\the\value{section}\back endcsname{%
- \back setcounter{subcrumbi}{0}
- }
- \back fi
- \back expandafter\back gappto\back csname crumbs\romannumeral\the\value{section}\back endcsname{%
- \back stepcounter{subcrumbi}
- \back subcrumb{\ifx\temp\empty #2\else #1\fi}{#2}
- }
- }
- \fi
- \oldsubsection{#2}
- }%
- \IfFileExists{\jobname.crumbs}{\input{\jobname.crumbs}}{}%
-}
+\AtBeginDocument{\IfFileExists{\jobname.crumbs}{\input{\jobname.crumbs}}{}}
\endinput
diff --git a/macros/latex/contrib/crumbs/crumbs.tex b/macros/latex/contrib/crumbs/crumbs.tex
index b80776ffcb..250be01c66 100644
--- a/macros/latex/contrib/crumbs/crumbs.tex
+++ b/macros/latex/contrib/crumbs/crumbs.tex
@@ -42,7 +42,7 @@
\title{\ff{crumbs}: \LaTeX{} Package \\ for Navigation Crumbs}
\author{Yegor Bugayenko}
-\date{0.1.0 2021/09/04}
+\date{0.2.1 2021/09/06}
\begin{document}
\pagenumbering{gobble}
@@ -99,8 +99,13 @@ The same for \ff{\char`\\subcrumb\{\}}, but the comparison should be
done not between \ff{section} and \ff{crumbi}, but between
\ff{subsection} and \ff{subcrumbi} counters.
+The first parameter of both \ff{\char`\\crumb\{\}} and \ff{\char`\\subcrumb\{\}}
+is the optional parameter of \ff{\char`\\section\{\}} and \ff{\char`\\subsection\{\}}
+calls respectively. The second one is the mandatory parameter of them, which
+is the full text of the section and sub-section.
+
You can use \ff{\char`\\section} and \ff{\char`\\subsection} with
-an option argument, which will be used in the crumbs, e.g.:
+an optional argument, which will be used in the crumbs, e.g.:
\begin{ffcode}
\section[Details]{More Details About The Method}
diff --git a/macros/latex/contrib/easybook/README.md b/macros/latex/contrib/easybook/README.md
index ac57d4e389..2d410a3109 100644
--- a/macros/latex/contrib/easybook/README.md
+++ b/macros/latex/contrib/easybook/README.md
@@ -1,6 +1,6 @@
# Easybook document class
-Easybook is a minimalist style template based on the ctexbook book document class, and it also has the functions of the book and article document classes, its basic macro package easybase can also be used with CTeX and standard document classes. Easybook considers some details and loads some almost necessary macro packages for packaging and improvement, and provides multiple commands and interfaces to make settings easy for users. It is suitable for typesetting Chinese and English dissertations, academic books or notes.
+Eeasybook is based on the book document class of ctexbook to create a minimalist style template. It also has the functions of book and article document class. Combined with the general framework design of the dissertation of various universities in China, providing multiple commands and interfaces allows users to easily customize the thesis template. Its basic macro package easybase can also be used with CTeX and standard document classes.
## License
@@ -8,16 +8,4 @@ This work may be distributed and/or modified under the conditions of the LPPL-1.
## Website
-| [Gitee](https://gitee.com/texl3/easybook) | [Github](https://github.com/texl3/easybook) | [CTAN](https://ctan.org/pkg/easybook) |
-
-# easybook 文档类
-
-easybook 是基于 ctexbook 书籍文档类创建以极简为风格的模板,同时兼具 book 与 article 文档类的用途,它的基础宏包 easybase 还可以搭配 CTeX 和标准文档类使用。easybook 考虑了一些细节并载入一些几乎必备的宏包进行包装和改进,提供多个命令和接口可以使用户简便地进行设置。它适用于排版中英文学位论文、学术书籍或者是笔记。
-
-## 协议
-
-可以使用 LPPL-1.3c 许可协议传播和修改此作品。此许可协议的最新版本位于 http://www.latex-project.org/lppl.txt
-
-## 网址
-
| [Gitee](https://gitee.com/texl3/easybook) | [Github](https://github.com/texl3/easybook) | [CTAN](https://ctan.org/pkg/easybook) | \ No newline at end of file
diff --git a/macros/latex/contrib/easybook/easybook.dtx b/macros/latex/contrib/easybook/easybook.dtx
index 3c11935729..c21f742ba7 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/08/31}{1.29h}
+\ProvidesExplClass{easybook}{2021/09/06}{1.29p}
{Typeset Chinese theses or books}
\bool_set_false:N \l__eb_compile_draft_bool
@@ -297,7 +297,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2020/10/01]
\RequirePackage{l3keys2e,etoolbox}
-\ProvidesExplPackage{easybase}{2021/08/31}{1.29h}
+\ProvidesExplPackage{easybase}{2021/09/06}{1.29p}
{Typeset Chinese theses or books}
\cs_generate_variant:Nn \dim_add:Nn { NV,Nv }
@@ -2400,7 +2400,7 @@
}
%</package>
%<*tcolorbox>
-\ProvidesExplFile{eb-tcolorbox.cfg}{2021/08/31}{1.29h}
+\ProvidesExplFile{eb-tcolorbox.cfg}{2021/09/06}{1.29p}
{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 61676923f4..a72a5948a3 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 a7b3d93c2f..83b27dad58 100644
--- a/macros/latex/contrib/easybook/easybook.tex
+++ b/macros/latex/contrib/easybook/easybook.tex
@@ -12,15 +12,15 @@
name = easybook,
color-scheme = blue,
title = EASYBOOK 使用手册,
- version = v1.29h,
- date = 2021/08/31,
+ version = v1.29p,
+ date = 2021/09/06,
authors = 瞿毅,
info = 排版简体中文学位论文和书籍,
email = quee123@foxmail.com,
url = https://gitee.com/texl3/easybook,
abstract =
{
- \cls*{easybook} 是基于 \cls*{ctexbook} 书籍文档类创建以极简为风格的模板,同时兼具 \cls*{book} 与 \cls*{article} 文档类的用途,它的基础宏包 \pkg*{easybase} 还可以搭配 C\TeX 和标准文档类使用。\cls*{easybook} 考虑了一些细节并载入一些几乎必备的宏包进行包装和改进,提供多个命令和接口可以使用户简便地进行设置。它适用于排版中英文学位论文、学术书籍或者是笔记。
+ \cls*{easybook} 是基于 \cls*{ctexbook} 书籍文档类创建以极简为风格的模板,同时兼具 \cls*{book} 与 \cls*{article} 文档类的功能。结合中国各高校学位论文的通用框架设计,提供多个命令和接口可以使用户简便地定制论文模板。它的基础宏包 \pkg*{easybase} 还可以搭配 C\TeX 和标准文档类使用。
},
arg-format = \normalfont\small\itshape,
abstract-format = \small,
@@ -727,9 +727,9 @@
\subsection{目录样式}
\label{subsec:catalog style}
-模块 \module*{tocset} 将使用 \pkg*{titletoc} 处理目录样式,\code{level} 代表 \code{part}、\code{chapter}、\code{section}、\code{subsection}、\code{figure}、\code{table} 和 \code{lstlisting} 级别的目录,而使用 \code{list} 级别可以统一设置图片、表格和代码目录的样式。目前目录支持适用于论文的常规样式,如果您需要例如段落或更复杂的样式可以使用本模块基于的 \cs*{titlecontents} 命令。
+模块 \module*{tocset} 将使用 \pkg*{titletoc} 处理目录样式,\module*{level} 代表 \code{part}、\code{chapter}、\code{section}、\code{subsection}、\code{figure}、\code{table} 和 \code{lstlisting} 级别的目录,而使用 \code{list} 级别可以统一设置图片、表格和代码目录的样式。目前目录支持适用于论文的常规样式,如果您需要例如段落或更复杂的样式可以使用本模块基于的 \cs*{titlecontents} 命令。
\begin{options}
- \keyval-{format}{目录标题格式}\Module{/(level)}
+ \keyval-{format}{目录标题格式}\Module{/<level>}
各级别目录中标题的格式,可以设置字体和加入垂直间距等,垂直间距最好使用防止垂直间距重合的 \cs*{addvspace} 命令。
\keyval-{format+}{目录标题格式}
与 \option{format} 用法一样,只是在已有的格式命令后附加代码。
@@ -762,8 +762,8 @@
\begin{options}
\keyval-{belowoffset}{刚性长度}\Module{tocset}\Default{-1pc}
主文档目录标题下方的间距补偿,一般为负值,用于抵消 \option{format} 中额外的垂直间距。
- \keyval-{belowoffset}{刚性长度}\Module{/(level)}\Default{0pc}
- \code{level} 代表 \code{figure}、\code{table} 和 \code{lstlisting} 三个级别目录标题下方间距补偿,也可以使用 \code{list} 统一设置,一般为正值。这个距离也可以用 C\TeX 标题下方距离选项修改。
+ \keyval-{belowoffset}{刚性长度}\Module{/<level>}\Default{0pc}
+ \module*{level} 代表 \code{figure}、\code{table} 和 \code{lstlisting} 三个级别目录标题下方间距补偿,也可以使用 \code{list} 统一设置,一般为正值。这个距离也可以用 C\TeX 标题下方距离选项修改。
\keyval-{lolskip}{弹性长度}\Module{tocset}\Default{0.8pc}
代码目录中每章代码标题的额外距离,与 C\TeX 的表格和图片目录中每章间的标题距离选项 \option*{lotskip} 和 \option*{lofskip} 类似,在 \cls*{article} 模式中此选项失效。
\keyval-{tocline-fig}{图片目录标签}
@@ -1185,39 +1185,6 @@
\end{commands}
\appendix
-
-\section{依赖的宏包}
-以下为 \pkg*{easybase} 直接调用的关键宏包,方括号内为宏包已使用的选项。蓝色的宏包表示截至当前在 \TeX Live 2021 中存在更新,旧版本并不影响使用。带有 \ding{72} 符号的宏包并未载入它们,仅做了一些预配置,可在导言区手动载入以实现相关的功能。
-\begin{description}[font = \normalfont\sffamily]
- \item[amsmath] 提供 \LaTeX 中的数学功能。
- \item[\passto{heading}{ctex}] 提供中文排版的通用框架。
- \item[chemformula] 提供了对化学式进行排版的命令。
- \item[caption] 在浮动环境中自定义题注。
- \item[\passto*{shortlabels,inline}{enumitem}] 提供列表环境的布局控制。
- \item[fancyhdr] 广泛控制页面的页眉和页脚。
- \item[graphicx] 增强了对图形插入的支持。
- \item[geometry] 灵活完整的页面尺寸设置。
- \item[\color{cnltxblue}hyperref] 处理交叉引用命令以及在文档中生成超文本链接。
- \item[listings] 可以在 \LaTeX 中排版程序/编程代码。
- \item[marginnote] 增强了边注输出的功能。
- \item[multicol] 混合单栏和多栏排版。
- \item[\passto{upint}{newtxmath}] 提供多种数学字体。
- \item[pdfpages] 在 \LaTeX 中插入 \code{pdf} 文档。
- \item[\passto{ctex}{spbmark}] 定制上标和下标的格式。
- \item[\color{cnltxblue}siunitx] 全面的国际标准单位支持。
- \item[setspace] 提供对文档中行间距的支持。
- \item[\color{cnltxblue}tabularray] 完全分离表格的内容和样式,并且可以通过键值方式完全设置表格。
- \item[thmtools] 用于通常需要的排版定理支持。
- \item[titletoc] 设置目录中的标题格式。
- \item[\passto*{normalem}{ulem}] 提供可断行多样式的下划线命令。
- \item[\passto*{svgnames}{xcolor}] 提供任意颜色的设定与混合。
- \item[\ding{72} \passto{list = off}{bicaption}] 提供图表的双语题注。
- \item[\ding{72} imakeidx] 可以让文档同时生成和排版一个或多个索引。
- \item[\ding{72} mathtools] 增强 \pkg*{amsmath} 的数学功能。
- \item[\color{cnltxblue}\ding{72} \passto{many}{tcolorbox}] 为带有标题线的彩色和带框文本框提供了一个环境。
- \item[\ding{72} unicode-math] 处理使用 \code{unicode} 编码的数学字体。
-\end{description}
-
\nocite{*}
\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md
index 193bd0cb47..614260e845 100644
--- a/macros/latex/contrib/siunitx/CHANGELOG.md
+++ b/macros/latex/contrib/siunitx/CHANGELOG.md
@@ -7,6 +7,13 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
## [Unreleased]
+## [v3.0.29]
+
+### Fixed
+- Only apply `text-series-to-math` when the math version is
+ `normal` (issue
+ [#541](https://github.com/josephwright/siunitx/issues/541))
+
## [v3.0.28]
### Fixed
@@ -1557,7 +1564,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.0.28...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.0.29...HEAD
+[v3.0.29]: https://github.com/josephwright/siunitx/compare/v3.0.28...v3.0.29
[v3.0.28]: https://github.com/josephwright/siunitx/compare/v3.0.27...v3.0.28
[v3.0.27]: https://github.com/josephwright/siunitx/compare/v3.0.26...v3.0.27
[v3.0.26]: https://github.com/josephwright/siunitx/compare/v3.0.25...v3.0.26
diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf
index 69de10dbc3..e674520e65 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-print.dtx b/macros/latex/contrib/siunitx/siunitx-print.dtx
index a38edf5c55..5b14aa123b 100644
--- a/macros/latex/contrib/siunitx/siunitx-print.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-print.dtx
@@ -339,7 +339,7 @@
% \l_@@_math_version_bool ,
% \l_@@_math_family_bool ,
% \l_@@_text_font_tl ,
-% \l_@@_math_weight_bool
+% \l_@@_math_series_bool
% }
% Options which apply to the main formatting routine, and so are not tied
% to either symbolic or literal input.
@@ -375,7 +375,7 @@
text-font-command .tl_set:N =
\l_@@_text_font_tl ,
text-series-to-math .bool_set:N =
- \l_@@_math_weight_bool ,
+ \l_@@_math_series_bool ,
unit-color .tl_set:N =
\l_@@_unit_color_tl ,
unit-mode .choices:nn =
@@ -482,32 +482,32 @@
%
% \begin{variable}
% {
-% \c_@@_weight_uc_tl ,
-% \c_@@_weight_ecl_tl ,
-% \c_@@_weight_c_tl ,
-% \c_@@_weight_sc_tl ,
-% \c_@@_weight_sx_tl ,
-% \c_@@_weight_x_tl ,
-% \c_@@_weight_ex_tl ,
-% \c_@@_weight_ux_tl
+% \c_@@_series_uc_tl ,
+% \c_@@_series_ecl_tl ,
+% \c_@@_series_c_tl ,
+% \c_@@_series_sc_tl ,
+% \c_@@_series_sx_tl ,
+% \c_@@_series_x_tl ,
+% \c_@@_series_ex_tl ,
+% \c_@@_series_ux_tl
% }
% Font widths where the |m| for weight is omitted.
% \begin{macrocode}
\clist_map_inline:nn { uc , ec , c , sc , sx , x , ex , ux }
- { \tl_const:cn { c_@@_weight_ #1 _tl } { m } }
+ { \tl_const:cn { c_@@_series_ #1 _tl } { m } }
% \end{macrocode}
% \end{variable}
%
% \begin{variable}
% {
-% \c_@@_weight_l_tl ,
-% \c_@@_weight_m_tl ,
-% \c_@@_weight_b_tl
+% \c_@@_series_l_tl ,
+% \c_@@_series_m_tl ,
+% \c_@@_series_b_tl
% }
% Font widths with one letter.
% \begin{macrocode}
\clist_map_inline:nn { l , m , b }
- { \tl_const:cn { c_@@_weight_ #1 _tl } { #1 } }
+ { \tl_const:cn { c_@@_series_ #1 _tl } { #1 } }
% \end{macrocode}
% \end{variable}
%
@@ -535,7 +535,9 @@
% \begin{macrocode}
\cs_new_protected:Npn \siunitx_print_math:n #1
{
- \bool_if:NTF \l_@@_math_weight_bool
+ \bool_lazy_and:nnTF
+ { \l_@@_math_series_bool }
+ { \str_if_eq_p:Vn \math@version { normal } }
{
\tl_set:Nx \l_@@_tmp_tl
{ \exp_after:wN \@@_extract_series:Nw \f@series ? \q_stop }
@@ -551,13 +553,13 @@
% work to do. To keep things fast, we use a hash table based lookup rather
% than a sequence or property list.
% \begin{macrocode}
-\cs_new:Npn \@@_extract_series:Nw #1#2 ? #3 \q_stop
+\cs_new:Npn \@@_extract_series:Nw #1#2 ? #3 \q_stop
{
- \cs_if_exist:cTF { c_@@_weight_ #1#2 _tl }
- { \@@_convert_series:v { c_@@_weight_ #1#2 _tl } }
+ \cs_if_exist:cTF { c_@@_series_ #1#2 _tl }
+ { \@@_convert_series:v { c_@@_series_ #1#2 _tl } }
{
- \cs_if_exist:cTF { c_@@_weight_ #1 _tl }
- { \@@_convert_series:v { c_@@_weight_ #1 _tl } }
+ \cs_if_exist:cTF { c_@@_series_ #1 _tl }
+ { \@@_convert_series:v { c_@@_series_ #1 _tl } }
{ \@@_convert_series:n {#1#2} }
}
}
diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx
index dde4c1ade4..1269e5ff90 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} {2021-08-27} {3.0.28}
+\ProvidesExplPackage {siunitx} {2021-09-06} {3.0.29}
{A comprehensive (SI) units package}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf
index 417219bbc0..6f9ceb00c1 100644
--- a/macros/latex/contrib/siunitx/siunitx.pdf
+++ b/macros/latex/contrib/siunitx/siunitx.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/siunitx.tex b/macros/latex/contrib/siunitx/siunitx.tex
index b83b72463d..95cad5ca88 100644
--- a/macros/latex/contrib/siunitx/siunitx.tex
+++ b/macros/latex/contrib/siunitx/siunitx.tex
@@ -1900,6 +1900,13 @@ exponents.
\qtyrange[range-units = repeat]{2}{4}{\degreeCelsius} \\
\qtyrange[range-units = single]{2}{4}{\degreeCelsius}
\end{LaTeXdemo}
+The option \opt{product-units} also offers the settings \opt{bracket-power} and
+\opt{power}.
+\begin{LaTeXdemo}
+ \qtyproduct{2 x 4}{\metre} \\
+ \qtyproduct[product-units = bracket-power]{2 x 4}{\metre} \\
+ \qtyproduct[product-units = power]{2 x 4}{\metre}
+\end{LaTeXdemo}
\subsection{Complex numbers}
diff --git a/macros/latex/contrib/uwa-colours/README b/macros/latex/contrib/uwa-colours/README
new file mode 100644
index 0000000000..8b0ef4240a
--- /dev/null
+++ b/macros/latex/contrib/uwa-colours/README
@@ -0,0 +1,19 @@
+This package uses the xcolor package to define macros for
+the colour palette of The University of Western Australia.
+
+Copyright 2019, 2021 Anthony Di Pietro
+
+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
+and version 1.3 or later is part of all distributions of LaTeX
+version 2005/12/01 or later.
+
+This work has the LPPL maintenance status `maintained'.
+
+The Current Maintainer of this work is Anthony Di Pietro.
+
+This work consists of the files uwa-colours.dtx and uwa-colours.ins
+and the derived files uwa-colours.sty and uwa-colours.pdf.
diff --git a/macros/latex/contrib/uwa-colours/uwa-colours.dtx b/macros/latex/contrib/uwa-colours/uwa-colours.dtx
new file mode 100644
index 0000000000..8ec251b9ee
--- /dev/null
+++ b/macros/latex/contrib/uwa-colours/uwa-colours.dtx
@@ -0,0 +1,273 @@
+% \iffalse meta-comment
+% Copyright 2019, 2021 Anthony Di Pietro
+%
+% 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
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Anthony Di Pietro.
+%
+% This work consists of the files uwa-colours.dtx and uwa-colours.ins
+% and the derived file uwa-colours.sty.
+% \fi
+%
+% \iffalse
+%<*driver>
+\ProvidesFile{uwa-colours.dtx}
+%</driver>
+%<package>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
+%<package>\ProvidesPackage{uwa-colours}
+%<*package>
+ [2019/08/31 1.0.0 UWA Colours]
+\RequirePackage[hyperref]{xcolor}
+%</package>
+%
+%<*driver>
+\documentclass[a4paper]{ltxdoc}
+\usepackage{hypdoc}
+\usepackage{uwa-colours}[2019/08/31]
+\DisableCrossrefs
+\CodelineIndex
+\RecordChanges
+\begin{document}
+ \DocInput{uwa-colours.dtx}
+\end{document}
+%</driver>
+% \fi
+%
+% \CheckSum{21}
+%
+% \CharacterTable
+% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
+% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
+% Digits \0\1\2\3\4\5\6\7\8\9
+% Exclamation \! Double quote \" Hash (number) \#
+% Dollar \$ Percent \% Ampersand \&
+% Acute accent \' Left paren \( Right paren \)
+% Asterisk \* Plus \+ Comma \,
+% Minus \- Point \. Solidus \/
+% Colon \: Semicolon \; Less than \<
+% Equals \= Greater than \> Question mark \?
+% Commercial at \@ Left bracket \[ Backslash \\
+% Right bracket \] Circumflex \^ Underscore \_
+% Grave accent \` Left brace \{ Vertical bar \|
+% Right brace \} Tilde \~}
+%
+%
+% \changes{v1.0}{2019/08/31}{Initial version}
+%
+% \GetFileInfo{uwa-colours.dtx}
+%
+% \DoNotIndex{\newcommand,\newenvironment}
+%
+% \makeatletter
+% \c@IndexColumns = 2
+% \def\SpecialIndex@#1#2{%
+% \@SpecialIndexHelper@#1\@nil
+% \def\@tempb{ }%
+% \ifcat \@tempb\@gtempa
+% \special@index{\quotechar\space\actualchar
+% \string\verb\quotechar*\verbatimchar
+% \quotechar\quotechar\space\verbatimchar#2}%
+% \else
+% \def\@tempb##1##2\relax{\ifx\relax##2\relax
+% \def\@tempc{\special@index{\quotechar##1\actualchar
+% \string\verb\quotechar*\verbatimchar
+% \quotechar\quotechar##1\verbatimchar#2}}%
+% \else
+% \def\@tempc{\special@index{##1##2\actualchar
+% \string\verb\quotechar*\verbatimchar
+% ##1##2\verbatimchar#2}}%
+% \fi}%
+% \expandafter\@tempb\@gtempa\relax
+% \@tempc
+% \fi}
+% \makeatother
+%
+% \newlength{\sampleheight}
+% \newlength{\samplewidth}
+% \newlength{\samplevspace}
+% \newlength{\samplehoffset}
+% \newlength{\samplehspace}
+% \setlength{\sampleheight}{2\baselineskip}
+% \setlength{\samplewidth}{10em}
+% \setlength{\samplevspace}{2.75\baselineskip}
+% \setlength{\samplehoffset}{-2.5em}
+% \setlength{\samplehspace}{1em}
+%
+% \newcommand{\coloursample}[1]{%
+% \begin{minipage}[t]{\samplewidth}
+% \vspace{\baselineskip}
+% \colorbox{#1}{\parbox[t][\sampleheight]{\samplewidth}{\vfill\hfill}} \\
+% \\
+% \centering\texttt{#1} \\
+% \vspace{\baselineskip}
+% \end{minipage}
+% }
+%
+% \newcommand{\threecoloursamplerow}[3]{%
+% \vspace{-\samplevspace}
+% \DescribeMacro{#1}
+% \DescribeMacro{#2}
+% \DescribeMacro{#3}
+% \hspace{\samplehoffset}
+% \begin{minipage}{\textwidth}
+% \vspace{\samplevspace}
+% \hspace{\samplehoffset}
+% \coloursample{#1}
+% \hspace{\samplehspace}
+% \coloursample{#2}
+% \hspace{\samplehspace}
+% \coloursample{#3}
+% \end{minipage}
+% \par
+% }
+%
+% \newcommand{\twocoloursamplerow}[2]{%
+% \vspace{-\samplevspace}
+% \DescribeMacro{#1}
+% \DescribeMacro{#2}
+% \hspace{\samplehoffset}
+% \begin{minipage}{\textwidth}
+% \vspace{\samplevspace}
+% \hspace{\samplehoffset}
+% \coloursample{#1}
+% \hspace{\samplehspace}
+% \coloursample{#2}
+% \end{minipage}
+% \par
+% }
+%
+% \title{%
+% {The UWA Colours Package} \\
+% {\Large uwa-colours \fileversion{} (\filedate{})}%
+% }
+% \author{Anthony Di Pietro}
+% \date{}
+%
+% \maketitle
+%
+% \section{Introduction}
+%
+% This package uses the |xcolor| package to define macros for
+% the colour palette of The University of Western Australia.
+%
+% \section{Usage}
+%
+% To load the package, add this to your preamble:
+% \begin{quote}
+% |\usepackage{uwa-colours}|
+% \end{quote}
+%
+% \subsection{Primary Colours}
+%
+% The primary colours.\index{primary colours|usage}
+%
+% \twocoloursamplerow{UWABlue}{UWAGold}
+%
+% \subsection{Background Colours}
+%
+% The background colours.\index{background colours|usage}
+%
+% \twocoloursamplerow{UWASmoke}{UWASky}
+% \twocoloursamplerow{UWAGrey}{UWAGreydark}
+%
+% \subsection{Secondary Colour Palette}
+%
+% The secondary colour palette.\index{secondary colour palette|usage}
+%
+% \threecoloursamplerow{UWAMaroon}{UWACrimson}{UWATomato}
+% \threecoloursamplerow{UWAMaria}{UWAAutumn}{UWAAmber}
+% \threecoloursamplerow{UWASeaweed}{UWAApple}{UWASushi}
+% \threecoloursamplerow{UWAMidnight}{UWADenim}{UWAViking}
+% \threecoloursamplerow{UWABossanova}{UWAOrchid}{UWAPlum}
+%
+% \StopEventually{\PrintChanges\PrintIndex}
+%
+% \section{Implementation}
+%
+% \begin{macro}{UWAblue}
+% \begin{macro}{UWAgold}
+% The primary colours.
+% \begin{macrocode}
+\definecolor{UWABlue}{RGB}{39, 52, 139}
+\definecolor{UWAGold}{RGB}{225, 182, 80}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{UWASmoke}
+% \begin{macro}{UWASky}
+% \begin{macro}{UWAGrey}
+% \begin{macro}{UWAGreydark}
+% The background colours.
+% \begin{macrocode}
+\definecolor{UWASmoke}{RGB}{245, 248, 252}
+\definecolor{UWASky}{RGB}{226, 237, 250}
+\definecolor{UWAGrey}{RGB}{236, 236, 236}
+\definecolor{UWAGreydark}{RGB}{221, 221, 221}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \newpage
+%
+% \begin{macro}{UWAMaroon}
+% \begin{macro}{UWACrimson}
+% \begin{macro}{UWATomato}
+% \begin{macro}{UWAMaria}
+% \begin{macro}{UWAAutumn}
+% \begin{macro}{UWAAmber}
+% \begin{macro}{UWASeaweed}
+% \begin{macro}{UWAApple}
+% \begin{macro}{UWASushi}
+% \begin{macro}{UWAMidnight}
+% \begin{macro}{UWADenim}
+% \begin{macro}{UWAViking}
+% \begin{macro}{UWABossanova}
+% \begin{macro}{UWAOrchid}
+% \begin{macro}{UWAPlum}
+% The secondary colour palette.
+% \begin{macrocode}
+\definecolor{UWAMaroon}{RGB}{169, 34, 71}
+\definecolor{UWACrimson}{RGB}{222, 40, 81}
+\definecolor{UWATomato}{RGB}{228, 54, 34}
+\definecolor{UWAMaria}{RGB}{232, 78, 15}
+\definecolor{UWAAutumn}{RGB}{244, 151, 0}
+\definecolor{UWAAmber}{RGB}{253, 195, 0}
+\definecolor{UWASeaweed}{RGB}{38, 85, 33}
+\definecolor{UWAApple}{RGB}{62, 134, 56}
+\definecolor{UWASushi}{RGB}{45, 192, 59}
+\definecolor{UWAMidnight}{RGB}{0, 56, 105}
+\definecolor{UWADenim}{RGB}{20, 136, 202}
+\definecolor{UWAViking}{RGB}{72, 190, 216}
+\definecolor{UWABossanova}{RGB}{70, 46, 81}
+\definecolor{UWAOrchid}{RGB}{145, 39, 117}
+\definecolor{UWAPlum}{RGB}{196, 108, 169}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \Finale
+\endinput
diff --git a/macros/latex/contrib/uwa-colours/uwa-colours.ins b/macros/latex/contrib/uwa-colours/uwa-colours.ins
new file mode 100644
index 0000000000..108a3a921a
--- /dev/null
+++ b/macros/latex/contrib/uwa-colours/uwa-colours.ins
@@ -0,0 +1,58 @@
+%% Copyright 2019 Anthony Di Pietro
+%%
+%% 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
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% The Current Maintainer of this work is Anthony Di Pietro.
+%%
+%% This work consists of the files uwa-colours.dtx and uwa-colours.ins
+%% and the derived file uwa-colours.sty.
+
+\input docstrip.tex
+\keepsilent
+
+\usedir{tex/latex/uwa-colours}
+
+\preamble
+
+Copyright 2019 Anthony Di Pietro
+
+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
+and version 1.3 or later is part of all distributions of LaTeX
+version 2005/12/01 or later.
+
+This work has the LPPL maintenance status `maintained'.
+
+The Current Maintainer of this work is Anthony Di Pietro.
+
+This work consists of the files uwa-colours.dtx and uwa-colours.ins
+and the derived file uwa-colours.sty.
+
+\endpreamble
+
+\askforoverwritefalse
+\generate{\file{uwa-colours.sty}{\from{uwa-colours.dtx}{package}}}
+
+\obeyspaces
+\Msg{*************************************************************}
+\Msg{* *}
+\Msg{* To complete the installation, move uwa-colours.sty into a *}
+\Msg{* directory searched by LaTeX. *}
+\Msg{* *}
+\Msg{* To produce the documentation, run uwa-colours.dtx through *}
+\Msg{* pdfLaTeX. *}
+\Msg{* *}
+\Msg{*************************************************************}
+
+\endbatchfile
diff --git a/macros/latex/contrib/uwa-colours/uwa-colours.pdf b/macros/latex/contrib/uwa-colours/uwa-colours.pdf
new file mode 100644
index 0000000000..5aed94ca42
--- /dev/null
+++ b/macros/latex/contrib/uwa-colours/uwa-colours.pdf
Binary files differ
diff --git a/macros/xetex/generic/xetexko/ChangeLog b/macros/xetex/generic/xetexko/ChangeLog
index a3d6346c4d..22a650bf49 100644
--- a/macros/xetex/generic/xetexko/ChangeLog
+++ b/macros/xetex/generic/xetexko/ChangeLog
@@ -1,3 +1,13 @@
+2021-09-06 Dohyun Kim <nomos at ktug org>
+
+ Version 4.0
+
+ * generalize the concept introduced at v3.9, that is
+ \ifx\f@encoding\UTFencname now affects inter-character spacing
+ as well as font substitution.
+ * guard against space character(catcode 12) in parsing code point
+ of next character
+
2021-08-09 Dohyun Kim <nomos at ktug org>
Version 3.9
diff --git a/macros/xetex/generic/xetexko/README b/macros/xetex/generic/xetexko/README
index 96462d8263..01eef1e851 100644
--- a/macros/xetex/generic/xetexko/README
+++ b/macros/xetex/generic/xetexko/README
@@ -1,4 +1,4 @@
-XeTeX-ko Package version 3.9 (2021/08/09)
+XeTeX-ko Package version 4.0 (2021/09/06)
=========================================
XeTeX-ko is a macro package for Xe(La)TeX which supports typesetting
diff --git a/macros/xetex/generic/xetexko/xetexko-doc.pdf b/macros/xetex/generic/xetexko/xetexko-doc.pdf
index 229db6ab1f..fa9b3a3056 100644
--- a/macros/xetex/generic/xetexko/xetexko-doc.pdf
+++ b/macros/xetex/generic/xetexko/xetexko-doc.pdf
Binary files differ
diff --git a/macros/xetex/generic/xetexko/xetexko-doc.tex b/macros/xetex/generic/xetexko/xetexko-doc.tex
index 921c95634f..97260f2f4d 100644
--- a/macros/xetex/generic/xetexko/xetexko-doc.tex
+++ b/macros/xetex/generic/xetexko/xetexko-doc.tex
@@ -74,7 +74,7 @@
\title{\xetexko\ 간단 매뉴얼}
\author{Dohyun Kim \normalsize <\texttt{nomos at ktug org}> \and
\normalsize <\url{http://github.com/dohyunkim/xetexko}>}
-\date{Version 3.9\quad 2021/08/09}
+\date{Version 4.0\quad 2021/09/06}
\maketitle
\begin{quote}\small
@@ -709,6 +709,12 @@ microtype 패키지의 protrusion 기능이 잘 작동하지 않는 경우가
\begin{small}\linespread{1.2}\selectfont
\begin{description}\itemsep=0pt
+ \item[v4.0] 2021-09-06
+ \begin{itemize}
+ \item \xetexko 가 제공하는 대부분의 기능은 폰트 인코딩이
+ 유니코드 인코딩(\texttt{TU})이거나 플레인텍처럼 폰트 인코딩 개념이 없는
+ 경우에만 동작한다.
+ \end{itemize}
\item[v3.6] 2021-06-10
\begin{itemize}
\item \hyperref[sec:verttype]
diff --git a/macros/xetex/generic/xetexko/xetexko.sty b/macros/xetex/generic/xetexko/xetexko.sty
index aff19c67a1..afd0ee6283 100644
--- a/macros/xetex/generic/xetexko/xetexko.sty
+++ b/macros/xetex/generic/xetexko/xetexko.sty
@@ -16,7 +16,7 @@
\ifdefined\ProvidesPackage
\NeedsTeXFormat{LaTeX2e}[2021/06/01]
- \ProvidesPackage{xetexko}[2021/08/09 v3.9 typesetting Korean with XeTeX]
+ \ProvidesPackage{xetexko}[2021/09/06 v4.0 typesetting Korean with XeTeX]
\else
\ifdefined\@tempcnta\else \newcount\@tempcnta \fi
\ifdefined\@sptoken \else
@@ -467,11 +467,9 @@
\expandafter\let\expandafter\XeKo@latin@font\the\font
\fi\fi
\ifdefined\XeKo@hangul@font
- \ifx\f@encoding\UTFencname
\XeKo@reset@options
\XeKo@hangul@font
\expandafter\let\expandafter\XeKo@raw@hangul@font\the\font
- \fi
\fi
}
\def\XeKo@font@CJK{%
@@ -480,11 +478,9 @@
\expandafter\let\expandafter\XeKo@latin@font\the\font
\fi\fi
\ifdefined\XeKo@hanja@font
- \ifx\f@encoding\UTFencname
\XeKo@reset@options
\XeKo@hanja@font
\expandafter\let\expandafter\XeKo@raw@hanja@font\the\font
- \fi
\fi
}
\def\XeKo@font@Latin{%
@@ -993,6 +989,7 @@
}
\XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassHG{%
+ \ifx\f@encoding\UTFencname
\ifnum\lastnodetype=12 %
\ifcase\lastkern
\or \XKinterhanjabreak \or \or \or \or % 1: ruby를 한자처럼 취급
@@ -1016,9 +1013,11 @@
\else\ifnum\lastnodetype=10 % mathoff
\XeKo@postmath
\fi\fi
- \XeKo@fontHG\XeKo@startHG
+ \XeKo@fontHG\expandafter\XeKo@startHG
+ \fi
}
\XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassID{%
+ \ifx\f@encoding\UTFencname
\ifnum\lastnodetype=12 %
\ifcase\lastkern
\or \XKinterhanjabreak \or \or \or \or
@@ -1042,9 +1041,11 @@
\else\ifnum\lastnodetype=10 % mathoff
\XeKo@postmath
\fi\fi
- \XeKo@fontID\XeKo@startID
+ \XeKo@fontID\expandafter\XeKo@startID
+ \fi
}
\XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassCJ{%
+ \ifx\f@encoding\UTFencname
\ifnum\lastnodetype=12 %
\ifcase\lastkern
\or \XKinterhanjabreak \XeKo@suppress@linebreak \or \or \or \or
@@ -1068,9 +1069,11 @@
\else\ifnum\lastnodetype=10 % mathoff
\XeKo@postmath
\fi\fi
- \XeKo@fontCJ\XeKo@startCJ
+ \XeKo@fontCJ\expandafter\XeKo@startCJ
+ \fi
}
\XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassSY{%
+ \ifx\f@encoding\UTFencname
\ifnum\lastnodetype=12 %
\ifcase\lastkern
\or \or \or \or \or
@@ -1094,9 +1097,11 @@
\else\ifnum\lastnodetype=10 % mathoff
\XeKo@postmath
\fi\fi
- \XeKo@fontSY\XeKo@startSY
+ \XeKo@fontSY\expandafter\XeKo@startSY
+ \fi
}
\XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassAA{%
+ \ifx\f@encoding\UTFencname
\ifnum\lastnodetype=12 %
\ifcase\lastkern
\or \XeKo@latincjk \or \or \or \or
@@ -1118,9 +1123,11 @@
\or \unkern\unkern \XeKo@quarterquarter % VC AA
\fi
\fi
- \XeKo@fontAA\XeKo@startAA
+ \XeKo@fontAA\expandafter\XeKo@startAA
+ \fi
}
\XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassAO{%
+ \ifx\f@encoding\UTFencname
\ifnum\lastnodetype=12 %
\ifcase\lastkern
\or \XeKo@latincjk \or \or \or \or
@@ -1142,9 +1149,11 @@
\or \unkern\unkern \XeKo@quarterquarter % VC AO
\fi
\fi
- \XeKo@fontAO\XeKo@startAO
+ \XeKo@fontAO\expandafter\XeKo@startAO
+ \fi
}
\XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassAC{%
+ \ifx\f@encoding\UTFencname
\ifnum\lastnodetype=12 %
\ifcase\lastkern
\or \or \or \or \or
@@ -1166,9 +1175,11 @@
\or \unkern\unkern % VC AC
\fi
\fi
- \XeKo@fontAC\XeKo@startAC
+ \XeKo@fontAC\expandafter\XeKo@startAC
+ \fi
}
\XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassAP{%
+ \ifx\f@encoding\UTFencname
\ifnum\lastnodetype=12 %
\ifcase\lastkern
\or \or \or \or \or
@@ -1190,9 +1201,11 @@
\or \unkern\unkern % VC AP
\fi
\fi
- \XeKo@fontAP\XeKo@startAP
+ \XeKo@fontAP\expandafter\XeKo@startAP
+ \fi
}
\XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassAM{%
+ \ifx\f@encoding\UTFencname
\ifnum\lastnodetype=12 %
\ifcase\lastkern
\or \XeKo@nobreak\XeKo@latincjk \or \or \or \or
@@ -1214,9 +1227,11 @@
\or \unkern\unkern % VC AM
\fi
\fi
- \XeKo@fontAM\XeKo@startAM
+ \XeKo@fontAM\expandafter\XeKo@startAM
+ \fi
}
\XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassAH{%
+ \ifx\f@encoding\UTFencname
\ifnum\lastnodetype=12 %
\ifcase\lastkern
\or \XeKo@nobreak \or \or \or \or
@@ -1238,9 +1253,11 @@
\or \unkern\unkern \XeKo@nobreak % VC AH
\fi
\fi
- \XeKo@fontAH\XeKo@startAH
+ \XeKo@fontAH\expandafter\XeKo@startAH
+ \fi
}
\XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassOP{%
+ \ifx\f@encoding\UTFencname
\ifnum\lastnodetype=12 %
\ifcase\lastkern
\or \XeKo@halfhalf \or \or \or \or
@@ -1264,9 +1281,11 @@
\else\ifnum\lastnodetype=10 % mathoff
\XeKo@halfhalf
\fi\fi
- \XeKo@fontOP\XeKo@startOP
+ \XeKo@fontOP\expandafter\XeKo@startOP
+ \fi
}
\XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassCL{%
+ \ifx\f@encoding\UTFencname
\ifnum\lastnodetype=12 %
\ifcase\lastkern
\or \or \or \or \or
@@ -1288,9 +1307,11 @@
\or \unkern\unkern % VC CL
\fi
\fi
- \XeKo@fontCL\XeKo@startCL
+ \XeKo@fontCL\expandafter\XeKo@startCL
+ \fi
}
\XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassMD{%
+ \ifx\f@encoding\UTFencname
\ifnum\lastnodetype=12 %
\ifcase\lastkern
\or \XeKo@nobreak\XeKo@quarterquarter \or \or \or \or
@@ -1314,9 +1335,11 @@
\else\ifnum\lastnodetype=10 % mathoff
\XeKo@nobreak\XeKo@quarterquarter
\fi\fi
- \XeKo@fontMD\XeKo@startMD
+ \XeKo@fontMD\expandafter\XeKo@startMD
+ \fi
}
\XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassFS{%
+ \ifx\f@encoding\UTFencname
\ifnum\lastnodetype=12 %
\ifcase\lastkern
\or \or \or \or \or
@@ -1338,9 +1361,11 @@
\or \unkern\unkern % VC FS
\fi
\fi
- \XeKo@fontFS\XeKo@startFS
+ \XeKo@fontFS\expandafter\XeKo@startFS
+ \fi
}
\XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassEX{%
+ \ifx\f@encoding\UTFencname
\ifnum\lastnodetype=12 %
\ifcase\lastkern
\or \or \or \or \or
@@ -1362,9 +1387,11 @@
\or \unkern\unkern % VC EX
\fi
\fi
- \XeKo@fontEX\XeKo@startEX
+ \XeKo@fontEX\expandafter\XeKo@startEX
+ \fi
}
\XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassLD{%
+ \ifx\f@encoding\UTFencname
\ifnum\lastnodetype=12 %
\ifcase\lastkern
\or \XKinterhanjabreak \XeKo@suppress@linebreak \or \or \or \or
@@ -1386,9 +1413,11 @@
\or \unkern\unkern \XKinterhanjabreak \XeKo@suppress@linebreak % VC LD
\fi
\fi
- \XeKo@fontLD\XeKo@startLD
+ \XeKo@fontLD\expandafter\XeKo@startLD
+ \fi
}
\XeTeXinterchartoks\XeTeXcharclassBoundary\XeTeXcharclassVC{%
+ \ifx\f@encoding\UTFencname
\ifnum\lastnodetype=12 %
\ifcase\lastkern
\or \or \or \or \or
@@ -1410,7 +1439,8 @@
\or \unkern\unkern % VC VC
\fi
\fi
- \XeKo@fontVC\XeKo@startVC
+ \XeKo@fontVC\expandafter\XeKo@startVC
+ \fi
}
\newbox\XeKo@box@
@@ -1504,7 +1534,7 @@
\catcode`A=11\relax \global\let\XeKo@catcode@letter=A
\catcode`0=12\relax \global\let\XeKo@catcode@other =0
\endgroup
-\def\XeKo@striptw@words#1 #2 #3{#3}
+\def\XeKo@striptw@words#1 #2 #3\relax{#3}
\def\XeKo@get@charslot{%
\if\noexpand\XeKo@let@token\relax
\chardef\XeKo@charslot="FFFF
@@ -1515,7 +1545,7 @@
\def\XeKo@get@charslot@{%
\ifnum 0\ifcat\XeKo@let@token\XeKo@catcode@letter 1\else
\ifcat\XeKo@let@token\XeKo@catcode@other 1\fi\fi >\z@
- \edef\@tempa{\expandafter\XeKo@striptw@words\meaning\XeKo@let@token}%
+ \edef\@tempa{\expandafter\XeKo@striptw@words\meaning\XeKo@let@token\relax}%
\expandafter\chardef\expandafter\XeKo@charslot\expandafter`\@tempa\relax
\else
\chardef\XeKo@charslot="FFFF