diff options
author | Norbert Preining <norbert@preining.info> | 2023-02-21 03:01:57 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2023-02-21 03:01:57 +0000 |
commit | b05164a5b679570a7040f2b28bbf156a0479c429 (patch) | |
tree | da7f6b6f1c9dc1b41ffd5cd0998efb319d85a88d /graphics/pgf/contrib/tangramtikz | |
parent | 5eb36ac321647ea1d7118566b9520a0e8a622203 (diff) |
CTAN sync 202302210301
Diffstat (limited to 'graphics/pgf/contrib/tangramtikz')
-rw-r--r-- | graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.pdf | bin | 442183 -> 446758 bytes | |||
-rw-r--r-- | graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.tex | 34 | ||||
-rw-r--r-- | graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-fr.pdf | bin | 440966 -> 445895 bytes | |||
-rw-r--r-- | graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-fr.tex | 34 | ||||
-rw-r--r-- | graphics/pgf/contrib/tangramtikz/tex/TangramTikz.sty | 107 |
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 Binary files differindex 2ad9ed8906..8f76925ac6 100644 --- a/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.pdf +++ b/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-en.pdf 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 Binary files differindex cbfc5cbde9..2c1a9bd080 100644 --- a/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-fr.pdf +++ b/graphics/pgf/contrib/tangramtikz/doc/TangramTikz-doc-fr.pdf 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}% } |