summaryrefslogtreecommitdiff
path: root/graphics/pgf
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-02-27 03:05:21 +0000
committerNorbert Preining <norbert@preining.info>2023-02-27 03:05:21 +0000
commit86d5a04282aa958addab4585c4df899ec9a92e50 (patch)
tree7736ac0fb49348cb6ae88770b4b72ed5ee9d8081 /graphics/pgf
parente7ae872926eddb0de09ecfe1c578e0680033955a (diff)
CTAN sync 202302270305
Diffstat (limited to 'graphics/pgf')
-rw-r--r--graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.pdfbin446758 -> 450025 bytes
-rw-r--r--graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.tex34
-rw-r--r--graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-fr.pdfbin445895 -> 451134 bytes
-rw-r--r--graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-fr.tex34
-rw-r--r--graphics/pgf/contrib/tangramtikz/tex/TangramTikz.sty107
5 files changed, 170 insertions, 5 deletions
diff --git a/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.pdf b/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.pdf
index 8f76925ac6..a2c8baa025 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 2867f641b4..041190728b 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.4}
-\def\TPdate{18/02/2023}
+\def\TPversion{0.1.5}
+\def\TPdate{25/02/2023}
\usepackage[most]{tcolorbox}
\tcbuselibrary{minted}
@@ -458,6 +458,10 @@ The third argument, \textit{mandatory} and between \texttt{\{...\}} is the name
\item Angel
\item Tower
\item Ufo
+ \item Chicken
+ \item Turtle
+ \item Crab
+ \item Snail
\end{itemize}
\end{multicols}}
@@ -668,10 +672,36 @@ The third argument, \textit{mandatory} and between \texttt{\{...\}} is the name
\TangramTikz[ColorCorrection]{Ufo}
\end{PresentationCode}
+\begin{PresentationCode}{}
+\TangramTikz{Chicken}
+\TangramTikz[Correction]{Chicken}
+\TangramTikz[ColorCorrection]{Chicken}
+\end{PresentationCode}
+
+\begin{PresentationCode}{}
+\TangramTikz{Turtle}
+\TangramTikz[Correction]{Turtle}
+\TangramTikz[ColorCorrection]{Turtle}
+\end{PresentationCode}
+
+\begin{PresentationCode}{}
+\TangramTikz{Crab}
+\TangramTikz[Correction]{Crab}
+\TangramTikz[ColorCorrection]{Crab}
+\end{PresentationCode}
+
+\begin{PresentationCode}{}
+\TangramTikz{Snail}
+\TangramTikz[Correction]{Snail}
+\TangramTikz[ColorCorrection]{Snail}
+\end{PresentationCode}
+
\newpage
\part{History}
+\verb|v0.1.5|~:~~~~New models
+
\verb|v0.1.4|~:~~~~New models
\verb|v0.1.3|~:~~~~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 2c1a9bd080..647f1eafea 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 e96133889d..e45fbee518 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.4}
-\def\TPdate{18 Février 2023}
+\def\TPversion{0.1.5}
+\def\TPdate{25 Février 2023}
\usepackage[most]{tcolorbox}
\tcbuselibrary{minted}
@@ -460,6 +460,10 @@ Le troisième argument, \textit{obligatoire} et entre \texttt{\{...\}} est quant
\item Ange
\item Tour
\item Ovni
+ \item Poule
+ \item Tortue
+ \item Crabe
+ \item Escargot
\end{itemize}
\end{multicols}}
@@ -672,10 +676,36 @@ Le troisième argument, \textit{obligatoire} et entre \texttt{\{...\}} est quant
\TangramTikz[CorrectionCouleur]{Ovni}
\end{PresentationCode}
+\begin{PresentationCode}{}
+\TangramTikz{Poule}
+\TangramTikz[Correction]{Poule}
+\TangramTikz[CorrectionCouleur]{Poule}
+\end{PresentationCode}
+
+\begin{PresentationCode}{}
+\TangramTikz{Tortue}
+\TangramTikz[Correction]{Tortue}
+\TangramTikz[CorrectionCouleur]{Tortue}
+\end{PresentationCode}
+
+\begin{PresentationCode}{}
+\TangramTikz{Crabe}
+\TangramTikz[Correction]{Crabe}
+\TangramTikz[CorrectionCouleur]{Crabe}
+\end{PresentationCode}
+
+\begin{PresentationCode}{}
+\TangramTikz{Escargot}
+\TangramTikz[Correction]{Escargot}
+\TangramTikz[CorrectionCouleur]{Escargot}
+\end{PresentationCode}
+
\newpage
\part{Historique}
+\verb|v0.1.5|~:~~~~Nouveaux modèles
+
\verb|v0.1.4|~:~~~~Nouveaux modèles
\verb|v0.1.3|~:~~~~Nouveaux modèles
diff --git a/graphics/pgf/contrib/tangramtikz/tex/TangramTikz.sty b/graphics/pgf/contrib/tangramtikz/tex/TangramTikz.sty
index acc0051592..9773eb1d11 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/18 v0.1.4 Tangram Puzzles with TikZ]
+\ProvidesPackage{TangramTikz}[2023/02/25 v0.1.5 Tangram Puzzles with TikZ]
+% 0.1.5 Ajout de modèles
% 0.1.4 Ajout de modèles
% 0.1.3 Ajout de modèles
% 0.1.2 Ajout de modèles
@@ -779,6 +780,98 @@
}%
}
+%the chicken / la poule (0.1.5)
+\NewDocumentCommand\TangramChicken{ s O{TangPuzz} }{%*=colorcorrection,[key for pic]
+ \IfBooleanTF{#1}%
+ {%
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<rotate=90>({0},{0}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<xscale=-1,rotate=90>({0},{0}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]({0.25},{0.25}){TangPetTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[2]}]<rotate=135>({0.5*sqrt(2)},{-0.5*sqrt(2)}){TangMoyTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[4]}]({1},{2}){TangCar}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]<rotate=135>({1+sqrt(2)},{3}){TangPetTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[5]}]<xscale=-1>({-1},{2}){TangPara}
+ }%
+ {%
+ \PieceTangram[#2]<rotate=90>({0},{0}){TangGrandTri}
+ \PieceTangram[#2]<xscale=-1,rotate=90>({0},{0}){TangGrandTri}
+ \PieceTangram[#2]({0.25},{0.25}){TangPetTri}
+ \PieceTangram[#2]<rotate=135>({0.5*sqrt(2)},{-0.5*sqrt(2)}){TangMoyTri}
+ \PieceTangram[#2]({1},{2}){TangCar}
+ \PieceTangram[#2]<rotate=135>({1+sqrt(2)},{3}){TangPetTri}
+ \PieceTangram[#2]<xscale=-1>({-1},{2}){TangPara}
+ }%
+}
+
+%the turtle / la tortue (0.1.5)
+\NewDocumentCommand\TangramTurtle{ s O{TangPuzz} }{%*=colorcorrection,[key for pic]
+ \IfBooleanTF{#1}%
+ {%
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]({0},{0}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<xscale=-1,rotate=90>({0},{0}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[5]}]<xscale=-1,,rotate=90>({2},{0}){TangPara}
+ \PieceTangram[TangSol={\TanGListeCouleurs[4]}]({3},{1}){TangCar}
+ \PieceTangram[TangSol={\TanGListeCouleurs[2]}]<rotate=90>({0},{0}){TangMoyTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]<rotate=45>({-0.5*sqrt(2)},{-0.5*sqrt(2)}){TangPetTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]<rotate=-135>({2+0.5*sqrt(2)},{0.5*sqrt(2)}){TangPetTri}
+ }%
+ {%
+ \PieceTangram[#2]({0},{0}){TangGrandTri}
+ \PieceTangram[#2]<xscale=-1,rotate=90>({0},{0}){TangGrandTri}
+ \PieceTangram[#2]<xscale=-1,,rotate=90>({2},{0}){TangPara}
+ \PieceTangram[#2]({3},{1}){TangCar}
+ \PieceTangram[#2]<rotate=90>({0},{0}){TangMoyTri}
+ \PieceTangram[#2]<rotate=45>({-0.5*sqrt(2)},{-0.5*sqrt(2)}){TangPetTri}
+ \PieceTangram[#2]<rotate=-135>({2+0.5*sqrt(2)},{0.5*sqrt(2)}){TangPetTri}
+ }%
+}
+
+%the crab / le crabe (0.1.5)
+\NewDocumentCommand\TangramCrab{ s O{TangPuzz} }{%*=colorcorrection,[key for pic]
+ \IfBooleanTF{#1}%
+ {%
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<rotate=-90>({0},{2}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<rotate=90>({3},{-1}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]<rotate=180>({1},{0}){TangPetTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[4]}]({1},{1}){TangCar}
+ \PieceTangram[TangSol={\TanGListeCouleurs[5]}]({2},{1}){TangPara}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]<rotate=-90>({3},{3}){TangPetTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[2]}]<rotate=90>({0},{1}){TangMoyTri}
+ }%
+ {%
+ \PieceTangram[#2]<rotate=-90>({0},{2}){TangGrandTri}
+ \PieceTangram[#2]<rotate=90>({3},{-1}){TangGrandTri}
+ \PieceTangram[#2]<rotate=180>({1},{0}){TangPetTri}
+ \PieceTangram[#2]({1},{1}){TangCar}
+ \PieceTangram[#2]({2},{1}){TangPara}
+ \PieceTangram[#2]<rotate=-90>({3},{3}){TangPetTri}
+ \PieceTangram[#2]<rotate=90>({0},{1}){TangMoyTri}
+ }%
+}
+
+%the snail / l'ecargot (0.1.5)
+\NewDocumentCommand\TangramSnail{ s O{TangPuzz} }{%*=colorcorrection,[key for pic]
+ \IfBooleanTF{#1}%
+ {%
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<rotate=45>({0},{0}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<rotate=-135>({0},{2*sqrt(2)}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[5]}]({0},{0}){TangPara}
+ \PieceTangram[TangSol={\TanGListeCouleurs[2]}]({1},{0}){TangMoyTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]<rotate=-90>({-1},{1}){TangPetTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]({-2},{0}){TangPetTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[4]}]<rotate=-45>({2},{1}){TangCar}
+ }%
+ {%
+ \PieceTangram[#2]<rotate=45>({0},{0}){TangGrandTri}
+ \PieceTangram[#2]<rotate=-135>({0},{2*sqrt(2)}){TangGrandTri}
+ \PieceTangram[#2]({0},{0}){TangPara}
+ \PieceTangram[#2]({1},{0}){TangMoyTri}
+ \PieceTangram[#2]<rotate=-90>({-1},{1}){TangPetTri}
+ \PieceTangram[#2]({-2},{0}){TangPetTri}
+ \PieceTangram[#2]<rotate=-45>({2},{1}){TangCar}
+ }%
+}
+
%macros for tangram creation / commandes pour créer le tangram
\NewDocumentCommand\TangramTikzCreateEN{ m }{%
\readlist*\TanGListeCouleurs{\TangColors}%
@@ -913,6 +1006,18 @@
%UFO
\IfStrEq{#3}{Ufo}{\TangramTikzCreateEN{\TangramUfo}}{}%
\IfStrEq{#3}{Ovni}{\TangramTikzCreateFR{\TangramUfo}}{}%
+ %CHICKEN
+ \IfStrEq{#3}{Chicken}{\TangramTikzCreateEN{\TangramChicken}}{}%
+ \IfStrEq{#3}{Poule}{\TangramTikzCreateFR{\TangramChicken}}{}%
+ %TURTLE
+ \IfStrEq{#3}{Turtle}{\TangramTikzCreateEN{\TangramTurtle}}{}%
+ \IfStrEq{#3}{Tortue}{\TangramTikzCreateFR{\TangramTurtle}}{}%
+ %CRAB
+ \IfStrEq{#3}{Crab}{\TangramTikzCreateEN{\TangramCrab}}{}%
+ \IfStrEq{#3}{Crabe}{\TangramTikzCreateFR{\TangramCrab}}{}%
+ %SNAIL
+ \IfStrEq{#3}{Snail}{\TangramTikzCreateEN{\TangramSnail}}{}%
+ \IfStrEq{#3}{Escargot}{\TangramTikzCreateFR{\TangramSnail}}{}%
\end{tikzpicture}%
}