summaryrefslogtreecommitdiff
path: root/macros/latex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-09-21 03:02:01 +0000
committerNorbert Preining <norbert@preining.info>2021-09-21 03:02:01 +0000
commit32e0f5d0a5abc4f2b6c7341f19b854b5945c3ebd (patch)
treed88327cf96992788ed82a343f071bbbf2ad4cc84 /macros/latex
parentc9fcf97bc045a9d020980c33b6c7c1ee5aedef99 (diff)
CTAN sync 202109210302
Diffstat (limited to 'macros/latex')
-rw-r--r--macros/latex/contrib/elteikthesis/LICENSE2
-rw-r--r--macros/latex/contrib/elteikthesis/README.md11
-rw-r--r--macros/latex/contrib/elteikthesis/README.pdfbin152282 -> 157578 bytes
-rw-r--r--macros/latex/contrib/elteikthesis/README_hu.md11
-rw-r--r--macros/latex/contrib/elteikthesis/README_hu.pdfbin156453 -> 161570 bytes
-rw-r--r--macros/latex/contrib/elteikthesis/chapters/impl.tex32
-rw-r--r--macros/latex/contrib/elteikthesis/chapters/user.tex4
-rw-r--r--macros/latex/contrib/elteikthesis/elteikthesis-minted.pdfbin0 -> 20680 bytes
-rw-r--r--macros/latex/contrib/elteikthesis/elteikthesis-minted.tex33
-rw-r--r--macros/latex/contrib/elteikthesis/elteikthesis.cls105
-rw-r--r--macros/latex/contrib/elteikthesis/elteikthesis.pdfbin461186 -> 446255 bytes
-rw-r--r--macros/latex/contrib/elteikthesis/elteikthesis.tex26
-rw-r--r--macros/latex/contrib/elteikthesis/settings.tex16
-rw-r--r--macros/latex/contrib/genealogytree/CHANGES.md398
-rw-r--r--macros/latex/contrib/genealogytree/README48
-rw-r--r--macros/latex/contrib/genealogytree/README.md49
-rw-r--r--macros/latex/contrib/genealogytree/genealogytree-example-1.pdfbin202898 -> 207638 bytes
-rw-r--r--macros/latex/contrib/genealogytree/genealogytree-example-2.pdfbin251357 -> 259454 bytes
-rw-r--r--macros/latex/contrib/genealogytree/genealogytree-example-3.pdfbin197945 -> 205128 bytes
-rw-r--r--macros/latex/contrib/genealogytree/genealogytree-example-4.pdfbin254364 -> 307949 bytes
-rw-r--r--macros/latex/contrib/genealogytree/genealogytree-languages.pdfbin441585 -> 466559 bytes
-rw-r--r--macros/latex/contrib/genealogytree/genealogytree.pdfbin7328827 -> 8620249 bytes
-rw-r--r--macros/latex/contrib/genealogytree/genealogytree.sty9
-rw-r--r--macros/latex/contrib/genealogytree/gtrcore.contour.code.tex6
-rw-r--r--macros/latex/contrib/genealogytree/gtrcore.drawing.code.tex6
-rw-r--r--macros/latex/contrib/genealogytree/gtrcore.node.code.tex6
-rw-r--r--macros/latex/contrib/genealogytree/gtrcore.options.code.tex18
-rw-r--r--macros/latex/contrib/genealogytree/gtrcore.parser.code.tex6
-rw-r--r--macros/latex/contrib/genealogytree/gtrcore.processing.code.tex6
-rw-r--r--macros/latex/contrib/genealogytree/gtrcore.symbols.code.tex6
-rw-r--r--macros/latex/contrib/genealogytree/gtrlang.danish.code.tex6
-rw-r--r--macros/latex/contrib/genealogytree/gtrlang.dutch.code.tex6
-rw-r--r--macros/latex/contrib/genealogytree/gtrlang.english.code.tex6
-rw-r--r--macros/latex/contrib/genealogytree/gtrlang.french.code.tex6
-rw-r--r--macros/latex/contrib/genealogytree/gtrlang.german.code.tex6
-rw-r--r--macros/latex/contrib/genealogytree/gtrlang.italian.code.tex6
-rw-r--r--macros/latex/contrib/genealogytree/gtrlang.portuguese.code.tex87
-rw-r--r--macros/latex/contrib/genealogytree/gtrlang.spanish.code.tex6
-rw-r--r--macros/latex/contrib/genealogytree/gtrlang.swedish.code.tex6
-rw-r--r--macros/latex/contrib/genealogytree/gtrlib.debug.code.tex6
-rw-r--r--macros/latex/contrib/genealogytree/gtrlib.fanchart.code.tex6
-rw-r--r--macros/latex/contrib/genealogytree/gtrlib.templates.code.tex6
-rw-r--r--macros/latex/contrib/lipsum/CHANGELOG.md8
-rw-r--r--macros/latex/contrib/lipsum/README.md26
-rw-r--r--macros/latex/contrib/lipsum/lipsum.dtx159
-rw-r--r--macros/latex/contrib/lipsum/lipsum.ins2
-rw-r--r--macros/latex/contrib/lipsum/lipsum.pdfbin650470 -> 653611 bytes
-rw-r--r--macros/latex/contrib/spacingtricks/spacingtricks.dtx96
-rw-r--r--macros/latex/contrib/spacingtricks/spacingtricks.ins6
-rw-r--r--macros/latex/contrib/spacingtricks/spacingtricks.pdfbin124789 -> 125414 bytes
50 files changed, 948 insertions, 300 deletions
diff --git a/macros/latex/contrib/elteikthesis/LICENSE b/macros/latex/contrib/elteikthesis/LICENSE
index 569279193f..d760da3dee 100644
--- a/macros/latex/contrib/elteikthesis/LICENSE
+++ b/macros/latex/contrib/elteikthesis/LICENSE
@@ -1,6 +1,6 @@
MIT License
-Copyright (c) 2013-2020 Máté Cserép <mcserep@inf.elte.hu>, Bálint Bognár
+Copyright (c) 2013-2021 Máté Cserép <mcserep@inf.elte.hu>, Bálint Bognár
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/macros/latex/contrib/elteikthesis/README.md b/macros/latex/contrib/elteikthesis/README.md
index fc0e06a1c4..4b8add09a0 100644
--- a/macros/latex/contrib/elteikthesis/README.md
+++ b/macros/latex/contrib/elteikthesis/README.md
@@ -27,12 +27,17 @@ pdflatex elteikthesis.tex
Compilation might be carried out through a preferred IDE (e.g. [TexStudio](https://www.texstudio.org/)), given the same commands should be executed.
+## Syntax highlighting of code blocks
+
+The minted package is also supported for syntax highlighting. For its usage the Python interpreter and the `Pygments` package must be installed as a prerequisite.
+See the `elteikthesis-minted.tex` file for example.
+
## Required packages (without completeness)
**Image handling:**
* Minimal and maximal size: [adjustbox](https://ctan.org/pkg/adjustbox)
-* Subfigures: [subfigure](https://ctan.org/pkg/subfigure)
+* Subfigures: [subcaption](https://ctan.org/pkg/subcaption)
* Rotation: [rotating](https://ctan.org/pkg/rotating)
**Table management:**
@@ -51,8 +56,8 @@ Compilation might be carried out through a preferred IDE (e.g. [TexStudio](https
* Mathematical formulas: [amsmath](https://ctan.org/pkg/amsmath)
* Mathematical definitions: [amsthm](https://ctan.org/pkg/amsthm)
* Mathematical symbols: [amsfonts](https://ctan.org/pkg/amsfonts)
-* Algorithms: [algorithmic](https://ctan.org/pkg/algorithms)
-* Code blocks: [listingsutf8](https://ctan.org/pkg/listingsutf8)
+* Algorithms: [algpseudocode](https://www.ctan.org/pkg/algorithmicx)
+* Code blocks: [listingsutf8](https://ctan.org/pkg/listingsutf8), [minted](https://ctan.org/pkg/minted)
**Miscellaneous:**
diff --git a/macros/latex/contrib/elteikthesis/README.pdf b/macros/latex/contrib/elteikthesis/README.pdf
index 4392582e6e..0cfeb82960 100644
--- a/macros/latex/contrib/elteikthesis/README.pdf
+++ b/macros/latex/contrib/elteikthesis/README.pdf
Binary files differ
diff --git a/macros/latex/contrib/elteikthesis/README_hu.md b/macros/latex/contrib/elteikthesis/README_hu.md
index 3e39384717..0f9550a339 100644
--- a/macros/latex/contrib/elteikthesis/README_hu.md
+++ b/macros/latex/contrib/elteikthesis/README_hu.md
@@ -27,12 +27,17 @@ pdflatex elteikthesis.tex
A fordításhoz tetszőleges fejlesztő környezet is használható (pl. [TexStudio](https://www.texstudio.org/)), ugyanezen utasítások kiadásával.
+## Kódblokkok szintaxis kiemelése
+
+A *minted* csomag támogatott a forráskódok szedésére és szintaxis kiemelésére. Használatához szükséges a Python interpreter és a `Pygments` csomag telepítése.
+Lásd a `elteikthesis-minted.tex` fájlt példaként.
+
## Fontosabb függőségi csomagok
**Képkezelés:**
* Minimális és maximális méret: [adjustbox](https://ctan.org/pkg/adjustbox)
-* Alábrák: [subfigure](https://ctan.org/pkg/subfigure)
+* Alábrák: [subcaption](https://ctan.org/pkg/subcaption)
* Forgatás: [rotating](https://ctan.org/pkg/rotating)
**Táblázatkezelés:**
@@ -51,8 +56,8 @@ A fordításhoz tetszőleges fejlesztő környezet is használható (pl. [TexStu
* Matematikai formulák: [amsmath](https://ctan.org/pkg/amsmath)
* Matematikai definíciók: [amsthm](https://ctan.org/pkg/amsthm)
* Matematikai szimbólumok: [amsfonts](https://ctan.org/pkg/amsfonts)
-* Algoritmusok: [algorithmic](https://ctan.org/pkg/algorithms)
-* Kódblokkok: [listingsutf8](https://ctan.org/pkg/listingsutf8)
+* Algoritmusok: [algpseudocode](https://www.ctan.org/pkg/algorithmicx)
+* Kódblokkok: [listingsutf8](https://ctan.org/pkg/listingsutf8), [minted](https://ctan.org/pkg/minted)
**Egyebek:**
diff --git a/macros/latex/contrib/elteikthesis/README_hu.pdf b/macros/latex/contrib/elteikthesis/README_hu.pdf
index d1f7c5f38e..dc5029c0b5 100644
--- a/macros/latex/contrib/elteikthesis/README_hu.pdf
+++ b/macros/latex/contrib/elteikthesis/README_hu.pdf
Binary files differ
diff --git a/macros/latex/contrib/elteikthesis/chapters/impl.tex b/macros/latex/contrib/elteikthesis/chapters/impl.tex
index aad6f326f3..7f9e0a81fc 100644
--- a/macros/latex/contrib/elteikthesis/chapters/impl.tex
+++ b/macros/latex/contrib/elteikthesis/chapters/impl.tex
@@ -95,21 +95,21 @@ Példa forrása: \href{https://www.inf.u-szeged.hu/actacybernetica/}{Acta Cybern
\label{alg:ibb}
\textbf{\underline{Funct}} IBB($S,f$)
\begin{algorithmic}[1] % sorszámok megjelenítése minden n. sor előtt, most n = 1
-\STATE Set the working list ${\cal L}_W$ := $\{S\}$ and the final list ${\cal L}_Q$ := $\{\}$
-\WHILE{( ${\cal L}_W \neq \emptyset$ )} \label{alg:igoend}
- \STATE Select an interval $X$ from ${\cal L}_W$ \label{step:selrule}\COMMENT{Selection rule}
- \STATE Compute $lbf(X)$ \COMMENT{Bounding rule}
- \IF[Elimination rule]{$X$ cannot be eliminated}
- \STATE Divide $X$ into $X^j,\ j=1,\dots, p$, subintervals \COMMENT{Division rule}
- \FOR{$j=1,\ldots,p$}
- \IF[Termination rule]{$X^j$ satisfies the termination criterion}
- \STATE Store $X^j$ in ${\cal L}_W$
- \ELSE
- \STATE Store $X^j$ in ${\cal L}_W$
- \ENDIF
- \ENDFOR
- \ENDIF
-\ENDWHILE
-\STATE \textbf{return} ${\cal L}_Q$
+\State Set the working list ${\cal L}_W$ := $\{S\}$ and the final list ${\cal L}_Q$ := $\{\}$
+\While{( ${\cal L}_W \neq \emptyset$ )} \label{alg:igoend}
+ \State Select an interval $X$ from ${\cal L}_W$ \label{step:selrule}\Comment{Selection rule}
+ \State Compute $lbf(X)$ \Comment{Bounding rule}
+ \If{$X$ cannot be eliminated} \Comment{Elimination rule}
+ \State Divide $X$ into $X^j,\ j=1,\dots, p$, subintervals \Comment{Division rule}
+ \For{$j=1,\ldots,p$}
+ \If{$X^j$ satisfies the termination criterion} \Comment{Termination rule}
+ \State Store $X^j$ in ${\cal L}_W$
+ \Else
+ \State Store $X^j$ in ${\cal L}_W$
+ \EndIf
+ \EndFor
+ \EndIf
+\EndWhile
+\State \textbf{return} ${\cal L}_Q$
\end{algorithmic}
\end{algorithm}
diff --git a/macros/latex/contrib/elteikthesis/chapters/user.tex b/macros/latex/contrib/elteikthesis/chapters/user.tex
index 47e302f99e..f0318a5c2f 100644
--- a/macros/latex/contrib/elteikthesis/chapters/user.tex
+++ b/macros/latex/contrib/elteikthesis/chapters/user.tex
@@ -85,10 +85,10 @@ In non ipsum fermentum urna feugiat rutrum a at odio. Pellentesque habitant morb
\begin{figure}[H]
\centering
- \subfigure[Vestibulum quis mattis urna]{
+ \subcaptionbox{Vestibulum quis mattis urna}{
\includegraphics[width=0.45\linewidth]{elte_cimer_szines}}
\hspace{5pt}
- \subfigure[Donec hendrerit quis dui sit amet venenatis]{
+ \subcaptionbox{Donec hendrerit quis dui sit amet venenatis}{
\includegraphics[width=0.45\linewidth]{elte_cimer_szines}}
\caption{Aenean porttitor mi volutpat massa gravida}
\label{fig:example-2}
diff --git a/macros/latex/contrib/elteikthesis/elteikthesis-minted.pdf b/macros/latex/contrib/elteikthesis/elteikthesis-minted.pdf
new file mode 100644
index 0000000000..409b970455
--- /dev/null
+++ b/macros/latex/contrib/elteikthesis/elteikthesis-minted.pdf
Binary files differ
diff --git a/macros/latex/contrib/elteikthesis/elteikthesis-minted.tex b/macros/latex/contrib/elteikthesis/elteikthesis-minted.tex
new file mode 100644
index 0000000000..c45a1afa5c
--- /dev/null
+++ b/macros/latex/contrib/elteikthesis/elteikthesis-minted.tex
@@ -0,0 +1,33 @@
+\documentclass{elteikthesis}[2021/09/20]
+
+\usepackage[newfloat]{minted}
+
+\begin{document}
+\documentlang{magyar}
+
+\chapter{Minted forráskód}
+\label{ch:chapter}
+
+\begin{listing}[H]
+\begin{minted}{cpp}
+#include <stdio>
+
+int main()
+{
+ int c;
+ std::cout << "Hello World!" << std::endl;
+
+ std::cout << "Press any key to exit." << std::endl;
+ std::cin >> c;
+
+ return 0;
+}
+\end{minted}
+\caption{Hello World in C++}
+\end{listing}
+
+\phantomsection
+\addcontentsline{toc}{chapter}{\lstcodelabel}
+\listoflistings
+
+\end{document} \ No newline at end of file
diff --git a/macros/latex/contrib/elteikthesis/elteikthesis.cls b/macros/latex/contrib/elteikthesis/elteikthesis.cls
index 347404ee8f..bdb616649f 100644
--- a/macros/latex/contrib/elteikthesis/elteikthesis.cls
+++ b/macros/latex/contrib/elteikthesis/elteikthesis.cls
@@ -1,7 +1,7 @@
%% MIT License
%%
-%% Version 2.1, 2020/05/15
-%% Copyright (c) 2013-2020 Máté Cserép <mcserep@inf.elte.hu>, Bálint Bognár
+%% Version 2.2, 2021/09/20
+%% Copyright (c) 2013-2021 Máté Cserép <mcserep@inf.elte.hu>, Bálint Bognár
%%
%% Permission is hereby granted, free of charge, to any person obtaining a copy
%% of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,7 @@
%% to the original package.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{elteikthesis}[2020/05/15 ELTE FI bachelor and master thesis template]
+\ProvidesClass{elteikthesis}[2021/09/20 ELTE FI bachelor and master thesis template]
% LaTeX programozói eszközök
\RequirePackage{etoolbox}
@@ -60,8 +60,13 @@
% ------------------------------
% Karakterkódolás, nyelv
-\RequirePackage[utf8]{inputenc}
-\RequirePackage[T1]{fontenc}
+\RequirePackage{iftex} % XeTex or LuaTex
+\iftutex
+ \RequirePackage{fontspec}
+\else % other (PdfTex)
+ \RequirePackage[utf8]{inputenc}
+ \RequirePackage[T1]{fontenc}
+\fi
\RequirePackage[english,magyar]{babel}
\RequirePackage{indentfirst}
% ------------------------------
@@ -109,6 +114,7 @@
\newcommand{\alglabel}{Algoritmus}
\newcommand{\biblabel}{Irodalomjegyzék}
+ \newcommand{\lstalgorithmlabel}{Algoritmusjegyzék}
\newcommand{\lstfigurelabel}{Ábrajegyzék}
\newcommand{\lsttablelabel}{Táblázatjegyzék}
\newcommand{\lstcodelabel}{Forráskódjegyzék}
@@ -132,6 +138,7 @@
\newcommand{\alglabel}{Algorithm}
\newcommand{\biblabel}{Bibliography}
+ \newcommand{\lstalgorithmlabel}{List of Algorithms}
\newcommand{\lstfigurelabel}{List of Figures}
\newcommand{\lsttablelabel}{List of Tables}
\newcommand{\lstcodelabel}{List of Codes}
@@ -144,6 +151,13 @@
% ------------------------------
% ------------------------------
+% Margók
+\RequirePackage[left=35mm, right=25mm, top=25mm, bottom=25mm, headheight=16pt]{geometry}
+%\setlength{\textwidth}{150mm}
+%\setlength{\textheight}{247mm}
+% ------------------------------
+
+% ------------------------------
% Fejlécek és láblécek
\RequirePackage{fancyhdr}
\pagestyle{fancy}
@@ -201,7 +215,7 @@
% Maximális ill. minimális méret megadása ábráknak
\RequirePackage[export]{adjustbox}
% Több ábra egy figure-on belül
-\RequirePackage[center]{subfigure}
+\RequirePackage{subcaption}
% Ábrák forgatása
\RequirePackage{rotating}
@@ -222,13 +236,6 @@
% ------------------------------
% ------------------------------
-% Margók
-\RequirePackage[left=35mm, right=25mm, top=25mm, bottom=25mm]{geometry}
-%\setlength{\textwidth}{150mm}
-%\setlength{\textheight}{247mm}
-% ------------------------------
-
-% ------------------------------
% Térköz bekezdések közé
\iftoggle{parspace}{
\RequirePackage{parskip}
@@ -254,7 +261,6 @@
% ------------------------------
% Helyközök és tördelés
-\linespread{1.5}
% Egyszeres helyköz a mondatok végén
\frenchspacing
% Szavak jobb margón túlnyúlásának tiltása
@@ -263,10 +269,15 @@
\nottoggle{hypenation}{\RequirePackage[none]{hyphenat}}{}
% Beállítás alternatív módon
-%\RequirePackage{setspace}
-%\singlespacing % ~1.0 linespread
-%\onehalfspacing % ~1.3 linespread
-%\doublespacing % ~1.6 linespread
+\RequirePackage{setspace}
+% According to
+% https://tex.stackexchange.com/questions/442030/setting-spaces-with-titlespacing-and-fonts
+% this matches the 1.5 linespacing in MS Word
+\setstretch{1.427465}
+
+% Vektorok és mátrixok egyszeres sorközzel
+% https://tex.stackexchange.com/questions/568084/problem-with-matrices-using-linespread
+\everydisplay=\expandafter{\the\everydisplay\linespread{1}\selectfont}
% Azonos sorköz használata láblácben
%\RequirePackage{footmisc}
@@ -293,8 +304,13 @@
% ------------------------------
% Tételek, definíciók
+\theoremstyle{definition}
\newtheorem{definition}{\deflabel}
+
+\theoremstyle{plain}
\newtheorem{theorem}{\theolabel}
+
+\theoremstyle{remark}
\newtheorem*{remark}{\remlabel}
\newtheorem*{note}{\notelabel}
% ------------------------------
@@ -322,7 +338,7 @@
% pdflatex-hez
\newcommand{\hyperrefComp}{}
-\RequirePackage[pdfborder={0 0 0}, unicode, \hyperrefComp]{hyperref}
+\RequirePackage[pdfborder={0 0 0}, unicode, pdfusetitle, \hyperrefComp]{hyperref}
\RequirePackage[all]{hypcap}
\RequirePackage{url}
\RequirePackage{bookmark}
@@ -351,6 +367,9 @@
% ------------------------------
% Számozott elemek kezelése
\RequirePackage{chngcntr}
+% Lábjegyzet folytonos számozása fejezetek között
+% Continuous counting of footnotes among chapters
+\counterwithout{footnote}{chapter}
% Lábjegyzet oldalak közti eltörésének tiltása
\interfootnotelinepenalty=10000
% ------------------------------
@@ -381,7 +400,7 @@
% ------------------------------
% Feliratok, tartalomjegyzék, ábrajegyzék, táblázatjegyzék
\RequirePackage[justification=centering]{caption}
-\RequirePackage[subfigure]{tocloft}
+\RequirePackage{tocloft}
% ------------------------------
@@ -409,7 +428,7 @@
% ------------------------------
% Algoritmusok és kódblokkok írása
\RequirePackage{algorithm}
-\RequirePackage{algorithmic}
+\RequirePackage{algpseudocode}
\RequirePackage{listingsutf8}
\lstset{
basicstyle=\footnotesize\ttfamily,
@@ -429,17 +448,16 @@
breaklines=true,
breakatwhitespace=false,
float,
- frame=linesc,
+ frame=lines,
captionpos=b
}
% Forráskód elnevezése
\renewcommand{\lstlistingname}{\codelabel}
% Forráskódjegyzék elnevezése
\renewcommand{\lstlistlistingname}{\lstcodelabel}
-% Algoritmus kommentek jobb szélre igazítása
-\renewcommand{\algorithmiccomment}[1]{\hfill {\it #1}}
% Algoritmus elnevezése
-\renewcommand{\ALG@name}{\alglabel}
+\floatname{algorithm}{\alglabel}
+\renewcommand{\listalgorithmname}{\lstalgorithmlabel}
% ------------------------------
% ------------------------------
@@ -534,3 +552,40 @@
\setcounter{page}{1}
}
% ------------------------------
+
+\AtBeginDocument{
+ % If the minted package is loaded, then provide a default for the formatting,
+ % and set the labels for the listings
+ \@ifpackageloaded{minted}{
+ \setminted{
+ style=tango,
+ numbers=left,
+ stepnumber=1,
+ firstnumber=1,
+ numbersep=5pt,
+ showspaces=false,
+ showtabs=false,
+ tabsize=2,
+ breaklines=true,
+ frame=lines,
+ bgcolor=codebackg,
+ }
+ \SetupFloatingEnvironment{listing}{
+ name=\codelabel, % Forráskód elnevezése
+ listname=\lstcodelabel, % Forráskódjegyzék elnevezése
+ }
+ }
+
+ % Az oldalszámozás a tartalomjegyzékkel kezdődik, de ott nem látható
+ \let\oldtableofcontents\tableofcontents
+ \renewcommand{\tableofcontents}{
+ \pagenumbering{gobble}
+ \oldtableofcontents
+ \cleardoublepage
+ % Oldalszám mentése és betöltésem mert a \pagenumbering visszállítja
+ \newcounter{conpageno}
+ \defcounter{conpageno}{\value{page}}
+ \pagenumbering{arabic}
+ \setcounter{page}{\value{conpageno}}
+ }
+}
diff --git a/macros/latex/contrib/elteikthesis/elteikthesis.pdf b/macros/latex/contrib/elteikthesis/elteikthesis.pdf
index 58ec02b7cf..a637d85d32 100644
--- a/macros/latex/contrib/elteikthesis/elteikthesis.pdf
+++ b/macros/latex/contrib/elteikthesis/elteikthesis.pdf
Binary files differ
diff --git a/macros/latex/contrib/elteikthesis/elteikthesis.tex b/macros/latex/contrib/elteikthesis/elteikthesis.tex
index 162ce58e7c..c72a65a4e1 100644
--- a/macros/latex/contrib/elteikthesis/elteikthesis.tex
+++ b/macros/latex/contrib/elteikthesis/elteikthesis.tex
@@ -3,13 +3,18 @@
%noindent, % Bekezdésének első sora ne legyen behúzva / No indentation of first lines in each paragraph
%nohyp, % Szavak sorvégi elválasztásának tiltása / No hyphenation of words
%twoside, % Kétoldalas nyomtatás / Double sided format
+ %draft, % Gyorsabb fordítás ábrák rajzolása nélkül / Quicker draft compilation without rendering images
%final, % Teendők elrejtése / Set final to hide todos
-]{elteikthesis}[2020/05/15]
+]{elteikthesis}[2021/09/20]
+
+% A minted csomag támogatott a forráskódok szedésére
+% The minted package is also supported for source highlighting
+%\usepackage[newfloat]{minted}
% Dolgozat metaadatai
% Document's metadata
\title{Dolgozat címe} % cím / title
-\date{2020} % védés éve / year of defense
+\date{2021} % védés éve / year of defense
% Szerző metaadatai
% Author's metadata
@@ -46,11 +51,7 @@
% Teendők listája (final dokumentumban nincs)
% List of todos (not in the final document)
-\listoftodos[\todolabel]
-
-% Dokumentum beállítások
-% Some document settings
-\input{settings.tex}
+%\listoftodos[\todolabel]
% Címlap (kötelező)
% Title page (mandatory)
@@ -84,24 +85,35 @@
% Irodalomjegyzék (kötelező)
% Bibliography (mandatory)
+\phantomsection
\addcontentsline{toc}{chapter}{\biblabel}
\printbibliography[title=\biblabel]
\cleardoublepage
% Ábrajegyzék (opcionális) - 3-5 ábra fölött érdemes
% List of figures (optional) - useful over 3-5 figures
+\phantomsection
\addcontentsline{toc}{chapter}{\lstfigurelabel}
\listoffigures
\cleardoublepage
% Táblázatjegyzék (opcionális) - 3-5 táblázat fölött érdemes
% List of tables (optional) - useful over 3-5 tables
+\phantomsection
\addcontentsline{toc}{chapter}{\lsttablelabel}
\listoftables
\cleardoublepage
+% Algorithmusjegyzék
+% List of algorithms
+\phantomsection
+\addcontentsline{toc}{chapter}{\lstalgorithmlabel}
+\listofalgorithms
+\cleardoublepage
+
% Forráskódjegyzék (opcionális) - 3-5 kódpélda fölött érdemes
% List of codes (optional) - useful over 3-5 code samples
+\phantomsection
\addcontentsline{toc}{chapter}{\lstcodelabel}
\lstlistoflistings
\cleardoublepage
diff --git a/macros/latex/contrib/elteikthesis/settings.tex b/macros/latex/contrib/elteikthesis/settings.tex
deleted file mode 100644
index d2040f9d24..0000000000
--- a/macros/latex/contrib/elteikthesis/settings.tex
+++ /dev/null
@@ -1,16 +0,0 @@
-% Lábjegyzet folytonos számozása fejezetek között
-% Continuous counting of footnotes among chapters
-\counterwithout{footnote}{chapter}
-
-% Tartalomjegyzék oldalszámozásának rejtése
-% Hide page numbering of ToC
-\newcounter{conpageno}
-\let\oldtableofcontents\tableofcontents
-\renewcommand{\tableofcontents}{
- \pagenumbering{gobble}
- \oldtableofcontents
- \cleardoublepage
- \setcounter{conpageno}{\value{page}}
- \pagenumbering{arabic}
- \setcounter{page}{\value{conpageno}}
-}
diff --git a/macros/latex/contrib/genealogytree/CHANGES.md b/macros/latex/contrib/genealogytree/CHANGES.md
new file mode 100644
index 0000000000..cdf54934e1
--- /dev/null
+++ b/macros/latex/contrib/genealogytree/CHANGES.md
@@ -0,0 +1,398 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on
+[Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to
+[Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security
+
+
+
+## [2.1.0] - 2021-09-20
+
+### Added
+- Portuguese translation provided by Natan de Almeida Laverde
+- Value `portuguese` for option `language`
+
+### Changed
+- Readme moved and adapted from README to README.md
+- Changelog moved from documentation `genealogytree.pdf` to CHANGES.md and adapted to
+ [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
+- From now on version numbers adhere to
+ [Semantic Versioning](http://semver.org/spec/v2.0.0.html)
+
+### Fixed
+- `options for subtree` had no effect in v2.01 (issue #39)
+
+
+
+## [2.01] - 2020-07-28
+
+### Added
+- New *LaTeXÜ macros added corresponding to existing macros:
+ - `\getree_set_options_for_subtree:nn`
+ - `\getree_set_options_for_family:nn`
+ - `\getree_set_options_for_node:nn`
+- Some hints for events with unknown dates added
+ to the documentation (issue #36)
+
+### Changed
+- Implementation changed to avoid problems with spurious blanks
+ and resulting errors for
+ - Option `tcb/if image defined`
+ - Option `date range before`
+ - Option `date range after`
+ - Option `place text`
+ - Option `options for subtree`
+ - Option `options for family`
+ - Option `options for node`
+ - Option `ignore subtree`
+ - Option `ignore node`
+ - `\gtrsetoptionsforsubtree`
+ - `\gtrsetoptionsforfamily`
+ - `\gtrsetoptionsfornode`
+ - `\gtrignoresubtree`
+ - `\gtrignorenode`
+ - `\gtrloadlanguage`
+ - `\gtrSymbolsSetCreateSelected`
+
+
+
+## [2.00] - 2020-06-19
+
+### Added
+- New options for influencing the autolayout algorithm to avoid
+ overlapping edges for childless families (issue #34):
+ - Option `insert for childless families`
+ - Option `insert phantom for childless families`
+ - Option `insert for childless families level limit`
+- New algorithm for automatic ancestor completion. This autofill is
+ controlled by the new options
+ - Option `autofill parents unspecific`
+ - Option `autofill parents unspecific*`
+ - Option `autofill parents male female`
+ - Option `autofill parents male female*`
+ - Option `autofill parents female male`
+ - Option `autofill parents female male*`
+ - Option `autofill parents none`
+ - Option `complemented`
+ - Option `complemented phantom`
+- New option `ignore parent childs` to remove all
+ siblings in an ancestor tree.
+- New data base keys for holding relation information:
+ - Option `database/relation`
+ - Option `database/ancestor`
+ - Option `database/descendant`
+ - Option `database/sibling`
+ - Option `database/unrelated`
+- New data base key for holding age information and accompanying
+ options and macros:
+ - Option `database/age`
+ - Option `age code`
+ - `\gtrPrintAge`
+ - `\gtrifagedefined`
+ - `\gtrDBage`
+- Conversion with MuPDF added and externalization rewritten for MuPDF.
+- New auxiliary tools for graph (picture) sizing
+ - `\gtrautosizebox`
+ - `\gtrautosizebox*`
+ - Environment `autosizetikzpicture`
+ - Environment `autosizetikzpicture*`
+- Graph example file `example.neumann.graph`
+- New library `fanchart` to draw fan chart diagrams
+ with a plethora of macros and options (issue #31):
+ - `\gtrfanchart`
+ - `\gtrfanchartinput`
+ - Option `fanchart radii`
+ - Option `fanchart inner offset`
+ - Option `fanchart outer offset`
+ - Option `fanchart minor angle`
+ - Option `fanchart major angle`
+ - Option `fanchart angles`
+ - Option `fanchart open full`
+ - Option `fanchart open up`
+ - Option `fanchart open down`
+ - Option `fanchart open left`
+ - Option `fanchart open right`
+ - Option `fanchart open for`
+ - Option `fanchart reset bounds`
+ - Option `fanchart bounds border`
+ - Option `fanchart landscape from level`
+ - Option `fanchart text portrait`
+ - Option `fanchart text landscape`
+ - Option `fanchart boundary color`
+ - Option `fanchart boundary width`
+ - Option `fanchart root style`
+ - Option `fanchart root malefemale`
+ - Option `fanchart segment style`
+ - Option `fanchart segment malefemale`
+ - Option `fanchart segment relation`
+ - Option `fanchart segment wave`
+ - Option `fanchart segment colorwheel`
+ - Option `fanchart segment radial`
+ - Option `fanchart marker style`
+ - Option `fanchart marker malefemale`
+ - Option `fanchart marker relation`
+ - Option `fanchart marker wave`
+ - Option `fanchart marker colorwheel`
+ - Option `fanchart marker radial`
+ - Option `tikz/gtr set color wave`
+ - Option `tikz/gtr set color colorwheel`
+ - Option `tikz/gtr set color series`
+ - Option `fanchart complemented segment style`
+ - Option `fanchart complemented marker style`
+ - Option `fanchart segment style for levels`
+ - Option `fanchart marker style for levels`
+ - Option `fanchart segment style for ids`
+ - Option `fanchart marker style for ids`
+ - Option `fanchart male style`
+ - Option `fanchart female style`
+ - Option `fanchart neuter style`
+ - Option `fanchart ancestor style`
+ - Option `fanchart descendant style`
+ - Option `fanchart sibling style`
+ - Option `fanchart unrelated style`
+- Option `fanchart template` with
+ - Template `malefemale sober`
+ - Template `malefemale relation`
+ - Template `colorwheel sober`
+ - Template `colorwheel serious`
+ - Template `colorwheel malefemale`
+ - Template `colorwheel rich`
+ - Template `colorwheel opulent`
+ - Template `wave sober`
+ - Template `wave serious`
+ - Template `wave malefemale`
+ - Template `wave rich`
+ - Template `wave opulent`
+ - Template `radial sober`
+ - Template `radial serious`
+ - Template `radial malefemale`
+ - Template `radial rich`
+ - Template `radial opulent`
+- Advanced customization by
+ - `\gtrcomplemented`
+ - Option `fanchart-segment-definition`
+ - Option `fanchart-marker-definition`
+ - Option `fanchart-segment-code`
+ - Option `fanchart-root-code`
+ - `\l_getree_fanchart_minor_angle_tl`
+ - `\l_getree_fanchart_major_angle_tl`
+ - `\l_getree_fanchart_angle_a_tl`
+ - `\l_getree_fanchart_angle_b_tl`
+ - `\l_getree_fanchart_radius_a_tl`
+ - `\l_getree_fanchart_radius_b_tl`
+ - `\l_getree_fanchart_offset_a_tl`
+ - `\l_getree_fanchart_offset_b_tl`
+ - `\l_getree_fanchart_line_width_tl`
+ - `\l_getree_fanchart_level_tl`
+ - `\l_getree_fanchart_ratio_tl`
+ - `\l_getree_fanchart_id_tl`
+ - `\c_getree_fanchart_maximum_rings_tl`
+ - `\getree_fanchart_if_complemented_node_p:`
+ - `\getree_fanchart_if_complemented_node:TF`
+ - `\getree_fanchart_set_segment_style:n`
+ - `\getree_fanchart_set_marker_style:n`
+ - `\getree_fanchart_set_color_wave:n`
+ - `\getree_fanchart_set_color_colorwheel:n`
+ - `\getree_fanchart_draw_path:n`
+ - `\getree_fanchart_draw_path:nnn`
+ - `\getree_fanchart_draw_root_style:n`
+ - `\getree_fanchart_draw_segment_standard:`
+
+### Changed
+- Implementation of `\genealogytree` slightly changed.
+
+### Fixed
+- Template `database sideways` et.al. raised errors when used in combination with
+ `family database` (issue #31).
+
+
+
+## [1.32] - 2019-04-08
+
+### Added
+- Internal database print command documented `\gtrPrintDatabase` (issue #24)
+
+### Changed
+- `tcolorbox` needs to be version 4.20 (2019/03/02) or newer.
+
+### Fixed
+- The templates library used some internal color names of `tcolorbox`.
+ They are adapted now to the new official names (issue #30).
+
+
+
+## [1.31] - 2018-04-17
+
+### Added
+- Option `database/imageopt`
+- Option `database/viewport`
+- `\gtrDBimageopt`
+- `\gtrincludeDBimage`
+- TikZ-Option `fill overzoom DBimage`
+
+### Changed
+- `tcolorbox` needs to be version 4.13 (2018/03/22) or newer.
+
+
+
+## [1.30] - 2017-12-08
+
+### Added
+- Spanish translation `language=spanish` provided by Francisco G. Pérez Sánchez
+- Swedish translation `language=swedish` provided by Per Starbäck
+- New values `date format`: `d/m yyyy`, `yyyy d/m`
+- Warnings for missing language strings added to \url{genealogytree-languages.pdf}
+- Option `edges shift`
+- Option `edges up`
+- Option `edges down`
+- Option `edges up by`
+- Option `edges down by`
+- Option `reset edge level shift`
+- Option `switch edge level shift`
+- Option `nullify edge level shift`
+
+
+
+## [1.21] - 2017-09-15
+
+### Added
+- Italian translation `language=italian` provided by Andrea Vaccari
+- Template `database pole reduced`
+- Template `database poleportrait`
+- Template `database poleportrait reduced`
+- Template `database portrait reduced`
+- Template `database traditional reduced`
+- Template `database sideways reduced`
+- Template `database sidewaysportait`
+- Template `database sidewaysportait reduced`
+
+### Changed
+- `\gtrsymFloruit` symbol rotated by 36 degrees for an enhanced
+ optical differentiation from `\gtrsymBorn`.
+
+
+
+## [1.20] - 2017-07-18
+
+### Added
+- Dutch translation `language=dutch` provided by Dirk Bosmans
+- New event `floruit` with symbol `\gtrsymFloruit` proposed by Mikkel Eide Eriksen
+ Accompanying keys are
+ `database/floruit`, `database/floruit+`, `database/floruit-`, `symlang/Floruit`, `event prefix/floruit`.
+ The standard options for `database format` were extended for floruit.
+ The standard options for `database format` were extended for floruit.
+
+
+
+## [1.10] - 2017-01-29
+
+### Added
+- Danish translation `language=danish` provided by Mikkel Eide Eriksen
+- French translation `language=french` provided by Denis Bitouzé
+- Separate document `genealogytree-languages` added to give a short survey
+ of language settings.
+- New values for `date format`:
+ `typical`, `dd mon.yyyy`, `d mon.yyyy`, `dd/mm yyyy`, `yyyymmdd`
+- Option `database/profession`
+- Option `profession code`
+- Option `info separators`
+- `\gtrDBprofession`
+- `\gtrPrintProfession`
+- `\gtrifprofessiondefined`
+- Environment `gtrinfolist`
+- ``
+
+### Changed
+- Option settings for `database format`
+ updated to process `database/comment` and `database/profession`.
+- Implementation for level sensitive variables changed to
+ support extension packages.
+- Implementation for `\gtruselibrary` changed to support
+ third party extension packages.
+
+
+
+## [1.01] - 2016-07-29
+
+### Added
+- Option `tikz`
+- Option `genealogytree extra edges scope`
+- Tutorial *Multi-Ancestors*
+
+### Changed
+- Family options like `pivot shift` are now applicable
+ for `options for family` and `gtrsetoptionsforfamily`.
+
+
+
+## [1.00] - 2015-09-21
+
+### Added
+- Template `database relationship`
+
+### Changed
+- Library loading made compatible with expl3.
+
+
+
+## [0.91 beta] - 2015-06-22
+
+### Added
+- Option `id prefix`
+- Option `id suffix`
+- Template `database sideways`
+- Tutorial *Externalization*
+- Tutorial *Conversion*
+- Option `date format` complemented with many more formats.
+
+### Changed
+- Settings for `date range full` and `date range separator` changed.
+
+### Fixed
+- `phantom` and `phantom*` switch off more settings of `tcolorbox`.
+
+
+
+## [0.90 beta] - 2015-05-22
+
+### Added
+- First functional beta release.
+- Full genealogy tree customization, tree positioning, input insertion and deletion,
+ edge customization.
+- Database processing.
+- Genealogy symbols.
+- Internationalization.
+- Templates library.
+- Tutorials.
+
+
+
+## [0.10 alpha] - 2015-01-12
+
+### Added
+- Initial public release (alpha version).
+- Grammar and Debugger as preview release.
+
+
+
+## [0.00] - 2013-2014
+
+### Added
+- Pre publication development.
+
+
+
+[v2.1.0] https://github.com/T-F-S/genealogytree/compare/v2.01...2.1.0
+[v2.01] https://github.com/T-F-S/genealogytree/compare/v2.00...v2.01
+
diff --git a/macros/latex/contrib/genealogytree/README b/macros/latex/contrib/genealogytree/README
deleted file mode 100644
index 3b793e1cef..0000000000
--- a/macros/latex/contrib/genealogytree/README
+++ /dev/null
@@ -1,48 +0,0 @@
-%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
-%%
-%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2013-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
-%% -------------------------------------------------------------------------------------------
-%%
-%% 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 `author-maintained'.
-%%
-%% This work consists of all files listed in README
-%%
-
-Pedigree and genealogical tree diagrams are proven tools to visualize genetic
-and relational connections between individuals. The naming for mathematical tree
-structures with parent nodes and child nodes is traded from historical family
-diagrams. However, even the smallest family entity consisting of two parents and
-several children is no mathematical tree but a more general graph. The
-genealogytree packages provides a set of tools to typeset such genealogical
-trees or, more precisely, to typeset a set of special graphs for the description
-of family-like structures. The package uses an autolayout algorithm which can be
-customized to e.g. prioritize certain paths.
-
-Contents of the package
-=======================
- 'README' this file
- 'genealogytree.sty' LaTeX package file (style file)
- '*.code.tex' LaTeX package file (library of genealogytree)
- 'genealogytree.pdf' Documentation for genealogytree
- 'genealogytree-example-*.pdf' Example pedigree charts
- 'genealogytree-languages.pdf' Short language survey
- 'genealogytree.doc.sources.zip' Source code of the documentation
-
-Installation
-============
-Copy the contents of the 'genealogytree.tds.zip' from CTAN to your local TeX
-file tree.
-
-Alternatively, put the files to their respective locations within the TeX installation:
- 'genealogytree.sty' -> /tex/latex/genealogytree
- '*.code.tex' -> /tex/latex/genealogytree
- all other files -> /doc/latex/genealogytree
diff --git a/macros/latex/contrib/genealogytree/README.md b/macros/latex/contrib/genealogytree/README.md
new file mode 100644
index 0000000000..5d22561834
--- /dev/null
+++ b/macros/latex/contrib/genealogytree/README.md
@@ -0,0 +1,49 @@
+# The LaTeX package genealogytree - version 2.1.0 (2021/09/20)
+
+> Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+
+> 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 `author-maintained`.
+
+> This work consists of all files listed in README.md
+
+
+Pedigree and genealogical tree diagrams are proven tools to visualize genetic
+and relational connections between individuals. The naming for mathematical tree
+structures with parent nodes and child nodes is traded from historical family
+diagrams. However, even the smallest family entity consisting of two parents and
+several children is no mathematical tree but a more general graph. The
+`genealogytree` packages provides a set of tools to typeset such genealogical
+trees or, more precisely, to typeset a set of special graphs for the description
+of family-like structures. The package uses an autolayout algorithm which can be
+customized to e.g. prioritize certain paths.
+
+
+## Contents of the package
+
+- `README.md` this file
+- `CHANGES.md` log of changes (history)
+- `genealogytree.sty` LaTeX package file (style file)
+- `*.code.tex` LaTeX package file (library of genealogytree)
+- `genealogytree.pdf` Documentation for genealogytree
+- `genealogytree-example-*.pdf` Example pedigree charts
+- `genealogytree-languages.pdf` Short language survey
+- `genealogytree.doc.sources.zip` Source code of the documentation
+
+
+## Installation
+
+Copy the contents of the `genealogytree.tds.zip` from CTAN to your local TeX file tree.
+
+Alternatively, put the files to their respective locations within the TeX installation:
+
+- `genealogytree.sty` -> /tex/latex/genealogytree
+- `*.code.tex` -> /tex/latex/genealogytree
+- all other files -> /doc/latex/genealogytree
diff --git a/macros/latex/contrib/genealogytree/genealogytree-example-1.pdf b/macros/latex/contrib/genealogytree/genealogytree-example-1.pdf
index 0f4311d752..d05dc7aad8 100644
--- a/macros/latex/contrib/genealogytree/genealogytree-example-1.pdf
+++ b/macros/latex/contrib/genealogytree/genealogytree-example-1.pdf
Binary files differ
diff --git a/macros/latex/contrib/genealogytree/genealogytree-example-2.pdf b/macros/latex/contrib/genealogytree/genealogytree-example-2.pdf
index ef6cb5cef5..1977763919 100644
--- a/macros/latex/contrib/genealogytree/genealogytree-example-2.pdf
+++ b/macros/latex/contrib/genealogytree/genealogytree-example-2.pdf
Binary files differ
diff --git a/macros/latex/contrib/genealogytree/genealogytree-example-3.pdf b/macros/latex/contrib/genealogytree/genealogytree-example-3.pdf
index fb446c4923..1214fcfc3c 100644
--- a/macros/latex/contrib/genealogytree/genealogytree-example-3.pdf
+++ b/macros/latex/contrib/genealogytree/genealogytree-example-3.pdf
Binary files differ
diff --git a/macros/latex/contrib/genealogytree/genealogytree-example-4.pdf b/macros/latex/contrib/genealogytree/genealogytree-example-4.pdf
index cd3c8ec48e..7a3beb3f52 100644
--- a/macros/latex/contrib/genealogytree/genealogytree-example-4.pdf
+++ b/macros/latex/contrib/genealogytree/genealogytree-example-4.pdf
Binary files differ
diff --git a/macros/latex/contrib/genealogytree/genealogytree-languages.pdf b/macros/latex/contrib/genealogytree/genealogytree-languages.pdf
index 023068205a..44c63e7500 100644
--- a/macros/latex/contrib/genealogytree/genealogytree-languages.pdf
+++ b/macros/latex/contrib/genealogytree/genealogytree-languages.pdf
Binary files differ
diff --git a/macros/latex/contrib/genealogytree/genealogytree.pdf b/macros/latex/contrib/genealogytree/genealogytree.pdf
index fb25a1a87c..933a55d001 100644
--- a/macros/latex/contrib/genealogytree/genealogytree.pdf
+++ b/macros/latex/contrib/genealogytree/genealogytree.pdf
Binary files differ
diff --git a/macros/latex/contrib/genealogytree/genealogytree.sty b/macros/latex/contrib/genealogytree/genealogytree.sty
index e9675d9491..f6be902292 100644
--- a/macros/latex/contrib/genealogytree/genealogytree.sty
+++ b/macros/latex/contrib/genealogytree/genealogytree.sty
@@ -1,8 +1,8 @@
-%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
+%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20)
%% genealogytree.sty: genealogy trees (graphs)
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2013-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -18,8 +18,8 @@
%% This work consists of all files listed in README
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{genealogytree}[2020/07/28 version 2.01 genealogy trees]
-\def\gtr@version{2.01}
+\ProvidesPackage{genealogytree}[2021/09/20 version 2.1.0 genealogy trees]
+\def\gtr@version{2.1.0}
\RequirePackage{expl3}[2020/02/25]
\RequirePackage{xparse}
@@ -140,6 +140,7 @@
\gtr@add@library{lang.french}{gtrlang.french.code.tex}
\gtr@add@library{lang.german}{gtrlang.german.code.tex}
\gtr@add@library{lang.italian}{gtrlang.italian.code.tex}
+\gtr@add@library{lang.portuguese}{gtrlang.portuguese.code.tex}
\gtr@add@library{lang.spanish}{gtrlang.spanish.code.tex}
\gtr@add@library{lang.swedish}{gtrlang.swedish.code.tex}
diff --git a/macros/latex/contrib/genealogytree/gtrcore.contour.code.tex b/macros/latex/contrib/genealogytree/gtrcore.contour.code.tex
index 70b302a0cb..cf4bb3d9e7 100644
--- a/macros/latex/contrib/genealogytree/gtrcore.contour.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrcore.contour.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
+%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20)
%% gtrcore.contour.code.tex: Contours
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2013-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\gtr@set@library@version{2.01}
+\gtr@set@library@version{2.1.0}
%%%%%%%%%%%%%%%%%%%%%%%
%% Contour
diff --git a/macros/latex/contrib/genealogytree/gtrcore.drawing.code.tex b/macros/latex/contrib/genealogytree/gtrcore.drawing.code.tex
index f917d7cc92..1112737c57 100644
--- a/macros/latex/contrib/genealogytree/gtrcore.drawing.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrcore.drawing.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
+%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20)
%% gtrcore.drawing.code.tex: Drawing
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2013-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\gtr@set@library@version{2.01}
+\gtr@set@library@version{2.1.0}
%%%%%%%%%%%%%%%%%%%%%%%
%% Auxiliary Tools
diff --git a/macros/latex/contrib/genealogytree/gtrcore.node.code.tex b/macros/latex/contrib/genealogytree/gtrcore.node.code.tex
index a02204cef1..5baae2638b 100644
--- a/macros/latex/contrib/genealogytree/gtrcore.node.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrcore.node.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
+%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20)
%% gtrcore.node.code.tex: Node Boxes
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2013-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\gtr@set@library@version{2.01}
+\gtr@set@library@version{2.1.0}
%%%%%%%%%%%%%%
% Processors %
diff --git a/macros/latex/contrib/genealogytree/gtrcore.options.code.tex b/macros/latex/contrib/genealogytree/gtrcore.options.code.tex
index 10eb3711a7..592ac1ea54 100644
--- a/macros/latex/contrib/genealogytree/gtrcore.options.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrcore.options.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
+%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20)
%% gtrcore.options.code.tex: Options
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2013-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\gtr@set@library@version{2.01}
+\gtr@set@library@version{2.1.0}
%%%%%%%%%%%%%%%%%%%%%%%
%% General handling
@@ -102,7 +102,7 @@
\clist_set:Nn \l_tmpa_clist { #1 }
\clist_map_inline:Nn \l_tmpa_clist
{
- \gtr@keys@addvalue{/gtr/sopt/##1}{#2}
+ \gtr@keys@addvalue{/gtr/sopt/##1}{subtree={#2}}
}
}
@@ -147,7 +147,11 @@
\NewDocumentCommand{\gtrignoresubtree}{ m }
{
- \getree_set_options_for_subtree:nn{#1}{ignore}
+ \clist_set:Nn \l_tmpa_clist { #1 }
+ \clist_map_inline:Nn \l_tmpa_clist
+ {
+ \gtr@keys@addvalue{/gtr/sopt/##1}{ignore}
+ }
}
@@ -162,8 +166,8 @@
options~for~family/.code~n~args={2}{\getree_set_options_for_family:nn{#1}{#2}},
options~for~node/.code~n~args={2}{\getree_set_options_for_node:nn{#1}{#2}},
%
- ignore~subtree/.code={\getree_set_options_for_subtree:nn{#1}{ignore}},
- ignore~node/.code={\getree_set_options_for_node:nn{#1}{ignore}},
+ ignore~subtree/.code={\gtrignoresubtree{#1}},
+ ignore~node/.code={\gtrignorenode{#1}},
}
\ExplSyntaxOff
diff --git a/macros/latex/contrib/genealogytree/gtrcore.parser.code.tex b/macros/latex/contrib/genealogytree/gtrcore.parser.code.tex
index 6b11207edd..239a0afa05 100644
--- a/macros/latex/contrib/genealogytree/gtrcore.parser.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrcore.parser.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
+%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20)
%% gtrcore.parser.code.tex: Parser
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2013-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\gtr@set@library@version{2.01}
+\gtr@set@library@version{2.1.0}
%% (local) stack implementation
\def\gtrnewstack#1{%
diff --git a/macros/latex/contrib/genealogytree/gtrcore.processing.code.tex b/macros/latex/contrib/genealogytree/gtrcore.processing.code.tex
index 2720096a29..dcc54415c2 100644
--- a/macros/latex/contrib/genealogytree/gtrcore.processing.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrcore.processing.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
+%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20)
%% gtrcore.processing.code.tex: Processing
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2013-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\gtr@set@library@version{2.01}
+\gtr@set@library@version{2.1.0}
%%%%%%%%%%%%%%%%%%%%%%%
%% Processing - common
%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/macros/latex/contrib/genealogytree/gtrcore.symbols.code.tex b/macros/latex/contrib/genealogytree/gtrcore.symbols.code.tex
index 783a75ca05..f95179043f 100644
--- a/macros/latex/contrib/genealogytree/gtrcore.symbols.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrcore.symbols.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
+%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20)
%% gtrcore.symbols.code.tex: Symbols
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2013-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\gtr@set@library@version{2.01}
+\gtr@set@library@version{2.1.0}
%%%%%%%%%%%%%%%%%%%%%%%
%% Symbols
diff --git a/macros/latex/contrib/genealogytree/gtrlang.danish.code.tex b/macros/latex/contrib/genealogytree/gtrlang.danish.code.tex
index 9596726bbe..bb03fc5b40 100644
--- a/macros/latex/contrib/genealogytree/gtrlang.danish.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrlang.danish.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
+%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20)
%% gtrlang.danish.code.tex: Danish language
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2013-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% Translation by Mikkel Eide Eriksen <mikkel dot eriksen at gmail dot com>
%% -------------------------------------------------------------------------------------------
%%
@@ -18,7 +18,7 @@
%%
%% This work consists of all files listed in README
%%
-\gtr@set@library@version{2.01}
+\gtr@set@library@version{2.1.0}
\gtrset{language@/danish/.code={%
\gtrset{symlang/.cd,
diff --git a/macros/latex/contrib/genealogytree/gtrlang.dutch.code.tex b/macros/latex/contrib/genealogytree/gtrlang.dutch.code.tex
index 7b068271da..0410fa7819 100644
--- a/macros/latex/contrib/genealogytree/gtrlang.dutch.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrlang.dutch.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
+%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20)
%% gtrlang.dutch.code.tex: Dutch language
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2013-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% Translation by Dirk Bosmans <onstrees at myonline be>
%% -------------------------------------------------------------------------------------------
%%
@@ -18,7 +18,7 @@
%%
%% This work consists of all files listed in README
%%
-\gtr@set@library@version{2.01}
+\gtr@set@library@version{2.1.0}
\gtrset{language@/dutch/.code={%
\gtrset{symlang/.cd,
diff --git a/macros/latex/contrib/genealogytree/gtrlang.english.code.tex b/macros/latex/contrib/genealogytree/gtrlang.english.code.tex
index ba77f95949..a208c468bc 100644
--- a/macros/latex/contrib/genealogytree/gtrlang.english.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrlang.english.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
+%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20)
%% gtrlang.english.code.tex: English language
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2013-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\gtr@set@library@version{2.01}
+\gtr@set@library@version{2.1.0}
\gtrset{language@/english/.code={%
\gtrset{symlang/.cd,
diff --git a/macros/latex/contrib/genealogytree/gtrlang.french.code.tex b/macros/latex/contrib/genealogytree/gtrlang.french.code.tex
index cfe2af2b63..011443f392 100644
--- a/macros/latex/contrib/genealogytree/gtrlang.french.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrlang.french.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
+%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20)
%% gtrlang.french.code.tex: French language
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2013-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% Translation by Denis Bitouze <denis dot bitouze at univ-littoral fr>
%% -------------------------------------------------------------------------------------------
%%
@@ -18,7 +18,7 @@
%%
%% This work consists of all files listed in README
%%
-\gtr@set@library@version{2.01}
+\gtr@set@library@version{2.1.0}
\gtrset{language@/french/.code={%
\gtrset{symlang/.cd,
diff --git a/macros/latex/contrib/genealogytree/gtrlang.german.code.tex b/macros/latex/contrib/genealogytree/gtrlang.german.code.tex
index e084601e0c..0e52d7c7dc 100644
--- a/macros/latex/contrib/genealogytree/gtrlang.german.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrlang.german.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
+%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20)
%% gtrlang.german.code.tex: German language
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2013-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\gtr@set@library@version{2.01}
+\gtr@set@library@version{2.1.0}
\gtrset{language@/german/.code={%
\gtrset{symlang/.cd,
diff --git a/macros/latex/contrib/genealogytree/gtrlang.italian.code.tex b/macros/latex/contrib/genealogytree/gtrlang.italian.code.tex
index bc99cced20..8368cfcd37 100644
--- a/macros/latex/contrib/genealogytree/gtrlang.italian.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrlang.italian.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
+%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20)
%% gtrlang.italian.code.tex: Italian language
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2013-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% Translation by Andrea Vaccari <ing dot andrea dot vaccari at gmail com>
%% -------------------------------------------------------------------------------------------
%%
@@ -18,7 +18,7 @@
%%
%% This work consists of all files listed in README
%%
-\gtr@set@library@version{2.01}
+\gtr@set@library@version{2.1.0}
\gtrset{language@/italian/.code={%
\gtrset{symlang/.cd,
diff --git a/macros/latex/contrib/genealogytree/gtrlang.portuguese.code.tex b/macros/latex/contrib/genealogytree/gtrlang.portuguese.code.tex
new file mode 100644
index 0000000000..8bdb4640b3
--- /dev/null
+++ b/macros/latex/contrib/genealogytree/gtrlang.portuguese.code.tex
@@ -0,0 +1,87 @@
+%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20)
+%% gtrlang.portuguese.code.tex: Portuguese language
+%%
+%% -------------------------------------------------------------------------------------------
+%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Translation by Natan de Almeida Laverde <natanlaverde at gmail dot com>
+%% -------------------------------------------------------------------------------------------
+%%
+%% 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 `author-maintained'.
+%%
+%% This work consists of all files listed in README
+%%
+\gtr@set@library@version{2.1.0}
+
+\gtrset{language@/portuguese/.code={%
+ \gtrset{symlang/.cd,
+ Born=nascimento,
+ Bornoutofwedlock=nascimento fora do matrim\^onio,
+ Stillborn=natimorto,
+ Diedonbirthday=morreu ao nascer,
+ Baptized=batizado,
+ Engaged=compromisso,
+ Married=matrim\^onio,
+ Divorced=div\'orcio,
+ Partnership=parceiros n\~ao casados,
+ Floruit=floruit,
+ Died=falecimento,
+ Killed=morreu em a\c{c}\~ao,
+ Buried=sepultamento,
+ Funeralurn=cremado(a),
+ Female=mulher,
+ Male=homem,
+ Neuter=neutro
+ }%
+ \gtrset{%
+ month long/.cd,
+ 01/.initial=janeiro,
+ 02/.initial=fevereiro,
+ 03/.initial=mar\c{c}o,
+ 04/.initial=abril,
+ 05/.initial=maio,
+ 06/.initial=junho,
+ 07/.initial=julho,
+ 08/.initial=agosto,
+ 09/.initial=setembro,
+ 10/.initial=outubro,
+ 11/.initial=novembro,
+ 12/.initial=dezembro,
+ }%
+ \gtrset{%
+ month short/.cd,
+ 01/.initial=jan\protect\dot,
+ 02/.initial=fev\protect\dot,
+ 03/.initial=mar\protect\dot,
+ 04/.initial=abr\protect\dot,
+ 05/.initial=mai\protect\dot,
+ 06/.initial=jun\protect\dot,
+ 07/.initial=jul\protect\dot,
+ 08/.initial=ago\protect\dot,
+ 09/.initial=set\protect\dot,
+ 10/.initial=out\protect\dot,
+ 11/.initial=nov\protect\dot,
+ 12/.initial=dez\protect\dot,
+ }%
+ \gtrset{%
+ set@typical@date@format=dd/mm/yyyy,
+ calendar text for=AD is {}{ d.~C.},
+ calendar text for=BC is {}{ a.~C.},
+ calendar text for=GR is {}{\protect\textsuperscript{greg.}},
+ calendar text for=JU is {}{\protect\textsuperscript{jul.}},
+ calendar text for=caAD is {ca.~}{ d.~C.},
+ calendar text for=caBC is {ca.~}{ a.~C.},
+ calendar text for=ca is {ca.~}{},
+ date range full={}{ a }{},
+ date range before={antes de }{},
+ date range after={depois de }{},
+ place text={em }{},
+ }%
+}}
diff --git a/macros/latex/contrib/genealogytree/gtrlang.spanish.code.tex b/macros/latex/contrib/genealogytree/gtrlang.spanish.code.tex
index 81ffcee6f8..810aa3add4 100644
--- a/macros/latex/contrib/genealogytree/gtrlang.spanish.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrlang.spanish.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
+%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20)
%% gtrlang.spanish.code.tex: Spanish language
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2013-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% Translation by Francisco G. Perez Sanchez <ozo.froid at gmail dot com>
%% -------------------------------------------------------------------------------------------
%%
@@ -18,7 +18,7 @@
%%
%% This work consists of all files listed in README
%%
-\gtr@set@library@version{2.01}
+\gtr@set@library@version{2.1.0}
\gtrset{language@/spanish/.code={%
\gtrset{symlang/.cd,
diff --git a/macros/latex/contrib/genealogytree/gtrlang.swedish.code.tex b/macros/latex/contrib/genealogytree/gtrlang.swedish.code.tex
index 0b4f57c79e..708ffb79f1 100644
--- a/macros/latex/contrib/genealogytree/gtrlang.swedish.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrlang.swedish.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
+%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20)
%% gtrlang.swedish.code.tex: Swedish language
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2013-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% Translation by Per Starbaeck <per at starback.se>
%% -------------------------------------------------------------------------------------------
%%
@@ -18,7 +18,7 @@
%%
%% This work consists of all files listed in README
%%
-\gtr@set@library@version{2.01}
+\gtr@set@library@version{2.1.0}
\gtrset{language@/swedish/.code={%
\gtrset{symlang/.cd,
diff --git a/macros/latex/contrib/genealogytree/gtrlib.debug.code.tex b/macros/latex/contrib/genealogytree/gtrlib.debug.code.tex
index 2fd01928b0..5450d3f69b 100644
--- a/macros/latex/contrib/genealogytree/gtrlib.debug.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrlib.debug.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
+%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20)
%% gtrlib.debug.code.tex: Debugger
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2013-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\gtr@set@library@version{2.01}
+\gtr@set@library@version{2.1.0}
\RequirePackage{array,tabularx}
\tcbuselibrary{breakable}
diff --git a/macros/latex/contrib/genealogytree/gtrlib.fanchart.code.tex b/macros/latex/contrib/genealogytree/gtrlib.fanchart.code.tex
index e62e479bdc..d9e485bc02 100644
--- a/macros/latex/contrib/genealogytree/gtrlib.fanchart.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrlib.fanchart.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
+%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20)
%% gtrlib.fanchart.code.tex: Fancharts
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2013-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\gtr@set@library@version{2.01}
+\gtr@set@library@version{2.1.0}
\ExplSyntaxOn
diff --git a/macros/latex/contrib/genealogytree/gtrlib.templates.code.tex b/macros/latex/contrib/genealogytree/gtrlib.templates.code.tex
index d0d9564701..6460a178c7 100644
--- a/macros/latex/contrib/genealogytree/gtrlib.templates.code.tex
+++ b/macros/latex/contrib/genealogytree/gtrlib.templates.code.tex
@@ -1,8 +1,8 @@
-%% The LaTeX package genealogytree - version 2.01 (2020/07/28)
+%% The LaTeX package genealogytree - version 2.1.0 (2021/09/20)
%% gtrlib.templates.code.tex: Templates
%%
%% -------------------------------------------------------------------------------------------
-%% Copyright (c) 2013-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% Copyright (c) 2013-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\gtr@set@library@version{2.01}
+\gtr@set@library@version{2.1.0}
% Templates
diff --git a/macros/latex/contrib/lipsum/CHANGELOG.md b/macros/latex/contrib/lipsum/CHANGELOG.md
index 470e445784..a11ca10e43 100644
--- a/macros/latex/contrib/lipsum/CHANGELOG.md
+++ b/macros/latex/contrib/lipsum/CHANGELOG.md
@@ -5,6 +5,14 @@ documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project uses major+minor version identifiers.
+## [2.7]
+
+### Changed
+- Rework language loading mechanism (gh/10).
+
+### Fixed
+- Hyphenation pattern setting with `polyglossia` (gh/10).
+
## [v2.6]
### Changed
diff --git a/macros/latex/contrib/lipsum/README.md b/macros/latex/contrib/lipsum/README.md
new file mode 100644
index 0000000000..6f527351b1
--- /dev/null
+++ b/macros/latex/contrib/lipsum/README.md
@@ -0,0 +1,26 @@
+# lipsum
+
+150 paragraphs of Lorem ipsum dummy text for LaTeX.
+
+## Install
+
+In most cases it is not requried to install this package manually, it is
+included in the major tex-distributions. If, for some reason, you want install
+it manually, run lipsum.ins through (pdf)latex to generate the style file. To
+generate the documentation, run lispum.dtx through a latex program that
+understands utf8 input (XeLaTeX or lualatex).
+
+## Usage
+
+See the documentation.
+
+## Quick'n'dirty
+
+```latex
+\documentclass{article}
+\usepackage{lipsum}
+
+\begin{document}
+\lipsum
+\end {document}
+```
diff --git a/macros/latex/contrib/lipsum/lipsum.dtx b/macros/latex/contrib/lipsum/lipsum.dtx
index 944dac139f..fb81e62771 100644
--- a/macros/latex/contrib/lipsum/lipsum.dtx
+++ b/macros/latex/contrib/lipsum/lipsum.dtx
@@ -15,8 +15,8 @@
% Please send error reports and suggestions for improvements to
% https://github.com/PhelypeOleinik/lipsum
%
-\def\lipsumversion{2.5}
-\def\lipsumdate{2021-08-01}
+\def\lipsumversion{2.7}
+\def\lipsumdate{2021-09-20}
%<*driver>
\ProvidesFile{lipsum.dtx}%
[\lipsumdate\space v\lipsumversion\space
@@ -84,6 +84,9 @@
\emergencystretch 2em
\newcommand\secref[1]{(see section~\ref{#1})}
\usepackage{hyperref}
+\def\ghissue#1{%
+ \texttt{\##1}\footnote{%
+ \url{https://github.com/PhelypeOleinik/lipsum/issues/#1}}}
\begin{document}
\DocInput{lipsum.dtx}
\end{document}
@@ -467,12 +470,6 @@
% disable automatic language switching with
% |\setlipsum{auto-lang=false}|.
%
-% \pkg{lipsum} relies on \pkg{babel}'s \cs{hyphenrules} command to
-% change the hyphenation patterns, thus it requires \pkg{babel} to be
-% loaded in the document if |auto-lang=true|. If \pkg{babel} is not
-% loaded, a warning is printed and the default language is used for
-% hyphenation instead.
-%
% The language is defined individually for each dummy text
% \secref{sec:other-texts}, but you may change it for the current dummy
% text by using |\setlipsum{language=|\meta{lang}|}|. If you load
@@ -1258,12 +1255,11 @@
%
% \begin{macro}{\@@_set_hyphens:,\@@_restore_hyphens:}
% Selects the hyphenation patterns for the language of the dummy text,
-% using \pkg{babel}'s \cs{hyphenrules} if that's defined.
-% If \cs{hyphenrules} doesn't exist (thus \pkg{babel} not loaded),
-% call \cs{@@_set_hyphens_babel_missing:} which will behave in a
-% slightly different way if encountered in the preamble or in the
-% document body. The hyphenation patterns are properly restored by
-% \cs{@@_restore_hypehens:} when the text ends.
+% using \cs{hyphenrules} if that's defined. If \cs{hyphenrules}
+% doesn't exist try setting hyphenation with \cs{@@_set_hyphens_raw:}.
+% Each \cs[no-index]{@@_set_hyphens_\meta{method}:} function
+% appropriately redefines \cs{@@_restore_hypehens:} to reset the
+% hyphenation patterns.
% \begin{macrocode}
\cs_new_protected:Npn \@@_set_hyphens:
{
@@ -1272,15 +1268,11 @@
{
\cs_if_exist:NTF \hyphenrules
{
- \cs_if_exist:cTF { l@ \g_@@_language_tl }
- {
- \exp_args:NV \hyphenrules \g_@@_language_tl
- \cs_set_protected:Npx \@@_restore_hyphens:
- { \exp_not:N \hyphenrules { \languagename } }
- }
- { \@@_missing_language_warning: }
+ \cs_if_exist:cTF { ver@polyglossia.sty }
+ { \@@_set_hyphens_polyglossia: }
+ { \@@_set_hyphens_babel: }
}
- { \@@_set_hyphens_babel_missing: }
+ { \@@_set_hyphens_raw: }
}
}
\cs_new_protected:Npn \@@_restore_hyphens:
@@ -1288,43 +1280,86 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\@@_set_hyphens_babel_missing:}
-% In the document preamble this emits a warning telling the user that
-% the proper hyphenations can't be used because \pkg{babel} isn't
-% loaded, then shut up for the rest of the preamble. In the document
-% body however, this is more serious, so we give a final warning and
-% deactivate automatic hyphenation setting.
+% \begin{macro}{\@@_set_hyphens_babel:}
+% \pkg{babel} makes things pretty simple. We just check if
+% \cs[no-index]{l@\meta{lang}} is defined, and if so, use
+% \cs{hyphenrules} to set it, and once more to reset in
+% \cs{@@_restore_hyphens:}. \cs{hyphenrules} is actually an
+% environment, but in \pkg{babel} its \cs[no-index]{end} part does
+% nothing, and its effect can be undone by just using another
+% \cs{hyphenrules} on top of it.
+%
+% If the language is not defined, the language either doesn't exist at
+% all, or we are using Lua\TeX. Both cases are handled by
+% \cs{@@_lang_not_available:}.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_set_hyphens_babel_missing:
+\cs_new_protected:Npn \@@_set_hyphens_babel:
{
- \msg_warning:nnn { lipsum } { missing-babel } { preamble }
- \cs_gset_eq:NN \@@_set_hyphens_babel_missing: \prg_do_nothing:
+ \cs_if_exist:cTF { l@ \g_@@_language_tl }
+ {
+ \exp_args:NV \hyphenrules \g_@@_language_tl
+ \cs_set_protected:Npx \@@_restore_hyphens:
+ { \exp_not:N \hyphenrules { \languagename } }
+ }
+ { \@@_lang_not_available: }
}
-\AtBeginDocument
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_set_hyphens_polyglossia:}
+% \pkg{polyglossia} less friendly. We also check if the language is
+% loaded (looking at \cs[no-index]{\meta{lang}@loaded}), and if it
+% is, load it with the \env{hyphenrules} environment. Here we can't
+% use the command form, as the \cs[no-index]{end} part is not a no-op.
+% This also means that an extra group is added around the dummy text,
+% which causes issue \ghissue{1} when used with \pkg{wrapfig}, for
+% example. But not too much we can do about that for now.
+%
+% In case the language is not loaded, fall back to
+% \cs{@@_set_hyphens_raw:} for a final attempt before giving up.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_set_hyphens_polyglossia:
{
- \cs_gset_protected:Npx \@@_set_hyphens_babel_missing:
+ \cs_if_exist:cTF { \g_@@_language_tl @loaded }
{
- \@ifpackageloaded { babel }
- { \msg_error:nnn { lipsum } { missing-babel } { impossible } }
- { \msg_warning:nnn { lipsum } { missing-babel } { document } }
- \setlipsum { auto-lang = false }
+ \exp_args:NnV \begin{hyphenrules} \g_@@_language_tl
+ \cs_set_protected:Npn \@@_restore_hyphens:
+ { \end{hyphenrules} }
}
+ { \@@_set_hyphens_raw: }
}
-\cs_if_exist:NT \DeclareHookRule
- { \DeclareHookRule { begindocument } { lipsum } { after } { babel } }
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\@@_missing_language_warning:}
-% Warn the user about an unknown/missing language. Most of the time
-% the issue is a minimal installation that doesn't have Latin, but
-% sometimes it may be a typo. Regardless of the case, warn the user
-% then change the language to \cs{languagename} so the warning appears
-% only once, at least until it is changed again.
+% \begin{macro}{\@@_set_hyphens_raw:}
+% If nothing else is available, try setting the language using
+% \cs{language}\meta{number}. This is always available,
+% except with Lua\TeX, which loads languages on-the-fly.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_missing_language_warning:
+\cs_new_protected:Npn \@@_set_hyphens_raw:
{
- \msg_warning:nn { lipsum } { missing-language }
+ \cs_if_exist:cTF { l@ \g_@@_language_tl }
+ {
+ \use:x
+ {
+ \language \use:c { l@ \g_@@_language_tl }
+ \cs_set_protected:Npn \@@_restore_hyphens:
+ { \language \int_eval:n { \language } \scan_stop: }
+ }
+ }
+ { \@@_lang_not_available: }
+ }
+% \end{macrocode}
+% \end{macro}
+%
+% \begin{macro}{\@@_lang_not_available:}
+% If the requested language is for some reason unavailable, warn the
+% user, then fall back to the current language.
+% \begin{macrocode}
+\cs_new_protected:Npn \@@_lang_not_available:
+ {
+ \msg_warning:nnx { lipsum } { missing-language }
+ { \g_@@_language_tl }
\tl_gset_eq:NN \g_@@_language_tl \languagename
}
% \end{macrocode}
@@ -1523,32 +1558,24 @@
Command~'\iow_char:N\\#1'~deprecated. \\
See~the~lipsum~documentation~for~help.
}
-\msg_new:nnn { lipsum } { missing-babel }
+\msg_new:nnn { lipsum } { missing-language }
{
- Hyphenation~patterns~for~'\g_@@_language_tl'~
- cannot~be~used~because~babel~is~not~loaded.~
- \str_case:nn {#1}
+ Unknown~language~'#1'.~Hyphenation~patterns~for~
+ '\languagename'~will~be~used~instead.
+ \sys_if_engine_luatex:T
{
- { preamble }
- { Loading~lipsum~after~babel~should~fix~the~issue. }
- { document }
+ \\ \\
+ \cs_if_exist:cTF { ver@polyglossia.sty }
{
- The~default~document~language~will~be~used~
- for~hyphenation~instead.
+ With~polyglossia,~you~have~to~explicitly~load~languages~
+ with~\iow_char:N\\setotherlanguage{#1}~or~similar.
}
- { impossible }
{
- Something~wrong~happened~and~the~command~
- \iow_char:N\\hyphenrules~is~not~available. \\ \\
- Please~report!
+ With~LuaTeX,~lipsum~requires~babel~to~get~proper~
+ hyphenation~(you~can~use~
+ \iow_char:N\\usepackage[base]{babel}).
}
}
- \\ \\ This~message~won't~be~shown~again.
- }
-\msg_new:nnn { lipsum } { missing-language }
- {
- Unknown~language~'\g_@@_language_tl'.~
- Hyphenation~patterns~for~'\languagename'~will~be~used~instead.
}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/lipsum/lipsum.ins b/macros/latex/contrib/lipsum/lipsum.ins
index e22af4b0c8..8a43f332fb 100644
--- a/macros/latex/contrib/lipsum/lipsum.ins
+++ b/macros/latex/contrib/lipsum/lipsum.ins
@@ -85,7 +85,7 @@ Please send error reports and suggestions for improvements to
\else
\inpartrue
\advance\parno by 1
- \wline{\string\NewLipsumPar\lb\pc~{\the\parno}}%
+ \wline{\string\NewLipsumPar\lb\pc\~{\the\parno}}%
\fi
\fi
\ifeof\lipsread\expandafter\genlipsumend\fi
diff --git a/macros/latex/contrib/lipsum/lipsum.pdf b/macros/latex/contrib/lipsum/lipsum.pdf
index a9a5d52217..1c8919dd72 100644
--- a/macros/latex/contrib/lipsum/lipsum.pdf
+++ b/macros/latex/contrib/lipsum/lipsum.pdf
Binary files differ
diff --git a/macros/latex/contrib/spacingtricks/spacingtricks.dtx b/macros/latex/contrib/spacingtricks/spacingtricks.dtx
index 3c22a98a8a..d9ff9bc46d 100644
--- a/macros/latex/contrib/spacingtricks/spacingtricks.dtx
+++ b/macros/latex/contrib/spacingtricks/spacingtricks.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2019-2020 by Antoine Missier <antoine.missier@ac-toulouse.fr>
+% Copyright (C) 2019-2021 by Antoine Missier <antoine.missier@ac-toulouse.fr>
%
% This file may be distributed and/or modified under the conditions of
% the LaTeX Project Public License, either version 1.3 of this license
@@ -19,8 +19,8 @@
%</driver>
%<*package>
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{spacingtricks}
- [2020/11/02 v1.3 .dtx spacingtricks file]
+\ProvidesPackage{spacingtricks}
+ [2021/09/20 v1.4 .dtx spacingtricks file]
%</package>
%<*driver>
\documentclass{ltxdoc}
@@ -32,24 +32,24 @@
\usepackage{pifont}
\usepackage{amsmath}
\usepackage{pstricks-add}
-\DisableCrossrefs
+\DisableCrossrefs
%\CodelineIndex
%\RecordChanges
\usepackage{hyperref}
\hypersetup{%
- colorlinks,
+ colorlinks,
linkcolor=blue,
citecolor=blue,
- pdftitle={spacingtricks},
- pdfsubject={LaTeX package},
+ pdftitle={spacingtricks},
+ pdfsubject={LaTeX package},
pdfauthor={Antoine Missier}
}
\begin{document}
- \DeleteShortVerb{\|}
- \MakeShortVerb{\"}
- \DocInput{spacingtricks.dtx}
- %\PrintChanges
- %\PrintIndex
+\DeleteShortVerb{\|}
+\MakeShortVerb{\"}
+\DocInput{spacingtricks.dtx}
+%\PrintChanges
+%\PrintIndex
\end{document}
%</driver>
% \fi
@@ -81,13 +81,14 @@
% \changes{v1.2}{2019/09/09}{A bug correction in the last update}
% \changes{v1.3}{2020/11/02}{Loading the setspace package,
% small changes in compactlist environment, improvement in dualboxes macro}
+% \changes{v1.4}{2021/09/21}{A mistake in the documentation is now corrected}
%
% \GetFileInfo{spacingtricks.sty}
%
% \title{The \texttt{spacingtricks} package\thanks{This document
% corresponds to \textsf{spacingtricks}~\fileversion, dated \filedate.}}
% \author{Antoine Missier \\ \texttt{antoine.missier@ac-toulouse.fr}}
-% \date{November 02, 2020}
+% \date{September 20, 2021}
% \maketitle
%
% \section{Introduction}
@@ -95,7 +96,7 @@
% This package offers some macros to deal with spacing issues. Thus:
% \begin{compactlist}
% \item "\centered" yields good horizontal centering without vertical spacing;
-% \item "\footnote" has been redefined to avoid unsuitable spacings;
+% \item "\footnote" has been redefined to avoid unsuitable spacing;
% \item "\vstrut" produces a strut with variable height or depth;
% \item "\indent" has been redefined to indent a line at the beginning
% of a particular paragraph even if "\parindent" has been set to 0;
@@ -105,7 +106,7 @@
% several aliases are provided to type some list symbols shorter:
% "\bul", "\dash", "\ddash", "\aster", "\hand", "\checksymb", "\arrowsymb";
% \item the macros "\ie" and "\eg" attends to typeset common abbreviations
-% \ie and \eg with correct spacings;
+% \ie and \eg with correct spacing;
% \item the "\dualboxes" command attends to place two boxes
% (figures, tables, text) side by side by adjusting the vertical positioning.
% \end{compactlist}
@@ -115,12 +116,13 @@
% \textsf{setspace} (natively in \LaTeXe),
% for setting line spacing in a piece of text
% (with the \texttt{spacing} environment), and
-% \textsf{xspace}~\cite{XSP}, which adds an interword space unless the macro
+% \textsf{xspace}~\cite{XSP}, which adds an inter-word space unless the macro
% is followed by a punctuation character.
%
% Otherwise, we provide the package \textsf{arraycols}~\cite{ARCOL},
-% wich allows a good management of spacings in \texttt{tabular} and \texttt{array} environments,
-% and \textsf{mismath}~\cite{MSMATH} of which several macros tends to improve spacings
+% which allows a good management of spacing in \texttt{tabular}
+% and \texttt{array} environments,
+% and \textsf{mismath}~\cite{MSMATH} of which several macros tends to improve spacing
% in mathematical formulas.
%
% \section{Usage}
@@ -216,11 +218,11 @@
%
% \medskip
% \DescribeMacro{\footnotespace} \DescribeMacro{\footenoteindent}
-% Like the old one, the new "\footnote" command can take an opional argument
+% Like the old one, the new "\footnote" command can take an optional argument
% to force the number of the note.
% Likewise, we have always the customization macros
% "\footnotesize", "\footnotesep", "\footnoterule",
-% but two new macros have been added to manage spacings:
+% but two new macros have been added to manage spacing:
% "\footnotespace" produces the space before the note call symbol
% and "\footnoteindent" produces the space at the beginning of the footnote text.
% For instance, with "\renewcommand{\footnotespace}{\,}"
@@ -373,7 +375,7 @@
% \DescribeMacro{\checksymb}\DescribeMacro{\arrowsymb}
% The following example is obtained with "\begin{compactlist}[\checksymb]":
% \begin{compactlist}[\checksymb]
-% \item Fisrt item.
+% \item First item.
% \item Second item.
% \item Third item.
% \end{compactlist}
@@ -392,7 +394,7 @@
% \medskip
% \DescribeMacro{\ie} \DescribeMacro{\eg}
% In English, at the end of a sentence, the point is followed by an em space
-% which is larger than an interword space.
+% which is larger than an inter-word space.
% We provide the "\ie" (\textit{id est}) and "\eg" (\textit{exempli gratia}) macros,
% suggested in The \LaTeX\ Companion \cite{COMP},
% to get correct spacing after these abbreviations \eg here.
@@ -433,11 +435,11 @@
% }
%
% \noindent
-% The horizontal space is equally shared between left margin, interbox space and right margin.
+% The horizontal space is equally shared between left margin, inter-box space and right margin.
%
% \medskip
% In the following example the right box has been shifted back
-% to make an overlaping with the left one, what \textsf{picins} cannot do.
+% to make an overlapping with the left one, what \textsf{picins} cannot do.
%
%\dualboxes{\footnotesize
% $\begin{array}{|*{7}{c|}} \hline
@@ -452,7 +454,7 @@
% \end{pspicture}
%}
% \begin{verbatim}
-% \dualboxes*{\footnotesize
+% \dualboxes{\footnotesize
% $\begin{array}{|*{7}{c|}} \hline
% x & -2 & -1 & 0 & 1 & 2 & 3 \\ \hline
% f(x) & -0.96 & -0.71 & 0 & 0.59 & 0.38 & 0.18 \\ \hline
@@ -498,8 +500,8 @@
\RequirePackage{setspace}
\RequirePackage{xspace}
-\newcommand*{\centered}[1]{{\setlength{\parskip}{0pt}\par\noindent\hfill
- #1\hfill\mbox{}}}
+\newcommand*{\centered}[1]{{\setlength{\parskip}{0pt}\par\noindent\hfill
+ #1\hfill\mbox{}}}
% \end{macrocode}
% The double braces are necessary here to ensure that the "\parskip" modification applies
% locally within the command and not globally to the rest of the document.
@@ -534,29 +536,29 @@
\newenvironment*{indentblock}[1][\parindentlength]{
\begin{list}{}{%
- \setlength{\leftmargin}{#1}
- \setlength{\itemsep}{0pt}
- \setlength{\topsep}{1ex}
- \setlength{\partopsep}{0pt}
+ \setlength{\leftmargin}{#1}
+ \setlength{\itemsep}{0pt}
+ \setlength{\topsep}{1ex}
+ \setlength{\partopsep}{0pt}
}
- \item[]
- }{\end{list}}
+ \item[]
+ }{\end{list}}
\newlength{\compactlistindent}
\setlength{\compactlistindent}{0.5em}
\newenvironment*{compactlist}[1][\textbullet]{
\par % sometimes necessary
\begin{list}{#1\unskip}{% \unskip suppresses the space created by \xspace
- \setlength{\itemsep}{0pt}
- \setlength{\parsep}{0pt}
- \setlength{\topsep}{0ex}
- \setlength{\partopsep}{0pt}
- \setlength{\labelwidth}{1em}
- \setlength{\leftmargin}{\labelwidth}
- \addtolength{\leftmargin}{\labelsep}
- \addtolength{\leftmargin}{\compactlistindent}
+ \setlength{\itemsep}{0pt}
+ \setlength{\parsep}{0pt}
+ \setlength{\topsep}{0ex}
+ \setlength{\partopsep}{0pt}
+ \setlength{\labelwidth}{1em}
+ \setlength{\leftmargin}{\labelwidth}
+ \addtolength{\leftmargin}{\labelsep}
+ \addtolength{\leftmargin}{\compactlistindent}
}
- }{\end{list}}
+ }{\end{list}}
\providecommand{\bul}{\textbullet}
\providecommand{\dash}{\textendash}
@@ -571,19 +573,19 @@
\providecommand{\checksymb}{\ding{51}\xspace}
\providecommand{\arrowsymb}{\ding{226}\xspace}
-\providecommand{\ie}{i.e.\@\xspace}
+\providecommand{\ie}{i.e.\@\xspace}
\providecommand{\eg}{e.g.\@\xspace}
\newcommand{\@@dualboxes}[3][1]{
\par\noindent
\raisebox{\depth-#1\totalheight}{#2} \hfill
\raisebox{\depth-#1\totalheight}{#3} \smallskip
- }
+}
\newcommand{\@dualboxes}[3][1]{
\par\noindent \hfill
\raisebox{\depth-#1\totalheight}{#2} \hfill
\raisebox{\depth-#1\totalheight}{#3} \hfill\mbox{}\smallskip
- }
+}
\newcommand{\dualboxes}{\@ifstar{\@@dualboxes}{\@dualboxes}}
% \end{macrocode}
%
@@ -597,9 +599,9 @@
% \bibitem{CELLSP} \emph{The \textsf{cellspace} package}, Josselin Noirel, CTAN, v1.8 2019/03/11.
% \bibitem{ENUM} \emph{Customizing lists with the \textsf{enumitem} package}, Javier Bezos,
% CTAN, v3.9 2019/06/20.
-% \bibitem{ARCOL} \emph{The \textsf{arraycols} package}, Antoine Missier, CTAN, v1.0 2019/06/26.
+% \bibitem{ARCOL} \emph{The \textsf{arraycols} package}, Antoine Missier, CTAN, v1.2 2021/09/20.
% \bibitem{MSMATH} \emph{\textsf{mismath} -- Miscellaneous mathematical macros}, Antoine Missier,
-% CTAN, v1.6 2019/09/06.
+% CTAN, v1.8 2020/11/15.
% \bibitem{PICINS} \emph{Bilder in \LaTeX -Dokumenten -- PicIns-Benutzerhandbuch},
% Joachim Bleser, Edmund Lang, CTAN, v3.0 sept. 1992.
% \bibitem{COMP} \emph{The \LaTeX\ Companion}. Frank Mittelbach, Michel Goossens,
diff --git a/macros/latex/contrib/spacingtricks/spacingtricks.ins b/macros/latex/contrib/spacingtricks/spacingtricks.ins
index 28f889e0f1..fb950279c3 100644
--- a/macros/latex/contrib/spacingtricks/spacingtricks.ins
+++ b/macros/latex/contrib/spacingtricks/spacingtricks.ins
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2019-2020 by Antoine Missier <antoine.missier@ac-toulouse.fr>
+%% Copyright (C) 2019-2021 by Antoine Missier <antoine.missier@ac-toulouse.fr>
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3 of this license
@@ -15,13 +15,13 @@
\input docstrip.tex
\keepsilent
-\usedir{tex/latex/mismac}
+\usedir{tex/latex/spacingtricks}
\preamble
This is a generated file.
-Copyright (C) 2019-2020 by Antoine Missier <antoine.missier@ac-toulouse.fr>
+Copyright (C) 2019-2021 by Antoine Missier <antoine.missier@ac-toulouse.fr>
This file may be distributed and/or modified under the conditions of
the LaTeX Project Public License, either version 1.3 of this license
diff --git a/macros/latex/contrib/spacingtricks/spacingtricks.pdf b/macros/latex/contrib/spacingtricks/spacingtricks.pdf
index 58d3a0602a..a7ab69f54e 100644
--- a/macros/latex/contrib/spacingtricks/spacingtricks.pdf
+++ b/macros/latex/contrib/spacingtricks/spacingtricks.pdf
Binary files differ