From ed791132736e91eb8e0b3c66c29bd4babd7c6b71 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 6 Jul 2023 19:47:31 +0000 Subject: profsio (6jul23) git-svn-id: svn://tug.org/texlive/trunk@67562 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/profsio/ProfSio-doc-fr.pdf | Bin 307885 -> 312457 bytes .../doc/latex/profsio/ProfSio-doc-fr.tex | 38 ++++++++-- Master/texmf-dist/tex/latex/profsio/ProfSio.sty | 83 ++++++++++++++------- 3 files changed, 89 insertions(+), 32 deletions(-) diff --git a/Master/texmf-dist/doc/latex/profsio/ProfSio-doc-fr.pdf b/Master/texmf-dist/doc/latex/profsio/ProfSio-doc-fr.pdf index 3c07f06d1c1..2cb83a3d522 100644 Binary files a/Master/texmf-dist/doc/latex/profsio/ProfSio-doc-fr.pdf and b/Master/texmf-dist/doc/latex/profsio/ProfSio-doc-fr.pdf differ diff --git a/Master/texmf-dist/doc/latex/profsio/ProfSio-doc-fr.tex b/Master/texmf-dist/doc/latex/profsio/ProfSio-doc-fr.tex index 0d7a8b3b51b..b884128e875 100644 --- a/Master/texmf-dist/doc/latex/profsio/ProfSio-doc-fr.tex +++ b/Master/texmf-dist/doc/latex/profsio/ProfSio-doc-fr.tex @@ -5,8 +5,8 @@ \documentclass[french,a4paper,11pt]{article} \usepackage[margin=2cm,includefoot]{geometry} -\def\TPversion{0.1.2} -\def\TPdate{3 juillet 2023} +\def\TPversion{0.1.3} +\def\TPdate{6 juillet 2023} %\usepackage[utf8]{inputenc} %\usepackage[T1]{fontenc} \usepackage{amsmath,amssymb} @@ -84,7 +84,7 @@ morekeywords={\MPMPlaceTache,\MPMPlaceNotice,\MPMPlaceDuree,GrapheMPM,TableKarnaugh,\KarnaughCasesResult,\KarnaughBlocRegroup,\MPMPlaceTaches,\MPMPlaceDurees,GrapheTikz,\GrphPlaceSommets,\GrphTraceAretes,\tikzset,\DiagrammeSagittal,\draw,\DiagrammeSagittalCompo,\TableVerite},% keywordstyle={\color{green!50!black}},% classoffset=3,% - morekeywords={CouleurDurees,CouleurFleches,LargeurCases,Epaisseur,Police,CouleurDates,CouleurBords,NoirBlanc,Grille,DecalHorizDeb,DecalVertDeb,DecalHorizFin,DecalVertFin,Coude,SensCoude,Unite,Variables,Swap,Aide,CouleurCases,Decalage,Couleur,Type,Legende,PosVarLaterale,CouleurLegende,CouleurSommets,TypeSommets,Unite,CouleurFT,DimensionSommets,PositionFleches,EchelleFleches,TypeFleche,Droit,Milieu,AngleGauche,AngleDroite,Boucle,GrphStyleArc,GrphStyleSommet,Poids,GrphStylepoids,DistElem,DistEns,LargEns,NomAppli,CouleurE,CouleurAppli,CouleurF,CouleursFleches,TypeFleche,Epaisseur,Labels,Ensembles,PosLabels,PoliceLabels,Offset,NomApplis,CouleursAppli,VF,LargeursColonnes,CouleurEnonce,CodeAvant,CodeApres},% + morekeywords={CouleurDurees,CouleurFleches,LargeurCases,Epaisseur,Police,CouleurDates,CouleurBords,NoirBlanc,Grille,DecalHorizDeb,DecalVertDeb,DecalHorizFin,DecalVertFin,Coude,SensCoude,Unite,Variables,Swap,Aide,CouleurCases,Decalage,Couleur,Type,Legende,PosVarLaterale,CouleurLegende,CouleurSommets,TypeSommets,Unite,CouleurFT,DimensionSommets,PositionFleches,EchelleFleches,TypeFleche,Droit,Milieu,AngleGauche,AngleDroite,Boucle,GrphStyleArc,GrphStyleSommet,Poids,GrphStylepoids,DistElem,DistEns,LargEns,NomAppli,CouleurE,CouleurAppli,CouleurF,CouleursFleches,TypeFleche,Epaisseur,Labels,Ensembles,PosLabels,PoliceLabels,Offset,NomApplis,CouleursAppli,VF,LargeursColonnes,CouleurEnonce,CodeAvant,CodeApres,StyleAlternatif,PoliceTT},% keywordstyle={\color{orange}} },% #1 @@ -205,7 +205,7 @@ \KarnaughBlocRegroup[Type=Droite,Couleur=red!75,Decalage=-1.5pt]{40}{31} \end{TableKarnaugh} \hspace{1cm} -\begin{TableKarnaugh}[Variables=u/v/w,Swap,CouleurCases=lime] +\begin{TableKarnaugh}[Variables=u/v/w,Swap,CouleurCases=lime,PoliceTT] \KarnaughCasesResult*{1,1,1,1,1,0,0,0} \KarnaughBlocRegroup[Type=Centre,Couleur=blue!75,Decalage=-1.5pt]{00}{12} \KarnaughBlocRegroup[Type=Centre,Couleur=red!75,Decalage=-1.15pt]{01}{42} @@ -255,6 +255,8 @@ \section{Historique} +\verb|v0.1.3|~:~~~~Style alternatif et Clé \Cle{PoliceTT} pour les tables de Karnaugh + \verb|v0.1.2|~:~~~~Clé \Cle{Offset} pour les diagrammes sagittaux + Diagrammes sagittaux de composées. \verb| |~:~~~~Ajout des tables de vérité (via \hologo{LuaLaTeX}). @@ -645,14 +647,14 @@ Les commandes à utiliser dans l'environnement sont : \begin{DemoCode}[] \begin{TableKarnaugh}[Aide] \end{TableKarnaugh} -\hspace{0.5cm} +\hspace{0.25cm} \begin{TableKarnaugh}[Variables=u/v/w] \KarnaughCasesResult{0,1,1,0,1,1,1,1} \KarnaughBlocRegroup[Type=Centre,Couleur=blue!75,Decalage=-1.5pt]{10}{32} \KarnaughBlocRegroup[Type=Gauche,Couleur=red!75,Decalage=-1.5pt]{00}{11} \KarnaughBlocRegroup[Type=Droite,Couleur=red!75,Decalage=-1.5pt]{40}{31} \end{TableKarnaugh} -\hspace{0.5cm} +\hspace{0.25cm} \begin{TableKarnaugh}[Variables=u/v/w,Swap] \end{TableKarnaugh} @@ -690,6 +692,9 @@ En ce qui concerne la création de l'environnement, les \Cle{clés} sont : \item \Cle{CouleurLegende} := couleur de la légende, via \Cle{Couleur} ou \Cle{CouleurA/CouleurB/CouleurC} ; \hfill~défaut : \Cle{black} + \item \Cle{StyleAternatif} := booléen pour changer de style ; \hfill~défaut : \Cle{false} + \item \Cle{AideAlt} := booléen pour (dés)activer le label \textit{binaire} des cases ; \hfill~défaut : \Cle{true} + \item \Cle{PoliceTT} := booléen pour forcer les labels en police télétype ; \hfill~défaut : \Cle{false} \item \Cle{PosVarLaterale} := position de la variable \textit{latérale}.\hfill~défaut : \Cle{Gauche} \end{itemize} @@ -771,7 +776,8 @@ Les deux arguments obligatoires, et entre \texttt{\{...\}}, correspondent aux \t \begin{DemoCode}[] On obtient le tableau de Karnaugh suivant : \begin{TableKarnaugh} - [Variables=k/l/m,Unite=1.25cm,CouleurCases=cyan!25,Couleur=darkgray, PosVarLaterale=Droite,CouleurLegende=black/blue/red] + [Variables=k/l/m,Unite=1.25cm,CouleurCases=cyan!25,Couleur=darkgray, + PosVarLaterale=Droite,CouleurLegende=black/blue/red] \KarnaughCasesResult*{1,1,1,0,1,1,1,0} \KarnaughBlocRegroup[Type=Centre,Couleur=brown,Decalage=-3pt]{00}{22} @@ -779,6 +785,24 @@ On obtient le tableau de Karnaugh suivant : \end{TableKarnaugh} \end{DemoCode} +\begin{DemoCode}[] +\begin{TableKarnaugh} + [Variables=k/l/m,Unite=1.25cm,Couleur=darkgray, PosVarLaterale=Droite,CouleurLegende=black/blue/red, + StyleAlternatif] + \KarnaughCasesResult{1,1,1,0,1,1,1,0} + \KarnaughBlocRegroup[Type=Centre,Couleur=brown,Decalage=-3pt]{00}{22} + \KarnaughBlocRegroup[Type=Centre,Couleur=teal,Decalage=-1.5pt]{10}{32} +\end{TableKarnaugh} +\hspace{5mm} +\begin{TableKarnaugh} + [Variables=k/l/m,Unite=1.25cm,CouleurCases=cyan!25,Couleur=darkgray, PosVarLaterale=Droite,CouleurLegende=black/blue/red, + PoliceTT] + \KarnaughCasesResult*{1,1,1,0,1,1,1,0} + \KarnaughBlocRegroup[Type=Centre,Couleur=brown,Decalage=-3pt]{00}{22} + \KarnaughBlocRegroup[Type=Centre,Couleur=teal,Decalage=-1.5pt]{10}{32} +\end{TableKarnaugh} +\end{DemoCode} + \pagebreak \section{Graphes \textit{simples}} diff --git a/Master/texmf-dist/tex/latex/profsio/ProfSio.sty b/Master/texmf-dist/tex/latex/profsio/ProfSio.sty index 1de0681384c..b4d4a4fa627 100644 --- a/Master/texmf-dist/tex/latex/profsio/ProfSio.sty +++ b/Master/texmf-dist/tex/latex/profsio/ProfSio.sty @@ -3,7 +3,8 @@ % : Luatruthtable from Chetan Shirore and Dr. Ajit Kumar https://ctan.org/pkg/luatruthtable \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ProfSio}[2023/07/03 0.1.2 Pour les enseignants en BTS SIO] +\ProvidesPackage{ProfSio}[2023/07/06 0.1.3 Pour les enseignants en BTS SIO] +%0.1.3 Style alternatif et Clé [PoliceTT] pour les tables de Karnaugh %0.1.2 Ajout d'une option [Offset] pour les diagrammes sagittaux + Diagrammes sagittaux de composée + Tables de vérité %0.1.1 Correction de la documentation + Ajout des diagrammes sagittaux %0.1.0 Version initiale @@ -239,7 +240,10 @@ Legende=true,% Couleur=black,% PosVarLaterale=Gauche,% - CouleurLegende=black + CouleurLegende=black, + StyleAlternatif=false,% + AideAlt=true,% + PoliceTT=false } \NewDocumentEnvironment{TableKarnaugh}{ O{} D<>{} }% @@ -268,36 +272,65 @@ \coordinate (A02) at (0,2) ; \coordinate (A12) at (1,2) ; \coordinate (A22) at (2,2) ; \coordinate (A32) at (3,2) ; \coordinate (A42) at (4,2) ; - \ifboolKV[tblkgh]{Legende} - {% - \draw[\KGHTCoulLegendeB,line width=\KGHThick,decorate,decoration={brace,amplitude=7pt}](0,2.1)--(2,2.1) node[midway,above=7pt,inner sep=1pt,text=\KGHTCoulLegendeB,outer sep=0pt] {$\strut\mathtt{\ListeVariablesKGH[2]}$}; - \draw[\KGHTCoulLegendeB,line width=\KGHThick,decorate,decoration={brace,amplitude=7pt}](2,2.1)--(4,2.1) node[midway,above=7pt,inner sep=1pt,text=\KGHTCoulLegendeB,outer sep=0pt] {$\strut\mathtt{\overline{\ListeVariablesKGH[2]}}$}; - \ifboolKV[tblkgh]{Swap}% - {% - \draw[\KGHTCoulLegendeC,line width=\KGHThick,decorate,decoration={brace,amplitude=7pt,mirror}](1,-0.1)--(3,-0.1) node[midway,below=7pt,inner sep=1pt,text=\KGHTCoulLegendeC,outer sep=0pt] {$\strut\mathtt{\ListeVariablesKGH[3]}$}; - \node[\KGHTCoulLegendeC,inner sep=1pt,below=7pt,outer sep=0pt] at (0.5,-0.1) {$\strut\mathtt{\overline{\ListeVariablesKGH[3]}}$}; - \node[\KGHTCoulLegendeC,inner sep=1pt,below=7pt,outer sep=0pt] at (3.5,-0.1) {$\strut\mathtt{\overline{\ListeVariablesKGH[3]}}$}; + \ifboolKV[tblkgh]{StyleAlternatif}% + { + \draw[line width=\KGHThick,\KGHTCoul] (A02)--++({-0.5*sqrt(2)},{0.5*sqrt(2)}) ; + \ifboolKV[tblkgh]{Legende} + {% + \draw[\KGHTCoulLegendeC,line width=\KGHThick] (-7pt,0)--++(0,1) node[midway,left=3pt,inner sep=1pt,text=\KGHTCoulLegendeC,outer sep=0pt] { \ifboolKV[tblkgh]{PoliceTT}{$\strut\mathtt{\ListeVariablesKGH[3]}$}{$\strut{\ListeVariablesKGH[3]}$} } ; + \draw[\KGHTCoulLegendeA,line width=\KGHThick] ($(A22)+(0,7pt)$)--++(2,0) node[midway,above,inner sep=1pt,text=\KGHTCoulLegendeA,outer sep=0pt] { \ifboolKV[tblkgh]{PoliceTT}{$\strut\mathtt{\ListeVariablesKGH[1]}$}{$\strut{\ListeVariablesKGH[1]}$} } ; + \draw[\KGHTCoulLegendeB,line width=\KGHThick] ($(A10)+(0,-7pt)$)--++(2,0) node[midway,below,inner sep=1pt,text=\KGHTCoulLegendeB,outer sep=0pt] { \ifboolKV[tblkgh]{PoliceTT}{$\strut\mathtt{\ListeVariablesKGH[2]}$}{$\strut{\ListeVariablesKGH[2]}$} } ; + \draw ($({-0.25*sqrt(2)},{2+0.25*sqrt(2)})+(-135:10pt)$) node[inner sep=1pt,text=\KGHTCoulLegendeC,outer sep=0pt] { \ifboolKV[tblkgh]{PoliceTT}{$\strut\mathtt{\ListeVariablesKGH[3]}$}{$\strut{\ListeVariablesKGH[3]}$} } ; + \draw ($({-0.25*sqrt(2)},{2+0.25*sqrt(2)})+(45:10pt)$) node[inner sep=1pt,outer sep=0pt] { \ifboolKV[tblkgh]{PoliceTT}{$\strut\mathtt{\mathcolor{\KGHTCoulLegendeA}{\ListeVariablesKGH[1]}\mathcolor{\KGHTCoulLegendeB}{\ListeVariablesKGH[2]}}$}{$\strut{\mathcolor{\KGHTCoulLegendeA}{\ListeVariablesKGH[1]}\mathcolor{\KGHTCoulLegendeB}{\ListeVariablesKGH[2]}}$} } ; }% + {}% + }% + {% + \ifboolKV[tblkgh]{Legende} {% - \draw[\KGHTCoulLegendeC,line width=\KGHThick,decorate,decoration={brace,amplitude=7pt,mirror}](1,-0.1)--(3,-0.1) node[midway,below=7pt,inner sep=1pt,text=\KGHTCoulLegendeC,outer sep=0pt] {$\strut\mathtt{\overline{\ListeVariablesKGH[3]}}$}; - \node[\KGHTCoulLegendeC,inner sep=1pt,below=7pt,outer sep=0pt] at (0.5,-0.1) {$\strut\mathtt{\ListeVariablesKGH[3]}$}; - \node[\KGHTCoulLegendeC,inner sep=1pt,below=7pt,outer sep=0pt] at (3.5,-0.1) {$\strut\mathtt{\ListeVariablesKGH[3]}$}; + \draw[\KGHTCoulLegendeB,line width=\KGHThick,decorate,decoration={brace,amplitude=7pt}](0,2.1)--(2,2.1) node[midway,above=7pt,inner sep=1pt,text=\KGHTCoulLegendeB,outer sep=0pt] { \ifboolKV[tblkgh]{PoliceTT}{$\strut\mathtt{\ListeVariablesKGH[2]}$}{$\strut{\ListeVariablesKGH[2]}$} }; + \draw[\KGHTCoulLegendeB,line width=\KGHThick,decorate,decoration={brace,amplitude=7pt}](2,2.1)--(4,2.1) node[midway,above=7pt,inner sep=1pt,text=\KGHTCoulLegendeB,outer sep=0pt] { \ifboolKV[tblkgh]{PoliceTT}{$\strut\mathtt{\overline{\ListeVariablesKGH[2]}}$}{$\strut{\overline{\ListeVariablesKGH[2]}}$} }; + \ifboolKV[tblkgh]{Swap}% + {% + \draw[\KGHTCoulLegendeC,line width=\KGHThick,decorate,decoration={brace,amplitude=7pt,mirror}](1,-0.1)--(3,-0.1) node[midway,below=7pt,inner sep=1pt,text=\KGHTCoulLegendeC,outer sep=0pt] { \ifboolKV[tblkgh]{PoliceTT}{$\strut\mathtt{\ListeVariablesKGH[3]}$}{$\strut{\ListeVariablesKGH[3]}$} }; + \node[\KGHTCoulLegendeC,inner sep=1pt,below=7pt,outer sep=0pt] at (0.5,-0.1) { \ifboolKV[tblkgh]{PoliceTT}{$\strut\mathtt{\overline{\ListeVariablesKGH[3]}}$}{$\strut{\overline{\ListeVariablesKGH[3]}}$} }; + \node[\KGHTCoulLegendeC,inner sep=1pt,below=7pt,outer sep=0pt] at (3.5,-0.1) { \ifboolKV[tblkgh]{PoliceTT}{$\strut\mathtt{\overline{\ListeVariablesKGH[3]}}$}{$\strut{\overline{\ListeVariablesKGH[3]}}$} }; + }% + {% + \draw[\KGHTCoulLegendeC,line width=\KGHThick,decorate,decoration={brace,amplitude=7pt,mirror}](1,-0.1)--(3,-0.1) node[midway,below=7pt,inner sep=1pt,text=\KGHTCoulLegendeC,outer sep=0pt] { \ifboolKV[tblkgh]{PoliceTT}{$\strut\mathtt{\overline{\ListeVariablesKGH[3]}}$}{$\strut{\overline{\ListeVariablesKGH[3]}}$} }; + \node[\KGHTCoulLegendeC,inner sep=1pt,below=7pt,outer sep=0pt] at (0.5,-0.1) { \ifboolKV[tblkgh]{PoliceTT}{$\strut\mathtt{\ListeVariablesKGH[3]}$}{$\strut{\ListeVariablesKGH[3]}$} }; + \node[\KGHTCoulLegendeC,inner sep=1pt,below=7pt,outer sep=0pt] at (3.5,-0.1) { \ifboolKV[tblkgh]{PoliceTT}{$\strut\mathtt{\ListeVariablesKGH[3]}$}{$\strut{\ListeVariablesKGH[3]}$} }; + }% + \IfStrEq{\KGHTPosVarA}{Gauche} + {% + \node[\KGHTCoulLegendeA,inner sep=1pt,outer sep=0pt,left=8pt] at (0,0.5) { \ifboolKV[tblkgh]{PoliceTT}{$\strut\mathtt{\overline{\ListeVariablesKGH[1]}}$}{$\strut{\overline{\ListeVariablesKGH[1]}}$} }; + \node[\KGHTCoulLegendeA,inner sep=1pt,outer sep=0pt,left=8pt] at (0,1.5) { \ifboolKV[tblkgh]{PoliceTT}{$\strut\mathtt{\ListeVariablesKGH[1]}$}{$\strut{\ListeVariablesKGH[1]}$} }; + }{}% + \IfStrEq{\KGHTPosVarA}{Droite} + {% + \node[\KGHTCoulLegendeA,inner sep=1pt,outer sep=0pt,right=8pt] at (4,0.5) { \ifboolKV[tblkgh]{PoliceTT}{$\strut\mathtt{\overline{\ListeVariablesKGH[1]}}$}{$\strut{\overline{\ListeVariablesKGH[1]}}$} }; + \node[\KGHTCoulLegendeA,inner sep=1pt,outer sep=0pt,right=8pt] at (4,1.5) { \ifboolKV[tblkgh]{PoliceTT}{$\strut\mathtt{\ListeVariablesKGH[1]}$}{$\strut{\ListeVariablesKGH[1]}$} }; + }{}% }% - \IfStrEq{\KGHTPosVarA}{Gauche} - {% - \node[\KGHTCoulLegendeA,inner sep=1pt,outer sep=0pt,left=8pt] at (0,0.5) {$\strut\mathtt{\overline{\ListeVariablesKGH[1]}}$}; - \node[\KGHTCoulLegendeA,inner sep=1pt,outer sep=0pt,left=8pt] at (0,1.5) {$\strut\mathtt{\ListeVariablesKGH[1]}$}; - }{}% - \IfStrEq{\KGHTPosVarA}{Droite} - {% - \node[\KGHTCoulLegendeA,inner sep=1pt,outer sep=0pt,right=8pt] at (4,0.5) {$\strut\mathtt{\overline{\ListeVariablesKGH[1]}}$}; - \node[\KGHTCoulLegendeA,inner sep=1pt,outer sep=0pt,right=8pt] at (4,1.5) {$\strut\mathtt{\ListeVariablesKGH[1]}$}; - }{}% + {}% }% - {}% \draw[line width=\KGHThick,step=1,ystep=1,\KGHTCoul] (0,0) grid (4,2) ; \draw[line width=\KGHThick,\KGHTCoul] (0,0) rectangle (4,2) ; }% {% + \ifboolKV[tblkgh]{StyleAlternatif}% + {% + \ifboolKV[tblkgh]{AideAlt}% + {% + \draw (A02) node[below right=2pt,inner sep=1pt,font=\scriptsize] {000} ; + \draw (A12) node[below right=2pt,inner sep=1pt,font=\scriptsize] {010} ; + \draw (A22) node[below right=2pt,inner sep=1pt,font=\scriptsize] {110} ; + \draw (A32) node[below right=2pt,inner sep=1pt,font=\scriptsize] {100} ; + \draw (A01) node[below right=2pt,inner sep=1pt,font=\scriptsize] {001} ; + \draw (A11) node[below right=2pt,inner sep=1pt,font=\scriptsize] {011} ; + \draw (A21) node[below right=2pt,inner sep=1pt,font=\scriptsize] {111} ; + \draw (A31) node[below right=2pt,inner sep=1pt,font=\scriptsize] {101} ; + }{}% + }{}% \ifboolKV[tblkgh]{Aide}% {% \foreach \noeud in {00,10,20,30,40,01,11,21,31,41,02,12,22,32,42} -- cgit v1.2.3