summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-11-06 03:03:43 +0000
committerNorbert Preining <norbert@preining.info>2023-11-06 03:03:43 +0000
commit240fd5fe8af67337e240c10434af4834fc86278f (patch)
treed3c79826e19d48c5559e120397514b76a28402ea /graphics
parentccd8f4d47ffbc15cb02b18cfb88cae0e995c3e69 (diff)
CTAN sync 202311060303
Diffstat (limited to 'graphics')
-rw-r--r--graphics/pgf/contrib/argumentation/README.md8
-rw-r--r--graphics/pgf/contrib/argumentation/argumentation-doc.pdfbin0 -> 183613 bytes
-rw-r--r--graphics/pgf/contrib/argumentation/argumentation-doc.tex397
-rw-r--r--graphics/pgf/contrib/argumentation/argumentation.sty104
-rw-r--r--graphics/pgf/contrib/fenetrecas/doc/FenetreCas-doc.pdfbin659575 -> 659906 bytes
-rw-r--r--graphics/pgf/contrib/fenetrecas/doc/FenetreCas-doc.tex7
-rw-r--r--graphics/pgf/contrib/fenetrecas/tex/FenetreCas.sty6
-rw-r--r--graphics/pgf/contrib/tkz-bernoulli/doc/tkz-bernoulli-doc.pdfbin193547 -> 194012 bytes
-rw-r--r--graphics/pgf/contrib/tkz-bernoulli/doc/tkz-bernoulli-doc.tex25
-rw-r--r--graphics/pgf/contrib/tkz-bernoulli/tex/tkz-bernoulli.sty82
10 files changed, 547 insertions, 82 deletions
diff --git a/graphics/pgf/contrib/argumentation/README.md b/graphics/pgf/contrib/argumentation/README.md
new file mode 100644
index 0000000000..1bc1c6bd18
--- /dev/null
+++ b/graphics/pgf/contrib/argumentation/README.md
@@ -0,0 +1,8 @@
+The argumentation package provides utility to create abstract argumentation frameworks in your LaTeX document via TikZ.
+
+
+For bug reports and feedback, please contact:
+Lars Bengel <lars.bengel@fernuni-hagen.de>
+
+Version: 1.0 [2023/11/05]
+This package is subject to the LaTeX Project Public License 1.3c \ No newline at end of file
diff --git a/graphics/pgf/contrib/argumentation/argumentation-doc.pdf b/graphics/pgf/contrib/argumentation/argumentation-doc.pdf
new file mode 100644
index 0000000000..61331279c4
--- /dev/null
+++ b/graphics/pgf/contrib/argumentation/argumentation-doc.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/argumentation/argumentation-doc.tex b/graphics/pgf/contrib/argumentation/argumentation-doc.tex
new file mode 100644
index 0000000000..5af926f031
--- /dev/null
+++ b/graphics/pgf/contrib/argumentation/argumentation-doc.tex
@@ -0,0 +1,397 @@
+\documentclass{article}
+
+\title{The \texttt{argumentation} Package}
+\author{Lars Bengel\\\small lars.bengel@fernuni-hagen.de}
+%\date{}
+
+%%%%%%%%% IMPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\usepackage{argumentation}
+\usepackage{amsmath}
+
+\newtheorem{example}{Example}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\begin{document}
+\maketitle
+
+\tableofcontents
+\newpage
+
+\section{Example}
+\vspace{-0.7cm}
+\begin{figure}[ht]
+ \centering
+ \begin{af}
+ \argument{args1}{a}
+ \argument[right=of args1]{args2}{b}
+ \argument[right=of args2]{args3}{c}
+ \argument[right=of args3]{args4}{d}
+ \argument[right=of args4]{args5}{e}
+ \argument[below=of args1]{args6}{f}
+ \argument[inactive,right=of args6]{args7}{g}
+ \argument[inactive,argin,right=of args7]{args8}{h}
+ \argument[right=of args8]{args9}{i}
+ \argument[right=of args9]{args10}{j}
+
+ \afname[left of=args1,yshift=-0.8cm,xshift=-0.2cm]{cap}{\textbf{F:}}
+
+ \selfattack{args1}
+ \dualattack[]{args1}{args6}
+ \dualattack[inactive]{args6}{args7}
+
+ \attack[inactive]{args8}{args7}
+ \attack[inactive]{args7}{args2}
+ \attack[]{args3}{args2}
+ \attack[]{args4}{args5}
+ \attack[]{args5}{args10}
+ \attack[]{args10}{args9}
+ \attack[]{args9}{args4}
+
+ \support[]{args4}{args3}
+ \support[]{args9}{args3}
+ \end{af}
+ \caption{An exemplary AF created with the \textsf{argumentation} package.}
+ \label{fig:example}
+\end{figure}
+\vspace{-0.4cm}
+\begin{verbatim}
+ \usepackage{argumentation}
+ \begin{figure}[ht]
+ \centering
+ \begin{af}
+ \argument{args1}{a}
+ \argument[right=of args1]{args2}{b}
+ \argument[right=of args2]{args3}{c}
+ \argument[right=of args3]{args4}{d}
+ \argument[right=of args4]{args5}{e}
+ \argument[below=of args1]{args6}{f}
+ \argument[inactive,right=of args6]{args7}{g}
+ \argument[inactive,argin,right=of args7]{args8}{h}
+ \argument[right=of args8]{args9}{i}
+ \argument[right=of args9]{args10}{j}
+
+ \afname[left of=args1,yshift=-0.8cm,xshift=-0.2cm]{cap}{\textbf{F:}}
+
+ \selfattack{args1}
+ \dualattack[]{args1}{args6}
+ \dualattack[inactive]{args6}{args7}
+
+ \attack[inactive]{args8}{args7}
+ \attack[inactive]{args7}{args2}
+ \attack[]{args3}{args2}
+ \attack[]{args4}{args5}
+ \attack[]{args5}{args10}
+ \attack[]{args10}{args9}
+ \attack[]{args9}{args4}
+
+ \support[]{args4}{args3}
+ \support[]{args9}{args3}
+ \end{af}
+ \caption{An exemplary AF created with the \textsf{argumentation} package.}
+ \label{fig:example}
+ \end{figure}
+\end{verbatim}
+
+\section{Documentation for Version 1.0 [2023/11/05]}
+In the following, we provide an overview over the functionality of the \textsf{argumentation} package.
+
+\subsection{Package Options}
+ Three options are provided to customize the look of the argumentation framework: \textsf{namestyle}, \textsf{argumentstyle} and \textsf{attackstyle}.
+ The \textsf{namestyle} option accepts three different values
+ \begin{align*}
+ \mathsf{italics} &\quad \text{The argument name is rendered in \emph{italics}.}\\
+ \mathsf{bold} &\quad \text{The argument name is rendered in \textbf{bold}.}\\
+ \mathsf{bolditalics} &\quad \text{(default) The argument name is rendered with \textbf{\emph{both}}.}\\
+ \end{align*}
+
+ The \textsf{argumentstyle} option controls the style of the argument nodes and accepts two values
+ \begin{align*}
+ \mathsf{standard} &\quad \text{(default) Standard style for the argument nodes.}\\
+ \mathsf{retro} &\quad \text{Alternative style, node size may vary for large argument names.}
+ \end{align*}
+
+ The \textsf{attackstyle} option controls the style of the attack arrows and accepts two values
+ \begin{align*}
+ \mathsf{standard} &\quad \text{(default) Standard style for the attack arrow tips.}\\
+ \mathsf{retro} &\quad \text{Alternative style, arrow tip is smaller and flatter.}
+ \end{align*}
+
+
+\subsection{Environments}
+The package provides two environments for creating abstract argumentation frameworks and bipolar argumentation frameworks in \LaTeX-documents.
+
+\subsubsection{\textsf{af}-Environment}
+ The \textsf{argumentation} package provides the \textsf{af} environment for creating abstract argumentation framework.
+ The \textsf{af} environment extends the \textsf{tikzpicture} environment, meaning all \textsf{tikzpicture}-parameters can be used inside the \textsf{af} environment as well.
+ The most relevant parameter is \verb|node distance|, which is set to \verb|1cm| per default.
+
+\subsubsection{\textsf{miniaf}-Environment}
+ The \textsf{miniaf} environment can be used to create argumentation frameworks using less space.
+ Especially useful for two-column layout documents.
+ It provides essentially the same as the \textsf{af} environment, but with \verb|node distance=0.5cm| and for each node \verb|minimum size=0.5cm|, \verb|font=\small|.
+
+
+\begin{figure}[ht]
+ \centering
+ \begin{miniaf}
+ \argument{args1}{a}
+ \argument[right=of args1]{args2}{b}
+ \argument[right=of args2]{args3}{c}
+ \argument[right=of args3]{args4}{d}
+ \argument[right=of args4]{args5}{e}
+ \argument[below=of args1]{args6}{f}
+ \argument[inactive,right=of args6]{args7}{g}
+ \argument[inactive,argin,right=of args7]{args8}{h}
+ \argument[right=of args8]{args9}{i}
+ \argument[right=of args9]{args10}{j}
+
+ \afname[left of=args1,yshift=-0.5cm,xshift=-0.2cm]{cap}{\textbf{F:}}
+
+ \selfattack{args1}
+ \dualattack[]{args1}{args6}
+ \dualattack[inactive]{args6}{args7}
+ \attack[inactive]{args8}{args7}
+
+ \attack[inactive]{args7}{args2}
+ \attack[]{args3}{args2}
+
+ \support[]{args4}{args3}
+ \support[]{args9}{args3}
+
+ \attack[]{args4}{args5}
+ \attack[]{args5}{args10}
+ \attack[]{args10}{args9}
+ \attack[]{args9}{args4}
+ \end{miniaf}
+ \caption{An exemplary Mini-AF created with the \textsf{miniaf} environment.}
+ \label{fig:example_mini}
+\end{figure}
+
+
+\subsection{Arguments}
+ Arguments can be created with the following command
+
+ \verb|\argument{id}{name}|
+
+ \noindent
+ To create an argument, you must provide a unique identifier \textsf{id} and the \textsf{name} to be displayed in the picture.
+ The \textsf{id} of an argument is then referred to when creating attacks as well as for the relative positioning of the other arguments.
+
+ The \textsf{standard} style of an argument is defined with the following parameters, all of which can be overridden if desired.
+ \begin{align*}
+ \textsf{circle} &\quad \text{the shape of the argument.}\\
+ \textsf{minimum~size=0.75cm} &\quad \text{the minimum size of the circle, to ensure consistent}\\
+ &\quad \text{argument size.}\\
+ \textsf{draw=black} &\quad \text{outline and text color of the argument.}\\
+ \textsf{thick} &\quad \text{the outline of the circle is rendered in \textsf{thick} mode.}\\
+ \textsf{fill=white} &\quad \text{the background color of the argument.}\\
+ \textsf{font=large} &\quad \text{the font size of the argument name.}\\
+ \textsf{text~centered} &\quad \text{positioning of the argument name inside the circle.}\\
+ \textsf{inner~sep=0} &\quad \text{inner margins of the circle, set to \textsf{0} to optimize space.}
+ \end{align*}
+ \subsubsection{Relative Positioning}
+ This package supports relative placement of the arguments via the \textsf{tikz}-library \textsf{positioning}.
+ The relative positioning information is provided as an optional parameter via
+
+ \verb|\argument[dir=of arg_id]{id}{name}|
+
+ \noindent
+ with \textsf{dir} being one of: \emph{right}, \emph{left}, \emph{below} and \emph{above} and \textsf{arg\_id} being the id of another argument.
+
+ Additionally, you can adjust the horizontal/vertical position of an argument via the options \textsf{xshift} and \textsf{yshift}.
+ You must also specify the distance in one of the following ways
+
+ \verb|\argument[xshift=5mm]{id}{name}|
+
+ \verb|\argument[xshift=5pt]{id}{name}|
+
+ \verb|\argument[xshift=5ex]{id}{name}|
+
+ \begin{example}~
+
+ \begin{verbatim}
+ \begin{af}
+ \argument{arg1}{a}
+ \argument[right=of arg1]{arg2}{b}
+ \argument[right=of arg2, yshift=-10pt]{arg3}{c}
+ \end{af}
+ \end{verbatim}
+
+ \begin{center}
+ \begin{af}
+ \argument{arg1}{a}
+ \argument[right=of arg1]{arg2}{b}
+ \argument[right=of arg2, yshift=-10pt]{arg3}{c}
+ \end{af}
+ \end{center}
+
+ \end{example}
+
+ \subsubsection{Argument Styles}
+ Furthermore, you can provide optional parameters to adjust the style of the argument node.
+ For that you can use all \textsf{tikz}-style options and additionally the following pre-defined style parameters:
+ \begin{align*}
+ \mathsf{inactive} &\quad \text{The argument is displayed in grey and with a dotted outline.}\\
+ \mathsf{argin} &\quad \text{The argument is displayed with green background color.}\\
+ \mathsf{argout} &\quad \text{The argument is displayed with red background color.}\\
+ \mathsf{argundec} &\quad \text{The argument is displayed with cyan background color.}
+ \end{align*}
+
+ \begin{example}
+
+ \end{example}
+
+\subsection{Attacks}
+ Attacks between two arguments can be created with the command
+
+ \verb|\attack{arg1}{arg2}|
+
+ \noindent
+ where \textsf{arg1} and \textsf{arg2} are the identifiers of two previously defined arguments.
+ The \textsf{standard} style for attacks is defined with the \textsf{arrows.meta} library as follows
+ \begin{align*}
+ \texttt{-{Stealth[scale=1.25]}}
+ \end{align*}
+
+\subsubsection{Attack Styles}
+ To customize an attack you can provide additional optional parameters:
+ \begin{align*}
+ \mathsf{inactive} &\quad \text{The attack is displayed in grey and with a dotted line.}\\
+ \mathsf{bend~right} &\quad \text{The attack arrow is bent to the right.}\\
+ &\quad \text{Can additionally provide the angle, e.\,g., \textsf{bend~right=40}.}\\
+ \mathsf{bend~left} &\quad \text{The attack arrow is bent to the left. Can also provide an angle.}\\
+ \end{align*}
+
+ Furthermore, all \textsf{tikz} style parameters can be used here as well.
+
+ \begin{example}~
+ \begin{verbatim}
+ \begin{af}
+ \argument{arg1}{a}
+ \argument[right=of arg1]{arg2}{b}
+ \argument[right=of arg2]{arg3}{c}
+ \argument[right=of arg3]{arg4}{d}
+
+ \attack{arg1}{arg2}
+ \attack[bend right]{arg2}{arg3}
+ \attack[bend left=10,inactive]{arg3}{arg4}
+ \end{af}
+ \end{verbatim}
+
+ \begin{center}
+ \begin{af}
+ \argument{arg1}{a}
+ \argument[right=of arg1]{arg2}{b}
+ \argument[right=of arg2]{arg3}{c}
+ \argument[right=of arg3]{arg4}{d}
+
+ \attack{arg1}{arg2}
+ \attack[bend right]{arg2}{arg3}
+ \attack[bend left=10,inactive]{arg3}{arg4}
+ \end{af}
+ \end{center}
+ \end{example}
+
+
+ Additionally, you can create a symmetric attack between two arguments with
+
+ \verb|\dualattack{arg1}{arg2}|
+
+ \noindent
+ and a self-attack for an argument with
+
+ \verb|\selfattack{arg1}|
+
+ \noindent
+ For both commands, you can use the same optional parameters as for the \verb|\attack| command.
+
+ \begin{example}~
+ \begin{verbatim}
+ \begin{af}
+ \argument{arg1}{a}
+ \argument[right=of arg1]{arg2}{b}
+
+ \selfattack{arg1}
+ \dualattack{arg1}{arg2}
+ \end{af}
+ \end{verbatim}
+
+ \begin{center}
+ \begin{af}
+ \argument{arg1}{a}
+ \argument[right=of arg1]{arg2}{b}
+
+ \selfattack{arg2}
+ \dualattack{arg1}{arg2}
+ \end{af}
+ \end{center}
+ \end{example}
+
+
+\subsection{Supports}
+ You can create a support relation between two arguments with the command
+
+ \verb|\support{arg1}{arg2}|
+
+ \noindent
+ where \verb|arg1| and \verb|arg2| are the identifiers of two previously defined arguments.
+ The support arrow use the same tip as the attack arrows, but have a perpendicular mark to distinguish them from attacks.
+ Supports can be customized in the same way as attacks.
+
+ \begin{example}~
+ \begin{verbatim}
+ \begin{af}
+ \argument{arg1}{a}
+ \argument[right=of arg1]{arg2}{b}
+ \argument[right=of arg2]{arg3}{c}
+
+ \support{arg1}{arg2}
+ \support[bend right]{arg2}{arg3}
+ \end{af}
+ \end{verbatim}
+
+ \begin{center}
+ \begin{af}
+ \argument{arg1}{a}
+ \argument[right=of arg1]{arg2}{b}
+ \argument[right=of arg2]{arg3}{c}
+
+ \support{arg1}{arg2}
+ \support[bend right]{arg2}{arg3}
+ \end{af}
+ \end{center}
+ \end{example}
+
+
+\subsection{Further Commands}
+ If you want to display an identifier for your argumentation framework in the picture, you can use the command
+
+ \verb|\afname{id}{name}|
+
+ \noindent
+ where \verb|id| is an identifier for the created node and \verb|name| is the text displayed in the picture.
+ Additionally, positioning information can be provided via the optional parameters.
+
+ \begin{example}~
+ \begin{verbatim}
+ \begin{af}
+ \argument{arg1}{a}
+ \argument[right=of arg1]{arg2}{b}
+ \afname[left=of arg1]{caption}{$F:$}
+
+ \attack{arg1}{arg2}
+ \end{af}
+ \end{verbatim}
+
+ \begin{center}
+ \begin{af}
+ \argument{arg1}{a}
+ \argument[right=of arg1]{arg2}{b}
+ \argument[right=of arg2]{arg3}{c}
+ \afname[left=of arg1]{caption}{$F:$}
+
+ \support{arg1}{arg2}
+ \end{af}
+ \end{center}
+ \end{example}
+
+\end{document}
diff --git a/graphics/pgf/contrib/argumentation/argumentation.sty b/graphics/pgf/contrib/argumentation/argumentation.sty
new file mode 100644
index 0000000000..80dd5f4c83
--- /dev/null
+++ b/graphics/pgf/contrib/argumentation/argumentation.sty
@@ -0,0 +1,104 @@
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{argumentation}[2023/11/05 Argumentation]
+% Author: Lars Bengel
+% E-Mail: lars.bengel@fernuni-hagen.de
+% Version: 1.0
+% License: LaTeX Project Public License 1.3c
+
+%%%%%%%%%%% Package Requirements %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\RequirePackage{options} % For managing package options
+\RequirePackage{tikz} % For drawing the argumentation frameworks
+\usetikzlibrary{positioning} % For relative node positioning
+\usetikzlibrary{arrows.meta} % For directed edges / attack arrows
+\usetikzlibrary{decorations.markings} % For creating the support edge markings
+
+\newcommand{\argstyle}[1]{\textbf{\emph{#1}}} % Defines the font style in which argument names are displayed
+
+
+%%%%%%%%%% Package Options %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\options{
+ /argumentation/.new family,
+ /argumentation/argumentstyle/.new choice = {standard, retro},
+ /argumentation/namestyle/.new choice = {normal, italics, bold, bolditalics},
+ /argumentation/attackstyle/.new choice = {standard, retro},
+ /argumentation/@unknown/.new cmd 2 = \PackageWarning{argumentation}{Unknown option `#1'}
+}
+\options@ProcessOptions{/argumentation}
+
+%%%%%%%%%% Preprocessing options %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ifcase\option{/argumentation/namestyle/@ord}\relax
+\or\renewcommand{\argstyle}[1]{\emph{#1}}
+\or\renewcommand{\argstyle}[1]{\textbf{#1}}
+\or\renewcommand{\argstyle}[1]{\textbf{\emph{#1}}}
+\fi
+
+\ifcase\option{/argumentation/argumentstyle/@ord}
+\tikzset{arg/.style={circle, minimum size=0.75cm,draw=black,thick,fill=white,font=\large, text centered, inner sep=0}}
+\or\tikzset{arg/.style={circle, minimum size=0.7cm,draw=black,thick,fill=white}}
+\fi
+
+\ifcase\option{/argumentation/attackstyle/@ord}
+\tikzset{att/.style={-{Stealth[scale=1.25]}}}
+\or\tikzset{att/.style={->}}
+\fi
+
+%%%%%%%%%% Package Content %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\tikzset{ % Basic predefined tikz-styles
+ % Self-Loop style
+ every loop/.style={min distance=2mm,in=0,out=60,looseness=5},
+ % Color shortcuts for labelled arguments and reduced arguments
+ inactive/.style={draw=black!30, text=black!40,densely dashed},
+ argin/.style={fill=green},
+ argout/.style={fill=red},
+ argundec/.style={fill=cyan},
+ % Style for displaying AF name in Figure
+ caption/.style={draw=none},
+ % Style for support mark
+ support mark/.style = {postaction = {decorate,decoration={markings,mark=at position #1 with {\draw[-] (0,-0.1) -- (0.1,0.1);}}}},
+}
+
+\newcommand{\setargumentstyle}[1]{\tikzset{arg/.style={#1}}}
+\newcommand{\setattackstyle}[1]{\tikzset{att/.style={#1}}}
+\newcommand{\setloopstyle}[1]{\tikzset{every loop/.style={#1}}}
+
+\newcommand{\adjustargumentstyle}[1]{\tikzset{arg/.append style={#1}}}
+\newcommand{\adjustattackstyle}[1]{\tikzset{att/.append style={#1}}}
+
+\newcommand{\resetargumentstyle}{\setargumentstyle{circle, minimum size=0.75cm,draw=black,thick,fill=white,font=\large, text centered, inner sep=0}}
+\newcommand{\resetattackstyle}{\setattackstyle{-{Stealth[scale=1.25]}}}
+\newcommand{\resetloopstyle}{\setloopstyle{min distance=2mm,in=0,out=60,looseness=5}}
+
+
+\newenvironment{af}{
+ \tikzpicture
+}{%
+ \endtikzpicture
+}
+
+\newenvironment{miniaf}[1][]{
+ \tikzset{arg/.append style={font=\small, minimum size=0.5cm},
+ att/.append style={-{Stealth[scale=0.9]}},
+ }
+ \tikzpicture[node distance=0.5cm,#1]
+}{%
+ \endtikzpicture
+}
+
+% Creates a node displaying the name of the AF
+\newcommand{\afname}[3][]{\node[caption,#1](#2){#3};}
+
+% Creates an argument node
+\newcommand{\argument}[3][]{\node[arg,#1](#2){\argstyle{#3}};}
+
+% Creates an attack edge
+\newcommand{\attack}[3][]{\path(#2) edge [att,#1] (#3);}
+
+% Creates a self-attack
+\newcommand{\selfattack}[2][]{\path(#2) edge [att,loop,#1] (#2);}
+
+% Creates two symmetric attack edges between two arguments
+\newcommand{\dualattack}[3][]{\path(#2) edge [att, bend right,#1] (#3);\path(#3) edge [att, bend right,#1] (#2);}
+
+% Creates a support edge between two arguments
+\newcommand{\support}[3][]{\path(#2) edge [att,support mark=0.3,#1] (#3);}
diff --git a/graphics/pgf/contrib/fenetrecas/doc/FenetreCas-doc.pdf b/graphics/pgf/contrib/fenetrecas/doc/FenetreCas-doc.pdf
index 85c5fe3f8b..00536bb76c 100644
--- a/graphics/pgf/contrib/fenetrecas/doc/FenetreCas-doc.pdf
+++ b/graphics/pgf/contrib/fenetrecas/doc/FenetreCas-doc.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/fenetrecas/doc/FenetreCas-doc.tex b/graphics/pgf/contrib/fenetrecas/doc/FenetreCas-doc.tex
index 827d667357..ef6906d061 100644
--- a/graphics/pgf/contrib/fenetrecas/doc/FenetreCas-doc.tex
+++ b/graphics/pgf/contrib/fenetrecas/doc/FenetreCas-doc.tex
@@ -3,8 +3,8 @@
% arara: pdflatex: {shell: yes, synctex: no, interaction: batchmode} if found('log', '(undefined references|Please rerun|Rerun to get)')
\documentclass[french,a4paper,11pt]{article}
-\def\TPversion{0.1.3}
-\def\TPdate{14 juin 2023}
+\def\TPversion{0.1.4}
+\def\TPdate{5 novembre 2023}
\usepackage[utf8]{inputenc}
\usepackage[T1]{fontenc}
\usepackage{amsmath,amssymb}
@@ -249,7 +249,7 @@ Il n'existe pas d'option pour le package, et \texttt{xcolor} n'est pas chargé a
Il est compatible avec les compilations usuelles en \textsf{latex}, \textsf{pdflatex}, \textsf{lualatex} ou \textsf{xelatex}.
\end{noteblock}
-\section{Fonctionnement global}
+\subsection{Fonctionnement global}
\begin{importantblock}
Le fonctionnement global est :
@@ -265,6 +265,7 @@ Le fonctionnement global est :
\section{Historique}
+\verb|v0.1.4|~:~~~~Migration de \textsf{\textbackslash tikzstyle} à \textsf{\textbackslash tikzset}.
\verb|v0.1.3|~:~~~~Clé \textsf{[PosRes]} pour la réponse (gauche/centre/droite) + correction de bugs mineurs.
diff --git a/graphics/pgf/contrib/fenetrecas/tex/FenetreCas.sty b/graphics/pgf/contrib/fenetrecas/tex/FenetreCas.sty
index a55c8ba894..4650718445 100644
--- a/graphics/pgf/contrib/fenetrecas/tex/FenetreCas.sty
+++ b/graphics/pgf/contrib/fenetrecas/tex/FenetreCas.sty
@@ -3,7 +3,8 @@
% or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{FenetreCas}[2023/06/14 0.1.3 Simuler une fenetre CAS type Geogebra ou Xcas]
+\ProvidesPackage{FenetreCas}[2023/11/05 0.1.4 Simuler une fenetre CAS type Geogebra ou Xcas]
+% 0.1.4 Passage \tikzstyle vers \tikzset
% 0.1.3 Clé [PosRes] pour positionner la réponse (gauche/centre/droite) + Correction de bugs mineurs.
% 0.1.2 Clés [Select] pour les numéros avec des ronds.
% 0.1.1 Clés [FondCouleur] pour le fond des cases.
@@ -226,7 +227,8 @@
\def\CoulXCASPt{cyan!20}\def\CoulXCASSave{green!20}\def\CoulXCASMid{violet!20}\def\CoulXCASStop{red}
}
\begin{tikzpicture}[#2]
- \tikzstyle{xcastitre}=[font=\XCCFfontenete\ttfamily,inner sep=1pt,outer sep=0pt]
+ \tikzset{xcastitre/.style={font=\XCCFfontenete\ttfamily,inner sep=1pt,outer sep=0pt}}%
+ %\tikzstyle{xcastitre}=[font=\XCCFfontenete\ttfamily,inner sep=1pt,outer sep=0pt]
%LE BLOC "TITRE"
\ifboolKV[paramfenxcascf]{Entete}%si titre=true
{%
diff --git a/graphics/pgf/contrib/tkz-bernoulli/doc/tkz-bernoulli-doc.pdf b/graphics/pgf/contrib/tkz-bernoulli/doc/tkz-bernoulli-doc.pdf
index 25f0aad4ad..cac5a2d194 100644
--- a/graphics/pgf/contrib/tkz-bernoulli/doc/tkz-bernoulli-doc.pdf
+++ b/graphics/pgf/contrib/tkz-bernoulli/doc/tkz-bernoulli-doc.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/tkz-bernoulli/doc/tkz-bernoulli-doc.tex b/graphics/pgf/contrib/tkz-bernoulli/doc/tkz-bernoulli-doc.tex
index bb387c577a..cb48588936 100644
--- a/graphics/pgf/contrib/tkz-bernoulli/doc/tkz-bernoulli-doc.tex
+++ b/graphics/pgf/contrib/tkz-bernoulli/doc/tkz-bernoulli-doc.tex
@@ -34,8 +34,8 @@
\hypersetup{pdfborder=0 0 0}
\usepackage[margin=1.5cm]{geometry}
\setlength{\parindent}{0pt}
-\def\TPversion{0.1.2}
-\def\TPdate{4 novembre 2023}
+\def\TPversion{0.1.3}
+\def\TPdate{5 novembre 2023}
\usepackage{tcolorbox}
\tcbuselibrary{skins,hooks}
\usepackage{soul}
@@ -232,8 +232,8 @@ Concernant cette commande :
\item \MontreCode{Aide} := booléen pour afficher les noms des nœuds créés (\MontreCode{false} par défaut) ;
\item \MontreCode{Notice} := booléen pour afficher les valeurs prises par la v.a. (\MontreCode{false} par défaut) ;
\item \MontreCode{Var} := nom de la v.a. pour la notice (\MontreCode{X} par défaut) ;
- \item \MontreCode{N} := paramètre $n$ du schéma de Bernoulli (\MontreCode{3} par défaut) ;
- \item \MontreCode{Indice} := booléen (expérimental !!) pour forcer l'affichage de l'indice du niveau pour les succès/échecs, au quel cas les évènements doivent utiliser \MontreCode{\_i} (mais pas dans un \MontreCode{\textbackslash overline}\ldots) ! (\MontreCode{false} par défaut).
+ \item \MontreCode{N} := paramètre $n$ du schéma de Bernoulli (\MontreCode{3} par défaut).
+ %\item \MontreCode{Indice} := booléen (expérimental !!) pour forcer l'affichage de l'indice du niveau pour les succès/échecs, au quel cas les évènements doivent utiliser \MontreCode{\_i} (mais pas dans un \MontreCode{\textbackslash overline}\ldots) ! (\MontreCode{false} par défaut).
\end{itemize}
\end{itemize}
@@ -261,9 +261,9 @@ Concernant cette commande :
\end{demohigh}
\begin{demohigh}[language=latex/latex2,style/main=cyan!10,style/code=cyan!10]
-%avec la clé Indice
+%en utilisant des indices, dépendant du niveau \i
\begin{tikzpicture}
- \tkzSchemBernoulli[Indice,Evts={$S_i$/$\overline{S}_i$}]
+ \tkzSchemBernoulli[Evts={$S_{\i}$/$\overline{S_{\i}}$}]
\end{tikzpicture}
\end{demohigh}
@@ -452,10 +452,19 @@ Default styles are given by :
\end{demohigh}
\begin{demohigh}[language=latex/latex2,style/main=cyan!10,style/code=cyan!10]
-%with Subscript key, experimental...
+%with index for the levels \i
\begin{tikzpicture}
- \tkzBernoulliTree[Subscript,Events={$S_i$/$\overline{S}_i$}]
+ \tkzBernoulliTree[Events={$S_{\i}$/$\overline{S_{\i}}$}]
\end{tikzpicture}
\end{demohigh}
+\pagebreak
+
+\section{Historique}
+
+{\small \texttt{v0.1.3 : }Correction de la documentation}
+
+{\small \texttt{v0.1.1 : }Commande pour une épreuve de Bernoulli}
+
+{\small \texttt{v0.1.0 : }Version initiale}
\end{document} \ No newline at end of file
diff --git a/graphics/pgf/contrib/tkz-bernoulli/tex/tkz-bernoulli.sty b/graphics/pgf/contrib/tkz-bernoulli/tex/tkz-bernoulli.sty
index e3e014c2b9..182f21234b 100644
--- a/graphics/pgf/contrib/tkz-bernoulli/tex/tkz-bernoulli.sty
+++ b/graphics/pgf/contrib/tkz-bernoulli/tex/tkz-bernoulli.sty
@@ -2,10 +2,11 @@
% licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tkz-bernoulli}[2023/11/04 0.1.2 Draw Bernoulli tree with tikz]
+\ProvidesPackage{tkz-bernoulli}[2023/11/05 0.1.3 Draw Bernoulli tree with tikz]
%====HISTORIQUE
-% v 0.1.2 Ajout d'une clé pour forcer l'affichage d'un indice pour les succès/échecs (prudence quand même...)
+% v 0.1.3 Retour en arrière pour la clé, qui n'est pas utile en fait...
+% v 0.1.2 Ajout d'une clé pour forcer l'affichage d'un indice pour les succès/échecs (prudence quand même... epérimental)
% v 0.1.1 Correction de bugs + ajout d'une commande pour une épreuve de Bernoulli
% v 0.1.0 Version initiale [fr] et [en]
@@ -15,7 +16,6 @@
\RequirePackage{simplekv}
\RequirePackage{xintexpr,xintbinhex}
\usetikzlibrary{calc}
-%\RequirePackage{listofitems}
%====SCHÉMA DE BERNOULLI [FR]
%styles par défaut
@@ -27,30 +27,6 @@
\tikzstyle{BernProbaE} = [fill=white,midway,font=\footnotesize,inner sep=2pt]
\tikzstyle{BernNotice} = [inner sep=2pt,text=teal,right=1em]
-%commande de personnalisations
-% \NewDocumentCommand\tkzSchemBernStyle{ m m }{%1=type,2=tikzstyle
- % \xdef\BernStyle{\noexpand#2}
- % \IfStrEq{#2}{defaut}%
- % {%
- % \IfStrEq{#1}{branche}{\tikzstyle{BernBranche} = [semithick]}{}%
- % \IfStrEq{#1}{racine}{\tikzstyle{BernRacine} = [inner sep=2pt]}{}%
- % \IfStrEq{#1}{noeudS}{\tikzstyle{BernNoeudS} = [inner sep=2pt]}{}%
- % \IfStrEq{#1}{noeudE}{\tikzstyle{BernNoeudE} = [inner sep=2pt]}{}%
- % \IfStrEq{#1}{probaS}{\tikzstyle{BernProbaS} = [fill=white,midway,font=\footnotesize]}{}%
- % \IfStrEq{#1}{probaE}{\tikzstyle{BernProbaE} = [fill=white,midway,font=\footnotesize]}{}%
- % \IfStrEq{#1}{notice}{\tikzstyle{BernNotice} = [inner sep=2pt,text=teal,right=1em]}{}%
- % }%
- % {%
- % \IfStrEq{#1}{branche}{\tikzstyle{BernBranche} = [\BernStyle]}{}%
- % \IfStrEq{#1}{racine}{\tikzstyle{BernRacine} = [\BernStyle]}{}%
- % \IfStrEq{#1}{noeudS}{\tikzstyle{BernNoeudS} = [\BernStyle]}{}%
- % \IfStrEq{#1}{noeudE}{\tikzstyle{BernNoeudE} = [\BernStyle]}{}%
- % \IfStrEq{#1}{probaS}{\tikzstyle{BernProbaS} = [\BernStyle]}{}%
- % \IfStrEq{#1}{probaE}{\tikzstyle{BernProbaE} = [\BernStyle]}{}%
- % \IfStrEq{#1}{notice}{\tikzstyle{BernNotice} = [\BernStyle]}{}%
- % }%
-% }
-
\NewDocumentCommand\tkzSchemBernStyleDefaut{ }{%
\tikzstyle{BernBranche} = [semithick]
\tikzstyle{BernRacine} = [inner sep=2pt]
@@ -83,8 +59,7 @@
Aide=false,%
Notice=false,%
Var=X,%
- N=3,%
- Indice=false
+ N=3
}
\NewDocumentCommand\tkzEpreuvBernoulli{ s O{} D<>{} }{%
@@ -94,12 +69,6 @@
\StrCut{\ArBinEvts}{/}{\ArBinSucces}{\ArBinEchec}%
\StrCut{\ArBinProbas}{/}{\ArBinProbSucces}{\ArBinProbEchec}%
\restoreexpandmode
- %====test listofitems
- % \setsepchar[.]{/}%
- % \readlist*\DefEvts{\ArBinEvts}%
- % \itemtomacro\DefEvts[1]\ArBinSucces%
- % \itemtomacro\DefEvts[2]\ArBinEchec%
- %===fin test listofitems
\IfBooleanT{#1}%
{%
\begin{tikzpicture}[#3]
@@ -115,8 +84,8 @@
}%
\coordinate (A1-1) at ($(A0-1)+({\ArBinIN},{0.5*\ArBinIF})$) ;
\coordinate (A1-2) at ($(A0-1)+({\ArBinIN},{-0.5*\ArBinIF})$) ;
- \node[BernNoeudS] (B1-1) at (A1-1) {\ifboolKV[ArbreBernoulli]{Indice}{\StrSubstitute{\ArBinSucces}{_i}{_1}}{\ArBinSucces}} ;%{\ArBinSucces} ;%succès
- \node[BernNoeudE] (B1-2) at (A1-2) {\ifboolKV[ArbreBernoulli]{Indice}{\StrSubstitute{\ArBinEchec}{_i}{_1}}{\ArBinEchec}} ;%{\ArBinEchec} ;%échec
+ \node[BernNoeudS] (B1-1) at (A1-1) {\ArBinSucces} ;%succès
+ \node[BernNoeudE] (B1-2) at (A1-2) {\ArBinEchec} ;%échec
\ifboolKV[ArbreBernoulli]{AffProbas}%
{%
\draw[BernBranche] (B0-1) -- (B1-1) node[BernProbaS] {\ArBinProbSucces} ;
@@ -180,8 +149,8 @@
\def\ArBinTmpNds{\fpeval{2**(\i)}}%
\foreach \j in {1,...,\ArBinTmpNds}{%
\xintifboolexpr{\xintiiRem{\j}{2} != 0 }%
- {\node[BernNoeudS] (B\i-\j) at (A\i-\j) {\ifboolKV[ArbreBernoulli]{Indice}{\StrSubstitute{\ArBinSucces}{_i}{_{\i}}}{\ArBinSucces}} ;}%{\ArBinSucces} ;}%succès
- {\node[BernNoeudE] (B\i-\j) at (A\i-\j) {\ifboolKV[ArbreBernoulli]{Indice}{\StrSubstitute{\ArBinEchec}{_i}{_{\i}}}{\ArBinEchec}} ;}%{\ArBinEchec} ;}%échec
+ {\node[BernNoeudS] (B\i-\j) at (A\i-\j) {\ArBinSucces} ;}%succès
+ {\node[BernNoeudE] (B\i-\j) at (A\i-\j) {\ArBinEchec} ;}%échec
\ifboolKV[ArbreBernoulli]{Aide}%
{\draw[teal] (B\i-\j) node[below=4pt,font=\tiny\ttfamily] {B\i-\j} ;}%
{}%
@@ -230,30 +199,6 @@
\tikzstyle{BernProbF} = [fill=white,midway,font=\footnotesize,inner sep=2pt]
\tikzstyle{BernGuide} = [inner sep=2pt,text=teal,right=1em]
-%commande de personnalisations [en]
-% \NewDocumentCommand\tkzBernTreeStyle{ m m }{%1=type,2=tikzstyle
- % \IfStrEq{#2}{default}%
- % \IfStrEq{#2}{defaut}%
- % {%
- % \IfStrEq{#1}{edge}{\tikzstyle{BernEdge} = [semithick]}{}%
- % \IfStrEq{#1}{root}{\tikzstyle{BernRoot} = [inner sep=2pt]}{}%
- % \IfStrEq{#1}{nodeS}{\tikzstyle{BernNodeS} = [inner sep=2pt]}{}%
- % \IfStrEq{#1}{nodeF}{\tikzstyle{BernNodeF} = [inner sep=2pt]}{}%
- % \IfStrEq{#1}{probS}{\tikzstyle{BernProbS} = [fill=white,midway,font=\footnotesize]}{}%
- % \IfStrEq{#1}{probF}{\tikzstyle{BernProbF} = [fill=white,midway,font=\footnotesize]}{}%
- % \IfStrEq{#1}{guide}{\tikzstyle{BernGuide} = [inner sep=2pt,text=teal,right=1em]}{}%
- % }%
- % {%
- % \IfStrEq{#1}{edge}{\tikzstyle{BernEdge} = [#2]}{}%
- % \IfStrEq{#1}{root}{\tikzstyle{BernRoot} = [#2]}{}%
- % \IfStrEq{#1}{nodeS}{\tikzstyle{BernNodeS} = [#2]}{}%
- % \IfStrEq{#1}{nodeF}{\tikzstyle{BernNodeF} = [#2]}{}%
- % \IfStrEq{#1}{probS}{\tikzstyle{BernProbS} = [#2]}{}%
- % \IfStrEq{#1}{probF}{\tikzstyle{BernProbF} = [#2]}{}%
- % \IfStrEq{#1}{guide}{\tikzstyle{BernGuide} = [#2]}{}%
- % }%
-% }
-
\NewDocumentCommand\tkzBernTreeStyleDefault{ }{%1=type,2=tikzstyle
\tikzstyle{BernEdge} = [semithick]
\tikzstyle{BernRoot} = [inner sep=2pt]
@@ -285,8 +230,7 @@
Help=false,%
Guide=false,%
Var=X,%
- N=3,%
- Subscript=false
+ N=3
}
\NewDocumentCommand\tkzBernoulliTrial{ s O{} D<>{} }{%
@@ -311,8 +255,8 @@
}%
\coordinate (A1-1) at ($(A0-1)+({\ArBinIN},{0.5*\ArBinIF})$) ;
\coordinate (A1-2) at ($(A0-1)+({\ArBinIN},{-0.5*\ArBinIF})$) ;
- \node[BernNodeS] (B1-1) at (A1-1) {\ifboolKV[BernoulliTree]{Subscript}{\StrSubstitute{\ArBinSucces}{_i}{_1}}{\ArBinSucces}} ;%succès
- \node[BernNodeF] (B1-2) at (A1-2) {\ifboolKV[BernoulliTree]{Subscript}{\StrSubstitute{\ArBinEchec}{_i}{_1}}{\ArBinEchec}} ;%échec
+ \node[BernNodeS] (B1-1) at (A1-1) {\ArBinSucces} ;%succès
+ \node[BernNodeF] (B1-2) at (A1-2) {\ArBinEchec} ;%échec
\ifboolKV[BernoulliTree]{ShowProbs}%
{%
\draw[BernEdge] (B0-1) -- (B1-1) node[BernProbS] {\ArBinProbSucces} ;
@@ -376,8 +320,8 @@
\def\ArBinTmpNds{\fpeval{2**(\i)}}%
\foreach \j in {1,...,\ArBinTmpNds}{%
\xintifboolexpr{\xintiiRem{\j}{2} != 0 }%
- {\node[BernNodeS] (B\i-\j) at (A\i-\j) {\ifboolKV[BernoulliTree]{Subscript}{\StrSubstitute{\ArBinSucces}{_i}{_{\i}}}{\ArBinSucces}} ;}%succès
- {\node[BernNodeF] (B\i-\j) at (A\i-\j) {\ifboolKV[BernoulliTree]{Subscript}{\StrSubstitute{\ArBinEchec}{_i}{_{\i}}}{\ArBinEchec}} ;}%échec
+ {\node[BernNodeS] (B\i-\j) at (A\i-\j) {\ArBinSucces} ;}%succès
+ {\node[BernNodeF] (B\i-\j) at (A\i-\j) {\ArBinEchec} ;}%échec
\ifboolKV[BernoulliTree]{Help}%
{\draw[teal] (B\i-\j) node[below=4pt,font=\tiny\ttfamily] {B\i-\j} ;}%
{}%