From ea087d8fd6dc3e8eb9b3597ffacce86966a8d3c6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 1 Jan 2018 22:05:01 +0000 Subject: systeme (1jan18) git-svn-id: svn://tug.org/texlive/trunk@46184 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/generic/systeme/systeme.sty | 2 +- Master/texmf-dist/tex/generic/systeme/systeme.tex | 101 +++++++++++----------- 2 files changed, 50 insertions(+), 53 deletions(-) (limited to 'Master/texmf-dist/tex/generic/systeme') diff --git a/Master/texmf-dist/tex/generic/systeme/systeme.sty b/Master/texmf-dist/tex/generic/systeme/systeme.sty index c11eabb65e9..33ba751f0ae 100644 --- a/Master/texmf-dist/tex/generic/systeme/systeme.sty +++ b/Master/texmf-dist/tex/generic/systeme/systeme.sty @@ -1,4 +1,4 @@ \RequirePackage{xstring} \input systeme.tex -\ProvidesPackage\SYS@packagename[\SYS@date\space v\SYS@ver\space Mise en forme de systemes d'equations] +\ProvidesPackage\SYSname[\SYSdate\space v\SYSver\space Mise en forme de systemes d'equations (CT)] \endinput \ No newline at end of file diff --git a/Master/texmf-dist/tex/generic/systeme/systeme.tex b/Master/texmf-dist/tex/generic/systeme/systeme.tex index 57569613a46..1bceaa21725 100644 --- a/Master/texmf-dist/tex/generic/systeme/systeme.tex +++ b/Master/texmf-dist/tex/generic/systeme/systeme.tex @@ -1,59 +1,42 @@ -% __________________________________________________________________ -% | | -% | | -% | systeme v0.3 | -% | | -% | 21 d\'ecembre 2013 | -% | | -% |__________________________________________________________________| -% -% Ce fichier est systeme.tex, le code TeX de l'extention "systeme". -% -% Maintainer: Christian Tellechea -% E-mail : unbonpetit@gmail.com -% Commentaires, remont\'ees de bugs, et suggestions -% sont les bienvenus. -% Licence : Released under the LaTeX Project Public License v1.3c or -% later, see http://www.latex-project.org/lppl.txt -% Copyright : Christian Tellechea 2013 +% !TeX encoding = ISO-8859-1 +% Ce fichier contient le code de l'extension "systeme" +\expandafter\edef\csname SYS@savedatcatcode\endcsname{\number\catcode`\@} +\catcode`\@11 % -% Le package "systeme" est constitu\'e de ces 5 fichiers : -% systeme.tex (ce fichier) -% systeme.sty (le fichier pour LaTeX) -% README -% systeme_doc_fr.tex, systeme_doc_fr.pdf (manuel en francais) +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +\def\SYSname {systeme} % +\def\SYSver {0.31} % +% % +\def\SYSdate {2018/01/01} % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % -------------------------------------------------------------------- -% This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3 -% of this license or (at your option) any later version. -% The latest version of this license is in -% -% % http://www.latex-project.org/lppl.txt -% -% and version 1.3 or later is part of all distributions of LaTeX -% version 2005/12/01 or later. +% Author : Christian Tellechea +% Status : Maintained +% Email : unbonpetit@netc.fr +% Package URL: https://www.ctan.org/pkg/systeme +% Bug tracker: https://framagit.org/unbonpetit/systeme/issues +% Repository : https://framagit.org/unbonpetit/systeme/tree/master +% Copyright : Christian Tellechea 2017 +% Licence : Released under the LaTeX Project Public License v1.3c +% or later, see http://www.latex-project.org/lppl.txt +% Files : 1) systeme.tex +% 2) systeme.sty +% 3) systeme-fr.tex +% 4) systeme-fr.pdf +% 5) README % -------------------------------------------------------------------- -% This work has the LPPL maintenance status `maintained'. -% -% The Current Maintainer of this work is Christian Tellechea % -------------------------------------------------------------------- -\expandafter\edef\csname SYS@savedatcatcode\endcsname{\number\catcode`\@} - -\catcode`\@11 - \def\SYS@newmacro#1{% \ifdefined#1% \errmessage{Package systeme Error: la macro \string#1\space existe deja. Contacter l'auteur svp.}% \fi \def#1% } - -\SYS@newmacro\SYS@ver {0.3} -\SYS@newmacro\SYS@date {2013/12/21} -\SYS@newmacro\SYS@longdate {21 d\'ecembre 2013} -\SYS@newmacro\SYS@packagename{systeme} +\SYS@newmacro\SYSlongdate {1\ier{} janvier 218} \newtoks\SYS@systemecode \newtoks\SYS@systempreamble @@ -70,7 +53,7 @@ \expandafter\ifx\csname @latexerr\endcsname\relax% on n'utilise pas LaTeX ? \ifdefined\xstringversion\else\def\SYS@nextaction{\input xstring.tex}\expandafter\SYS@nextaction\fi - \immediate\write\m@ne{Package: \SYS@packagename\space\SYS@date\space\space v\SYS@ver\space\space Saisie naturelle de systemes d'equations}% + \immediate\write\m@ne{Package: \SYSname\space\SYSdate\space\space v\SYSver\space\space Saisie naturelle de systemes d'equations}% \newskip\normalbaselineskip \normalbaselineskip=12pt \long\def\@firstoftwo#1#2{#1} \long\def\@secondoftwo#1#2{#2} @@ -254,7 +237,13 @@ \expandafter\SYS@findletter\expandafter{\SYS@currentterm}% trouver le nom de la variable \ifx\SYS@letterfound\@empty \SYS@consttermtrue - \def\SYS@letterfound{const}% + \ifcsname SYS@term@const@\SYS@eqnumber\endcsname% si terme constant d\'ej\`a rencontr\'e, l'ajouter \`a celui qui existe + \SYS@expaddtocs\SYS@currentsign\SYS@currentterm + \expandafter\SYS@expaddtocs\csname SYS@term@const@\SYS@eqnumber\endcsname{\SYS@currentsign}% + \else + \SYS@cslet{SYS@sign@const@\SYS@eqnumber}\SYS@currentsign% sinon proc\'eder aux assignations + \SYS@cslet{SYS@term@const@\SYS@eqnumber}\SYS@currentterm + \fi \else \ifcsname SYS@term@\detokenize\expandafter{\SYS@letterfound}@\SYS@eqnumber\endcsname \errmessage{Package systeme Error: l'inconnue "\detokenize\expandafter{\SYS@letterfound}" a deja ete trouvee dans l'equation !}% @@ -262,9 +251,10 @@ \ifSYS@sortvariable \SYS@insletter\SYS@letterfound% l'ins\'erer si besoin dans la liste ordonn\'ee des variables \fi +% \show\SYS@letterlist + \SYS@cslet{SYS@sign@\detokenize\expandafter{\SYS@letterfound}@\SYS@eqnumber}\SYS@currentsign% proc\'eder aux assignations + \SYS@cslet{SYS@term@\detokenize\expandafter{\SYS@letterfound}@\SYS@eqnumber}\SYS@currentterm \fi - \SYS@cslet{SYS@sign@\detokenize\expandafter{\SYS@letterfound}@\SYS@eqnumber}\SYS@currentsign% proc\'eder aux assignations - \SYS@cslet{SYS@term@\detokenize\expandafter{\SYS@letterfound}@\SYS@eqnumber}\SYS@currentterm } % cherche la premi\`ere lettre minuscule dans #1 @@ -317,7 +307,9 @@ \SYS@newmacro\SYS@testsubscript{% \noexploregroups \IfBeginWith\SYS@currentfindletter_% - {\StrChar\SYS@currentfindletter\tw@[\SYS@currentletterafter]% + {%\StrChar\SYS@currentfindletter\tw@[\SYS@currentletterafter]% TODO BUGFIX + \StrGobbleLeft\SYS@currentfindletter1[\SYS@currentletterafter]% +% \show\SYS@currentletterafter \exploregroups \StrRemoveBraces\SYS@currentletterafter[\SYS@currentletterafter]% \IfInteger\SYS@currentletterafter @@ -440,8 +432,9 @@ \else \ifSYS@constterm \SYS@addtocode{{}}% - \expandafter\SYS@expaddtocode\expandafter{\csname SYS@sign@const@#1\endcsname{}&}% - \expandafter\SYS@expaddtocode\expandafter{\csname SYS@term@const@#1\endcsname}% + \ifSYS@firstterm\else\expandafter\SYS@expaddtocode\expandafter{\csname SYS@sign@const@#1\endcsname}\fi + \SYS@addtocode{{}&}% + \expandafter\SYS@expaddtocode\expandafter{\csname SYS@term@const@#1\endcsname&}% \fi \ifcsname SYS@eqsign@#1\endcsname \SYS@addtocode{{}}% @@ -688,4 +681,8 @@ v0.2b 2011/06/23 extensibles plac\'es de part et d'autre du syst\`eme. ---------------------------------------------------------------------- v0.3 21/12/2013 - - Un terme constant est permis dans le membre de gauche \ No newline at end of file + - Un terme constant est permis dans le membre de gauche + ---------------------------------------------------------------------- +v0.31 01/01/2018 + - Il manquait un "&" apr\`es le terme constant, merci \`a Thomas Soll + de l'avoir signal\'e \ No newline at end of file -- cgit v1.2.3