diff options
| author | Norbert Preining <norbert@preining.info> | 2024-11-05 03:03:11 +0000 |
|---|---|---|
| committer | Norbert Preining <norbert@preining.info> | 2024-11-05 03:03:11 +0000 |
| commit | a4b630cb6c1e636209914240d2c6b2481cb60885 (patch) | |
| tree | 0c209bc63080699e05135e31eec8dec725d11632 /macros | |
| parent | b946d7a609b500b429ac4491f4255061019320be (diff) | |
Diffstat (limited to 'macros')
97 files changed, 898 insertions, 81 deletions
diff --git a/macros/generic/markdown/CHANGES.md b/macros/generic/markdown/CHANGES.md index 69deeac748..f4e2fdb7d0 100644 --- a/macros/generic/markdown/CHANGES.md +++ b/macros/generic/markdown/CHANGES.md @@ -1,5 +1,15 @@ # Changes +## 3.8.1 (2024-11-03) + +Fixes: + +- Fix backslashes at the ends of hybrid documents. + (#502, #503, contributed by @lostenderman) + +- Fix hard line breaks in fancy list items. + (#508, #509, contributed by @lostenderman) + ## 3.8.0 (2024-10-31) Development: diff --git a/macros/generic/markdown/VERSION b/macros/generic/markdown/VERSION index 8d19285c37..7a3b734d16 100644 --- a/macros/generic/markdown/VERSION +++ b/macros/generic/markdown/VERSION @@ -1 +1 @@ -3.8.0-0-ga4bab835 (2024-10-31) +3.8.1-0-gbbed72f3 (2024-11-03) diff --git a/macros/generic/markdown/markdown.dtx b/macros/generic/markdown/markdown.dtx index 092c68c911..8fc4867b43 100644 --- a/macros/generic/markdown/markdown.dtx +++ b/macros/generic/markdown/markdown.dtx @@ -28450,9 +28450,11 @@ parsers.commented_line = Cg(Cc(""), "backslashes") * Cs(parsers.commented_line_letter - parsers.newline)^1 -- initial * Cg(Cc(""), "backslashes")) - + #(parsers.backslash * parsers.backslash) + + #( parsers.backslash + * (parsers.backslash + parsers.newline)) * Cg((parsers.backslash -- even backslash - * parsers.backslash)^1, "backslashes") + * ( parsers.backslash + + #parsers.newline))^1, "backslashes") + (parsers.backslash * (#parsers.percent * Cb("backslashes") @@ -30355,7 +30357,7 @@ function M.reader.new(writer, options) * -V("EndlineExceptions") + parsers.check_optional_indent * -V("EndlineExceptions") - * -parsers.starter) / "") + * -V("ListStarter")) / "") * parsers.spacechar^0 / "\n" parsers.link_and_emph_content @@ -30894,6 +30896,8 @@ function M.reader.new(writer, options) parsers.html_interrupting = parsers.fail end + parsers.ListStarter = parsers.starter + parsers.EndlineExceptions = parsers.blankline -- paragraph break + parsers.eof -- end of document @@ -30911,7 +30915,7 @@ function M.reader.new(writer, options) * -V("EndlineExceptions") + parsers.check_optional_indent * -V("EndlineExceptions") - * -parsers.starter) / function(_) return end + * -V("ListStarter")) / function(_) return end * parsers.spacechar^0 parsers.Endline = parsers.endline @@ -30925,36 +30929,38 @@ function M.reader.new(writer, options) * -V("NoSoftLineBreakEndlineExceptions") + parsers.check_optional_indent * -V("NoSoftLineBreakEndlineExceptions") - * -parsers.starter) + * -V("ListStarter")) * parsers.spacechar^0 / writer.space - parsers.EndlineBreak = parsers.backslash * parsers.Endline + parsers.EndlineBreak = parsers.backslash * parsers.endline / writer.hard_line_break parsers.OptionalIndent = parsers.spacechar^1 / writer.space - parsers.Space = parsers.spacechar^2 * parsers.Endline + parsers.Space = parsers.spacechar^2 * parsers.endline / writer.hard_line_break + parsers.spacechar^1 - * parsers.Endline^-1 + * parsers.endline^-1 * parsers.eof / self.expandtabs - + parsers.spacechar^1 * parsers.Endline + + parsers.spacechar^1 * parsers.endline / writer.soft_line_break + parsers.spacechar^1 * -parsers.newline / self.expandtabs + + parsers.spacechar^1 parsers.NoSoftLineBreakSpace - = parsers.spacechar^2 * parsers.Endline + = parsers.spacechar^2 * parsers.endline / writer.hard_line_break + parsers.spacechar^1 - * parsers.Endline^-1 + * parsers.endline^-1 * parsers.eof / self.expandtabs - + parsers.spacechar^1 * parsers.Endline + + parsers.spacechar^1 * parsers.endline / writer.soft_line_break + parsers.spacechar^1 * -parsers.newline / self.expandtabs + + parsers.spacechar^1 parsers.NonbreakingEndline = parsers.endline @@ -31464,6 +31470,7 @@ end Paragraph = parsers.Paragraph, Plain = parsers.Plain, + ListStarter = parsers.ListStarter, EndlineExceptions = parsers.EndlineExceptions, NoSoftLineBreakEndlineExceptions = parsers.NoSoftLineBreakEndlineExceptions, @@ -32760,17 +32767,10 @@ M.extensions.fancy_lists = function() local FancyList = join_table_with_func(FancyListOfType, markers_table) - local Endline = parsers.newline - * (parsers.check_minimal_indent - * -parsers.EndlineExceptions - + parsers.check_optional_indent - * -parsers.EndlineExceptions - * -starter) - * parsers.spacechar^0 - / writer.soft_line_break + local ListStarter = starter self.update_rule("OrderedList", FancyList) - self.update_rule("Endline", Endline) + self.update_rule("ListStarter", ListStarter) end } end diff --git a/macros/generic/markdown/markdown.html b/macros/generic/markdown/markdown.html index 159c5f2cfd..d111179592 100644 --- a/macros/generic/markdown/markdown.html +++ b/macros/generic/markdown/markdown.html @@ -93,7 +93,7 @@ <header id="title-block-header"> <h1 class="title">Markdown Package User Manual</h1> <p class="author">Vít Starý Novotný, Andrej Genčur</p> -<p class="date">3.8.0-0-ga4bab835 2024-10-31</p> +<p class="date">3.8.1-0-gbbed72f3 2024-11-03</p> </header> <nav id="TOC" role="doc-toc"> <ul> @@ -227,10 +227,10 @@ class="tex">T<sub>e</sub>X</span> distribution, you will need to install it.</p> <p>From <a href="https://github.com/witiko/markdown/releases" title="Releases - witiko/markdown">Releases</a>, download <a -href="https://github.com/witiko/markdown/releases/download/3.8.0/markdown.zip" -title="Release 3.8.0 - witiko/markdown">an archive +href="https://github.com/witiko/markdown/releases/download/3.8.1/markdown.zip" +title="Release 3.8.1 - witiko/markdown">an archive <code>markdown.zip</code> for this version of the Markdown package -(3.8.0)</a> or a different version that you wish to install. Then, unzip +(3.8.1)</a> or a different version that you wish to install. Then, unzip the archive. If you downloaded an archive for a different version of the Markdown package, you should now locate a file named <code>markdown.html</code> with the user manual for that version, open diff --git a/macros/generic/markdown/markdown.pdf b/macros/generic/markdown/markdown.pdf Binary files differindex d77534db1b..f2d56f280d 100644 --- a/macros/generic/markdown/markdown.pdf +++ b/macros/generic/markdown/markdown.pdf diff --git a/macros/latex/contrib/customenvs/doc/customenvs-doc-en.pdf b/macros/latex/contrib/customenvs/doc/customenvs-doc-en.pdf Binary files differindex 212a2da0c9..b92c8bcc3b 100644 --- a/macros/latex/contrib/customenvs/doc/customenvs-doc-en.pdf +++ b/macros/latex/contrib/customenvs/doc/customenvs-doc-en.pdf diff --git a/macros/latex/contrib/customenvs/doc/customenvs-doc-en.tex b/macros/latex/contrib/customenvs/doc/customenvs-doc-en.tex index abfa9021a9..de85d9f12b 100644 --- a/macros/latex/contrib/customenvs/doc/customenvs-doc-en.tex +++ b/macros/latex/contrib/customenvs/doc/customenvs-doc-en.tex @@ -34,8 +34,8 @@ \usepackage[margin=1.5cm]{geometry} \setlength{\parindent}{0pt} -\def\TPversion{0.2.3} -\def\TPdate{09/14/2024} +\def\TPversion{0.2.6} +\def\TPdate{04/11/2024} \usepackage{tcolorbox} \sethlcolor{lightgray!25} \NewDocumentCommand\MontreCode{ m }{% @@ -111,33 +111,39 @@ \section{History} +\verb|v0.2.6|~:~~~Whell of skills, speedometer + +\verb|v0.2.5|~:~~~Bugfix with exercices (\textsf{[fr]} macro) + +\verb|v0.2.4|~:~~~Small box \textit{marker} + \verb|v0.2.3|~:~~~Highway signs + sold banners (see \textsf{[fr]} doc) \verb|v0.2.2|~:~~~Flared arrow, with \TikZ \verb|v0.2.1|~:~~~Enhancements for \textit{stars skills} + AutoGrid for \TikZ\ (see \textsf{[fr]} doc) -\verb|v0.2.0|~:~~~~Skills with stars (\textsf{fontawesome5} or \TikZ) +\verb|v0.2.0|~:~~~Skills with stars (\textsf{fontawesome5} or \TikZ) -\verb|v0.1.9|~:~~~~Title banner +\verb|v0.1.9|~:~~~Title banner -\verb|v0.1.8|~:~~~~Score banner +\verb|v0.1.8|~:~~~Score banner -\verb|v0.1.7|~:~~~~Small patch for \textsf{Vignette} macro (see \texttt{[fr]} documentation) +\verb|v0.1.7|~:~~~Small patch for \textsf{Vignette} macro (see \texttt{[fr]} documentation) -\verb|v0.1.6|~:~~~~Small patchs for \textsf{displayskip} + \textsf{pas-tableur} (see \texttt{[fr]} documentation) +\verb|v0.1.6|~:~~~Small patchs for \textsf{displayskip} + \textsf{pas-tableur} (see \texttt{[fr]} documentation) -\verb|v0.1.5|~:~~~~New macros for boxes with \textsf{tcolorbox} (see \texttt{[fr]} documentation) +\verb|v0.1.5|~:~~~New macros for boxes with \textsf{tcolorbox} (see \texttt{[fr]} documentation) -\verb|v0.1.4|~:~~~~Create a SMS conversation +\verb|v0.1.4|~:~~~Create a SMS conversation -\verb|v0.1.3|~:~~~~Environment for exercise(s) (in french doc) +\verb|v0.1.3|~:~~~Environment for exercise(s) (in french doc) -\verb|v0.1.2|~:~~~~Pencil of skills +\verb|v0.1.2|~:~~~Pencil of skills -\verb|v0.1.1|~:~~~~Skills table (only french for the moment...) +\verb|v0.1.1|~:~~~Skills table (only french for the moment...) -\verb|v0.1.0|~:~~~~Initial version +\verb|v0.1.0|~:~~~Initial version \vspace*{5mm} @@ -714,4 +720,125 @@ It's possible to redefine \MontreCode{\textbackslash part} (for example). \end{tikzpicture} \end{demohigh} +\subsection{Small markerbox} + +\begin{codehigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25] +\tbcmarker[color=...,width=...,font=...]{text} +\end{codehigh} + +\begin{demohigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25] +\tbcmarker{my text} +\end{demohigh} + +\begin{demohigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25] +\tbcmarker[color=olive,font=\normalfont\normalsize]{my text} +\end{demohigh} + +%\subsection{Letters wirh pixelart style (experimental)} +% +%\begin{codehigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25] +%%one letter only +%\PixlLetter% +% [height=...,thick=...,color=...,gridcolor=..., +% offseth=...,offsetv=...,gridafter=...,nospaceafter=...] +% <tikzpicture options> +% {letter} +% +%%several words +%\PixlLetters% +% [height=...,thick=...,color=...,gridcolor=..., +% offseth=...,offsetv=...,gridafter=...,nospaceafter=...] +% {letters} +%\end{codehigh} +% +%\begin{codehigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25] +%\PixlLetter{M}\PixlLetter{o}\PixlLetter{n}\PixlLetter{k}\PixlLetter{e}\PixlLetter{y} +%\end{codehigh} +% +%\PixlLetter{M}\PixlLetter{o}\PixlLetter{n}\PixlLetter{k}\PixlLetter{e}\PixlLetter{y} +% +%\begin{codehigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25] +%\PixlLetters[height=2cm,color=red,gridafter,offsetv=1]{(Monkey)} +%\end{codehigh} +% +%\PixlLetters[height=2cm,color=red,gridafter,offsetv=1]{(Monkey)} +% +%\begin{codehigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25] +%\PixlLetters[color=blue]{Monkeys roxxxx !?} +%\end{codehigh} +% +%\PixlLetters[color=blue]{Monkeys roxxxx !?} +% +%\begin{codehigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25] +%\PixlLetters[color=red]{1+1=2} +%\end{codehigh} +% +%\PixlLetters[color=red]{1+1=2} + +\subsection{Wheel of skills / speedometer} + +\begin{codehigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25] +\WheelOfSkills[% + Radius=..., %radius of wheel + Mark=..., %absolute position of optional marker + Font=..., %font of optional labels + SkillsList=..., %list of optional skill labels + ]% + {number of skills or list of colors} +\end{codehigh} + +\begin{demohigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25] +\WheelOfSkills[% + Radius=3cm,% + Mark=5.85,% + Font=\scriptsize\bfseries\ttfamily,% + SkillsList={Niv.1,Niv.2,Niv.3,Niv.4,Niv.5,Niv.6,Niv.7,Niv.8,Niv.9,Niv.10}]% + {10}% +\end{demohigh} + +\begin{demohigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25] +\WheelOfSkills[% + Mark=1.5,% + Font=\scriptsize\bfseries\sffamily,% + SkillsList={LOW-MODERATE,NORMAL,HIGH,VERY HIGH,SEVERE,EXTREME,CATASTROPHIC} + ]% + {yellow!50,orange!50,red!50,blue!50,teal!50,purple!50,violet!50}% +\end{demohigh} + +\begin{codehigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25] +\begin{SkillsWheel}[% + Radius=..., %radius of wheel + Mark=..., %absolute position of optional marker + Font=..., %font of optional labels + SkillsList=..., %list of optional skill labels + ]{number of skills or list of colors} + \PutIconsSkills[Pos=...,Scale=...]{list of icons} +\end{SkillsWheel} +\end{codehigh} + +\begin{demohigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25] +\begin{SkillsWheel}[Radius=5cm,Mark=5.85]% + {yellow!50,orange!50,red!50,blue!50,teal!50,purple!50,violet!50} + \PutIconsSkills[Echelle=3]% + {\faPython,\faAdjust,\faAngellist,\faAmbulance,\faAdjust,\faBabyCarriage,\faBlender} +\end{SkillsWheel} +\end{demohigh} + +\begin{codehigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25] +%inline version, with automatic dimensions +\miniskillwheel[Colors=...,Mark=...]{nb of levels} + +%normal version +\tkzspeedometer[Size=...,Mark=...,Colors=...]{nb levels} +\end{codehigh} + +\begin{demohigh}[language=latex/latex3,style/main=teal!25,style/code=teal!25] +%inline version, with automatic dimensions +\scalebox{2.25}[2.25]{\sffamily Small inline \textit{skillwheel} +\miniskillwheel[Colors=red/blue,Mark=4.33]{7} for testing.} + +%normal version +\tkzspeedometer[Size=5cm,Mark=2.25,Colors=teal/magenta]{6} +\end{demohigh} + \end{document}
\ No newline at end of file diff --git a/macros/latex/contrib/customenvs/doc/customenvs-doc-fr.pdf b/macros/latex/contrib/customenvs/doc/customenvs-doc-fr.pdf Binary files differindex 4c5cd3cd2f..ad524e7e96 100644 --- a/macros/latex/contrib/customenvs/doc/customenvs-doc-fr.pdf +++ b/macros/latex/contrib/customenvs/doc/customenvs-doc-fr.pdf diff --git a/macros/latex/contrib/customenvs/doc/customenvs-doc-fr.tex b/macros/latex/contrib/customenvs/doc/customenvs-doc-fr.tex index 5f319afb89..9d508cf5c0 100644 --- a/macros/latex/contrib/customenvs/doc/customenvs-doc-fr.tex +++ b/macros/latex/contrib/customenvs/doc/customenvs-doc-fr.tex @@ -39,8 +39,8 @@ \usepackage[margin=1.5cm]{geometry} \setlength{\parindent}{0pt} -\def\TPversion{0.2.3} -\def\TPdate{14 septembre 2024} +\def\TPversion{0.2.6} +\def\TPdate{4 novembre 2024} \usepackage{tcolorbox} \tcbuselibrary{listingsutf8} %\usepackage{eurosym} @@ -65,14 +65,14 @@ keywordstyle={\color{blue}},% classoffset=1,% alsoletter={-},% - morekeywords={center,justify,\LstDeuxNiv,\LstTroisNiv,\LstQuatreNiv,\NoticeDeuxNiv,\NoticeTroisNiv,\NoticeQuatreNiv,\DeuxNivBatterie,\TroisNivBatterie,\QuatreNivBatterie,\DeuxNivSmiley,\TroisNivSmiley,\QuatreNivSmiley,\vcenterfa,\faIcon,part,RenewDocumentCommand,IfBooleanTF,\VilleDist},% + morekeywords={center,justify,\LstDeuxNiv,\LstTroisNiv,\LstQuatreNiv,\NoticeDeuxNiv,\NoticeTroisNiv,\NoticeQuatreNiv,\DeuxNivBatterie,\TroisNivBatterie,\QuatreNivBatterie,\DeuxNivSmiley,\TroisNivSmiley,\QuatreNivSmiley,\vcenterfa,\faIcon,part,RenewDocumentCommand,IfBooleanTF},% keywordstyle={\color{violet}},% classoffset=2,% alsoletter={-},% - morekeywords={\ReponsesQCM,MultiCols,\CreerListeItems,\ListeChoixItems,\TableauCompetences,\CrayonDeCompetences,\StyleEnvtExo,\StyleEnvtExoDefaut,\TitreExo,\ipsum,EnvSMS,\SMSrec,\SMSenv,BoiteSimple,\SujetTitreExo,\CircledNumber,\AffVignette,\BoiteArrondie,\ChangerDisplaySkip,\celcouleur,\celfusion,\lignetxt,\colonnetxt,\celnumbreak,\celtxt,\BandeauScore,\InsererImage,\tkzBannerTri,\NiveauDiffExos,\tkzEtoiles,\tkzGrilleAuto,\tkzAutoGridLocal,\tkzAutoGridActivate,\tkzFlecheEvasee,PanneauAutoroute,\AfficheSoldes},% + morekeywords={\ReponsesQCM,MultiCols,\CreerListeItems,\ListeChoixItems,\TableauCompetences,\CrayonDeCompetences,\StyleEnvtExo,\StyleEnvtExoDefaut,\TitreExo,\ipsum,EnvSMS,\SMSrec,\SMSenv,BoiteSimple,\SujetTitreExo,\CircledNumber,\AffVignette,\BoiteArrondie,\ChangerDisplaySkip,\celcouleur,\celfusion,\lignetxt,\colonnetxt,\celnumbreak,\celtxt,\BandeauScore,\InsererImage,\tkzBannerTri,\NiveauDiffExos,\tkzEtoiles,\tkzGrilleAuto,\tkzAutoGridLocal,\tkzAutoGridActivate,\tkzFlecheEvasee,PanneauAutoroute,\AfficheSoldes,\tbcmarker,\VilleDist,\RoueNiveaux,EnvRoueNiveaux,\PlacerIconeNiveau,\PlacerIconesNiveaux,\MiniCompteurNiveaux,\tkzspeedometer},% keywordstyle={\color{green!50!black}},% classoffset=3,% - morekeywords={Largeur,Filets,EspacesCL,NbCols,Labels,PoliceLabels,EspaceLabels,Swap,Type,CoeffEspVert,EpTrait,Alea,LargeurNivs,Niveaux,NoticeNiveaux,Titre,PolTitre,PolNotice,PolComp,LigneSep,CouleurNotice,CouleurNiveaux,CouleurFond,Note,Notice,PoliceCateg,PoliceBloc,Couleurs,LargeurBloc,Echelle,NoirBlanc,Libelle,EpTrait,Police,Type,ComplementTitre,Titre,CodeDebut,Couleur,EchelleImage,Decoration,Trait,Avatar,AffAvatar,NoirBlanc,CouleurE,CouleurR,CouleurFond,Hauteur,Largeur,PoliceTxt,CouleurTitre,AlignH,bg,txt,bthick,bcol,raise,Type,EspH,Fond,Texte,Style,Dense,Avant,AvantS,Apres,ApresS,Global,align,width,Legende,CouleurFond,Hauteur,Ratio,AffLegende,Couleurs,EchelleSymboles,Symboles,vRemplir,vOffset,vCentrer,height,width,blockwidth,collight,colmedium,coldar,coltxt,fonttxt,swap,maincolor,logo,type,num,dispblock,customtype,Couleur,AlignV,Offset,NiveauMax,pasX,pasY,grilleauto,TailleFleche,Direction,Coeff,TypeFleche,Deplacement,LineCap,Epaisseur,CouleurCartouche,Fleches,CouleurFond,CouleurTitre,PoliceCartouche,TypeFleche,EspacementV,OffsetFleches,Dernier,PoliceEntete,PolicePrix,PoliceReduc,OffsetReduc,AgrandirReduc},% + morekeywords={Largeur,Filets,EspacesCL,NbCols,Labels,PoliceLabels,EspaceLabels,Swap,Type,CoeffEspVert,EpTrait,Alea,LargeurNivs,Niveaux,NoticeNiveaux,Titre,PolTitre,PolNotice,PolComp,LigneSep,CouleurNotice,CouleurNiveaux,CouleurFond,Note,Notice,PoliceCateg,PoliceBloc,Couleurs,LargeurBloc,Echelle,NoirBlanc,Libelle,EpTrait,Police,Type,ComplementTitre,Titre,CodeDebut,Couleur,EchelleImage,Decoration,Trait,Avatar,AffAvatar,NoirBlanc,CouleurE,CouleurR,CouleurFond,Hauteur,Largeur,PoliceTxt,CouleurTitre,AlignH,bg,txt,bthick,bcol,raise,Type,EspH,Fond,Texte,Style,Dense,Avant,AvantS,Apres,ApresS,Global,align,width,Legende,CouleurFond,Hauteur,Ratio,AffLegende,Couleurs,EchelleSymboles,Symboles,vRemplir,vOffset,vCentrer,height,width,blockwidth,collight,colmedium,coldar,coltxt,fonttxt,swap,maincolor,logo,type,num,dispblock,customtype,Couleur,AlignV,Offset,NiveauMax,pasX,pasY,grilleauto,TailleFleche,Direction,Coeff,TypeFleche,Deplacement,LineCap,Epaisseur,CouleurCartouche,Fleches,CouleurFond,CouleurTitre,PoliceCartouche,TypeFleche,EspacementV,OffsetFleches,Dernier,PoliceEntete,PolicePrix,PoliceReduc,OffsetReduc,AgrandirReduc,Rayon,Police,ListeNiveaux,Marqueur,Pos,Echelle,Couleurs,Taille},% keywordstyle={\color{orange}} },% #1 @@ -152,6 +152,12 @@ \section{Historique} +\verb|v0.2.6|~:~~~Roue des compétences / speedometer + +\verb|v0.2.5|~:~~~Correction du fonctionnement de \texttt{EnvtExo} + +\verb|v0.2.4|~:~~~Petite boîte type \textit{marker} + \verb|v0.2.3|~:~~~Panneaux autoroutiers + Affichettes de soldes \verb|v0.2.2|~:~~~Ajout d'une commande pour des flèches évasées, en \TikZ\ @@ -817,6 +823,133 @@ L'argument, obligatoire et entre \MontreCode{\{...\}} est la liste des catégori \pagebreak +\section{Roue de compétences} + +\subsection{Principe et fonctionnement} + +L'idée est de proposer une commande et un environnement pour créer une \textit{demie-roue} de compétences, basé sur \MontreCode{TikZ}. + +\begin{DemoCode}{listing only} +\RoueNiveaux[clés]<options tikz>{couleurs ou nb de niveaux}% +\end{DemoCode} + +\begin{DemoCode}{listing only} +\begin{EnvRoueNiveaux}[clés]<options tikz>{couleurs ou nb de niveaux}% + \PlacerIconesNiveaux[clés]{liste d'icônes} +\end{EnvRoueNiveaux} +\end{DemoCode} + +\begin{DemoCode}{} +\RoueNiveaux{5}\hspace{5mm} +\RoueNiveaux{green!50,yellow!50,orange!50,red!50,brown!50} +\end{DemoCode} + +\begin{DemoCode}{} +\begin{EnvRoueNiveaux}{4} + \PlacerIconesNiveaux{\faPython,\faAdjust,\faAngellist,\faAmbulance} +\end{EnvRoueNiveaux} +\end{DemoCode} + +\subsection{La commande et l'environnement} + +Les \MontreCode{clés} (communes) disponibles, à donner entre \MontreCode{[...]}, sont : + +\begin{itemize} + \item \MontreCode{Rayon} : rayon de la roue ; \MontreCode{4cm} par défaut + \item \MontreCode{Police} : police des éventuels labels ; \MontreCode{\textbackslash bfseries\textbackslash sffamily} par défaut + \item \MontreCode{ListeNiveaux} : liste éventuelle des niveaux, sous la forme \MontreCode{Label1,Label2,...} + \item \MontreCode{Marqueur} : position relative d'un éventuel marqueur. +\end{itemize} + +L'argument optionnel, et entre \MontreCode{<...>}, permet de spécifier des options à la figure \MontreCode{TikZ} (comme une rotation, un alignement, etc) + +\smallskip + +L'argument, obligatoire et entre \MontreCode{\{...\}} est la liste des couleurs, ou le nombre de catégories pour une sortie en N\&B. + +\medskip + +Pour l'environnement, la commande \MontreCode{\textbackslash PlacerIconesNiveaux} permet de placer des icônes en lieu et place des libellés. les clés disponibles sont : + +\begin{itemize} + \item \MontreCode{Pos} : position (excentricité) des icônes ; \MontreCode{0.8} par défaut + \item \MontreCode{Echelle} : échelle des icônes ; \MontreCode{2}. +\end{itemize} + +\subsection{Exemples} + +\begin{DemoCode}{} +\RoueNiveaux[% + Marqueur=1.5,% + Police=\scriptsize\bfseries\sffamily,% + ListeNiveaux={LOW-MODERATE,NORMAL,HIGH,VERY HIGH,SEVERE,EXTREME,CATASTROPHIC} + ]% + {yellow!50,orange!50,red!50,blue!50,teal!50,purple!50,violet!50}% +\end{DemoCode} + +\begin{DemoCode}{} +\RoueNiveaux[% + Rayon=3cm,% + Marqueur=5.85,% + Police=\scriptsize\bfseries\ttfamily,% + ListeNiveaux={% + Niv.1,Niv.2,Niv.3,Niv.4,Niv.5,Niv.6,Niv.7,Niv.8,Niv.9,Niv.10,Niv.11,Niv.12}% + ]% + {12} +\end{DemoCode} + +\begin{DemoCode}{} +\begin{EnvRoueNiveaux}[Rayon=5cm,Marqueur=5.85]% + {yellow!50,orange!50,red!50,blue!50,teal!50,purple!50,violet!50} + \PlacerIconesNiveaux[Echelle=3]% + {\faPython,\faAdjust,\faAngellist,\faAmbulance,\faAdjust,\faBabyCarriage,\faBlender} +\end{EnvRoueNiveaux} +\end{DemoCode} + +\pagebreak + +\subsection{\og Speed-o-meter \fg} + +En marge de la roue \textit{détaillée}, il est possible d'utiliser une version simplifiée, soit en mode en ligne, soit en mode autonome. + +\smallskip + +À noter qu'en mode en ligne, les dimensions sont calculées automatiquement en fonction de la police courante. + +\begin{DemoCode}{listing only} +%à utiliser en mode en ligne +\MiniCompteurNiveaux[clés]<options tikz>{nb niveaux} +\end{DemoCode} + +\begin{DemoCode}{listing only} +%mode autonome +\tkzspeedometer[clés]<options tikz>{nb niveaux} +\end{DemoCode} + +Les \MontreCode{clés} (communes) disponibles, à donner entre \MontreCode{[...]}, sont : + +\begin{itemize} + \item \MontreCode{Couleurs} : couleur(s) (sous la forme \MontreCode{couleur} ou \MontreCode{couleurp/couleurs}) ; \MontreCode{black} par défaut + \item \MontreCode{Marqueur} : position relative d'un éventuel marqueur ; + \item \MontreCode{Taille} : taille du cadran (en mode autonome uniquement !) +\end{itemize} + +L'argument optionnel, et entre \MontreCode{<...>}, permet de spécifier des options à la figure \MontreCode{TikZ} (comme une rotation, un alignement, etc) + +\smallskip + +L'argument, obligatoire et entre \MontreCode{\{...\}} est le nombre de niveaux. + +\begin{DemoCode}{} +\scalebox{3}[3]{Petit compteur \MiniCompteurNiveaux[Couleurs=blue/red,Marqueur=4.33]{6} en ligne.} +\end{DemoCode} + +\begin{DemoCode}{} +\tkzspeedometer[Marqueur=3.66]{5} +\end{DemoCode} + +\pagebreak + \section{Bandeau de score} \subsection{Principe et fonctionnement} @@ -1021,6 +1154,7 @@ Hormis le style global, il est possible de modifier/ajouter certains éléments \item une icône, via \texttt{fontawesome5}, dont la hauteur est adaptée à la hauteur de la ligne en cours ; \item des étoiles, via \texttt{fontawesome5} ou \TikZ, dont la hauteur est adaptée à la hauteur de la ligne en cours ; \item un petit chronomètre, via \texttt{pictochrono}, dont la hauteur est adaptée à la hauteur de la ligne en cours ; + \item un petit \textit{speedometer}, dont la hauteur est adaptée à la hauteur de la ligne en cours ; \item une ceinture colorée, via \texttt{coloredbelts}, dont la hauteur est adaptée à la hauteur de la ligne en cours ; \end{itemize} \item le compteur (nommé \MontreCode{numeroexo}) peut être désactivé et \textit{adpaté} via les commandes classiques de compteurs. @@ -1041,6 +1175,7 @@ Les \MontreCode{clés} disponibles, à donner entre \MontreCode{[...]}, sont : \item \MontreCode{Ceinture/...} := afficher la ceinture couleur \MontreCode{...} à la fin de la ligne ; \item \MontreCode{Chrono/...} := afficher le chrono de durée \MontreCode{...} à la fin de la ligne ; \item \MontreCode{Points/...} := afficher les points \MontreCode{(... points)} à la fin de la ligne ; + \item \MontreCode{Speedo/...§...} := afficher un \textit{speedometer} ; \item \MontreCode{faEtoiles/...} := afficher des étoiles de difficultés à la fin de la ligne ; \item \MontreCode{tkzEtoiles/...} := afficher des étoiles de difficultés à la fin de la ligne ; \end{itemize} @@ -1058,7 +1193,6 @@ La commande d'affichage des étoiles de difficultés est indépendante de l'envi \begin{DemoCode}{listing only} %commande d'étoiles (max=3 par défaut) avec fontawesome5 \NiveauDiffExos[max]{nb} - %commande d'étoiles (max=3 par défaut) avec tikz \tkzEtoiles[Couleur=...,CouleurFond=...,Offset=...,NiveauMax=...,AlignV=...]{nb} \end{DemoCode} @@ -1126,28 +1260,30 @@ Le code proposé utilise l'environnement, mais la commande simple est complètem \begin{EnvtExo}[Decoration=tkzEtoiles/3.5§5]\ipsum<Lang=FR,Type=sent>\end{EnvtExo}%exo8 -\begin{EnvtExo}[Decoration=Points/7]\ipsum<Lang=FR,Type=sent>\end{EnvtExo}%exo9 +\begin{EnvtExo}[Decoration=Points/7.5]\ipsum<Lang=FR,Type=sent>\end{EnvtExo}%exo9 + +\begin{EnvtExo}[Decoration=Speedo/4.25§6]\ipsum<Lang=FR,Type=sent>\end{EnvtExo}%exo10 -\begin{EnvtExo}[Type=Perso/{Titre perso }]\ipsum<Lang=FR,Type=sent>\end{EnvtExo}%exo10 +\begin{EnvtExo}[Type=Perso/{Titre perso }]\ipsum<Lang=FR,Type=sent>\end{EnvtExo}%exo11 \StyleEnvtExo[Couleur=red,CouleurDeco=teal,Police=\bfseries\ttfamily,EpTrait=2pt, Libelle={Exercice n°}] \begin{EnvtExo}[Decoration=Icone/\faAddressBook] \ipsum<Lang=FR,Type=sent> -\end{EnvtExo}%exo11 +\end{EnvtExo}%exo12 -\begin{EnvtExo}[Type=Perso/{Titre perso },Decoration=Chrono/25,Trait=dashilles]%exo12 +\begin{EnvtExo}[Type=Perso/{Titre perso },Decoration=Chrono/25,Trait=dashilles]%exo13 \ipsum<Lang=FR,Type=sent> \end{EnvtExo} \StyleEnvtExoDefaut \begin{EnvtExo}% - [Type=Perso/{Titre perso~},Decoration=Image/goku_ssj4,Trait=non,Compteur=false]%exo13 + [Type=Perso/{Titre perso~},Decoration=Image/goku_ssj4,Trait=non,Compteur=false]%exo14 \ipsum<Lang=FR,Type=sent> \end{EnvtExo} -\TitreExo[Type=Perso/{Annexe Exercice 3},Compteur=false,Decoration=Image/sseiya_aiolos]%exo14 +\TitreExo[Type=Perso/{Annexe Exercice 3},Compteur=false,Decoration=Image/sseiya_aiolos]%exo15 \ipsum<Lang=FR,Type=sent> \end{DemoCode} @@ -1326,7 +1462,7 @@ On se place dans la plage \VignetteTableur{A3:B5} pour... \end{DemoCode} -\subsection{Boîte arrondie} +\subsection{Boîte arrondie, petite boîte type marker} \begin{DemoCode}{listing only} \BoiteArrondie[Fond=...,Texte=...,EspH=...,Style=...]{texte}[noeud tikz] @@ -1336,6 +1472,69 @@ On se place dans la plage \VignetteTableur{A3:B5} pour... On lance le logiciel \BoiteArrondie[Fond=cyan!33,Texte=violet,EspH=2mm,Style=rect]{situé sur le bureau} en cliquant \BoiteArrondie[Fond=lightgray!25,Texte=darkgray]{droit}. \end{DemoCode} +\begin{DemoCode}{listing only} +\tbcmarker[Couleur=...,Largeur=...,Police=...]{contenu} +\end{DemoCode} + +\begin{DemoCode}{} +\tbcmarker{contenu} +\end{DemoCode} + +\begin{DemoCode}{} +\tbcmarker[Couleur=olive,Police=\normalfont\normalsize]{contenu} +\end{DemoCode} + +%\subsection{Lettres à la manière d'un pixelart (expérimental)} +% +%L'idée est de proposer une présentation de (quelques) lettres (faite en \TikZ) sous la forme d'un \textit{pixelart}. +% +%\smallskip +% +%Par défaut les lettres ont une \textit{hauteur} de 5 carreaux (la taille est déterminée par rapport à la hauteur globale souhaitée, qui vaut par défaut 11~mm), et 2 carreaux ont été rajoutés en haut et en bas, et 1 carreau de chaque côté. +% +%\smallskip +% +%Attention cependant aux caractères spéciaux et/ ou aux lettres accentuées, qui pourraient poser problème (au quel cas la macro d'insertion individuelle est à préférer !) +% +%\begin{DemoCode}{listing only} +%%une lettre +%\PixlLetter% +% [height=...,thick=...,color=...,gridcolor=..., +% offseth=...,offsetv=...,gridafter=...,nospaceafter=...] +% <options tikzpicture> +% {lettre} +% +%%l'apostrophe, si besoin... +%\PixlLetterQuote% +% [height=...,thick=...,color=...,gridcolor=..., +% offseth=...,offsetv=...,gridafter=...,nospaceafter=...] +% <options tikzpicture> +% +%%plusieurs lettres +%\PixlLetters% +% [height=...,thick=...,color=...,gridcolor=..., +% offseth=...,offsetv=...,gridafter=...,nospaceafter=...] +% {lettres} +%\end{DemoCode} +% +%\begin{DemoCode}{listing only} +%\PixlLetter{S}\PixlLetter{i}\PixlLetter{n}\PixlLetter{g}\PixlLetter{e} +% +%\PixlLetters[height=2cm,color=red,gridafter,offsetv=1]{(Singe)} +% +%\PixlLetters[color=blue]{Les singes, c'est super !?} +% +%\PixlLetters[color=red]{1+1=2} +%\end{DemoCode} +% +%\PixlLetter{S}\PixlLetter{i}\PixlLetter{n}\PixlLetter{g}\PixlLetter{e} +% +%\PixlLetters[height=2cm,color=red,gridafter,offsetv=1]{(Singe)} +% +%\PixlLetters[color=blue]{Les singes, c'est super !?} +% +%\PixlLetters[color=red]{1+1=2} + \subsection{Bannière de titre} L'idée est de proposer une bannière, réalisée en \TikZ, pour présenter par exemple un titre. diff --git a/macros/latex/contrib/customenvs/doc/envtexo_exemples.pdf b/macros/latex/contrib/customenvs/doc/envtexo_exemples.pdf Binary files differindex aed4fe853c..147a20d1fa 100644 --- a/macros/latex/contrib/customenvs/doc/envtexo_exemples.pdf +++ b/macros/latex/contrib/customenvs/doc/envtexo_exemples.pdf diff --git a/macros/latex/contrib/customenvs/doc/envtexo_exemples.tex b/macros/latex/contrib/customenvs/doc/envtexo_exemples.tex index d32d06230a..464dbbaec6 100644 --- a/macros/latex/contrib/customenvs/doc/envtexo_exemples.tex +++ b/macros/latex/contrib/customenvs/doc/envtexo_exemples.tex @@ -54,32 +54,36 @@ \ipsum<Lang=FR,Type=sent> \end{EnvtExo} -\begin{EnvtExo}[Decoration=Points/7]%exo10 +\begin{EnvtExo}[Decoration=Speedo/4.25§6]%exo10 \ipsum<Lang=FR,Type=sent> \end{EnvtExo} -\begin{EnvtExo}[Type=Perso/{Titre perso },Etoiles={2.5§5}]%exo11 +\begin{EnvtExo}[Decoration=Points/7.5]%exo11 + \ipsum<Lang=FR,Type=sent> +\end{EnvtExo} + +\begin{EnvtExo}[Type=Perso/{Titre perso },Etoiles={2.5§5}]%exo12 \ipsum<Lang=FR,Type=sent> \end{EnvtExo} \StyleEnvtExo[Couleur=red,CouleurDeco=teal,Police=\bfseries\ttfamily,EpTrait=2pt,Libelle={Exercice n°}] -\begin{EnvtExo}[Decoration=Icone/\faAddressBook]%exo12 +\begin{EnvtExo}[Decoration=Icone/\faAddressBook]%exo13 \ipsum<Lang=FR,Type=sent> \end{EnvtExo} -\begin{EnvtExo}[Type=Perso/{Titre perso },Decoration=Chrono/25,Trait=dashilles,Etoiles=0.5]%exo13 +\begin{EnvtExo}[Type=Perso/{Titre perso },Decoration=Chrono/25,Trait=dashilles,Etoiles=0.5]%exo14 \ipsum<Lang=FR,Type=sent> \end{EnvtExo} \StyleEnvtExoDefaut \begin{EnvtExo}% - [Type=Perso/{Titre perso~},Decoration=Image/goku_ssj4,Trait=non,Compteur=false]%exo14 + [Type=Perso/{Titre perso~},Decoration=Image/goku_ssj4,Trait=non,Compteur=false]%exo15 \ipsum<Lang=FR,Type=sent> \end{EnvtExo} -\TitreExo[Type=Perso/{Annexe Exercice 3},Compteur=false,Decoration=Image/sseiya_aiolos]%exo15 +\TitreExo[Type=Perso/{Annexe Exercice 3},Compteur=false,Decoration=Image/sseiya_aiolos]%exo16 \ipsum<Lang=FR,Type=sent> diff --git a/macros/latex/contrib/customenvs/tex/customenvs.sty b/macros/latex/contrib/customenvs/tex/customenvs.sty index a54da462ab..ef5f36f42f 100644 --- a/macros/latex/contrib/customenvs/tex/customenvs.sty +++ b/macros/latex/contrib/customenvs/tex/customenvs.sty @@ -3,9 +3,12 @@ % source pencil...: CC-BY-SA 4.0 https://tex.stackexchange.com/questions/504092/replicating-a-fancy-bordered-text-style-in-latex/504145#504145 \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{customenvs}[2024/09/14 0.2.3 Custom classic environments] +\ProvidesPackage{customenvs}[2024/11/04 0.2.6 Custom classic environments] %====HISTORIQUE +% v 0.2.6 Roue des compétences / SkillsWheel / speedometer +% v 0.2.5 Modification mineure des points dans l'environnement EnvtExo +% v 0.2.4 Petite boîte marker % v 0.2.3 Panneau autoroutier + Panneau Soldes % v 0.2.2 Flèche évasée, en TikZ % v 0.2.1 Modification mineure de la gestion des étoiles tikz (baseline) + grille auto tikzpicture @@ -947,8 +950,10 @@ \IfSubStr{\EnvtExoDeco}{Points}% {% \StrBehind{\EnvtExoDeco}{/}[\EnvtExoPts]% - \IfStrEq{\EnvtExoPts}{1}{\def\pts{point}}{\def\pts{points}}% - \,\textcolor{macouleurexodeco}{(\EnvtExoPts\ \pts)}% + \xintifboolexpr{ \EnvtExoPts <= 1 }{\def\pts{point}}{\def\pts{points}}% + %\IfStrEq{\EnvtExoPts}{1}{\def\pts{point}}{\def\pts{points}}% + %\,\textcolor{macouleurexodeco}{(\num{\EnvtExoPts} \pts)}% + \,\textcolor{macouleurexodeco}{(\StrSubstitute{\EnvtExoPts}{.}{{{,}}}\ \pts)}% }{}% \IfSubStr{\EnvtExoDeco}{Image}% {% @@ -956,6 +961,12 @@ \settototalheight{\tmp@image@hauteur@totale}{\hbox{\tmpstyleexo qB}}% \,$\vcenter{\hbox{\includegraphics[height=\EnvtExoScaleImg\tmp@image@hauteur@totale]{\EnvtExoImg}}}$% }{}% + \IfSubStr{\EnvtExoDeco}{Speedo}% + {% + \StrBehind{\EnvtExoDeco}{/}[\EnvtExoLevel]% + \StrCut{\EnvtExoLevel}{§}{\EnvtExoLevelSk}{\EnvtExoLevelTo}% + \,\MiniCompteurNiveaux[Couleurs=macouleurexodeco,Marqueur=\EnvtExoLevelSk]{\EnvtExoLevelTo}% + }{}% \IfSubStr{\EnvtExoDeco}{faEtoiles}% {% \StrBehind{\EnvtExoDeco}{/}[\EnvtExoStars]% @@ -1025,8 +1036,10 @@ \IfSubStr{\EnvtExoDeco}{Points}% {% \StrBehind{\EnvtExoDeco}{/}[\EnvtExoPts]% - \IfStrEq{\EnvtExoPts}{1}{\def\pts{point}}{\def\pts{points}}% - \,\textcolor{macouleurexodeco}{(\EnvtExoPts\ \pts)}% + \xintifboolexpr{ \EnvtExoPts <= 1 }{\def\pts{point}}{\def\pts{points}}% + %\IfStrEq{\EnvtExoPts}{1}{\def\pts{point}}{\def\pts{points}}% + %\,\textcolor{macouleurexodeco}{(\num{\EnvtExoPts} \pts)}% + \,\textcolor{macouleurexodeco}{(\StrSubstitute{\EnvtExoPts}{.}{{{,}}}\ \pts)}% }{}% \IfSubStr{\EnvtExoDeco}{Image}% {% @@ -1116,8 +1129,9 @@ \IfSubStr{\EnvtExoDeco}{Points}% {% \StrBehind{\EnvtExoDeco}{/}[\EnvtExoPts]% - \IfStrEq{\EnvtExoPts}{1}{\def\pts{point}}{\def\pts{points}}% - \,(\EnvtExoPts\ \pts)% + \xintifboolexpr{ \EnvtExoPts <= 1 }{\def\pts{point}}{\def\pts{points}}% + %\,(\EnvtExoPts\ \pts)% + \,\textcolor{macouleurexodeco}{(\StrSubstitute{\EnvtExoPts}{.}{{{,}}}\ \pts)}% }{}% \IfSubStr{\EnvtExoDeco}{Image}% {% @@ -1194,8 +1208,9 @@ \IfSubStr{\EnvtExoDeco}{Points}% {% \StrBehind{\EnvtExoDeco}{/}[\EnvtExoPts]% - \IfStrEq{\EnvtExoPts}{1}{\def\pts{point}}{\def\pts{points}}% - \,(\EnvtExoPts\ \pts)% + \xintifboolexpr{ \EnvtExoPts <= 1 }{\def\pts{point}}{\def\pts{points}}% + %\,(\EnvtExoPts\ \pts)% + \,\textcolor{macouleurexodeco}{(\StrSubstitute{\EnvtExoPts}{.}{{{,}}}\ \pts)}% }{}% \IfSubStr{\EnvtExoDeco}{Image}% {% @@ -3068,4 +3083,459 @@ \endtcolorbox% } +%====tcbmarker +\defKV[tcbmarker]{% + Couleur=\def\tcbmarkercolor{#1},% + color=\def\tcbmarkercolor{#1},% + Police=\def\tcbmarkerfonte{#1},% + font=\def\tcbmarkerfonte{#1},% + Largeur=\def\tcbmarkerlarg{#1},% + width=\def\tcbmarkerlarg{#1} +} +\setKVdefault[tcbmarker]{% + Couleur=yellow,% + color=yellow,% + Police=\small\sffamily,% + font=\small\sffamily,% + Largeur=auto,% + width=auto +} + +\NewDocumentCommand\tbcmarker{ O{} D<>{} m }{% + \restoreKV[tcbmarker]% + \setKV[tcbmarker]{#1}% + \IfEq{\tcbmarkerlarg}{auto}% + {% + \tcbset{tcbmarkerbase/.style={enhanced,box align=base}} + }% + {% + \tcbset{tcbmarkerbase/.style={enhanced,capture=minipage,width=\tcbmarkerlarg}} + }% + \tcbox[tcbmarkerbase,nobeforeafter,fontupper=\tcbmarkerfonte,% + boxrule=0.5pt,boxsep=0.5mm,left=2mm,right=5mm,top=0pt,bottom=0pt,colback=\tcbmarkercolor!15,colframe=\tcbmarkercolor!20!black,sharp corners,rounded corners=southeast,arc is angular,arc=3mm,% + underlay={\path[line width=0.5pt,fill=tcbcolback!80!black] ([yshift=3mm]interior.south east)--++(-0.4,-0.1)--++(0.1,-0.2);\path[line width=0.5pt,draw=tcbcolframe,shorten <=-0.05mm,shorten >=-0.05mm] ([yshift=3mm]interior.south east)--++(-0.4,-0.1)--++(0.1,-0.2);},drop fuzzy shadow,#2,before upper={\vphantom{(qÉ)}},#2]{#3}% +} + +%====SkillsWheel [en & fr] +\usetikzlibrary{bbox} +\newlength{\skilwheelradius} +\setlength\skilwheelradius{4cm} + +\defKV[skillswheel]{% + Rayon=\setlength\skilwheelradius{#1},% + Radius=\setlength\skilwheelradius{#1},% + Police=\def\skilwheelfonte{#1},% + Font=\def\skilwheelfonte{#1},% + ListeNiveaux=\def\skilwheelskills{#1},% + SkillsList=\def\skilwheelskills{#1},% + Marqueur=\def\skilwheelmark{#1},% + Mark=\def\skilwheelmark{#1} +} +\setKVdefault[skillswheel]{% + Rayon=3cm,Radius=3cm, + Police=\bfseries\sffamily,Font=\bfseries\sffamily,% + ListeNiveaux={},SkillsList={},% + Marqueur={},Mark={} +} + +\NewDocumentCommand\RoueNiveaux{ O{} D<>{} m }{% + %1 := clés + %2 := liste couleurs + %3 := choix marqueur + \restoreKV[skillswheel]% + \setKV[skillswheel]{#1}% + %\IfEq{#3}{}{\xdef\skilwheelmark{-1}}{\xdef\skilwheelmark{#3}}% + \IfSubStr{#3}{,}% + {% + \readlist*\skilswheelcolors{#3}% + }% + {% + \xdef\skilswheelcolorslen{#3}% + }% + \IfEq{\skilwheelmark}{}% + {}% + {% + \xintifboolexpr{\skilwheelmark >= 0 'and' \skilwheelmark <= \skilswheelcolorslen}% + {% + \xdef\skilswheelposcurs{\xintfloateval{180-180*(\skilwheelmark)/\skilswheelcolorslen}}% + }% + {% + \xdef\skilswheelposcurs{\xintfloateval{0.5*\skilswheelcolorslen}}% + }% + }% + \IfEq{\skilwheelskills}{}{}{\readlist*\skilswheellstskills{\skilwheelskills}}% + \begin{tikzpicture}[transform shape,#2] + \foreach \i in {1,...,\skilswheelcolorslen}{% + \IfSubStr{#3}{,}% + {% + \draw[line join=mitter,line cap=rect,line width=\fpeval{0.015\skilwheelradius},fill={\skilswheelcolors[\i]}] ({180-180*(\i-1)/\skilswheelcolorslen}:{0.075\skilwheelradius}) -- ({180-180*(\i-1)/\skilswheelcolorslen}:\skilwheelradius) arc({180-180*(\i-1)/\skilswheelcolorslen}:{180-180*(\i)/\skilswheelcolorslen}:\skilwheelradius) -- ({180-180*(\i)/\skilswheelcolorslen}:{0.075\skilwheelradius}) arc({180-180*(\i)/\skilswheelcolorslen}:{180-180*(\i-1)/\skilswheelcolorslen}:{0.075\skilwheelradius}) ; + }% + {% + \draw[line join=mitter,line cap=rect,line width=\fpeval{0.015\skilwheelradius}] ({180-180*(\i-1)/\skilswheelcolorslen}:{0.075\skilwheelradius}) -- ({180-180*(\i-1)/\skilswheelcolorslen}:\skilwheelradius) arc({180-180*(\i-1)/\skilswheelcolorslen}:{180-180*(\i)/\skilswheelcolorslen}:\skilwheelradius) -- ({180-180*(\i)/\skilswheelcolorslen}:{0.075\skilwheelradius}) arc({180-180*(\i)/\skilswheelcolorslen}:{180-180*(\i-1)/\skilswheelcolorslen}:{0.075\skilwheelradius}) ; + }% + %label + \IfEq{\skilwheelskills}{}% + {}% + {% + \xintifboolexpr{ 180*(\i-1)/\skilswheelcolorslen <= 90}% + {% + \draw[draw=none] ({180-180*(\i-1)/\skilswheelcolorslen}:\skilwheelradius) -- ({180-180*(\i-1)/\skilswheelcolorslen}:{0.075\skilwheelradius}) node[inner sep=1.5pt,sloped,pos=0.033,above right,font=\skilwheelfonte] {\vphantom{()}\skilswheellstskills[\i]} ; + }% + {% + \draw[draw=none] ({180-180*(\i)/\skilswheelcolorslen}:\skilwheelradius) -- ({180-180*(\i)/\skilswheelcolorslen}:{0.075\skilwheelradius}) node[inner sep=1.5pt,sloped,pos=0.033,above left,font=\skilwheelfonte] {\vphantom{()}\skilswheellstskills[\i]} ; + }% + }% + }% + \IfEq{\skilwheelmark}{}% + {}% + {% + \node[rotate={90+\skilswheelposcurs},regular polygon,regular polygon sides=3,fill=black,inner sep=0pt,minimum size={0.125*\skilwheelradius},outer sep=0pt] at (\skilswheelposcurs:{1.0125\skilwheelradius}) {} ; + }% + \end{tikzpicture}% +} + +\NewDocumentCommand\WheelOfSkills{ O{} D<>{} m }{% + %1 := clés + %2 := liste couleurs + %3 := choix marqueur + \restoreKV[skillswheel]% + \setKV[skillswheel]{#1}% + %\IfEq{#3}{}{\xdef\skilwheelmark{-1}}{\xdef\skilwheelmark{#3}}% + \IfSubStr{#3}{,}% + {% + \readlist*\skilswheelcolors{#3}% + }% + {% + \xdef\skilswheelcolorslen{#3}% + }% + \IfEq{\skilwheelmark}{}% + {}% + {% + \xintifboolexpr{\skilwheelmark >= 0 'and' \skilwheelmark <= \skilswheelcolorslen}% + {% + \xdef\skilswheelposcurs{\xintfloateval{180-180*(\skilwheelmark)/\skilswheelcolorslen}}% + }% + {% + \xdef\skilswheelposcurs{\xintfloateval{0.5*\skilswheelcolorslen}}% + }% + }% + \IfEq{\skilwheelskills}{}{}{\readlist*\skilswheellstskills{\skilwheelskills}}% + \begin{tikzpicture}[transform shape,#2] + \foreach \i in {1,...,\skilswheelcolorslen}{% + \IfSubStr{#3}{,}% + {% + \draw[line join=mitter,line cap=rect,line width=\fpeval{0.015\skilwheelradius},fill={\skilswheelcolors[\i]}] ({180-180*(\i-1)/\skilswheelcolorslen}:{0.075\skilwheelradius}) -- ({180-180*(\i-1)/\skilswheelcolorslen}:\skilwheelradius) arc({180-180*(\i-1)/\skilswheelcolorslen}:{180-180*(\i)/\skilswheelcolorslen}:\skilwheelradius) -- ({180-180*(\i)/\skilswheelcolorslen}:{0.075\skilwheelradius}) arc({180-180*(\i)/\skilswheelcolorslen}:{180-180*(\i-1)/\skilswheelcolorslen}:{0.075\skilwheelradius}) ; + }% + {% + \draw[line join=mitter,line cap=rect,line width=\fpeval{0.015\skilwheelradius}] ({180-180*(\i-1)/\skilswheelcolorslen}:{0.075\skilwheelradius}) -- ({180-180*(\i-1)/\skilswheelcolorslen}:\skilwheelradius) arc({180-180*(\i-1)/\skilswheelcolorslen}:{180-180*(\i)/\skilswheelcolorslen}:\skilwheelradius) -- ({180-180*(\i)/\skilswheelcolorslen}:{0.075\skilwheelradius}) arc({180-180*(\i)/\skilswheelcolorslen}:{180-180*(\i-1)/\skilswheelcolorslen}:{0.075\skilwheelradius}) ; + }% + %label + \IfEq{\skilwheelskills}{}% + {}% + {% + \xintifboolexpr{ 180*(\i-1)/\skilswheelcolorslen <= 90}% + {% + \draw[draw=none] ({180-180*(\i-1)/\skilswheelcolorslen}:\skilwheelradius) -- ({180-180*(\i-1)/\skilswheelcolorslen}:{0.075\skilwheelradius}) node[inner sep=1.5pt,sloped,pos=0.033,above right,font=\skilwheelfonte] {\vphantom{()}\skilswheellstskills[\i]} ; + }% + {% + \draw[draw=none] ({180-180*(\i)/\skilswheelcolorslen}:\skilwheelradius) -- ({180-180*(\i)/\skilswheelcolorslen}:{0.075\skilwheelradius}) node[inner sep=1.5pt,sloped,pos=0.033,above left,font=\skilwheelfonte] {\vphantom{()}\skilswheellstskills[\i]} ; + }% + }% + }% + \IfEq{\skilwheelmark}{}% + {}% + {% + \node[rotate={90+\skilswheelposcurs},regular polygon,regular polygon sides=3,fill=black,inner sep=0pt,minimum size={0.125*\skilwheelradius},outer sep=0pt] at (\skilswheelposcurs:{1.0125\skilwheelradius}) {} ; + }% + \end{tikzpicture}% +} + +\defKV[skillswheellevel]{% + Pos=\def\skilswheelposlab{#1},% + Echelle=\def\skilswheelscalelab{#1},% + Scale=\def\skilswheelscalelab{#1},% +} +\setKVdefault[skillswheellevel]{% + Pos=0.80,% + Echelle=2,Scale=2 +} + +\NewDocumentCommand\PlacerIconeNiveau{ O{} m m }{% + \restoreKV[skillswheellevel]% + \setKV[skillswheellevel]{#1}% + \node[rotate={90-(180*(#2-0.5)/\skilswheelcolorslen)},inner sep=0pt,outer sep=0pt,scale=\skilswheelscalelab] at ({180-180*(#2-0.5)/\skilswheelcolorslen}:{\skilswheelposlab\skilwheelradius}) {#3} ; +} + +\NewDocumentCommand\PutIconSkill{ O{} m m }{% + \restoreKV[skillswheellevel]% + \setKV[skillswheellevel]{#1}% + \node[rotate={90-(180*(#2-0.5)/\skilswheelcolorslen)},inner sep=0pt,outer sep=0pt,scale=\skilswheelscalelab] at ({180-180*(#2-0.5)/\skilswheelcolorslen}:{\skilswheelposlab\skilwheelradius}) {#3} ; +} + +\NewDocumentCommand\PlacerIconesNiveaux{ O{} m }{% + \restoreKV[skillswheellevel]% + \setKV[skillswheellevel]{#1}% + \readlist*\skllsticon{#2}% + \foreach \i in {1,...,\skllsticonlen}{% + \node[rotate={90-(180*(\i-0.5)/\skilswheelcolorslen)},inner sep=0pt,outer sep=0pt,scale=\skilswheelscalelab] at ({180-180*(\i-0.5)/\skilswheelcolorslen}:{\skilswheelposlab\skilwheelradius}) {\skllsticon[\i]} ; + } +} + +\NewDocumentCommand\PutIconsSkills{ O{} m }{% + \restoreKV[skillswheellevel]% + \setKV[skillswheellevel]{#1}% + \readlist*\skllsticon{#2}% + \foreach \i in {1,...,\skllsticonlen}{% + \node[rotate={90-(180*(\i-0.5)/\skilswheelcolorslen)},inner sep=0pt,outer sep=0pt,scale=\skilswheelscalelab] at ({180-180*(\i-0.5)/\skilswheelcolorslen}:{\skilswheelposlab\skilwheelradius}) {\skllsticon[\i]} ; + } +} + +\NewDocumentEnvironment{EnvRoueNiveaux}{ O{} D<>{} m }% +{% + %1 := clés + %2 := liste couleurs + %3 := choix marqueur + \restoreKV[skillswheel]% + \setKV[skillswheel]{#1}% + %\IfEq{#3}{}{\xdef\skilwheelmark{-1}}{\xdef\skilwheelmark{#3}}% + \IfSubStr{#3}{,}% + {% + \readlist*\skilswheelcolors{#3}% + }% + {% + \xdef\skilswheelcolorslen{#3}% + }% + \IfEq{\skilwheelmark}{}% + {}% + {% + \xintifboolexpr{\skilwheelmark >= 0 'and' \skilwheelmark <= \skilswheelcolorslen}% + {% + \xdef\skilswheelposcurs{\xintfloateval{180-180*(\skilwheelmark)/\skilswheelcolorslen}}% + }% + {% + \xdef\skilswheelposcurs{\xintfloateval{0.5*\skilswheelcolorslen}}% + }% + }% + \IfEq{\skilwheelskills}{}{}{\readlist*\skilswheellstskills{\skilwheelskills}}% + \begin{tikzpicture}[transform shape,#2] + \foreach \i in {1,...,\skilswheelcolorslen}{% + \IfSubStr{#3}{,}% + {% + \draw[line join=mitter,line cap=rect,line width=\fpeval{0.015\skilwheelradius},fill={\skilswheelcolors[\i]}] ({180-180*(\i-1)/\skilswheelcolorslen}:{0.075\skilwheelradius}) -- ({180-180*(\i-1)/\skilswheelcolorslen}:\skilwheelradius) arc({180-180*(\i-1)/\skilswheelcolorslen}:{180-180*(\i)/\skilswheelcolorslen}:\skilwheelradius) -- ({180-180*(\i)/\skilswheelcolorslen}:{0.075\skilwheelradius}) arc({180-180*(\i)/\skilswheelcolorslen}:{180-180*(\i-1)/\skilswheelcolorslen}:{0.075\skilwheelradius}) ; + }% + {% + \draw[line join=mitter,line cap=rect,line width=\fpeval{0.015\skilwheelradius}] ({180-180*(\i-1)/\skilswheelcolorslen}:{0.075\skilwheelradius}) -- ({180-180*(\i-1)/\skilswheelcolorslen}:\skilwheelradius) arc({180-180*(\i-1)/\skilswheelcolorslen}:{180-180*(\i)/\skilswheelcolorslen}:\skilwheelradius) -- ({180-180*(\i)/\skilswheelcolorslen}:{0.075\skilwheelradius}) arc({180-180*(\i)/\skilswheelcolorslen}:{180-180*(\i-1)/\skilswheelcolorslen}:{0.075\skilwheelradius}) ; + }% + %label + \IfEq{\skilwheelskills}{}% + {}% + {% + \xintifboolexpr{ 180*(\i-1)/\skilswheelcolorslen <= 90}% + {% + \draw[draw=none] ({180-180*(\i-1)/\skilswheelcolorslen}:\skilwheelradius) -- ({180-180*(\i-1)/\skilswheelcolorslen}:{0.075\skilwheelradius}) node[inner sep=1.5pt,sloped,pos=0.033,above right,font=\skilwheelfonte] {\vphantom{()}\skilswheellstskills[\i]} ; + }% + {% + \draw[draw=none] ({180-180*(\i)/\skilswheelcolorslen}:\skilwheelradius) -- ({180-180*(\i)/\skilswheelcolorslen}:{0.075\skilwheelradius}) node[inner sep=1.5pt,sloped,pos=0.033,above left,font=\skilwheelfonte] {\vphantom{()}\skilswheellstskills[\i]} ; + }% + }% + }% + \IfEq{\skilwheelmark}{}% + {}% + {% + \node[rotate={90+\skilswheelposcurs},regular polygon,regular polygon sides=3,fill=black,inner sep=0pt,minimum size={0.125*\skilwheelradius},outer sep=0pt] at (\skilswheelposcurs:{1.0125\skilwheelradius}) {} ; + }% +}% +{% + \end{tikzpicture}% +} + +\NewDocumentEnvironment{SkillsWheel}{ O{} D<>{} m }% +{% + %1 := clés + %2 := liste couleurs + %3 := choix marqueur + \restoreKV[skillswheel]% + \setKV[skillswheel]{#1}% + %\IfEq{#3}{}{\xdef\skilwheelmark{-1}}{\xdef\skilwheelmark{#3}}% + \IfSubStr{#3}{,}% + {% + \readlist*\skilswheelcolors{#3}% + }% + {% + \xdef\skilswheelcolorslen{#3}% + }% + \IfEq{\skilwheelmark}{}% + {}% + {% + \xintifboolexpr{\skilwheelmark >= 0 'and' \skilwheelmark <= \skilswheelcolorslen}% + {% + \xdef\skilswheelposcurs{\xintfloateval{180-180*(\skilwheelmark)/\skilswheelcolorslen}}% + }% + {% + \xdef\skilswheelposcurs{\xintfloateval{0.5*\skilswheelcolorslen}}% + }% + }% + \IfEq{\skilwheelskills}{}{}{\readlist*\skilswheellstskills{\skilwheelskills}}% + \begin{tikzpicture}[transform shape,#2] + \foreach \i in {1,...,\skilswheelcolorslen}{% + \IfSubStr{#3}{,}% + {% + \draw[line join=mitter,line cap=rect,line width=\fpeval{0.015\skilwheelradius},fill={\skilswheelcolors[\i]}] ({180-180*(\i-1)/\skilswheelcolorslen}:{0.075\skilwheelradius}) -- ({180-180*(\i-1)/\skilswheelcolorslen}:\skilwheelradius) arc({180-180*(\i-1)/\skilswheelcolorslen}:{180-180*(\i)/\skilswheelcolorslen}:\skilwheelradius) -- ({180-180*(\i)/\skilswheelcolorslen}:{0.075\skilwheelradius}) arc({180-180*(\i)/\skilswheelcolorslen}:{180-180*(\i-1)/\skilswheelcolorslen}:{0.075\skilwheelradius}) ; + }% + {% + \draw[line join=mitter,line cap=rect,line width=\fpeval{0.015\skilwheelradius}] ({180-180*(\i-1)/\skilswheelcolorslen}:{0.075\skilwheelradius}) -- ({180-180*(\i-1)/\skilswheelcolorslen}:\skilwheelradius) arc({180-180*(\i-1)/\skilswheelcolorslen}:{180-180*(\i)/\skilswheelcolorslen}:\skilwheelradius) -- ({180-180*(\i)/\skilswheelcolorslen}:{0.075\skilwheelradius}) arc({180-180*(\i)/\skilswheelcolorslen}:{180-180*(\i-1)/\skilswheelcolorslen}:{0.075\skilwheelradius}) ; + }% + %label + \IfEq{\skilwheelskills}{}% + {}% + {% + \xintifboolexpr{ 180*(\i-1)/\skilswheelcolorslen <= 90}% + {% + \draw[draw=none] ({180-180*(\i-1)/\skilswheelcolorslen}:\skilwheelradius) -- ({180-180*(\i-1)/\skilswheelcolorslen}:{0.075\skilwheelradius}) node[inner sep=1.5pt,sloped,pos=0.033,above right,font=\skilwheelfonte] {\vphantom{()}\skilswheellstskills[\i]} ; + }% + {% + \draw[draw=none] ({180-180*(\i)/\skilswheelcolorslen}:\skilwheelradius) -- ({180-180*(\i)/\skilswheelcolorslen}:{0.075\skilwheelradius}) node[inner sep=1.5pt,sloped,pos=0.033,above left,font=\skilwheelfonte] {\vphantom{()}\skilswheellstskills[\i]} ; + }% + }% + }% + \IfEq{\skilwheelmark}{}% + {}% + {% + \node[rotate={90+\skilswheelposcurs},regular polygon,regular polygon sides=3,fill=black,inner sep=0pt,minimum size={0.125*\skilwheelradius},outer sep=0pt] at (\skilswheelposcurs:{1.0125\skilwheelradius}) {} ; + }% +}% +{% + \end{tikzpicture}% +} + +\newlength{\tmphauteurgradniv} +\newlength{\tmphauteurspeedom} + +\defKV[miniskillswheel]{% + Couleurs=\def\miniskillswheelcol{#1},% + Colors=\def\miniskillswheelcol{#1},% + Marqueur=\def\miniskillswheelmark{#1},% + Mark=\def\miniskillswheelmark{#1},% + Taille=\setlength{\tmphauteurspeedom}{#1},% + Size=\setlength{\tmphauteurspeedom}{#1} +} +\setKVdefault[miniskillswheel]{% + Couleurs=black,% + Colors=black, + Marqueur={},% + Mark={}, + Taille=4cm,% + Size=4cm +} + +\NewDocumentCommand\MiniCompteurNiveaux{ O{} D<>{} m }{% + \restoreKV[miniskillswheel]% + \setKV[miniskillswheel]{#1}% + \settototalheight{\tmphauteurgradniv}{\hbox{azertyuiopqsdfghjklmwxcvbnAZERTYUIOPQSDFGHJKLMWXCVBN}}% + \setlength{\tmphauteurgradniv}{0.90\tmphauteurgradniv}%. + \IfEq{\miniskillswheelmark}{}% + {}% + {% + \xintifboolexpr{\miniskillswheelmark >= 0 'and' \miniskillswheelmark <= #3}% + {% + \xdef\miniskilswheelposcurs{\xintfloateval{180-180*(\miniskillswheelmark)/(#3)}}% + }% + {% + \xdef\miniskilswheelposcurs{\xintfloateval{0.5*(#3)}}% + }% + }% + \IfSubStr{\miniskillswheelcol}{/}% + {% + \StrCut{\miniskillswheelcol}{/}{\miniskillswheelcolp}{\miniskillswheelcols}% + }% + {% + \xdef\miniskillswheelcolp{\miniskillswheelcol}\xdef\miniskillswheelcols{\miniskillswheelcol}% + }% + \begin{tikzpicture}[bezier bounding box,baseline={-0.075\tmphauteurgradniv},line width={0.075\tmphauteurgradniv},#2,transform shape] + \draw[\miniskillswheelcolp] (-15:{0.7588\tmphauteurgradniv}) arc(-15:195:{0.7588\tmphauteurgradniv}) --cycle ; + \foreach \i in {0,...,#3}{% + \draw[\miniskillswheelcolp,line cap=round] ({180-180*(\i)/#3}:{0.55\tmphauteurgradniv})--({180-180*(\i)/#3}:{0.65\tmphauteurgradniv}) ; + } + \IfEq{\miniskillswheelmark}{}% + {}% + {% + \draw[\miniskillswheelcols] (0,0) circle[radius=0.1\tmphauteurgradniv] ; + \draw[\miniskillswheelcols,line cap=round] ({\miniskilswheelposcurs}:{0.1\tmphauteurgradniv}) -- ({\miniskilswheelposcurs}:{0.6125\tmphauteurgradniv}) ; + }% + \end{tikzpicture}% +} + +\NewDocumentCommand\miniskillwheel{ O{} D<>{} m }{% + \restoreKV[miniskillswheel]% + \setKV[miniskillswheel]{#1}% + \settototalheight{\tmphauteurgradniv}{\hbox{azertyuiopqsdfghjklmwxcvbnAZERTYUIOPQSDFGHJKLMWXCVBN}}% + \setlength{\tmphauteurgradniv}{0.90\tmphauteurgradniv}%. + \IfEq{\miniskillswheelmark}{}% + {}% + {% + \xintifboolexpr{\miniskillswheelmark >= 0 'and' \miniskillswheelmark <= #3}% + {% + \xdef\miniskilswheelposcurs{\xintfloateval{180-180*(\miniskillswheelmark)/(#3)}}% + }% + {% + \xdef\miniskilswheelposcurs{\xintfloateval{0.5*(#3)}}% + }% + }% + \IfSubStr{\miniskillswheelcol}{/}% + {% + \StrCut{\miniskillswheelcol}{/}{\miniskillswheelcolp}{\miniskillswheelcols}% + }% + {% + \xdef\miniskillswheelcolp{\miniskillswheelcol}\xdef\miniskillswheelcols{\miniskillswheelcol}% + }% + \begin{tikzpicture}[bezier bounding box,baseline={-0.075\tmphauteurgradniv},line width={0.075\tmphauteurgradniv},#2,transform shape] + \draw[\miniskillswheelcolp] (-15:{0.7588\tmphauteurgradniv}) arc(-15:195:{0.7588\tmphauteurgradniv}) --cycle ; + \foreach \i in {0,...,#3}{% + \draw[\miniskillswheelcolp,line cap=round] ({180-180*(\i)/#3}:{0.55\tmphauteurgradniv})--({180-180*(\i)/#3}:{0.65\tmphauteurgradniv}) ; + } + \IfEq{\miniskillswheelmark}{}% + {}% + {% + \draw[\miniskillswheelcols] (0,0) circle[radius=0.1\tmphauteurgradniv] ; + \draw[\miniskillswheelcols,line cap=round] ({\miniskilswheelposcurs}:{0.1\tmphauteurgradniv}) -- ({\miniskilswheelposcurs}:{0.6125\tmphauteurgradniv}) ; + }% + \end{tikzpicture}% +} + +\NewDocumentCommand\tkzspeedometer{ O{} D<>{} m }{% + \restoreKV[miniskillswheel]% + \setKV[miniskillswheel]{#1}% + \setlength{\tmphauteurgradniv}{0.9\tmphauteurspeedom}% + \IfEq{\miniskillswheelmark}{}% + {}% + {% + \xintifboolexpr{\miniskillswheelmark >= 0 'and' \miniskillswheelmark <= #3}% + {% + \xdef\miniskilswheelposcurs{\xintfloateval{180-180*(\miniskillswheelmark)/(#3)}}% + }% + {% + \xdef\miniskilswheelposcurs{\xintfloateval{0.5*(#3)}}% + }% + }% + \IfSubStr{\miniskillswheelcol}{/}% + {% + \StrCut{\miniskillswheelcol}{/}{\miniskillswheelcolp}{\miniskillswheelcols}% + }% + {% + \xdef\miniskillswheelcolp{\miniskillswheelcol}\xdef\miniskillswheelcols{\miniskillswheelcol}% + }% + \begin{tikzpicture}[bezier bounding box,line width={0.075\tmphauteurgradniv},#2,transform shape]% + \draw[\miniskillswheelcolp] (-15:{0.7588\tmphauteurgradniv}) arc(-15:195:{0.7588\tmphauteurgradniv}) --cycle ; + \foreach \i in {0,...,#3}{% + \draw[\miniskillswheelcolp,line cap=round] ({180-180*(\i)/#3}:{0.55\tmphauteurgradniv})--({180-180*(\i)/#3}:{0.65\tmphauteurgradniv}) ; + }% + \IfEq{\miniskillswheelmark}{}% + {}% + {% + \draw[\miniskillswheelcols] (0,0) circle[radius=0.1\tmphauteurgradniv] ;% + \draw[\miniskillswheelcols,line cap=round] ({\miniskilswheelposcurs}:{0.1\tmphauteurgradniv}) -- ({\miniskilswheelposcurs}:{0.6125\tmphauteurgradniv}) ;% + }% + \end{tikzpicture}% +} + \endinput
\ No newline at end of file diff --git a/macros/latex/contrib/spelatex/Example/example-spel/1.0.0.0.0.0-1.ogg b/macros/latex/contrib/spelatex/Example/example-spel/1.0.0.0.0.0-1.ogg Binary files differindex cc0ac97383..bdf7b5f7cc 100644 --- a/macros/latex/contrib/spelatex/Example/example-spel/1.0.0.0.0.0-1.ogg +++ b/macros/latex/contrib/spelatex/Example/example-spel/1.0.0.0.0.0-1.ogg diff --git a/macros/latex/contrib/spelatex/Example/example-spel/2.1.0.0.0.0-1.ogg b/macros/latex/contrib/spelatex/Example/example-spel/2.1.0.0.0.0-1.ogg Binary files differindex d3e307663a..f8fae21be9 100644 --- a/macros/latex/contrib/spelatex/Example/example-spel/2.1.0.0.0.0-1.ogg +++ b/macros/latex/contrib/spelatex/Example/example-spel/2.1.0.0.0.0-1.ogg diff --git a/macros/latex/contrib/spelatex/Example/example-spel/2.1.0.0.0.0-2.ogg b/macros/latex/contrib/spelatex/Example/example-spel/2.1.0.0.0.0-2.ogg Binary files differindex cc3d6f6140..96b69ea840 100644 --- a/macros/latex/contrib/spelatex/Example/example-spel/2.1.0.0.0.0-2.ogg +++ b/macros/latex/contrib/spelatex/Example/example-spel/2.1.0.0.0.0-2.ogg diff --git a/macros/latex/contrib/spelatex/Example/example-spel/2.1.0.0.0.0-3.ogg b/macros/latex/contrib/spelatex/Example/example-spel/2.1.0.0.0.0-3.ogg Binary files differindex 1ff0bad991..d60e2ba905 100644 --- a/macros/latex/contrib/spelatex/Example/example-spel/2.1.0.0.0.0-3.ogg +++ b/macros/latex/contrib/spelatex/Example/example-spel/2.1.0.0.0.0-3.ogg diff --git a/macros/latex/contrib/spelatex/Example/example-spel/2.3.0.0.0.0-1.ogg b/macros/latex/contrib/spelatex/Example/example-spel/2.3.0.0.0.0-1.ogg Binary files differindex 7e4a820b0d..f794c8140b 100644 --- a/macros/latex/contrib/spelatex/Example/example-spel/2.3.0.0.0.0-1.ogg +++ b/macros/latex/contrib/spelatex/Example/example-spel/2.3.0.0.0.0-1.ogg diff --git a/macros/latex/contrib/spelatex/Example/example.pdf b/macros/latex/contrib/spelatex/Example/example.pdf Binary files differindex 002b9816e1..ece32c6f15 100644 --- a/macros/latex/contrib/spelatex/Example/example.pdf +++ b/macros/latex/contrib/spelatex/Example/example.pdf diff --git a/macros/latex/contrib/spelatex/spelatex-spel/0.0.0.0.0-1.ogg b/macros/latex/contrib/spelatex/spelatex-spel/0.0.0.0.0-1.ogg Binary files differindex 0596f06bbb..d45b7eb367 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/0.0.0.0.0-1.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/0.0.0.0.0-1.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/1.1.0.0.0-1.ogg b/macros/latex/contrib/spelatex/spelatex-spel/1.1.0.0.0-1.ogg Binary files differindex f0194764e3..706d7fec65 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/1.1.0.0.0-1.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/1.1.0.0.0-1.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/1.1.0.0.0-2.ogg b/macros/latex/contrib/spelatex/spelatex-spel/1.1.0.0.0-2.ogg Binary files differindex 2af4750075..f451a0ddd4 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/1.1.0.0.0-2.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/1.1.0.0.0-2.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/1.1.0.0.0-3.ogg b/macros/latex/contrib/spelatex/spelatex-spel/1.1.0.0.0-3.ogg Binary files differindex 58ebce6cbd..fd7fb39aaf 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/1.1.0.0.0-3.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/1.1.0.0.0-3.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/1.2.1.0.0-1.ogg b/macros/latex/contrib/spelatex/spelatex-spel/1.2.1.0.0-1.ogg Binary files differindex 96a05bf03f..67b45b1f3a 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/1.2.1.0.0-1.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/1.2.1.0.0-1.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/1.2.1.0.0-2.ogg b/macros/latex/contrib/spelatex/spelatex-spel/1.2.1.0.0-2.ogg Binary files differindex bece48eafa..c3aa2bfcc9 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/1.2.1.0.0-2.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/1.2.1.0.0-2.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/1.2.1.0.0-3.ogg b/macros/latex/contrib/spelatex/spelatex-spel/1.2.1.0.0-3.ogg Binary files differindex 902435b2b8..3c4db3afde 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/1.2.1.0.0-3.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/1.2.1.0.0-3.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0-1.ogg b/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0-1.ogg Binary files differindex f516bba0b6..cefdd66a35 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0-1.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0-1.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0-2.ogg b/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0-2.ogg Binary files differindex 1ce32adf2d..e475a09b0b 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0-2.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/1.2.2.0.0-2.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-1.ogg b/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-1.ogg Binary files differindex 121ad080df..46124694f5 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-1.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-1.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-10.ogg b/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-10.ogg Binary files differindex 2d6f1219c9..316674ba27 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-10.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-10.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-11.ogg b/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-11.ogg Binary files differindex 308152e10c..e845fbfbb0 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-11.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-11.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-2.ogg b/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-2.ogg Binary files differindex ea679aff58..727787fc27 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-2.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-2.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-3.ogg b/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-3.ogg Binary files differindex 6d18873f65..eb32419d97 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-3.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-3.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-4.ogg b/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-4.ogg Binary files differindex d91b0a075a..b31204ccb8 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-4.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-4.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-8.ogg b/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-8.ogg Binary files differindex 3875e79c5a..8c33f3cc8c 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-8.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-8.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-9.ogg b/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-9.ogg Binary files differindex a8fde7a44e..13b95ad07c 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-9.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/1.3.0.0.0-9.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/2.0.0.0.0.m3u b/macros/latex/contrib/spelatex/spelatex-spel/2.0.0.0.0.m3u index a637467d28..1487f62e77 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/2.0.0.0.0.m3u +++ b/macros/latex/contrib/spelatex/spelatex-spel/2.0.0.0.0.m3u @@ -9,14 +9,12 @@ https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0 https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0-5.ogg https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0-6.ogg https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/footnote-1.ogg -https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/footnote-2.ogg https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.0.0.0.ogg https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0.ogg https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-1.ogg https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-2.ogg https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-3.ogg -https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/footnote-3.ogg -https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/footnote-4.ogg +https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/footnote-2.ogg https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-4.ogg https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-5.ogg https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-6.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0-1.ogg b/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0-1.ogg Binary files differindex 83ac3316b8..3d4b783af4 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0-1.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0-1.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0-6.ogg b/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0-6.ogg Binary files differindex 0348deb29d..129d9995f6 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0-6.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0-6.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0.m3u b/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0.m3u index 296094a70d..a090328aba 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0.m3u +++ b/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0.m3u @@ -7,5 +7,4 @@ https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0 https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0-4.ogg https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0-5.ogg https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.1.0.0.0-6.ogg -https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/footnote-1.ogg -https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/footnote-2.ogg
\ No newline at end of file +https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/footnote-1.ogg
\ No newline at end of file diff --git a/macros/latex/contrib/spelatex/spelatex-spel/2.2.0.0.0.m3u b/macros/latex/contrib/spelatex/spelatex-spel/2.2.0.0.0.m3u index ec97d1b98f..8cc006355c 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/2.2.0.0.0.m3u +++ b/macros/latex/contrib/spelatex/spelatex-spel/2.2.0.0.0.m3u @@ -5,8 +5,7 @@ https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0 https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-1.ogg https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-2.ogg https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-3.ogg -https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/footnote-3.ogg -https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/footnote-4.ogg +https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/footnote-2.ogg https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-4.ogg https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-5.ogg https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-6.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-1.ogg b/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-1.ogg Binary files differindex 3d4f89fadf..4627fc6c64 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-1.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-1.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-3.ogg b/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-3.ogg Binary files differindex 355172e89d..d51010f671 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-3.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-3.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-4.ogg b/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-4.ogg Binary files differindex dd7b27ecc7..3730a263a0 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-4.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-4.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-5.ogg b/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-5.ogg Binary files differindex 12303266f4..f6d2ec2a3d 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-5.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-5.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-8.ogg b/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-8.ogg Binary files differindex 85a9734365..882271a2f9 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-8.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-8.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0.m3u b/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0.m3u index 7cb5682e5b..d13d4ba944 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0.m3u +++ b/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0.m3u @@ -4,8 +4,7 @@ https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0 https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-1.ogg https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-2.ogg https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-3.ogg -https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/footnote-3.ogg -https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/footnote-4.ogg +https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/footnote-2.ogg https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-4.ogg https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-5.ogg https://ctan.org/tex-archive/macros/latex/contrib/spelatex/spelatex-spel/2.2.1.0.0-6.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/2.2.2.0.0-1.ogg b/macros/latex/contrib/spelatex/spelatex-spel/2.2.2.0.0-1.ogg Binary files differindex d844ed9d1e..c8fa8ecb58 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/2.2.2.0.0-1.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/2.2.2.0.0-1.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/2.2.2.0.0-2.ogg b/macros/latex/contrib/spelatex/spelatex-spel/2.2.2.0.0-2.ogg Binary files differindex cd2856bc46..4467facf76 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/2.2.2.0.0-2.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/2.2.2.0.0-2.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/2.2.2.0.0-3.ogg b/macros/latex/contrib/spelatex/spelatex-spel/2.2.2.0.0-3.ogg Binary files differindex 43a28cfb0c..6c30d096f0 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/2.2.2.0.0-3.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/2.2.2.0.0-3.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-1.ogg b/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-1.ogg Binary files differindex a99ba7689d..6fd74fd9f5 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-1.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-1.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-2.ogg b/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-2.ogg Binary files differindex d311b1a572..95ffb0b988 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-2.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-2.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-5.ogg b/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-5.ogg Binary files differindex 66c0c266a8..ca7c035dc6 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-5.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-5.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-6.ogg b/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-6.ogg Binary files differindex 0b37d3daf4..e7f7528a6c 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-6.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/2.2.3.0.0-6.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/2.2.4.0.0-1.ogg b/macros/latex/contrib/spelatex/spelatex-spel/2.2.4.0.0-1.ogg Binary files differindex eb761b9689..77e5806347 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/2.2.4.0.0-1.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/2.2.4.0.0-1.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/2.2.4.0.0-2.ogg b/macros/latex/contrib/spelatex/spelatex-spel/2.2.4.0.0-2.ogg Binary files differindex fc28e9115b..cef6b409c5 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/2.2.4.0.0-2.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/2.2.4.0.0-2.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/2.2.4.0.0-3.ogg b/macros/latex/contrib/spelatex/spelatex-spel/2.2.4.0.0-3.ogg Binary files differindex 5f7de20d02..ca8effdb4d 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/2.2.4.0.0-3.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/2.2.4.0.0-3.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/2.3.0.0.0-1.ogg b/macros/latex/contrib/spelatex/spelatex-spel/2.3.0.0.0-1.ogg Binary files differindex eadac92031..920c695ba0 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/2.3.0.0.0-1.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/2.3.0.0.0-1.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/2.3.0.0.0-2.ogg b/macros/latex/contrib/spelatex/spelatex-spel/2.3.0.0.0-2.ogg Binary files differindex 28ddb1cbc6..1401ff6b3a 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/2.3.0.0.0-2.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/2.3.0.0.0-2.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/2.4.0.0.0-1.ogg b/macros/latex/contrib/spelatex/spelatex-spel/2.4.0.0.0-1.ogg Binary files differindex 95fdcca17f..608c52f217 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/2.4.0.0.0-1.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/2.4.0.0.0-1.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/3.1.0.0.0-1.ogg b/macros/latex/contrib/spelatex/spelatex-spel/3.1.0.0.0-1.ogg Binary files differindex bb5b47e77a..ead0073e85 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/3.1.0.0.0-1.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/3.1.0.0.0-1.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/3.1.0.0.0-2.ogg b/macros/latex/contrib/spelatex/spelatex-spel/3.1.0.0.0-2.ogg Binary files differindex 95ddea0872..f0baab0387 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/3.1.0.0.0-2.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/3.1.0.0.0-2.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/3.1.0.0.0-3.ogg b/macros/latex/contrib/spelatex/spelatex-spel/3.1.0.0.0-3.ogg Binary files differindex 1c1e04dca8..0c218c7956 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/3.1.0.0.0-3.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/3.1.0.0.0-3.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-1.ogg b/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-1.ogg Binary files differindex b09f0e9da7..455c142159 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-1.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-1.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-2.ogg b/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-2.ogg Binary files differindex cd82a168e6..292deb50b5 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-2.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-2.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-3.ogg b/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-3.ogg Binary files differindex ce197d5d07..e151c0003f 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-3.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-3.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-4.ogg b/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-4.ogg Binary files differindex 0158aa1a25..60b2302847 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-4.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-4.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-5.ogg b/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-5.ogg Binary files differindex 03ad4013e4..701953fdc4 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-5.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/3.2.1.0.0-5.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-3.ogg b/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-3.ogg Binary files differindex 740b113f76..49f1d3f79f 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-3.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-3.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-6.ogg b/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-6.ogg Binary files differindex 9f57ec1746..85e7c5a0bb 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-6.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/3.2.2.0.0-6.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/3.3.0.0.0-1.ogg b/macros/latex/contrib/spelatex/spelatex-spel/3.3.0.0.0-1.ogg Binary files differindex b26bdeb2dd..8ee26f5c14 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/3.3.0.0.0-1.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/3.3.0.0.0-1.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/3.4.0.0.0-1.ogg b/macros/latex/contrib/spelatex/spelatex-spel/3.4.0.0.0-1.ogg Binary files differindex 2f1cd79c68..1a5e199543 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/3.4.0.0.0-1.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/3.4.0.0.0-1.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/3.4.0.0.0-2.ogg b/macros/latex/contrib/spelatex/spelatex-spel/3.4.0.0.0-2.ogg Binary files differindex 9c661de201..0c1243bb5e 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/3.4.0.0.0-2.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/3.4.0.0.0-2.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/3.4.0.0.0-3.ogg b/macros/latex/contrib/spelatex/spelatex-spel/3.4.0.0.0-3.ogg Binary files differindex 677b6c81b7..e569e88aef 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/3.4.0.0.0-3.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/3.4.0.0.0-3.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/4.1.0.0.0-2.ogg b/macros/latex/contrib/spelatex/spelatex-spel/4.1.0.0.0-2.ogg Binary files differindex 52cfa6538b..61b116002e 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/4.1.0.0.0-2.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/4.1.0.0.0-2.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/4.1.1.0.0-1.ogg b/macros/latex/contrib/spelatex/spelatex-spel/4.1.1.0.0-1.ogg Binary files differindex b2372b8993..75fd27a313 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/4.1.1.0.0-1.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/4.1.1.0.0-1.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/4.1.1.0.0-2.ogg b/macros/latex/contrib/spelatex/spelatex-spel/4.1.1.0.0-2.ogg Binary files differindex b9a7aeb8bd..346cefc755 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/4.1.1.0.0-2.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/4.1.1.0.0-2.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/4.1.2.0.0-1.ogg b/macros/latex/contrib/spelatex/spelatex-spel/4.1.2.0.0-1.ogg Binary files differindex ea5c6aba0e..7275f04af9 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/4.1.2.0.0-1.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/4.1.2.0.0-1.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/4.1.2.0.0-2.ogg b/macros/latex/contrib/spelatex/spelatex-spel/4.1.2.0.0-2.ogg Binary files differindex e4c713fe08..5f7ea29e9e 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/4.1.2.0.0-2.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/4.1.2.0.0-2.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/4.1.4.0.0-1.ogg b/macros/latex/contrib/spelatex/spelatex-spel/4.1.4.0.0-1.ogg Binary files differindex f7cd56b794..4af0644be6 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/4.1.4.0.0-1.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/4.1.4.0.0-1.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/4.1.4.0.0-2.ogg b/macros/latex/contrib/spelatex/spelatex-spel/4.1.4.0.0-2.ogg Binary files differindex a4a1f7a5d3..70429b98f6 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/4.1.4.0.0-2.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/4.1.4.0.0-2.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-1.ogg b/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-1.ogg Binary files differindex 9cb84600f8..125b5c53e8 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-1.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-1.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-2.ogg b/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-2.ogg Binary files differindex 1282cf646f..4d1fde8824 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-2.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-2.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-3.ogg b/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-3.ogg Binary files differindex 1eb5d06cf5..350142b864 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-3.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/4.1.7.0.0-3.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/6.2.1.0.0-1.ogg b/macros/latex/contrib/spelatex/spelatex-spel/6.2.1.0.0-1.ogg Binary files differindex da959c392b..54745ef221 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/6.2.1.0.0-1.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/6.2.1.0.0-1.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/6.2.1.0.0-2.ogg b/macros/latex/contrib/spelatex/spelatex-spel/6.2.1.0.0-2.ogg Binary files differindex 44ec885932..dac080258c 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/6.2.1.0.0-2.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/6.2.1.0.0-2.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/6.2.1.0.0-3.ogg b/macros/latex/contrib/spelatex/spelatex-spel/6.2.1.0.0-3.ogg Binary files differindex 84805426f7..7b28b18fbc 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/6.2.1.0.0-3.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/6.2.1.0.0-3.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/6.6.2.0.0-1.ogg b/macros/latex/contrib/spelatex/spelatex-spel/6.6.2.0.0-1.ogg Binary files differindex 018eaedf09..d3443b1947 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/6.6.2.0.0-1.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/6.6.2.0.0-1.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-5.ogg b/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-5.ogg Binary files differindex d6c36c73e1..2b1f795b1a 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-5.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/6.7.0.0.0-5.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/date.ogg b/macros/latex/contrib/spelatex/spelatex-spel/date.ogg Binary files differindex 60d079af3b..3fad561190 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/date.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/date.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/footnote-2.ogg b/macros/latex/contrib/spelatex/spelatex-spel/footnote-2.ogg Binary files differindex 578bd9e634..cfea7a5f06 100644 --- a/macros/latex/contrib/spelatex/spelatex-spel/footnote-2.ogg +++ b/macros/latex/contrib/spelatex/spelatex-spel/footnote-2.ogg diff --git a/macros/latex/contrib/spelatex/spelatex-spel/footnote-3.ogg b/macros/latex/contrib/spelatex/spelatex-spel/footnote-3.ogg Binary files differdeleted file mode 100644 index cfea7a5f06..0000000000 --- a/macros/latex/contrib/spelatex/spelatex-spel/footnote-3.ogg +++ /dev/null diff --git a/macros/latex/contrib/spelatex/spelatex-spel/footnote-4.ogg b/macros/latex/contrib/spelatex/spelatex-spel/footnote-4.ogg Binary files differdeleted file mode 100644 index cfea7a5f06..0000000000 --- a/macros/latex/contrib/spelatex/spelatex-spel/footnote-4.ogg +++ /dev/null diff --git a/macros/latex/contrib/spelatex/spelatex.dtx b/macros/latex/contrib/spelatex/spelatex.dtx index 46946464c5..6d92901dbd 100644 --- a/macros/latex/contrib/spelatex/spelatex.dtx +++ b/macros/latex/contrib/spelatex/spelatex.dtx @@ -32,10 +32,10 @@ \ProvidesFile{spelatex.dtx} %</driver> %<*package> - [2024/11/01 v0.94 SpeLaTeX - Speech-enabled LaTeX (DMW and LVP)] + [2024/11/04 v0.94b SpeLaTeX - Speech-enabled LaTeX (DMW and LVP)] %</package> -\def\fileversion{0.94} -\def\filedate{2024/11/01} +\def\fileversion{0.94b} +\def\filedate{2024/11/04} %<*driver> \documentclass[11pt,a4paper]{ltxdoc} \usepackage[margin=1in,left=2in]{geometry} @@ -106,6 +106,7 @@ % - removed all 'dropped character warnings' % - the logo now has a hyphenation point % - increased font size of documentation} +% \changes{v0.94b}{2024/11/04}{. Fixed bug that resulted in duplicate text} % % \GetFileInfo{spelatex.dtx} % @@ -2327,7 +2328,6 @@ \catcode`\^^M\active \catcode`\^^I=12 \verbatim@start}% \def\endspelverbatimwrite{ - \verbatim@finish \closeoutputstream{chunk} \@esphack } diff --git a/macros/latex/contrib/spelatex/spelatex.pdf b/macros/latex/contrib/spelatex/spelatex.pdf Binary files differindex 1d4724a231..a1faf6900e 100644 --- a/macros/latex/contrib/spelatex/spelatex.pdf +++ b/macros/latex/contrib/spelatex/spelatex.pdf diff --git a/macros/latex/required/latexbug/changes.txt b/macros/latex/required/latexbug/changes.txt index 034f3d7fe5..990fc8a92a 100644 --- a/macros/latex/required/latexbug/changes.txt +++ b/macros/latex/required/latexbug/changes.txt @@ -1,3 +1,8 @@ +2024-07-16 Yukai Chou <muzimuzhi@gmail.com> + + * latexbug.dtx: + Add historic package versions owned by "us(*)" + 2024-06-17 Frank Mittelbach <Frank.Mittelbach@latex-project.org> * latexbug.dtx: diff --git a/macros/latex/required/latexbug/latexbug.dtx b/macros/latex/required/latexbug/latexbug.dtx index da0a7c995c..64a6ffbc0c 100644 --- a/macros/latex/required/latexbug/latexbug.dtx +++ b/macros/latex/required/latexbug/latexbug.dtx @@ -267,7 +267,7 @@ % \begin{macrocode} %<*package> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{latexbug}[2024/06/17 v1.0o Bug-classification] +\ProvidesPackage{latexbug}[2024/07/16 v1.0p Bug-classification] % \end{macrocode} % % \begin{macro}{\latexbug@empty} @@ -372,6 +372,8 @@ cp858.def = us , cp865.def = us , decmulti.def = us , doc-v3beta.sty = us , +doc-2016-02-15.sty = us, +doc-2021-06-01.sty = us, doc.sty = us , docstrip.tex = us , exscale.sty = us , @@ -518,6 +520,7 @@ x2enc.dfu = us , afterpage.sty = us , array-2016-10-06.sty = us , array-2020-02-10.sty = us , +array-2023-11-01.sty = us , array.sty = us , bm.sty = us , calc.sty = us , @@ -535,12 +538,14 @@ layout.sty = us , longtable-2020-01-07.sty = us , longtable.sty = us , multicol-2017-04-11.sty = us , +multicol-2019-10-01.sty = us , multicol.sty = us , q.tex = us , r.tex = us , rawfonts.sty = us , s.tex = us , shellesc.sty = us , +showkeys-2014-10-28.sty = us , showkeys.sty = us , somedefs.sty = us , tabularx.sty = us , @@ -557,6 +562,7 @@ varioref.sty = us , verbatim.sty = us , verbtest.tex = us , x.tex = us , +xr-2023-07-04.sty = us , xr.sty = us , xspace.sty = us , %--------------------------------- babel (locale files) @@ -1601,6 +1607,7 @@ l3str-enc-iso88599.def = us* , xcoffins.sty = us* , xgalley.sty = us* , xparse.sty = us* , +xtemplate-2023-10-10.sty = us* , xtemplate.sty = us* , %--------------------------------- TAGGING PROJECT pdfmanagement-testphase.sty = us* diff --git a/macros/latex/required/latexbug/latexbug.pdf b/macros/latex/required/latexbug/latexbug.pdf Binary files differindex 7d71a756db..b6ee633e01 100644 --- a/macros/latex/required/latexbug/latexbug.pdf +++ b/macros/latex/required/latexbug/latexbug.pdf |