texlive[65971] branches/branch2022.final/Master/texmf-dist:
commits+karl at tug.org
commits+karl at tug.org
Mon Feb 20 21:51:15 CET 2023
Revision: 65971
http://tug.org/svn/texlive?view=revision&revision=65971
Author: karl
Date: 2023-02-20 21:51:15 +0100 (Mon, 20 Feb 2023)
Log Message:
-----------
tangramtikz (20feb23) (branch)
Modified Paths:
--------------
branches/branch2022.final/Master/texmf-dist/doc/latex/tangramtikz/TangramTikz-doc-en.pdf
branches/branch2022.final/Master/texmf-dist/doc/latex/tangramtikz/TangramTikz-doc-en.tex
branches/branch2022.final/Master/texmf-dist/doc/latex/tangramtikz/TangramTikz-doc-fr.pdf
branches/branch2022.final/Master/texmf-dist/doc/latex/tangramtikz/TangramTikz-doc-fr.tex
branches/branch2022.final/Master/texmf-dist/tex/latex/tangramtikz/TangramTikz.sty
Modified: branches/branch2022.final/Master/texmf-dist/doc/latex/tangramtikz/TangramTikz-doc-en.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2022.final/Master/texmf-dist/doc/latex/tangramtikz/TangramTikz-doc-en.tex
===================================================================
--- branches/branch2022.final/Master/texmf-dist/doc/latex/tangramtikz/TangramTikz-doc-en.tex 2023-02-20 20:43:22 UTC (rev 65970)
+++ branches/branch2022.final/Master/texmf-dist/doc/latex/tangramtikz/TangramTikz-doc-en.tex 2023-02-20 20:51:15 UTC (rev 65971)
@@ -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 @@
\item Horse
\item Goat
\item Lions
+ \item Factory
+ \item Angel
+ \item Tower
+ \item Ufo
\end{itemize}
\end{multicols}}
@@ -640,10 +644,36 @@
\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
Modified: branches/branch2022.final/Master/texmf-dist/doc/latex/tangramtikz/TangramTikz-doc-fr.pdf
===================================================================
(Binary files differ)
Modified: branches/branch2022.final/Master/texmf-dist/doc/latex/tangramtikz/TangramTikz-doc-fr.tex
===================================================================
--- branches/branch2022.final/Master/texmf-dist/doc/latex/tangramtikz/TangramTikz-doc-fr.tex 2023-02-20 20:43:22 UTC (rev 65970)
+++ branches/branch2022.final/Master/texmf-dist/doc/latex/tangramtikz/TangramTikz-doc-fr.tex 2023-02-20 20:51:15 UTC (rev 65971)
@@ -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 @@
\item Cheval
\item Chevre
\item Lion
+ \item Usine
+ \item Ange
+ \item Tour
+ \item Ovni
\end{itemize}
\end{multicols}}
@@ -644,10 +648,36 @@
\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
Modified: branches/branch2022.final/Master/texmf-dist/tex/latex/tangramtikz/TangramTikz.sty
===================================================================
--- branches/branch2022.final/Master/texmf-dist/tex/latex/tangramtikz/TangramTikz.sty 2023-02-20 20:43:22 UTC (rev 65970)
+++ branches/branch2022.final/Master/texmf-dist/tex/latex/tangramtikz/TangramTikz.sty 2023-02-20 20:51:15 UTC (rev 65971)
@@ -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}%
}
More information about the tex-live-commits
mailing list.