summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-04-26 21:26:00 +0000
committerKarl Berry <karl@freefriends.org>2024-04-26 21:26:00 +0000
commite05223a39d1747bc8d39427c21b583dfd68e27f6 (patch)
treea317d045597954729a40381a0bf5169cda8c4d36 /Master
parent4b9462e5aa4f7c30bf378a042229c10706c9476e (diff)
jigsaw (26apr24)
git-svn-id: svn://tug.org/texlive/trunk@71084 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/jigsaw/DEPENDS.txt3
-rw-r--r--Master/texmf-dist/doc/latex/jigsaw/README.md29
-rw-r--r--Master/texmf-dist/doc/latex/jigsaw/jigsaw-doc.pdfbin183243 -> 149829 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jigsaw/jigsaw-doc.tex195
-rw-r--r--Master/texmf-dist/tex/latex/jigsaw/jigsaw-doc-settings.sty196
-rw-r--r--Master/texmf-dist/tex/latex/jigsaw/jigsaw.sty2
-rw-r--r--Master/tlpkg/tlpsrc/epstopdf-pkg.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/jigsaw.tlpsrc3
8 files changed, 306 insertions, 123 deletions
diff --git a/Master/texmf-dist/doc/latex/jigsaw/DEPENDS.txt b/Master/texmf-dist/doc/latex/jigsaw/DEPENDS.txt
new file mode 100644
index 00000000000..4a5b9136d90
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/jigsaw/DEPENDS.txt
@@ -0,0 +1,3 @@
+hard pgf
+hard iftex
+hard epstopdf-pkg
diff --git a/Master/texmf-dist/doc/latex/jigsaw/README.md b/Master/texmf-dist/doc/latex/jigsaw/README.md
index 85fd24c58ac..9ec853f080f 100644
--- a/Master/texmf-dist/doc/latex/jigsaw/README.md
+++ b/Master/texmf-dist/doc/latex/jigsaw/README.md
@@ -1,9 +1,32 @@
+![](https://raw.githubusercontent.com/samcarter/jigsaw/main/ICON.png)
+
+
# Jigsaw
+[![GitHub](https://img.shields.io/github/license/samcarter/jigsaw.svg?color=blue)](http://www.latex-project.org/lppl.txt)
+[![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/samcarter/jigsaw.svg?label=current%20version)](https://github.com/samcarter/jigsaw/releases/latest)
+[![CTAN](https://img.shields.io/ctan/v/jigsaw.svg)](https://ctan.org/pkg/jigsaw)
+
+
A small LaTeX package to draw jigsaw pieces with TikZ. It is possible to draw individual pieces and adjust their shape, produce tile patterns or to automatically generate complete jigsaws.
-Current version: 2023/02/21 version v0.4
+This project is licensed under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt .
+
+The project repository, including a bug tracker, can be found at https://github.com/samcarter/jigsaw .
+
+### Usage
+
+```latex
+\documentclass{standalone}
+\usepackage{jigsaw}
+
+\begin{document}
+
+\begin{tikzpicture}
+ \piece[color=teal]{1}{-1}{1}{-1}
+\end{tikzpicture}
-This project is licensed under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt
+\end{document}
+```
-The project repository, including a bug tracker, can be found at https://github.com/samcarter/jigsaw/issues
+For more details, please consult the [package documentation](https://github.com/samcarter/jigsaw/blob/main/DOCUMENTATION.pdf).
diff --git a/Master/texmf-dist/doc/latex/jigsaw/jigsaw-doc.pdf b/Master/texmf-dist/doc/latex/jigsaw/jigsaw-doc.pdf
index 774686398ad..cc286aa201b 100644
--- a/Master/texmf-dist/doc/latex/jigsaw/jigsaw-doc.pdf
+++ b/Master/texmf-dist/doc/latex/jigsaw/jigsaw-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jigsaw/jigsaw-doc.tex b/Master/texmf-dist/doc/latex/jigsaw/jigsaw-doc.tex
index 18ff47f514d..d52b2fb216f 100644
--- a/Master/texmf-dist/doc/latex/jigsaw/jigsaw-doc.tex
+++ b/Master/texmf-dist/doc/latex/jigsaw/jigsaw-doc.tex
@@ -11,91 +11,40 @@
% See http://www.latex-project.org/lppl.txt
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\documentclass[parskip=half]{scrartcl}
-
-% packages %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
-\usepackage[english]{babel}
-\usepackage[bitstream-charter]{mathdesign}
-%\usepackage{duckuments}
-\usepackage{jigsaw}
-\usetikzlibrary{matrix}
-\usepackage[most]{tcolorbox}
-\usepackage[paper=a4paper,margin=2.9cm]{geometry}
-\usepackage{url}
-\usepackage{xspace}
-\usepackage{scrlayer-scrpage}
-\usepackage[hang,flushmargin,bottom]{footmisc}
-\usepackage[colorlinks=true,breaklinks=true,urlcolor=duckblue,linkcolor=duckblue,citecolor=duckblue,filecolor=duckblue]{hyperref}
-
-% macros %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newcommand{\CTAN}{\textsc{CTAN}\xspace}
-\newcommand{\TikZ}{Ti\emph{k}Z\xspace}
-\newcommand{\miktex}{MiK\TeX\xspace}
-\newcommand{\texlive}{\TeX{}Live\xspace}
-
-% customisation %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\definecolor{duckblue}{RGB}{0,70,140}
-\definecolor{marmotred}{RGB}{140,20,40}
-\addtokomafont{sectioning}{\color{teal}}
-\addtokomafont{date}{\normalsize}
-\addtokomafont{author}{\normalsize}
-\setlength{\footnotemargin}{0.7em}
-
-% from https://tex.stackexchange.com/a/147848
-\def\beginlstdelim#1#2#3%
-{%
- \def\endlstdelim{#2\egroup}%
- \ttfamily#1\bgroup\color{#3}\aftergroup\endlstdelim%
-}
-
-\lstdefinestyle{jigsawstyle}{%
- language={[latex]TeX},
- tabsize=2,
- breaklines,
- basicstyle=\footnotesize\ttfamily,
- commentstyle={\color{teal}\slshape},
- columns=fullflexible,
- texcsstyle=*\color{duckblue}\bfseries,
- keywordstyle=\color{red!60!black}\bfseries,
- morekeywords={tikzpicture,scope},
- moretexcs={path,node,draw,clip,pic,includegraphics,color,piece,tile,jigsaw},
- delim ={[s][\ttfamily\color{green!50!black}]{$}{$}},
- moredelim=[is][\footnotesize\ttfamily\color{orange!70!black}]{|}{|},
- moredelim={[s][\color{gray}]{<}{>}},
-% moredelim = **[is][\beginlstdelim{\{}{\}}{orange!70!black}]{\{}{\}},
-% moredelim = **[is][\beginlstdelim{[}{]}{orange!70!black}]{[}{]},
-}
-
-\tcbset{%
- colframe=teal,
- arc=2mm,
- fonttitle=\bfseries,
- sidebyside,
- listing options={style=jigsawstyle},
- center lower,
- righthand width=5.7cm,
- bottom=0pt,
- top=0pt,
- sidebyside gap=10pt
-}
-
-\lstset{style=jigsawstyle}
+% !TeX program = txs:///arara
+% arara: latexmk: {
+% arara: --> engine: pdflatex,
+% arara: --> options: [
+% arara: --> '-shell-escape',
+% arara: --> '-synctex=1',
+% arara: --> '-interaction=nonstopmode',
+% arara: --> ]
+% arara: --> }
+\documentclass{scrartcl}
% meta %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\title{The jigsaw package}
\subtitle{Drawing jigsaw pieces in \TikZ}
\author{%
- \texorpdfstring{
- \begin{tikzpicture}
- \piece[lightgray!70!white]{1}{-1}{1}{-1}
- \end{tikzpicture}\\[0.8em]
- \texttt{samcarter}\\
- \url{https://github.com/samcarter/jigsaw}\\
- \url{https://www.ctan.org/pkg/jigsaw}
- }{samcarter}}
-\date{Version v0.4 \textendash{} 2023/02/21}
+ \texorpdfstring{
+ \begin{tikzpicture}
+ \piece[lightgray!70!white]{1}{-1}{1}{-1}
+ \end{tikzpicture}\\[0.8em]
+ \texttt{samcarter}\\
+ \url{https://github.com/samcarter/jigsaw}\\
+ \url{https://www.ctan.org/pkg/jigsaw}
+ }{samcarter}}
+\date{Version v0.5 \textendash{} 2024/04/25}
+
+\usepackage[
+ themecolor=samlgreen
+]{\jobname-settings}
+
+\colorlet{teal}{samlgreen}
+\colorlet{violet}{samviolet}
+
+\usepackage{jigsaw}
+\usetikzlibrary{matrix}
\begin{document}
\maketitle
@@ -114,20 +63,22 @@ Copyright \raisebox{0.2em}{\tiny\fontfamily{cmr}\selectfont\textcopyright} \text
An individual jigsaw piece can be drawn with
\begin{tcolorbox}[title={Jigsaw piece}]
-\begin{lstlisting}
+\begin{samcode}
\piece{<bottom>}{<right>}{<top>}{<left>}
-\end{lstlisting}
+\end{samcode}
\tcblower
\begin{tikzpicture}
- \piece{1}{-1}{1}{1}
+\piece{1}{-1}{1}{1}
\end{tikzpicture}
\end{tcolorbox}
-wherein arguments specify for each side if it should be a tab (-1), a straight line (0) or a slot (1). The following example will produce a jigsaw piece with one tab sticking out, one straight boarder and two slots:
+wherein arguments specify for each side if it should be a tab (-1), a straight line (0) or a slot (1).
+
+The following example will produce a jigsaw piece with one tab sticking out, one straight boarder and two slots:
\begin{tcblisting}{title={Jigsaw piece}}
\begin{tikzpicture}
- \piece{1}{-1}{0}{1}
+ \piece{1}{-1}{0}{1}
\end{tikzpicture}
\end{tcblisting}
@@ -135,7 +86,7 @@ With an optional argument, a fill colour can be passed to the piece:
\begin{tcblisting}{title={Filled piece}}
\begin{tikzpicture}
- \piece[teal]{-1}{1}{-1}{1}
+ \piece[teal]{-1}{1}{-1}{1}
\end{tikzpicture}
\end{tcblisting}
@@ -143,69 +94,73 @@ Or to change the line colour:
\begin{tcblisting}{title={Coloured piece}}
\begin{tikzpicture}
- \color{teal}\piece{-1}{-1}{1}{1}
+ \color{teal}\piece{-1}{-1}{1}{1}
\end{tikzpicture}
\end{tcblisting}
-The piece shape is also available as \TikZ \verb|pic|:
+The piece shape is also available as \TikZ \saminline|pic|:
\begin{tcblisting}{title={\texttt{pic}}}
\begin{tikzpicture}
- \path (2,-3) pic[
- fill=lightgray, draw=teal, ultra thick,
+ \path (2,-3) pic[
+ fill=lightgray, draw=teal, thick,
scale=2, pic text={Some Text},
pic text options={text=violet}
]{piece={1}{-1}{1}{0}};
\end{tikzpicture}
\end{tcblisting}
-Using the \TikZ \verb|pic| allows to apply various \TikZ option like \verb|scale| or add text in the centre of the piece via \verb|pic text={...}|.
+Using the \TikZ \saminline|pic| allows to apply various \TikZ option like \saminline|scale| or add text in the centre of the piece via \saminline|pic text={...}|.
The shapes of the jigsaw pieces are designed to seamlessly fit into each other which allows to produce tile patters in various ways:
\begin{tcblisting}{title={Manual tile pattern}}
\begin{tikzpicture}
\begin{scope}
- \piece[teal]{1}{1}{0}{0}
+ \piece[teal]{1}{1}{0}{0}
\end{scope}
\begin{scope}[xshift=1cm]
- \piece[lightgray]{1}{0}{0}{-1}
+ \piece[lightgray]{1}{0}{0}{-1}
\end{scope}
\begin{scope}[yshift=-1cm]
- \piece[lightgray]{0}{-1}{-1}{0}
+ \piece[lightgray]{0}{-1}{-1}{0}
\end{scope}
\begin{scope}[xshift=1cm,yshift=-1cm]
- \piece[teal]{0}{0}{-1}{1}
+ \piece[teal]{0}{0}{-1}{1}
\end{scope}
\end{tikzpicture}
\end{tcblisting}
\begin{tcblisting}{title={Manual pattern using \texttt{\textbackslash pic}}}
\begin{tikzpicture}
-\pic at (0,1) [fill=lightgray,draw]
- {piece={1}{1}{0}{0}};
-\pic at (1,1) [fill=teal]
- {piece={1}{0}{0}{-1}};
-\pic at (0,0) [fill=teal]
- {piece={0}{-1}{-1}{0}};
-\pic at (1,0) [fill=lightgray,draw]
- {piece={0}{0}{-1}{1}};
+ \pic at (0,1) [fill=lightgray,draw]
+ {piece={1}{1}{0}{0}};
+ \pic at (1,1) [fill=teal,draw]
+ {piece={1}{0}{0}{-1}};
+ \pic at (0,0) [fill=teal,draw]
+ {piece={0}{-1}{-1}{0}};
+ \pic at (1,0) [fill=lightgray,draw]
+ {piece={0}{0}{-1}{1}};
\end{tikzpicture}
\end{tcblisting}
\begin{tcblisting}{title={Manual pattern using Ti\emph{k}Z matrix}}
% \usetikzlibrary{matrix}
\begin{tikzpicture}
-\matrix [nodes=draw]{
-\pic [fill=lightgray]{piece={-1}{1}{0}{0}};&
-\pic [fill=teal]{piece={1}{0}{0}{-1}}; \\
-\pic [fill=teal]{piece={0}{-1}{1}{0}}; &
-\pic [fill=lightgray]{piece={0}{0}{-1}{1}};\\
-};
+ \matrix [nodes=draw]{
+ \pic [fill=lightgray]
+ {piece={-1}{1}{0}{0}}; &
+ \pic [fill=teal]
+ {piece={1}{0}{0}{-1}}; \\
+ \pic [fill=teal]
+ {piece={0}{-1}{1}{0}}; &
+ \pic [fill=lightgray]
+ {piece={0}{0}{-1}{1}};\\
+ };
\end{tikzpicture}
\end{tcblisting}
-Manually position each jigsaw piece at the correct position can be tedious, therefore the command \lstinline|\tile[<colour>]{<bottom>}{<right>}{<top>}{<left>}| was added. It can be used outside of of the \lstinline|tikzpicture| environment to place the pieces besides each other like normal letters in a text. Line breaks have to be added at the appropriate positions and one has to be careful not to introduce additional spaces between the jigsaw pieces from unprotected line endings.
+Manually position each jigsaw piece at the correct position can be tedious, therefore the command \saminline|\tile[<colour>]{<bottom>}{<right>}{<top>}{<left>}| was added. It can be used outside of of the \saminline|tikzpicture| environment to place the pieces besides each other like normal letters in a text. Line breaks have to be added at the appropriate positions and one has to be careful not to introduce additional spaces between the jigsaw pieces from unprotected line endings.
\begin{tcblisting}{title={The tile command}}
\tile[violet]{1}{1}{0}{0}%
@@ -221,23 +176,25 @@ Manually position each jigsaw piece at the correct position can be tedious, ther
\tile[violet]{0}{0}{1}{1}
\end{tcblisting}
-Finally there is also the possibility to automatically generate complete jigsaw puzzles using the command \lstinline|\jigsaw{<x>}{<y>}|, with \lstinline|<x>| and \lstinline|<y>| the number of rows and columns, respectively.
+Finally there is also the possibility to automatically generate complete jigsaw puzzles using the command \saminline|\jigsaw{<x>}{<y>}|, with \saminline|<x>| and \saminline|<y>| the number of rows and columns, respectively.
-\begin{tcblisting}{title={Automatic jigsaw generation}}
+\begin{tcblisting}{title={Automatic jigsaw generation},righthand width=6.1cm}
\begin{tikzpicture}
-\jigsaw{6}{4}
+ \jigsaw{6}{4}
\end{tikzpicture}
\end{tcblisting}
This automatically generated jigsaw can also be overlaid on a picture:
-\begin{tcblisting}{title={Overlaid image}}
+\begin{tcblisting}{title={Overlaid image},righthand width=6.1cm}
\begin{tikzpicture}
-\clip (0,0) rectangle (6,4);
-\node at (3,2) {%
- \includegraphics[width=6cm,height=4cm]{example-image-duck}%
-};
-\jigsaw{6}{4}
+ \clip (0,0) rectangle (6,4);
+ \node at (3,2) {%
+ \includegraphics[
+ width=6cm,height=4cm
+ ]{example-image-duck}%
+ };
+ \jigsaw{6}{4}
\end{tikzpicture}
\end{tcblisting}
diff --git a/Master/texmf-dist/tex/latex/jigsaw/jigsaw-doc-settings.sty b/Master/texmf-dist/tex/latex/jigsaw/jigsaw-doc-settings.sty
new file mode 100644
index 00000000000..13a1498c38e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jigsaw/jigsaw-doc-settings.sty
@@ -0,0 +1,196 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Personal helper theme for package documentations
+% Copyright samcarter
+%
+% This file may be distributed and/or modified
+% under the LaTeX Project Public License 1.3c or later
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% Usage:
+% ln ~/Life/latex/beamertheme-sam/themesam.sty package-doc-settings.sty
+% \usepackage[
+% themecolor=samdblue
+% ]{\jobname-settings}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Colours
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\RequirePackage{xcolor}
+\definecolor{samyellow}{RGB}{246,193,65}
+\definecolor{samorange}{RGB}{241,147,45}
+\definecolor{samred}{RGB}{191,26,46}% TikZbricks
+\definecolor{sammagenta}{RGB}{170,42,104}% TikZmarmots
+\definecolor{samviolet}{RGB}{136,46,114}% TikZlings
+\definecolor{samlila}{RGB}{101,67,159}% Rainbow beamer theme
+\definecolor{samdblue}{RGB}{0,51,134}% beamer theme
+\definecolor{samlblue}{RGB}{22,89,155}% TikZducks
+\definecolor{samteal}{RGB}{25,143,157}% Tcolorbox beamer theme
+\definecolor{samlgreen}{RGB}{68,170,153}% Jigsaw
+\definecolor{samdgreen}{RGB}{78,178,125}
+\definecolor{samlgray}{RGB}{160,160,185}
+\definecolor{samdgray}{RGB}{60,60,85}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Package options
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\RequirePackage{xkeyval}
+\DeclareOptionX{themecolor}[samdblue]{\colorlet{themecolor}{#1}}
+\DeclareOptionX{listingcolor}[samlblue]{\colorlet{listingcolor}{#1}}
+\ExecuteOptionsX{themecolor,listingcolor}
+\ProcessOptionsX
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Packages
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\@ifclassloaded{beamer}{}{%
+ \RequirePackage[english]{babel}
+ \RequirePackage[paper=a4paper,margin=2.9cm]{geometry}
+ \RequirePackage{scrlayer-scrpage}
+ \let\hrulefillx\hrulefill
+ \RequirePackage[bitstream-charter]{mathdesign}
+ \let\hrulefill\hrulefillx
+ \RequirePackage[hang,flushmargin,bottom]{footmisc}
+ \RequirePackage{footnotehyper}
+ \makesavenoteenv{tcolorbox}
+ \RequirePackage[all]{nowidow}
+ \RequirePackage[colorlinks=true,breaklinks=true,allcolors=themecolor,hyperfootnotes=false]{hyperref}
+}
+\RequirePackage[T1]{fontenc}
+\RequirePackage{xspace}
+\RequirePackage{inconsolata}% mono font with bold, but italic is missing
+% \RequirePackage[scale=0.85]{cascadia-code}
+% \AddToHook{cmd/ttfamily/before}{\fontseries{sl}}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Listings
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\RequirePackage[
+ cachedir=./build/
+]{minted}
+
+% smuggling custom pygmentize style in cache folder
+% (a real pygmentise style would need installtion in some python folder)
+\begin{filecontents*}[noheader]{./build/sam.pygstyle}
+\makeatletter
+\def\PYG@reset{\let\PYG@it=\relax \let\PYG@bf=\relax%
+ \let\PYG@ul=\relax \let\PYG@tc=\relax%
+ \let\PYG@bc=\relax \let\PYG@ff=\relax}
+\def\PYG@tok#1{\csname PYG@tok@#1\endcsname}
+\def\PYG@toks#1+{\ifx\relax#1\empty\else%
+ \PYG@tok{#1}\expandafter\PYG@toks\fi}
+\def\PYG@do#1{\PYG@bc{\PYG@tc{\PYG@ul{%
+ \PYG@it{\PYG@bf{\PYG@ff{#1}}}}}}}
+\def\PYG#1#2{\PYG@reset\PYG@toks#1+\relax+\PYG@do{#2}}
+
+% optional arguments
+\expandafter\def\csname PYG@tok@na\endcsname{\def\PYG@tc##1{\textcolor{black}{##1}}}
+
+% macros
+\expandafter\def\csname PYG@tok@k\endcsname{\def\PYG@tc##1{\textcolor{listingcolor}{\bfseries ##1}}}
+% curly brakets
+\expandafter\def\csname PYG@tok@nb\endcsname{\def\PYG@tc##1{\textcolor{listingcolor}{\bfseries ##1}}}
+
+% comments (italics won't work with the inconsolata font)
+\expandafter\def\csname PYG@tok@c\endcsname{\def\PYG@tc##1{\textcolor{gray}{##1}}}
+
+\def\PYGZbs{\char`\\}
+\def\PYGZus{\char`\_}
+\def\PYGZob{\char`\{}
+\def\PYGZcb{\char`\}}
+\def\PYGZca{\char`\^}
+\def\PYGZam{\char`\&}
+\def\PYGZlt{\char`\<}
+\def\PYGZgt{\char`\>}
+\def\PYGZsh{\char`\#}
+\def\PYGZpc{\char`\%}
+\def\PYGZdl{\char`\$}
+\def\PYGZhy{\char`\-}
+\def\PYGZsq{\char`\'}
+\def\PYGZdq{\char`\"}
+\def\PYGZti{\char`\~}
+% for compatibility with earlier versions
+\def\PYGZat{@}
+\def\PYGZlb{[}
+\def\PYGZrb{]}
+\makeatother
+\end{filecontents*}
+
+\usemintedstyle{sam}
+\setminted{
+ breaksymbolleft={},
+ tabsize=2,
+ breaklines=true,
+}
+\newminted[samcode]{latex}{}
+\newmintinline[saminline]{latex}{}
+
+% use non-bold and all coloured for inline code in articles
+\ifdefined\insertaspectratio\else
+ \patchcmd{\minted@inputpyg@inline}{\minted@input}{\color{listingcolor}\renewcommand\textcolor[3][]{##3}\renewcommand\bfseries{}\minted@input}{}{}
+\fi
+
+\RequirePackage[most]{tcolorbox}
+\tcbuselibrary{minted}
+\tcbset{%
+ colframe=themecolor,
+ fonttitle=\bfseries,
+ sidebyside,
+ center lower,
+ righthand width=5.7cm,
+ bottom=2pt,
+ top=2pt,
+ left=3pt,
+ right=3pt,
+ sidebyside gap=10pt,
+ lower separated=false,
+ listing engine=minted,
+ minted language=latex,
+ colback=themecolor!10,
+ sharp corners,
+ boxrule=0pt,
+ before title={\strut}
+}
+
+% avoid page breaks right in front of the tcolorbox
+\@ifclassloaded{beamer}{}{
+ \tcbuselibrary{hooks}
+ \tcbset{before pre={\nopagebreak[4]}}
+}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% document settings
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\@ifclassloaded{scrartcl}{%
+ \KOMAoptions{parskip=half}
+ \addtokomafont{sectioning}{\color{themecolor}}
+ \addtokomafont{date}{\normalsize}
+ \addtokomafont{author}{\normalsize}
+ \setlength{\footnotemargin}{0.7em}
+}{}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% Custom macros
+%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\providecommand*{\CTAN}{\textsc{CTAN}\xspace}
+\providecommand*{\TikZ}{Ti\emph{k}Z\xspace}
+\providecommand*{\miktex}{MiK\TeX\xspace}
+\providecommand*{\texlive}{\TeX{}Live\xspace}
+\providecommand*{\tikzbrick}{Ti\emph{k}Zbrick\xspace}
+\providecommand*{\tikzducks}{Ti\emph{k}Zducks\xspace}
+\providecommand*{\tikzlings}{Ti\emph{k}Zlings\xspace}
+\providecommand*{\tikzmarmots}{Ti\emph{k}Zmarmots\xspace}
+\providecommand*{\ConTeXt}{C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt} \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/jigsaw/jigsaw.sty b/Master/texmf-dist/tex/latex/jigsaw/jigsaw.sty
index 49f2b618bed..5bc144aadff 100644
--- a/Master/texmf-dist/tex/latex/jigsaw/jigsaw.sty
+++ b/Master/texmf-dist/tex/latex/jigsaw/jigsaw.sty
@@ -12,7 +12,7 @@
% See http://www.latex-project.org/lppl.txt
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesPackage{jigsaw}[2023/02/21 version v0.4 Draw jigsaw pieces in TikZ]
+\ProvidesPackage{jigsaw}[2024/04/25 version v0.5 Draw jigsaw pieces in TikZ]
\RequirePackage{tikz}
diff --git a/Master/tlpkg/tlpsrc/epstopdf-pkg.tlpsrc b/Master/tlpkg/tlpsrc/epstopdf-pkg.tlpsrc
index e69de29bb2d..384d7c072e7 100644
--- a/Master/tlpkg/tlpsrc/epstopdf-pkg.tlpsrc
+++ b/Master/tlpkg/tlpsrc/epstopdf-pkg.tlpsrc
@@ -0,0 +1 @@
+depend epstopdf
diff --git a/Master/tlpkg/tlpsrc/jigsaw.tlpsrc b/Master/tlpkg/tlpsrc/jigsaw.tlpsrc
index e69de29bb2d..616730c3f46 100644
--- a/Master/tlpkg/tlpsrc/jigsaw.tlpsrc
+++ b/Master/tlpkg/tlpsrc/jigsaw.tlpsrc
@@ -0,0 +1,3 @@
+depend pgf
+depend iftex
+depend epstopdf-pkg