summaryrefslogtreecommitdiff
path: root/graphics/pgf
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/pgf')
-rw-r--r--graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.pdfbin435827 -> 440579 bytes
-rw-r--r--graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.tex44
-rw-r--r--graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-fr.pdfbin435237 -> 439375 bytes
-rw-r--r--graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-fr.tex42
-rw-r--r--graphics/pgf/contrib/tangramtikz/tex/TangramTikz.sty107
5 files changed, 182 insertions, 11 deletions
diff --git a/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.pdf b/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.pdf
index 8f2d5b2833..50fb16b213 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 bb60af024d..f383c700e8 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.1}
-\def\TPdate{26/01/2023}
+\def\TPversion{0.1.2}
+\def\TPdate{31/01/2023}
\usepackage[most]{tcolorbox}
\tcbuselibrary{minted}
@@ -418,8 +418,12 @@ The second argument, \textit{optional} ans between \texttt{<...>}, give options
\item etc
\end{itemize}
-The third argument, \textit{mandatory} and between \texttt{\{...\}} is the name of the predefined tangram :
-%
+The third argument, \textit{mandatory} and between \texttt{\{...\}} is the name of the predefined tangram (list below).
+
+\pagebreak
+
+\subsection{List of predefined tangrams}
+
\texttt{\begin{multicols}{5}
\begin{itemize}
\item Square
@@ -444,11 +448,13 @@ The third argument, \textit{mandatory} and between \texttt{\{...\}} is the name
\item Jogger
\item Dancer
\item Camel
+ \item Flamingo
+ \item Heart
+ \item Giraffe
+ \item Horse
\end{itemize}
\end{multicols}}
-\pagebreak
-
\begin{PresentationCode}{}
\TangramTikz{Rocket}~~
\TangramTikz[Color=red]{Rocket}~~
@@ -596,10 +602,36 @@ The third argument, \textit{mandatory} and between \texttt{\{...\}} is the name
\TangramTikz[ColorCorrection]{Camel}
\end{PresentationCode}
+\begin{PresentationCode}{}
+\TangramTikz{Flamingo}
+\TangramTikz[Correction]{Flamingo}
+\TangramTikz[ColorCorrection]{Flamingo}
+\end{PresentationCode}
+
+\begin{PresentationCode}{}
+\TangramTikz{Heart}
+\TangramTikz[Correction]{Heart}
+\TangramTikz[ColorCorrection]{Heart}
+\end{PresentationCode}
+
+\begin{PresentationCode}{}
+\TangramTikz{Giraffe}
+\TangramTikz[Correction]{Giraffe}
+\TangramTikz[ColorCorrection]{Giraffe}
+\end{PresentationCode}
+
+\begin{PresentationCode}{}
+\TangramTikz{Horse}
+\TangramTikz[Correction]{Horse}
+\TangramTikz[ColorCorrection]{Horse}
+\end{PresentationCode}
+
\newpage
\part{History}
+\verb|v0.1.2|~:~~~~New models
+
\verb|v0.1.1|~:~~~~New models
\verb|v0.1.0|~:~~~~Initial version
diff --git a/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-fr.pdf b/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-fr.pdf
index b17c1d9b6b..a1f58c7d28 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 ec34ffbfe7..80bc5d553e 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.1}
-\def\TPdate{26 Janvier 2023}
+\def\TPversion{0.1.2}
+\def\TPdate{31 Janvier 2023}
\usepackage[most]{tcolorbox}
\tcbuselibrary{minted}
@@ -420,7 +420,11 @@ Le deuxième argument, \textit{optionnel} et entre \texttt{<...>}, correspond au
\item etc
\end{itemize}
-Le troisième argument, \textit{obligatoire} et entre \texttt{\{...\}} est quant à lui le nom du Tangram issu de la \textit{base de données} présente dans le package :
+Le troisième argument, \textit{obligatoire} et entre \texttt{\{...\}} est quant à lui le nom du Tangram issu de la \textit{base de données} présente dans le package (liste ci-après).
+
+\pagebreak
+
+\subsection{Liste des Tangrams inclus dans le package}
%
\texttt{\begin{multicols}{5}
\begin{itemize}
@@ -446,10 +450,14 @@ Le troisième argument, \textit{obligatoire} et entre \texttt{\{...\}} est quant
\item Coureur
\item Danseur
\item Chameau
+ \item Flamant
+ \item Coeur
+ \item Girafe
+ \item Cheval
\end{itemize}
\end{multicols}}
-\pagebreak
+\medskip
\begin{PresentationCode}{}
\TangramTikz{Fusee}~~
@@ -598,10 +606,36 @@ Le troisième argument, \textit{obligatoire} et entre \texttt{\{...\}} est quant
\TangramTikz[CorrectionCouleur]{Chameau}
\end{PresentationCode}
+\begin{PresentationCode}{}
+\TangramTikz{Flamant}
+\TangramTikz[Correction]{Flamant}
+\TangramTikz[CorrectionCouleur]{Flamant}
+\end{PresentationCode}
+
+\begin{PresentationCode}{}
+\TangramTikz{Coeur}
+\TangramTikz[Correction]{Coeur}
+\TangramTikz[CorrectionCouleur]{Coeur}
+\end{PresentationCode}
+
+\begin{PresentationCode}{}
+\TangramTikz{Girafe}
+\TangramTikz[Correction]{Girafe}
+\TangramTikz[CorrectionCouleur]{Girafe}
+\end{PresentationCode}
+
+\begin{PresentationCode}{}
+\TangramTikz{Cheval}
+\TangramTikz[Correction]{Cheval}
+\TangramTikz[CorrectionCouleur]{Cheval}
+\end{PresentationCode}
+
\newpage
\part{Historique}
+\verb|v0.1.2|~:~~~~Nouveaux modèles
+
\verb|v0.1.1|~:~~~~Nouveaux modèles
\verb|v0.1.0|~:~~~~Version initiale
diff --git a/graphics/pgf/contrib/tangramtikz/tex/TangramTikz.sty b/graphics/pgf/contrib/tangramtikz/tex/TangramTikz.sty
index 3bed1152a8..412b477de9 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/01/26 v0.1.1 Tangram Puzzles with TikZ]
+\ProvidesPackage{TangramTikz}[2023/01/31 v0.1.2 Tangram Puzzles with TikZ]
+% 0.1.2 Ajout de modèles
% 0.1.1 Ajout de modèles
% 0.1.0 Version initiale + quelques modèles
@@ -546,6 +547,98 @@
}%
}
+%the flamingo / le flamant rose (0.1.2)
+\NewDocumentCommand\TangramFlamingo{ s O{TangPuzz} }{%*=colorcorrection,[key for pic]
+ \IfBooleanTF{#1}%
+ {%
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<rotate=180>({0},{0}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<rotate=135>({0},{0}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[4]}]<rotate=45>({0},{0}){TangCar}
+ \PieceTangram[TangSol={\TanGListeCouleurs[5]}]<rotate=45>({-0.5*sqrt(2)},{0.5*sqrt(2)}){TangPara}
+ \PieceTangram[TangSol={\TanGListeCouleurs[2]}]<rotate=45>({0},{sqrt(2)}){TangMoyTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]<rotate=-135>({-1.5},{-1.5}){TangPetTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]<rotate=-90>({-1.5-0.35},{-1.5-sqrt(2)+0.35}){TangPetTri}
+ }%
+ {%
+ \PieceTangram[#2]<rotate=180>({0},{0}){TangGrandTri}
+ \PieceTangram[#2]<rotate=135>({0},{0}){TangGrandTri}
+ \PieceTangram[#2]<rotate=45>({0},{0}){TangCar}
+ \PieceTangram[#2]<rotate=45>({-0.5*sqrt(2)},{0.5*sqrt(2)}){TangPara}
+ \PieceTangram[#2]<rotate=45>({0},{sqrt(2)}){TangMoyTri}
+ \PieceTangram[#2]<rotate=-135>({-1.5},{-1.5}){TangPetTri}
+ \PieceTangram[#2]<rotate=-90>({-1.5-0.35},{-1.5-sqrt(2)+0.35}){TangPetTri}
+ }%
+}
+
+%the heart / le coeur (0.1.2)
+\NewDocumentCommand\TangramHeart{ s O{TangPuzz} }{%*=colorcorrection,[key for pic]
+ \IfBooleanTF{#1}%
+ {%
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<rotate=-45>({0},{0}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<rotate=135>({3*sqrt(2)},{0}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[5]}]<rotate=45,yscale=-1>({0},{0}){TangPara}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]<rotate=135>({1.5*sqrt(2)},{0.5*sqrt(2)}){TangPetTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[2]}]<rotate=45>({2*sqrt(2)},{-sqrt(2)}){TangMoyTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]<rotate=-135>({2*sqrt(2)},{0}){TangPetTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[4]}]<rotate=-135>({1.5*sqrt(2)},{-0.5*sqrt(2)}){TangCar}
+ }%
+ {%
+ \PieceTangram[#2]<rotate=-45>({0},{0}){TangGrandTri}
+ \PieceTangram[#2]<rotate=135>({3*sqrt(2)},{0}){TangGrandTri}
+ \PieceTangram[#2]<rotate=45,yscale=-1>({0},{0}){TangPara}
+ \PieceTangram[#2]<rotate=135>({1.5*sqrt(2)},{0.5*sqrt(2)}){TangPetTri}
+ \PieceTangram[#2]<rotate=45>({2*sqrt(2)},{-sqrt(2)}){TangMoyTri}
+ \PieceTangram[#2]<rotate=-135>({2*sqrt(2)},{0}){TangPetTri}
+ \PieceTangram[#2]<rotate=-135>({1.5*sqrt(2)},{-0.5*sqrt(2)}){TangCar}
+ }%
+}
+
+%the giraffe / la girafe (0.1.2)
+\NewDocumentCommand\TangramGiraffe{ s O{TangPuzz} }{%*=colorcorrection,[key for pic]
+ \IfBooleanTF{#1}%
+ {%
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<rotate=-135>({0},{0}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]<rotate=135,xscale=-1>({0},{0}){TangPetTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[4]}]<rotate=45>({0.5*sqrt(2)},{-0.5*sqrt(2)}){TangCar}
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<rotate=-135>({sqrt(2)},{0}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[5]}]<rotate=-45,yscale=-1>({0.5*sqrt(2)},{1.5*sqrt(2)}){TangPara}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]<rotate=-135>({sqrt(2)},{2*sqrt(2)}){TangPetTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[2]}]<rotate=135>({2*sqrt(2)},{1.5*sqrt(2)}){TangMoyTri}
+ }%
+ {%
+ \PieceTangram[#2]<rotate=-135>({0},{0}){TangGrandTri}
+ \PieceTangram[#2]<rotate=135,xscale=-1>({0},{0}){TangPetTri}
+ \PieceTangram[#2]<rotate=45>({0.5*sqrt(2)},{-0.5*sqrt(2)}){TangCar}
+ \PieceTangram[#2]<rotate=-135>({sqrt(2)},{0}){TangGrandTri}
+ \PieceTangram[#2]<rotate=-45,yscale=-1>({0.5*sqrt(2)},{1.5*sqrt(2)}){TangPara}
+ \PieceTangram[#2]<rotate=-135>({sqrt(2)},{2*sqrt(2)}){TangPetTri}
+ \PieceTangram[#2]<rotate=135>({2*sqrt(2)},{1.5*sqrt(2)}){TangMoyTri}
+ }%
+}
+
+%the horse / le cheval (0.1.2)
+\NewDocumentCommand\TangramHorse{ s O{TangPuzz} }{%*=colorcorrection,[key for pic]
+ \IfBooleanTF{#1}%
+ {%
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<rotate=-135>({0},{0}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<rotate=-180>({2},{0}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]<rotate=135>({2+0.5*sqrt(2)},{-0.5*sqrt(2)}){TangPetTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]<rotate=-90>({0},{-2.5}){TangPetTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[4]}]({0},{0}){TangCar}
+ \PieceTangram[TangSol={\TanGListeCouleurs[2]}]({0},{1}){TangMoyTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[5]}]<rotate=90,xscale=-1>({-sqrt(2)},{-sqrt(2)}){TangPara}
+ }%
+ {%
+ \PieceTangram[#2]<rotate=-135>({0},{0}){TangGrandTri}
+ \PieceTangram[#2]<rotate=-180>({2},{0}){TangGrandTri}
+ \PieceTangram[#2]<rotate=135>({2+0.5*sqrt(2)},{-0.5*sqrt(2)}){TangPetTri}
+ \PieceTangram[#2]<rotate=-90>({0},{-2.5}){TangPetTri}
+ \PieceTangram[#2]({0},{0}){TangCar}
+ \PieceTangram[#2]({0},{1}){TangMoyTri}
+ \PieceTangram[#2]<rotate=90,xscale=-1>({-sqrt(2)},{-sqrt(2)}){TangPara}
+ }%
+}
+
%macros for tangram creation / commandes pour créer le tangram
\NewDocumentCommand\TangramTikzCreateEN{ m }{%
\readlist*\TanGListeCouleurs{\TangColors}%
@@ -650,6 +743,18 @@
%CAMEL
\IfStrEq{#3}{Camel}{\TangramTikzCreateEN{\TangramCamel}}{}%
\IfStrEq{#3}{Chameau}{\TangramTikzCreateFR{\TangramCamel}}{}%
+ %FLAMINGO
+ \IfStrEq{#3}{Flamingo}{\TangramTikzCreateEN{\TangramFlamingo}}{}%
+ \IfStrEq{#3}{Flamant}{\TangramTikzCreateFR{\TangramFlamingo}}{}%
+ %HEART
+ \IfStrEq{#3}{Heart}{\TangramTikzCreateEN{\TangramHeart}}{}%
+ \IfStrEq{#3}{Coeur}{\TangramTikzCreateFR{\TangramHeart}}{}%
+ %GIRAFFE
+ \IfStrEq{#3}{Giraffe}{\TangramTikzCreateEN{\TangramGiraffe}}{}%
+ \IfStrEq{#3}{Girafe}{\TangramTikzCreateFR{\TangramGiraffe}}{}%
+ %HORSE
+ \IfStrEq{#3}{Horse}{\TangramTikzCreateEN{\TangramHorse}}{}%
+ \IfStrEq{#3}{Cheval}{\TangramTikzCreateFR{\TangramHorse}}{}%
\end{tikzpicture}%
}