summaryrefslogtreecommitdiff
path: root/macros/latex/contrib
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2024-04-13 03:01:50 +0000
committerNorbert Preining <norbert@preining.info>2024-04-13 03:01:50 +0000
commit8c3c68877a46b9b70b5d02c8582595e90be9737a (patch)
tree1d3660064a6fbe1b71a4a6f1a505812aecafdf23 /macros/latex/contrib
parent230773c2e42cd0257e4150d0b500aa7ca6c1c02a (diff)
CTAN sync 202404130301
Diffstat (limited to 'macros/latex/contrib')
-rw-r--r--macros/latex/contrib/huaz/README2
-rw-r--r--macros/latex/contrib/huaz/huaz.pdfbin327838 -> 328438 bytes
-rw-r--r--macros/latex/contrib/huaz/huaz.sty7
-rw-r--r--macros/latex/contrib/huaz/huaz.tex6
-rw-r--r--macros/latex/contrib/hulipsum/hulipsum.dtx18
-rw-r--r--macros/latex/contrib/hulipsum/hulipsum.pdfbin156432 -> 156507 bytes
-rw-r--r--macros/latex/contrib/siunitx/CHANGELOG.md9
-rw-r--r--macros/latex/contrib/siunitx/README.md4
-rw-r--r--macros/latex/contrib/siunitx/siunitx-abbreviation.dtx4
-rw-r--r--macros/latex/contrib/siunitx/siunitx-angle.dtx4
-rw-r--r--macros/latex/contrib/siunitx/siunitx-binary.dtx4
-rw-r--r--macros/latex/contrib/siunitx/siunitx-code.pdfbin647146 -> 645101 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx-code.tex4
-rw-r--r--macros/latex/contrib/siunitx/siunitx-command.dtx4
-rw-r--r--macros/latex/contrib/siunitx/siunitx-complex.dtx4
-rw-r--r--macros/latex/contrib/siunitx/siunitx-compound.dtx2
-rw-r--r--macros/latex/contrib/siunitx/siunitx-emulation.dtx4
-rw-r--r--macros/latex/contrib/siunitx/siunitx-locale.dtx4
-rw-r--r--macros/latex/contrib/siunitx/siunitx-number.dtx11
-rw-r--r--macros/latex/contrib/siunitx/siunitx-print.dtx2
-rw-r--r--macros/latex/contrib/siunitx/siunitx-quantity.dtx4
-rw-r--r--macros/latex/contrib/siunitx/siunitx-symbol.dtx4
-rw-r--r--macros/latex/contrib/siunitx/siunitx-table.dtx4
-rw-r--r--macros/latex/contrib/siunitx/siunitx-unit.dtx2
-rw-r--r--macros/latex/contrib/siunitx/siunitx.dtx4
-rw-r--r--macros/latex/contrib/siunitx/siunitx.ins6
-rw-r--r--macros/latex/contrib/siunitx/siunitx.pdfbin705175 -> 703728 bytes
-rw-r--r--macros/latex/contrib/siunitx/siunitx.tex2
-rw-r--r--macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-en.pdfbin465893 -> 476435 bytes
-rw-r--r--macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-en.tex30
-rw-r--r--macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-fr.pdfbin607723 -> 612911 bytes
-rw-r--r--macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-fr.tex49
-rw-r--r--macros/latex/contrib/writeongrid/tex/WriteOnGrid.sty153
33 files changed, 277 insertions, 74 deletions
diff --git a/macros/latex/contrib/huaz/README b/macros/latex/contrib/huaz/README
index d0fcca51b4..b37490a04a 100644
--- a/macros/latex/contrib/huaz/README
+++ b/macros/latex/contrib/huaz/README
@@ -1,6 +1,6 @@
huaz.sty package
-Copyright 2022 by Tibor Tómács
+Copyright 2022-2024 by Tibor Tómács
Automatic definite articles for Hungarian
diff --git a/macros/latex/contrib/huaz/huaz.pdf b/macros/latex/contrib/huaz/huaz.pdf
index a9092fdb9d..ab19e2a95f 100644
--- a/macros/latex/contrib/huaz/huaz.pdf
+++ b/macros/latex/contrib/huaz/huaz.pdf
Binary files differ
diff --git a/macros/latex/contrib/huaz/huaz.sty b/macros/latex/contrib/huaz/huaz.sty
index c6b40e6f14..8127c5b585 100644
--- a/macros/latex/contrib/huaz/huaz.sty
+++ b/macros/latex/contrib/huaz/huaz.sty
@@ -3,7 +3,7 @@
%%
%% Automatic Hungarian definite articles
%%
-%% Copyright 2022 by Tibor Tomacs
+%% Copyright 2022-2024 by Tibor Tomacs
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -18,7 +18,7 @@
%% The Current Maintainer of this work is Tibor Tomacs.
%%
\NeedsTeXFormat{LaTeX2e}[2021/10/10]
-\ProvidesPackage{huaz}[2022/10/16 v1.0 Automatic Hungarian definite articles]
+\ProvidesPackage{huaz}[2024/04/12 v1.1 Automatic Hungarian definite articles]
\RequirePackage{xstring,refcount,iftex}
@@ -102,7 +102,8 @@
\def\large{}\def\Large{}\def\LARGE{}\def\huge{}\def\Huge{}%
\def\uppercase{}\def\lowercase{}\def\MakeUppercase{}\def\MakeLowercase{}%
\def\textcolor{\huaz@deloptparam}\def\color{\huaz@deloptparam}%
- \def\mbox{}\def\fbox{}}
+ \def\mbox{}\def\fbox{}%
+ \def\told{}}
\AddToHook{huaz}{% Expandable cross-references commands
\def\ref#1{\getrefnumber{#1}}%
diff --git a/macros/latex/contrib/huaz/huaz.tex b/macros/latex/contrib/huaz/huaz.tex
index 0d1eb4b74a..c873d10fb4 100644
--- a/macros/latex/contrib/huaz/huaz.tex
+++ b/macros/latex/contrib/huaz/huaz.tex
@@ -63,9 +63,9 @@ keepspaces]}
\begin{document}
\title{The \huaz\ package\\
- {\large v1.0 (2022/10/16)}}
+ {\large v1.1 (2024/04/12)}}
\author{Tibor Tómács\\
- {\normalsize\href{email:tomacs.tibor@uni-eszterhazy.hu}{\nolinkurl{tomacs.tibor@uni-eszterhazy.hu}}}}
+ {\normalsize\href{email:tomacs.tibor@gmail.com}{\nolinkurl{tomacs.tibor@gmail.com}}}}
\date{}
\maketitle
@@ -75,7 +75,7 @@ In Hungarian there are two definite articles, \emph{``a''} and \emph{``az''}, wh
The \huaz\ package helps the user to insert automatically the correct definite article for cross-references and other commands containing text. Thus, if these change, the definite articles will also change accordingly.
\medskip
-\emph{Sorry, the documentation is in Hungarian, because only users of the Hungarian language are interested.}
+\emph{Sorry, the documentation is in Hungarian. This is because only Hungar\-ian-speaking users are interested.}
\end{abstract}
\end{otherlanguage}
diff --git a/macros/latex/contrib/hulipsum/hulipsum.dtx b/macros/latex/contrib/hulipsum/hulipsum.dtx
index 02d257e3a9..693be54052 100644
--- a/macros/latex/contrib/hulipsum/hulipsum.dtx
+++ b/macros/latex/contrib/hulipsum/hulipsum.dtx
@@ -25,7 +25,7 @@
\ProvidesFile{hulipsum.dtx}
%</driver>
%<package>\NeedsTeXFormat{LaTeX2e}[2022/06/20]
-%<package>\ProvidesPackage{hulipsum}[2024/04/07 v1.2 Hungarian dummy text (Lorum ipse)]
+%<package>\ProvidesPackage{hulipsum}[2024/04/12 v1.3 Hungarian dummy text (Lorum ipse)]
%
%<*driver>
\documentclass{ltxdoc}
@@ -59,8 +59,8 @@ keepspaces]}
%
% \GetFileInfo{hulipsum.sty}
%
-% \title{The {\bfseries\sffamily hulipsum} package\\{\large v1.2 (2024/04/07)}}
-% \author{Tibor Tómács\\{\normalsize\url{tomacs.tibor@gmail.com}}}
+% \title{The {\bfseries\sffamily hulipsum} package\\{\large v1.3 (2024/04/12)}}
+% \author{Tibor Tómács\\{\normalsize\href{mailto:tomacs.tibor@gmail.com}{\texttt{tomacs.tibor@gmail.com}}}}
% \date{}
% \maketitle
% \thispagestyle{empty}
@@ -110,22 +110,22 @@ keepspaces]}
%
% \begin{description}
% \item \commandinline|maketitle=!<boolean>!| \hfill (default: \texttt{true})\\
-% Adds \verbinline|\maketitle| if the \commandinline|!<boolean>!| is \texttt{true}.
+% Adds \verbinline|\maketitle|, if the \commandinline|!<boolean>!| is \texttt{true}.
%
% \item \commandinline|tableofcontents=!<boolean>!| \hfill (default: \texttt{true})\\
-% Adds \verbinline|\tableofcontents| if the \commandinline|!<boolean>!| is \texttt{true}.
+% Adds \verbinline|\tableofcontents|, if the \commandinline|!<boolean>!| is \texttt{true}.
%
% \item \commandinline|part=!<boolean>!| \hfill (default: \texttt{false})\\
% Adds \verbinline|\part{...}| before the chapter and section, if the \commandinline|!<boolean>!| is \texttt{true}.
%
% \item \commandinline|abstract=!<boolean>!| \hfill (default: \texttt{true})\\
-% Adds an \texttt{abstract} environment if the \commandinline|!<boolean>!| is \texttt{true}.
+% Adds an \texttt{abstract} environment, if the \commandinline|!<boolean>!| is \texttt{true}.
%
% \item \commandinline|math=!<boolean>!| \hfill (default: \texttt{true})\\
-% Adds a mathematical equation if the \commandinline|!<boolean>!| is \texttt{true}.
+% Adds a mathematical formula, if the \commandinline|!<boolean>!| is \texttt{true}.
%
% \item \commandinline|bibliography=!<boolean>!| \hfill (default: \texttt{true})\\
-% Adds \texttt{thebibliography} environment if the \commandinline|!<boolean>!| is \texttt{true}.
+% Adds \texttt{thebibliography} environment, if the \commandinline|!<boolean>!| is \texttt{true}.
% \end{description}
% The \texttt{=true} can be omitted in the options. For example \verbinline|\hulipsumdocument[part,math=false]|.
% \end{description}
@@ -243,7 +243,7 @@ keepspaces]}
\if@hulipsum@maketitle
\@ifundefined{title}{}{\title{L\'{o}rum ipse}}
\@ifundefined{author}{}{\author{Nyomasek Bob\'{o}}}
-\@ifundefined{supervisor}{}{\supervisor{Szel\'{e}s Gerg\H{o}\\ egyetemi docens}\author{Nyomasek Bob\'{o}\\ matematika szak}}
+\@ifundefined{supervisor}{}{\supervisor{Dr. Szel\'{e}s Gerg\H{o}\\ egyetemi docens}\author{Nyomasek Bob\'{o}\\ matematika szak}}
\@ifundefined{institute}{}{\institute{Matematikai és Informatikai Intézet}}
\@ifundefined{city}{}{\city{Eger}}
\@ifundefined{maketitle}{}{\maketitle}
diff --git a/macros/latex/contrib/hulipsum/hulipsum.pdf b/macros/latex/contrib/hulipsum/hulipsum.pdf
index c44bf76cb9..a692e8f383 100644
--- a/macros/latex/contrib/hulipsum/hulipsum.pdf
+++ b/macros/latex/contrib/hulipsum/hulipsum.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/CHANGELOG.md b/macros/latex/contrib/siunitx/CHANGELOG.md
index 2c9d384bf9..87c775ca83 100644
--- a/macros/latex/contrib/siunitx/CHANGELOG.md
+++ b/macros/latex/contrib/siunitx/CHANGELOG.md
@@ -7,6 +7,12 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
## [Unreleased]
+## [v3.3.13] - 2024-04-12
+
+### Fixed
+- Minimum digits in uncertainties under some circumstances (see issue
+ [\#725](https://github.com/josephwright/siunitx/issues/725))
+
## [v3.3.12] - 2024-02-15
### Fixed
@@ -2080,7 +2086,8 @@ Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to
### Added
- First public testing release (as `si`)
-[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.3.12...HEAD
+[Unreleased]: https://github.com/josephwright/siunitx/compare/v3.3.13...HEAD
+[v3.3.13]: https://github.com/josephwright/siunitx/compare/v3.3.12...v3.3.13
[v3.3.12]: https://github.com/josephwright/siunitx/compare/v3.3.11...v3.3.12
[v3.3.11]: https://github.com/josephwright/siunitx/compare/v3.3.10...v3.3.11
[v3.3.10]: https://github.com/josephwright/siunitx/compare/v3.3.9...v3.3.10
diff --git a/macros/latex/contrib/siunitx/README.md b/macros/latex/contrib/siunitx/README.md
index 9b5881aead..9619de2d6b 100644
--- a/macros/latex/contrib/siunitx/README.md
+++ b/macros/latex/contrib/siunitx/README.md
@@ -17,8 +17,8 @@ ability to control tabular alignment of numbers.
## Author
-This package is maintained by Joseph Wright: joseph.wright@morningstar2.co.uk
+This package is maintained by Joseph Wright: joseph@texdev.net
## License
-Released under the LaTeX Project Public License v1.3c or later. See https://www.latex-project.org/lppl.txt \ No newline at end of file
+Released under the LaTeX Project Public License v1.3c or later. See https://www.latex-project.org/lppl.txt
diff --git a/macros/latex/contrib/siunitx/siunitx-abbreviation.dtx b/macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
index 2d4e60e1d4..f123546389 100644
--- a/macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-abbreviation.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% File: siunitx-abbreviation.dtx Copyright (C) 2018,2019,2021-2023 Joseph Wright
+% File: siunitx-abbreviation.dtx Copyright (C) 2018,2019,2021-2024 Joseph Wright
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -49,7 +49,7 @@
% Joseph Wright^^A
% \thanks{^^A
% E-mail:
-% \email{joseph.wright@morningstar2.co.uk}^^A
+% \email{joseph@texdev.net}^^A
% }^^A
% }
%
diff --git a/macros/latex/contrib/siunitx/siunitx-angle.dtx b/macros/latex/contrib/siunitx/siunitx-angle.dtx
index 7b2b012e13..ac933f4636 100644
--- a/macros/latex/contrib/siunitx/siunitx-angle.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-angle.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% File: siunitx-angle.dtx Copyright (C) 2016-2019,2021-2023 Joseph Wright
+% File: siunitx-angle.dtx Copyright (C) 2016-2019,2021-2024 Joseph Wright
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -50,7 +50,7 @@
% Joseph Wright^^A
% \thanks{^^A
% E-mail:
-% \email{joseph.wright@morningstar2.co.uk}^^A
+% \email{joseph@texdev.net}^^A
% }^^A
% }
%
diff --git a/macros/latex/contrib/siunitx/siunitx-binary.dtx b/macros/latex/contrib/siunitx/siunitx-binary.dtx
index bcb643808e..04e18e6e06 100644
--- a/macros/latex/contrib/siunitx/siunitx-binary.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-binary.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% File: siunitx-binary.dtx Copyright (C) 2021,2023 Joseph Wright
+% File: siunitx-binary.dtx Copyright (C) 2021,2023,2024 Joseph Wright
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -49,7 +49,7 @@
% Joseph Wright^^A
% \thanks{^^A
% E-mail:
-% \email{joseph.wright@morningstar2.co.uk}^^A
+% \email{joseph@texdev.net}^^A
% }^^A
% }
%
diff --git a/macros/latex/contrib/siunitx/siunitx-code.pdf b/macros/latex/contrib/siunitx/siunitx-code.pdf
index 71adbfb38c..cf00251427 100644
--- a/macros/latex/contrib/siunitx/siunitx-code.pdf
+++ b/macros/latex/contrib/siunitx/siunitx-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/siunitx-code.tex b/macros/latex/contrib/siunitx/siunitx-code.tex
index a0a4319e23..f392a6178f 100644
--- a/macros/latex/contrib/siunitx/siunitx-code.tex
+++ b/macros/latex/contrib/siunitx/siunitx-code.tex
@@ -1,6 +1,6 @@
\iffalse meta-comment
-File: siunitx-code.tex Copyright (C) 2016-2023 Joseph Wright
+File: siunitx-code.tex Copyright (C) 2016-2024 Joseph Wright
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -68,7 +68,7 @@ for those people who are interested.
Joseph Wright%
\thanks{%
E-mail:
- \email{joseph.wright@morningstar2.co.uk}%
+ \email{joseph@texdev.net}%
}%
}
diff --git a/macros/latex/contrib/siunitx/siunitx-command.dtx b/macros/latex/contrib/siunitx/siunitx-command.dtx
index a862676ade..49b513bbbd 100644
--- a/macros/latex/contrib/siunitx/siunitx-command.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-command.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% File: siunitx-command.dtx Copyright (C) 2019,2021,2023 Joseph Wright
+% File: siunitx-command.dtx Copyright (C) 2019,2021,2023,2024 Joseph Wright
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -50,7 +50,7 @@
% Joseph Wright^^A
% \thanks{^^A
% E-mail:
-% \email{joseph.wright@morningstar2.co.uk}^^A
+% \email{joseph@texdev.net}^^A
% }^^A
% }
%
diff --git a/macros/latex/contrib/siunitx/siunitx-complex.dtx b/macros/latex/contrib/siunitx/siunitx-complex.dtx
index 644aa9c095..2ff86391c2 100644
--- a/macros/latex/contrib/siunitx/siunitx-complex.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-complex.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% File: siunitx-complex.dtx Copyright (C) 2021-2023 Joseph Wright
+% File: siunitx-complex.dtx Copyright (C) 2021-2024 Joseph Wright
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -50,7 +50,7 @@
% Joseph Wright^^A
% \thanks{^^A
% E-mail:
-% \email{joseph.wright@morningstar2.co.uk}^^A
+% \email{joseph@texdev.net}^^A
% }^^A
% }
%
diff --git a/macros/latex/contrib/siunitx/siunitx-compound.dtx b/macros/latex/contrib/siunitx/siunitx-compound.dtx
index a6f1ccac76..ec5a680516 100644
--- a/macros/latex/contrib/siunitx/siunitx-compound.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-compound.dtx
@@ -50,7 +50,7 @@
% Joseph Wright^^A
% \thanks{^^A
% E-mail:
-% \email{joseph.wright@morningstar2.co.uk}^^A
+% \email{joseph@texdev.net}^^A
% }^^A
% }
%
diff --git a/macros/latex/contrib/siunitx/siunitx-emulation.dtx b/macros/latex/contrib/siunitx/siunitx-emulation.dtx
index 4d82d7b426..8909d2994f 100644
--- a/macros/latex/contrib/siunitx/siunitx-emulation.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-emulation.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% File: siunitx-emulation.dtx Copyright (C) 2016-2019,2021-2023 Joseph Wright
+% File: siunitx-emulation.dtx Copyright (C) 2016-2019,2021-2024 Joseph Wright
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -49,7 +49,7 @@
% Joseph Wright^^A
% \thanks{^^A
% E-mail:
-% \email{joseph.wright@morningstar2.co.uk}^^A
+% \email{joseph@texdev.net}^^A
% }^^A
% }
%
diff --git a/macros/latex/contrib/siunitx/siunitx-locale.dtx b/macros/latex/contrib/siunitx/siunitx-locale.dtx
index da12029bc9..fd75128612 100644
--- a/macros/latex/contrib/siunitx/siunitx-locale.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-locale.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% File: siunitx-locale.dtx Copyright (C) 2020-2023 Joseph Wright
+% File: siunitx-locale.dtx Copyright (C) 2020-2024 Joseph Wright
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -49,7 +49,7 @@
% Joseph Wright^^A
% \thanks{^^A
% E-mail:
-% \email{joseph.wright@morningstar2.co.uk}^^A
+% \email{joseph@texdev.net}^^A
% }^^A
% }
%
diff --git a/macros/latex/contrib/siunitx/siunitx-number.dtx b/macros/latex/contrib/siunitx/siunitx-number.dtx
index 8c94cefee4..cfa4a03e25 100644
--- a/macros/latex/contrib/siunitx/siunitx-number.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-number.dtx
@@ -50,7 +50,7 @@
% Joseph Wright^^A
% \thanks{^^A
% E-mail:
-% \email{joseph.wright@morningstar2.co.uk}^^A
+% \email{joseph@texdev.net}^^A
% }^^A
% }
%
@@ -2703,13 +2703,12 @@
\cs_new:Npn \@@_digits_uncert_aux:nn #1#2
{
\exp_not:n {#2}
- \@@_digits:nn
+ \int_compare:nNnT
+ { \l_@@_min_decimal_int - \tl_count:n {#1} } > 0
{
- \int_max:nn
- { 0 }
- { \l_@@_min_decimal_int - \tl_count:n {#1} + 1 }
+ \prg_replicate:nn
+ { \l_@@_min_decimal_int - \tl_count:n {#1} } { 0 }
}
- {#2}
}
\cs_new:Npn \@@_digits_uncert:nN #1#2
{
diff --git a/macros/latex/contrib/siunitx/siunitx-print.dtx b/macros/latex/contrib/siunitx/siunitx-print.dtx
index 9cc2e6aca2..7a8224c075 100644
--- a/macros/latex/contrib/siunitx/siunitx-print.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-print.dtx
@@ -50,7 +50,7 @@
% Joseph Wright^^A
% \thanks{^^A
% E-mail:
-% \email{joseph.wright@morningstar2.co.uk}^^A
+% \email{joseph@texdev.net}^^A
% }^^A
% }
%
diff --git a/macros/latex/contrib/siunitx/siunitx-quantity.dtx b/macros/latex/contrib/siunitx/siunitx-quantity.dtx
index b9c7e107bb..9e3c14ffaf 100644
--- a/macros/latex/contrib/siunitx/siunitx-quantity.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-quantity.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% File: siunitx-quantity.dtx Copyright (C) 2018-2023 Joseph Wright
+% File: siunitx-quantity.dtx Copyright (C) 2018-2024 Joseph Wright
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -50,7 +50,7 @@
% Joseph Wright^^A
% \thanks{^^A
% E-mail:
-% \email{joseph.wright@morningstar2.co.uk}^^A
+% \email{joseph@texdev.net}^^A
% }^^A
% }
%
diff --git a/macros/latex/contrib/siunitx/siunitx-symbol.dtx b/macros/latex/contrib/siunitx/siunitx-symbol.dtx
index c5ec0c39ce..7428d39dc4 100644
--- a/macros/latex/contrib/siunitx/siunitx-symbol.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-symbol.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% File: siunitx-symbol.dtx Copyright (C) 2018-2023 Joseph Wright
+% File: siunitx-symbol.dtx Copyright (C) 2018-2024 Joseph Wright
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -49,7 +49,7 @@
% Joseph Wright^^A
% \thanks{^^A
% E-mail:
-% \email{joseph.wright@morningstar2.co.uk}^^A
+% \email{joseph@texdev.net}^^A
% }^^A
% }
%
diff --git a/macros/latex/contrib/siunitx/siunitx-table.dtx b/macros/latex/contrib/siunitx/siunitx-table.dtx
index f900c741f8..5de8f0b603 100644
--- a/macros/latex/contrib/siunitx/siunitx-table.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-table.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% File: siunitx-table.dtx Copyright (C) 2016-2019,2021-2023 Joseph Wright
+% File: siunitx-table.dtx Copyright (C) 2016-2019,2021-2024 Joseph Wright
%
% It may be distributed and/or modified under the conditions of the
% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -50,7 +50,7 @@
% Joseph Wright^^A
% \thanks{^^A
% E-mail:
-% \email{joseph.wright@morningstar2.co.uk}^^A
+% \email{joseph@texdev.net}^^A
% }^^A
% }
%
diff --git a/macros/latex/contrib/siunitx/siunitx-unit.dtx b/macros/latex/contrib/siunitx/siunitx-unit.dtx
index 6c0210cec1..2c9c1efb13 100644
--- a/macros/latex/contrib/siunitx/siunitx-unit.dtx
+++ b/macros/latex/contrib/siunitx/siunitx-unit.dtx
@@ -64,7 +64,7 @@
% Joseph Wright^^A
% \thanks{^^A
% E-mail:
-% \email{joseph.wright@morningstar2.co.uk}^^A
+% \email{joseph@texdev.net}^^A
% }^^A
% }
%
diff --git a/macros/latex/contrib/siunitx/siunitx.dtx b/macros/latex/contrib/siunitx/siunitx.dtx
index bd231a50f7..0d79cd5fde 100644
--- a/macros/latex/contrib/siunitx/siunitx.dtx
+++ b/macros/latex/contrib/siunitx/siunitx.dtx
@@ -49,7 +49,7 @@
% Joseph Wright^^A
% \thanks{^^A
% E-mail:
-% \email{joseph.wright@morningstar2.co.uk}^^A
+% \email{joseph@texdev.net}^^A
% }^^A
% }
%
@@ -121,7 +121,7 @@
%
% Identify the package and give the over all version information.
% \begin{macrocode}
-\ProvidesExplPackage {siunitx} {2024-02-15} {3.3.12}
+\ProvidesExplPackage {siunitx} {2024-04-12} {3.3.13}
{A comprehensive (SI) units package}
% \end{macrocode}
%
diff --git a/macros/latex/contrib/siunitx/siunitx.ins b/macros/latex/contrib/siunitx/siunitx.ins
index b2a35b2d4e..f03c6e745b 100644
--- a/macros/latex/contrib/siunitx/siunitx.ins
+++ b/macros/latex/contrib/siunitx/siunitx.ins
@@ -1,6 +1,6 @@
\iffalse meta-comment
-File: siunitx.ins Copyright (C) 2014-2021 Joseph Wright
+File: siunitx.ins Copyright (C) 2014-2021,2024 Joseph Wright
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -33,8 +33,8 @@ for those people who are interested.
\preamble
\endpreamble
\postamble
-Copyright (C) 2008-2022 by
- Joseph Wright <joseph.wright@morningstar2.co.uk>
+Copyright (C) 2008-2022,2024 by
+ Joseph Wright <joseph@texdev.net>
It may be distributed and/or modified under the conditions of
the LaTeX Project Public License (LPPL), either version 1.3c of
diff --git a/macros/latex/contrib/siunitx/siunitx.pdf b/macros/latex/contrib/siunitx/siunitx.pdf
index 3d70a9723b..8bd9cefb62 100644
--- a/macros/latex/contrib/siunitx/siunitx.pdf
+++ b/macros/latex/contrib/siunitx/siunitx.pdf
Binary files differ
diff --git a/macros/latex/contrib/siunitx/siunitx.tex b/macros/latex/contrib/siunitx/siunitx.tex
index 59ecd43acd..d004e8f9d7 100644
--- a/macros/latex/contrib/siunitx/siunitx.tex
+++ b/macros/latex/contrib/siunitx/siunitx.tex
@@ -200,7 +200,7 @@ for those people who are interested.
Joseph Wright%
\thanks{%
E-mail:
- \email{joseph.wright@morningstar2.co.uk}%
+ \email{joseph@texdev.net}%
}%
}
diff --git a/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-en.pdf b/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-en.pdf
index 2e3d3e8a32..7bcc35aa1b 100644
--- a/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-en.pdf
+++ b/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-en.pdf
Binary files differ
diff --git a/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-en.tex b/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-en.tex
index 3648aa6f50..070c88b7cd 100644
--- a/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-en.tex
+++ b/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-en.tex
@@ -45,8 +45,8 @@
\setlength{\parindent}{0pt}
\definecolor{LightGray}{gray}{0.9}
-\def\TPversion{0.1.5}
-\def\TPdate{15/11/2023}
+\def\TPversion{0.1.6}
+\def\TPdate{12/04/2024}
\usepackage[most]{tcolorbox}
\tcbuselibrary{minted}
@@ -252,6 +252,30 @@ The package \textsf{WriteOnGrid} proposes "shortcuts" for classic colors !
{\tikz \filldraw[PapierGris] (0,0) rectangle++ (6,1) node[midway,font=\bfseries\large,text=black] {\verb+PapierGris+};}
\end{PresentationCode}
+\subsection{The number of squares}
+
+The number of grid squares (for individual grids and environments) can be given in several ways:
+
+\begin{itemize}
+ \item \Cle{NumSquares=<nbcols>x<nblines>} to specify manually;
+ \item \Cle{NumSquares=Auto} to fill the rest of the page (horiz. and vert.);
+ \item \Cle{NumSquares=Cx<nblines} to fill horizontally and specify the number of lines;
+ \item \Cle{NumSquares=<nbcols>xL} to fill vertically and specify the number of columns.
+\end{itemize}
+
+Note that the calculations carried out to determine the remaining \textit{space} do not take into account any elastic springs that \LaTeX\ can add to \textit{optimize} the space.
+
+\smallskip
+
+To \textit{force} the addition of additional line(s), it is possible to use:
+
+\begin{itemize}
+ \item \Cle{NumSquares=Auto*} to force the addition of one more line;
+ \item \Cle{NumSquares=Auto**} to force the addition of two more lines;
+ \item \Cle{NumSquares=Auto***} to force the addition of three more lines;
+ \item etc.
+\end{itemize}
+
\pagebreak
\section{Commands, keys and options}
@@ -501,6 +525,8 @@ To sum up, they create full paper grid (by preference for \texttt{\textbf{a4pape
\part*{History}
+\verb|v0.1.6|~:~~~~Possibility to automatically determine L\&C based on the remaining space.
+
\verb|v0.1.4|~:~~~~New \texttt{[keys]} + enhancements for paragraphs, for french version (for the moment\dots)
\verb|v0.1.4|~:~~~~\texttt{xcolor} isn't loaded with \textsf{[table,svgnames]})
diff --git a/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-fr.pdf b/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-fr.pdf
index c3573469d1..517ce5911d 100644
--- a/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-fr.pdf
+++ b/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-fr.pdf
Binary files differ
diff --git a/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-fr.tex b/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-fr.tex
index 74ac22a898..1da2b2b0bc 100644
--- a/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-fr.tex
+++ b/macros/latex/contrib/writeongrid/doc/WriteOnGrid-doc-fr.tex
@@ -48,8 +48,8 @@
\setlength{\parindent}{0pt}
\definecolor{LightGray}{gray}{0.9}
-\def\TPversion{0.1.5}
-\def\TPdate{15 novembre 2023}
+\def\TPversion{0.1.6}
+\def\TPdate{12 avril 2024}
\usepackage[most]{tcolorbox}
\tcbuselibrary{minted}
@@ -266,7 +266,29 @@ Le package \textsf{WriteOnGrid} définit également des couleurs pour une saisie
{\tikz \filldraw[PapierGris] (0,0) rectangle++ (6,1) node[midway,font=\bfseries\large,text=black] {\verb+PapierGris+};}
\end{PresentationCode}
+\subsection{Le nombre de carreaux}
+Le nombre de carreaux de la grille (pour les quadrillages individuelles et les environnements) peuvent être donnés de plusieurs manières :
+
+\begin{itemize}
+ \item \Cle{NbCarreaux=<nbcols>x<nblignes>} pour spécifier manuellement ;
+ \item \Cle{NbCarreaux=Auto} pour remplir le reste de la page (horiz. et vert.) ;
+ \item \Cle{NbCarreaux=Cx<nblignes} pour remplir horizontalement et spécifier le nombre de lignes ;
+ \item \Cle{NbCarreaux=<nbcols>xL} pour remplir verticalement et spécifier le nombre de colonnes.
+\end{itemize}
+
+À noter que les calculs effectués pour déterminer la \textit{place} restante ne tiennent pas compte des éventuels ressorts élastiques que \LaTeX\ peut rajouter pour \textit{optimiser} la place.
+
+\smallskip
+
+Pour \textit{forcer} l'ajout de ligne(s) supplémentaire(s), il est possible d'utiliser :
+
+\begin{itemize}
+ \item \Cle{NbCarreaux=Auto*} pour forcer l'ajout d'une ligne en plus ;
+ \item \Cle{NbCarreaux=Auto**} pour forcer l'ajout de deux lignes en plus ;
+ \item \Cle{NbCarreaux=Auto***} pour forcer l'ajout de trois lignes en plus ;
+ \item etc
+\end{itemize}
\pagebreak
@@ -587,6 +609,14 @@ Le dernier argument, \textit{obligatoire} et entre \texttt{\{...\}} est le parag
Un exemple \textit{détaillé}, avec le rendu en page suivante, avec quelques commentaires pour expliquer.
\begin{PresentationCode}{listing only}
+\documentclass[a4paper,11pt]{article}
+\usepackage{WriteOnGrid}
+\usepackage{amsmath,amssymb}
+\usepackage{frcursive}
+\usepackage{lipsum}
+
+\begin{document}
+
\pagestyle{empty}
\begin{PleinePageSeyes}[NumLignes]%numéro de lignes pour mieux "lire"
@@ -601,18 +631,16 @@ Un exemple \textit{détaillé}, avec le rendu en page suivante, avec quelques co
%un paragraphe de quelques lignes
\ParagraphePapierSeyes[Ligne=10]{\cursive\lipsum[1]}
%un paragraphe avec des maths
- \ParagraphePapierSeyes[Ligne=22]
- {%
+ \ParagraphePapierSeyes[Ligne=22]{%
On essaye avec des maths $1+\frac12=\frac32$ en mode ligne avec des lignes assez longues pour voir
ce que ça peut donner\ldots Et une intégrale $\int_0^1 2x dx = 1$.\\On essaye en passant à la ligne !!!
- }
+ }
%une ligne avec des maths
\LignePapierSeyes[Ligne=25]<center>{${\displaystyle\sum_{i=1}^{n} i=\displaystyle\frac{n(n+1)}{2}}$.}
%un environnement, avec ajustement manuel via (x,y)...
%pas fonctionnel à 100%
- \LignePapierSeyes[Echelle=1.1,Ligne=27](-1.4,0.95)
- {
+ \LignePapierSeyes[Echelle=1.1,Ligne=27](-1.4,0.95){
\begin{align*}
\frac{d}{dx} \ln x &= \lim_{h\to 0} \frac{\ln(x+h) - \ln x}{h} \\
&= \ln e^{1/x} &&\text{How this follows is left as an exercise.}\\
@@ -620,9 +648,10 @@ Un exemple \textit{détaillé}, avec le rendu en page suivante, avec quelques co
\end{align*}
}
%un paragraphe multiligne, avec police agrandie
- \ParagraphePapierSeyes[Echelle=1.15,Ligne=30]
- {BlablablaBlablabla.\\BlablablaBlablablaBlablablaBlablabla.}
+ \ParagraphePapierSeyes[Echelle=1.15,Ligne=30]{BlablablaBlablabla.\\BlablablaBlablablaBlablablaBlablabla.}
\end{PleinePageSeyes}
+
+\end{document}
\end{PresentationCode}
\newpage
@@ -813,6 +842,8 @@ Les exemples des pages suivantes ont été obtenus de la même manière que celu
\section{Historique}
+\verb|v0.1.6|~:~~~~Possibilité de déterminer automatiquement L\&C en fonction de la place restante.
+
\verb|v0.1.5|~:~~~~Possibilité de spécifier la réglure pour les quadrillages de type \textsf{Seyes} + meilleure gestion des paragraphes.
\phantom{\texttt{v0.1.5}}~:~~~~Amélioration de la gestion des paragraphes en mode \textsf{pleine page}.
diff --git a/macros/latex/contrib/writeongrid/tex/WriteOnGrid.sty b/macros/latex/contrib/writeongrid/tex/WriteOnGrid.sty
index f6a9d6199e..e2673d3c58 100644
--- a/macros/latex/contrib/writeongrid/tex/WriteOnGrid.sty
+++ b/macros/latex/contrib/writeongrid/tex/WriteOnGrid.sty
@@ -2,7 +2,8 @@
% licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{WriteOnGrid}[2023/11/15 v0.1.5 package to write on grid lines]
+\ProvidesPackage{WriteOnGrid}[2024/04/12 v0.1.6 package to write on grid lines]
+% 0.1.6 Commande pour calculer le nombre de lignes à insérer en fin de page / options Auto
% 0.1.5 Choix de la réglure pour le seyes (en pretest) + amélioration de la gestion des paragraphes
% 0.1.4 Suppression des options de xcolor (définition manuelle des couleurs)
% 0.1.3 Ajout de commandes simples pour des mini-quadrillages autonomes, sans texte
@@ -20,6 +21,33 @@
%------Variables
\newcounter{lgquadri}%compteur des lignes, qui sera incrémenté
+%-----Calcul du nombre de lignes/colonnes
+\NewDocumentCommand\GridCalcNbCols{ O{\ColAuto} m }{%
+ \IfStrEqCase{#2}{%
+ {Seyes}{\xdef#1{\fpeval{trunc((\the\linewidth)/(22.762192pt),0)}}}%
+ {5x5}{\xdef#1{\fpeval{trunc((\the\linewidth)/(14.22637pt),0)}}}%
+ {Ruled}{\xdef#1{\fpeval{trunc((\the\linewidth)/(25.607466pt),0)}}}%
+ }[\xdef#1{\fpeval{trunc((\the\linewidth)/(22.762192pt),0)}}]%
+}
+
+\NewDocumentCommand\GridCalcNbLignes{ O{\LgnAuto} m }{%
+ \edef\measurepage{\dimexpr\pagegoal-\pagetotal\relax}
+ \IfStrEqCase{#2}{%
+ {Seyes}{\xdef#1{\fpeval{trunc((\the\measurepage)/(22.762192pt),0)}}}%
+ {5x5}{\xdef#1{\fpeval{trunc((\the\measurepage)/(14.22637pt),0)}}}%
+ {Ruled}{\xdef#1{\fpeval{trunc((\the\measurepage)/(25.607466pt),0)}}}%
+ }[\xdef#1{\fpeval{trunc((\the\measurepage)/(22.762192pt),0)}}]%
+}
+
+\NewDocumentCommand\GridCalcAuto{ O{\LgnAuto} O{\ColAuto} m }{%
+ \edef\measurepage{\dimexpr\pagegoal-\pagetotal\relax}
+ \IfStrEqCase{#3}{%
+ {Seyes}{\xdef#1{\fpeval{trunc((\the\measurepage)/(22.762192pt),0)}}\xdef#2{\fpeval{trunc((\the\linewidth)/(22.762192pt),0)}}}%
+ {5x5}{\xdef#1{\fpeval{trunc((\the\measurepage)/(14.22637pt),0)}}\xdef#2{\fpeval{trunc((\the\linewidth)/(14.22637pt),0)}}}%
+ {Ruled}{\xdef#1{\fpeval{trunc((\the\measurepage)/(25.607466pt),0)}}\xdef#2{\fpeval{trunc((\the\linewidth)/(25.607466pt),0)}}}%
+ }[\xdef#1{\fpeval{trunc((\the\measurepage)/(22.762192pt),0)}}\xdef#2{\fpeval{trunc((\the\linewidth)/(22.762192pt),0)}}]%
+}
+
%-----Couleurs utiles
\definecolor{TyrianPurple}{rgb}{0.4,0.01,0.24}
\definecolor{PapierRose}{HTML}{E6B8E6}
@@ -78,7 +106,35 @@
\IfSubStr{#2}{/}%on récupère les couleurs
{\StrCut{#2}{/}{\QuadCoulA}{\QuadCoulB}}
{\def\QuadCoulA{#2}\def\QuadCoulB{#2}}%
- \StrCut{\QuadNbCar}{x}{\QuadNbCol}{\QuadNbLig}%
+ %détermination des nb de carreaux, sans unite... ? TEST !!!!!!
+ \IfSubStr{\QuadNbCar}{Auto}%
+ {%
+ \GridCalcAuto[\QuadNbLig][\QuadNbCol]{\QuadType}%
+ \IfSubStr{\QuadNbCar}{Auto*}%
+ {%
+ \StrCount{\QuadNbCar}{*}[\tmpnbetoiles]%
+ \xdef\QuadNbLig{\inteval{\QuadNbLig+\tmpnbetoiles}}%
+ }%
+ {}%
+ }%
+ {%
+ \IfBeginWith{\QuadNbCar}{C}%
+ {%
+ \GridCalcNbCols[\QuadNbCol]{\QuadType}%
+ \StrBehind{\QuadNbCar}{x}[\QuadNbLig]%
+ }%
+ {%
+ \IfEndWith{\QuadNbCar}{L}%
+ {%
+ \GridCalcNbLignes[\QuadNbLig]{\QuadType}%
+ \StrBefore{\QuadNbCar}{x}[\QuadNbCol]%
+ }%
+ {%
+ \StrCut{\QuadNbCar}{x}{\QuadNbCol}{\QuadNbLig}%
+ }%
+ }%
+ }%
+ %suite des calculs
\IfStrEq{\QuadType}{Seyes}%les types de quadrillages
{\xdef\ValeurCarreau{0.8}\xdef\CoeffUnite{\fpeval{(\QuadReglureSeyes)/2}}}%
{}%
@@ -88,7 +144,6 @@
\IfStrEq{\QuadType}{Ruled}%
{\xdef\ValeurCarreau{0.9}\xdef\CoeffUnite{1}}%
{}%
-
\IfSubStr{\QuadElar}{/}%on récupère les élargissements G et D
{\StrCut{\QuadElar}{/}{\QuadElarG}{\QuadElarD}}%
{\def\QuadElarG{\QuadElar}\def\QuadElarD{\QuadElar}}%
@@ -133,7 +188,35 @@
\IfSubStr{#2}{/}%on récupère les couleurs
{\StrCut{#2}{/}{\QuadCoulA}{\QuadCoulB}}
{\def\QuadCoulA{#2}\def\QuadCoulB{#2}}%
- \StrCut{\QuadNbCar}{x}{\QuadNbCol}{\QuadNbLig}%
+ %détermination des nb de carreaux, sans unite... ? TEST !!!!!!
+ \IfSubStr{\QuadNbCar}{Auto}%
+ {%
+ \GridCalcAuto[\QuadNbLig][\QuadNbCol]{\QuadType}%
+ \IfSubStr{\QuadNbCar}{Auto*}%
+ {%
+ \StrCount{\QuadNbCar}{*}[\tmpnbetoiles]%
+ \xdef\QuadNbLig{\inteval{\QuadNbLig+\tmpnbetoiles}}%
+ }%
+ {}%
+ }%
+ {%
+ \IfBeginWith{\QuadNbCar}{C}%
+ {%
+ \GridCalcNbCols[\QuadNbCol]{\QuadType}%
+ \StrBehind{\QuadNbCar}{x}[\QuadNbLig]%
+ }%
+ {%
+ \IfEndWith{\QuadNbCar}{L}%
+ {%
+ \GridCalcNbLignes[\QuadNbLig]{\QuadType}%
+ \StrBefore{\QuadNbCar}{x}[\QuadNbCol]%
+ }%
+ {%
+ \StrCut{\QuadNbCar}{x}{\QuadNbCol}{\QuadNbLig}%
+ }%
+ }%
+ }%
+ %suite des calculs
\IfStrEq{\QuadType}{Seyes}%les types de quadrillages
{\xdef\ValeurCarreau{0.8}\xdef\CoeffUnite{\fpeval{(\QuadReglureSeyes)/2}}}%
{}%
@@ -204,7 +287,35 @@
\IfSubStr{#2}{/}%on récupère les couleurs
{\StrCut{#2}{/}{\QuadCoulA}{\QuadCoulB}}
{\def\QuadCoulA{#2}\def\QuadCoulB{#2}}%
- \StrCut{\QuadNbCar}{x}{\QuadNbCol}{\QuadNbLig}%
+ %détermination des nb de carreaux, sans unite... ? TEST !!!!!!
+ \IfSubStr{\QuadNbCar}{Auto}%
+ {%
+ \GridCalcAuto[\QuadNbLig][\QuadNbCol]{\QuadType}%
+ \IfSubStr{\QuadNbCar}{Auto*}%
+ {%
+ \StrCount{\QuadNbCar}{*}[\tmpnbetoiles]%
+ \xdef\QuadNbLig{\inteval{\QuadNbLig+\tmpnbetoiles}}%
+ }%
+ {}%
+ }%
+ {%
+ \IfBeginWith{\QuadNbCar}{C}%
+ {%
+ \GridCalcNbCols[\QuadNbCol]{\QuadType}%
+ \StrBehind{\QuadNbCar}{x}[\QuadNbLig]%
+ }%
+ {%
+ \IfEndWith{\QuadNbCar}{L}%
+ {%
+ \GridCalcNbLignes[\QuadNbLig]{\QuadType}%
+ \StrBefore{\QuadNbCar}{x}[\QuadNbCol]%
+ }%
+ {%
+ \StrCut{\QuadNbCar}{x}{\QuadNbCol}{\QuadNbLig}%
+ }%
+ }%
+ }%
+ %suite des calculs
\IfStrEq{\QuadType}{Seyes}%les types de quadrillages
{\xdef\ValeurCarreau{0.8}}%
{}%
@@ -258,7 +369,35 @@
\IfSubStr{#2}{/}%on récupère les couleurs
{\StrCut{#2}{/}{\QuadCoulA}{\QuadCoulB}}
{\def\QuadCoulA{#2}\def\QuadCoulB{#2}}%
- \StrCut{\QuadNbCar}{x}{\QuadNbCol}{\QuadNbLig}%
+ %détermination des nb de carreaux, sans unite... ? TEST !!!!!!
+ \IfSubStr{\QuadNbCar}{Auto}%
+ {%
+ \GridCalcAuto[\QuadNbLig][\QuadNbCol]{\QuadType}%
+ \IfSubStr{\QuadNbCar}{Auto*}%
+ {%
+ \StrCount{\QuadNbCar}{*}[\tmpnbetoiles]%
+ \xdef\QuadNbLig{\inteval{\QuadNbLig+\tmpnbetoiles}}%
+ }%
+ {}%
+ }%
+ {%
+ \IfBeginWith{\QuadNbCar}{C}%
+ {%
+ \GridCalcNbCols[\QuadNbCol]{\QuadType}%
+ \StrBehind{\QuadNbCar}{x}[\QuadNbLig]%
+ }%
+ {%
+ \IfEndWith{\QuadNbCar}{L}%
+ {%
+ \GridCalcNbLignes[\QuadNbLig]{\QuadType}%
+ \StrBefore{\QuadNbCar}{x}[\QuadNbCol]%
+ }%
+ {%
+ \StrCut{\QuadNbCar}{x}{\QuadNbCol}{\QuadNbLig}%
+ }%
+ }%
+ }%
+ %suite des calculs
\IfStrEq{\QuadType}{Seyes}%les types de quadrillages
{\xdef\ValeurCarreau{0.8}}%
{}%
@@ -354,7 +493,7 @@
{%
\foreach \lig in {1,...,\inteval{\SeyesFullNbLignP+1}} {\node[gray,inner sep=0pt,anchor=base east] at ($(SeyesOrigine)+(-0.2,{-0.4*\SeyesFullReglureSeyes*(\lig-1)})$) {\scriptsize\sffamily\lig};}
}%
- {}
+ {}%
}
{
\end{tikzpicture}%