summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-10-29 19:47:54 +0000
committerKarl Berry <karl@freefriends.org>2022-10-29 19:47:54 +0000
commitda2983eaf28cbe959300f10351f8105a83d74a0a (patch)
tree2fa11484ae117d2c27322abe5d7ee8fa011772ce
parent161c5c1d51a8d9438c4da92eaa7ac1e7a08c2168 (diff)
jeuxcartes (29oct22)
git-svn-id: svn://tug.org/texlive/trunk@64850 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/jeuxcartes/JeuxCartes-doc.pdfbin5663850 -> 6662060 bytes
-rw-r--r--Master/texmf-dist/doc/latex/jeuxcartes/JeuxCartes-doc.tex221
-rw-r--r--Master/texmf-dist/doc/latex/jeuxcartes/README.md5
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-10AT.pngbin44247 -> 57196 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-10C.pngbin42766 -> 6550 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-10K.pngbin42360 -> 6515 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-10P.pngbin47466 -> 8337 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-10T.pngbin56973 -> 9148 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-11AT.pngbin37927 -> 55004 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-12AT.pngbin44818 -> 59829 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-13AT.pngbin44384 -> 65265 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-14AT.pngbin36795 -> 52917 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-15AT.pngbin45828 -> 61233 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-16AT.pngbin53425 -> 68221 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-17AT.pngbin49300 -> 64238 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-18AT.pngbin49989 -> 66932 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-19AT.pngbin43440 -> 58843 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-1AT.pngbin43799 -> 54608 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-20AT.pngbin43792 -> 56498 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-21AT.pngbin48089 -> 63853 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-2AT.pngbin50287 -> 59695 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-2C.pngbin27549 -> 3982 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-2K.pngbin27207 -> 3885 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-2P.pngbin29073 -> 4568 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-2T.pngbin30579 -> 4837 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-3AT.pngbin50104 -> 63032 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-3C.pngbin30378 -> 4496 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-3K.pngbin30138 -> 4369 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-3P.pngbin31671 -> 5226 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-3T.pngbin34899 -> 5583 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-4AT.pngbin45425 -> 61773 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-4C.pngbin28707 -> 4293 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-4K.pngbin28936 -> 4236 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-4P.pngbin31048 -> 5059 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-4T.pngbin33487 -> 5569 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-5AT.pngbin43095 -> 58625 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-5C.pngbin30426 -> 4617 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-5K.pngbin30600 -> 4552 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-5P.pngbin34235 -> 5519 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-5T.pngbin37424 -> 6160 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-6AT.pngbin48338 -> 59895 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-6C.pngbin31872 -> 5217 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-6K.pngbin33157 -> 5008 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-6P.pngbin37950 -> 6308 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-6T.pngbin42512 -> 6865 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-7AT.pngbin49002 -> 62153 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-7C.pngbin30118 -> 5270 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-7K.pngbin29190 -> 5059 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-7P.pngbin36529 -> 6377 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-7T.pngbin40463 -> 7024 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-8AT.pngbin49112 -> 62990 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-8C.pngbin37356 -> 5944 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-8K.pngbin34636 -> 5742 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-8P.pngbin41209 -> 7308 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-8T.pngbin47785 -> 8152 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-9AT.pngbin48783 -> 58278 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-9C.pngbin37970 -> 6038 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-9K.pngbin37475 -> 5961 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-9P.pngbin43485 -> 7427 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-9T.pngbin47633 -> 8140 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-AC.pngbin22035 -> 3206 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-AK.pngbin21913 -> 3099 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-AP.pngbin23870 -> 3693 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-AT.pngbin25708 -> 3880 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-CC.pngbin38389 -> 55076 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-CK.pngbin37673 -> 55019 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-CP.pngbin41010 -> 59298 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-CT.pngbin40689 -> 57354 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-DC.pngbin38949 -> 51517 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-DK.pngbin38448 -> 49058 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-DP.pngbin38922 -> 52460 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-DT.pngbin32924 -> 44217 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-Dos.pngbin80226 -> 13810 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-Exc.pngbin46165 -> 59732 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-RC.pngbin42817 -> 54000 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-RK.pngbin43865 -> 56080 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-RP.pngbin38016 -> 47461 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-RT.pngbin44231 -> 59599 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-VC.pngbin46382 -> 56135 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-VK.pngbin49967 -> 63167 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-VP.pngbin49125 -> 56491 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-VT.pngbin42304 -> 53517 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-0B.pngbin0 -> 18565 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-0J.pngbin0 -> 17202 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-0R.pngbin0 -> 18850 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-0V.pngbin0 -> 19036 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-1B.pngbin0 -> 15439 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-1J.pngbin0 -> 14420 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-1R.pngbin0 -> 15864 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-1V.pngbin0 -> 15926 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-2B.pngbin0 -> 18072 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-2J.pngbin0 -> 16733 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-2R.pngbin0 -> 18350 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-2V.pngbin0 -> 18621 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-3B.pngbin0 -> 17594 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-3J.pngbin0 -> 16278 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-3R.pngbin0 -> 17851 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-3V.pngbin0 -> 18077 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-4B.pngbin0 -> 16432 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-4J.pngbin0 -> 15177 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-4R.pngbin0 -> 16737 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-4V.pngbin0 -> 16962 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-5B.pngbin0 -> 17926 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-5J.pngbin0 -> 16611 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-5R.pngbin0 -> 18289 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-5V.pngbin0 -> 18463 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-6B.pngbin0 -> 16961 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-6J.pngbin0 -> 15679 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-6R.pngbin0 -> 17243 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-6V.pngbin0 -> 17439 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-7B.pngbin0 -> 16703 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-7J.pngbin0 -> 15546 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-7R.pngbin0 -> 17086 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-7V.pngbin0 -> 17239 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-8B.pngbin0 -> 17900 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-8J.pngbin0 -> 16498 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-8R.pngbin0 -> 18128 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-8V.pngbin0 -> 18357 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-9B.pngbin0 -> 17003 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-9J.pngbin0 -> 15702 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-9R.pngbin0 -> 17298 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-9V.pngbin0 -> 17468 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-CSB.pngbin0 -> 26231 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-CSJ.pngbin0 -> 23900 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-CSR.pngbin0 -> 26768 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-CSV.pngbin0 -> 27195 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-Dos.pngbin0 -> 19451 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-P2B.pngbin0 -> 21458 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-P2J.pngbin0 -> 19765 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-P2R.pngbin0 -> 21877 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-P2V.pngbin0 -> 22037 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-P4.pngbin0 -> 25683 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-PTJ.pngbin0 -> 23467 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-PTR.pngbin0 -> 26061 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-PTV.pngbin0 -> 26507 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/Caj-Uno-Coul.pngbin0 -> 29329 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/Caj-Uno-PTB.pngbin0 -> 25529 bytes
-rw-r--r--Master/texmf-dist/tex/latex/jeuxcartes/JeuxCartes.sty80
138 files changed, 218 insertions, 88 deletions
diff --git a/Master/texmf-dist/doc/latex/jeuxcartes/JeuxCartes-doc.pdf b/Master/texmf-dist/doc/latex/jeuxcartes/JeuxCartes-doc.pdf
index 7cf04344978..13458c708b1 100644
--- a/Master/texmf-dist/doc/latex/jeuxcartes/JeuxCartes-doc.pdf
+++ b/Master/texmf-dist/doc/latex/jeuxcartes/JeuxCartes-doc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/jeuxcartes/JeuxCartes-doc.tex b/Master/texmf-dist/doc/latex/jeuxcartes/JeuxCartes-doc.tex
index 159fe3412f9..07e617d6055 100644
--- a/Master/texmf-dist/doc/latex/jeuxcartes/JeuxCartes-doc.tex
+++ b/Master/texmf-dist/doc/latex/jeuxcartes/JeuxCartes-doc.tex
@@ -52,8 +52,8 @@
\setlength{\parindent}{0pt}
\definecolor{LightGray}{gray}{0.9}
-\def\TPversion{0.1.2}
-\def\TPdate{26 Octobre 2022}
+\def\TPversion{0.1.3}
+\def\TPdate{28 Octobre 2022}
\usepackage[most]{tcolorbox}
\usepackage[outputdir=build]{minted}
@@ -102,8 +102,8 @@
\begin{tabular}{c}
\lstinline!JeuxCartes!\\
\\
- Des cartes de poker ou de tarot, \\
- simples ou en \textit{mains}, \\
+ Des cartes de Poker ou de Tarot ou de Uno, \\
+ simples ou en \textit{mains} ou en \textit{mini}, \\
avec possibilité de tirage aléatoire.
\end{tabular}
\end{center}
@@ -128,7 +128,7 @@
\thispagestyle{empty}
-{\Large {\bfseries Résumé} : Quelques commandes pour afficher des cartes à jouer, de type Poker ou Tarot}
+{\Large $\blacktriangleright$~~Quelques commandes pour afficher des cartes à jouer, de type Poker/Tarot/Uno}
\medskip
@@ -143,7 +143,7 @@ Une commande pour des cartes en version \og miniatures \fg{} (individuelle, main
\vspace{0.5cm}
\begin{center}
- \CartesJeu[Eventail,EspH=0,EspV=0.1]{7K § 8P § DT § AP § 10C § AC § 8T § 2K § VC}\hspace{0.5cm}\CartesJeu[TypeJeu=Tarot,EspH=0.85,EspV=0.2]{Exc § 1AT § CC § 8T § 2K § 5AT § 2AT § DP § 7T § 10C § 19AT § VP}
+ \MainCartesJeu[Eventail,EspH=0,EspV=0.1]{7K § 8P § DT § AP § 10C § AC § 8T § 2K § VC}\hspace{0.5cm}\MainCartesJeu[TypeJeu=Tarot,EspH=0.85,EspV=0.2]{Exc § 1AT § CC § 8T § 2K § 5AT § 2AT § DP § 7T § 10C § 19AT § VP}
\end{center}
\hfill{}\textit{Merci aux membres du groupe \faFacebook{} du \og Coin \LaTeX{} \fg{} pour leur aide et leurs idées !}
@@ -181,6 +181,11 @@ Une commande pour des cartes en version \og miniatures \fg{} (individuelle, main
\vfill~
\part{Historique}
+
+{\small \bverb|v0.1.3|~:~~~~Ajout de cartes Uno (CC1.0 par AlexDer) + modification des commandes + rami
+
+{\small \bverb| |~:~~~~Amélioration de la qualité des cartes de Tarot (sans augmenter la taille)
+
{\small \bverb|v0.1.2|~:~~~~Modification du nom (et de la source) des images de Tarot (CC0)
{\small \bverb|v0.1.1|~:~~~~Ajout de commandes pour des mini-cartes
@@ -204,7 +209,8 @@ Les cartes sont des images :
%
\begin{itemize}
\item les cartes type \textsf{Poker} sont sous licence LGPL, \copyright{}2005, de David Bellot, via \url{https://github.com/htdebeer/SVG-cards} ;
- \item les cartes type \textsf{Tarot} sous licence CC0, du site \url{https://freesvg.org}.
+ \item les cartes type \textsf{Tarot} sous licence CC0, du site \url{https://freesvg.org} ;
+ \item les cartes type \textsf{Uno} (édité par Mattel\texttrademark) sous licence CC0, du site \url{https://alexder.itch.io/uno-card-game-asset-pack}.
\end{itemize}
\end{codeidee}
@@ -278,21 +284,60 @@ Autant que faire se peut, des exemples/illustrations/remarques seront proposés
Les \textsf{codes} seront présentés dans des \textsf{boîtes} \textcolor{red!75!black}{{\small \faCode} Code \LaTeX}, si possible avec la \textsf{sortie} dans la même boîte, et sinon la \textsf{sortie} sera visible dans des \textsf{boîtes} \textcolor{red!75!black}{{\small \faArrowAltCircleRight[regular]} Sortie \LaTeX}. Les \textsf{clés} ou \textsf{options} seront présentées dans des \textsf{boîtes} \textcolor{ForestGreen}{{\small \faPaperclip} Clés}.
\end{codeinfo}
+\subsection{Liste des commandes et jeux disponibles}
+
+\begin{codeinfo}
+Les \textit{Jeux} disponibles sont :
+
+\begin{itemize}
+ \item \Cle{Poker}, \Cle{Tarot} et \Cle{Uno} pour l'affichage des cartes ;
+ \item \Cle{Poker}, \Cle{Tarot}, \Cle{Bataille}, \Cle{Rami}, \Cle{Belote} et \Cle{Uno} pour les mains aléatoires.
+\end{itemize}
+\end{codeinfo}
+
+\begin{codetex}[listing only]
+%Affichage d'une seule carte (mode image pure ou mode tikz)
+\AffCarteJeu[...]{...}
+
+%Affichage en mode côte à côte de plusieurs cartes
+\AffCartesJeu[...]{...}
+
+%Affichage en main de plusieurs cartes (éventail possible)
+\MainCartesJeu[...]{...}
+
+%Affichage en main de cartes aléatoires (éventail possible)
+\MainCartesJeuAleatoire[...]{...}
+
+%affichage d'une mini-carte (mode 'inline')
+\AffMiniCarteJeu[...]{...}
+
+%affichage d'une main de mini-cartes (mode 'inline')
+\MainMiniCartesJeu[...]{...}
+
+%affichage d'une main de mini-cartes aléatoires (mode 'inline')
+\MainMiniCartesJeuAleatoire[...]{...}
+\end{codetex}
+
+\pagebreak
+
\part{Les commandes}
-\section{La commande simple \og CarteJeu \fg}
+\section{Les commandes simples \og AffCarteJeu \fg{} et \og AffCartesJeu \fg}
\subsection{Introduction}
\begin{codeinfo}
-La commande \ctex{AffCarteJeu} affiche une carte, avec un système de clés/options
+La commande \ctex{AffCarteJeu} affiche une carte, avec un système de clés/options.
+
+La commande \ctex{AffCartesJeu} affiche une liste de cartes ne mode \textit{côte à côte}, avec un système de clés/options.
\end{codeinfo}
\begin{codetex}[]
\AffCarteJeu{VP}\AffCarteJeu{10K}\AffCarteJeu{AC}\AffCarteJeu{DosBleu}\AffCarteJeu{DT}\\ \\
\AffCarteJeu[TypeJeu=Tarot]{VP}\AffCarteJeu[TypeJeu=Tarot]{Dos}
\AffCarteJeu[TypeJeu=Tarot]{Exc}\AffCarteJeu[TypeJeu=Tarot]{1AT}
-\AffCarteJeu[TypeJeu=Tarot]{10K}\AffCarteJeu[TypeJeu=Tarot]{18AT}
+\AffCarteJeu[TypeJeu=Tarot]{10K}\AffCarteJeu[TypeJeu=Tarot]{18AT}\\ \\
+\AffCartesJeu[TypeJeu=Uno]{P4 § PTR § Coul § 7B § 8V}
\end{codetex}
\subsection{Noms de cartes}
@@ -320,6 +365,19 @@ est fixé suivant le modèle suivant (typiquement \texttt{<hauteur>.<couleur>} )
\item \texttt{Exc}, \texttt{1AT}, \texttt{2AT}, \ldots, \texttt{20T}, \texttt{21AT}\dotfill\Cle{Atouts}
\item \texttt{Dos}\dotfill\Cle{Dos}
\end{itemize}
+ \item cartes de Uno :
+ \begin{itemize}
+ \item \texttt{0B}, \texttt{1B}, \ldots, \texttt{8B}, \texttt{9B}\dotfill\Cle{Bleu}
+ \item \texttt{0R}, \texttt{1R}, \ldots, \texttt{8R}, \texttt{9R}\dotfill\Cle{Rouge}
+ \item \texttt{0J}, \texttt{1J}, \ldots, \texttt{8J}, \texttt{9J}\dotfill\Cle{Jaune}
+ \item \texttt{0V}, \texttt{1V}, \ldots, \texttt{8V}, \texttt{9V}\dotfill\Cle{Vert}
+ \item \texttt{P2B}, \texttt{P2R}, \texttt{P2B}, \texttt{P2J}, \texttt{P2V}\dotfill\Cle{+2}
+ \item \texttt{PTB}, \texttt{PTR}, \texttt{PTB}, \texttt{PTJ}, \texttt{PTV}\dotfill\Cle{PasseTour}
+ \item \texttt{CSB}, \texttt{CSR}, \texttt{CSB}, \texttt{CSJ}, \texttt{CSV}\dotfill\Cle{ChangeSens}
+ \item \texttt{P4}\dotfill\Cle{+4}
+ \item \texttt{Coul}\dotfill\Cle{JokerCouleur}
+ \item \texttt{Dos}\dotfill\Cle{Dos}
+ \end{itemize}
\end{itemize}
\end{codeinfo}
@@ -327,6 +385,7 @@ est fixé suivant le modèle suivant (typiquement \texttt{<hauteur>.<couleur>} )
\begin{codetex}[listing only]
\AffCarteJeu[options]{<carte>}
+\AffCartesJeu[options]{<liste de cartes>}
\end{codetex}
\begin{codecles}
@@ -334,7 +393,7 @@ Concernant les \Cle{options} :
\begin{itemize}
\item la clé \Cle{Hauteur} correspond à la hauteur voulue, en cm, de la carte ; \hfill{}défaut \Cle{4.25}
- \item la clé \Cle{TypeJeu} (parmi \Cle{Poker} ou \Cle{Tarot}) pour spécifier les cartes à utiliser ; \hfill{}défaut \Cle{Poker}
+ \item la clé \Cle{TypeJeu} (parmi \Cle{Poker} ou \Cle{Tarot} ou \Cle{Uno}) pour spécifier les cartes à utiliser ; \hfill{}défaut \Cle{Poker}
\item la clé \Cle{Rotation} pour une éventuelle rotation de la carte ; \hfill{}défaut \Cle{0}
\item la clé \Cle{AlignementV} pour l'alignement vertical (lié à \ctex{raisebox} ou à \TikZ) ; \hfill{}défaut \Cle{0.5}
\item le booléen \Cle{Tikz} pour préciser que la carte est \textit{autonome}, dans un environnement \ctex{tikzpicture} ; \hfill{}défaut \Cle{false}
@@ -364,19 +423,12 @@ Il est à noter que la commande (en \textit{interne}) est liée à un \textit{so
\begin{codetex}[]
En mode normal, \AffCarteJeu{VP} ou \AffCarteJeu[AlignementV=0]{DosRouge} ou
-\AffCarteJeu[AlignementV=1]{10K} ou \AffCarteJeu[TypeJeu=Tarot,AlignementV=0.33,Rotation=25]{10AT}.
-
-\smallskip
-
-En mode \TikZ, \AffCarteJeu[Hauteur=2.75,Tikz]{VP}
-ou \AffCarteJeu[Hauteur=2.75,AlignementV=0,Tikz]{DosVert}
-ou \AffCarteJeu[Hauteur=2.75,AlignementV=1,Tikz]{10K}
-ou \AffCarteJeu[Hauteur=2.75,TypeJeu=Tarot,AlignementV=0.33,Rotation=-25]{10AT}.
-
-\smallskip
-
-On obtient la main \AffCarteJeu[Hauteur=2]{VP}\AffCarteJeu[Hauteur=2]{10K}
-\AffCarteJeu[Hauteur=2]{AK}\AffCarteJeu[Hauteur=2]{JN}\AffCarteJeu[Hauteur=2]{7P}.
+\AffCarteJeu[AlignementV=1]{10K} ou \AffCarteJeu[TypeJeu=Tarot,AlignementV=0.33,Rotation=25]{10AT}.\\ \\
+En mode \TikZ, \AffCarteJeu[Hauteur=2,Tikz]{VP}
+ou \AffCarteJeu[Hauteur=2,AlignementV=0,Tikz]{DosVert}
+ou \AffCarteJeu[Hauteur=2,AlignementV=1,Tikz]{10K}
+ou \AffCarteJeu[Hauteur=2,TypeJeu=Tarot,AlignementV=0.33,Rotation=-25]{10AT}.\\ \\
+On obtient la main \AffCartesJeu[Hauteur=2,TypeJeu=Uno]{9B § 8R § P2J § P4 § 0J § CSR § PTJ}.
\end{codetex}
\section{Main de cartes}
@@ -392,7 +444,7 @@ Les commandes pour créer des \textit{mains} sont obligatoirement liées à des
\end{codeattention}
\begin{codetex}[listing only]
-\CartesJeu[options]{<liste de cartes>}
+\MainCartesJeu[options]{<liste de cartes>}
\end{codetex}
\subsection{Clés et options}
@@ -408,7 +460,7 @@ Les \Cle{options} sont les suivantes :
\begin{itemize}
\item la clé \Cle{Hauteur} correspond à la hauteur voulue, en cm, des cartes ; \hfill{}défaut \Cle{4.25}
- \item la clé \Cle{TypeJeu} (parmi \Cle{Poker} ou \Cle{Tarot}) pour spécifier les cartes à utiliser ; \hfill{}défaut \Cle{Poker}
+ \item la clé \Cle{TypeJeu} (parmi \Cle{Poker} ou \Cle{Tarot} ou \Cle{Uno}) pour spécifier les cartes à utiliser ; \hfill{}défaut \Cle{Poker}
\item la clé \Cle{EspH} correspond à coefficient d'espacement horizontal (\textit{proche} du cm en taille réelle) entre les cartes ; \hfill{}défaut \Cle{1}
\item la clé \Cle{EspH} correspond à coefficient d'espacement vertical (\textit{proche} du cm en taille réelle) entre les cartes ; \hfill{}défaut \Cle{0}
\item le booléen \Cle{Eventail} pour une présentation en éventail ; \hfill{}défaut \Cle{false}
@@ -418,9 +470,9 @@ Les \Cle{options} sont les suivantes :
\end{codecles}
\begin{codetex}[]
-\CartesJeu{7K § 8P § DT § AC}
-~ou \CartesJeu[Eventail,EspH=0,EspV=0.1]{7K § 8P § DT § AC}
-~ou \CartesJeu[Eventail,EspH=0.5]{7K § 8P § DT § AC}
+\MainCartesJeu{7K § 8P § DT § AC}
+~ou \MainCartesJeu[Eventail,EspH=0,EspV=0.1]{7K § 8P § DT § AC}
+~ou \MainCartesJeu[Eventail,EspH=0.5]{7K § 8P § DT § AC}
\end{codetex}
\begin{codeinfo}
@@ -436,23 +488,23 @@ Les exemples proposés dans cette documentation permettent de se rendre compte d
\end{codeinfo}
\begin{codetex}[]
-\CartesJeu[TypeJeu=Tarot]%
- {Exc § 1AT § CC § 8T § 2K § 5AT § 2AT § DP § 7T § 10C § 19AT § VP}
+\MainCartesJeu[TypeJeu=Uno,EspH=1.75]%
+ {9B § P4 § P2J § 1R § 7R § PTV § 2J § 5J § 9B § PTR § 5V}
\smallskip
-\CartesJeu[TypeJeu=Tarot,EspH=1,EspV=-0.15,Hauteur=2.25]%
+\MainCartesJeu[TypeJeu=Tarot,EspH=1,EspV=-0.15,Hauteur=2.25]%
{Exc § 1AT § CC § 8T § 2K § 5AT § 2AT § DP § 7T § 10C § 19AT § VP}
\smallskip
-Ça c'est une belle poignée ! \CartesJeu[Eventail,Hauteur=3,TypeJeu=Tarot,EspH=0,EspV=0.1]%
+Ça c'est une belle poignée ! \MainCartesJeu[Eventail,Hauteur=3,TypeJeu=Tarot,EspH=0,EspV=0.1]%
{Exc § 1AT § 2AT § 3AT § 4AT § 5AT § 6AT § %
10AT § 11AT § 15AT § 16AT § 19AT § 20AT § 21AT}
\smallskip
-Et un chien qui en a : \CartesJeu[Eventail,Hauteur=2,TypeJeu=Tarot,EspH=0.5,EspV=0.15,Rotation=20]%
+Et un chien qui en a : \MainCartesJeu[Eventail,Hauteur=2,TypeJeu=Tarot,EspH=0.5,EspV=0.15,Rotation=20]%
{DK § 10AT § 16AT § VP § 1AT}
\end{codetex}
@@ -467,13 +519,13 @@ L'idée est ici de proposer une commande, similaire à la précédente, mais qui
\end{codeidee}
\begin{codetex}[listing only]
-\CartesJeuAleatoire[<options>]{<nombre de cartes>}
+\MainCartesJeuAleatoire[<options>]{<nombre de cartes>}
\end{codetex}
\begin{codetex}[]
-Voilà de quoi d'obtenir une main aléatoire de Poker :
+Voilà de quoi obtenir une main aléatoire de Poker :
-\CartesJeuAleatoire{5}
+\MainCartesJeuAleatoire{5}
\end{codetex}
\subsection{Clés et options}
@@ -483,7 +535,7 @@ Les \Cle{options} sont les suivantes :
\begin{itemize}
\item la clé \Cle{Hauteur} correspond à la hauteur voulue, en cm, des cartes ; \hfill{}défaut \Cle{4.25}
- \item la clé \Cle{TypeJeu} (parmi \Cle{Poker} ou \Cle{Tarot} ou \Cle{Belote} ou \Cle{Bataille}) ; \hfill{}défaut \Cle{Poker}
+ \item la clé \Cle{TypeJeu} (parmi \Cle{Poker} ou \Cle{Tarot} ou \Cle{Belote} ou \Cle{Bataille} ou \Cle{Rami} ou \Cle{Uno}) ; \hfill{}défaut \Cle{Poker}
\item la clé \Cle{EspH} correspond à coefficient d'espacement horizontal (\textit{proche} du cm en taille réelle) entre les cartes ; \hfill{}défaut \Cle{1}
\item la clé \Cle{EspH} correspond à coefficient d'espacement vertical (\textit{proche} du cm en taille réelle) entre les cartes ; \hfill{}défaut \Cle{0}
\item le booléen \Cle{Eventail} pour une présentation en éventail ; \hfill{}défaut \Cle{false}
@@ -507,24 +559,22 @@ En ce qui concerne les \textit{jeux} disponibles (non modifiables) :
\begin{codetex}[]
\textbf{\large Belote :} \\
-
-\CartesJeuAleatoire[Hauteur=2,TypeJeu=Belote]{8} ou \CartesJeuAleatoire[Hauteur=2,TypeJeu=Belote]{8}.\\
-
+\MainCartesJeuAleatoire[Hauteur=2.5,TypeJeu=Belote]{8} ou \MainCartesJeuAleatoire[Hauteur=2,TypeJeu=Belote]{8}.\\
\textbf{\large Poker :} \\
-
-\CartesJeuAleatoire[Hauteur=3,Eventail,EspH=0,EspV=0.1]{5} ou \CartesJeuAleatoire[Hauteur=3,Eventail,EspH=0,EspV=0.1]{5}.\\
-
+\MainCartesJeuAleatoire[Hauteur=2.5,Eventail,EspH=0,EspV=0.1]{5} ou \MainCartesJeuAleatoire[Hauteur=2.5,Eventail,EspH=0,EspV=0.1]{5}.\\
\textbf{\large Bataille :} \\
-
-\CartesJeuAleatoire[Hauteur=2.25,TypeJeu=Bataille]{27}\\
-
+\MainCartesJeuAleatoire[Hauteur=2.5,TypeJeu=Bataille]{27}\\
\textbf{\large Tarot :} \\
-
-\CartesJeuAleatoire[Hauteur=3.25,TypeJeu=Tarot]{10} ou~
-\CartesJeuAleatoire[Hauteur=3.25,Eventail,TypeJeu=Tarot,EspH=0,EspV=0.1]{10}
+\MainCartesJeuAleatoire[Hauteur=3.25,TypeJeu=Tarot]{10} ou~
+\MainCartesJeuAleatoire[Hauteur=3.25,Eventail,TypeJeu=Tarot,EspH=0,EspV=0.1]{10}.
\end{codetex}
-\pagebreak
+\begin{codetex}[]
+\textbf{\large Rami :} \\
+\MainCartesJeuAleatoire[Hauteur=3.75,TypeJeu=Rami]{15}\\
+\textbf{\large Uno :} \\
+\MainCartesJeuAleatoire[Hauteur=4,TypeJeu=Uno,Eventail,EspH=-0.1,Rotation=15,EspV=0.1]{7}
+\end{codetex}
\section{\textit{Mini}-Cartes}
@@ -539,13 +589,13 @@ Ces \textit{mini-}cartes sont des figures \TikZ, alignées verticalement sur leu
\end{codeidee}
\begin{codetex}[listing only]
-\MiniCarteJeu[<options>]{<carte>}
+\AffMiniCarteJeu[<options>]{<carte>}
\end{codetex}
\begin{codetex}[]
Si on met du texte sur la ligne du dessus, on peut voir le résultat.\\
-Voilà des exemples de mini-cartes, \MiniCarteJeu{7.K}\MiniCarteJeu{1.AT}\MiniCarteJeu{V.K}\MiniCarteJeu{10.C}, intégrables dans un paragraphe.\\
-Si on met du texte sur la ligne du dessous, on peut voir le résultat.
+Voilà des exemples de mini-cartes, \AffMiniCarteJeu{7.K}\AffMiniCarteJeu{1.AT}\AffMiniCarteJeu{V.K}\AffMiniCarteJeu{10.C}, intégrables dans un paragraphe.\\
+Si on met du texte sur la ligne du dessous, on peut voir le résultat.\\
\end{codetex}
\subsection{Noms des \textit{mini-}cartes}
@@ -561,6 +611,8 @@ Pour des raisons internes au code, les cartes doivent être saisies suivant la n
\item \texttt{J.N}, \texttt{J.R}\dotfill\Cle{Joker}
\item \texttt{Exc}, \texttt{1.AT}, \texttt{2.AT}, \ldots, \texttt{20.T}, \texttt{21.AT}\dotfill\Cle{Atouts}
\end{itemize}
+
+Par contre, il n'est pas prévu de \textit{mini-}cartes pour le Uno.
\end{codeinfo}
\begin{codeinfo}
@@ -579,9 +631,9 @@ Quelques \Cle{options} pour les \textit{mini-}cartes :
\end{codecles}
\begin{codetex}[]
-\foreach \EECARTE in {2,3,4,5,6,7,8,9,10,V,C,D,R,A}{\MiniCarteJeu[Largeur=0.75cm]{\EECARTE.K}}\\
-\MiniCarteJeu[FondAtout=LightSkyBlue,Largeur=0.75cm]{Exc}%
-\foreach \EECARTE in {1,2,...,21}{\MiniCarteJeu[FondAtout=LightSkyBlue,Largeur=0.75cm]{\EECARTE.AT}}
+\foreach \EECARTE in {2,3,4,5,6,7,8,9,10,V,C,D,R,A}{\AffMiniCarteJeu[Largeur=0.75cm]{\EECARTE.K}}\\
+\AffMiniCarteJeu[FondAtout=LightSkyBlue,Largeur=0.75cm]{Exc}%
+\foreach \EECARTE in {1,2,...,21}{\AffMiniCarteJeu[FondAtout=LightSkyBlue,Largeur=0.75cm]{\EECARTE.AT}}
\end{codetex}
\subsection{\textit{Mini}-Mains et \textit{mini}-mains aléatoires}
@@ -591,35 +643,38 @@ Comme pour les cartes \textit{classiques}, il existe deux commandes pour des \te
\end{codeidee}
\begin{codetex}[listing only]
-\MiniCartesJeu[<options>]{<liste de cartes>}
+\MainMiniCartesJeu[<options>]{<liste de cartes>}
-\MiniCartesJeuAleatoire[<options>]{<liste de cartes>}
+\MainMiniCartesJeuAleatoire[<options>]{<nb cartes>}
\end{codetex}
\begin{codecles}
Les \Cle{Clés} sont les mêmes que pour la commande individuelle, avec en plus :
\begin{itemize}
- \item la clé \Cle{TypeJeu} (parmi \Cle{Poker} ou \Cle{Tarot} ou \Cle{Belote} ou \Cle{Bataille}). \hfill{}défaut \Cle{Poker}
+ \item la clé \Cle{TypeJeu} (parmi \Cle{Poker} ou \Cle{Tarot} ou \Cle{Belote} ou \Cle{Bataille} ou \Cle{Rami}). \hfill{}défaut \Cle{Poker}
\end{itemize}
\end{codecles}
\begin{codetex}[]
\textbf{\large Saisie de mains : }\\
-\MiniCartesJeu{7.K § A.P § D.T § V.K § 10.C § C.T} et~
-\MiniCartesJeu{Exc § 1.AT § C.C § 8.T § 2.K § 5.AT § 2.AT § D.P § 7.T § 10.C § 19.AT § V.P}\\
+\MainMiniCartesJeu{7.K § A.P § D.T § V.K § 10.C § C.T} et~
+\MainMiniCartesJeu{Exc § 1.AT § C.C § 8.T § 2.K § 5.AT § 2.AT § D.P § 7.T § 10.C § 19.AT § V.P}\\
\textbf{\large Poker : }\\
-\MiniCartesJeuAleatoire{5} ou \MiniCartesJeuAleatoire{5} ou \MiniCartesJeuAleatoire{5} ou \MiniCartesJeuAleatoire{5}.\\
+\MainMiniCartesJeuAleatoire{5} ou \MainMiniCartesJeuAleatoire{5} ou \MainMiniCartesJeuAleatoire{5} ou \MainMiniCartesJeuAleatoire{5}.\\
\textbf{\large Belote :}\\
-\MiniCartesJeuAleatoire[TypeJeu=Belote]{8} ou \MiniCartesJeuAleatoire[TypeJeu=Belote]{8} ou \MiniCartesJeuAleatoire[TypeJeu=Belote]{8}.\\
+\MainMiniCartesJeuAleatoire[TypeJeu=Belote]{8} ou \MainMiniCartesJeuAleatoire[TypeJeu=Belote]{8} ou \MainMiniCartesJeuAleatoire[TypeJeu=Belote]{8}.\\
\textbf{\large Bataille : }\\
-\MiniCartesJeuAleatoire[TypeJeu=Bataille]{12} ou \MiniCartesJeuAleatoire[TypeJeu=Bataille]{12}.\\
+\MainMiniCartesJeuAleatoire[TypeJeu=Bataille]{12} ou \MainMiniCartesJeuAleatoire[TypeJeu=Bataille]{12}.\\
\textbf{\large Tarot : }\\
-\MiniCartesJeuAleatoire[TypeJeu=Tarot]{10} ou \MiniCartesJeuAleatoire[TypeJeu=Tarot]{10}.
+\MainMiniCartesJeuAleatoire[TypeJeu=Tarot]{10} ou \MainMiniCartesJeuAleatoire[TypeJeu=Tarot]{10}.\\
+
+\textbf{\large Rami : }\\
+\MainMiniCartesJeuAleatoire[TypeJeu=Rami]{15} ou \MainMiniCartesJeuAleatoire[TypeJeu=Rami]{14}.
\end{codetex}
\pagebreak
@@ -651,33 +706,47 @@ Les \Cle{Clés} sont les mêmes que pour la commande individuelle, avec en plus
\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,C,D,R,A}\do{\AffCarteJeu[TypeJeu=Tarot,Hauteur=1.75]{#1T}}
-\AffCarteJeu[TypeJeu=Tarot,Hauteur=2]{Exc}%
+\AffCarteJeu[TypeJeu=Tarot,Hauteur=1.75]{Exc}%
\xintFor #1 in {1,2,3,4,5,6,7,8,9,10}\do{\AffCarteJeu[TypeJeu=Tarot,Hauteur=1.75]{#1AT}}%
-\AffCarteJeu[TypeJeu=Tarot,Hauteur=2]{Dos}
+\AffCarteJeu[TypeJeu=Tarot,Hauteur=1.75]{Dos}
\xintFor #1 in {11,12,13,14,15,16,17,18,19,20,21}\do{\AffCarteJeu[TypeJeu=Tarot,Hauteur=1.75]{#1AT}}%
\AffCarteJeu[TypeJeu=Tarot,Hauteur=1.75]{Dos}
\pagebreak
+\subsection{Cartes de Uno}
+
+\AffCartesJeu[TypeJeu=Uno,Hauteur=2]{0B § 1B § 2B § 3B § 4B § 5B § 6B § 7B § 8B § 9B § P2B § PTB § CSB}
+
+\AffCartesJeu[TypeJeu=Uno,Hauteur=2]{0R § 1R § 2R § 3R § 4R § 5R § 6R § 7R § 8R § 9R § P2R § PTR § CSR}
+
+\AffCartesJeu[TypeJeu=Uno,Hauteur=2]{0J § 1J § 2J § 3J § 4J § 5J § 6J § 7J § 8J § 9J § P2J § PTJ § CSJ}
+
+\AffCartesJeu[TypeJeu=Uno,Hauteur=2]{0V § 1V § 2V § 3V § 4V § 5V § 6V § 7V § 8V § 9V § P2V § PTV § CSV}
+
+\AffCartesJeu[TypeJeu=Uno,Hauteur=2]{P4 § Coul § Dos}
+
\subsection{MiniCartes}
-\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,C,D,R,A}\do{\MiniCarteJeu{#1.P}}
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,C,D,R,A}\do{\AffMiniCarteJeu{#1.P}}
-\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,C,D,R,A}\do{\MiniCarteJeu{#1.C}}
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,C,D,R,A}\do{\AffMiniCarteJeu{#1.C}}
-\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,C,D,R,A}\do{\MiniCarteJeu{#1.K}}
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,C,D,R,A}\do{\AffMiniCarteJeu{#1.K}}
-\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,C,D,R,A}\do{\MiniCarteJeu{#1.T}}
+\xintFor #1 in {2,3,4,5,6,7,8,9,10,V,C,D,R,A}\do{\AffMiniCarteJeu{#1.T}}
-\MiniCarteJeu{J.N}\MiniCarteJeu{J.R}
+\AffMiniCarteJeu{J.N}\AffMiniCarteJeu{J.R}
\medskip
-\MiniCarteJeu{Exc}%
-\xintFor #1 in {1,2,3,4,5,6,7,8,9,10}\do{\MiniCarteJeu{#1.AT}}
+\AffMiniCarteJeu{Exc}%
+\xintFor #1 in {1,2,3,4,5,6,7,8,9,10}\do{\AffMiniCarteJeu{#1.AT}}
+
+\xintFor #1 in {11,12,13,14,15,16,17,18,19,20,21}\do{\AffMiniCarteJeu{#1.AT}}%
-\xintFor #1 in {11,12,13,14,15,16,17,18,19,20,21}\do{\MiniCarteJeu{#1.AT}}%
+\pagebreak
\section{Carte simple dans un environnement \TikZ}
diff --git a/Master/texmf-dist/doc/latex/jeuxcartes/README.md b/Master/texmf-dist/doc/latex/jeuxcartes/README.md
index bcfb5270a12..fcdb4e5269a 100644
--- a/Master/texmf-dist/doc/latex/jeuxcartes/README.md
+++ b/Master/texmf-dist/doc/latex/jeuxcartes/README.md
@@ -5,5 +5,6 @@ JeuxCartes est un package avec des cartes à jouer.
Author : Cédric Pierquet
email : cpierquet@outlook.fr
Licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt
-Poker cards Image's Licence : LGPL-2.1 license https://github.com/htdebeer/SVG-cards
-Tarot cards Image's Licence : Public Domain https://freesvg.org/ \ No newline at end of file
+Poker cards Image's Licence : LGPL-2.1 license, https://github.com/htdebeer/SVG-cards
+Tarot cards Image's Licence : Public Domain, https://freesvg.org/
+Uno cards Image's Licence : Public Domain, https://alexder.itch.io/uno-card-game-asset-pack \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-10AT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-10AT.png
index 99f82861808..ba302956ade 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-10AT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-10AT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-10C.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-10C.png
index 2b04117df5b..9264e77c428 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-10C.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-10C.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-10K.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-10K.png
index 12971fcaaba..0450435639f 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-10K.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-10K.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-10P.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-10P.png
index 2c853b17580..4968d1649d5 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-10P.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-10P.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-10T.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-10T.png
index a8a6bca4dfd..8526467433e 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-10T.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-10T.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-11AT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-11AT.png
index 9e8a68bb0d0..b3b8133321f 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-11AT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-11AT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-12AT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-12AT.png
index 067a4f86ea9..2838f0a478a 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-12AT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-12AT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-13AT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-13AT.png
index 6e5e2380842..2193b662d95 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-13AT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-13AT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-14AT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-14AT.png
index 2a2129b9443..c1e6efb90db 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-14AT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-14AT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-15AT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-15AT.png
index dfe28537f88..2e5600fa0a3 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-15AT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-15AT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-16AT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-16AT.png
index 5e6677b910f..3505b53c99b 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-16AT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-16AT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-17AT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-17AT.png
index 75209880528..08d0b4fb07a 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-17AT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-17AT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-18AT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-18AT.png
index 39bb7f054a6..b43d654a3a9 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-18AT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-18AT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-19AT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-19AT.png
index 74b6d63a3af..2bd5350cbb6 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-19AT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-19AT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-1AT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-1AT.png
index c597d451d82..b74bb131778 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-1AT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-1AT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-20AT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-20AT.png
index c8f0e7c6e37..9360e747174 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-20AT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-20AT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-21AT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-21AT.png
index 3f18693fdf0..02561017d47 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-21AT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-21AT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-2AT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-2AT.png
index 565a8bba929..78a9ca74d1a 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-2AT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-2AT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-2C.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-2C.png
index e0b4d2b05c5..97b9c479626 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-2C.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-2C.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-2K.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-2K.png
index a86d518c931..39c83a2d321 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-2K.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-2K.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-2P.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-2P.png
index 4f91a036a98..3a6b4b329e3 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-2P.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-2P.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-2T.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-2T.png
index a80c47b6dc9..fc57bcf13ca 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-2T.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-2T.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-3AT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-3AT.png
index cd0729efc73..5fa6cbd4cbd 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-3AT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-3AT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-3C.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-3C.png
index a06a5d69a3c..21c4a45ba62 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-3C.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-3C.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-3K.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-3K.png
index 2138f6a8d86..5f7d0adbdd3 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-3K.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-3K.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-3P.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-3P.png
index 2869a70e195..b4ce45275cc 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-3P.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-3P.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-3T.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-3T.png
index f5b7fce1f7f..517cd6d297e 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-3T.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-3T.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-4AT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-4AT.png
index 2c8b7392ef2..29c7c0bfe2b 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-4AT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-4AT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-4C.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-4C.png
index 19917255c8a..e3465aa8976 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-4C.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-4C.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-4K.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-4K.png
index 21b0a5f57ec..c0aed66137b 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-4K.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-4K.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-4P.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-4P.png
index b8ba63f36e7..0292f4364c4 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-4P.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-4P.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-4T.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-4T.png
index 5868cbdb0d7..66c1d14703c 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-4T.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-4T.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-5AT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-5AT.png
index aedb0c4399e..ce0482b6abe 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-5AT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-5AT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-5C.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-5C.png
index ef87bf92a2e..64b85578a84 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-5C.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-5C.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-5K.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-5K.png
index 9891e868a56..045c01969a9 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-5K.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-5K.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-5P.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-5P.png
index 35bf65c3819..a7a3c0f224b 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-5P.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-5P.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-5T.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-5T.png
index c700fe02155..79dfb5fd76f 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-5T.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-5T.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-6AT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-6AT.png
index 63b302112bd..eeeae641133 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-6AT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-6AT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-6C.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-6C.png
index 77c57f63626..aeecd1f277b 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-6C.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-6C.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-6K.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-6K.png
index 30f171483a2..1206bdbdd30 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-6K.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-6K.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-6P.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-6P.png
index f58346b8aa9..6e1d4f2ab24 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-6P.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-6P.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-6T.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-6T.png
index 41fd9df936d..d2548554ce8 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-6T.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-6T.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-7AT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-7AT.png
index 48492d74fce..03cd40b4147 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-7AT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-7AT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-7C.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-7C.png
index db5748f145e..2f255dc6274 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-7C.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-7C.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-7K.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-7K.png
index c308120066d..7ef37eaba18 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-7K.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-7K.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-7P.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-7P.png
index d2dc30f9354..d698af1992b 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-7P.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-7P.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-7T.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-7T.png
index ce49ddd1a1c..19a998cbaff 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-7T.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-7T.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-8AT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-8AT.png
index e8d50bf89fb..6cdff476dfe 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-8AT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-8AT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-8C.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-8C.png
index 9db298531ac..d31fc5c7c36 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-8C.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-8C.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-8K.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-8K.png
index ad2d973a57b..f5545b20eff 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-8K.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-8K.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-8P.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-8P.png
index 4a4a763faac..f342067f6b5 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-8P.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-8P.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-8T.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-8T.png
index 68c7761162f..3c0c19850d1 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-8T.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-8T.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-9AT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-9AT.png
index e07ae08c57c..63786f8e83a 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-9AT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-9AT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-9C.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-9C.png
index ad8d90b1cbd..4e783343c0a 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-9C.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-9C.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-9K.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-9K.png
index 300186f8355..9ac40389707 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-9K.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-9K.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-9P.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-9P.png
index 510803578f0..20a33a224dc 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-9P.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-9P.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-9T.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-9T.png
index 2c5f6b7d5ba..6d1952986e6 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-9T.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-9T.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-AC.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-AC.png
index 7ef4682fb04..b7da50fc3a3 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-AC.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-AC.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-AK.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-AK.png
index 8658a7417fa..657811d3ed7 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-AK.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-AK.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-AP.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-AP.png
index d9f37790b15..fa81068f40d 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-AP.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-AP.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-AT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-AT.png
index a5bb6ff59e7..7c8e4c8fb81 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-AT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-AT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-CC.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-CC.png
index e4a74c9fa70..fb9c5c2b4cd 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-CC.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-CC.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-CK.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-CK.png
index a16a9f4c3e1..f091530e3af 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-CK.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-CK.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-CP.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-CP.png
index 539819df05f..d41eaee49b0 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-CP.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-CP.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-CT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-CT.png
index fc45c569afb..319c8cedfb2 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-CT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-CT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-DC.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-DC.png
index 3ea415980b0..a7bc94d96a6 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-DC.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-DC.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-DK.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-DK.png
index 5f520f98675..01b22f76e70 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-DK.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-DK.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-DP.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-DP.png
index f5349b86e28..46fc995edc4 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-DP.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-DP.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-DT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-DT.png
index 220287bb722..9e9e3906499 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-DT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-DT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-Dos.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-Dos.png
index 4cc36a5cf9c..e4a2879a8c7 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-Dos.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-Dos.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-Exc.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-Exc.png
index 560e1f1473b..aeac134872c 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-Exc.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-Exc.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-RC.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-RC.png
index df94f090e4d..9ff480cae29 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-RC.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-RC.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-RK.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-RK.png
index cdc8117c376..8beccf96b6d 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-RK.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-RK.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-RP.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-RP.png
index 642d4756bc1..8f08aaa8a8e 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-RP.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-RP.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-RT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-RT.png
index 307f0efabc8..0be50e9f55f 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-RT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-RT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-VC.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-VC.png
index ceacfaecfbf..a88eccda7d2 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-VC.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-VC.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-VK.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-VK.png
index bc5598bb00e..20ae0918bce 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-VK.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-VK.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-VP.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-VP.png
index b2d53510f8d..0f7d4cb104d 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-VP.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-VP.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-VT.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-VT.png
index 73a743ad26e..c1d2eb779a9 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-VT.png
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Tarot-VT.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-0B.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-0B.png
new file mode 100644
index 00000000000..05114490ebc
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-0B.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-0J.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-0J.png
new file mode 100644
index 00000000000..f63aa68b1a7
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-0J.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-0R.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-0R.png
new file mode 100644
index 00000000000..3d8f05694b2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-0R.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-0V.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-0V.png
new file mode 100644
index 00000000000..bbe8dd3f766
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-0V.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-1B.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-1B.png
new file mode 100644
index 00000000000..098d378a319
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-1B.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-1J.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-1J.png
new file mode 100644
index 00000000000..cff7c99e764
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-1J.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-1R.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-1R.png
new file mode 100644
index 00000000000..8a65ad1afe6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-1R.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-1V.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-1V.png
new file mode 100644
index 00000000000..d61972f03fe
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-1V.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-2B.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-2B.png
new file mode 100644
index 00000000000..ebc489c4058
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-2B.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-2J.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-2J.png
new file mode 100644
index 00000000000..b79a3df08f2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-2J.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-2R.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-2R.png
new file mode 100644
index 00000000000..03580a3a18c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-2R.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-2V.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-2V.png
new file mode 100644
index 00000000000..4b27640c312
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-2V.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-3B.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-3B.png
new file mode 100644
index 00000000000..55c431c5d69
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-3B.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-3J.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-3J.png
new file mode 100644
index 00000000000..cc3265aa7eb
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-3J.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-3R.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-3R.png
new file mode 100644
index 00000000000..1349bedbc70
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-3R.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-3V.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-3V.png
new file mode 100644
index 00000000000..ba94e7ac2fa
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-3V.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-4B.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-4B.png
new file mode 100644
index 00000000000..6097938af6f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-4B.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-4J.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-4J.png
new file mode 100644
index 00000000000..fb8d19f44b8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-4J.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-4R.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-4R.png
new file mode 100644
index 00000000000..fea17c7b5b8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-4R.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-4V.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-4V.png
new file mode 100644
index 00000000000..b8747e1b8ec
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-4V.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-5B.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-5B.png
new file mode 100644
index 00000000000..ef9452d2a35
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-5B.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-5J.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-5J.png
new file mode 100644
index 00000000000..5efda76b2d6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-5J.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-5R.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-5R.png
new file mode 100644
index 00000000000..5d049fba70a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-5R.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-5V.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-5V.png
new file mode 100644
index 00000000000..fd7ae1198bd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-5V.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-6B.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-6B.png
new file mode 100644
index 00000000000..dff139e926a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-6B.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-6J.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-6J.png
new file mode 100644
index 00000000000..14253e13d7f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-6J.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-6R.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-6R.png
new file mode 100644
index 00000000000..be16264dba3
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-6R.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-6V.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-6V.png
new file mode 100644
index 00000000000..1ab72d00013
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-6V.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-7B.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-7B.png
new file mode 100644
index 00000000000..2bb2077e0c0
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-7B.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-7J.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-7J.png
new file mode 100644
index 00000000000..d9baae1f9f2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-7J.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-7R.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-7R.png
new file mode 100644
index 00000000000..697ae9b95cf
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-7R.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-7V.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-7V.png
new file mode 100644
index 00000000000..3df2c4822eb
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-7V.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-8B.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-8B.png
new file mode 100644
index 00000000000..2ad5440780a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-8B.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-8J.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-8J.png
new file mode 100644
index 00000000000..9ae59a01a75
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-8J.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-8R.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-8R.png
new file mode 100644
index 00000000000..fb410389abd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-8R.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-8V.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-8V.png
new file mode 100644
index 00000000000..412cb7a8f62
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-8V.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-9B.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-9B.png
new file mode 100644
index 00000000000..f303c104a17
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-9B.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-9J.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-9J.png
new file mode 100644
index 00000000000..db8fa3d2b90
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-9J.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-9R.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-9R.png
new file mode 100644
index 00000000000..489c8aaab10
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-9R.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-9V.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-9V.png
new file mode 100644
index 00000000000..1c3f7380d97
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-9V.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-CSB.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-CSB.png
new file mode 100644
index 00000000000..c3a02a5a97d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-CSB.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-CSJ.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-CSJ.png
new file mode 100644
index 00000000000..541cffa5307
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-CSJ.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-CSR.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-CSR.png
new file mode 100644
index 00000000000..e2150953371
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-CSR.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-CSV.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-CSV.png
new file mode 100644
index 00000000000..1792f42e63d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-CSV.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-Dos.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-Dos.png
new file mode 100644
index 00000000000..62451d6c4a8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-Dos.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-P2B.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-P2B.png
new file mode 100644
index 00000000000..54f6070d302
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-P2B.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-P2J.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-P2J.png
new file mode 100644
index 00000000000..730cd6a8866
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-P2J.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-P2R.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-P2R.png
new file mode 100644
index 00000000000..180c597c57e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-P2R.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-P2V.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-P2V.png
new file mode 100644
index 00000000000..0a9fa5b96bd
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-P2V.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-P4.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-P4.png
new file mode 100644
index 00000000000..dc30b311ac2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-P4.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-PTJ.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-PTJ.png
new file mode 100644
index 00000000000..1077bd10dcf
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-PTJ.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-PTR.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-PTR.png
new file mode 100644
index 00000000000..c79f71ab6a6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-PTR.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-PTV.png b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-PTV.png
new file mode 100644
index 00000000000..8f71738c1d4
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/CaJ-Uno-PTV.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/Caj-Uno-Coul.png b/Master/texmf-dist/tex/latex/jeuxcartes/Caj-Uno-Coul.png
new file mode 100644
index 00000000000..6ff22574f7c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/Caj-Uno-Coul.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/Caj-Uno-PTB.png b/Master/texmf-dist/tex/latex/jeuxcartes/Caj-Uno-PTB.png
new file mode 100644
index 00000000000..d5822926cdc
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/Caj-Uno-PTB.png
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/jeuxcartes/JeuxCartes.sty b/Master/texmf-dist/tex/latex/jeuxcartes/JeuxCartes.sty
index 5dfd0b5a032..684902535b1 100644
--- a/Master/texmf-dist/tex/latex/jeuxcartes/JeuxCartes.sty
+++ b/Master/texmf-dist/tex/latex/jeuxcartes/JeuxCartes.sty
@@ -3,9 +3,12 @@
% or later, see http://www.latex-project.org/lppl.txtf
% Poker cards Image's Licence : LGPL-2.1 license https://github.com/htdebeer/SVG-cards
% Tarot cards Image's Licence : Public Domain https://freesvg.org/deck-of-french-tarot-playing-cards
+% Uno cards Image's Licence : CC1.0 https://alexder.itch.io/uno-card-game-asset-pack
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{JeuxCartes}[2022/10/26 v0.1.2 Jeux de cartes]
+\ProvidesPackage{JeuxCartes}[2022/10/28 v0.1.3 Jeux de cartes]
+% 0.1.3 Ajout de cartes Uno (CC1.0 par AlexDer) + modification des commandes + rami
+% Amélioration de la qualité des cartes de Tarot (sans augmenter la taille)
% 0.1.2 Modification du nom (et de la source) des images de Tarot (CC0)
% 0.1.1 Ajout de commandes pour des mini-cartes
% 0.1 Version initiale
@@ -14,7 +17,7 @@
\RequirePackage{graphicx}
\RequirePackage[table,svgnames]{xcolor}
\RequirePackage{tikz}
-\RequirePackage{pgf,pgffor}
+\RequirePackage{pgffor}
\RequirePackage{xfp}
\RequirePackage{listofitems}
\RequirePackage{xstring}
@@ -27,6 +30,7 @@
\usetikzlibrary{calc,scopes}
%images venant de https://github.com/htdebeer/SVG-cards
%images venant de https://freesvg.org/deck-of-french-tarot-playing-cards
+%images venant de https://alexder.itch.io/uno-card-game-asset-pack
%------Commande en ligne (includegraphics) via raisebox/rotatebox ou tikz
\defKV[AffCarteJeu]{%
@@ -54,8 +58,12 @@
%cas poker
\IfStrEq{\AffCarteJeuType}{Poker}%poker
{\def\CartePrefixe{CaJ-Poker-}}{}%
+ %cas tarot
\IfStrEq{\AffCarteJeuType}{Tarot}%tarot
{\def\CartePrefixe{CaJ-Tarot-}}{}%
+ %cas tarot
+ \IfStrEq{\AffCarteJeuType}{Uno}%tarot
+ {\def\CartePrefixe{CaJ-Uno-}}{}%
%transformation valign en tikz
\def\OptionTikzCBB{current bounding box.center}%
\IfStrEq{\AffCarteJeuAlignementV}{0}%
@@ -80,6 +88,30 @@
}%
}
+%------commande main simple (cartes côte à côte)
+\defKV[AffMainSimpleCartes]{%
+ Hauteur=\def\MainSimpleHauteur{#1},%
+ TypeJeu=\def\MainSimpleJeuType{#1}
+}
+\setKVdefault[AffMainSimpleCartes]{%
+ Hauteur=4.25,%
+ TypeJeu=Poker
+}
+
+\NewDocumentCommand\AffCartesJeu{ O{} m }{%1=options,2=listecartes
+ \useKVdefault[AffMainSimpleCartes]%
+ \setKV[AffMainSimpleCartes]{#1}%
+ %calculs et traitement des variables
+ \setsepchar{§}%
+ \readlist*\ListeCartesMain{#2}%
+ \def\NbCartesMain{\ListeCartesMainlen}%nbcartes
+ %main côte à côte
+ \foreach \i in {1,2,...,\ListeCartesMainlen}{%
+ \itemtomacro\ListeCartesMain[\i]\CarteMain%
+ \AffCarteJeu[TypeJeu=\MainSimpleJeuType,Hauteur=\MainSimpleHauteur]{\CarteMain}%
+ }%
+}
+
%------commande main cartes
\defKV[AffMainCartes]{%
Hauteur=\def\MainHauteur{#1},%
@@ -99,7 +131,7 @@
AlignementV=0.5
}
-\NewDocumentCommand\CartesJeu{ O{} m }{%1=options,2=listecartes
+\NewDocumentCommand\MainCartesJeu{ O{} m }{%1=options,2=listecartes
\useKVdefault[AffMainCartes]%
\setKV[AffMainCartes]{#1}%
%calculs et traitement des variables
@@ -111,6 +143,9 @@
{\def\HauteurGenerique{8.5}\def\CarteMainPrefixe{CaJ-Poker-}}{}%
\IfStrEq{\MainJeuType}{Tarot}%tarot
{\def\HauteurGenerique{5.5}\def\CarteMainPrefixe{CaJ-Tarot-}}{}%
+ \IfStrEq{\MainJeuType}{Uno}%uno
+ {\def\HauteurGenerique{8.5}\def\CarteMainPrefixe{CaJ-Uno-}}{}%
+ %echelle globale
\def\EchelleCarteDecalage{\fpeval{\MainHauteur/\HauteurGenerique}}%
%transformation valign en tikz
\def\OptionTikzCBB{current bounding box.center}%
@@ -160,19 +195,25 @@
\xdef\CartesJeuPoker{2P,3P,4P,5P,6P,7P,8P,9P,10P,VP,DP,RP,AP,2T,3T,4T,5T,6T,7T,8T,9T,10T,VT,DT,RT,AT,2C,3C,4C,5C,6C,7C,8C,9C,10C,VC,DC,RC,AC,2K,3K,4K,5K,6K,7K,8K,9K,10K,VK,DK,RK,AK}%
\xdef\CartesJeuBelote{7P,8P,9P,10P,VP,DP,RP,AP,7T,8T,9T,10T,VT,DT,RT,AT,7C,8C,9C,10C,VC,DC,RC,AC,7K,8K,9K,10K,VK,DK,RK,AK}%
\xdef\CartesJeuBataille{2P,3P,4P,5P,6P,7P,8P,9P,10P,VP,DP,RP,AP,2T,3T,4T,5T,6T,7T,8T,9T,10T,VT,DT,RT,AT,2C,3C,4C,5C,6C,7C,8C,9C,10C,VC,DC,RC,AC,2K,3K,4K,5K,6K,7K,8K,9K,10K,VK,DK,RK,AK,JN,JR}%
+\xdef\CartesJeuRami{2P,3P,4P,5P,6P,7P,8P,9P,10P,VP,DP,RP,AP,2T,3T,4T,5T,6T,7T,8T,9T,10T,VT,DT,RT,AT,2C,3C,4C,5C,6C,7C,8C,9C,10C,VC,DC,RC,AC,2K,3K,4K,5K,6K,7K,8K,9K,10K,VK,DK,RK,AK,JN,JR,2P,3P,4P,5P,6P,7P,8P,9P,10P,VP,DP,RP,AP,2T,3T,4T,5T,6T,7T,8T,9T,10T,VT,DT,RT,AT,2C,3C,4C,5C,6C,7C,8C,9C,10C,VC,DC,RC,AC,2K,3K,4K,5K,6K,7K,8K,9K,10K,VK,DK,RK,AK,JN,JR}%
\xdef\CartesJeuTarot{2P,3P,4P,5P,6P,7P,8P,9P,10P,VP,CP,DP,RP,AP,2T,3T,4T,5T,6T,7T,8T,9T,10T,VT,CT,DT,RT,AT,2C,3C,4C,5C,6C,7C,8C,9C,10C,VC,CC,DC,RC,AC,2K,3K,4K,5K,6K,7K,8K,9K,10K,VK,CK,DK,RK,AK,1AT,2AT,3AT,4AT,5AT,6AT,7AT,8AT,9AT,10AT,11AT,12AT,13AT,14AT,15AT,16AT,17AT,18AT,19AT,20AT,21AT,Exc}%
+\xdef\CartesJeuUno{0B,1B,1B,2B,2B,3B,3B,4B,4B,5B,5B,6B,6B,7B,7B,8B,8B,9B,9B,PTB,PTB,CSB,CSB,P2B,P2B,0V,1V,1V,2V,2V,3V,3V,4V,4V,5V,5V,6V,6V,7V,7V,8V,8V,9V,9V,PTV,PTV,CSV,CSV,P2V,P2V,0J,1J,1J,2J,2J,3J,3J,4J,4J,5J,5J,6J,6J,7J,7J,8J,8J,9J,9J,PTJ,PTJ,CSJ,CSJ,P2J,P2J,0R,1R,1R,2R,2R,3R,3R,4R,4R,5R,5R,6R,6R,7R,7R,8R,8R,9R,9R,PTR,PTR,CSR,CSR,P2R,P2R,P4,P4,P4,P4,Coul,Coul,Coul,Coul}%
\NewList{CartesJeuMelange}
-\NewDocumentCommand\CartesJeuAleatoire{ O{} m }{%1=options,2=nbcartes
+\NewDocumentCommand\MainCartesJeuAleatoire{ O{} m }{%1=options,2=nbcartes
\useKVdefault[AffMainAleaCartes]%
\setKV[AffMainAleaCartes]{#1}%
%calculs et traitement des variables
\IfStrEq{\MainJeuType}{Poker}%poker
{\def\HauteurGenerique{8.5}\def\CarteMainType{Poker}\xdef\CarteDebutRand{\fpeval{randint(0,52-#2)}}}{}%
+ \IfStrEq{\MainJeuType}{Uno}%uno
+ {\def\HauteurGenerique{8.5}\def\CarteMainType{Uno}\xdef\CarteDebutRand{\fpeval{randint(0,108-#2)}}}{}%
\IfStrEq{\MainJeuType}{Bataille}%bataille
{\def\HauteurGenerique{8.5}\def\CarteMainType{Poker}\xdef\CarteDebutRand{\fpeval{randint(0,54-#2)}}}{}%
\IfStrEq{\MainJeuType}{Belote}%poker
{\def\HauteurGenerique{8.5}\def\CarteMainType{Poker}\xdef\CarteDebutRand{\fpeval{randint(0,32-#2)}}}{}%
+ \IfStrEq{\MainJeuType}{Rami}%rami
+ {\def\HauteurGenerique{8.5}\def\CarteMainType{Poker}\xdef\CarteDebutRand{\fpeval{randint(0,108-#2)}}}{}%
\IfStrEq{\MainJeuType}{Tarot}%tarot
{\def\HauteurGenerique{6.375}\def\CarteMainType{Tarot}\xdef\CarteDebutRand{\fpeval{randint(0,78-#2)}}}{}%
%échelle relative des cartes
@@ -197,6 +238,18 @@
\do{\InsertRandomItem{CartesJeuMelange}{##1}}%
}%
{}%
+ \IfStrEq{\MainJeuType}{Rami}%si c'est le rami
+ {%
+ \xintFor* ##1 in {\xintCSVtoList{\CartesJeuRami}}%
+ \do{\InsertRandomItem{CartesJeuMelange}{##1}}%
+ }%
+ {}%
+ \IfStrEq{\MainJeuType}{Uno}%si c'est le uno
+ {%
+ \xintFor* ##1 in {\xintCSVtoList{\CartesJeuUno}}%
+ \do{\InsertRandomItem{CartesJeuMelange}{##1}}%
+ }%
+ {}%
\IfStrEq{\MainJeuType}{Belote}%si c'est le poker
{%
\xintFor* ##1 in {\xintCSVtoList{\CartesJeuBelote}}%
@@ -240,7 +293,7 @@
FondAtout=PeachPuff
}
-\NewDocumentCommand\MiniCarteJeu{ O{} m }{%1=options,2=nbcartes
+\NewDocumentCommand\AffMiniCarteJeu{ O{} m }{%1=options,2=nbcartes
\useKVdefault[AffMiniCartes]%
\setKV[AffMiniCartes]{#1}%
%découpage de l'argument
@@ -300,14 +353,14 @@
FondAtout=PeachPuff
}
-\NewDocumentCommand\MiniCartesJeu{ O{} m }{%1=options,2=liste
+\NewDocumentCommand\MainMiniCartesJeu{ O{} m }{%1=options,2=liste
\useKVdefault[AffMiniMainCartes]%
\setKV[AffMiniMainCartes]{#1}%
\ignoreemptyitems%
\setsepchar{§}%
\readlist*\MiniCartesMain{#2}%
\foreachitem\MiniCarteAffich\in\MiniCartesMain{%
- \MiniCarteJeu[FondAtout=\MiniMainFondAtout,Largeur=\MiniMainLargeur]{\MiniCarteAffich}%
+ \AffMiniCarteJeu[FondAtout=\MiniMainFondAtout,Largeur=\MiniMainLargeur]{\MiniCarteAffich}%
}%
}
@@ -327,9 +380,10 @@
\xdef\MiniCartesJeuBelote{7.P,8.P,9.P,10.P,V.P,D.P,R.P,A.P,7.T,8.T,9.T,10.T,V.T,D.T,R.T,A.T,7.C,8.C,9.C,10.C,V.C,D.C,R.C,A.C,7.K,8.K,9.K,10.K,V.K,D.K,R.K,A.K}%
\xdef\MiniCartesJeuBataille{2.P,3.P,4.P,5.P,6.P,7.P,8.P,9.P,10.P,V.P,D.P,R.P,A.P,2.T,3.T,4.T,5.T,6.T,7.T,8.T,9.T,10.T,V.T,D.T,R.T,A.T,2.C,3.C,4.C,5.C,6.C,7.C,8.C,9.C,10.C,V.C,D.C,R.C,A.C,2.K,3.K,4.K,5.K,6.K,7.K,8.K,9.K,10.K,V.K,D.K,R.K,A.K,J.N,J.R}%
\xdef\MiniCartesJeuTarot{2.P,3.P,4.P,5.P,6.P,7.P,8.P,9.P,10.P,V.P,C.P,D.P,R.P,A.P,2.T,3.T,4.T,5.T,6.T,7.T,8.T,9.T,10.T,V.T,C.T,D.T,R.T,A.T,2.C,3.C,4.C,5.C,6.C,7.C,8.C,9.C,10.C,V.C,C.C,D.C,R.C,A.C,2.K,3.K,4.K,5.K,6.K,7.K,8.K,9.K,10.K,V.K,C.K,D.K,R.K,A.K,1.AT,2.AT,3.AT,4.AT,5.AT,6.AT,7.AT,8.AT,9.AT,10.AT,11.AT,12.AT,13.AT,14.AT,15.AT,16.AT,17.AT,18.AT,19.AT,20.AT,21.AT,Exc}%
+\xdef\MiniCartesJeuRami{2.P,3.P,4.P,5.P,6.P,7.P,8.P,9.P,10.P,V.P,D.P,R.P,A.P,2.T,3.T,4.T,5.T,6.T,7.T,8.T,9.T,10.T,V.T,D.T,R.T,A.T,2.C,3.C,4.C,5.C,6.C,7.C,8.C,9.C,10.C,V.C,D.C,R.C,A.C,2.K,3.K,4.K,5.K,6.K,7.K,8.K,9.K,10.K,V.K,D.K,R.K,A.K,J.N,J.R,2.P,3.P,4.P,5.P,6.P,7.P,8.P,9.P,10.P,V.P,D.P,R.P,A.P,2.T,3.T,4.T,5.T,6.T,7.T,8.T,9.T,10.T,V.T,D.T,R.T,A.T,2.C,3.C,4.C,5.C,6.C,7.C,8.C,9.C,10.C,V.C,D.C,R.C,A.C,2.K,3.K,4.K,5.K,6.K,7.K,8.K,9.K,10.K,V.K,D.K,R.K,A.K,J.N,J.R}%
\NewList{MiniCartesJeuMelange}
-\NewDocumentCommand\MiniCartesJeuAleatoire{ O{} m }{%1=options,2=nbcartes
+\NewDocumentCommand\MainMiniCartesJeuAleatoire{ O{} m }{%1=options,2=nbcartes
\useKVdefault[MiniMainAleaCartes]%
\setKV[MiniMainAleaCartes]{#1}%
%melange du jeu
@@ -346,7 +400,7 @@
\do{\InsertRandomItem{MiniCartesJeuMelange}{##1}}%
}%
{}%
- \IfStrEq{\MiniMainAleaType}{Belote}%si c'est le poker
+ \IfStrEq{\MiniMainAleaType}{Belote}%si c'est le belote
{%
\xintFor* ##1 in {\xintCSVtoList{\MiniCartesJeuBelote}}%
\do{\InsertRandomItem{MiniCartesJeuMelange}{##1}}%
@@ -358,10 +412,16 @@
\do{\InsertRandomItem{MiniCartesJeuMelange}{##1}}%
}%
{}%
+ \IfStrEq{\MiniMainAleaType}{Rami}%si c'est le rami
+ {%
+ \xintFor* ##1 in {\xintCSVtoList{\MiniCartesJeuRami}}%
+ \do{\InsertRandomItem{MiniCartesJeuMelange}{##1}}%
+ }%
+ {}%
%création de la main
\foreach \i in {1,2,...,#2}{%
\GetItem{MiniCartesJeuMelange}{\inteval{\i-1}}{MiniCarteMainChoisie}%
- \MiniCarteJeu[FondAtout=\MiniMainAleaFondAtout,Largeur=\MiniMainAleaLargeur]{\MiniCarteMainChoisie}%
+ \AffMiniCarteJeu[FondAtout=\MiniMainAleaFondAtout,Largeur=\MiniMainAleaLargeur]{\MiniCarteMainChoisie}%
}%finpour
}