summaryrefslogtreecommitdiff
path: root/macros/latex/contrib
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-12-20 03:01:51 +0000
committerNorbert Preining <norbert@preining.info>2023-12-20 03:01:51 +0000
commit04c437f630dc0457787999e2779770fa77bdb601 (patch)
tree1a8de076bf460f11a4eec923f1b1b41932d856f9 /macros/latex/contrib
parent60e9a31bad8271499f6b5f9280174e76bd62814f (diff)
CTAN sync 202312200301
Diffstat (limited to 'macros/latex/contrib')
-rw-r--r--macros/latex/contrib/decimalcomma/decimalcomma.dtx46
-rw-r--r--macros/latex/contrib/decimalcomma/decimalcomma.pdfbin88992 -> 93818 bytes
-rw-r--r--macros/latex/contrib/mismath/README.md2
-rw-r--r--macros/latex/contrib/mismath/mismath.dtx136
-rw-r--r--macros/latex/contrib/mismath/mismath.pdfbin273395 -> 276197 bytes
-rw-r--r--macros/latex/contrib/profmaquette/doc/ProfMaquette-doc.pdfbin268144 -> 267874 bytes
-rw-r--r--macros/latex/contrib/profmaquette/doc/ProfMaquette-doc.tex3
-rw-r--r--macros/latex/contrib/profmaquette/latex/ProfMaquette.sty71
-rw-r--r--macros/latex/contrib/sidenotesplus/README.txt5
-rw-r--r--macros/latex/contrib/sidenotesplus/sidenotesplus.dtx27
-rw-r--r--macros/latex/contrib/sidenotesplus/sidenotesplus.pdfbin235043 -> 235661 bytes
-rw-r--r--macros/latex/contrib/sidenotesplus/tests-sidenoteplus.bib45
-rw-r--r--macros/latex/contrib/sidenotesplus/tests-sidenoteplus.pdfbin218822 -> 142743 bytes
-rw-r--r--macros/latex/contrib/sidenotesplus/tests-sidenoteplus.tex49
14 files changed, 245 insertions, 139 deletions
diff --git a/macros/latex/contrib/decimalcomma/decimalcomma.dtx b/macros/latex/contrib/decimalcomma/decimalcomma.dtx
index ae1fb4fa99..b054255836 100644
--- a/macros/latex/contrib/decimalcomma/decimalcomma.dtx
+++ b/macros/latex/contrib/decimalcomma/decimalcomma.dtx
@@ -20,7 +20,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{decimalcomma}
- [2023/12/06 v1.0 .dtx decimalcomma file]
+ [2023/12/19 v1.1 .dtx decimalcomma file]
%</package>
%<*driver>
\documentclass{ltxdoc}
@@ -32,6 +32,7 @@
\usepackage{sectsty}
\usepackage{xcolor}
\usepackage{centeredline}
+\usepackage{metalogo}
\definecolor{darkbrown}{rgb}{0.5,0.1,0.1}
\allsectionsfont{\color{darkbrown}}
@@ -57,7 +58,7 @@
%</driver>
% \fi
%
-% \CheckSum{26}
+% \CheckSum{36}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -76,6 +77,7 @@
% Right brace \} Tilde \~}
%
% \changes{v1.0}{2023/12/06}{Initial version}
+% \changes{v1.1}{2023/12/19}{Error message when unicode-math loaded after decimalcomma}
%
% \GetFileInfo{decimalcomma.sty}
%
@@ -111,8 +113,8 @@
% especially when used with \textsf{babel}
% in conjunction with \textsf{numprint}~\cite{NUMP} and its \texttt{autolanguage} option
% (at least for certain languages such as French and Spanish).
-% Another issue with \textsf{ncccomma} is that compiling with Lua\LaTeX,
-% \textsf{unicode-math}, and "\setmathfont" fails.
+% Another issue with \textsf{ncccomma} is that compiling with \LuaLaTeX\ or \XeLaTeX\
+% fails when using \textsf{unicode-math} and "\setmathfont".
%
% Let it be noted that a code proposed by Claudio Beccari~\cite{BECC},
% similar to that of \textsf{ncccomma}, presents the same type of issues.
@@ -123,11 +125,15 @@
% aforementioned incompatibilities.
%
% \section{Bugs and problems}
+%
+% When \textsf{unicode-math} is used, \textsf{decimalcomma} must be loaded \emph{after} it.
+%
% Here, we are revisiting what Walter Schmidt wrote in the documentation of his
% \textsf{icomma} package:
%
-% In case the \textsf{decimalcomma} is used together with the \textsf{dcolumn} package,
-% a comma to be printed as the decimal separator in a column of type \texttt{D}
+% In case \textsf{decimalcomma} is used together with the \textsf{dcolumn}
+% package~\cite{DCOL}, a comma to be printed as the decimal separator
+% in a column of type \texttt{D}
% is to be specified as "{\mathord\mathcomma}", rather than "{,}",
% since the latter leads to an error.
% For instance:
@@ -141,6 +147,30 @@
% \StopEventually{}
%
% \section{Implementation}
+%
+% This first peace of code produces an appropriate error message, if you load
+% \textsf{unicode-math} \emph{after} \textsf{decimalcomma}.
+% To achieve this, first we check if \textsf{unicode-math} has been loaded before.
+% In that case, the boolean "DC@unicodemath" will be set to true.
+% Then, at the end of the preamble, when all the packages have been loaded,
+% we perform a new verification. If \textsf{unicode-math} has been loaded after
+% but not before, the error message is generated.
+% Without this code, the error message mentioning a problem on "\futurelet",
+% would be incomprehensible for the novice.
+%
+% \begin{macrocode}
+\newif\if@DC@unicodemath
+\@ifpackageloaded{unicode-math}{\DC@unicodemathtrue}
+\AtBeginDocument{\@ifpackageloaded{unicode-math}{
+ \ifDC@unicodemath\else
+ \PackageError{decimalcomma}{decimalcomma must be loaded
+ after unicode-math}{If you did'nt load decimalcomma
+ yourself, check which package you loaded uses it}
+ \fi
+ }{}
+}
+
+% \end{macrocode}
% We have taken up Walter Schmidt's fundamental idea for looking up the next character,
% but with an execution loop to test all the digits from 0 to 9 instead of "\space".
% We could have also used ten nested "\if" \ldots "\else" \ldots "\fi" structures
@@ -172,7 +202,7 @@
% \end{macrocode}
%
-% \begin{thebibliography}{4}
+% \begin{thebibliography}{5}
% % \begin{raggedright}
% \bibitem{ICOMMA} \emph{The \textsf{icomma} package for \LaTeXe}.
% Walter Schmidt, CTAN, v2.0 2002/03/10.
@@ -183,6 +213,8 @@
% \url{https://tug.org/pracjourn/2011-1/beccari/Intcomma.pdf}
% \bibitem{NUMP} \emph{The \textsf{numprint} package}. Harald Harders,
% CTAN, v1.39 2012/08/20.
+% \bibitem{DCOL} \emph{The \textsf{dcolumn} package}, David Carlisle.
+% CTAN, v1.06 2023/07/08.
% \end{raggedright}
% \end{thebibliography}
% \Finale
diff --git a/macros/latex/contrib/decimalcomma/decimalcomma.pdf b/macros/latex/contrib/decimalcomma/decimalcomma.pdf
index 8ebaefab55..e2ca70f2bb 100644
--- a/macros/latex/contrib/decimalcomma/decimalcomma.pdf
+++ b/macros/latex/contrib/decimalcomma/decimalcomma.pdf
Binary files differ
diff --git a/macros/latex/contrib/mismath/README.md b/macros/latex/contrib/mismath/README.md
index 2cb96b216e..caba9f3da7 100644
--- a/macros/latex/contrib/mismath/README.md
+++ b/macros/latex/contrib/mismath/README.md
@@ -8,7 +8,7 @@ The package provides some mathematical macros to typeset:
- vectors with beautiful arrows and adjusted norm,
- tensors,
- some standard operator names,
-- enhancing spacings in mathematical formulas,
+- improved spacings in mathematical formulas,
- systems of equations and small matrices,
- displaymath in double columns for lengthy calculations.
diff --git a/macros/latex/contrib/mismath/mismath.dtx b/macros/latex/contrib/mismath/mismath.dtx
index 108f3e1b75..1d601eff84 100644
--- a/macros/latex/contrib/mismath/mismath.dtx
+++ b/macros/latex/contrib/mismath/mismath.dtx
@@ -20,7 +20,7 @@
%<*package>
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{mismath}
- [2023/07/27 v2.8 .dtx mismath file]
+ [2023/12/19 v2.9 .dtx mismath file]
%</package>
%<*driver>
\documentclass{ltxdoc}
@@ -69,7 +69,7 @@
%</driver>
% \fi
%
-% \CheckSum{624}
+% \CheckSum{631}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -197,13 +197,17 @@
% - Some small changes in the documentation
% - New macro `onlymathC' designed for using '\C' when Russian language is loaded}
%
+% \changes{v2.9}{2023/12/19}{
+% - New option decimalcomma
+% - Some small changes in the documentation}
+%
% \GetFileInfo{mismath.sty}
%
% \title{\textsf{mismath}\\ Miscellaneous mathematical macros\thanks{This document
% corresponds to \textsf{mismath}~\fileversion, dated \filedate.
% Thanks to François Bastouil for help in English translation.}}
% \author{Antoine Missier \\ \texttt{antoine.missier@ac-toulouse.fr}}
-% \date{July 27, 2023}
+% \date{December 19, 2023}
%
% \maketitle
% \tableofcontents
@@ -274,7 +278,7 @@
% where all capital letters in mathematics
% are required to be typeset in upright shape
% \footnote{By using the \textsf{frenchmath} package~\cite{FR},
-% you can ensure that the recommended french rule is followed in your document.}.
+% you can ensure that the recommended French rule is followed in your document.}.
% The decision to load any of these packages is left to the user's discretion.
%
% \section{Usage}
@@ -861,24 +865,22 @@
% \footnote{This functionality is optional because it causes
% errors when using a command defined by
% \texttt{\bslash DeclarePairedDelimiter}~\cite{TOOL} with square brackets.}
-% loaded by \textsf{mismath} using the \texttt{ibrackets} package option
-% \footnote{It is the only option specific to the \textsf{mismath} package.}.
-%
-% Simply type |$x\in ]-\pi,0[ \cup ]2\pi,3\pi[$| to get
-% \begin{align*}
-% x\in ]-\pi, 0[ \cup ]2\pi, 3\pi[ &\mbox{\quad with \textsf{ibrackets}}, \\
-% \mbox{instead of \quad}
+% loaded by \textsf{mismath} using the \texttt{ibrackets} package option.
+% Thus |$x\in ]-\pi,0[ \cup ]2\pi,3\pi[$|
+% \begin{align*}
+% \mbox{yields \ }
+% x\in ]-\pi, 0[ \cup ]2\pi, 3\pi[ & \mbox{\ with \textsf{ibrackets}}, \\
+% \mbox{instead of \ }
% x\in \mathclose{]}-\pi, 0 \mathopen{[} \cup \mathclose{]} 2\pi, 3\pi \mathopen{[}
-% &\mbox{\quad without \textsf{ibrackets}}.
+% &\mbox{\ without \textsf{ibrackets}}.
% \end{align*}
-% In our code, the symbols $[$ and $]$
-% and are not defined by default as delimiters.
-% Therefore, a line break could occur between the two brackets. However,
+%
+% In our code, the symbols $[$ and $]$ are set as `active' characters,
+% behaving like ordinary characters and not as delimiters in most cases.
+% Therefore, a line break could occur between the two brackets, but
% it is always possible to transform them
% into delimiters using |\left| and |\right|.
%
-% With the \textsf{ibrackets} package, brackets are set as ``active'' characters,
-% behaving like ordinary characters in most cases.
% However, when a bracket is \emph{immediately} followed by a + or - character,
% it becomes an open delimiter.
% Therefore, when the left bound contains an operator sign,
@@ -888,9 +890,9 @@
% instead of $x \in ]-\infty, 0]$.
% Conversely, when dealing with algebraic expressions involving intervals,
% \emph{you must leave a blank space between the second bracket and the} +/-
-% \emph{operations}.
-% For instance |$[a, b] + [c, d]$| yields $[a, b] + [c, d]$
-% but |$[a, b]+ [c, d]$| yields $[a, b]+ [c, d]$.
+% \emph{operation}.
+% For instance |$[a,b] + [c,d]$| yields $[a,b] + [c,d]$
+% but |$[a,b]+ [c,d]$| yields $[a, b]+ [c, d]$.
%
% Besides, there are other approaches, for example the |\interval| macro
% from the \textsf{interval} package~\cite{INT},
@@ -898,6 +900,30 @@
% (but the latter is incompatible with \textsf{ibrackets}
% for managing brackets).
%
+% \medskip
+%\DescribeMacro{[decimalcomma]}
+% In many countries, except notably in Anglo-Saxon countries,
+% the comma is used as a decimal separator for numbers.
+% However, in the math mode of \LaTeX, the comma is always, by default,
+% treated as a punctuation symbol and therefore is followed by a space.
+% This is appropriate in intervals: |$[a,b]$| results in $[a,b]$,
+% but is not appropriate for numbers where the comma represents the decimal separator.
+% For example, |$12,5$| is displayed as $12, 5$ instead of $12{,}5$.
+%
+% Two very convenient packages allow handling the decimal comma in math mode:
+% \textsf{icomma} by Walter Schmidt~\cite{ICOMMA} and
+% \textsf{ncccomma} by Alexander I.~Rozhenko~\cite{NCC}.
+% The second package takes a more generic approach,
+% however it poses several compatibility issues,
+% in particular when compiling with Lua\LaTeX, using \textsf{unicode-math}
+% and calling |\setmathfont|.
+% Therefore we propose the \textsf{decimalcomma} package~\cite{DEC},
+% functionally identical to that of \textsf{ncccomma} but with lighter code
+% and without the aforementioned incompatibility.
+% It can be loaded by \textsf{mismath} using the \texttt{decimalcomma}
+% package option\footnote{\texttt{ibrackets} and \texttt{decimalcomma} are the only
+% options specific to the \textsf{mismath} package.}.
+%
% \subsection{Environments for systems of equations and small matrices}
%
% \DescribeEnv{system}
@@ -1046,14 +1072,14 @@
% \end{verbatim}
%
% \vspace{-4ex}
-% \subsection{Deprecated commands}
+% \subsection{Old commands}
%
-% Here is a summary table of the deprecated commands that were used until version 2.2.
+% Here is a summary table of old commands that were used until version 2.2.
% These commands are still functional and will be maintained for the time being,
-% but they do produce a warning message.
+% but a warning message indicates the new alternative.
% They used to work only in the preamble, affecting the entire document globally,
% and lacked an inverse switch.
-% As a result, these deprecated commands are now being replaced by the more
+% These old commands can now be replaced by the more
% versatile and powerful |\MathUp| macro, which can be used anywhere
% in the document or preamble and has an inverse switch |\MathIt|.
%
@@ -1061,7 +1087,7 @@
% \setlength{\extrarowheight}{1pt}
% \begin{tabular}{ll}
% \hline
-% Deprecated command & New alternative \\
+% Old command & New alternative \\
% \hline
% |\enumber| & |\MathUp{e}| \\
% |\inumber| & |\MathUp{i}| \\
@@ -1078,7 +1104,7 @@
% and you can include V in its argument to refer to variance.
%
% \medskip
-% In version 2.3 we attempted to replace these deprecated commands
+% In version 2.3 we attempted to replace these old commands
% with package options based on keyval. However, we found that this method was
% less efficient and have decided to abandon it.
% As a result, the command |\mismathset| is now obsolete.
@@ -1090,7 +1116,9 @@
%
% \begin{macrocode}
\newif\ifmm@ibrackets % initialized to false
+\newif\ifmm@decimalcomma
\DeclareOption{ibrackets}{\mm@ibracketstrue}
+\DeclareOption{decimalcomma}{\mm@decimalcommatrue}
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{amsmath}}
\ProcessOptions \relax
\@ifpackageloaded{amsmath}{}{\RequirePackage{amsmath}}
@@ -1101,10 +1129,11 @@
\RequirePackage{xspace}
\RequirePackage{iftex}
\ifmm@ibrackets\RequirePackage{ibrackets}\fi
+\ifmm@decimalcomma\RequirePackage{decimalcomma}\fi
% \end{macrocode}
-% The above conditional packages loading prevents ``option clash'' errors in case
-% these packages have been previously loaded previously with different options.
+% We have load certain packages conditionally to avoid 'option clash' errors in cases
+% where these packages have been previously loaded with other options.
%
% \medskip
% \DescribeMacro{\bslash}
@@ -1253,18 +1282,18 @@
% \DescribeMacro{\apply}
% With the inverse global switch |\MathNormal|, you can apply the normal (italic) style
% on any comma-separated list of characters. This is achieved using
-% the |\apply| macro, for example |\apply\macro{arg1,arg2}|
+% the |\apply| macro, \eg |\apply\macro{arg1,arg2}|
% expands to |\macro{arg1}\macro{arg2}|.
-% So using |\apply\MathUp{e,i,j}| is equivalent to |\MathUp{e}\MathUp{i}\MathUp{j}|.
-% I discovered this powerfull macro on Tex RSSing.com by searching for
+% Thus |\apply\MathUp{e,i,j}| is equivalent to |\MathUp{e}\MathUp{i}\MathUp{j}|.
+% I discovered this powerfull macro on \texttt{iterate190.rssing.com} by searching for
% ``TeX How to iterate over a comma separated list?''
-% The answer was provided by a user named ``wipet'' on 2021/02/26.
-% I don't know who is wipet but I am grateful for his contribution,
-% as this macro allows us to accomplish the task that
+% The answer was posted under the pseudonym `wipet' on 2021/02/26.
+% Let its author, Petr Olšák, be thanked.
+% This macro allows to accomplish tasks that
% usual loop instructions like |\@for| or |\foreach| cannot achieve due to
% errors like ``!~Improper alphabetic constant''.
% For instance, if you try |\def\letter{A} \MathUp{\letter}| it will fail
-% because the control sequence |\letter| is not considered as the single character `A'.
+% because the control sequence |\letter| is not equivalent here to the single character `A'.
%
% \medskip
% \begin{macrocode}
@@ -1279,7 +1308,7 @@
% \end{macrocode}
%
-% The following commands are deprecated but still work.
+% The following commands were used until version 2.2 but still work.
% They were intended to set some letters in upright shape
% in math mode, but only worked in the preamble.
% This is now managed by the more powerful |\MathUp| command, and
@@ -1288,27 +1317,28 @@
%
% \begin{macrocode}
\newcommand{\enumber}{%
- \PackageWarning{mismath}{Command \string\enumber\space
- is deprecated, \MessageBreak
- use \bslash MathUp{e} instead}
+ \PackageWarning{mismath}{Old command \string\enumber\space
+ is used. \MessageBreak
+ It can be replaced by \bslash MathUp{e}}
\MathUp{e}
}
\newcommand{\inumber}{%
- \PackageWarning{mismath}{Command \string\inumber\space
- is deprecated, \MessageBreak
- use \bslash MathUp{i} instead}
+ \PackageWarning{mismath}{Old command \string\inumber\space
+ is used. \MessageBreak
+ It can be replaced by \bslash MathUp{i}}
\MathUp{i}
}
\newcommand{\jnumber}{
- \PackageWarning{mismath}{Command \string\jnumber\space
- is deprecated, \MessageBreak
- use \bslash MathUp{j} instead}
+ \PackageWarning{mismath}{Old command \string\jnumber\space
+ is used. \MessageBreak
+ It can be replaced by \bslash MathUp{j}}
\MathUp{j}
}
\newcommand{\PEupright}{
- \PackageWarning{mismath}{Command \string\PEupright\space
- is deprecated, \MessageBreak
- use \bslash MathUp{P} and \bslash MathUp{R} instead}
+ \PackageWarning{mismath}{Old command \string\PEupright\space
+ is used. \MessageBreak
+ It can be replaced by \bslash MathUp{P}
+ and \bslash MathUp{E}}
\MathUp{P}\MathUp{E}
}
@@ -1529,8 +1559,8 @@
\begin{math}\begin{aligned}\displaystyle
}
% \end{macrocode}
-% \bigskip
-% \begin{thebibliography}{24}
+% \pagebreak
+% \begin{thebibliography}{27}
% \begin{raggedright}
% \bibitem{TYPMA} \emph{Typesetting mathematics for science and technology according
% to ISO 31/XI}, Claudio Beccari, TUGboat Volume 18 (1997), No.~1.
@@ -1570,6 +1600,12 @@
% \bibitem{LGR} \emph{The \textsf{lgrmath} package}, Jean-François B., CTAN, v1.0 2022/11/16.
% \bibitem{INT} \emph{The \textsf{interval} package}. Lars Madsen, CTAN,
% v0.4 2019/03/06.
+% \bibitem{ICOMMA} \emph{The \textsf{icomma} package for \LaTeXe}.
+% Walter Schmidt, CTAN, v2.0 2002/03/10.
+% \bibitem{NCC} \emph{The \textsf{ncccomma} package}. Alexander I.~Rozhenko,
+% CTAN, v1.0 2005/02/10.
+% \bibitem{DEC} \emph{The \textsf{decimalcomma} package}. Antoine Missier,
+% CTAN, v1.0 2023/12/06.
% \bibitem{SYST} \emph{L'extension pour \TeX\ et \LaTeX\ \textsf{systeme}},
% Christian Tellechea, CTAN v0.32 2019/01/13.
% \bibitem{SPAL} \emph{The \textsf{spalign} package}, Joseph Rabinoff, CTAN, 2016/10/05.
diff --git a/macros/latex/contrib/mismath/mismath.pdf b/macros/latex/contrib/mismath/mismath.pdf
index 0ba40a0458..e55f6ede13 100644
--- a/macros/latex/contrib/mismath/mismath.pdf
+++ b/macros/latex/contrib/mismath/mismath.pdf
Binary files differ
diff --git a/macros/latex/contrib/profmaquette/doc/ProfMaquette-doc.pdf b/macros/latex/contrib/profmaquette/doc/ProfMaquette-doc.pdf
index ed8e4c5c09..d3c757b5d4 100644
--- a/macros/latex/contrib/profmaquette/doc/ProfMaquette-doc.pdf
+++ b/macros/latex/contrib/profmaquette/doc/ProfMaquette-doc.pdf
Binary files differ
diff --git a/macros/latex/contrib/profmaquette/doc/ProfMaquette-doc.tex b/macros/latex/contrib/profmaquette/doc/ProfMaquette-doc.tex
index 2304a9cd99..f7ed922994 100644
--- a/macros/latex/contrib/profmaquette/doc/ProfMaquette-doc.tex
+++ b/macros/latex/contrib/profmaquette/doc/ProfMaquette-doc.tex
@@ -1428,7 +1428,8 @@ Cela engendre, si nécessaire, la création de fichier \lstinline!*.sol! pour le
\clearpage
\section*{Historique}
\begin{description}
-\item[\PfMfiledate{}--v \PfMfileversion] Ajout d'une clé \Cle{Dys} pour les élèves à profil particulier.
+\item[\PfMfiledate{}--v \PfMfileversion] Correction de bugs.
+ %0.80 Ajout d'une clé \Cle{Dys} pour les élèves à profil particulier.
%0.75 Exercices {\em éventuellement} non numérotés. Correction de bugs (Feuille de route).
%0.65 Création du format CAN (Course aux nombres).
\end{description}
diff --git a/macros/latex/contrib/profmaquette/latex/ProfMaquette.sty b/macros/latex/contrib/profmaquette/latex/ProfMaquette.sty
index 9f30f0948a..24267d36b5 100644
--- a/macros/latex/contrib/profmaquette/latex/ProfMaquette.sty
+++ b/macros/latex/contrib/profmaquette/latex/ProfMaquette.sty
@@ -2,9 +2,9 @@
% licence : Released under the LaTeX Project Public License v1.3c
% or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}%
-\def\filedate{2023/11/25}%
+\def\filedate{2023/12/20}%
\let\PfMfiledate\filedate%
-\def\fileversion{0.8}%
+\def\fileversion{0.82}%
\let\PfMfileversion\fileversion%
\ProvidesPackage{ProfMaquette}[\filedate\space v\fileversion\space Maquettage de documents]%
@@ -141,11 +141,16 @@
}
\NewDocumentEnvironment{Consignes}{+b}{%
+ \ifboolKV[Boulot]{CAN}{}{%
\begin{tcolorbox}[consignes]
\small\sffamily #1
\end{tcolorbox}
+ }
}{}%
+\definecolor{SLCP}{HTML}{00B51A}
+\colorlet{Evidence}{SLCP}
+
% Pour la gestion de l'aléatoire
% afin de permettre d'utiliser le même exercice.
% Extraire des sommets
@@ -561,17 +566,17 @@
\newlength{\brouillon}
\newcommand*\FranPt[1]{%
- \ifboolKV[ClesExercices]{BaremeDetaille}{%
- \color{gray!75}(\num{#1})%
- }{}
+% \ifboolKV[ClesExercices]{BaremeDetaille}{%
+ \color{red!75}(\num{#1})%
+% }{}
}
\makeatletter
-\newcommand\BaremeEspace@Marge{15pt}
+\newcommand\BaremeEspace@Marge{18pt}
\newcommand\BaremeEspace@MargeCorrection{0pt}
%\f@size est la taille par défaut de la fonte.
-\newcommand*{\brm}[1]{%
+\newcommand*\brm[1]{%
\ifboolKV[Boulot]{Fiche}{}{%
\immediate\write\@auxout{%
\string\opadd*{#1}%
@@ -583,8 +588,32 @@
\setlength{\brouillon}{\BaremeEspace@Marge-\linewidth+\textwidth}%
\makebox[0pt][r]{\footnotesize\FranPt{#1}\hspace*{\brouillon}}%
\ignorespaces%
+ }{}%
+ }%
+}%
+
+\NewDocumentCommand\BRM{som}{%
+ \ifboolKV[Boulot]{Fiche}{}{%
+ \immediate\write\@auxout{%
+ \string\opadd*{#3}%
+ {total\the\c@PfMSection-\the\c@PfMExo}%
+ {total\the\c@PfMSection-\the\c@PfMExo}%
+ \string\opcopy{\thePfMExo}{TotalExo}%
}%
- }{}%
+ \IfBooleanTF{#1}{%
+ \ifboolKV[ClesExercices]{BaremeDetaille}{%
+ \setlength{\brouillon}{\fpeval{\BaremeEspace@Marge-#2}pt}%
+ \makebox[0pt][r]{\footnotesize\FranPt{#3}\hspace*{\brouillon}}%
+ \ignorespaces%
+ }{}%
+ }{%
+ \ifboolKV[ClesExercices]{BaremeDetaille}{%
+ \setlength{\brouillon}{\BaremeEspace@Marge-\linewidth+\textwidth}%
+ \makebox[0pt][r]{\footnotesize\FranPt{#3}\hspace*{\brouillon}}%
+ \ignorespaces%
+ }{}%
+ }%
+ }%
}%
\newcommand*{\Brm}[1]{%
@@ -655,6 +684,9 @@
before skip=1em,
enhanced,
breakable,
+ fonttitle=\bfseries\sffamily,
+ title=\ifboolKV[ClesExercices]{AffichageTitre}{\useKV[ClesExercices]{Titre}}{},%
+ coltitle=black,
frame hidden,
}
}
@@ -751,7 +783,7 @@
\@ifundefined{Op@\Alph{PfMMaquette}-ContratTotalExo}{Recompilez pour obtenir le contrat.}%
{%
\opexport{\Alph{PfMMaquette}-ContratTotalExo}{\ContratTotalExo}%
- % Total Exo : \ContratTotalExo
+% % Total Exo : \ContratTotalExo
\setsepchar{,}\ignoreemptyitems%
\xdef\PfCFooListeA{\csname \Alph{PfMMaquette}Contrata\endcsname}%
\xdef\PfCFooListeB{\csname \Alph{PfMMaquette}Contratb\endcsname}%
@@ -759,7 +791,7 @@
\readlist*\ListeB{\PfCFooListeB}%
% Liste A : \showitems\ListeA[]\par
% Liste B : \showitems\ListeB[]\par
- % On écrit en supposant que la liste A est la plus longue
+% % On écrit en supposant que la liste A est la plus longue
\xdef\LongueurA{\ListeAlen}%
\xdef\LongueurB{\ListeBlen}%
\xdef\Foo{}%
@@ -783,6 +815,13 @@
\xdef\Foo{\Foo,\ListeB[##1]}
}%
}%
+ % on vérifie qu'on n'a pas oublié des 0 :)
+ \readlist*\ListeB{\Foo}%
+ \ifnum\ListeAlen>\ListeBlen\relax
+ \xintFor* ##4 in{\xintSeq{1}{\fpeval{\ListeAlen-\ListeBlen}}}\do{
+ \xdef\Foo{\Foo,0}
+ }
+ \fi
% La liste A est \showitems\ListeA[]\par
\readlist*\ListeB{\Foo}%
% La liste B modifiée est \showitems\ListeB[]\par
@@ -2533,13 +2572,13 @@
\ifboolKV[Boulot]{CorrigeFin}{%
\AddToHook{env/Maquette/after}[Correction]{%
\useKVdefault[Boulot]%
- \setKV[Boulot]{#1}%
- \PfMBasculeDys%
- \setlength{\columnseprule}{\useKV[Boulot]{Epaisseur}}%
- \TikzCANCor{#2}%
- \ifboolKV[Boulot]{CorrectionColonnes}{\begin{multicols}{\useKV[Boulot]{Colonnes}}}{}%
+ \setKV[Boulot]{#1}%
+ \PfMBasculeDys%
+ \setlength{\columnseprule}{\useKV[Boulot]{Epaisseur}}%
+ \TikzCANCor{#2}%
+ \ifboolKV[Boulot]{CorrectionColonnes}{\begin{multicols}{\useKV[Boulot]{Colonnes}}}{}%
\PfMAffichageCorrige%
- \ifboolKV[Boulot]{CorrectionColonnes}{\end{multicols}}{}%
+ \ifboolKV[Boulot]{CorrectionColonnes}{\end{multicols}}{}%
}%
}{}%
}{%
diff --git a/macros/latex/contrib/sidenotesplus/README.txt b/macros/latex/contrib/sidenotesplus/README.txt
index e8d6a21a01..23817d80ea 100644
--- a/macros/latex/contrib/sidenotesplus/README.txt
+++ b/macros/latex/contrib/sidenotesplus/README.txt
@@ -2,7 +2,7 @@ LaTeX package sidenotesplus
Copyright (c) Anton Vrba, 2022
-------------------------------------------------------------------
Version:
- 2023/10/05 1.03 added \sidecitebefore and \sidecitemark
+ 2023/12/19 1.04 fixed bug in \sidecite (Trailing comma replaced by trailing period)
Licence:
This work may be distributed and/or modified under the conditions
of the LaTeX Project Public License, version 1.3c of the license.
@@ -18,6 +18,7 @@ Abstract:
-------------------------------------------------------------------
Previous Versions:
- 2202/07/09 1.02 Added Ragged option
+ 2023/10/05 1.03 added \sidecitebefore and \sidecitemark
+ 2022/07/09 1.02 Added Ragged option
2022/05/31 1.01 Minor bug fix
2022/05/15 1.00 Initial release
diff --git a/macros/latex/contrib/sidenotesplus/sidenotesplus.dtx b/macros/latex/contrib/sidenotesplus/sidenotesplus.dtx
index 4d559deb3f..4379b0152c 100644
--- a/macros/latex/contrib/sidenotesplus/sidenotesplus.dtx
+++ b/macros/latex/contrib/sidenotesplus/sidenotesplus.dtx
@@ -36,7 +36,7 @@
%<package>\NeedsTeXFormat{LaTeX2e}[2020/10/01]
%<package>\ProvidesPackage{sidenotesplus}
%<*package>
- [2023/10/05 1.03 rich text marginal notes, tables and figures ]
+ [2023/12/19 1.04 rich text marginal notes, tables and figures ]
%</package>
%<package>\RequirePackage{marginnote} % provides an offset option for the marginals instead of a float
%<package>\RequirePackage{caption} % handles the captions (in the margin)
@@ -98,6 +98,7 @@
% \changes{1.01}{2022/05/31}{Environment text* improved}
% \changes{1.02}{2022/07/09}{added Ragged option}
% \changes{1.03}{2023/10/05}{added commands sidecitebefore, sideciteafter and sidcitemark}
+% \changes{1.04}{2023/12/19}{fixed bug in the sidecite commands (Trailing comma replaced by trailing period}
%
% \begin{abstract}
% \noindent A package to manage the margin notes, figures, tables and captions.
@@ -1267,8 +1268,10 @@
{\RenewDocumentCommand \snp@before {} {}}
{\RenewDocumentCommand \snp@before {} {#6}}
\IfNoValueOrEmptyTF{#7}
- {\RenewDocumentCommand \snp@after {} {}}
- {\RenewDocumentCommand \snp@after {} {#7}}
+ { \DeclareDelimFormat{postnotedelim}{\addperiod}
+ \RenewDocumentCommand \snp@after {} {}}
+ { \DeclareDelimFormat{postnotedelim}{\addcomma\space}
+ \RenewDocumentCommand \snp@after {} { #7}}
\sidenote|#2|<#3>(#4)!#5!{\kern-2.3pt\upshape\fullcite[\snp@before][\snp@after]{#8}}
}
% \end{macrocode}
@@ -1282,8 +1285,10 @@
{\RenewDocumentCommand \snp@before {} {}}
{\RenewDocumentCommand \snp@before {} {#6}}
\IfNoValueOrEmptyTF{#7}
- {\RenewDocumentCommand \snp@after {} {}}
- {\RenewDocumentCommand \snp@after {} {#7}}
+ { \DeclareDelimFormat{postnotedelim}{\addperiod}
+ \RenewDocumentCommand \snp@after {} {}}
+ { \DeclareDelimFormat{postnotedelim}{\addcomma\space}
+ \RenewDocumentCommand \snp@after {} { #7}}
\IfBooleanTF{#1}
{
\citeauthor{#8}'s\sidenote|#2|<#3>(#4)!#5!
@@ -1310,8 +1315,10 @@
{\RenewDocumentCommand \snp@before {} {}}
{\RenewDocumentCommand \snp@before {} {#6}}
\IfNoValueOrEmptyTF{#7}
- {\RenewDocumentCommand \snp@after {} {}}
- {\RenewDocumentCommand \snp@after {} {#7}}
+ { \DeclareDelimFormat{postnotedelim}{\addperiod}
+ \RenewDocumentCommand \snp@after {} {}}
+ { \DeclareDelimFormat{postnotedelim}{\addcomma\space}
+ \RenewDocumentCommand \snp@after {} { #7}}
\sidenotetextbefore|#2|<#3>(#4)!#5!{\kern-2.3pt\upshape\fullcite[\snp@before][\snp@after]{#8}}
}
% \end{macrocode}
@@ -1329,8 +1336,10 @@
{\RenewDocumentCommand \snp@before {} {}}
{\RenewDocumentCommand \snp@before {} {#6}}
\IfNoValueOrEmptyTF{#7}
- {\RenewDocumentCommand \snp@after {} {}}
- {\RenewDocumentCommand \snp@after {} {#7}}
+ { \DeclareDelimFormat{postnotedelim}{\addperiod}
+ \RenewDocumentCommand \snp@after {} {}}
+ { \DeclareDelimFormat{postnotedelim}{\addcomma\space}
+ \RenewDocumentCommand \snp@after {} { #7}}
\sidenotetext|#2|<#3>(#4)!#5!{\kern-2.3pt\upshape\fullcite[\snp@before][\snp@after]{#8}}
}
% \end{macrocode}
diff --git a/macros/latex/contrib/sidenotesplus/sidenotesplus.pdf b/macros/latex/contrib/sidenotesplus/sidenotesplus.pdf
index cf8d8c792c..0f8f05d746 100644
--- a/macros/latex/contrib/sidenotesplus/sidenotesplus.pdf
+++ b/macros/latex/contrib/sidenotesplus/sidenotesplus.pdf
Binary files differ
diff --git a/macros/latex/contrib/sidenotesplus/tests-sidenoteplus.bib b/macros/latex/contrib/sidenotesplus/tests-sidenoteplus.bib
deleted file mode 100644
index 6dc192ea7b..0000000000
--- a/macros/latex/contrib/sidenotesplus/tests-sidenoteplus.bib
+++ /dev/null
@@ -1,45 +0,0 @@
-%% LaTeX2e file `tests-sidenoteplus.bib'
-%% generated by the `filecontents' environment
-%% from source `tests-sidenoteplus' on 2022/07/09.
-%%
-@book{Tufte1990,
- author = {Edward R. Tufte},
- title = {Envisioning Information},
- publisher = {Graphics Press},
- year = {1990},
- isbn = {0-9613921-1-8}
-}
-
-@book{Tufte2006,
- author = {Edward R. Tufte},
- title = {Beautiful Evidence},
- year = {2006},
- publisher = {Graphics Press, {LLC}},
- isbn = {0-9613921-7-7}
-}
-
-@BOOK{bringhurst:2002,
- title = {{T}he {E}lements of {T}ypographic {S}tyle},
- publisher = {Hartley \& Marks Publishers},
- year = {2013},
- author = {Robert Bringhurst},
- series = {Version 4.0: 20th Anniversary Edition},
- address = {Point Roberts, WA, USA}
- }
-
-@Article{Einstein_1905e,
- author = {A. Einstein},
- journal = {Annalen der Physik},
- title = {Ist die Trägheit eines Körpers von seinem Energieinhalt abhängig?},
- year = {1905},
- number = {13},
- pages = {639--641},
- volume = {323},
- doi = {10.1002/andp.19053231314},
- file = {:Articles/Einstein_1905e - Does the Inertia of a Body Depend upon its
- Energy-Content_.pdf:PDF;:Articles/Einstein_1905e - Ist Die Trägheit Eines Körpers Von Seinem
- Energieinhalt Abhängig_.pdf:PDF},
- groups = {Relativity},
- publisher = {Wiley},
-}
-
diff --git a/macros/latex/contrib/sidenotesplus/tests-sidenoteplus.pdf b/macros/latex/contrib/sidenotesplus/tests-sidenoteplus.pdf
index 9d2049e257..a946ed6a01 100644
--- a/macros/latex/contrib/sidenotesplus/tests-sidenoteplus.pdf
+++ b/macros/latex/contrib/sidenotesplus/tests-sidenoteplus.pdf
Binary files differ
diff --git a/macros/latex/contrib/sidenotesplus/tests-sidenoteplus.tex b/macros/latex/contrib/sidenotesplus/tests-sidenoteplus.tex
index 41eccf6e4a..26afebbb76 100644
--- a/macros/latex/contrib/sidenotesplus/tests-sidenoteplus.tex
+++ b/macros/latex/contrib/sidenotesplus/tests-sidenoteplus.tex
@@ -55,7 +55,25 @@
address = {Point Roberts, WA, USA}
}
-@Article{Einstein_1905e,
+
+
+
+@Article{Einstein_str,
+ author = {A. Einstein},
+ journal = {Annalen der Physik},
+ title = {Zur Elektrodynamik bewegter Körper},
+ year = {1905},
+ number = {10},
+ pages = {891--921},
+ volume = {322},
+ doi = {10.1002/andp.19053221004},
+ file = {:Articles/Einstein_1905d - On the Electrodynamics of Moving Bodies.pdf:PDF;:Articles/Einstein_1905d - Zur Elektrodynamik Bewegter Körper.pdf:PDF},
+ groups = {Relativity},
+ publisher = {Wiley},
+ sorttitle = {a},
+}
+
+@Article{Einstein_mc2,
author = {A. Einstein},
journal = {Annalen der Physik},
title = {Ist die Trägheit eines Körpers von seinem Energieinhalt abhängig?},
@@ -64,21 +82,36 @@
pages = {639--641},
volume = {323},
doi = {10.1002/andp.19053231314},
- file = {:Articles/Einstein_1905e - Does the Inertia of a Body Depend upon its
- Energy-Content_.pdf:PDF;:Articles/Einstein_1905e - Ist Die Trägheit Eines Körpers Von Seinem
- Energieinhalt Abhängig_.pdf:PDF},
+ file = {:Articles/Einstein_1905e - Does the Inertia of a Body Depend upon its Energy-Content_.pdf:PDF;:Articles/Einstein_1905e - Ist Die Trägheit Eines Körpers Von Seinem Energieinhalt Abhängig_.pdf:PDF},
groups = {Relativity},
publisher = {Wiley},
+ sorttitle = {b},
}
+
+
\end{filecontents}
\usepackage{mwe}
% -- language: English --
%
\usepackage[english]{babel}
% -- biblatex --
-\usepackage[backend=biber,style=nature]{biblatex} % xxx
-% the .bib file with the references
+\PassOptionsToPackage{%
+ backend=bibtex,bibencoding=ascii,%
+ language=auto,%
+ style=verbose-ibid,
+ bibstyle=authoryear,dashed=false,
+ sorting = anyvt,
+ maxbibnames=10, % default: 3, et al.
+ natbib=true, % natbib compatibility mode (\citep and \citet still work)
+ urldate=iso,date=iso,
+ isbn=false,
+ doi=false,
+ url=false,
+ eprint=false,
+}{biblatex}
+\usepackage{biblatex}
+
\addbibresource{\jobname.bib}
@@ -199,7 +232,7 @@ set. In usage \verb"\sidenotemark" is followed by \verb"\sidenotetext", whereas
to the \verb"\sidenotetext" commands.
\sidecitet*{bringhurst:2002} expertise is in typography, and the famous expression $E=mc^2$ was
- first presented in this paper\sidecite{Einstein_1905e}.
+ first presented with these papers\sidecite{Einstein_mc2, Einstein_str}.
~
@@ -207,7 +240,7 @@ to the \verb"\sidenotetext" commands.
\begin{verbatim}
\sidecitet*{bringhurst:2002} expertise is in typography,
and the famous expression $E=mc^2$ was first presented
- in this paper\sidecite{Einstein_1905e}.
+ with these papers\sidecite{Einstein_mc2, Einstein_str}.
\end{verbatim}