summaryrefslogtreecommitdiff
path: root/graphics/pgf
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-02-18 03:01:32 +0000
committerNorbert Preining <norbert@preining.info>2023-02-18 03:01:32 +0000
commit4ff14bd6227f033e0d226f68a153f4a8c6458d16 (patch)
tree7ec4972c299f416960bd8426facbb245545d05e7 /graphics/pgf
parentcb7cbc1f98cedde266389c64619b6dbfaec14f87 (diff)
CTAN sync 202302180301
Diffstat (limited to 'graphics/pgf')
-rw-r--r--graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.pdfbin440579 -> 442183 bytes
-rw-r--r--graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.tex20
-rw-r--r--graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-fr.pdfbin439375 -> 440966 bytes
-rw-r--r--graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-fr.tex20
-rw-r--r--graphics/pgf/contrib/tangramtikz/tex/TangramTikz.sty55
5 files changed, 90 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 50fb16b213..2ad9ed8906 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 f383c700e8..0775f8a82b 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.2}
-\def\TPdate{31/01/2023}
+\def\TPversion{0.1.3}
+\def\TPdate{17/02/2023}
\usepackage[most]{tcolorbox}
\tcbuselibrary{minted}
@@ -452,6 +452,8 @@ The third argument, \textit{mandatory} and between \texttt{\{...\}} is the name
\item Heart
\item Giraffe
\item Horse
+ \item Goat
+ \item Lions
\end{itemize}
\end{multicols}}
@@ -626,10 +628,24 @@ The third argument, \textit{mandatory} and between \texttt{\{...\}} is the name
\TangramTikz[ColorCorrection]{Horse}
\end{PresentationCode}
+\begin{PresentationCode}{}
+\TangramTikz{Goat}
+\TangramTikz[Correction]{Goat}
+\TangramTikz[ColorCorrection]{Goat}
+\end{PresentationCode}
+
+\begin{PresentationCode}{}
+\TangramTikz{Lions}
+\TangramTikz[Correction]{Lions}
+\TangramTikz[ColorCorrection]{Lions}
+\end{PresentationCode}
+
\newpage
\part{History}
+\verb|v0.1.3|~:~~~~New models
+
\verb|v0.1.2|~:~~~~New models
\verb|v0.1.1|~:~~~~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 a1f58c7d28..cbfc5cbde9 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 80bc5d553e..69dd30c432 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.2}
-\def\TPdate{31 Janvier 2023}
+\def\TPversion{0.1.3}
+\def\TPdate{17 Février 2023}
\usepackage[most]{tcolorbox}
\tcbuselibrary{minted}
@@ -454,6 +454,8 @@ Le troisième argument, \textit{obligatoire} et entre \texttt{\{...\}} est quant
\item Coeur
\item Girafe
\item Cheval
+ \item Chevre
+ \item Lion
\end{itemize}
\end{multicols}}
@@ -630,10 +632,24 @@ Le troisième argument, \textit{obligatoire} et entre \texttt{\{...\}} est quant
\TangramTikz[CorrectionCouleur]{Cheval}
\end{PresentationCode}
+\begin{PresentationCode}{}
+\TangramTikz{Chevre}
+\TangramTikz[Correction]{Chevre}
+\TangramTikz[CorrectionCouleur]{Chevre}
+\end{PresentationCode}
+
+\begin{PresentationCode}{}
+\TangramTikz{Lion}
+\TangramTikz[Correction]{Lion}
+\TangramTikz[CorrectionCouleur]{Lion}
+\end{PresentationCode}
+
\newpage
\part{Historique}
+\verb|v0.1.3|~:~~~~Nouveaux modèles
+
\verb|v0.1.2|~:~~~~Nouveaux modèles
\verb|v0.1.1|~:~~~~Nouveaux modèles
diff --git a/graphics/pgf/contrib/tangramtikz/tex/TangramTikz.sty b/graphics/pgf/contrib/tangramtikz/tex/TangramTikz.sty
index 412b477de9..6943745a3c 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/31 v0.1.2 Tangram Puzzles with TikZ]
+\ProvidesPackage{TangramTikz}[2023/02/17 v0.1.3 Tangram Puzzles with TikZ]
+% 0.1.3 Ajout de modèles
% 0.1.2 Ajout de modèles
% 0.1.1 Ajout de modèles
% 0.1.0 Version initiale + quelques modèles
@@ -639,6 +640,52 @@
}%
}
+%the goat / la chèvre (0.1.3)
+\NewDocumentCommand\TangramGoat{ s O{TangPuzz} }{%*=colorcorrection,[key for pic]
+ \IfBooleanTF{#1}%
+ {%
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<rotate=135>({0},{0}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<rotate=90>({1},{-1}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]<rotate=180>({-2*sqrt(2)+1},{0}){TangPetTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[4]}]<rotate=135>({-sqrt(2)},{sqrt(2)}){TangCar}
+ \PieceTangram[TangSol={\TanGListeCouleurs[2]}]<rotate=45>({-2.5*sqrt(2)},{0.5*sqrt(2)}){TangMoyTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[5]}]({-2.5*sqrt(2)},{1.5*sqrt(2)}){TangPara}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]<rotate=10>({1},{1}){TangPetTri}
+ }%
+ {%
+ \PieceTangram[#2]<rotate=135>({0},{0}){TangGrandTri}
+ \PieceTangram[#2]<rotate=90>({1},{-1}){TangGrandTri}
+ \PieceTangram[#2]<rotate=180>({-2*sqrt(2)+1},{0}){TangPetTri}
+ \PieceTangram[#2]<rotate=135>({-sqrt(2)},{sqrt(2)}){TangCar}
+ \PieceTangram[#2]<rotate=45>({-2.5*sqrt(2)},{0.5*sqrt(2)}){TangMoyTri}
+ \PieceTangram[#2]({-2.5*sqrt(2)},{1.5*sqrt(2)}){TangPara}
+ \PieceTangram[#2]<rotate=10>({1},{1}){TangPetTri}
+ }%
+}
+
+%the lion / le lion (0.1.3)
+\NewDocumentCommand\TangramLion{ s O{TangPuzz} }{%*=colorcorrection,[key for pic]
+ \IfBooleanTF{#1}%
+ {%
+ \PieceTangram[TangSol={\TanGListeCouleurs[2]}]<rotate=135>({0},{0}){TangMoyTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<rotate=90>({sqrt(2)},{-sqrt(2)}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[5]}]<rotate=-55>({sqrt(2)},{2-sqrt(2)}){TangPara}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]<rotate=135>({sqrt(2)},{-sqrt(2)}){TangPetTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[3]}]<rotate=180>({-sqrt(2)+0.5},{0}){TangPetTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[1]}]<rotate=90>({-sqrt(2)},{0}){TangGrandTri}
+ \PieceTangram[TangSol={\TanGListeCouleurs[4]}]<rotate=-135>({-sqrt(2)-1.75},{1.75}){TangCar}
+ }%
+ {%
+ \PieceTangram[#2]<rotate=135>({0},{0}){TangMoyTri}
+ \PieceTangram[#2]<rotate=90>({sqrt(2)},{-sqrt(2)}){TangGrandTri}
+ \PieceTangram[#2]<rotate=-55>({sqrt(2)},{2-sqrt(2)}){TangPara}
+ \PieceTangram[#2]<rotate=135>({sqrt(2)},{-sqrt(2)}){TangPetTri}
+ \PieceTangram[#2]<rotate=180>({-sqrt(2)+0.5},{0}){TangPetTri}
+ \PieceTangram[#2]<rotate=90>({-sqrt(2)},{0}){TangGrandTri}
+ \PieceTangram[#2]<rotate=-135>({-sqrt(2)-1.75},{1.75}){TangCar}
+ }%
+}
+
%macros for tangram creation / commandes pour créer le tangram
\NewDocumentCommand\TangramTikzCreateEN{ m }{%
\readlist*\TanGListeCouleurs{\TangColors}%
@@ -755,6 +802,12 @@
%HORSE
\IfStrEq{#3}{Horse}{\TangramTikzCreateEN{\TangramHorse}}{}%
\IfStrEq{#3}{Cheval}{\TangramTikzCreateFR{\TangramHorse}}{}%
+ %GOAT
+ \IfStrEq{#3}{Goat}{\TangramTikzCreateEN{\TangramGoat}}{}%
+ \IfStrEq{#3}{Chevre}{\TangramTikzCreateFR{\TangramGoat}}{}%
+ %LION
+ \IfStrEq{#3}{Lions}{\TangramTikzCreateEN{\TangramLion}}{}%
+ \IfStrEq{#3}{Lion}{\TangramTikzCreateFR{\TangramLion}}{}%
\end{tikzpicture}%
}