summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-04-25 20:14:07 +0000
committerKarl Berry <karl@freefriends.org>2024-04-25 20:14:07 +0000
commit8a0be03eb98221b571145be725383385a10e2d18 (patch)
tree2a4904d21a9a79e2ec6c29a7300d9b060bb02210 /Master/texmf-dist
parent14d8b2a58434d618a3531b792dec291d56bcc6d5 (diff)
tikzmarmots (25apr24)
git-svn-id: svn://tug.org/texlive/trunk@71076 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/tikzmarmots/DEPENDS.txt1
-rw-r--r--Master/texmf-dist/doc/latex/tikzmarmots/README.md30
-rw-r--r--Master/texmf-dist/doc/latex/tikzmarmots/tikzmarmots-doc-settings.sty16
-rw-r--r--Master/texmf-dist/doc/latex/tikzmarmots/tikzmarmots-doc.pdfbin209675 -> 208537 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tikzmarmots/tikzmarmots-doc.tex26
-rw-r--r--Master/texmf-dist/tex/latex/tikzmarmots/tikzlibrarymarmots.code.tex5
-rw-r--r--Master/texmf-dist/tex/latex/tikzmarmots/tikzmarmots-v1.sty3
-rw-r--r--Master/texmf-dist/tex/latex/tikzmarmots/tikzmarmots.sty8
8 files changed, 53 insertions, 36 deletions
diff --git a/Master/texmf-dist/doc/latex/tikzmarmots/DEPENDS.txt b/Master/texmf-dist/doc/latex/tikzmarmots/DEPENDS.txt
new file mode 100644
index 00000000000..ed6d16b113a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/tikzmarmots/DEPENDS.txt
@@ -0,0 +1 @@
+hard tikzlings
diff --git a/Master/texmf-dist/doc/latex/tikzmarmots/README.md b/Master/texmf-dist/doc/latex/tikzmarmots/README.md
index 5dbde87676b..f9c865db22a 100644
--- a/Master/texmf-dist/doc/latex/tikzmarmots/README.md
+++ b/Master/texmf-dist/doc/latex/tikzmarmots/README.md
@@ -1,14 +1,32 @@
-# Tikzmarmots
+![](https://raw.githubusercontent.com/samcarter/tikzmarmots/main/ICON.png)
+
+# TikZmarmots
+
+[![GitHub](https://img.shields.io/github/license/samcarter/tikzmarmots.svg?color=blue)](http://www.latex-project.org/lppl.txt)
+[![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/samcarter/tikzmarmots.svg?label=current%20version)](https://github.com/samcarter/tikzmarmots/releases/latest)
+[![CTAN](https://img.shields.io/ctan/v/tikzmarmots.svg)](https://ctan.org/pkg/tikzmarmots)
+
+This is a little LaTeX package to draw marmots with TikZ.
> *Notice: this package has been merged into the TikZlings package and, starting with version 2.0, is now a wrapper around the `tikzlings-marmots` package. The previous version can be accessed via `\usepackage{tikzmarmots}[v1]`.*
-This is a little LaTeX package for marmots to be used in TikZ pictures.
+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/tikzmarmots .
+
+### Usage
-This project is licensed under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt
+```latex
+\documentclass{standalone}
+\usepackage{tikzmarmots}
-The project repository, including a bug tracker, can be found at https://github.com/samcarter/tikzmarmots/issues
+\begin{document}
+\begin{tikzpicture}
+ \marmot
+\end{tikzpicture}
-### A few examples:
+\end{document}
+```
-![tikz marmots](https://user-images.githubusercontent.com/8226363/42419778-ba1cf506-82bb-11e8-8e44-15f9837188e4.png)
+For more details, please consult the [package documentation](https://github.com/samcarter/tikzmarmots/blob/main/DOCUMENTATION.pdf).
diff --git a/Master/texmf-dist/doc/latex/tikzmarmots/tikzmarmots-doc-settings.sty b/Master/texmf-dist/doc/latex/tikzmarmots/tikzmarmots-doc-settings.sty
index 9f7307dc874..3042db1f4a0 100644
--- a/Master/texmf-dist/doc/latex/tikzmarmots/tikzmarmots-doc-settings.sty
+++ b/Master/texmf-dist/doc/latex/tikzmarmots/tikzmarmots-doc-settings.sty
@@ -59,6 +59,7 @@
\let\hrulefill\hrulefillx
\RequirePackage[hang,flushmargin,bottom]{footmisc}
\RequirePackage[colorlinks=true,breaklinks=true,allcolors=themecolor]{hyperref}
+ \RequirePackage[all]{nowidow}
}
\RequirePackage[T1]{fontenc}
\RequirePackage{xspace}
@@ -140,18 +141,28 @@
\tcbuselibrary{minted}
\tcbset{%
colframe=themecolor,
- arc=2mm,
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
+ 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]}}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -160,6 +171,7 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\@ifclassloaded{scrartcl}{%
+ \KOMAoptions{parskip=half}
\addtokomafont{sectioning}{\color{themecolor}}
\addtokomafont{date}{\normalsize}
\addtokomafont{author}{\normalsize}
diff --git a/Master/texmf-dist/doc/latex/tikzmarmots/tikzmarmots-doc.pdf b/Master/texmf-dist/doc/latex/tikzmarmots/tikzmarmots-doc.pdf
index 2df83aafbf8..708c67b7741 100644
--- a/Master/texmf-dist/doc/latex/tikzmarmots/tikzmarmots-doc.pdf
+++ b/Master/texmf-dist/doc/latex/tikzmarmots/tikzmarmots-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tikzmarmots/tikzmarmots-doc.tex b/Master/texmf-dist/doc/latex/tikzmarmots/tikzmarmots-doc.tex
index 52d20b781b5..6a0d533bd10 100644
--- a/Master/texmf-dist/doc/latex/tikzmarmots/tikzmarmots-doc.tex
+++ b/Master/texmf-dist/doc/latex/tikzmarmots/tikzmarmots-doc.tex
@@ -10,9 +10,6 @@
% Released under the LaTeX Project Public License v1.3c or later
% See http://www.latex-project.org/lppl.txt
%
-% Version 2.0
-% Apr 17, 2024
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% !TeX program = txs:///arara
% arara: latexmk: {
@@ -23,7 +20,7 @@
% arara: --> '-interaction=nonstopmode',
% arara: --> ]
% arara: --> }
-\documentclass[parskip=half]{scrartcl}
+\documentclass{scrartcl}
% meta %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\title{The \texorpdfstring{\tikzmarmots}{tikzmarmots} package}
@@ -37,7 +34,7 @@
\url{https://github.com/samcarter/tikzmarmots}\\
\url{https://www.ctan.org/pkg/tikzmarmots}
}{samcarter}}
-\date{Version 2.0 -- \today}
+\date{Version v2.1 \textendash{} 2024/04/24}
\usepackage[
themecolor=sammagenta
@@ -120,7 +117,7 @@
\setlength{\footheight}{45pt}
\cfoot{%
- \begin{tikzpicture}[scale=0.5]
+ \begin{tikzpicture}[scale=0.5]
\marmot
\thing[scale=0.8,signpost=\scalebox{0.6}{\thepage}]
\end{tikzpicture}
@@ -131,8 +128,8 @@
\maketitle
\thispagestyle{scrheadings}
-\begin{tcolorbox}[coltext=themecolor,width=.8\textwidth,center,sidebyside=false,bottom=10pt,top=10pt]
-The \tikzmarmots package was merged into the Ti\emph{k}Zlings package and, starting with version 2.0, is now a wrapper around the \saminline|tikzlings-marmots| package.
+\begin{tcolorbox}[coltext=themecolor,width=.8\textwidth,center,sidebyside=false,title={Note}]
+The \tikzmarmots package was merged into the Ti\emph{k}Zlings package and, starting with version 2.0, is now a wrapper around the \saminline|tikzlings-marmots| package.
To access the previous version, use \saminline|\usepackage{tikzmarmots}[v1]|.
\end{tcolorbox}
@@ -145,8 +142,8 @@ Inspired by the enthusiasms of the TeX.Stackexchange user \href{https://tex.stac
Unlike its older sibling, the \tikzducks package, this packages focuses on drawing the marmot itself. Additional accessories are not part of the package, but can be taken from other sources.
-This package is work in progress, therefore I would be happy to hear your feedback and ideas how to improve the package. The head version of the source code can be found on \url{github.com/samcarter/tikzmarmots}, including a bug tracker -- please make constructive use of it!
-A more stable package version can be found on \CTAN (\url{www.ctan.org/pkg/tikzmarmots}) and is included in both \miktex and \texlive as \tikzmarmots.
+This package is work in progress, therefore I would be happy to hear your feedback and ideas how to improve the package. The head version of the source code can be found on \url{github.com/samcarter/tikzmarmots}, including a bug tracker -- please make constructive use of it!
+A more stable package version can be found on \CTAN (\url{www.ctan.org/pkg/tikzmarmots}) and is included in both \miktex and \texlive as \tikzmarmots.
If you seek any other assistance (not bug reports/feature requests), I suggest asking on \href{https://tex.stackexchange.com}{TeX.Stackexchange}.
Copyright \raisebox{0.2em}{\tiny\fontfamily{cmr}\selectfont\textcopyright}
@@ -229,10 +226,11 @@ The above list of available customisations does not sound very exhaustive, but t
\section{Re-using accessories from the \tikzlings package}
-As already said in the introduction, this package focuses on the marmots themselves and does not provide additional accessories.
-However there is no need to despair! There are many accessories available from the \saminline|tikzlings-addons| package (\url{https://www.ctan.org/pkg/tikzlings}).
+As already said in the introduction, this package focuses on the marmots themselves and does not provide additional accessories.
+However there is no need to despair! There are many accessories available from the \saminline|tikzlings-addons| package (\url{https://www.ctan.org/pkg/tikzlings}).
\addtocounter{footnote}{1}
+\footnotetext[\thefootnote]{The Marmot Queen is inspired by \href{http://www.ilregnodeifanes.it/inglese/summary.htm}{The Fanes' saga}}
\begin{tcblisting}{title={Marmot Queen$^{\thefootnote}$}}
%\usepackage{tikzlings-addons}
\begin{tikzpicture}
@@ -240,7 +238,7 @@ However there is no need to despair! There are many accessories available from t
\thing[crown]
\end{tikzpicture}
\end{tcblisting}
-\footnotetext[\thefootnote]{The Marmot Queen is inspired by \href{http://www.ilregnodeifanes.it/inglese/summary.htm}{The Fanes' saga}}
+
The items can be modified with the usual \TikZ keys and come with additional options. Here one example:
\begin{tcblisting}{title={Happy Birthday!}}
@@ -254,4 +252,4 @@ The items can be modified with the usual \TikZ keys and come with additional opt
Please consult the \href{http://mirrors.ctan.org/graphics/pgf/contrib/tikzlings/tikzlings-doc.pdf}{\tikzlings package documentation} for an exhaustive list of options.
-\end{document} \ No newline at end of file
+\end{document}
diff --git a/Master/texmf-dist/tex/latex/tikzmarmots/tikzlibrarymarmots.code.tex b/Master/texmf-dist/tex/latex/tikzmarmots/tikzlibrarymarmots.code.tex
index dc93fdbf5d5..41b7f854c25 100644
--- a/Master/texmf-dist/tex/latex/tikzmarmots/tikzlibrarymarmots.code.tex
+++ b/Master/texmf-dist/tex/latex/tikzmarmots/tikzlibrarymarmots.code.tex
@@ -10,9 +10,6 @@
% Released under the LaTeX Project Public License v1.3c or later
% See http://www.latex-project.org/lppl.txt
%
-% Version 2.0
-% Apr 17, 2024
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\usepackage{tikzmarmots}
@@ -23,5 +20,3 @@
},
marmot/.search also={,/tikz,/pgf},
}
-
-
diff --git a/Master/texmf-dist/tex/latex/tikzmarmots/tikzmarmots-v1.sty b/Master/texmf-dist/tex/latex/tikzmarmots/tikzmarmots-v1.sty
index ae2bf3d9376..7651accdfb2 100644
--- a/Master/texmf-dist/tex/latex/tikzmarmots/tikzmarmots-v1.sty
+++ b/Master/texmf-dist/tex/latex/tikzmarmots/tikzmarmots-v1.sty
@@ -11,9 +11,6 @@
% Released under the LaTeX Project Public License v1.3c or later
% See http://www.latex-project.org/lppl.txt
%
-% Version 1.0
-% Nov 8, 2018
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ProvidesPackage{tikzmarmots}
[2018/11/09 v1.0 Drawing marmots in TikZ]
diff --git a/Master/texmf-dist/tex/latex/tikzmarmots/tikzmarmots.sty b/Master/texmf-dist/tex/latex/tikzmarmots/tikzmarmots.sty
index f773854489f..7a929dd930b 100644
--- a/Master/texmf-dist/tex/latex/tikzmarmots/tikzmarmots.sty
+++ b/Master/texmf-dist/tex/latex/tikzmarmots/tikzmarmots.sty
@@ -11,11 +11,7 @@
% Released under the LaTeX Project Public License v1.3c or later
% See http://www.latex-project.org/lppl.txt
%
-% Version 2.0
-% Apr 17, 2024
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesPackage{tikzmarmots}
- [2024/04/17 v2.0 Drawing marmots in TikZ]
+\ProvidesPackage{tikzmarmots}[2024/04/24 version v2.1 Drawing marmots in TikZ]
-\RequirePackage{tikzlings-marmots} \ No newline at end of file
+\RequirePackage{tikzlings-marmots}