diff options
author | Norbert Preining <norbert@preining.info> | 2020-08-25 03:02:50 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-08-25 03:02:50 +0000 |
commit | dfbdba4c53651477b0d82164c0126e0f41f8bdb1 (patch) | |
tree | e80834e2b32577d66fc8ca26954b482c87b455c7 /macros/latex/contrib | |
parent | db172be44b76658fe542ff91f2e6e02550d417b8 (diff) |
CTAN sync 202008250302
Diffstat (limited to 'macros/latex/contrib')
30 files changed, 309 insertions, 59 deletions
diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/README.md b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/README.md index e22c28ec14..0387bc4765 100644 --- a/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/README.md +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/README.md @@ -1,11 +1,53 @@ -# beamerthemeNord +# The Nord Beamer Theme -A simple beamer theme using [Nord](https://www.nordtheme.com/) color theme. +A beamer theme using [Nord](https://www.nordtheme.com/) color scheme. + +Pull requests and issues are welcome. + +## News + +- This theme is now available both at see [CTAN](https://ctan.org/pkg/beamerthemenord) (see [CTAN announcement](https://ctan.org/ctan-ann/id/mailman.2913.1593882783.3866.ctan-ann@ctan.org)) and [Overleaf](https://www.overleaf.com/latex/templates/beamerthemenord/xyjjhcsyyjbr). + +- Added light/dark style option + +## Installation + +### Tex Live / MacTeX + +[Tex Live](https://www.tug.org/texlive/) and [MacTeX](https://www.tug.org/mactex/) users can install/update **beamerthemeNord** by using +```sh +tlmgr update --self beamerthemenord +``` + +### Manual + +If you want to customize this theme, you can also clone this repository and copy all `*.sty` files into the directory where you main `tex` source file is. ## Usage See [beamerthemeNord.pdf](./beamerthemeNord.pdf) or [beamerthemeNord.tex](./beamerthemeNord.tex) +**Note**: This theme currently only supports XeLaTeX, which is convinent to use system-wide fonts and to write in non-ASCII characters. +You are weclome to contribute on compatability for other TeX distributions. + +## Screenshots + +Light Style | Dark Style +----------------------------------------|--------------------------------------- +![](./screenshots/light-titlepage.png) | ![](./screenshots/dark-titlepage.png) +![](./screenshots/light-usage.png) | ![](./screenshots/dark-usage.png) +![](./screenshots/light-colors.png) | ![](./screenshots/dark-colors.png) +![](./screenshots/light-fonts.png) | ![](./screenshots/dark-fonts.png) +![](./screenshots/light-blocks.png) | ![](./screenshots/dark-blocks.png) +![](./screenshots/light-toc.png) | ![](./screenshots/dark-toc.png) + + +## Usecases + +Please send a pull request to add your usecase + +- [Ph.D. defense of Junwei Wang](https://junwei-wang.github.io/pdfs/slides/2020-phd-defense-handout.pdf) + ## Maintainer Junwei Wang (i.junwei.wang@gmail.com) diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/beamercolorthemeNord.sty b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/beamercolorthemeNord.sty index 3faf457f72..8cdaed54e9 100644 --- a/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/beamercolorthemeNord.sty +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/beamercolorthemeNord.sty @@ -17,8 +17,9 @@ \definecolor{NordMediumBlack}{HTML}{434C5e} % nord2 \definecolor{NordBrightBlack}{HTML}{4C566A} % nord3 % Snow Storm -\definecolor{NordWhite}{HTML}{E5E9F0} % nord5 -\definecolor{NordBrightWhite}{HTML}{ECEFF4} % nord6 +\definecolor{NordWhite}{HTML}{D8DEE9} % nord4 +\definecolor{NordBrighterWhite}{HTML}{E5E9F0} % nord5 +\definecolor{NordBrightestWhite}{HTML}{ECEFF4} % nord6 % Frost \definecolor{NordCyan}{HTML}{8FBCBB} % nord7 \definecolor{NordBrightCyan}{HTML}{88C0D0} % nord8 @@ -31,31 +32,95 @@ \definecolor{NordGreen}{HTML}{A3BE8C} % nord14 \definecolor{NordMagenta}{HTML}{B48EAD} % nord15 -\setbeamercolor*{background canvas}{bg=NordBlack} -\setbeamercolor*{normal text}{fg=NordWhite} -\setbeamercolor*{alerted text}{fg=NordRed} -\setbeamercolor*{example text}{fg=NordBrightCyan} -\setbeamercolor*{structure}{fg=NordCyan} - -\setbeamercolor*{title}{fg=NordGreen} -\setbeamercolor*{subtitle}{fg=NordBlue} -\setbeamercolor*{frametitle}{fg=NordGreen} -\setbeamercolor*{framesubtitle}{fg=NordBlue} -\setbeamercolor*{section in toc}{fg=NordGreen} -\setbeamercolor*{subsection in toc}{fg=NordBlue} -\setbeamercolor*{subsection in toc shaded}{fg=NordCyan!20!NordBrightBlack} - -\setbeamercolor*{itemize item}{fg=NordGreen} -\setbeamercolor*{enumerate item}{fg=NordGreen} - -\setbeamercolor*{section in head/foot}{bg=NordBlack, fg=NordCyan} - -\setbeamercolor{block title}{bg=NordBlack!80,fg=NordGreen} -\setbeamercolor{block title example}{bg=NordBlack!80,parent={example text}} -\setbeamercolor{block title alerted}{bg=NordBlack!80,parent={alerted text}} -\setbeamercolor{block body}{bg=NordGreen!50!NordBlack,fg=NordCyan} -\setbeamercolor{block body example}{bg=NordBrightCyan!50!NordBlack,fg=NordWhite} -\setbeamercolor{block body alerted}{bg=NordRed!50!NordBlack,fg=NordWhite} + +%%%%% create alias for colors according to usage +\DeclareOptionBeamer{style}{\def\beamer@nordtheme@style{#1}} +\ExecuteOptionsBeamer{style=dark} % `dark` will be default if nothing is given +\ProcessOptionsBeamer + +\def\beamer@nordtheme@styledark{dark}% +\def\beamer@nordtheme@stylelight{light}% + + +\colorlet{ColorAlertedText}{NordRed} +\colorlet{ColorSubtitle}{NordBlue} +\colorlet{ColorSubsectionInToc}{ColorSubtitle} + +\ifx\beamer@nordtheme@style\beamer@nordtheme@styledark% + \colorlet{ColorBackground}{NordBlack} + \colorlet{ColorText}{NordWhite} + \colorlet{ColorExampleText}{NordBrightCyan} + \colorlet{ColorStructure}{NordCyan} + \colorlet{ColorTitle}{NordGreen} + \colorlet{ColorSubsectionInTocShaded}{NordCyan!20!NordBrightBlack} + \colorlet{ColorItemizeItem}{NordGreen} + \colorlet{ColorBlockTitleBg}{NordBlack!80} + \colorlet{ColorExampleBlockTitleBg}{ColorBlockTitleBg} + \colorlet{ColorAlertedBlockTitleBg}{ColorBlockTitleBg} + \colorlet{ColorBlockBodyBg}{NordGreen!50!NordBlack} + \colorlet{ColorExampleBlockBodyBg}{NordBrightCyan!50!NordBlack} + \colorlet{ColorAlertedBlockBodyBg}{NordRed!50!NordBlack} + \colorlet{ColorBlockBodyFg}{NordCyan} + \colorlet{ColorExampleBlockBodyFg}{NordWhite} + \colorlet{ColorAlertedBlockBodyFg}{NordWhite} +\else% + \ifx\beamer@nordtheme@style\beamer@nordtheme@stylelight% + \colorlet{ColorBackground}{NordBrightestWhite} + \colorlet{ColorText}{NordBrightBlack} + \colorlet{ColorExampleText}{NordCyan} + \colorlet{ColorStructure}{NordBrightCyan} + \colorlet{ColorTitle}{NordBrightBlue} + \colorlet{ColorSubtitle}{NordBlue} + \colorlet{ColorSubsectionInTocShaded}{ColorSubsectionInToc!50!ColorBackground} + \colorlet{ColorItemizeItem}{ColorStructure} + \colorlet{ColorBlockTitleBg}{NordGreen!50} + \colorlet{ColorExampleBlockTitleBg}{ColorExampleText!50} + \colorlet{ColorAlertedBlockTitleBg}{ColorAlertedText!50} + \colorlet{ColorBlockBodyBg}{NordGreen!20} + \colorlet{ColorExampleBlockBodyBg}{ColorExampleText!20} + \colorlet{ColorAlertedBlockBodyBg}{ColorAlertedText!20} + \colorlet{ColorBlockBodyFg}{ColorText} + \colorlet{ColorExampleBlockBodyFg}{ColorText} + \colorlet{ColorAlertedBlockBodyFg}{ColorText} + \else% + \PackageError{beamercolorthemeNord}{Unknow style option `\beamer@nordtheme@style`}{extra help} + \fi% +\fi% + + +\colorlet{ColorNormalText}{ColorText} +\colorlet{ColorFrameTitle}{ColorTitle} +\colorlet{ColorFrameSubtitle}{ColorSubtitle} +\colorlet{ColorSectionInToc}{ColorTitle} +\colorlet{ColorEnumerateColor}{ColorItemizeItem} +\colorlet{ColorSectionInHeadFoot}{ColorStructure} + +%%%%% set beamer color +\setbeamercolor*{background canvas}{bg=ColorBackground} +\setbeamercolor*{normal text}{fg=ColorNormalText} +\setbeamercolor*{alerted text}{fg=ColorAlertedText} +\setbeamercolor*{example text}{fg=ColorExampleText} +\setbeamercolor*{structure}{fg=ColorStructure} + +\setbeamercolor*{title}{fg=ColorTitle} +\setbeamercolor*{subtitle}{fg=ColorSubtitle} +\setbeamercolor*{frametitle}{fg=ColorFrameTitle} +\setbeamercolor*{framesubtitle}{fg=ColorFrameSubtitle} +\setbeamercolor*{section in toc}{fg=ColorSectionInToc} +\setbeamercolor*{subsection in toc}{fg=ColorSubsectionInToc} +\setbeamercolor*{subsection in toc shaded}{fg=ColorSubsectionInTocShaded} + +\setbeamercolor*{itemize item}{fg=ColorItemizeItem} +\setbeamercolor*{enumerate item}{fg=ColorEnumerateColor} + +\setbeamercolor*{section in head/foot}{bg=ColorBackground, fg=ColorSectionInHeadFoot} + +\setbeamercolor{block title}{bg=ColorBlockTitleBg,fg=NordGreen} +\setbeamercolor{block title example}{bg=ColorExampleBlockTitleBg,parent={example text}} +\setbeamercolor{block title alerted}{bg=ColorAlertedBlockTitleBg,parent={alerted text}} +\setbeamercolor{block body}{bg=ColorBlockBodyBg,fg=ColorBlockBodyFg} +\setbeamercolor{block body example}{bg=ColorExampleBlockBodyBg,fg=ColorExampleBlockBodyFg} +\setbeamercolor{block body alerted}{bg=ColorAlertedBlockBodyBg,fg=ColorAlertedBlockBodyFg} \setbeamercolor{caption}{fg=NordBrightBlue} diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/beamerthemeNord.pdf b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/beamerthemeNord.pdf Binary files differindex ac95702492..aadc8b8c1a 100644 --- a/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/beamerthemeNord.pdf +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/beamerthemeNord.pdf diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/beamerthemeNord.sty b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/beamerthemeNord.sty index 40067d2fb8..55633e3480 100644 --- a/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/beamerthemeNord.sty +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/beamerthemeNord.sty @@ -6,10 +6,15 @@ % The latest version of this license is in % http://www.latex-project.org/lppl.txt -\ProvidesPackage{beamerthemeNord}[2020/07/03 v0.1.0 A simple beamer theme using Nord color scheme] +\ProvidesPackage{beamerthemeNord}[2020/08/24 v0.2.0 A simple beamer theme using Nord color scheme] \mode<presentation> +\DeclareOptionBeamer{style}{ + \PassOptionsToPackage{style=#1}{beamercolorthemeNord} +} +\ProcessOptionsBeamer + \RequirePackage{ifthen} \usecolortheme{Nord} @@ -17,7 +22,7 @@ \setbeamertemplate{navigation symbols}{} -\setbeamersize{text margin left=6mm,text margin right=6mm} +\setbeamersize{text margin left=10mm,text margin right=10mm} \setbeamertemplate{caption}{\insertcaption} diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/beamerthemeNord.tex b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/beamerthemeNord.tex index 7159333a36..7c09578573 100644 --- a/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/beamerthemeNord.tex +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/beamerthemeNord.tex @@ -15,6 +15,8 @@ \usepackage{tikz} \usetheme{Nord} +% \usetheme[style=light]{Nord} + \setmainfont{Yanone Kaffeesatz} \setsansfont{Andika New Basic} \setmonofont{DejaVu Sans Mono} @@ -48,6 +50,27 @@ \section{Appearance} + +\begin{frame}[fragile] + \frametitle{Usage} + Simply include the following code in your preamble: + + \begin{lstlisting}[basicstyle = \ttfamily\small] +\usetheme{Nord} + \end{lstlisting} + + \bigskip + + By default, the appearance is in dark theme, however you can actively choose a either a light or a + dark theme. + + \begin{lstlisting}[basicstyle = \ttfamily\small] +\usetheme[style=light]{Nord} +\usetheme[style=dark]{Nord} + \end{lstlisting} + +\end{frame} + \subsection{Colors} \begin{frame}{Defined Colors}{This is a subtitle} @@ -56,7 +79,8 @@ \textcolor{NordDarkBlack}{NordDarkBlack} \quad \textcolor{NordBlack}{NordBlack}\\ \textcolor{NordMediumBlack}{NordMediumBlack} \quad \textcolor{NordBrightBlack}{NordBrightBlack} \item[Snow Storm] - \textcolor{NordWhite}{NordWhite} \quad \textcolor{NordBrightWhite}{NordBrightWhite} + \textcolor{NordWhite}{NordWhite} \quad \textcolor{NordBrighterWhite}{NordBrightestWhite}\\ + \textcolor{NordBrightestWhite}{NordBrightestWhite} \item[Forest] \textcolor{NordCyan}{NordCyan} \quad \textcolor{NordBrightCyan}{NordBrightCyan}\\ \textcolor{NordBlue}{NordBlue} \quad \textcolor{NordBrightBlue}{NordBrightBlue} @@ -89,39 +113,57 @@ \begin{frame} \frametitle{Blocks} - \begin{block}{This is an Ordinary Block} + \begin{block}{This is a Block} \[ a^2 + b^2 = c^2 \] \end{block} \begin{exampleblock}{This is an Example Block} \[ - 3^2+4^2 = 5^2 + E = m \cdot c^{2} \] \end{exampleblock} \begin{alertblock}{This is an Alert Block} \[ - 3^2+4^2 \neq 5^2 + e^{i\pi} + 1 = 0 \] \end{alertblock} \centering \begin{minipage}{1.0\linewidth} - \begin{block}{This is an Horizontally-Aligned Ordinary Block} + \begin{block}{Horizontally-Aligned Block} \[ - a^2 + b^2 = c^2 + \log xy = \log x + \log y \] \end{block} \end{minipage} \end{frame} +\subsection{Items} + +\begin{frame}{Items} + Itemize + \begin{itemize} + \item item 1 + \item item 2 + \end{itemize} + + \bigskip + + Enumerate + \begin{enumerate} + \item item 1 + \item item 2 + \end{enumerate} +\end{frame} + \subsection{Figures} \begin{frame}{Figures} \begin{figure} \centering \begin{tikzpicture} - \draw [help lines,NordMagenta] (0,0) grid (5,4); + \draw [help lines,NordMagenta,very thick] (0,0) grid (5,4); \end{tikzpicture} \caption{Credits to Ti\textit{k}Z} \end{figure} @@ -132,4 +174,5 @@ %%% Local Variables: %%% mode: latex %%% TeX-master: t +%%% TeX-engine: xetex %%% End: diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/dark-blocks.png b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/dark-blocks.png Binary files differnew file mode 100644 index 0000000000..ab9000e2de --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/dark-blocks.png diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/dark-colors.png b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/dark-colors.png Binary files differnew file mode 100644 index 0000000000..302f4f1091 --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/dark-colors.png diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/dark-fonts.png b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/dark-fonts.png Binary files differnew file mode 100644 index 0000000000..09017e8cc5 --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/dark-fonts.png diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/dark-titlepage.png b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/dark-titlepage.png Binary files differnew file mode 100644 index 0000000000..0223ee9e26 --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/dark-titlepage.png diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/dark-toc.png b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/dark-toc.png Binary files differnew file mode 100644 index 0000000000..202a8710ba --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/dark-toc.png diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/dark-usage.png b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/dark-usage.png Binary files differnew file mode 100644 index 0000000000..a4054d08a7 --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/dark-usage.png diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/light-blocks.png b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/light-blocks.png Binary files differnew file mode 100644 index 0000000000..573c072afa --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/light-blocks.png diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/light-colors.png b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/light-colors.png Binary files differnew file mode 100644 index 0000000000..9fa03a29f8 --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/light-colors.png diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/light-fonts.png b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/light-fonts.png Binary files differnew file mode 100644 index 0000000000..2b8347b74f --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/light-fonts.png diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/light-titlepage.png b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/light-titlepage.png Binary files differnew file mode 100644 index 0000000000..23b803060c --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/light-titlepage.png diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/light-toc.png b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/light-toc.png Binary files differnew file mode 100644 index 0000000000..daf81fae73 --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/light-toc.png diff --git a/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/light-usage.png b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/light-usage.png Binary files differnew file mode 100644 index 0000000000..303a58e6c5 --- /dev/null +++ b/macros/latex/contrib/beamer-contrib/themes/beamerthemenord/screenshots/light-usage.png diff --git a/macros/latex/contrib/etoolbox/etoolbox.def b/macros/latex/contrib/etoolbox/etoolbox.def index fb9dfc0ac3..ad4ac6df7e 100644 --- a/macros/latex/contrib/etoolbox/etoolbox.def +++ b/macros/latex/contrib/etoolbox/etoolbox.def @@ -1,5 +1,5 @@ \ProvidesFile{etoolbox.def} - [2020/07/15 v2.5i etoolbox debug messages (JAW)] + [2020/08/24 v2.5j etoolbox debug messages (JAW)] \begingroup \makeatletter diff --git a/macros/latex/contrib/etoolbox/etoolbox.pdf b/macros/latex/contrib/etoolbox/etoolbox.pdf Binary files differindex 995fa2140f..2117815e0c 100644 --- a/macros/latex/contrib/etoolbox/etoolbox.pdf +++ b/macros/latex/contrib/etoolbox/etoolbox.pdf diff --git a/macros/latex/contrib/etoolbox/etoolbox.sty b/macros/latex/contrib/etoolbox/etoolbox.sty index 43e00958b5..39b4a791b0 100644 --- a/macros/latex/contrib/etoolbox/etoolbox.sty +++ b/macros/latex/contrib/etoolbox/etoolbox.sty @@ -12,7 +12,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{etoolbox} - [2020/07/15 v2.5i e-TeX tools for LaTeX (JAW)] + [2020/08/24 v2.5j e-TeX tools for LaTeX (JAW)] \begingroup \@ifundefined{eTeXversion} @@ -878,6 +878,45 @@ \csname#2\endcsname} {\csundef{#1}}} +\ifdef\NewCommandCopy + {% + \def\etb@carsquare#1#2#3\@nil{#1#2} + % + % {<cstoken>}{<true>}{<false>} + % + \newrobustcmd*{\etb@if@robustcmd}[1]{% + \begingroup + \escapechar=`\\ + \edef\etb@tempa{% + \endgroup + \def\noexpand\etb@tempa{\noexpand\@testopt + \expandafter\noexpand\csname\string#1\endcsname}% + \def\noexpand\etb@tempb{\unexpanded\expandafter\expandafter\expandafter + {\expandafter\etb@carsquare#1{}{}\@nil}}% + }\etb@tempa + \ifx\etb@tempa\etb@tempb + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi} + % + % {<cstoken>}{<cstoken>} + % + \newrobustcmd*{\etb@copy@robustcmd}[2]{% + \begingroup + \escapechar=`\\ + \edef\etb@tempa{% + \endgroup + \protected\def\noexpand#1{\noexpand\@testopt + \expandafter\noexpand\csname\string#1\endcsname + \unexpanded\expandafter\expandafter\expandafter + {\expandafter\@gobbletwo#2}}% + \let\expandafter\noexpand\csname\string#1\endcsname + \expandafter\noexpand\csname\string#2\endcsname + }\etb@tempa} + \g@addto@macro\@declarecommandcopylisthook + {{\etb@if@robustcmd\etb@copy@robustcmd}} + }{} % {<csname>} \newcommand*{\csuse}[1]{% @@ -1699,7 +1738,7 @@ \ifdef\AddToHook {% - \newrobustcmd*{\AtEndPreamble}{\AddToHook{env/document/begin}}% + \newrobustcmd*{\AtEndPreamble}{\AddToHook{begindocument/before}}% \let\AfterPreamble\AtBeginDocument \newrobustcmd*{\AfterEndPreamble}{\AddToHook{begindocument/end}}% \newrobustcmd*{\AfterEndDocument}{\AddToHook{enddocument/end}}% diff --git a/macros/latex/contrib/etoolbox/etoolbox.tex b/macros/latex/contrib/etoolbox/etoolbox.tex index 9eae069874..415a88b797 100644 --- a/macros/latex/contrib/etoolbox/etoolbox.tex +++ b/macros/latex/contrib/etoolbox/etoolbox.tex @@ -12,8 +12,8 @@ url={http://www.ctan.org/pkg/etoolbox/}, author={Philipp Lehman, Joseph Wright}, email={joseph.wright@morningstar2.co.uk}, - revision={v2.5i}, - date={2020/07/15}} + revision={v2.5j}, + date={2020/08/24}} \hypersetup{% pdftitle={The etoolbox Package}, @@ -1297,6 +1297,10 @@ This revision history is a list of changes relevant to users of this package. Ch \begin{changelog} +\begin{release}{2.5j}{2020-08-24} +\item Track \LaTeXe{} kernel changes +\end{release} + \begin{release}{2.5i}{2020-07-13} \item Track \LaTeXe{} kernel changes \end{release} diff --git a/macros/latex/contrib/fontsetup/README b/macros/latex/contrib/fontsetup/README index b73720d945..377b78a5f5 100644 --- a/macros/latex/contrib/fontsetup/README +++ b/macros/latex/contrib/fontsetup/README @@ -1,5 +1,5 @@ The fontsetup package - (Version 1.006, GPL3) + (Version 1.007, GPL3) This simple package makes it trivial to switch quickly between different quality fonts supporting Mathematics. diff --git a/macros/latex/contrib/fontsetup/doc/fontsetup-doc.pdf b/macros/latex/contrib/fontsetup/doc/fontsetup-doc.pdf Binary files differindex ffa923c0fc..7bbc3d52ba 100644 --- a/macros/latex/contrib/fontsetup/doc/fontsetup-doc.pdf +++ b/macros/latex/contrib/fontsetup/doc/fontsetup-doc.pdf diff --git a/macros/latex/contrib/fontsetup/doc/fontsetup-doc.tex b/macros/latex/contrib/fontsetup/doc/fontsetup-doc.tex index f5ed9c551a..b9ddc3ddcd 100644 --- a/macros/latex/contrib/fontsetup/doc/fontsetup-doc.tex +++ b/macros/latex/contrib/fontsetup/doc/fontsetup-doc.tex @@ -9,8 +9,8 @@ \textit{by}\\[1ex] {\large Antonis Tsolomitis}\\ University of the Aegean\\ Department of Mathematics\\[1ex] - \textsc{14} August \textsc{2020}\\[1ex] - Version 1.006, \textsc{gpl3} + \textsc{24} August \textsc{2020}\\[1ex] + Version 1.007, \textsc{gpl3} \end{center} This package is a simple wrapper-type package that makes the setup of fonts easy and @@ -24,12 +24,9 @@ University of the Aegean\\ Department of Mathematics\\[1ex] some restrictions. The fonts must have some commercial-level quality and must support Mathematics. - The options (in alphabetic order) are as follows: + The options (in alphabetic order after the default option) are as follows: \begin{description} - \item[cambria] Loads the Cambria fonts of Microsoft. These must be already installed - as a system font (in \verb|C:\Windows\Fonts| in MS-Windows, in \verb|/home/user/.fonts/| in Linux - or elsewhere by the system administratior). \item[default] Loads the NewComputerModern fonts (in Book weight), which is an assembly of cm fonts plus more fonts to support Greek (cbgreek) and Cyrillic languages. It also provides @@ -47,7 +44,16 @@ University of the Aegean\\ Department of Mathematics\\[1ex] documented in the Appendix \item commands to access the negation of uniform convergence symbols \verb|\nrightrightarrows| for $\nrightrightarrows$ and \verb|\nleftleftarrows| for $\nleftleftarrows$. + \item commands to access the IPA symbols. These are \verb|\ipatext| and \verb|\ipatextsans| + to select the fonts properly or \verb|\textipa{...}| and \verb|\textsansipa{...}| to select the fonts + for IPA symbols locally. Compare \textipa{ðŋβθχ} + (produced with \verb|\textipa{ðŋβθχ}|) with ðŋβθχ. \end{itemize} + \item[olddefault] Loads the NewComputerModern fonts (in Regular weight) + similarly to the default option. + \item[cambria] Loads the Cambria fonts of Microsoft. These must be already installed + as a system font (in \verb|C:\Windows\Fonts| in MS-Windows, in \verb|/home/user/.fonts/| in Linux + or elsewhere by the system administratior). \item[ebgaramond] Loads the EB-Garamond fonts with Garamond-Math. \item[fira] Loads the Fira family, a sans-serif font. \item[gfsartemisia] Loads the GFSArtemisia, a font family designed to be used @@ -78,7 +84,6 @@ University of the Aegean\\ Department of Mathematics\\[1ex] from MS-Garamond. \item[neoeuler] Loads the Concrete fonts with the Euler for Mathematics. Needs euler.otf to be instaled in the TeX installation. - \item[olddefault] Loads the NewComputerModern fonts (in Regular weight), \item[palatino] Loads the Linotype Palatino Fonts available from some versions of Windows. Thefonts must be system installed (in \verb|C:\Windows\Fonts| in MS-Windows, in \verb|/home/user/.fonts/| in Linux or elsewhere by the system administratior). The supplied diff --git a/macros/latex/contrib/fontsetup/fspdefault.sty b/macros/latex/contrib/fontsetup/fspdefault.sty index bdc44f2ee5..da0a494155 100644 --- a/macros/latex/contrib/fontsetup/fspdefault.sty +++ b/macros/latex/contrib/fontsetup/fspdefault.sty @@ -231,3 +231,21 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Book.otf} % some math symbols \DeclareRobustCommand\nrightrightarrows{\mathrel{\char"E033}} \DeclareRobustCommand\nleftleftarrows{\mathrel{\char"E032}} +% +% select ss02 lookup table for IPA symbols +\newfontfamily{\ipatext}[StylisticSet=5,% +BoldFont=NewCM10-Bold.otf,% +SlantedFont=NewCM10-Regular.otf,% +SlantedFeatures={FakeSlant=0.25}, +BoldSlantedFont=NewCM10-Bold.otf,% +BoldSlantedFeatures={FakeSlant=0.25}, +SmallCapsFeatures={Numbers=OldStyle}]{NewCM10-Book.otf} +\newcommand{\textipa}[1]{{\ipatext#1}} +\newfontfamily{\ipatextsans}[StylisticSet=5,% +ItalicFont=NewCMSans10-BookOblique.otf,% +BoldFont=NewCMSans10-Bold.otf,% +BoldItalicFont=NewCMSans10-BoldOblique.otf,% +SlantedFont=NewCMSans10-Oblique.otf,% +BoldSlantedFont=NewCMSans10-BoldOblique.otf,% +SmallCapsFeatures={Numbers=OldStyle}]{NewCMSans10-Book.otf} +\newcommand{\textsansipa}[1]{{\ipatextsans#1}} diff --git a/macros/latex/contrib/fontsetup/fspolddefault.sty b/macros/latex/contrib/fontsetup/fspolddefault.sty index e55f59e917..1c52a8ff0c 100644 --- a/macros/latex/contrib/fontsetup/fspolddefault.sty +++ b/macros/latex/contrib/fontsetup/fspolddefault.sty @@ -231,3 +231,21 @@ SmallCapsFeatures={Numbers=OldStyle}]{NewCMMono10-Regular.otf} % some math symbols \DeclareRobustCommand\nrightrightarrows{\mathrel{\char"E033}} \DeclareRobustCommand\nleftleftarrows{\mathrel{\char"E032}} +% +% select ss02 lookup table for IPA symbols +\newfontfamily{\ipatext}[StylisticSet=5,% +BoldFont=NewCM10-Bold.otf,% +SlantedFont=NewCM10-Regular.otf,% +SlantedFeatures={FakeSlant=0.25}, +BoldSlantedFont=NewCM10-Bold.otf,% +BoldSlantedFeatures={FakeSlant=0.25}, +SmallCapsFeatures={Numbers=OldStyle}]{NewCM10-Regular.otf} +\newcommand{\textipa}[1]{{\ipatext#1}} +\newfontfamily{\ipatextsans}[StylisticSet=5,% +ItalicFont=NewCMSans10-Oblique.otf,% +BoldFont=NewCMSans10-Bold.otf,% +BoldItalicFont=NewCMSans10-BoldOblique.otf,% +SlantedFont=NewCMSans10-Oblique.otf,% +BoldSlantedFont=NewCMSans10-BoldOblique.otf,% +SmallCapsFeatures={Numbers=OldStyle}]{NewCMSans10-Regular.otf} +\newcommand{\textsansipa}[1]{{\ipatextsans#1}} diff --git a/macros/latex/contrib/skdoc/Makefile b/macros/latex/contrib/skdoc/Makefile index 6a247013d9..f742f13777 100644 --- a/macros/latex/contrib/skdoc/Makefile +++ b/macros/latex/contrib/skdoc/Makefile @@ -1,3 +1,13 @@ +ZIP_NOATTRS := +ifeq ($(shell uname -s),Darwin) + ZIP_NOATTRS += -X +endif + +TAR_NOATTRS := +ifeq ($(shell uname -s),Darwin) + TAR_NOATTRS += --disable-copyfile +endif + TEXMFHOME ?= $(shell kpsewhich -var-value TEXMFHOME) .PHONY: all clean distclean install dist test clean-test all: skdoc.dtx skdoc.cls skdoc.pdf README @@ -38,7 +48,7 @@ skdoc.tds.zip: all mkdir -p skdoc/source/latex/skdoc cp skdoc.dtx skdoc/source/latex/skdoc/skdoc.dtx cp README skdoc/doc/latex/skdoc/README - cd skdoc && zip -r ../skdoc.tds.zip * + cd skdoc && zip $(ZIP_NOATTRS) -r ../skdoc.tds.zip * rm -rf skdoc skdoc.tar.gz: all skdoc.tds.zip @@ -47,7 +57,7 @@ skdoc.tar.gz: all skdoc.tds.zip cp skdoc.pdf skdoc/skdoc.pdf cp README skdoc/README cp Makefile skdoc/Makefile - tar -czf $@ skdoc skdoc.tds.zip + tar $(TAR_NOATTRS) -czf $@ skdoc skdoc.tds.zip rm -rf skdoc dist: skdoc.tar.gz diff --git a/macros/latex/contrib/skdoc/README b/macros/latex/contrib/skdoc/README index 8385ac97aa..b50b6c83d3 100644 --- a/macros/latex/contrib/skdoc/README +++ b/macros/latex/contrib/skdoc/README @@ -1,6 +1,6 @@ %% skdoc documentation class %% -%% Copyright (C) 2012-2019 by Simon Sigurdhsson <sigurdhsson@gmail.com> +%% Copyright (C) 2012-2020 by Simon Sigurdhsson <sigurdhsson@gmail.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -17,7 +17,7 @@ %% This work consists of the files skdoc.dtx %% and the derived filebase skdoc.cls. -This is version 1.5b of the skdoc document class. It is designed to +This is version 1.5c of the skdoc document class. It is designed to generate both documentation and derivative files using only LaTeX, i.e. without using docstrip and ins/dtx files. diff --git a/macros/latex/contrib/skdoc/skdoc.dtx b/macros/latex/contrib/skdoc/skdoc.dtx index a7bfdc10d8..19d086a975 100644 --- a/macros/latex/contrib/skdoc/skdoc.dtx +++ b/macros/latex/contrib/skdoc/skdoc.dtx @@ -1,7 +1,7 @@ % \iffalse %% skdoc documentation class %% -%% Copyright (C) 2012-2019 by Simon Sigurdhsson <sigurdhsson@gmail.com> +%% Copyright (C) 2012-2020 by Simon Sigurdhsson <sigurdhsson@gmail.com> %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -73,7 +73,7 @@ %</driver> %<class>\ProvidesExplClass{skdoc} %<*class> - {2019/09/29}{1.5b}{skdoc documentation class} + {2020/08/24}{1.5c}{skdoc documentation class} %</class> % %<*driver> @@ -132,7 +132,7 @@ % {}{\small\pagemark} % \pagestyle{skdoc-class} % -% \version{1.5b} +% \version{1.5c} % \changes{1.0}{Initial version} % \changes{1.1}{Added support for syntax highlighting using \pkg{minted}} % \changes{1.1a}{Deprecate the use of \pkg{bibtex} in favour of \pkg{biblatex}} @@ -146,6 +146,7 @@ % \changes{1.5}{Fix incompatibilities with \pkg{minted}} % \changes{1.5a}{Track \pkg{expl3} changes (thanks to Felix Faltin)} % \changes{1.5b}{Track \pkg{expl3} changes (thanks to Phelype Oleinik). Replace \pkg{opensans} option \opt{osfigures} with \opt{oldstyle} (\#40)} +% \changes{1.5c}{Replace \pkg{scrpage} package with \pkg{scrlayer-scrpage} (thanks to Daniel Wunderlich)} % \iffalse %%% Don't forget to update the version number and release date of %%% the package declaration on line 76! @@ -795,7 +796,7 @@ % \end{macrocode} % The rest is basically just styling. % \begin{macrocode} -\RequirePackage{scrpage2} +\RequirePackage{scrlayer-scrpage} \AtEndOfClass{% \RequirePackage[\skdoc@babel]{babel} \RequirePackage[english=british]{csquotes} diff --git a/macros/latex/contrib/skdoc/skdoc.pdf b/macros/latex/contrib/skdoc/skdoc.pdf Binary files differindex ac78b085ea..4e0de82cc7 100644 --- a/macros/latex/contrib/skdoc/skdoc.pdf +++ b/macros/latex/contrib/skdoc/skdoc.pdf |