diff options
author | Norbert Preining <norbert@preining.info> | 2022-10-08 03:03:41 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2022-10-08 03:03:41 +0000 |
commit | 54f6d0a2d0879db458c3cdc6b2e666c67a0da7b0 (patch) | |
tree | 04d78cc9f3edb647dc5e5b4ece71b0a0f681bc49 /macros/latex/contrib | |
parent | bbbfa0a90645d4da46b1492f6513b28a01eb78da (diff) |
CTAN sync 202210080303
Diffstat (limited to 'macros/latex/contrib')
-rw-r--r-- | macros/latex/contrib/fixmath/LICENSE | 416 | ||||
-rw-r--r-- | macros/latex/contrib/fixmath/README | 27 | ||||
-rw-r--r-- | macros/latex/contrib/fixmath/fixmath.dtx (renamed from macros/latex/contrib/was/fixmath.dtx) | 12 | ||||
-rw-r--r-- | macros/latex/contrib/fixmath/fixmath.ins | 21 | ||||
-rw-r--r-- | macros/latex/contrib/fixmath/fixmath.pdf | bin | 0 -> 186475 bytes | |||
-rw-r--r-- | macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf | bin | 861172 -> 870624 bytes | |||
-rw-r--r-- | macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex | 117 | ||||
-rw-r--r-- | macros/latex/contrib/proflycee/tex/ProfLycee.sty | 74 | ||||
-rw-r--r-- | macros/latex/contrib/was/fixmath.ins | 8 | ||||
-rw-r--r-- | macros/latex/contrib/was/fixmath.pdf | bin | 155059 -> 0 bytes |
10 files changed, 652 insertions, 23 deletions
diff --git a/macros/latex/contrib/fixmath/LICENSE b/macros/latex/contrib/fixmath/LICENSE new file mode 100644 index 0000000000..2244313901 --- /dev/null +++ b/macros/latex/contrib/fixmath/LICENSE @@ -0,0 +1,416 @@ +The LaTeX Project Public License +=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- + +LPPL Version 1.3c 2008-05-04 + +Copyright 1999 2002-2008 LaTeX3 Project + Everyone is allowed to distribute verbatim copies of this + license document, but modification of it is not allowed. + + +PREAMBLE +======== + +The LaTeX Project Public License (LPPL) is the primary license under +which the LaTeX kernel and the base LaTeX packages are distributed. + +You may use this license for any work of which you hold the copyright +and which you wish to distribute. This license may be particularly +suitable if your work is TeX-related (such as a LaTeX package), but +it is written in such a way that you can use it even if your work is +unrelated to TeX. + +The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE', +below, gives instructions, examples, and recommendations for authors +who are considering distributing their works under this license. + +This license gives conditions under which a work may be distributed +and modified, as well as conditions under which modified versions of +that work may be distributed. + +We, the LaTeX3 Project, believe that the conditions below give you +the freedom to make and distribute modified versions of your work +that conform with whatever technical specifications you wish while +maintaining the availability, integrity, and reliability of +that work. If you do not see how to achieve your goal while +meeting these conditions, then read the document `cfgguide.tex' +and `modguide.tex' in the base LaTeX distribution for suggestions. + + +DEFINITIONS +=========== + +In this license document the following terms are used: + + `Work' + Any work being distributed under this License. + + `Derived Work' + Any work that under any applicable law is derived from the Work. + + `Modification' + Any procedure that produces a Derived Work under any applicable + law -- for example, the production of a file containing an + original file associated with the Work or a significant portion of + such a file, either verbatim or with modifications and/or + translated into another language. + + `Modify' + To apply any procedure that produces a Derived Work under any + applicable law. + + `Distribution' + Making copies of the Work available from one person to another, in + whole or in part. Distribution includes (but is not limited to) + making any electronic components of the Work accessible by + file transfer protocols such as FTP or HTTP or by shared file + systems such as Sun's Network File System (NFS). + + `Compiled Work' + A version of the Work that has been processed into a form where it + is directly usable on a computer system. This processing may + include using installation facilities provided by the Work, + transformations of the Work, copying of components of the Work, or + other activities. Note that modification of any installation + facilities provided by the Work constitutes modification of the Work. + + `Current Maintainer' + A person or persons nominated as such within the Work. If there is + no such explicit nomination then it is the `Copyright Holder' under + any applicable law. + + `Base Interpreter' + A program or process that is normally needed for running or + interpreting a part or the whole of the Work. + + A Base Interpreter may depend on external components but these + are not considered part of the Base Interpreter provided that each + external component clearly identifies itself whenever it is used + interactively. Unless explicitly specified when applying the + license to the Work, the only applicable Base Interpreter is a + `LaTeX-Format' or in the case of files belonging to the + `LaTeX-format' a program implementing the `TeX language'. + + + +CONDITIONS ON DISTRIBUTION AND MODIFICATION +=========================================== + +1. Activities other than distribution and/or modification of the Work +are not covered by this license; they are outside its scope. In +particular, the act of running the Work is not restricted and no +requirements are made concerning any offers of support for the Work. + +2. You may distribute a complete, unmodified copy of the Work as you +received it. Distribution of only part of the Work is considered +modification of the Work, and no right to distribute such a Derived +Work may be assumed under the terms of this clause. + +3. You may distribute a Compiled Work that has been generated from a +complete, unmodified copy of the Work as distributed under Clause 2 +above, as long as that Compiled Work is distributed in such a way that +the recipients may install the Compiled Work on their system exactly +as it would have been installed if they generated a Compiled Work +directly from the Work. + +4. If you are the Current Maintainer of the Work, you may, without +restriction, modify the Work, thus creating a Derived Work. You may +also distribute the Derived Work without restriction, including +Compiled Works generated from the Derived Work. Derived Works +distributed in this manner by the Current Maintainer are considered to +be updated versions of the Work. + +5. If you are not the Current Maintainer of the Work, you may modify +your copy of the Work, thus creating a Derived Work based on the Work, +and compile this Derived Work, thus creating a Compiled Work based on +the Derived Work. + +6. If you are not the Current Maintainer of the Work, you may +distribute a Derived Work provided the following conditions are met +for every component of the Work unless that component clearly states +in the copyright notice that it is exempt from that condition. Only +the Current Maintainer is allowed to add such statements of exemption +to a component of the Work. + + a. If a component of this Derived Work can be a direct replacement + for a component of the Work when that component is used with the + Base Interpreter, then, wherever this component of the Work + identifies itself to the user when used interactively with that + Base Interpreter, the replacement component of this Derived Work + clearly and unambiguously identifies itself as a modified version + of this component to the user when used interactively with that + Base Interpreter. + + b. Every component of the Derived Work contains prominent notices + detailing the nature of the changes to that component, or a + prominent reference to another file that is distributed as part + of the Derived Work and that contains a complete and accurate log + of the changes. + + c. No information in the Derived Work implies that any persons, + including (but not limited to) the authors of the original version + of the Work, provide any support, including (but not limited to) + the reporting and handling of errors, to recipients of the + Derived Work unless those persons have stated explicitly that + they do provide such support for the Derived Work. + + d. You distribute at least one of the following with the Derived Work: + + 1. A complete, unmodified copy of the Work; + if your distribution of a modified component is made by + offering access to copy the modified component from a + designated place, then offering equivalent access to copy + the Work from the same or some similar place meets this + condition, even though third parties are not compelled to + copy the Work along with the modified component; + + 2. Information that is sufficient to obtain a complete, + unmodified copy of the Work. + +7. If you are not the Current Maintainer of the Work, you may +distribute a Compiled Work generated from a Derived Work, as long as +the Derived Work is distributed to all recipients of the Compiled +Work, and as long as the conditions of Clause 6, above, are met with +regard to the Derived Work. + +8. The conditions above are not intended to prohibit, and hence do not +apply to, the modification, by any method, of any component so that it +becomes identical to an updated version of that component of the Work as +it is distributed by the Current Maintainer under Clause 4, above. + +9. Distribution of the Work or any Derived Work in an alternative +format, where the Work or that Derived Work (in whole or in part) is +then produced by applying some process to that format, does not relax or +nullify any sections of this license as they pertain to the results of +applying that process. + +10. a. A Derived Work may be distributed under a different license + provided that license itself honors the conditions listed in + Clause 6 above, in regard to the Work, though it does not have + to honor the rest of the conditions in this license. + + b. If a Derived Work is distributed under a different license, that + Derived Work must provide sufficient documentation as part of + itself to allow each recipient of that Derived Work to honor the + restrictions in Clause 6 above, concerning changes from the Work. + +11. This license places no restrictions on works that are unrelated to +the Work, nor does this license place any restrictions on aggregating +such works with the Work by any means. + +12. Nothing in this license is intended to, or may be used to, prevent +complete compliance by all parties with all applicable laws. + + +NO WARRANTY +=========== + +There is no warranty for the Work. Except when otherwise stated in +writing, the Copyright Holder provides the Work `as is', without +warranty of any kind, either expressed or implied, including, but not +limited to, the implied warranties of merchantability and fitness for a +particular purpose. The entire risk as to the quality and performance +of the Work is with you. Should the Work prove defective, you assume +the cost of all necessary servicing, repair, or correction. + +In no event unless required by applicable law or agreed to in writing +will The Copyright Holder, or any author named in the components of the +Work, or any other party who may distribute and/or modify the Work as +permitted above, be liable to you for damages, including any general, +special, incidental or consequential damages arising out of any use of +the Work or out of inability to use the Work (including, but not limited +to, loss of data, data being rendered inaccurate, or losses sustained by +anyone as a result of any failure of the Work to operate with any other +programs), even if the Copyright Holder or said author or said other +party has been advised of the possibility of such damages. + + +MAINTENANCE OF THE WORK +======================= + +The Work has the status `author-maintained' if the Copyright Holder +explicitly and prominently states near the primary copyright notice in +the Work that the Work can only be maintained by the Copyright Holder +or simply that it is `author-maintained'. + +The Work has the status `maintained' if there is a Current Maintainer +who has indicated in the Work that they are willing to receive error +reports for the Work (for example, by supplying a valid e-mail +address). It is not required for the Current Maintainer to acknowledge +or act upon these error reports. + +The Work changes from status `maintained' to `unmaintained' if there +is no Current Maintainer, or the person stated to be Current +Maintainer of the work cannot be reached through the indicated means +of communication for a period of six months, and there are no other +significant signs of active maintenance. + +You can become the Current Maintainer of the Work by agreement with +any existing Current Maintainer to take over this role. + +If the Work is unmaintained, you can become the Current Maintainer of +the Work through the following steps: + + 1. Make a reasonable attempt to trace the Current Maintainer (and + the Copyright Holder, if the two differ) through the means of + an Internet or similar search. + + 2. If this search is successful, then enquire whether the Work + is still maintained. + + a. If it is being maintained, then ask the Current Maintainer + to update their communication data within one month. + + b. If the search is unsuccessful or no action to resume active + maintenance is taken by the Current Maintainer, then announce + within the pertinent community your intention to take over + maintenance. (If the Work is a LaTeX work, this could be + done, for example, by posting to comp.text.tex.) + + 3a. If the Current Maintainer is reachable and agrees to pass + maintenance of the Work to you, then this takes effect + immediately upon announcement. + + b. If the Current Maintainer is not reachable and the Copyright + Holder agrees that maintenance of the Work be passed to you, + then this takes effect immediately upon announcement. + + 4. If you make an `intention announcement' as described in 2b. above + and after three months your intention is challenged neither by + the Current Maintainer nor by the Copyright Holder nor by other + people, then you may arrange for the Work to be changed so as + to name you as the (new) Current Maintainer. + + 5. If the previously unreachable Current Maintainer becomes + reachable once more within three months of a change completed + under the terms of 3b) or 4), then that Current Maintainer must + become or remain the Current Maintainer upon request provided + they then update their communication data within one month. + +A change in the Current Maintainer does not, of itself, alter the fact +that the Work is distributed under the LPPL license. + +If you become the Current Maintainer of the Work, you should +immediately provide, within the Work, a prominent and unambiguous +statement of your status as Current Maintainer. You should also +announce your new status to the same pertinent community as +in 2b) above. + + +WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE +====================================================== + +This section contains important instructions, examples, and +recommendations for authors who are considering distributing their +works under this license. These authors are addressed as `you' in +this section. + +Choosing This License or Another License +---------------------------------------- + +If for any part of your work you want or need to use *distribution* +conditions that differ significantly from those in this license, then +do not refer to this license anywhere in your work but, instead, +distribute your work under a different license. You may use the text +of this license as a model for your own license, but your license +should not refer to the LPPL or otherwise give the impression that +your work is distributed under the LPPL. + +The document `modguide.tex' in the base LaTeX distribution explains +the motivation behind the conditions of this license. It explains, +for example, why distributing LaTeX under the GNU General Public +License (GPL) was considered inappropriate. Even if your work is +unrelated to LaTeX, the discussion in `modguide.tex' may still be +relevant, and authors intending to distribute their works under any +license are encouraged to read it. + +A Recommendation on Modification Without Distribution +----------------------------------------------------- + +It is wise never to modify a component of the Work, even for your own +personal use, without also meeting the above conditions for +distributing the modified component. While you might intend that such +modifications will never be distributed, often this will happen by +accident -- you may forget that you have modified that component; or +it may not occur to you when allowing others to access the modified +version that you are thus distributing it and violating the conditions +of this license in ways that could have legal implications and, worse, +cause problems for the community. It is therefore usually in your +best interest to keep your copy of the Work identical with the public +one. Many works provide ways to control the behavior of that work +without altering any of its licensed components. + +How to Use This License +----------------------- + +To use this license, place in each of the components of your work both +an explicit copyright notice including your name and the year the work +was authored and/or last substantially modified. Include also a +statement that the distribution and/or modification of that +component is constrained by the conditions in this license. + +Here is an example of such a notice and statement: + + %% pig.dtx + %% Copyright 2005 M. Y. Name + % + % 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. + % + % This work has the LPPL maintenance status `maintained'. + % + % The Current Maintainer of this work is M. Y. Name. + % + % This work consists of the files pig.dtx and pig.ins + % and the derived file pig.sty. + +Given such a notice and statement in a file, the conditions +given in this license document would apply, with the `Work' referring +to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being +generated from `pig.dtx' using `pig.ins'), the `Base Interpreter' +referring to any `LaTeX-Format', and both `Copyright Holder' and +`Current Maintainer' referring to the person `M. Y. Name'. + +If you do not want the Maintenance section of LPPL to apply to your +Work, change `maintained' above into `author-maintained'. +However, we recommend that you use `maintained', as the Maintenance +section was added in order to ensure that your Work remains useful to +the community even when you can no longer maintain and support it +yourself. + +Derived Works That Are Not Replacements +--------------------------------------- + +Several clauses of the LPPL specify means to provide reliability and +stability for the user community. They therefore concern themselves +with the case that a Derived Work is intended to be used as a +(compatible or incompatible) replacement of the original Work. If +this is not the case (e.g., if a few lines of code are reused for a +completely different task), then clauses 6b and 6d shall not apply. + + +Important Recommendations +------------------------- + + Defining What Constitutes the Work + + The LPPL requires that distributions of the Work contain all the + files of the Work. It is therefore important that you provide a + way for the licensee to determine which files constitute the Work. + This could, for example, be achieved by explicitly listing all the + files of the Work near the copyright notice of each file or by + using a line such as: + + % This work consists of all files listed in manifest.txt. + + in that place. In the absence of an unequivocal list it might be + impossible for the licensee to determine what is considered by you + to comprise the Work and, in such a case, the licensee would be + entitled to make reasonable conjectures as to which files comprise + the Work. + diff --git a/macros/latex/contrib/fixmath/README b/macros/latex/contrib/fixmath/README new file mode 100644 index 0000000000..772de0df9c --- /dev/null +++ b/macros/latex/contrib/fixmath/README @@ -0,0 +1,27 @@ +============================================================ + + fixmath package + +============================================================ +Walter Schmidt +w.a.schmidt@gmx.net + +Keiran Harcombe +kjh@harcombe.net + +A LaTeX package to provide italic uppercase Greek + letters in math and an additional bold italic math + alphabet \mathbold; to be used with the default CM math + fonts. + +The style files can be unpacked by running the particular +installation script (.ins) through LaTeX. The files will +be created immediately in the appropriate TDS directory +tex/latex/was, if this directory exists and the DOCSTRIP +tool is properly configured -- otherwise they are written +into the current directory. + +The documentation of a package can be generated by running +the particular .dtx file through LaTeX. + +==finis diff --git a/macros/latex/contrib/was/fixmath.dtx b/macros/latex/contrib/fixmath/fixmath.dtx index 97647e9c6a..0fb13f792e 100644 --- a/macros/latex/contrib/was/fixmath.dtx +++ b/macros/latex/contrib/fixmath/fixmath.dtx @@ -4,14 +4,18 @@ % % File `fixmath.dtx'. % Copyright (c) 2000--2003 Walter Schmidt +% Copyright (c) 2022-- Keiran Harcombe % % This program may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.2 +% conditions of the LaTeX Project Public License, either version 1.3c % 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.2 or later is part of all distributions of LaTeX +% and version 1.3c or later is part of all distributions of LaTeX % version 1999/12/01 or later. +% This work has the LPPL maintennace status 'maintained'. +% +% The Current Maintainer of this work is Keiran Harcombe % % This program consists of the files fixmath.dtx and fixmath.ins % @@ -23,7 +27,7 @@ \ProvidesFile{fixmath.drv} %</driver> %<package>\ProvidesPackage{fixmath} - [2000/04/11 v0.9 (WaS)] + [2022/10/06 v0.9.1 (WaS)] %<*driver> \documentclass{ltxdoc} \usepackage{url} @@ -39,7 +43,7 @@ % \MakeShortVerb{\+} % % \title{The \textsf{fixmath} package for \LaTeXe} -% \author{Walter Schmidt\thanks{{\ttfamily w.a.schmidt@gmx.net}}} +% \author{Walter Schmidt & Keiran Harcombe\thanks{{\ttfamily kjh@harcombe.net}}} % \date{(\fileversion{} -- \filedate)} % \maketitle % \sloppy diff --git a/macros/latex/contrib/fixmath/fixmath.ins b/macros/latex/contrib/fixmath/fixmath.ins new file mode 100644 index 0000000000..c6ef62e660 --- /dev/null +++ b/macros/latex/contrib/fixmath/fixmath.ins @@ -0,0 +1,21 @@ +% File `fixmath.ins'. +% Copyright (c) 2000--2003 Walter Schmidt +% Copyright (c) 2022-- Keiran Harcombe +% +% This program may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3c +% 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.3c or later is part of all distributions of LaTeX +% version 1999/12/01 or later. +% This work has the LPPL maintennace status 'maintained'. +% +% The Current Maintainer of this work is Keiran Harcombe +% +% This program consists of the files fixmath.dtx and fixmath.ins +\input docstrip +\usedir{tex/latex/was} +\generate{\file{fixmath.sty}{\from{fixmath.dtx}{package}}} +\endbatchfile + diff --git a/macros/latex/contrib/fixmath/fixmath.pdf b/macros/latex/contrib/fixmath/fixmath.pdf Binary files differnew file mode 100644 index 0000000000..431bf95be5 --- /dev/null +++ b/macros/latex/contrib/fixmath/fixmath.pdf diff --git a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf Binary files differindex b050328eed..37dc7a1700 100644 --- a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf +++ b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.pdf diff --git a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex index d2df28ed97..7223c0798e 100644 --- a/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex +++ b/macros/latex/contrib/proflycee/doc/ProfLycee-doc.tex @@ -40,6 +40,7 @@ ylabel near ticks } \usepackage{tkz-tab} +\tikzstyle{every picture}+=[remember picture] \usepackage{listofitems} \usepackage{xintexpr} \usepackage{codehigh} @@ -61,8 +62,8 @@ \setlength{\parindent}{0pt} \definecolor{LightGray}{gray}{0.9} -\def\PLversion{1.2.9} -\def\PLdate{3 Octobre 2022} +\def\PLversion{1.3.1} +\def\PLdate{7 Octobre 2022} \tcbset{vignettes/.style={% nobeforeafter,box align=base,boxsep=0pt,enhanced,sharp corners=all,rounded corners=southeast,% @@ -3772,6 +3773,97 @@ $\PLconvtodec[zeros=false,basedep=16]{AC0DC}$ \newpage +\section{Conversion \og présentée \fg{} d'un nombre en décimal}\label{convrestes} + +\subsection{Idée} + +\begin{codeidee} +L'idée est de proposer une \og présentation \fg{} par divisions euclidiennes pour la conversion d'un entier donné en base 10 dans une base quelconque. + +\smallskip + +Les commandes de la section précédente donne \textit{juste} les résultats, dans cette section il y a en plus la présentation de la conversion. + +\smallskip + +La commande utilise -- par défaut -- du code \TikZ{} en mode \ctex{overlay}, donc on pourra déclarer -- si ce n'est pas fait -- dans le préambule, la commande qui suit. +\end{codeidee} + +\begin{codetex}[listing only] +... +\tikzstyle{every picture}+=[remember picture] +... +\end{codetex} + +\subsection{Code et clés} + +\begin{codetex}[] +%conversion basique +\PLconvDepuisDec{78}{2} +\end{codetex} + +\begin{codeinfo} +La \og tableau \fg, qui est géré par \ctex{array} est inséré dans un \ctex{ensuremath}, donc les \ctex{\$...\$} ne sont pas utiles. +\end{codeinfo} + +\begin{codetex}[listing only] +\PLconvDepuisDec[<options>]{<nombre en base 10>}{<base d'arrivée>} +\end{codetex} + +\begin{codecles} +Quelques options pour cette commande : + +\begin{itemize} + \item la clé \Cle{couleur} pour la couleur du \og rectangle \fg{} des restes ; \hfill{}défaut \Cle{red} + \item la clé \Cle{decalh} pour gérer le décalage H du \og rectangle \fg{}, qui peut être donné soit sous la forme \Cle{esp} ou soit sous la forme \Cle{espgauche/espdroite}; \hfill{}défaut \Cle{2pt} + \item la clé \Cle{decalv} pour le décalage vertical du \og rectangle \fg{} ; \hfill{}défaut \Cle{3pt} + \item la clé \Cle{noeud} pour le préfixe du nœud du premier et du dernier reste (pour utilisation en \TikZ) ; \hfill{}défaut \Cle{EEE} + \item le booléen \Cle{rect} pour afficher ou non le \og rectangle \fg{} des restes. \hfill{}défaut \Cle{true} +\end{itemize} +\end{codecles} + +\begin{codetex}[listing only] +%conversion avec changement de couleur +\PLconvDepuisDec[couleur=DarkBlue]{45}{2} + +%conversion sans le rectangle +Par divisions euclidiennes successives, \PLconvDepuisDec[rect=false]{54}{3}. + +%conversion avec gestion du decalh pour le placement précis du rectangle +\PLconvDepuisDec[couleur=Goldenrod,decalh=6pt/2pt]{1012}{16} + +%conversion avec nœud personnalisé et réutilisation +\PLconvDepuisDec[couleur=ForestGreen,noeud=TEST]{100}{9} +\begin{tikzpicture} + \draw[overlay,ForestGreen,thick,->] (TEST2.south east) to[bend right] ++ (3cm,-1cm) node[right] {test } ; +\end{tikzpicture} +\end{codetex} + +\begin{codesortie} +\PLconvDepuisDec[couleur=DarkBlue]{45}{2} + +\medskip + +Par divisions euclidiennes successives, \PLconvDepuisDec[rect=false]{54}{3}. + +\medskip + +\PLconvDepuisDec[couleur=Goldenrod,decalh=6pt/2pt]{1012}{16} + +\medskip + +On obtient donc \PLconvDepuisDec[couleur=ForestGreen,noeud=TEST]{100}{9} +\begin{tikzpicture} + \draw[overlay,ForestGreen,thick,->] (TEST2.south east) to[bend right] ++ (3cm,-1cm) node[right] {test } ; +\end{tikzpicture} + +\vspace{1.5cm} + +~ +\end{codesortie} + +\newpage + \section{Style \og main levée \fg{} en \TikZ}\label{mainlevee} \subsection{Idée} @@ -3919,6 +4011,9 @@ C,A,B,D \begin{tikzpicture}%avec correction \PLpixelart[codes=ABCD,couleurs={Black,Green,Yellow,Red},correction]{basique.csv} \end{tikzpicture} +\begin{tikzpicture}%avec correction sans bordure + \PLpixelart[codes=ABCD,couleurs={Black,Green,Yellow,Red},correction,bordcases=false]{basique.csv} +\end{tikzpicture} \end{codetex} \begin{codesortie} @@ -3940,18 +4035,23 @@ C,A,B,D \end{tabular} \end{center} -\hfill\begin{tikzpicture} +\hfill\begin{tikzpicture}[scale=0.9] %avec lettres \PLpixelart[codes=ABCD,style=\large\sffamily]{basique.csv} \end{tikzpicture} -\begin{tikzpicture} +\begin{tikzpicture}[scale=0.9] %avec chiffres \PLpixelart[codes=ABCD,symboles={45,22,1,7},symb,style=\large\sffamily]{basique.csv} \end{tikzpicture} -\begin{tikzpicture} +\begin{tikzpicture}[scale=0.9] %avec correction \PLpixelart[codes=ABCD,couleurs={Black,Green,Yellow,Red},correction]{basique.csv} -\end{tikzpicture}\hfill~ +\end{tikzpicture} +\begin{tikzpicture}[scale=0.9] + %avec correction + \PLpixelart[codes=ABCD,couleurs={Black,Green,Yellow,Red},correction,bordcases=false]{basique.csv} +\end{tikzpicture} +\hfill~ \end{codesortie} \begin{codeinfo} @@ -3979,6 +4079,7 @@ Quelques \Cle{Clés} sont nécessaires au bon fonctionnement de la commande : \item la clé \Cle{symboles} qui contient la \textsf{liste éventuelles} des caractères alternatifs à afficher dans les cases ; \item la clé booléenne \Cle{correction} qui permet de colorier le PixelART ;\hfill{}défaut \Cle{false} \item la clé booléenne \Cle{symb} qui permet d'afficher les caractères \textit{alternatifs} ;\hfill{}défaut \Cle{false} + \item la clé booléenne \Cle{bordcases} qui permet d'afficher les bords des cases de la correction ;\hfill{}défaut \Cle{true} \item la clé \Cle{style} qui permet de spécifier le style des caractères. \hfill{}défaut \Cle{scriptsize} \end{itemize} \end{codecles} @@ -4331,6 +4432,10 @@ La grille, créée en \TikZ, est portée par le rectangle de \og coins \fg{} $(0 \part{Historique} +{\small \bverb|v1.3.1|~:~~~~Ajout d'une option pour ne pas afficher les bordures des corrections de pixelart (page \pageref{pixelart}) + +{\small \bverb|v1.3.0|~:~~~~Commande pour présenter une conversion depuis la base 10 (page \pageref{convrestes}) + {\small \bverb|v1.2.9|~:~~~~Correction des commandes avec simplekv {\small \bverb|v1.2.8|~:~~~~Ajout d'une librairie \TikZ{} oubliée, et remise en forme de la documentation diff --git a/macros/latex/contrib/proflycee/tex/ProfLycee.sty b/macros/latex/contrib/proflycee/tex/ProfLycee.sty index e13bf2a31e..cf741e124d 100644 --- a/macros/latex/contrib/proflycee/tex/ProfLycee.sty +++ b/macros/latex/contrib/proflycee/tex/ProfLycee.sty @@ -3,7 +3,9 @@ % or later, see http://www.latex-project.org/lppl.txtf \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ProfLycee}[2022/10/03 v1.2.9 - Aide pour l'utilisation de LaTeX en lycee] +\ProvidesPackage{ProfLycee}[2022/10/07 v1.3.1 - Aide pour l'utilisation de LaTeX en lycee] +% 1.3.1 Ajout d'une option pour ne pas afficher les bords des cases en pixelart +% 1.3.0 Ajout d'une commande pour mettre en forme une conversion depuis la base 10 % 1.2.9 Correction d'une incompatibilité avec simplekv (clés vides...) % 1.2.8 Correction de l'oubli d'une librairie tikz et remise en forme de la documentation % 1.2.7 Calculs de probas pour des lois classiques @@ -932,8 +934,8 @@ } \newcommand\ensPL[2][1]{% - \useKVdefault[kvensemble] - \setKV[kvensemble]{#1} + \useKVdefault[kvensemble]% + \setKV[kvensemble]{#1}% \ifboolKV[kvensemble]{mathpunct}% {\left\lbrace \PLensopt{} \mathpunct{} \StrSubstitute{#2}{/}{\mathpunct{}{\PLenssep}\mathpunct{}} \mathpunct{} \right\rbrace}% {\left\lbrace \PLensopt{} \StrSubstitute{#2}{/}{{\PLenssep}} \right\rbrace} @@ -1569,7 +1571,8 @@ \setKVdefault[pixelarttkz]{% style=\scriptsize,% correction=false,% - symb=false + symb=false,% + bordcases=true } \newcommand\PLpixelart[2][]{% @@ -1587,7 +1590,10 @@ \xintifboolexpr{\pixcnt>0}% {% \itemtomacro\LCPA[\pixcnt]\pixcol% - \draw[fill=\pixcol] ({\n-0.5},{-\thecsvrow+0.5}) rectangle ({\n+0.5},{-\thecsvrow-0.5}) ;% + \ifboolKV[pixelarttkz]{bordcases}% + {\draw[fill=\pixcol] ({\n-0.5},{-\thecsvrow+0.5}) rectangle ({\n+0.5},{-\thecsvrow-0.5}) ;}% + {\filldraw[\pixcol] ({\n-0.5},{-\thecsvrow+0.5}) rectangle ({\n+0.5},{-\thecsvrow-0.5}) ;}% + % }% {} } @@ -2334,4 +2340,62 @@ } } +%===============CONVFROMDEC============ OK !! +\newcommand\PLnoeud[2]{\tikz[remember picture,baseline=(#1.base)]\node[shape=rectangle,inner sep=0pt](#1){#2};} +\ExplSyntaxOn +\newcommand\convertbasedixtobase[2]{% + \int_to_Base:nn {#1}{#2} +} +\ExplSyntaxOff + +\defKV[convfromten]{% + couleur=\def\PLConvCouleur{#1},% + decalh=\def\PLConvDecalH{#1},% + decalv=\def\PLConvDecalV{#1},% + noeud=\def\PLConvNoeud{#1} +} + +\setKVdefault[convfromten]{% + couleur=red,% + decalh=2pt,% + decalv=3pt,% + rect=true,% + noeud=EEE +} + +\newcommand\PLconvDepuisDec[3][]{% + \useKVdefault[convfromten]% + \setKV[convfromten]{#1}% + \xdef\ValRes{\xintDecToHex{#2}}% + \xdef\ValA{#2}\xdef\ValB{#3}% + \xdef\ValTMP{#2}% + \xdef\ValMU{\inteval{#3-1}}% + \ensuremath{% + \left\lbrace\begin{array}{@{\,}r@{\;=\;}l@{\;+\;}r} + %1ere division + \xdef\ValQ{\fpeval{trunc(\ValTMP/#3,0)}}\xdef\ValR{\fpeval{\ValTMP-#3*\ValQ}} + \num{\ValTMP}\uppercase{&}\num{\ValB}\times\num{\ValQ}\uppercase{&}\PLnoeud{\PLConvNoeud1}{\num{\ValR}}% + \xdef\ValTMP{\ValQ}% + \whiledo {\ValTMP > \ValMU}% + {% + \xdef\ValQ{\fpeval{trunc(\ValTMP/#3,0)}}\xdef\ValR{\fpeval{\ValTMP-#3*\ValQ}}% + \\ \num{\ValTMP}\uppercase{&}\num{\ValB}\times\num{\ValQ}\uppercase{&}\num{\ValR} + \xdef\ValTMP{\ValQ}% + } + %dernière + \xdef\ValQ{\fpeval{trunc(\ValTMP/#3,0)}}\xdef\ValR{\fpeval{\ValTMP-#3*\ValQ}}% + \\ \num{\ValTMP}\uppercase{&}\num{\ValB}\times\num{\ValQ}\uppercase{&}\PLnoeud{\PLConvNoeud2}{\num{\ValR}} + \end{array} \right| \Rightarrow \num{#2}_{10}=\convertbasedixtobase{#2}{#3}_{#3}} + \ifboolKV[convfromten]{rect}% + {% + \IfSubStr{\PLConvDecalH}{/}% + {\StrCut{\PLConvDecalH}{/}{\PLConvDecalHg}{\PLConvDecalHd}}% + {\def\PLConvDecalHg{\PLConvDecalH}\def\PLConvDecalHd{\PLConvDecalH}} + \begin{tikzpicture} + \draw[overlay,rounded corners=4pt,\PLConvCouleur,thick] ($(\PLConvNoeud1.north west)+(-\PLConvDecalHg,\PLConvDecalV)$) rectangle ($(\PLConvNoeud2.south east)+(\PLConvDecalHd,-\PLConvDecalV)$) ; + \draw[overlay,rounded corners=4pt,\PLConvCouleur,thick,->,>=latex] ($(\PLConvNoeud2.east)+(\PLConvDecalHd,0)$)--++(0,{0.75\baselineskip}) ; + \end{tikzpicture} + }{} +} + \endinput
\ No newline at end of file diff --git a/macros/latex/contrib/was/fixmath.ins b/macros/latex/contrib/was/fixmath.ins deleted file mode 100644 index c459403366..0000000000 --- a/macros/latex/contrib/was/fixmath.ins +++ /dev/null @@ -1,8 +0,0 @@ -% file fixmath.ins -\input docstrip -\usedir{tex/latex/was} - -\generate{\file{fixmath.sty}{\from{fixmath.dtx}{package}}} - -\endbatchfile - diff --git a/macros/latex/contrib/was/fixmath.pdf b/macros/latex/contrib/was/fixmath.pdf Binary files differdeleted file mode 100644 index c1162abc2e..0000000000 --- a/macros/latex/contrib/was/fixmath.pdf +++ /dev/null |