summaryrefslogtreecommitdiff
path: root/macros
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-03-04 03:01:41 +0000
committerNorbert Preining <norbert@preining.info>2023-03-04 03:01:41 +0000
commit7761a2c2ae5e392243a4e09aefe8c69a97a1d0f6 (patch)
treecaf3ebd2ad32acef93a74b70c70c52e9d255f0e2 /macros
parentc000ad35f0ce69cc0466ad24b0647c1e295c0259 (diff)
CTAN sync 202303040301
Diffstat (limited to 'macros')
-rw-r--r--macros/latex/contrib/photobook/photobook.cls22
-rw-r--r--macros/latex/contrib/photobook/photobook.pdfbin140502 -> 140491 bytes
-rw-r--r--macros/latex/contrib/photobook/scripts/make-images.sh1
-rw-r--r--macros/latex/contrib/uvaletter/LICENSE21
-rw-r--r--macros/latex/contrib/uvaletter/README.md54
-rw-r--r--macros/latex/contrib/uvaletter/demo/uvaletter-demo.pdfbin0 -> 134477 bytes
-rw-r--r--macros/latex/contrib/uvaletter/demo/uvaletter-demo.tex35
-rw-r--r--macros/latex/contrib/uvaletter/uvaletter.sty108
-rw-r--r--macros/xetex/latex/xduts/xduts.dtx7
-rw-r--r--macros/xetex/latex/xduts/xduts.pdfbin331681 -> 331677 bytes
10 files changed, 238 insertions, 10 deletions
diff --git a/macros/latex/contrib/photobook/photobook.cls b/macros/latex/contrib/photobook/photobook.cls
index 202090fc27..c5e4f8d925 100644
--- a/macros/latex/contrib/photobook/photobook.cls
+++ b/macros/latex/contrib/photobook/photobook.cls
@@ -71,7 +71,7 @@
%%% NOTE: \def\<module-name>@[A-Z]+ macros will be visible to both the
%%% code and the generated docs...
-\edef\photobook@FILEVERSION{v0.1.8}
+\edef\photobook@FILEVERSION{v0.1.9}
\edef\photobook@FILEDATE{2023-03-01}
@@ -623,6 +623,8 @@
%% \href{https://ctan.org/pkg/adjustbox}{adjustbox},
\RequirePackage{adjustbox}
%% \href{https://ctan.org/pkg/adjustbox}{adjustbox},
+% XXX BUG TEXTPOS textblock in absolute mode does not behave well with
+% sbox in absolute mode...
\RequirePackage[absolute]{textpos}
%% \href{https://ctan.org/pkg/fancyvrb}{fancyvrb},
\RequirePackage{fancyvrb}
@@ -1695,11 +1697,11 @@
%%
% XXX SYNTAX: place the second arg in braces...
% \begin{cell*}(<left>, <top>){<width>}{<height>}
+%\newenvironment{cell*}[3]{%
\newenvironment{cell*}[3]{%
\begingroup%
\setsepchar{,}%
\readlist*\photobook@cell@offset{#1}%
- %
% NOTE: if there is no \null before textblock then it can reset the
% non-standard page boxes...
% ...not sure yet if this is an issue with how/when foldout env
@@ -1708,7 +1710,7 @@
% XXX report this as a bug if issue is in textblock...
% XXX another place where this is relevant is in the resizedpages
% env...
- \null%
+ %\null%
\begin{textblock*}{#2}(#1)%
\begin{inlinecell*}{#2}{#3}%
\setlength\celloffsettop{\photobook@cell@offset[1]}%
@@ -1767,7 +1769,7 @@
%% This is similar to |\newsavebox{..}| and |\sbox{..}| but adds
%% cell functionality.
%%
-%% |\gsavecell{..}| is the same as |\savecell{..}| but greates a global
+%% |\gsavecell{..}| is the same as |\savecell{..}| but creates a global
%% cell.
%%
% XXX can/should we make this an env???
@@ -1777,21 +1779,25 @@
\newcommand\savecell[5][]{%
% only define a savebox once...
\@ifundefined{#2}{%
- \expandafter\newsavebox\csname #2\endcsname}{}
+ \expandafter\newsavebox\csname #2\endcsname}{}%
\expandafter\sbox\csname #2\endcsname{%
+ \TPoptions{absolute=false}%
\begin{inlinecell*}[#1]{#3}{#4}%
#5%
- \end{inlinecell*}}%
+ \end{inlinecell*}%
+ \TPoptions{absolute=true}}%
\ignorespaces}
\newcommand\gsavecell[5][]{%
% only define a savebox once...
\@ifundefined{#2}{%
- \expandafter\newsavebox\csname #2\endcsname}{}
+ \expandafter\newsavebox\csname #2\endcsname}{}%
\global\expandafter\sbox\csname #2\endcsname{%
+ \TPoptions{absolute=false}%
\begin{inlinecell*}[#1]{#3}{#4}%
#5%
- \end{inlinecell*}}%
+ \end{inlinecell*}%
+ \TPoptions{absolute=true}}%
\ignorespaces}
diff --git a/macros/latex/contrib/photobook/photobook.pdf b/macros/latex/contrib/photobook/photobook.pdf
index 44c848ff5c..c10cb7eba2 100644
--- a/macros/latex/contrib/photobook/photobook.pdf
+++ b/macros/latex/contrib/photobook/photobook.pdf
Binary files differ
diff --git a/macros/latex/contrib/photobook/scripts/make-images.sh b/macros/latex/contrib/photobook/scripts/make-images.sh
index 7be3a53cf8..bfec27d978 100644
--- a/macros/latex/contrib/photobook/scripts/make-images.sh
+++ b/macros/latex/contrib/photobook/scripts/make-images.sh
@@ -80,6 +80,7 @@ shopt -s nullglob extglob
# ...something like:
# <template-name>-left.tpl
# <template-name>-right.tpl
+# - add multiple images/captions...
#
#
#
diff --git a/macros/latex/contrib/uvaletter/LICENSE b/macros/latex/contrib/uvaletter/LICENSE
new file mode 100644
index 0000000000..0e3bcfd492
--- /dev/null
+++ b/macros/latex/contrib/uvaletter/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Michele Piazzai
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/macros/latex/contrib/uvaletter/README.md b/macros/latex/contrib/uvaletter/README.md
new file mode 100644
index 0000000000..eb1edbfc0a
--- /dev/null
+++ b/macros/latex/contrib/uvaletter/README.md
@@ -0,0 +1,54 @@
+<!--
+uvaletter v1.1.0
+author: Michele Piazzai
+contact: michele.piazzai@uc3m.es
+license: MIT
+-->
+
+# uvaletter
+
+This is an unofficial LaTeX package that provides a letterhead template for the University of Amsterdam. The design mimics the [official Word template](https://www.uva.nl/over-de-uva/over-de-universiteit/huisstijl/downloadstools/brief/brief.html) of the University and complies with the University's [house style](https://www.uva.nl/over-de-uva/over-de-universiteit/huisstijl/huisstijl.html).
+
+![](https://github.com/piazzai/uvaletter/blob/master/screenshot.jpg)
+
+## Installation
+
+This package is hosted on CTAN and distributed as part of MikTex and TeXLive. It can also be installed manually by cloning this repository in your `$HOME/texmf/tex/latex` folder, which is searched by LaTeX. If you do not have such a folder, you can [create it](https://www.ias.edu/math/computing/faq/local-latex-style-files).
+
+## Usage
+
+The package can be loaded with a `pageno` option that enables page numbering. Be aware that, in order for the layout to display, your letter body should be wrapped in a `letterhead` environment.
+
+Here is a minimal working example:
+
+```tex
+\documentclass{letter}
+\usepackage{uvaletter}
+
+\logo{logo.jpg}
+\recipient{foo}
+\department{bar}
+\visiting{}
+\postal{}
+\website{}
+\date{}
+\yourreference{}
+\ourreference{}
+\contactperson{}
+\phone{}
+\email{}
+\subject{}
+\enclosed{}
+
+\begin{document}
+\begin{letterhead}
+
+ Hello world!
+
+\end{letterhead}
+\end{document}
+```
+
+The `\recipient{}` and `\department{}` commands are mandatory and their arguments must be non-empty. All other commands are optional and can be removed, commented out, or left empty.
+
+In order for a logo to be displayed, you must indicate a path to the image in `\logo{}`. All official logos of the University of Amsterdam, including faculties, departments, and institutes, can be found [here](https://www.uva.nl/over-de-uva/over-de-universiteit/huisstijl/huisstijlelementen/logo/logo.html). If a path is not provided or the file is not found, the logo space is left blank.
diff --git a/macros/latex/contrib/uvaletter/demo/uvaletter-demo.pdf b/macros/latex/contrib/uvaletter/demo/uvaletter-demo.pdf
new file mode 100644
index 0000000000..4d66682285
--- /dev/null
+++ b/macros/latex/contrib/uvaletter/demo/uvaletter-demo.pdf
Binary files differ
diff --git a/macros/latex/contrib/uvaletter/demo/uvaletter-demo.tex b/macros/latex/contrib/uvaletter/demo/uvaletter-demo.tex
new file mode 100644
index 0000000000..72276484f1
--- /dev/null
+++ b/macros/latex/contrib/uvaletter/demo/uvaletter-demo.tex
@@ -0,0 +1,35 @@
+\documentclass[11pt]{letter}
+\usepackage[pageno]{uvaletter}
+
+\logo{logo.jpg}
+\recipient{Place Holder \\ University of \TeX \\ 123 Main St \\ Anytown \\ USA}
+\department{Amsterdam Business School}
+\visiting{Plantage Muidergracht 12 \\ 1018 TV Amsterdam \\ The Netherlands}
+\postal{P.O.~Box 15953 \\ 1001 NL Amsterdam \\ The Netherlands}
+\website{www.abs.uva.nl}
+\date{January 1, 1970}
+\yourreference{Foo}
+\ourreference{Bar}
+\contactperson{Dr.~Plaatsvervanger}
+\phone{+31\,(0)20\,525\,5250}
+\email{p.holder@uva.nl}
+\subject{Lorem ipsum dolor sit amet, consectetur adipisicing elit}
+\enclosed{Attachment 1 \\ Attachment 2}
+
+\begin{document}
+\begin{letterhead}
+
+ Beste aanhef,
+
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit. Donec gravida velit in ornare accumsan. Maecenas id lorem non dui tempus pretium ut rhoncus lectus. Donec odio nibh, ultricies non imperdiet in, interdum eget enim. Sed fringilla dui at arcu auctor, consequat aliquam mauris faucibus. Mauris fringilla magna erat, a bibendum mi interdum non. Nulla mauris massa, tincidunt et fermentum vel, auctor ac felis. Nullam quis tristique orci, nec molestie mauris. Etiam velit odio, rhoncus quis sem ac, bibendum placerat sapien. Aenean ornare magna sit amet consectetur mattis. Etiam at ante iaculis, rutrum diam ac, dignissim purus. Vivamus vehicula scelerisque aliquet.
+
+ Morbi et placerat turpis. Sed placerat ligula a ipsum pretium efficitur. In tincidunt urna quis faucibus ornare. Fusce commodo laoreet gravida. Donec tempus ante at ullamcorper imperdiet. Morbi lobortis neque eget eros luctus, vel dictum ex molestie. Proin eget viverra est. Morbi rhoncus, neque id molestie convallis, urna quam vulputate sem, id rhoncus est ex at nunc. Curabitur nisl felis, vehicula nec sapien rhoncus, imperdiet placerat erat. Curabitur tristique ipsum at odio mollis fringilla. Donec nisl leo, posuere in cursus a, ultricies ac massa. In imperdiet tempus tellus, ultrices iaculis metus bibendum ac. In quis interdum nisi.
+
+ Nulla semper maximus nibh, vel sagittis odio. Aenean feugiat nunc erat, non auctor orci fringilla vel. Maecenas in finibus odio, nec elementum lorem. Ut varius tellus nec efficitur interdum. Ut orci turpis, auctor vel odio sed, euismod malesuada mi. Sed id bibendum nisl. Aliquam erat volutpat. Integer varius sapien non nunc interdum tempor. In rutrum ac quam at vulputate. Aenean.
+
+ Met vriendelijke groet,
+
+ Dr.~Plaatsvervanger, \\ Hoogleraar Sjablonen
+
+\end{letterhead}
+\end{document}
diff --git a/macros/latex/contrib/uvaletter/uvaletter.sty b/macros/latex/contrib/uvaletter/uvaletter.sty
new file mode 100644
index 0000000000..c1148eeab7
--- /dev/null
+++ b/macros/latex/contrib/uvaletter/uvaletter.sty
@@ -0,0 +1,108 @@
+% uvaletter v1.1.0
+% Author: Michele Piazzai
+% Contact: michele.piazzai@uc3m.es
+% License: MIT
+
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{uvaletter}[2023/03/02 UvA Letter]
+
+\RequirePackage[T1]{fontenc}
+\RequirePackage[utf8]{inputenc}
+\RequirePackage[a4paper,margin=3.05cm]{geometry}
+\RequirePackage{times,microtype,fancyhdr,setspace,graphicx,ifthen,soul,lastpage}
+
+\pagestyle{fancy}
+\fancyhf{}
+\DeclareOption{pageno}{\rfoot{\tabentry Page~\thepage~of~\pageref{LastPage}}}
+
+\newenvironment{letterhead}{%
+ \ifthenelse{\equal{\@logo}{}}{}{%
+ \IfFileExists{\@logo}{%
+ \begin{minipage}{\textwidth}
+ \vspace{-2cm}\hspace{-1.31cm}\includegraphics[width=.65\textwidth]{\@logo}
+ \end{minipage}
+ }{}}
+ \begin{minipage}[b]{.4975\textwidth}
+ \raggedright\@recipient
+ \end{minipage}
+ \begin{minipage}[b]{.4975\textwidth}
+ \raggedleft\small\sffamily
+ {\bfseries\@department} \\
+ \ifthenelse{\equal{\@visiting}{}}{}{\medskip\@visiting \\}
+ \ifthenelse{\equal{\@postal}{}}{}{\medskip\@postal \\}
+ \medskip\@website
+ \end{minipage}
+
+ \bigskip\bigskip\bigskip\bigskip
+ \begin{minipage}{.3\textwidth}
+ {\tabentry Date}
+ \newline\@date
+ \end{minipage}
+ \begin{minipage}{.3\textwidth}
+ {\tabentry Your reference}
+ \newline\@yourreference
+ \end{minipage}
+ \begin{minipage}{.3\textwidth}
+ {\tabentry Our reference}
+ \newline\@ourreference
+ \end{minipage}
+
+ \begin{minipage}{.3\textwidth}
+ {\tabentry Contact person}
+ \newline\@contactperson
+ \end{minipage}
+ \begin{minipage}{.3\textwidth}
+ {\tabentry Telephone}
+ \newline\@phone
+ \end{minipage}
+ \begin{minipage}{.3\textwidth}
+ {\tabentry Email}
+ \newline\@email
+ \end{minipage}
+
+ \begin{minipage}{\textwidth}
+ {\tabentry Subject}
+ \newline\@subject
+ \end{minipage}
+
+ \ifthenelse{\equal{\@enclosed}{}}{\bigskip}{%
+ \begin{minipage}{\textwidth}
+ {\tabentry Enclosed}
+ \newline\@enclosed
+ \end{minipage}
+ \bigskip
+ }
+ \raggedright
+}{}
+
+\ProcessOptions
+\setlength{\parindent}{0pt}
+\setlength{\parskip}{1em plus 0.2em minus 0.2em}
+\renewcommand{\headrulewidth}{0pt}
+\newcommand\tabentry{\scriptsize\sffamily}
+\newcommand\logo[1]{\renewcommand\@logo{#1}}
+\newcommand\@logo{}
+\newcommand\recipient[1]{\renewcommand\@recipient{#1}}
+\newcommand\@recipient{}
+\newcommand\department[1]{\renewcommand\@department{#1}}
+\newcommand\@department{}
+\newcommand\visiting[1]{\renewcommand\@visiting{#1}}
+\newcommand\@visiting{}
+\newcommand\postal[1]{\renewcommand\@postal{#1}}
+\newcommand\@postal{}
+\newcommand\website[1]{\renewcommand\@website{#1}}
+\newcommand\@website{}
+\newcommand\yourreference[1]{\renewcommand\@yourreference{#1}}
+\newcommand\@yourreference{}
+\newcommand\ourreference[1]{\renewcommand\@ourreference{#1}}
+\newcommand\@ourreference{}
+\newcommand\contactperson[1]{\renewcommand\@contactperson{#1}}
+\newcommand\@contactperson{}
+\newcommand\phone[1]{\renewcommand\@phone{#1}}
+\newcommand\@phone{}
+\newcommand\email[1]{\renewcommand\@email{#1}}
+\newcommand\@email{}
+\newcommand\subject[1]{\renewcommand\@subject{#1}}
+\newcommand\@subject{}
+\newcommand\enclosed[1]{\renewcommand\@enclosed{#1}}
+\newcommand\@enclosed{}
diff --git a/macros/xetex/latex/xduts/xduts.dtx b/macros/xetex/latex/xduts/xduts.dtx
index b296c67b8e..3802edfdaf 100644
--- a/macros/xetex/latex/xduts/xduts.dtx
+++ b/macros/xetex/latex/xduts/xduts.dtx
@@ -1,7 +1,7 @@
% \iffalse
%<*driver>
\ProvidesFile{xduts.dtx}
-[2023/03/02 v6.0.0.0 Xidian University TeX Suite]
+[2023/03/03 v6.0.1.0 Xidian University TeX Suite]
%</driver>
%<class|sty>\NeedsTeXFormat{LaTeX2e}
%<class|sty>\RequirePackage{expl3}
@@ -9,7 +9,7 @@
%<xduugtp>\ProvidesExplClass{xduugtp}
%<xdupgthesis>\ProvidesExplClass{xdupgthesis}
%<xduugthesis>\ProvidesExplClass{xduugthesis}
-%<class|sty> {2023/03/02}{6.0.0.0}
+%<class|sty> {2023/03/03}{6.0.1.0}
%<xdufont> {Xidian University Font package}
%<xduugtp> {Xidian University Undergraduate Thesis Proposal class}
%<xdupgthesis> {Xidian University Postgraduate Thesis document class}
@@ -5269,6 +5269,7 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1}
% \end{macro}
% \subsection{Caption}
% \begin{macro}{\DeclareCaptionLabelSeparator,\DeclareCaptionFont,\captionsetup}
+% \changes{v6.0.1.0}{2023/03/03}{修正子图子表caption垂直间距}
% \changes{v5.2.0.0}{2023/02/23}{设置图表caption前后垂直间距}
% \changes{v3.0.0.0}{2022/12/03}{设置图表caption格式}
% \changes{v2.17.0.0}{2022/11/28}{设置图表caption格式}
@@ -5287,6 +5288,8 @@ literate = {\$}{{\textcolor{purple3}{\$}}}{1}
labelsep = customskip,
font = customfont
}
+\captionsetup [ subfigure ] { strut = on, skip = 0pt }
+\captionsetup [ subtable ] { strut = on, skip = 0pt }
\dim_set_eq:NN \intextsep \abovecaptionskip
\ctex_at_end_preamble:n
{
diff --git a/macros/xetex/latex/xduts/xduts.pdf b/macros/xetex/latex/xduts/xduts.pdf
index 065431c812..017f108829 100644
--- a/macros/xetex/latex/xduts/xduts.pdf
+++ b/macros/xetex/latex/xduts/xduts.pdf
Binary files differ