summaryrefslogtreecommitdiff
path: root/graphics/pgf
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-02-21 03:01:57 +0000
committerNorbert Preining <norbert@preining.info>2023-02-21 03:01:57 +0000
commitb05164a5b679570a7040f2b28bbf156a0479c429 (patch)
treeda7f6b6f1c9dc1b41ffd5cd0998efb319d85a88d /graphics/pgf
parent5eb36ac321647ea1d7118566b9520a0e8a622203 (diff)
CTAN sync 202302210301
Diffstat (limited to 'graphics/pgf')
-rw-r--r--graphics/pgf/contrib/pixelart/CHANGELOG.md6
-rw-r--r--graphics/pgf/contrib/pixelart/README.md2
-rw-r--r--graphics/pgf/contrib/pixelart/pixelart.pdfbin232668 -> 232992 bytes
-rw-r--r--graphics/pgf/contrib/pixelart/pixelart.sty4
-rw-r--r--graphics/pgf/contrib/pixelart/pixelart.tex4
-rw-r--r--graphics/pgf/contrib/pixelart/pixelart0.pdfbin152529 -> 152313 bytes
-rw-r--r--graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.pdfbin442183 -> 446758 bytes
-rw-r--r--graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.tex34
-rw-r--r--graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-fr.pdfbin440966 -> 445895 bytes
-rw-r--r--graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-fr.tex34
-rw-r--r--graphics/pgf/contrib/tangramtikz/tex/TangramTikz.sty107
11 files changed, 181 insertions, 10 deletions
diff --git a/graphics/pgf/contrib/pixelart/CHANGELOG.md b/graphics/pgf/contrib/pixelart/CHANGELOG.md
index ee5be079dd..190802d7fd 100644
--- a/graphics/pgf/contrib/pixelart/CHANGELOG.md
+++ b/graphics/pgf/contrib/pixelart/CHANGELOG.md
@@ -1,3 +1,9 @@
+* pixelart 1.0.2 (2023-02-20)
+
+ * Fix error while trying to load pixelart.lua (closes #2).
+
+ -- Louis Paternault <spalax@gresille.org>
+
* pixelart 1.0.1 (2023-02-18)
* Bugs
diff --git a/graphics/pgf/contrib/pixelart/README.md b/graphics/pgf/contrib/pixelart/README.md
index fa717d9015..4e3bfc91fd 100644
--- a/graphics/pgf/contrib/pixelart/README.md
+++ b/graphics/pgf/contrib/pixelart/README.md
@@ -1,7 +1,7 @@
pixelart 🎨 A LaTeX package to draw pixel-art pictures
======================================================
-![Example](https://framagit.org/spalax/pixelart/-/raw/v1.0.1/pixelart.png)
+![Example](https://framagit.org/spalax/pixelart/-/raw/v1.0.2/pixelart.png)
- [Usage and installation instruction](http://mirrors.ctan.org/graphics/pgf/contrib/pixelart/pixelart.pdf).
- Example: The heart of the picture above was produced using the following code.
diff --git a/graphics/pgf/contrib/pixelart/pixelart.pdf b/graphics/pgf/contrib/pixelart/pixelart.pdf
index 615676f083..511878b9c1 100644
--- a/graphics/pgf/contrib/pixelart/pixelart.pdf
+++ b/graphics/pgf/contrib/pixelart/pixelart.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/pixelart/pixelart.sty b/graphics/pgf/contrib/pixelart/pixelart.sty
index 4fa15d8101..19f2bd4135 100644
--- a/graphics/pgf/contrib/pixelart/pixelart.sty
+++ b/graphics/pgf/contrib/pixelart/pixelart.sty
@@ -15,7 +15,7 @@
%% This work consists of the files pixelart.sty, pixelart.lua, pixelart.tex.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{pixelart}[2023/02/18 v1.0.1 A package to draw pixel-art pictures]
+\ProvidesPackage{pixelart}[2023/02/20 v1.0.2 A package to draw pixel-art pictures]
\RequirePackage{iftex}
\ifluatex
@@ -28,7 +28,7 @@
\RequirePackage{tikz}
\usetikzlibrary{patterns}
-\luadirect{dofile("pixelart.lua")}
+\luadirect{require("pixelart")}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Package options
diff --git a/graphics/pgf/contrib/pixelart/pixelart.tex b/graphics/pgf/contrib/pixelart/pixelart.tex
index bfcf1e5863..3e63dfb71a 100644
--- a/graphics/pgf/contrib/pixelart/pixelart.tex
+++ b/graphics/pgf/contrib/pixelart/pixelart.tex
@@ -9,8 +9,8 @@
\setcnltx{
name = pixelart,
title = \pixelartlogo,
- version = v1.0.1,
- date = 2023-02-18,
+ version = v1.0.2,
+ date = 2023-02-20,
info = A \LaTeX{} package to draw pixel-art pictures ,
authors = Louis Paternault ,
email = spalax(at)gresille(dot)org ,
diff --git a/graphics/pgf/contrib/pixelart/pixelart0.pdf b/graphics/pgf/contrib/pixelart/pixelart0.pdf
index abd374878a..74d435678d 100644
--- a/graphics/pgf/contrib/pixelart/pixelart0.pdf
+++ b/graphics/pgf/contrib/pixelart/pixelart0.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.pdf b/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.pdf
index 2ad9ed8906..8f76925ac6 100644
--- a/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.pdf
+++ b/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.tex b/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.tex
index 0775f8a82b..2867f641b4 100644
--- a/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.tex
+++ b/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.tex
@@ -50,8 +50,8 @@
\setlength{\parindent}{0pt}
\definecolor{LightGray}{gray}{0.9}
-\def\TPversion{0.1.3}
-\def\TPdate{17/02/2023}
+\def\TPversion{0.1.4}
+\def\TPdate{18/02/2023}
\usepackage[most]{tcolorbox}
\tcbuselibrary{minted}
@@ -454,6 +454,10 @@ The third argument, \textit{mandatory} and between \texttt{\{...\}} is the name
\item Horse
\item Goat
\item Lions
+ \item Factory
+ \item Angel
+ \item Tower
+ \item Ufo
\end{itemize}
\end{multicols}}
@@ -640,10 +644,36 @@ The third argument, \textit{mandatory} and between \texttt{\{...\}} is the name
\TangramTikz[ColorCorrection]{Lions}
\end{PresentationCode}
+\begin{PresentationCode}{}
+\TangramTikz{Factory}
+\TangramTikz[Correction]{Factory}
+\TangramTikz[ColorCorrection]{Factory}
+\end{PresentationCode}
+
+\begin{PresentationCode}{}
+\TangramTikz{Angel}
+\TangramTikz[Correction]{Angel}
+\TangramTikz[ColorCorrection]{Angel}
+\end{PresentationCode}
+
+\begin{PresentationCode}{}
+\TangramTikz{Tower}
+\TangramTikz[Correction]{Tower}
+\TangramTikz[ColorCorrection]{Tower}
+\end{PresentationCode}
+
+\begin{PresentationCode}{}
+\TangramTikz{Ufo}
+\TangramTikz[Correction]{Ufo}
+\TangramTikz[ColorCorrection]{Ufo}
+\end{PresentationCode}
+
\newpage
\part{History}
+\verb|v0.1.4|~:~~~~New models
+
\verb|v0.1.3|~:~~~~New models
\verb|v0.1.2|~:~~~~New models
diff --git a/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-fr.pdf b/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-fr.pdf
index cbfc5cbde9..2c1a9bd080 100644
--- a/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-fr.pdf
+++ b/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-fr.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-fr.tex b/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-fr.tex
index 69dd30c432..e96133889d 100644
--- a/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-fr.tex
+++ b/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-fr.tex
@@ -49,8 +49,8 @@
\setlength{\parindent}{0pt}
\definecolor{LightGray}{gray}{0.9}
-\def\TPversion{0.1.3}
-\def\TPdate{17 Février 2023}
+\def\TPversion{0.1.4}
+\def\TPdate{18 Février 2023}
\usepackage[most]{tcolorbox}
\tcbuselibrary{minted}
@@ -456,6 +456,10 @@ Le troisième argument, \textit{obligatoire} et entre \texttt{\{...\}} est quant
\item Cheval
\item Chevre
\item Lion
+ \item Usine
+ \item Ange
+ \item Tour
+ \item Ovni
\end{itemize}
\end{multicols}}
@@ -644,10 +648,36 @@ Le troisième argument, \textit{obligatoire} et entre \texttt{\{...\}} est quant
\TangramTikz[CorrectionCouleur]{Lion}
\end{PresentationCode}
+\begin{PresentationCode}{}
+\TangramTikz{Usine}
+\TangramTikz[Correction]{Usine}
+\TangramTikz[CorrectionCouleur]{Usine}
+\end{PresentationCode}
+
+\begin{PresentationCode}{}
+\TangramTikz{Ange}
+\TangramTikz[Correction]{Ange}
+\TangramTikz[CorrectionCouleur]{Ange}
+\end{PresentationCode}
+
+\begin{PresentationCode}{}
+\TangramTikz{Tour}
+\TangramTikz[Correction]{Tour}
+\TangramTikz[CorrectionCouleur]{Tour}
+\end{PresentationCode}
+
+\begin{PresentationCode}{}
+\TangramTikz{Ovni}
+\TangramTikz[Correction]{Ovni}
+\TangramTikz[CorrectionCouleur]{Ovni}
+\end{PresentationCode}
+
\newpage
\part{Historique}
+\verb|v0.1.4|~:~~~~Nouveaux modèles
+
\verb|v0.1.3|~:~~~~Nouveaux modèles
\verb|v0.1.2|~:~~~~Nouveaux modèles
diff --git a/graphics/pgf/contrib/tangramtikz/tex/TangramTikz.sty b/graphics/pgf/contrib/tangramtikz/tex/TangramTikz.sty
index 6943745a3c..acc0051592 100644
--- a/graphics/pgf/contrib/tangramtikz/tex/TangramTikz.sty
+++ b/graphics/pgf/contrib/tangramtikz/tex/TangramTikz.sty
@@ -3,7 +3,8 @@
% Inspiration....: https://tex.stackexchange.com/questions/407449/typesetting-tangram-figures-in-latex
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{TangramTikz}[2023/02/17 v0.1.3 Tangram Puzzles with TikZ]
+\ProvidesPackage{TangramTikz}[2023/02/18 v0.1.4 Tangram Puzzles with TikZ]
+% 0.1.4 Ajout de modèles
% 0.1.3 Ajout de modèles
% 0.1.2 Ajout de modèles
% 0.1.1 Ajout de modèles
@@ -686,6 +687,98 @@
}%
}
+%the factory / l'usine (0.1.4)
+\NewDocumentCommand\TangramFactory{ s O{TangPuzz} }{%*=colorcorrection,[key for pic]
+ \IfBooleanTF{#1}%
+ {%
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<rotate=135>({0},{0}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<rotate=-135>({0},{2*sqrt(2)}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[2]}]<rotate=45>({-sqrt(2)},{sqrt(2)}){TangMoyTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[4]}]({-1},{2*sqrt(2)}){TangCar}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]<rotate=135>({0.5*sqrt(2)-0.5},{2*sqrt(2)+1}){TangPetTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[5]}]<xscale=-1,rotate=90>({-2*sqrt(2)},{0}){TangPara}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]<rotate=-180>({-2*sqrt(2)+1},{2}){TangPetTri}
+ }%
+ {%
+ \PieceTangram[#2]<rotate=135>({0},{0}){TangGrandTri}
+ \PieceTangram[#2]<rotate=-135>({0},{2*sqrt(2)}){TangGrandTri}
+ \PieceTangram[#2]<rotate=45>({-sqrt(2)},{sqrt(2)}){TangMoyTri}
+ \PieceTangram[#2]({-1},{2*sqrt(2)}){TangCar}
+ \PieceTangram[#2]<rotate=135>({0.5*sqrt(2)-0.5},{2*sqrt(2)+1}){TangPetTri}
+ \PieceTangram[#2]<xscale=-1,rotate=90>({-2*sqrt(2)},{0}){TangPara}
+ \PieceTangram[#2]<rotate=-180>({-2*sqrt(2)+1},{2}){TangPetTri}
+ }%
+}
+
+%the angel / l'ange (0.1.4)
+\NewDocumentCommand\TangramAngel{ s O{TangPuzz} }{%*=colorcorrection,[key for pic]
+ \IfBooleanTF{#1}%
+ {%
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]<rotate=135>({0},{0}){TangPetTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[5]}]<rotate=90>({0},{0}){TangPara}
+ \PieceTangram[TangSol={\TanGListeCouleurs[2]}]<rotate=90>({0},{1}){TangMoyTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]<rotate=-90>({0},{2.5}){TangPetTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[4]}]<rotate=-45>({0},{3}){TangCar}
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<rotate=67.5>({0},{3}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<xscale=-1,rotate=5>({0},{3}){TangGrandTri}
+ }%
+ {%
+ \PieceTangram[#2]<rotate=135>({0},{0}){TangPetTri}
+ \PieceTangram[#2]<rotate=90>({0},{0}){TangPara}
+ \PieceTangram[#2]<rotate=90>({0},{1}){TangMoyTri}
+ \PieceTangram[#2]<rotate=-90>({0},{2.5}){TangPetTri}
+ \PieceTangram[#2]<rotate=-45>({0},{3}){TangCar}
+ \PieceTangram[#2]<rotate=67.5>({0},{3}){TangGrandTri}
+ \PieceTangram[#2]<xscale=-1,rotate=5>({0},{3}){TangGrandTri}
+ }%
+}
+
+%the tower / la tour (0.1.4)
+\NewDocumentCommand\TangramTower{ s O{TangPuzz} }{%*=colorcorrection,[key for pic]
+ \IfBooleanTF{#1}%
+ {%
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]({-2},{0}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<rotate=-90>({0},{2}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[5]}]<rotate=-90>({0},{3}){TangPara}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]<rotate=-135>({1},{2+sqrt(2)}){TangPetTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[2]}]<rotate=180>({2-0.5*sqrt(2)},{3+0.5*sqrt(2)}){TangMoyTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[4]}]({0},{3+0.5*sqrt(2)}){TangCar}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]<rotate=135>({0.5+0.5*sqrt(2)},{4+0.5*sqrt(2)}){TangPetTri}
+ }%
+ {%
+ \PieceTangram[#2]({-2},{0}){TangGrandTri}
+ \PieceTangram[#2]<rotate=-90>({0},{2}){TangGrandTri}
+ \PieceTangram[#2]<rotate=-90>({0},{3}){TangPara}
+ \PieceTangram[#2]<rotate=-135>({1},{2+sqrt(2)}){TangPetTri}
+ \PieceTangram[#2]<rotate=180>({2-0.5*sqrt(2)},{3+0.5*sqrt(2)}){TangMoyTri}
+ \PieceTangram[#2]({0},{3+0.5*sqrt(2)}){TangCar}
+ \PieceTangram[#2]<rotate=135>({0.5+0.5*sqrt(2)},{4+0.5*sqrt(2)}){TangPetTri}
+ }%
+}
+
+%the UFO / l'OVNI (0.1.4)
+\NewDocumentCommand\TangramUfo{ s O{TangPuzz} }{%*=colorcorrection,[key for pic]
+ \IfBooleanTF{#1}%
+ {%
+ \PieceTangram[TangSol={\TanGListeCouleurs[4]}]<rotate=-135>({0},{0}){TangCar}
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<rotate=90>({2},{-2}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<rotate=180>({0},{0}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[2]}]({-1},{0}){TangMoyTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[5]}]<rotate=-90>({2},{0}){TangPara}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]({-3},{-1}){TangPetTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]<rotate=180>({-2},{-1}){TangPetTri}
+ }%
+ {%
+ \PieceTangram[#2]<rotate=-135>({0},{0}){TangCar}
+ \PieceTangram[#2]<rotate=90>({2},{-2}){TangGrandTri}
+ \PieceTangram[#2]<rotate=180>({0},{0}){TangGrandTri}
+ \PieceTangram[#2]({-1},{0}){TangMoyTri}
+ \PieceTangram[#2]<rotate=-90>({2},{0}){TangPara}
+ \PieceTangram[#2]({-3},{-1}){TangPetTri}
+ \PieceTangram[#2]<rotate=180>({-2},{-1}){TangPetTri}
+ }%
+}
+
%macros for tangram creation / commandes pour créer le tangram
\NewDocumentCommand\TangramTikzCreateEN{ m }{%
\readlist*\TanGListeCouleurs{\TangColors}%
@@ -808,6 +901,18 @@
%LION
\IfStrEq{#3}{Lions}{\TangramTikzCreateEN{\TangramLion}}{}%
\IfStrEq{#3}{Lion}{\TangramTikzCreateFR{\TangramLion}}{}%
+ %FACTORY
+ \IfStrEq{#3}{Factory}{\TangramTikzCreateEN{\TangramFactory}}{}%
+ \IfStrEq{#3}{Usine}{\TangramTikzCreateFR{\TangramFactory}}{}%
+ %ANGEL
+ \IfStrEq{#3}{Angel}{\TangramTikzCreateEN{\TangramAngel}}{}%
+ \IfStrEq{#3}{Ange}{\TangramTikzCreateFR{\TangramAngel}}{}%
+ %TOWER
+ \IfStrEq{#3}{Tower}{\TangramTikzCreateEN{\TangramTower}}{}%
+ \IfStrEq{#3}{Tour}{\TangramTikzCreateFR{\TangramTower}}{}%
+ %UFO
+ \IfStrEq{#3}{Ufo}{\TangramTikzCreateEN{\TangramUfo}}{}%
+ \IfStrEq{#3}{Ovni}{\TangramTikzCreateFR{\TangramUfo}}{}%
\end{tikzpicture}%
}