pas-tableur (16apr23)

git-svn-id: svn://tug.org/texlive/trunk@66860 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 23 insertions, 20 deletions

diff --git a/Master/texmf-dist/tex/latex/pas-tableur/pas-tableur.sty b/Master/texmf-dist/tex/latex/pas-tableur/pas-tableur.sty
index e98aa208bcb..a2de8687f22 100644
--- a/Master/texmf-dist/tex/latex/pas-tableur/pas-tableur.sty
+++ b/Master/texmf-dist/tex/latex/pas-tableur/pas-tableur.sty
@@ -1,6 +1,6 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                         %
-%        pas-tableur.sty  v2.01     encodage : UTF8       %
+%        pas-tableur.sty  v2.05     encodage : UTF8       %
 %                                                         %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                         %
@@ -8,8 +8,8 @@
 %                                                         %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % 
-\def\fileversion{2.1}
-\def\filedate{2016/01/31}
+\def\fileversion{2.04}
+\def\filedate{2023/04/16}
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesClass{pas-tableur}[%
   \filedate\space v\fileversion\space
@@ -220,14 +220,17 @@
 			}%
 	} % --> Fin de \tableur
 %	
-% Inserer quelque chose dans une cellule : \celtxt [modif. du 2016/01/21 due \`a "Un bon petit"]
+% Inserer quelque chose dans une cellule : \celtxt [modif. du 2016/01/21 due a "Un bon petit"]
 %
 \define@cmdkey [PAS] {celtxt} {width}{}
 \define@cmdkey [PAS] {celtxt} {color}{}
+\define@cmdkey [PAS] {celtxt} {align}{} % NEW 2023-04_16
+\define@cmdkey [PAS] {celtxt} {font}{} % NEW 2016-06-18
+\define@boolkey [PAS] {celtxt} {ajust}[true]{} % NEW 2016-06-20
 \define@boolkey [PAS] {celtxt} {l}[true]{}
-\define@boolkey [PAS] {celtxt} {r}[true]{}
-\define@boolkey [PAS] {celtxt} {c}[true]{} 
-\presetkeys    [PAS] {celtxt} {width = \col@width, color=black}{}
+\define@boolkey [PAS] {celtxt} {r}[false]{}
+\define@boolkey [PAS] {celtxt} {c}[false]{} 
+\presetkeys    [PAS] {celtxt} {width = \col@width, color=black, font=\normalsize, ajust=false, align=left}{}
 %
 \newcommand*\celtxt@catcoderegime@begin{}
 \newcommand*\celtxt@catcoderegime@end{}
@@ -238,7 +241,8 @@
 		\let\celtxt@catcoderegime@end\@empty
 		\let\celtxt@catcoderegime@begin\@empty
 		\celtxt@i
-	  }{%
+	  }
+	  {%
 		\def\celtxt@catcoderegime@begin{%
 		  \begingroup
 		  \@makeother\^%
@@ -254,24 +258,23 @@
 \newcommand*\celtxt@ii[3]
 	{%
 	   \setkeys[PAS]{celtxt}{#1}%
-	   \celtxt@catcoderegime@begin
+	   \ifPAS@celtxt@ajust\else\celtxt@catcoderegime@begin\fi
 	   \celtxt@iii{#1}{#2}{#3}%
 	}
 %
+
 \newcommand*\celtxt@iii[4]
 	{%
-	   \celtxt@catcoderegime@end
-	   \IfBeginWith{#4}{=}{\let\pastab@style\texttt}{\let\pastab@style\@empty}
-	   \ifPAS@celtxt@c
-			\def\pos@align{c}%
+	   \ifPAS@celtxt@ajust
+			\IfStrEq{\cmdPAS@celtxt@align}{right}{\def\postab@align{r}}{}
+			\IfStrEq{\cmdPAS@celtxt@align}{left}{\def\postab@align{l}}{}
+			\IfStrEq{\cmdPAS@celtxt@align}{center}{\def\postab@align{c}}{}
+			\node[text width=\dimexpr\cmdPAS@celtxt@width-4pt, align=\cmdPAS@celtxt@align, color=\cmdPAS@celtxt@color, font=\cmdPAS@celtxt@font, execute at begin node=\setlength{\baselineskip}{2pt}] at (cell#2-#3) {\begin{tabular}{@{}\postab@align @{}}#4\end{tabular}};% 
 	   \else
-			\ifPAS@celtxt@r
-				\def\pos@align{r}%
-			\else
-				\def\pos@align{l}%
-			\fi
-	   \fi
-	   \node at (cell#2-#3) {\makebox[\dimexpr\cmdPAS@celtxt@width-2pt][\pos@align]{\pastab@style{\textcolor{\cmdPAS@celtxt@color}{#4}}}};%
+			\celtxt@catcoderegime@end
+			\IfBeginWith{#4}{=}{\let\pastab@style\texttt}{\let\pastab@style\@empty}
+			\node[text width=\dimexpr\cmdPAS@celtxt@width-4pt,align=\cmdPAS@celtxt@align, color=\cmdPAS@celtxt@color, font=\cmdPAS@celtxt@font, execute at begin node=\setlength{\baselineskip}{2pt}] at (cell#2-#3) {\pastab@style{#4}};%
+		\fi
 	}
 %
 % Cellule selectionnee : \selecCell