diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
771 files changed, 30493 insertions, 10680 deletions
diff --git a/Master/texmf-dist/tex/latex/abraces/abraces.sty b/Master/texmf-dist/tex/latex/abraces/abraces.sty index af146826ce5..3b096e7ab77 100644 --- a/Master/texmf-dist/tex/latex/abraces/abraces.sty +++ b/Master/texmf-dist/tex/latex/abraces/abraces.sty @@ -1,5 +1,5 @@ %% abraces.sty -%% Copyright 2021 Werner Grundlingh +%% Copyright 2024 Werner Grundlingh % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -16,9 +16,12 @@ % This work consists of the file abraces.sty. \ProvidesPackage{abraces}% http://ctan.org/pkg/abraces - [2022/11/06 v2.1 Arbitrary and asymmetric braces] + [2024/08/02 v2.2 Arbitrary and asymmetric braces] +% xparse definitions now form part of the LaTeX core. However, keeping this in for those using older versions. \RequirePackage{xparse} +% Since abraces defines \bracecolor, add xcolor as dependency +\RequirePackage{xcolor} \newif\if@overload \DeclareOption{overload}{\@overloadtrue} diff --git a/Master/texmf-dist/tex/latex/acmart/acmart-tagged.cls b/Master/texmf-dist/tex/latex/acmart/acmart-tagged.cls new file mode 100644 index 00000000000..4a264e00c9d --- /dev/null +++ b/Master/texmf-dist/tex/latex/acmart/acmart-tagged.cls @@ -0,0 +1,3492 @@ +%% +%% This is file `acmart-tagged.cls', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% acmart.dtx (with options: `class,tagged') +%% +%% IMPORTANT NOTICE: +%% +%% For the copyright see the source file. +%% +%% Any modified versions of this file must be renamed +%% with new filenames distinct from acmart-tagged.cls. +%% +%% For distribution of the original source see the terms +%% for copying and modification in the file acmart.dtx. +%% +%% This generated file may be distributed as long as the +%% original source files, as listed above, are part of the +%% same distribution. (The sources need not necessarily be +%% in the same archive or directory.) +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} + +\NeedsTeXFormat{LaTeX2e} +\ProvidesClass{acmart-tagged} +[2024/08/25 v2.09 Typesetting articles for the Association for Computing Machinery] +\def\@classname{acmart-tagged} +\InputIfFileExists{acmart-preload-hook.tex}{% + \ClassWarning{\@classname}{% + I am loading acmart-preload-hook.tex. You are fully responsible + for any problems from now on.}}{} +\RequirePackage{xkeyval} +\RequirePackage{xstring} +\RequirePackage{iftex} +\define@choicekey*+{\@classname.cls}{format}[\ACM@format\ACM@format@nr]{% + manuscript, acmsmall, acmlarge, acmtog, sigconf, siggraph, + sigplan, sigchi, sigchi-a, acmengage, acmcp}[manuscript]{}{% + \ClassError{\@classname}{The option format must be manuscript, + acmsmall, acmlarge, acmtog, sigconf, siggraph, + sigplan, sigchi or sigchi-a}} +\def\@DeclareACMFormat#1{\DeclareOptionX{#1}{\setkeys{\@classname.cls}{format=#1}}} +\@DeclareACMFormat{manuscript} +\@DeclareACMFormat{acmsmall} +\@DeclareACMFormat{acmlarge} +\@DeclareACMFormat{acmtog} +\@DeclareACMFormat{sigconf} +\@DeclareACMFormat{siggraph} +\@DeclareACMFormat{sigplan} +\@DeclareACMFormat{sigchi} +\@DeclareACMFormat{sigchi-a} +\@DeclareACMFormat{acmengage} +\@DeclareACMFormat{acmcp} +\ExecuteOptionsX{format} +\define@boolkey+{\@classname.cls}[@ACM@]{screen}[true]{% + \if@ACM@screen + \PackageInfo{\@classname}{Using screen mode}% + \else + \PackageInfo{\@classname}{Not using screen mode}% + \fi}{\PackageError{\@classname}{The option screen can be either true or + false}} +\ExecuteOptionsX{screen=false} +\define@boolkey+{\@classname.cls}[@ACM@]{urlbreakonhyphens}[true]{% + \if@ACM@urlbreakonhyphens + \PackageInfo{\@classname}{Using breaking urls on hyphens}% + \else + \PackageInfo{\@classname}{Not breaking urls on hyphens}% + \fi}{\PackageError{\@classname}{The option urlbreakonhyphens can be either true or + false}} +\ExecuteOptionsX{urlbreakonhyphens=true} +\define@boolkey+{\@classname.cls}[@ACM@]{acmthm}[true]{% + \if@ACM@acmthm + \PackageInfo{\@classname}{Requiring acmthm}% + \else + \PackageInfo{\@classname}{Suppressing acmthm}% + \fi}{\PackageError{\@classname}{The option acmthm can be either true or + false}} +\ExecuteOptionsX{acmthm=true} +\define@boolkey+{\@classname.cls}[@ACM@]{review}[true]{% + \if@ACM@review + \PackageInfo{\@classname}{Using review mode}% + \AtBeginDocument{\@ACM@printfoliostrue}% + \else + \PackageInfo{\@classname}{Not using review mode}% + \fi}{\PackageError{\@classname}{The option review can be either true or + false}} +\ExecuteOptionsX{review=false} +\define@boolkey+{\@classname.cls}[@ACM@]{authorversion}[true]{% + \if@ACM@authorversion + \PackageInfo{\@classname}{Using authorversion mode}% + \else + \PackageInfo{\@classname}{Not using authorversion mode}% + \fi}{\PackageError{\@classname}{The option authorversion can be either true or + false}} +\ExecuteOptionsX{authorversion=false} +\define@boolkey+{\@classname.cls}[@ACM@]{nonacm}[true]{% + \if@ACM@nonacm + \PackageInfo{\@classname}{Using nonacm mode}% + \AtBeginDocument{\@ACM@printacmreffalse}% + % in 'nonacm' mode we disable the "ACM Reference Format" + % printing by default, but this can be re-enabled by the + % user using \settopmatter{printacmref=true} + \else + \PackageInfo{\@classname}{Not using nonacm mode}% + \fi}{\PackageError{\@classname}{The option nonacm can be either true or + false}} +\ExecuteOptionsX{nonacm=false} +\define@boolkey+{\@classname.cls}[@ACM@]{balance}[true]{}{% + \PackageError{\@classname}{The option balance can be either true or + false}} +\ExecuteOptionsX{balance} +\define@boolkey+{\@classname.cls}[@ACM@]{pbalance}[true]{}{% + \PackageError{\@classname}{The option pbalance can be either true or + false}} +\ExecuteOptionsX{pbalance=false} +\define@boolkey+{\@classname.cls}[@ACM@]{natbib}[true]{% + \if@ACM@natbib + \PackageInfo{\@classname}{Explicitly selecting natbib mode}% + \else + \PackageInfo{\@classname}{Explicitly deselecting natbib mode}% + \fi}{\PackageError{\@classname}{The option natbib can be either true or + false}} +\ExecuteOptionsX{natbib=true} +\define@boolkey+{\@classname.cls}[@ACM@]{anonymous}[true]{% + \if@ACM@anonymous + \PackageInfo{\@classname}{Using anonymous mode}% + \else + \PackageInfo{\@classname}{Not using anonymous mode}% + \fi}{\PackageError{\@classname}{The option anonymous can be either true or + false}} +\ExecuteOptionsX{anonymous=false} +\define@boolkey+{\@classname.cls}[@ACM@]{timestamp}[true]{% + \if@ACM@timestamp + \PackageInfo{\@classname}{Using timestamp mode}% + \else + \PackageInfo{\@classname}{Not using timestamp mode}% + \fi}{\PackageError{\@classname}{The option timestamp can be either true or + false}} +\ExecuteOptionsX{timestamp=false} +\define@boolkey+{\@classname.cls}[@ACM@]{authordraft}[true]{% + \if@ACM@authordraft + \PackageInfo{\@classname}{Using authordraft mode}% + \@ACM@timestamptrue + \@ACM@reviewtrue + \else + \PackageInfo{\@classname}{Not using authordraft mode}% + \fi}{\PackageError{\@classname}{The option authordraft can be either true or + false}} +\ExecuteOptionsX{authordraft=false} +\def\ACM@fontsize{} +\DeclareOptionX{8pt}{\edef\ACM@fontsize{\CurrentOption}} +\DeclareOptionX{9pt}{\edef\ACM@fontsize{\CurrentOption}} +\DeclareOptionX{10pt}{\edef\ACM@fontsize{\CurrentOption}} +\DeclareOptionX{11pt}{\edef\ACM@fontsize{\CurrentOption}} +\DeclareOptionX{12pt}{\edef\ACM@fontsize{\CurrentOption}} +\def\ACM@languages{} +\DeclareOptionX{language}{% + \ifx\ACM@languages\@empty + \gdef\ACM@languages{english}\fi + \g@addto@macro\ACM@languages{, #1}} +\DeclareOptionX{draft}{\PassOptionsToClass{\CurrentOption}{amsart}} +\DeclareOptionX{*}{\PassOptionsToClass{\CurrentOption}{amsart}} +\ProcessOptionsX +\ClassInfo{\@classname}{Using format \ACM@format, number \ACM@format@nr} +\newif\if@ACM@manuscript +\newif\if@ACM@journal +\newif\if@ACM@journal@bibstrip +\newif\if@ACM@journal@bibstrip@or@tog +\newif\if@ACM@sigchiamode +\newif\if@ACM@engage +\@ACM@engagefalse +\newif\if@ACM@acmcp +\@ACM@acmcpfalse +\ifnum\ACM@format@nr=5\relax % siggraph +\ClassWarning{\@classname}{% + The format siggraph is now obsolete.\MessageBreak + I am switching to sigconf.} + \setkeys{\@classname.cls}{format=sigconf} +\fi +\ifnum\ACM@format@nr=7\relax % sigchi +\ClassWarning{\@classname}{% + The format sigchi is now obsolete.\MessageBreak + I am switching to sigconf.} + \setkeys{\@classname.cls}{format=sigconf} +\fi +\ifnum\ACM@format@nr=8\relax % sigchi +\ClassWarning{\@classname}{% + ACM SIGCHI has retired the SIGCHI-A template\MessageBreak + effective immediately. ACM is keeping this template\MessageBreak + option available to authors who are working on legacy\MessageBreak + documents only. ACM will not, under any circumstances,\MessageBreak + accept documents in this format for publication and\MessageBreak + will not offer technical support to the authors who use\MessageBreak + this template.\MessageBreak + ACM SIGCHI is directing Conference leaders and\MessageBreak + authors to publish their articles using the SIGCONF\MessageBreak + template call.} +\fi +\ifnum\ACM@format@nr=0\relax + \@ACM@manuscripttrue +\else + \@ACM@manuscriptfalse +\fi +\@ACM@sigchiamodefalse +\ifcase\ACM@format@nr +\relax % manuscript + \@ACM@journaltrue +\or % acmsmall + \@ACM@journaltrue +\or % acmlarge + \@ACM@journaltrue +\or % acmtog + \@ACM@journaltrue + \@ACM@journal@bibstrip@or@togtrue +\or % sigconf + \@ACM@journalfalse +\or % siggraph + \@ACM@journalfalse + \or % sigplan + \@ACM@journalfalse + \or % sigchi + \@ACM@journalfalse +\or % sigchi-a + \@ACM@journalfalse + \@ACM@sigchiamodetrue +\or % acmengage + \@ACM@journalfalse + \@ACM@engagetrue +\or % acmcp + \@ACM@journaltrue + \@ACM@acmcptrue + \AtBeginDocument{\@ACM@printacmreffalse}% +\fi +\if@ACM@journal + \@ACM@journal@bibstriptrue + \@ACM@journal@bibstrip@or@togtrue +\else + \@ACM@journal@bibstripfalse +\fi +\let\@startsection@kernel\@startsection +\let\@xsect@kernel\@xsect +\let\@sect@kernel\@sect +\let\@ssect@kernel\@ssect +\ifx\ACM@fontsize\@empty + \ifcase\ACM@format@nr + \relax % manuscript + \def\ACM@fontsize{9pt}% + \or % acmsmall + \def\ACM@fontsize{10pt}% + \or % acmlarge + \def\ACM@fontsize{10pt}% + \or % acmtog + \def\ACM@fontsize{9pt}% + \or % sigconf + \def\ACM@fontsize{9pt}% + \or % siggraph + \def\ACM@fontsize{9pt}% + \or % sigplan + \def\ACM@fontsize{10pt}% + \or % sigchi + \def\ACM@fontsize{9pt}% + \or % sigchi-a + \def\ACM@fontsize{10pt}% + \or % acmengage + \def\ACM@fontsize{10pt}% + \or % acmcp + \def\ACM@fontsize{9pt}% + \fi +\fi +\ClassInfo{\@classname}{Using fontsize \ACM@fontsize} +\LoadClass[\ACM@fontsize, reqno]{amsart} +\RequirePackage{microtype} +\RequirePackage{etoolbox} +\RequirePackage{booktabs} +\RequirePackage{refcount} +\RequirePackage{totpages} +\RequirePackage{environ} +\if@ACM@manuscript +\RequirePackage{setspace} +\onehalfspacing +\fi +\RequirePackage{textcase} +\if@ACM@acmcp +\RequirePackage{framed} +\RequirePackage{zref-savepos, zref-user} +\fi +\newdimen\@ACM@acmcp@delta +\@ACM@acmcp@delta=0pt\relax +\if@ACM@natbib + \RequirePackage{natbib} + \renewcommand{\bibsection}{% + \section*{\refname}% + \phantomsection\addcontentsline{toc}{section}{\refname}% + } + \renewcommand{\bibfont}{\bibliofont} + \renewcommand\setcitestyle[1]{ + \@for\@tempa:=#1\do + {\def\@tempb{round}\ifx\@tempa\@tempb + \renewcommand\NAT@open{(}\renewcommand\NAT@close{)}\fi + \def\@tempb{square}\ifx\@tempa\@tempb + \renewcommand\NAT@open{[}\renewcommand\NAT@close{]}\fi + \def\@tempb{angle}\ifx\@tempa\@tempb + \renewcommand\NAT@open{$<$}\renewcommand\NAT@close{$>$}\fi + \def\@tempb{curly}\ifx\@tempa\@tempb + \renewcommand\NAT@open{\{}\renewcommand\NAT@close{\}}\fi + \def\@tempb{semicolon}\ifx\@tempa\@tempb + \renewcommand\NAT@sep{;}\fi + \def\@tempb{colon}\ifx\@tempa\@tempb + \renewcommand\NAT@sep{;}\fi + \def\@tempb{comma}\ifx\@tempa\@tempb + \renewcommand\NAT@sep{,}\fi + \def\@tempb{authoryear}\ifx\@tempa\@tempb + \NAT@numbersfalse\fi + \def\@tempb{numbers}\ifx\@tempa\@tempb + \NAT@numberstrue\NAT@superfalse\fi + \def\@tempb{super}\ifx\@tempa\@tempb + \NAT@numberstrue\NAT@supertrue\fi + \def\@tempb{nobibstyle}\ifx\@tempa\@tempb + \let\bibstyle=\@gobble\fi + \def\@tempb{bibstyle}\ifx\@tempa\@tempb + \let\bibstyle=\@citestyle\fi + \def\@tempb{sort}\ifx\@tempa\@tempb + \def\NAT@sort{\@ne}\fi + \def\@tempb{nosort}\ifx\@tempa\@tempb + \def\NAT@sort{\z@}\fi + \def\@tempb{compress}\ifx\@tempa\@tempb + \def\NAT@cmprs{\@ne}\fi + \def\@tempb{nocompress}\ifx\@tempa\@tempb + \def\NAT@cmprs{\z@}\fi + \def\@tempb{sort&compress}\ifx\@tempa\@tempb + \def\NAT@sort{\@ne}\def\NAT@cmprs{\@ne}\fi + \def\@tempb{mcite}\ifx\@tempa\@tempb + \let\NAT@merge\@ne\fi + \def\@tempb{merge}\ifx\@tempa\@tempb + \@ifnum{\NAT@merge<\tw@}{\let\NAT@merge\tw@}{}\fi + \def\@tempb{elide}\ifx\@tempa\@tempb + \@ifnum{\NAT@merge<\thr@@}{\let\NAT@merge\thr@@}{}\fi + \def\@tempb{longnamesfirst}\ifx\@tempa\@tempb + \NAT@longnamestrue\fi + \def\@tempb{nonamebreak}\ifx\@tempa\@tempb + \def\NAT@nmfmt#1{\mbox{\NAT@up#1}}\fi + \expandafter\NAT@find@eq\@tempa=\relax\@nil + \if\@tempc\relax\else + \expandafter\NAT@rem@eq\@tempc + \def\@tempb{open}\ifx\@tempa\@tempb + \xdef\NAT@open{\@tempc}\fi + \def\@tempb{close}\ifx\@tempa\@tempb + \xdef\NAT@close{\@tempc}\fi + \def\@tempb{aysep}\ifx\@tempa\@tempb + \xdef\NAT@aysep{\@tempc}\fi + \def\@tempb{yysep}\ifx\@tempa\@tempb + \xdef\NAT@yrsep{\@tempc}\fi + \def\@tempb{notesep}\ifx\@tempa\@tempb + \xdef\NAT@cmt{\@tempc}\fi + \def\@tempb{citesep}\ifx\@tempa\@tempb + \xdef\NAT@sep{\@tempc}\fi + \fi + }% + \NAT@@setcites + } + \renewcommand\citestyle[1]{% + \ifcsname bibstyle@#1\endcsname% + \csname bibstyle@#1\endcsname\let\bibstyle\@gobble% + \else% + \@latex@error{Undefined `#1' citestyle}% + \fi + }% +\fi +\newcommand{\bibstyle@acmauthoryear}{% + \setcitestyle{% + authoryear,% + open={[},close={]},citesep={;},% + aysep={},yysep={,},% + notesep={, }}} +\newcommand{\bibstyle@acmnumeric}{% + \setcitestyle{% + numbers,sort&compress,% + open={[},close={]},citesep={,},% + notesep={, }}} +\if@ACM@natbib +\citestyle{acmnumeric} +\fi +\if@ACM@journal + \renewcommand\keywordsname{Additional Key Words and Phrases}% +\else + \renewcommand\keywordsname{Keywords}% +\fi +\if@ACM@engage + \renewcommand\abstractname{Synopsis}% +\fi +\ifx\ACM@languages\@empty +\else + \RequirePackage[\ACM@languages]{babel}% + \addto\captionsenglish{% + \if@ACM@journal + \renewcommand\keywordsname{Additional Key Words and Phrases}% + \else + \renewcommand\keywordsname{Keywords}% + \fi + \renewcommand\acksname{Acknowledgements}% + \if@ACM@engage + \renewcommand\abstractname{Synopsis}% + \fi + }% + \addto\captionsfrench{% + \if@ACM@journal + \renewcommand\keywordsname{Mots Clés et Phrases Supplémentaires}% + \else + \renewcommand\keywordsname{Mots clés}% + \fi + \renewcommand\acksname{Remerciements}% + }% + \addto\captionsgerman{% + \if@ACM@journal + \renewcommand\keywordsname{Zusätzliche Schlagwörter und Phrasen}% + \else + \renewcommand\keywordsname{Schlagwörter}% + \fi + \renewcommand\acksname{Danksagungen}% + }% + \addto\captionsspanish{% + \if@ACM@journal + \renewcommand\keywordsname{Palabras y Frases Claves Adicionales}% + \else + \renewcommand\keywordsname{Palabras claves}% + \fi + \renewcommand\acksname{Expresiones de gratitud}% + }% +\fi +\newcommand\ACM@lang@check[1]{% + \ifx\ACM@languages\@empty\relax + \ClassError{\@classname}{% + Command \string#1 \MessageBreak is used in monlingual document}{% + You used a command (\string#1) \MessageBreak + that does not have a meaning \MessageBreak + unless are languages are defined. \MessageBreak + Please choose the languages in \string\documentclass + \MessageBreak + (e.g. \string\documentclass[languages={french, english}]{acmart}), + \MessageBreak + or delete the command.}% + \fi} +\def\@translatedtitle{} +\newcommand\translatedtitle[2]{\ACM@lang@check{\translatedtitle}% +\g@addto@macro\@translatedtitle{\par\foreignlanguage{#1}{#2}}} +\def\@translatedsubtitle{} +\newcommand\translatedsubtitle[2]{\ACM@lang@check{\translatedsubtitle}% +\g@addto@macro\@translatedsubtitle{\par\foreignlanguage{#1}{#2}}} +\def\@translatedkeywords{} +\newcommand\translatedkeywords[2]{\ACM@lang@check{\translatedkeywords}% +\g@addto@macro\@translatedkeywords{\@mktranslatedkeywords{#1}{#2}}} +\def\@translatedabstracts{} +\newenvironment{translatedabstract}[1]{\Collect@Body + \@savetranslatedabstract\@mktranslatedabstract{#1}}{} +\long\def\@savetranslatedabstract#1{\if@ACM@maketitle@typeset + \ClassError{\@classname}{Abstract must be defined before maketitle + command. Please move it!}\fi + \ACM@lang@check{translatedabstract}% + \g@addto@macro\@translatedabstracts{\bgroup#1\egroup}} +\let\@startsection\@startsection@kernel +\let\@sect\@sect@kernel +\let\@ssect\@ssect@kernel +\let\@xsect\@xsect@kernel +\def\@seccntformat#1{\csname the#1\endcsname\quad} +\def\@starttoc#1#2{\begingroup\makeatletter + \setTrue{#1}% + \par\removelastskip\vskip\z@skip + \@startsection{section}\@M\z@{\linespacing\@plus\linespacing}% + {.5\linespacing}{\centering\contentsnamefont}{#2}% +\@starttoc@cfgpoint@before{#1}%NEW<<<<<<<<<< (name will change) + \@input{\jobname.#1}% +\@starttoc@cfgpoint@after{#1}%NEW<<<<<<<<<<<< (name will change) + \if@filesw + \@xp\newwrite\csname tf@#1\endcsname + \immediate\@xp\openout\csname tf@#1\endcsname \jobname.#1\relax + \fi + \global\@nobreakfalse \endgroup + \addvspace{32\p@\@plus14\p@}% +} +\def\l@section{\@tocline{1}{0pt}{1pc}{2pc}{}} +\def\l@subsection{\@tocline{2}{0pt}{1pc}{3pc}{}} +\def\l@subsubsection{\@tocline{3}{0pt}{1pc}{5pc}{}} +\def\@makefntext{\noindent\@makefnmark} +\if@ACM@sigchiamode +\long\def\@footnotetext#1{\marginpar{% + \reset@font\small + \interlinepenalty\interfootnotelinepenalty + \protected@edef\@currentlabel{% + \csname p@footnote\endcsname\@thefnmark + }% + \color@begingroup + \@makefntext{% + \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% + \color@endgroup}}% +\fi +\long\def\@mpfootnotetext#1{% + \global\setbox\@mpfootins\vbox{% + \unvbox\@mpfootins + \reset@font\footnotesize + \hsize\columnwidth + \@parboxrestore + \protected@edef\@currentlabel + {\csname p@mpfootnote\endcsname\@thefnmark}% + \color@begingroup\centering + \@makefntext{% + \rule\z@\footnotesep\ignorespaces#1\@finalstrut\strutbox}% + \color@endgroup}} +\def\@makefnmark{\hbox{\@textsuperscript{\normalfont\@thefnmark}}} +\let\@footnotemark@nolink\@footnotemark +\let\@footnotetext@nolink\@footnotetext +\RequirePackage[bookmarksnumbered,unicode]{hyperref} +\RequirePackage{hyperxmp} +\pdfstringdefDisableCommands{% + \def\addtocounter#1#2{}% + \def\unskip{}% + \def\textbullet{- }% + \def\textrightarrow{ -> }% + \def\footnotemark{}% +} +\urlstyle{rm} +\ifcase\ACM@format@nr +\relax % manuscript +\or % acmsmall +\or % acmlarge +\or % acmtog +\or % sigconf +\or % siggraph +\or % sigplan + \urlstyle{sf} +\or % sigchi +\or % sigchi-a + \urlstyle{sf} +\or % acmengage +\or % acmcp +\fi +\AtEndPreamble{% + \if@ACM@urlbreakonhyphens + \def\do@url@hyp{\do\-}% + \fi + \if@ACM@screen + \hypersetup{colorlinks, + linkcolor=ACMPurple, + citecolor=ACMPurple, + urlcolor=ACMDarkBlue, + filecolor=ACMDarkBlue} + \else + \hypersetup{hidelinks} + \fi + \hypersetup{pdflang={en}, + pdfdisplaydoctitle}} +\if@ACM@natbib + \let\citeN\cite + \let\cite\citep + \let\citeANP\citeauthor + \let\citeNN\citeyearpar + \let\citeyearNP\citeyear + \let\citeNP\citealt + \DeclareRobustCommand\citeA + {\begingroup\NAT@swafalse + \let\NAT@ctype\@ne\NAT@partrue\NAT@fullfalse\NAT@open\NAT@citetp}% + \providecommand\newblock{}% +\else + \AtBeginDocument{% + \let\shortcite\cite% + \providecommand\citename[1]{#1}} +\fi +\newcommand\shortcite[2][]{% + \ifNAT@numbers\cite[#1]{#2}\else\citeyearpar[#1]{#2}\fi} +\def\bibliographystyle#1{% + \ifx\@begindocumenthook\@undefined\else + \expandafter\AtBeginDocument + \fi + {\if@filesw + \immediate\write\@auxout{\string\bibstyle{#1}}% + \fi}} +\RequirePackage{graphicx} +\RequirePackage[prologue]{xcolor} +\definecolor[named]{ACMBlue}{cmyk}{1,0.1,0,0.1} +\definecolor[named]{ACMYellow}{cmyk}{0,0.16,1,0} +\definecolor[named]{ACMOrange}{cmyk}{0,0.42,1,0.01} +\definecolor[named]{ACMRed}{cmyk}{0,0.90,0.86,0} +\definecolor[named]{ACMLightBlue}{cmyk}{0.49,0.01,0,0} +\definecolor[named]{ACMGreen}{cmyk}{0.20,0,1,0.19} +\definecolor[named]{ACMPurple}{cmyk}{0.55,1,0,0.15} +\definecolor[named]{ACMDarkBlue}{cmyk}{1,0.58,0,0.21} +\if@ACM@authordraft + \RequirePackage{draftwatermark} + \SetWatermarkFontSize{0.5in} + \SetWatermarkColor[gray]{.9} + \SetWatermarkText{\parbox{12em}{\centering + Unpublished working draft.\\ + Not for distribution.}} +\else + \if@ACM@sigchiamode + \if@ACM@nonacm\else + \RequirePackage{draftwatermark} + \SetWatermarkFontSize{0.5in} + \SetWatermarkColor[gray]{.9} + \SetWatermarkText{\parbox{12em}{\centering + Legacy document. \\ + Not for publication in an ACM venue}} + \fi + \fi +\fi +\RequirePackage{geometry} +\ifcase\ACM@format@nr +\relax % manuscript + \geometry{letterpaper,head=13pt, + marginparwidth=6pc,heightrounded}% +\or % acmsmall + \geometry{twoside=true, + includeheadfoot, head=13pt, foot=2pc, + paperwidth=6.75in, paperheight=10in, + top=58pt, bottom=44pt, inner=46pt, outer=46pt, + marginparwidth=2pc,heightrounded + }% +\or % acmlarge + \geometry{twoside=true, head=13pt, foot=2pc, + paperwidth=8.5in, paperheight=11in, + includeheadfoot, + top=78pt, bottom=114pt, inner=81pt, outer=81pt, + marginparwidth=4pc,heightrounded + }% +\or % acmtog + \geometry{twoside=true, head=13pt, foot=2pc, + paperwidth=8.5in, paperheight=11in, + includeheadfoot, columnsep=24pt, + top=52pt, bottom=75pt, inner=52pt, outer=52pt, + marginparwidth=2pc,heightrounded + }% +\or % sigconf + \geometry{twoside=true, head=13pt, + paperwidth=8.5in, paperheight=11in, + includeheadfoot, columnsep=2pc, + top=57pt, bottom=73pt, inner=54pt, outer=54pt, + marginparwidth=2pc,heightrounded + }% +\or % siggraph + \geometry{twoside=true, head=13pt, + paperwidth=8.5in, paperheight=11in, + includeheadfoot, columnsep=2pc, + top=57pt, bottom=73pt, inner=54pt, outer=54pt, + marginparwidth=2pc,heightrounded + }% +\or % sigplan + \geometry{twoside=true, head=13pt, + paperwidth=8.5in, paperheight=11in, + includeheadfoot=false, columnsep=2pc, + top=1in, bottom=1in, inner=0.75in, outer=0.75in, + marginparwidth=2pc,heightrounded + }% +\or % sigchi + \geometry{twoside=true, head=13pt, + paperwidth=8.5in, paperheight=11in, + includeheadfoot, columnsep=2pc, + top=66pt, bottom=73pt, inner=54pt, outer=54pt, + marginparwidth=2pc,heightrounded + }% +\or % sigchi-a + \geometry{twoside=false, head=13pt, + paperwidth=11in, paperheight=8.5in, + includeheadfoot, marginparsep=72pt, + marginparwidth=170pt, columnsep=20pt, + top=72pt, bottom=72pt, left=314pt, right=72pt + }% + \@mparswitchfalse + \reversemarginpar +\or % acmengage + \geometry{twoside=true, head=13pt, + paperwidth=8.5in, paperheight=11in, + includeheadfoot, columnsep=2pc, + top=57pt, bottom=73pt, inner=54pt, outer=54pt, + marginparwidth=2pc,heightrounded + }% +\or % acmcp + \geometry{twoside=true, + includeheadfoot, head=13pt, foot=2pc, + paperwidth=6.75in, paperheight=10in, + top=58pt, bottom=44pt, inner=46pt, outer=46pt, + marginparwidth=2pc,heightrounded + }% +\fi +\setlength\parindent{10\p@} +\setlength\parskip{\z@} +\ifcase\ACM@format@nr +\relax % manuscript +\or % acmsmall +\or % acmlarge +\or % acmtog + \setlength\parindent{9\p@}% +\or % sigconf +\or % siggraph +\or % sigplan +\or % sigchi +\or % sigchi-a +\or % acmengage +\or % acmcp +\fi +\setlength\normalparindent{\parindent} +\def\copyrightpermissionfootnoterule{\kern-3\p@ + \hrule \@width \columnwidth \kern 2.6\p@} +\RequirePackage{manyfoot} +\SelectFootnoteRule[2]{copyrightpermission} +\DeclareNewFootnote{authorsaddresses} +\SelectFootnoteRule[2]{copyrightpermission} +\DeclareNewFootnote{copyrightpermission} +\def\footnoterule{\kern-3\p@ + \hrule \@width 4pc \kern 2.6\p@} +\def\endminipage{% + \par + \unskip + \ifvoid\@mpfootins\else + \vskip\skip\@mpfootins + \normalcolor + \unvbox\@mpfootins + \fi + \@minipagefalse + \color@endgroup + \egroup + \expandafter\@iiiparbox\@mpargs{\unvbox\@tempboxa}} +\def\@textbottom{\vskip \z@ \@plus 1pt} +\let\@texttop\relax +\ifcase\ACM@format@nr +\relax % manuscript +\or % acmsmall +\or % acmlarge +\or % acmtog + \flushbottom +\or % sigconf + \flushbottom +\or % siggraph + \flushbottom +\or % sigplan + \flushbottom +\or % sigchi + \flushbottom +\or % sigchi-a +\or % acmengage + \flushbottom +\or % acmcp + \flushbottom +\fi +\ifPDFTeX +\input{glyphtounicode} +\pdfglyphtounicode{f_f}{FB00} +\pdfglyphtounicode{f_f_i}{FB03} +\pdfglyphtounicode{f_f_l}{FB04} +\pdfglyphtounicode{f_i}{FB01} +\pdfglyphtounicode{t_t}{0074 0074} +\pdfglyphtounicode{f_t}{0066 0074} +\pdfglyphtounicode{T_h}{0054 0068} +\pdfgentounicode=1 +\RequirePackage{cmap} +\fi +\newif\if@ACM@newfonts +\@ACM@newfontstrue +\IfFileExists{libertine.sty}{}{\ClassWarning{\@classname}{You do not + have the libertine package installed. Please upgrade your + TeX}\@ACM@newfontsfalse} +\IfFileExists{zi4.sty}{}{\ClassWarning{\@classname}{You do not + have the inconsolata (zi4.sty) package installed. Please upgrade your + TeX}\@ACM@newfontsfalse} +\IfFileExists{newtxmath.sty}{}{\ClassWarning{\@classname}{You do not + have the newtxmath package installed. Please upgrade your + TeX}\@ACM@newfontsfalse} +\if@ACM@newfonts + \RequirePackage[T1]{fontenc} + % Note that the order in which packages are loaded matters, + % and the correct order depends on the LaTeX engine used. + % See https://github.com/borisveytsman/acmart/issues/402 + % and https://github.com/borisveytsman/acmart/issues/410 + \ifxetex + \RequirePackage[libertine]{newtxmath} + \RequirePackage[tt=false]{libertine} + \setmonofont[StylisticSet=3]{inconsolata} + \else + \ifluatex + \RequirePackage[libertine]{newtxmath} + \RequirePackage[tt=false]{libertine} + \setmonofont[StylisticSet=3]{inconsolata} + \else + \RequirePackage[tt=false, type1=true]{libertine} + \RequirePackage[varqu]{zi4} + \RequirePackage[libertine]{newtxmath} + \fi + \fi +\fi +\let\liningnums\@undefined +\AtEndPreamble{% + \DeclareTextFontCommand{\liningnums}{\libertineLF}} +\if@ACM@sigchiamode + \renewcommand{\familydefault}{\sfdefault} +\fi +\newif\if@Description@present +\@Description@presenttrue +\newif\if@undescribed@images +\@undescribed@imagesfalse +\newcommand\Description[2][]{\global\@Description@presenttrue\ignorespaces} +\AtEndDocument{\if@undescribed@images + \ClassWarningNoLine{\@classname}{Some images may lack descriptions}\fi} +\AtBeginEnvironment{figure}{\@Description@presentfalse + \let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig} +\AtBeginEnvironment{figure*}{\@Description@presentfalse + \let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig} +\AtEndEnvironment{figure}{\if@Description@present\else + \global\@undescribed@imagestrue + \ClassWarning{\@classname}{A possible image without description}\fi} +\AtEndEnvironment{figure*}{\if@Description@present\else + \global\@undescribed@imagestrue + \ClassWarning{\@classname}{A possible image without description}\fi} +\AtBeginEnvironment{table}{\let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig} +\AtBeginEnvironment{table*}{\let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig} +\AtBeginEnvironment{algorithm}{\let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig} +\AtBeginEnvironment{algorithm*}{\let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig} +\AtBeginEnvironment{lstlisting}{\let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig} +\AtBeginEnvironment{lstlisting*}{\let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig} +\AtBeginEnvironment{minted}{\let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig} +\AtBeginEnvironment{minted*}{\let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig} +\AtBeginEnvironment{listing}{\let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig} +\AtBeginEnvironment{listing*}{\let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig} + +\RequirePackage{caption, float} +\captionsetup[table]{position=top} +\if@ACM@journal + \captionsetup{labelfont={sf, small}, + textfont={sf, small}, margin=\z@} + \captionsetup[figure]{name={Fig.}} +\else + \captionsetup{labelfont={bf}, + textfont={bf}, labelsep=colon, margin=\z@} + \ifcase\ACM@format@nr + \relax % manuscript + \or % acmsmall + \or % acmlarge + \or % acmtog + \or % sigconf + \or % siggraph + \captionsetup{textfont={it}} + \or % sigplan + \captionsetup{labelfont={bf}, + textfont={normalfont}, labelsep=period, margin=\z@} + \or % sigchi + \captionsetup[figure]{labelfont={bf, small}, + textfont={bf, small}} + \captionsetup[table]{labelfont={bf, small}, + textfont={bf, small}} + \or % sigchi-a + \captionsetup[figure]{labelfont={bf, small}, + textfont={bf, small}} + \captionsetup[table]{labelfont={bf, small}, + textfont={bf, small}} + \or % acmengage + \or % acmcp + \fi +\fi +\newfloat{sidebar}{}{sbar} +\floatname{sidebar}{Sidebar} +\renewenvironment{sidebar}{\Collect@Body\@sidebar}{} +\long\def\@sidebar#1{\bgroup\let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig\captionsetup{type=sidebar}% + \marginpar{\small#1}\egroup} +\newenvironment{marginfigure}{\Collect@Body\@marginfigure}{} +\long\def\@marginfigure#1{\bgroup + \let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig + \captionsetup{type=figure}% + \marginpar{\@Description@presentfalse\centering + \small#1\if@Description@present\else + \global\@undescribed@imagestrue + \ClassWarning{\@classname}{A possible image without description} + \fi}% + \egroup} +\newenvironment{margintable}{\Collect@Body\@margintable}{} +\long\def\@margintable#1{\bgroup\let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig\captionsetup{type=table}% + \marginpar{\centering\small#1}\egroup} +\newdimen\fulltextwidth +\fulltextwidth=\dimexpr(\textwidth+\marginparwidth+\marginparsep) +\if@ACM@sigchiamode +\def\@dblfloat{\bgroup\let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig\columnwidth=\fulltextwidth + \let\@endfloatbox\@endwidefloatbox + \def\@fpsadddefault{\def\@fps{tp}}% + \@float} +\fi +\if@ACM@sigchiamode +\def\end@dblfloat{% + \end@float\egroup} +\fi +\def\@endwidefloatbox{% + \par\vskip\z@skip + \@minipagefalse + \outer@nobreak + \egroup + \color@endbox + \global\setbox\@currbox=\vbox{\moveleft + \dimexpr(\fulltextwidth-\textwidth)\box\@currbox}% + \wd\@currbox=\textwidth +} +\ifcase\ACM@format@nr +\relax % manuscript +\or % acmsmall +\or % acmlarge +\or % acmtog +\or % sigconf +\or % siggraph +\or % sigplan +\def\labelenumi{\theenumi.} +\def\labelenumii{\theenumii.} +\def\labelenumiii{\theenumiii.} +\def\labelenumiv{\theenumiv.} +\or % sigchi +\or % sigchi-a +\or % acmengage +\or % acmcp +\fi +\newdimen\@ACM@labelwidth +\AtBeginDocument{% + \setlength\labelsep{4pt} + \setlength{\@ACM@labelwidth}{6.5pt} + + %% First-level list: when beginning after the first line of an + %% indented paragraph or ending before an indented paragraph, labels + %% should not hang to the left of the preceding/following text. + \setlength\leftmargini{\z@} + \addtolength\leftmargini{\parindent} + \addtolength\leftmargini{2\labelsep} + \addtolength\leftmargini{\@ACM@labelwidth} + + %% Second-level and higher lists. + \setlength\leftmarginii{\z@} + \addtolength\leftmarginii{0.5\labelsep} + \addtolength\leftmarginii{\@ACM@labelwidth} + \setlength\leftmarginiii{\leftmarginii} + \setlength\leftmarginiv{\leftmarginiii} + \setlength\leftmarginv{\leftmarginiv} + \setlength\leftmarginvi{\leftmarginv} + \@listi} +\newskip\listisep +\listisep\smallskipamount +\def\@listI{\leftmargin\leftmargini + \labelwidth\leftmargini \advance\labelwidth-\labelsep + \listparindent\z@ + \topsep\listisep} +\let\@listi\@listI +\def\@listii{\leftmargin\leftmarginii + \labelwidth\leftmarginii \advance\labelwidth-\labelsep + \topsep\z@skip} +\def\@listiii{\leftmargin\leftmarginiii + \labelwidth\leftmarginiii \advance\labelwidth-\labelsep} +\def\@listiv{\leftmargin\leftmarginiv + \labelwidth\leftmarginiv \advance\labelwidth-\labelsep} +\def\@listv{\leftmargin\leftmarginv + \labelwidth\leftmarginv \advance\labelwidth-\labelsep} +\def\@listvi{\leftmargin\leftmarginvi + \labelwidth\leftmarginvi \advance\labelwidth-\labelsep} +\renewcommand{\descriptionlabel}[1]{\upshape\bfseries #1} +\renewenvironment{description}{\list{}{% + \labelwidth\@ACM@labelwidth + \let\makelabel\descriptionlabel}% +}{ + \endlist +} +\let\enddescription=\endlist % for efficiency +\newif\if@ACM@maketitle@typeset +\@ACM@maketitle@typesetfalse +\define@choicekey*+{ACM}{acmJournal}[\@journalCode\@journalCode@nr]{% + ACMJCSS,% + CIE,% + CSUR,% + DGOV,% + DLT,% + DTRAP,% + FAC,% + GAMES,% + HEALTH,% + IMWUT,% + JACM,% + JATS,% + JDIQ,% + JDS,% + JEA,% + JERIC,% + JETC,% + JOCCH,% + JRC,% + PACMCGIT,% + PACMHCI,% + PACMMOD,% + PACMNET,% + PACMPL,% + PACMSE,% + POMACS,% + TAAS,% + TACCESS,% + TACO,% + TALG,% + TALLIP,% + TAP,% + TCPS,% + TDS,% + TEAC,% + TECS,% + TELO,% + THRI,% + TIIS,% + TIOT,% + TISSEC,% + TIST,% + TKDD,% + TMIS,% + TOCE,% + TOCHI,% + TOCL,% + TOCS,% + TOCT,% + TODAES,% + TODS,% + TOG,% + TOIS,% + TOIT,% + TOMACS,% + TOMM,% + TOMPECS,% + TOMS,% + TOPC,% + TOPLAS,% + TOPML,% + TOPS,% + TORS,% + TOS,% + TOSEM,% + TOSN,% + TQC,% + TRETS,% + TSAS,% + TSC,% + TSLP,% + TWEB,% + FACMP% +}{% +\ifcase\@journalCode@nr +\relax % ACMJCSS + \def\@journalName{ACM Journal on Computing and Sustainable Societies}% + \def\@journalNameShort{ACM J. Comput. Sustain. Soc.}% + \def\@permissionCodeOne{2834-5533}% + \def\@permissionCodeTwo{2834-5533}% +\or % CIE + \def\@journalName{ACM Computers in Entertainment}% + \def\@journalNameShort{ACM Comput. Entertain.}% + \def\@permissionCodeOne{1544-3574}% +\or % CSUR + \def\@journalName{ACM Computing Surveys}% + \def\@journalNameShort{ACM Comput. Surv.}% + \def\@permissionCodeOne{0360-0300}% + \def\@permissionCodeTwo{1557-7341}% +\or % DGOV + \def\@journalName{Digital Government: Research and Practice}% + \def\@journalNameShort{Digit. Gov. Res. Pract.}% + \def\@permissionCodeOne{2639-0175}% + \def\@permissionCodeTwo{2639-0175}% +\or % DLT + \def\@journalName{Distributed Ledger Technologies: Research and Practice}% + \def\@journalNameShort{Distrib. Ledger Technol.}% + \def\@permissionCodeOne{2769-6472}% + \def\@permissionCodeTwo{2769-6480}% +\or % DTRAP + \def\@journalName{Digital Threats: Research and Practice}% + \def\@journalNameShort{Digit. Threat. Res. Pract.}% + \def\@permissionCodeOne{2576-5337}% + \def\@permissionCodeTwo{2576-5337}% +\or % FAC + \def\@journalName{Formal Aspects of Computing}% + \def\@journalNameShort{Form. Asp. Comput.}% + \def\@permissionCodeOne{0934-5043}% + \def\@permissionCodeTwo{1433-299X}% +\or % GAMES + \def\@journalName{ACM Games: Research and Practice}% + \def\@journalNameShort{ACM Games}% + \def\@permissionCodeOne{2832-5516}% + \def\@permissionCodeTwo{2832-5516}% +\or % HEALTH + \def\@journalName{ACM Transactions on Computing for Healthcare}% + \def\@journalNameShort{ACM Trans. Comput. Healthcare}% + \def\@permissionCodeOne{2637-8051}% + \def\@permissionCodeTwo{2637-8051}% +\or % IMWUT + \def\@journalName{Proceedings of the ACM on Interactive, Mobile, + Wearable and Ubiquitous Technologies}% + \def\@journalNameShort{Proc. ACM Interact. Mob. Wearable Ubiquitous Technol.}% + \def\@permissionCodeOne{2474-9567}% + \def\@permissionCodeTwo{2474-9567}% + \@ACM@screentrue + \PackageInfo{\@classname}{Using screen mode due to \@journalCode}% +\or % JACM + \def\@journalName{Journal of the ACM}% + \def\@journalNameShort{J. ACM}% + \def\@permissionCodeOne{0004-5411}% + \def\@permissionCodeTwo{1557-735X}% +\or % JATS + \def\@journalName{Journal on Autonomous Transportation Systems}% + \def\@journalNameShort{ACM J. Auton. Transport. Syst.}% + \def\@permissionCodeOne{2833-0528}% + \def\@permissionCodeTwo{2833-0528}% +\or % JDIQ + \def\@journalName{ACM Journal of Data and Information Quality}% + \def\@journalNameShort{ACM J. Data Inform. Quality}% + \def\@permissionCodeOne{1936-1955}% + \def\@permissionCodeTwo{1936-1963}% +\or % JDS + \def\@journalName{ACM/IMS Journal of Data Science}% + \def\@journalNameShort{ACM/IMS J. Data Sci.}% + \def\@permissionCodeOne{2831-3194}% + \def\@permissionCodeTwo{2831-3194}% +\or % JEA + \def\@journalName{ACM Journal of Experimental Algorithmics}% + \def\@journalNameShort{ACM J. Exp. Algor.}% + \def\@permissionCodeOne{1084-6654}% + \def\@permissionCodeTwo{1084-6654}% +\or % JERIC + \def\@journalName{ACM Journal of Educational Resources in Computing}% + \def\@journalNameShort{ACM J. Edu. Resources in Comput.}% + \def\@permissionCodeOne{1073-0516}% +\or % JETC + \def\@journalName{ACM Journal on Emerging Technologies in Computing Systems}% + \def\@journalNameShort{ACM J. Emerg. Technol. Comput. Syst.}% + \def\@permissionCodeOne{1550-4832}% + \def\@permissionCodeTwo{1550-4840}% +\or % JOCCH + \def\@journalName{ACM Journal on Computing and Cultural Heritage}% + \def\@journalNameShort{ACM J. Comput. Cult. Herit.}% + \def\@permissionCodeOne{1556-4673}% + \def\@permissionCodeTwo{1556-4711}% +\or % JRC + \def\@journalName{ACM Journal on Responsible Computing}% + \def\@journalNameShort{ACM J. Responsib. Comput.}% + \def\@permissionCodeOne{2832-0565}% + \def\@permissionCodeTwo{2832-0565}% +\or % PACMCGIT + \def\@journalName{Proceedings of the ACM on Computer Graphics and Interactive Techniques}% + \def\@journalNameShort{Proc. ACM Comput. Graph. Interact. Tech.}% + \def\@permissionCodeOne{2577-6193}% + \def\@permissionCodeTwo{2577-6193}% + \@ACM@screentrue + \PackageInfo{\@classname}{Using screen mode due to \@journalCode}% +\or % PACMHCI + \def\@journalName{Proceedings of the ACM on Human-Computer Interaction}% + \def\@journalNameShort{Proc. ACM Hum.-Comput. Interact.}% + \def\@permissionCodeOne{2573-0142}% + \def\@permissionCodeTwo{2573-0142}% + \@ACM@screentrue + \PackageInfo{\@classname}{Using screen mode due to \@journalCode}% +\or % PACMMOD + \def\@journalName{Proceedings of the ACM on Management of Data}% + \def\@journalNameShort{Proc. ACM Manag. Data}% + \def\@permissionCodeOne{2836-6573}% + \def\@permissionCodeTwo{2836-6573}% +\or % PACMNET + \def\@journalName{Proceedings of the ACM on Networkng}% + \def\@journalNameShort{Proc. ACM Netw.}% + \def\@permissionCodeOne{2834-5509}% + \def\@permissionCodeTwo{2834-5509}% +\or % PACMPL + \def\@journalName{Proceedings of the ACM on Programming Languages}% + \def\@journalNameShort{Proc. ACM Program. Lang.}% + \def\@permissionCodeOne{2475-1421}% + \def\@permissionCodeTwo{2475-1421}% + \@ACM@screentrue + \PackageInfo{\@classname}{Using screen mode due to \@journalCode}% +\or % PACMSE + \def\@journalName{Proceedings of the ACM on Software Engineering}% + \def\@journalNameShort{Proc. ACM Softw. Eng.}% + \def\@permissionCodeOne{2994-970X}% + \def\@permissionCodeTwo{2994-970X}% + \@ACM@screentrue + \PackageInfo{\@classname}{Using screen mode due to \@journalCode}% +\or % POMACS + \def\@journalName{Proceedings of the ACM on Measurement and Analysis of Computing Systems}% + \def\@journalNameShort{Proc. ACM Meas. Anal. Comput. Syst.}% + \def\@permissionCodeOne{2476-1249}% + \def\@permissionCodeTwo{2476-1249}% + \@ACM@screentrue + \PackageInfo{\@classname}{Using screen mode due to \@journalCode}% +\or % TAAS + \def\@journalName{ACM Transactions on Autonomous and Adaptive Systems}% + \def\@journalNameShort{ACM Trans. Autonom. Adapt. Syst.}% + \def\@permissionCodeOne{1556-4665}% + \def\@permissionCodeTwo{1556-4703}% +\or % TACCESS + \def\@journalName{ACM Transactions on Accessible Computing}% + \def\@journalNameShort{ACM Trans. Access. Comput.}% + \def\@permissionCodeOne{1936-7228}% + \def\@permissionCodeTwo{1936-7236}% +\or % TACO + \def\@journalName{ACM Transactions on Architecture and Code Optimization}% + \def\@journalNameShort{ACM Trans. Arch. Code Optim.}% + \def\@permissionCodeOne{1544-3566}% + \def\@permissionCodeTwo{1544-3973}% +\or % TALG + \def\@journalName{ACM Transactions on Algorithms}% + \def\@journalNameShort{ACM Trans. Algor.}% + \def\@permissionCodeOne{1549-6325}% + \def\@permissionCodeTwo{1549-6333}% +\or % TALLIP + \def\@journalName{ACM Transactions on Asian and Low-Resource Language Information Processing}% + \def\@journalNameShort{ACM Trans. Asian Low-Resour. Lang. Inf. Process.}% + \def\@permissionCodeOne{2375-4699}% + \def\@permissionCodeTwo{2375-4702}% +\or % TAP + \def\@journalName{ACM Transactions on Applied Perception}% + \def\@journalNameShort{ACM Trans. Appl. Percept.}% + \def\@permissionCodeOne{1544-3558}% + \def\@permissionCodeTwo{1544-3965}% +\or % TCPS + \def\@journalName{ACM Transactions on Cyber-Physical Systems}% + \def\@journalNameShort{ACM Trans. Cyber-Phys. Syst.}% + \def\@permissionCodeOne{2378-962X}% + \def\@permissionCodeTwo{2378-9638}% +\or % TDS + \def\@journalName{ACM/IMS Transactions on Data Science}% + \def\@journalNameShort{ACM/IMS Trans. Data Sci.}% + \def\@permissionCodeOne{2577-3224}% +\or % TEAC + \def\@journalName{ACM Transactions on Economics and Computation}% + \def\@journalNameShort{ACM Trans. Econ. Comput.}% + \def\@permissionCodeOne{2167-8375}% + \def\@permissionCodeTwo{2167-8383}% +\or % TECS + \def\@journalName{ACM Transactions on Embedded Computing Systems}% + \def\@journalNameShort{ACM Trans. Embedd. Comput. Syst.}% + \def\@permissionCodeOne{1539-9087}% + \def\@permissionCodeTwo{1558-3465}% +\or % TELO + \def\@journalName{ACM Transactions on Evolutionary Learning and Optimization}% + \def\@journalNameShort{ACM Trans. Evol. Learn. Optim.}% + \def\@permissionCodeOne{2688-299X}% + \def\@permissionCodeTwo{2688-3007}% +\or % THRI + \def\@journalName{ACM Transactions on Human-Robot Interaction}% + \def\@journalNameShort{ACM Trans. Hum.-Robot Interact.}% + \def\@permissionCodeOne{2573-9522}% + \def\@permissionCodeTwo{2573-9522}% +\or % TIIS + \def\@journalName{ACM Transactions on Interactive Intelligent Systems}% + \def\@journalNameShort{ACM Trans. Interact. Intell. Syst.}% + \def\@permissionCodeOne{2160-6455}% + \def\@permissionCodeTwo{2160-6463}% +\or % TIOT + \def\@journalName{ACM Transactions on Internet of Things}% + \def\@journalNameShort{ACM Trans. Internet Things}% + \def\@permissionCodeOne{2577-6207}% + \def\@permissionCodeTwo{2577-6207}% +\or % TISSEC + \def\@journalName{ACM Transactions on Information and System Security}% + \def\@journalNameShort{ACM Trans. Info. Syst. Sec.}% + \def\@permissionCodeOne{1094-9224}% +\or % TIST + \def\@journalName{ACM Transactions on Intelligent Systems and Technology}% + \def\@journalNameShort{ACM Trans. Intell. Syst. Technol.}% + \def\@permissionCodeOne{2157-6904}% + \def\@permissionCodeTwo{2157-6912}% +\or % TKDD + \def\@journalName{ACM Transactions on Knowledge Discovery from Data}% + \def\@journalNameShort{ACM Trans. Knowl. Discov. Data.}% + \def\@permissionCodeOne{1556-4681}% + \def\@permissionCodeTwo{1556-472X}% +\or % TMIS + \def\@journalName{ACM Transactions on Management Information Systems}% + \def\@journalNameShort{ACM Trans. Manag. Inform. Syst.}% + \def\@permissionCodeOne{2158-656X}% + \def\@permissionCodeTwo{2158-6578}% +\or % TOCE + \def\@journalName{ACM Transactions on Computing Education}% + \def\@journalNameShort{ACM Trans. Comput. Educ.}% + \def\@permissionCodeOne{1946-6226}% + \def\@permissionCodeTwo{1946-6226}% +\or % TOCHI + \def\@journalName{ACM Transactions on Computer-Human Interaction}% + \def\@journalNameShort{ACM Trans. Comput.-Hum. Interact.}% + \def\@permissionCodeOne{1073-0516}% + \def\@permissionCodeTwo{1557-7325}% +\or % TOCL + \def\@journalName{ACM Transactions on Computational Logic}% + \def\@journalNameShort{ACM Trans. Comput. Logic}% + \def\@permissionCodeOne{1529-3785}% + \def\@permissionCodeTwo{1557-945X}% +\or % TOCS + \def\@journalName{ACM Transactions on Computer Systems}% + \def\@journalNameShort{ACM Trans. Comput. Syst.}% + \def\@permissionCodeOne{0734-2071}% + \def\@permissionCodeTwo{1557-7333}% +\or % TOCT + \def\@journalName{ACM Transactions on Computation Theory}% + \def\@journalNameShort{ACM Trans. Comput. Theory}% + \def\@permissionCodeOne{1942-3454}% + \def\@permissionCodeTwo{1942-3462}% +\or % TODAES + \def\@journalName{ACM Transactions on Design Automation of Electronic Systems}% + \def\@journalNameShort{ACM Trans. Des. Autom. Electron. Syst.}% + \def\@permissionCodeOne{1084-4309}% + \def\@permissionCodeTwo{1557-7309}% +\or % TODS + \def\@journalName{ACM Transactions on Database Systems}% + \def\@journalNameShort{ACM Trans. Datab. Syst.}% + \def\@permissionCodeOne{0362-5915}% + \def\@permissionCodeTwo{1557-4644}% +\or % TOG + \def\@journalName{ACM Transactions on Graphics}% + \def\@journalNameShort{ACM Trans. Graph.}% + \def\@permissionCodeOne{0730-0301}% + \def\@permissionCodeTwo{1557-7368}% +\or % TOIS + \def\@journalName{ACM Transactions on Information Systems}% + \def\@journalNameShort{ACM Trans. Inf. Syst.}% + \def\@permissionCodeOne{1046-8188}% + \def\@permissionCodeTwo{1558-2868}% +\or % TOIT + \def\@journalName{ACM Transactions on Internet Technology}% + \def\@journalNameShort{ACM Trans. Internet Technol.}% + \def\@permissionCodeOne{1533-5399}% + \def\@permissionCodeTwo{1557-6051}% +\or % TOMACS + \def\@journalName{ACM Transactions on Modeling and Computer Simulation}% + \def\@journalNameShort{ACM Trans. Model. Comput. Simul.}% + \def\@permissionCodeOne{1049-3301}% + \def\@permissionCodeTwo{1558-1195}% +\or % TOMM + \def\@journalName{ACM Transactions on Multimedia Computing, Communications and Applications}% + \def\@journalNameShort{ACM Trans. Multimedia Comput. Commun. Appl.}% + \def\@permissionCodeOne{1551-6857}% + \def\@permissionCodeTwo{1551-6865}% +\or % TOMPECS + \def\@journalName{ACM Transactions on Modeling and Performance Evaluation of Computing Systems}% + \def\@journalNameShort{ACM Trans. Model. Perform. Eval. Comput. Syst.}% + \def\@permissionCodeOne{2376-3639}% + \def\@permissionCodeTwo{2376-3647}% +\or % TOMS + \def\@journalName{ACM Transactions on Mathematical Software}% + \def\@journalNameShort{ACM Trans. Math. Softw.}% + \def\@permissionCodeOne{0098-3500}% + \def\@permissionCodeTwo{1557-7295}% +\or % TOPC + \def\@journalName{ACM Transactions on Parallel Computing}% + \def\@journalNameShort{ACM Trans. Parallel Comput.}% + \def\@permissionCodeOne{2329-4949}% + \def\@permissionCodeTwo{2329-4957}% +\or % TOPLAS + \def\@journalName{ACM Transactions on Programming Languages and Systems}% + \def\@journalNameShort{ACM Trans. Program. Lang. Syst.}% + \def\@permissionCodeOne{0164-0925}% + \def\@permissionCodeTwo{1558-4593}% +\or % TOPML + \def\@journalName{ACM Transactions on Probabilistic Machine Learning}% + \def\@journalNameShort{ACM Trans. Probab. Mach. Learn.}% + \def\@permissionCodeOne{2836-8924}% + \def\@permissionCodeTwo{2836-8924}% +\or % TOPS + \def\@journalName{ACM Transactions on Privacy and Security}% + \def\@journalNameShort{ACM Trans. Priv. Sec.}% + \def\@permissionCodeOne{2471-2566}% + \def\@permissionCodeTwo{2471-2574}% +\or % TORS + \def\@journalName{ACM Transactions on Recommender Systems}% + \def\@journalNameShort{ACM Trans. Recomm. Syst.}% + \def\@permissionCodeOne{2770-6699}% + \def\@permissionCodeTwo{2770-6699}% +\or % TOS + \def\@journalName{ACM Transactions on Storage}% + \def\@journalNameShort{ACM Trans. Storage}% + \def\@permissionCodeOne{1553-3077}% + \def\@permissionCodeTwo{1553-3093}% +\or % TOSEM + \def\@journalName{ACM Transactions on Software Engineering and Methodology}% + \def\@journalNameShort{ACM Trans. Softw. Eng. Methodol.}% + \def\@permissionCodeOne{1049-331X}% + \def\@permissionCodeTwo{1557-7392}% +\or % TOSN + \def\@journalName{ACM Transactions on Sensor Networks}% + \def\@journalNameShort{ACM Trans. Sensor Netw.}% + \def\@permissionCodeOne{1550-4859}% + \def\@permissionCodeTwo{1550-4867}% +\or % TQC + \def\@journalName{ACM Transactions on Quantum Computing}% + \def\@journalNameShort{ACM Trans. Quantum Comput.}% + \def\@permissionCodeOne{2643-6817}% + \def\@permissionCodeTwo{2643-6817}% +\or % TRETS + \def\@journalName{ACM Transactions on Reconfigurable Technology and Systems}% + \def\@journalNameShort{ACM Trans. Reconfig. Technol. Syst.}% + \def\@permissionCodeOne{1936-7406}% + \def\@permissionCodeTwo{1936-7414}% +\or % TSAS + \def\@journalName{ACM Transactions on Spatial Algorithms and Systems}% + \def\@journalNameShort{ACM Trans. Spatial Algorithms Syst.}% + \def\@permissionCodeOne{2374-0353}% + \def\@permissionCodeTwo{2374-0361}% +\or % TSC + \def\@journalName{ACM Transactions on Social Computing}% + \def\@journalNameShort{ACM Trans. Soc. Comput.}% + \def\@permissionCodeOne{2469-7818}% + \def\@permissionCodeTwo{2469-7826}% +\or % TSLP + \def\@journalName{ACM Transactions on Speech and Language Processing}% + \def\@journalNameShort{ACM Trans. Speech Lang. Process.}% + \def\@permissionCodeOne{1550-4875}% + \def\@permissionCodeTwo{2329-9304}% +\or % TWEB + \def\@journalName{ACM Transactions on the Web}% + \def\@journalNameShort{ACM Trans. Web}% + \def\@permissionCodeOne{1559-1131}% + \def\@permissionCodeTwo{1559-114X}% +\else % FACMP, a dummy journal + \def\@journalName{ACM Just Accepted}% + \def\@journalNameShort{ACM Accepted}% + \def\@permissionCodeOne{XXXX-XXXX}% +\fi +\ClassInfo{\@classname}{Using journal code \@journalCode}% +}{% + \ClassError{\@classname}{Incorrect journal #1}% +}% +\def\acmJournal#1{\setkeys{ACM}{acmJournal=#1}% + \global\@ACM@journal@bibstriptrue + \global\@ACM@journal@bibstrip@or@togtrue} +\def\@journalCode@nr{0} +\def\@journalName{}% +\def\@journalNameShort{\@journalName}% +\def\@permissionCodeOne{XXXX-XXXX}% +\def\@permissionCodeTwo{\@permissionCodeOne}% +\newcommand\acmConference[4][]{% + \gdef\acmConference@shortname{#1}% + \gdef\acmConference@name{#2}% + \gdef\acmConference@date{#3}% + \gdef\acmConference@venue{#4}% + \ifx\acmConference@shortname\@empty + \gdef\acmConference@shortname{#2}% + \fi + \global\@ACM@journal@bibstripfalse + \ifx\@acmBooktitle\@empty\relax + \acmBooktitle{Proceedings of \acmConference@name + \ifx\acmConference@name\acmConference@shortname\else + \ (\acmConference@shortname)\fi}% + \fi +} +\if@ACM@journal\else +\acmConference[Conference'17]{ACM Conference}{July 2017}{Washington, + DC, USA}% +\fi +\def\acmBooktitle#1{\gdef\@acmBooktitle{#1}} +\acmBooktitle{} +\def\@editorsAbbrev{(Ed.)} +\def\@acmEditors{} +\def\editor#1{\ifx\@acmEditors\@empty + \gdef\@acmEditors{#1}% + \else + \gdef\@editorsAbbrev{(Eds.)}% + \g@addto@macro\@acmEditors{\and#1}% +\fi} +\def\subtitle#1{\def\@subtitle{#1}} +\subtitle{} +\newcount\num@authorgroups +\num@authorgroups=0\relax +\newcount\num@authors +\num@authors=0\relax +\newif\if@insideauthorgroup +\@insideauthorgroupfalse +\renewcommand\author[2][]{% + \IfSubStr{\detokenize{#2}}{,}{\ClassWarning{\@classname}{Do not put several + authors in the same \string\author\space macro!}}{}% + \global\advance\num@authors by 1\relax + \if@insideauthorgroup\else + \global\advance\num@authorgroups by 1\relax + \global\@insideauthorgrouptrue + \fi + \ifx\addresses\@empty + \if@ACM@anonymous + \gdef\addresses{\@author{Anonymous Author(s)% + \ifx\@acmSubmissionID\@empty\else\\Submission Id: + \@acmSubmissionID\fi}}% + \gdef\authors{Anonymous Author(s)}% + \else + \expandafter\gdef\expandafter\addresses\expandafter{% + \expandafter\@author\expandafter{% + \csname typeset@author\the\num@authors\endcsname{#2}}}% + \gdef\authors{#2}% + \fi + \else + \if@ACM@anonymous\else + \expandafter\g@addto@macro\expandafter\addresses\expandafter{% + \expandafter\and\expandafter\@author\expandafter{% + \csname typeset@author\the\num@authors\endcsname{#2}}}% + \g@addto@macro\authors{\and#2}% + \fi + \fi + \if@ACM@anonymous + \ifx\shortauthors\@empty + \gdef\shortauthors{Anon. + \ifx\@acmSubmissionID\@empty\else Submission Id: + \@acmSubmissionID\fi}% + \fi + \else + \def\@tempa{#1}% + \ifx\@tempa\@empty + \ifx\shortauthors\@empty + \gdef\shortauthors{#2}% + \else + \g@addto@macro\shortauthors{\and#2}% + \fi + \else + \ifx\shortauthors\@empty + \gdef\shortauthors{#1}% + \else + \g@addto@macro\shortauthors{\and#1}% + \fi + \fi + \fi} +\newcommand{\affiliation}[2][]{% + \global\@insideauthorgroupfalse + \if@ACM@anonymous\else + \g@addto@macro\addresses{\affiliation{#1}{#2}}% + \fi} +\define@boolkey+{@ACM@affiliation@}[@ACM@affiliation@]{obeypunctuation}% +[true]{}{\ClassError{\@classname}{The option obeypunctuation can be either true or false}} +\def\additionalaffiliation#1{\authornote{\@additionalaffiliation{#1}}} +\def\@additionalaffiliation#1{\bgroup + \def\position##1{\ignorespaces}% + \def\institution##1{##1\ignorespaces}% + \def\department{\@ifnextchar[{\@department}{\@department[]}}% + \def\@department[##1]##2{\unskip, ##2\ignorespaces}% + \let\city\position + \let\state\position + \let\country\position + Also with #1\unskip.\egroup} +\renewcommand{\email}[2][]{% + \IfSubStr{#2}{,}{\ClassWarning{\@classname}{Do not put several + addresses in the same \string\email\space macro!}}{}% + \if@ACM@anonymous\else + \g@addto@macro\addresses{\email{#1}{#2}}% + \fi} +\def\orcid#1{\unskip\ignorespaces% + \IfBeginWith{#1}{http}{% + \expandafter\gdef\csname + typeset@author\the\num@authors\endcsname##1{% + \href{#1}{##1}}}{% + \expandafter\gdef\csname + typeset@author\the\num@authors\endcsname##1{% + \href{https://orcid.org/#1}{##1}}}} +\def\authorsaddresses#1{\def\@authorsaddresses{#1}} +\authorsaddresses{\@mkauthorsaddresses} +\newcommand\@mktranslatedkeywords[2]{\bgroup + \selectlanguage{#1}% + {\@specialsection{\keywordsname}% + \noindent#2\par}\egroup} +\def\@titlenotes{} +\def\titlenote#1{% + \g@addto@macro\@title{\footnotemark}% + \if@ACM@anonymous + \g@addto@macro\@titlenotes{% + \stepcounter{footnote}\footnotetext{Title note}}% + \else + \g@addto@macro\@titlenotes{\stepcounter{footnote}\footnotetext{#1}}% + \fi} +\def\@subtitlenotes{} +\def\subtitlenote#1{% + \g@addto@macro\@subtitle{\footnotemark}% + \if@ACM@anonymous + \g@addto@macro\@subtitlenotes{% + \stepcounter{footnote}\footnotetext{Subtitle note}}% + \else + \g@addto@macro\@subtitlenotes{% + \stepcounter{footnote}\footnotetext{#1}}% + \fi} +\def\@authornotes{} +\def\authornote#1{% + \if@ACM@anonymous\else + \g@addto@macro\addresses{\@authornotemark}% + \g@addto@macro\@authornotes{% + \stepcounter{footnote}\footnotetext{#1}}% + \fi} +\newcommand\authornotemark[1][\relax]{% + \ifx#1\relax\relax\relax + \g@addto@macro\addresses{\@authornotemark}% + \else + \g@addto@macro\addresses{\@@authornotemark{#1}}% + \fi} +\def\acmVolume#1{\def\@acmVolume{#1}} +\acmVolume{1} +\def\acmNumber#1{\def\@acmNumber{#1}} +\acmNumber{1} +\def\acmArticle#1{\def\@acmArticle{#1}} +\acmArticle{} +\def\acmArticleSeq#1{\def\@acmArticleSeq{#1}} +\acmArticleSeq{\@acmArticle} +\def\acmYear#1{\def\@acmYear{#1}} +\acmYear{\the\year} +\def\acmMonth#1{\def\@acmMonth{#1}} +\acmMonth{\the\month} +\def\@acmPubDate{\ifcase\@acmMonth\or + January\or February\or March\or April\or May\or June\or + July\or August\or September\or October\or November\or + December\fi~\@acmYear} +\def\acmPrice#1{\ClassWarning{\@classname}{The macro \string\acmPrice + is obsolete. ACM no longer prints the price in bibstrip.}} +\def\acmSubmissionID#1{\def\@acmSubmissionID{#1}} +\acmSubmissionID{} +\def\acmISBN#1{\def\@acmISBN{#1}} +\acmISBN{978-x-xxxx-xxxx-x/YY/MM} +\def\acmDOI#1{\def\@acmDOI{#1}} +\acmDOI{10.1145/nnnnnnn.nnnnnnn} +\newlength\@ACM@badge@width +\setlength\@ACM@badge@width{3pc} +\newlength\@ACM@title@width +\newlength\@ACM@badge@skip +\setlength\@ACM@badge@skip{1pt} +\def\@acmBadgeR{} +\def\@acmBadgeL{} +\newcommand\acmBadgeR[2][]{% + \ifx\@acmBadgeR\@empty + \gdef\@acmBadgeR{% + \smash{% + \raisebox{0.5\height}{% + \href{#1}{\includegraphics[width=\@ACM@badge@width]{#2}}}}}% + \else + \g@addto@macro{\@acmBadgeR}{% + \hspace{\@ACM@badge@skip}% + \smash{% + \raisebox{0.5\height}{% + \href{#1}{\includegraphics[width=\@ACM@badge@width]{#2}}}}}% + \fi} +\newcommand\acmBadgeL[2][]{% + \ifx\@acmBadgeL\@empty + \gdef\@acmBadgeL{% + \smash{% + \raisebox{0.5\height}{% + \href{#1}{\includegraphics[width=\@ACM@badge@width]{#2}}}}}% + \else + \g@addto@macro{\@acmBadgeL}{% + \hspace{\@ACM@badge@skip}% + \smash{% + \raisebox{0.5\height}{% + \href{#1}{\includegraphics[width=\@ACM@badge@width]{#2}}}}}% + \fi} +\let\acmBadge=\acmBadgeR +\def\startPage#1{\def\@startPage{#1}} +\startPage{} +\def\terms#1{\ClassWarning{\@classname}{The command \string\terms{} is + obsolete. I am going to ignore it}} +\def\keywords#1{\def\@keywords{#1}} +\let\@keywords\@empty +\AtEndDocument{\if@ACM@nonacm\else\ifx\@keywords\@empty + \ifnum\getrefnumber{TotPages}>2\relax + \ClassWarningNoLine{\@classname}{ACM keywords are mandatory + for papers over two pages}% + \fi\fi\fi} +\renewenvironment{abstract}{\Collect@Body\@saveabstract}{} +\long\def\@saveabstract#1{\if@ACM@maketitle@typeset + \ClassError{\@classname}{Abstract must be defined before maketitle + command. Please move it!}\fi + \long\gdef\@abstract{#1}} +\@saveabstract{} +\long\def\@lempty{} +\define@boolkey+{@ACM@topmatter@}[@ACM@]{printccs}[true]{% + \if@ACM@printccs + \ClassInfo{\@classname}{Printing CCS}% + \else + \ClassInfo{\@classname}{Suppressing CCS}% + \fi}{\ClassError{\@classname}{The option printccs can be either true or false}} +\define@boolkey+{@ACM@topmatter@}[@ACM@]{printacmref}[true]{% + \if@ACM@printacmref + \ClassInfo{\@classname}{Printing bibformat}% + \else + \ClassInfo{\@classname}{Suppressing bibformat}% + \fi}{\ClassError{\@classname}{The option printacmref can be either true or false}} +\AtEndDocument{\if@ACM@nonacm\else\if@ACM@printacmref\else + \ifnum\getrefnumber{TotPages}>1\relax + \ClassWarningNoLine{\@classname}{% + ACM reference format is mandatory \MessageBreak + for papers over one page. \MessageBreak + Please add printacmref=true to the \MessageBreak + \string\settopmatter\space command.}% + \fi\fi\fi} +\define@boolkey+{@ACM@topmatter@}[@ACM@]{printfolios}[true]{% + \if@ACM@printfolios + \ClassInfo{\@classname}{Printing folios}% + \else + \ClassInfo{\@classname}{Suppressing folios}% + \fi}{\ClassError{\@classname}{The option printfolios can be either true or false}} +\define@cmdkey{@ACM@topmatter@}[@ACM@]{authorsperrow}[0]{% + \IfInteger{#1}{\ClassInfo{\@classname}{Setting authorsperrow to + #1}}{\ClassWarning{\@classname}{The parameter authorsperrow must be + numerical. Ignoring the input #1}\gdef\@ACM@authorsperrow{0}}} +\def\settopmatter#1{\setkeys{@ACM@topmatter@}{#1}} +\settopmatter{printccs=true, printacmref=true} +\if@ACM@manuscript + \settopmatter{printfolios=true} +\else + \if@ACM@journal + \settopmatter{printfolios=true} + \else + \settopmatter{printfolios=false} + \fi +\fi +\settopmatter{authorsperrow=0} +\def\@received{} +\newcommand\received[2][]{\def\@tempa{#1}% + \ifx\@tempa\@empty + \ifx\@received\@empty + \gdef\@received{Received #2}% + \else + \g@addto@macro{\@received}{; revised #2}% + \fi + \else + \ifx\@received\@empty + \gdef\@received{#1 #2}% + \else + \g@addto@macro{\@received}{; #1 #2}% + \fi + \fi} +\AtEndDocument{% + \ifx\@received\@empty\else + \par\bigskip\noindent\small\normalfont\@received\par + \fi} +\define@choicekey+{ACM}{articletype}[\ACM@ArticleType\ACM@ArticleType@nr]{% + Research,Review,Discussion,Invited,Position}[Review]{% + \ifcase\ACM@ArticleType@nr + \relax % Research + \colorlet{@ACM@Article@color}{ACMBlue}% + \or % Review + \colorlet{@ACM@Article@color}{ACMOrange}% + \or % Discussion + \colorlet{@ACM@Article@color}{ACMGreen}% + \or % Invited + \colorlet{@ACM@Article@color}{ACMPurple}% + \or % Position + \colorlet{@ACM@Article@color}{ACMRed}% + \fi +}{% + \ClassError{\@classname}{Article Type must be Research, Review,\MessageBreak + Discussion, Invited, or Position}} +\def\acmArticleType#1{\setkeys{ACM}{articletype=#1}} +\if@ACM@acmcp +\acmArticleType{Research}% +\fi + % \end{macrocode} +\newenvironment{@ACM@color@frame}{% + \def\FrameCommand{\hspace*{-6.5pc}% + \colorbox{@ACM@Article@color!10!white}}% + \MakeFramed {\advance\hsize + -6.5pc\relax\FrameRestore}}{\zsaveposy{@ACM@acmcpframe@y}% + \endMakeFramed} +\def\acmCodeLink#1{% + \ifx\@acmCodeDataLink\@empty + \gdef\@acmCodeDataLink{\url{#1}}% + \else + \g@addto@macro{\@acmCodeDataLink}{\\ \url{#1}}% + \fi} +\def\@acmCodeDataLink{} +\def\acmContributions#1{\gdef\@acmContributions{#1}} +\acmContributions{} +\let\acmDataLink\acmCodeLink +\RequirePackage{comment} +\excludecomment{CCSXML} +\let\@concepts\@empty +\newcounter{@concepts} +\newcommand\ccsdesc[2][100]{% + \ccsdesc@parse#1~#2~~\ccsdesc@parse@end} +\def\textrightarrow{$\rightarrow$} +\def\ccsdesc@parse#1~#2~#3~{% + \stepcounter{@concepts}% + \expandafter\ifx\csname CCS@General@#2\endcsname\relax + \expandafter\gdef\csname CCS@General@#2\endcsname{\textbullet\ + \textbf{#2}}% + \expandafter\gdef\csname CCS@Punctuation@#2\endcsname{; }% + \expandafter\gdef\csname CCS@Specific@#2\endcsname{}% + \g@addto@macro{\@concepts}{\csname CCS@General@#2\endcsname + \csname CCS@Punctuation@#2\endcsname + \csname CCS@Specific@#2\endcsname}% + \fi + \ifx#3\relax\relax\else + \expandafter\gdef\csname CCS@Punctuation@#2\endcsname{ + \textrightarrow\ }% + \expandafter\g@addto@macro\expandafter{\csname CCS@Specific@#2\endcsname}{% + \addtocounter{@concepts}{-1}% + \ifnum#1>499\textbf{#3}\else + \ifnum#1>299\textit{#3}\else + #3\fi\fi\ifnum\value{@concepts}=0.\else; \fi}% + \fi +\ccsdesc@parse@finish} +\AtEndDocument{\if@ACM@nonacm\else\ifx\@concepts\@empty\relax + \ifnum\getrefnumber{TotPages}>2\relax + \ClassWarningNoLine{\@classname}{CCS concepts are mandatory + for papers over two pages}% + \fi\fi\fi} +\def\ccsdesc@parse@finish#1\ccsdesc@parse@end{} +\newif\if@printcopyright +\@printcopyrighttrue +\newif\if@printpermission +\@printpermissiontrue +\newif\if@acmowned +\@acmownedtrue +\define@choicekey*{ACM@}{acmcopyrightmode}[% + \acm@copyrightinput\acm@copyrightmode]{none,% + acmcopyright,acmlicensed,rightsretained,% + usgov,usgovmixed,cagov,cagovmixed,licensedusgovmixed,% + licensedcagov,licensedcagovmixed,othergov,licensedothergov,% + iw3c2w3,iw3c2w3g,cc}{% + \@printpermissiontrue + \@printcopyrighttrue + \@acmownedtrue + \ifnum\acm@copyrightmode=0\relax % none + \@printpermissionfalse + \@printcopyrightfalse + \@acmownedfalse + \fi + \ifnum\acm@copyrightmode=2\relax % acmlicensed + \@acmownedfalse + \fi + \ifnum\acm@copyrightmode=3\relax % rightsretained + \@acmownedfalse + \fi + \ifnum\acm@copyrightmode=4\relax % usgov + \@printpermissiontrue + \@printcopyrightfalse + \@acmownedfalse + \fi + \ifnum\acm@copyrightmode=6\relax % cagov + \@acmownedfalse + \fi + \ifnum\acm@copyrightmode=8\relax % licensedusgovmixed + \@acmownedfalse + \fi + \ifnum\acm@copyrightmode=9\relax % licensedcagov + \@acmownedfalse + \fi + \ifnum\acm@copyrightmode=10\relax % licensedcagovmixed + \@acmownedfalse + \fi + \ifnum\acm@copyrightmode=11\relax % othergov + \@acmownedtrue + \fi + \ifnum\acm@copyrightmode=12\relax % licensedothergov + \@acmownedfalse + \fi + \ifnum\acm@copyrightmode=13\relax % iw3c2w3 + \@acmownedfalse + \fi + \ifnum\acm@copyrightmode=14\relax % iw3c2w3g + \@acmownedfalse + \fi + \ifnum\acm@copyrightmode=15\relax % cc + \@acmownedfalse + \fi} +\def\setcopyright#1{\setkeys{ACM@}{acmcopyrightmode=#1}} +\setcopyright{acmlicensed} +\newcommand\setcctype[2][4.0]{% + \def\ACM@cc@version{#1}% + \def\ACM@cc@type{#2}} +\setcctype{by} +\def\@copyrightowner{% + \ifcase\acm@copyrightmode\relax % none + \or % acmcopyright + ACM\@. + \or % acmlicensed + Copyright held by the owner/author(s). Publication rights licensed to + ACM\@. + \or % rightsretained + Copyright held by the owner/author(s). + \or % usgov + \or % usgovmixed + Copyright held by the owner/author(s). + \or % cagov + Copyright Crown in Right of Canada. + \or %cagovmixed + Copyright held by the owner/author(s). + \or %licensedusgovmixed + Copyright held by the owner/author(s). Publication rights licensed to + ACM\@. + \or % licensedcagov + Copyright held by the owner/author(s). + \or %licensedcagovmixed + Copyright held by the owner/author(s). Publication rights licensed to + ACM\@. + \or % othergov + Copyright held by the owner/author(s). + \or % licensedothergov + Copyright held by the owner/author(s). Publication rights licensed to + ACM\@. + \or % ic2w3www + IW3C2 (International World Wide Web Conference Committee), published + under Creative Commons CC-BY~4.0 License. + \or % ic2w3wwwgoogle + IW3C2 (International World Wide Web Conference Committee), published + under Creative Commons CC-BY-NC-ND~4.0 License. + \or % cc + Copyright held by the owner/author(s). + \fi} +\def\@formatdoi#1{\url{https://doi.org/#1}} +\def\@copyrightpermission{% + \ifcase\acm@copyrightmode\relax % none + \or % acmcopyright + Permission to make digital or hard copies of all or part of this + work for personal or classroom use is granted without fee provided + that copies are not made or distributed for profit or commercial + advantage and that copies bear this notice and the full citation on + the first page. Copyrights for components of this work owned by + others than ACM must be honored. Abstracting with credit is + permitted. To copy otherwise, or republish, to post on servers or + to redistribute to lists, requires prior specific permission + and\hspace*{.5pt}/or + a fee. Request permissions from permissions@acm.org. + \or % acmlicensed + Permission to make digital or hard copies of all or part of this + work for personal or classroom use is granted without fee provided + that copies are not made or distributed for profit or commercial + advantage and that copies bear this notice and the full citation on + the first page. Copyrights for components of this work owned by + others than the author(s) must be honored. Abstracting with credit + is permitted. To copy otherwise, or republish, to post on servers + or to redistribute to lists, requires prior specific permission + and\hspace*{.5pt}/or a fee. Request permissions from + permissions@acm.org. + \or % rightsretained + Permission to make digital or hard copies of all or part of this + work for personal or classroom use is granted without fee provided + that copies are not made or distributed for profit or commercial + advantage and that copies bear this notice and the full citation on + the first page. Copyrights for third-party components of this work + must be honored. For all other uses, contact the + owner\hspace*{.5pt}/author(s). + \or % usgov + This paper is authored by an employee(s) of the United States + Government and is in the public domain. Non-exclusive copying or + redistribution is allowed, provided that the article citation is + given and the authors and agency are clearly identified as its + source. All others Request permissions from + owner\hspace*{.5pt}/author(s). + \or % usgovmixed + ACM acknowledges that this contribution was authored or co-authored + by an employee, contractor, or affiliate of the United States + government. As such, the United States government retains a + nonexclusive, royalty-free right to publish or reproduce this + article, or to allow others to do so, for government purposes + only. Request permissions from owner\hspace*{.5pt}/author(s). + \or % cagov + This article was authored by employees of the Government of + Canada. As such, the Canadian government retains all interest in + the copyright to this work and grants to ACM a nonexclusive, + royalty-free right to publish or reproduce this article, or to + allow others to do so, provided that clear attribution is given + both to the authors and the Canadian government agency employing + them. Permission to make digital or hard copies for personal or + classroom use is granted. Copies must bear this notice and the full + citation on the first page. Copyrights for components of this work + owned by others than the Canadian Government must be honored. To + copy otherwise, distribute, republish, or post, requires prior + specific permission and/or a fee. Request permissions from + owner\hspace*{.5pt}/author(s). + \or % cagovmixed + ACM acknowledges that this contribution was co-authored by an + affiliate of the national government of Canada. As such, the Crown + in Right of Canada retains an equal interest in the + copyright. Reprints must include clear attribution to ACM and the + author’s government agency affiliation. Permission to make digital + or hard copies for personal or classroom use is granted. Copies + must bear this notice and the full citation on the first + page. Copyrights for components of this work owned by others than + ACM must be honored. To copy otherwise, distribute, republish, or + post, requires prior specific permission and/or a fee. Request + permissions from owner\hspace*{.5pt}/author(s). + \or % licensedusgovmixed + Publication rights licensed to ACM\@. ACM acknowledges that this + contribution was authored or co-authored by an employee, contractor + or affiliate of the United States government. As such, the + Government retains a nonexclusive, royalty-free right to publish or + reproduce this article, or to allow others to do so, for Government + purposes only. Request permissions from + owner\hspace*{.5pt}/author(s). + \or % licensedcagov + This article was authored by employees of the Government of + Canada. As such, the Canadian government retains all interest in + the copyright to this work and grants to ACM a nonexclusive, + royalty-free right to publish or reproduce this article, or to + allow others to do so, provided that clear attribution is given + both to the authors and the Canadian government agency employing + them. Permission to make digital or hard copies for personal or + classroom use is granted. Copies must bear this notice and the full + citation on the first page. Copyrights for components of this work + owned by others than the Canadian Government must be honored. To + copy otherwise, distribute, republish, or post, requires prior + specific permission and/or a fee. Request permissions from + owner\hspace*{.5pt}/author(s). + \or % licensedcagovmixed + Publication rights licensed to ACM. ACM acknowledges that this + contribution was authored or co-authored by an employee, contractor + or affiliate of the national government of Canada. As such, the + Government retains a nonexclusive, royalty-free right to publish or + reproduce this article, or to allow others to do so, for Government + purposes only. Request permissions from + owner\hspace*{.5pt}/author(s). + \or % othergov + ACM acknowledges that this contribution was authored or co-authored + by an employee, contractor or affiliate of a national + government. As such, the Government retains a nonexclusive, + royalty-free right to publish or reproduce this article, or to + allow others to do so, for Government purposes only. Request + permissions from owner\hspace*{.5pt}/author(s). + \or % licensedothergov + Publication rights licensed to ACM\@. ACM acknowledges that this + contribution was authored or co-authored by an employee, contractor + or affiliate of a national government. As such, the Government + retains a nonexclusive, royalty-free right to publish or reproduce + this article, or to allow others to do so, for Government purposes + only. Request permissions from owner\hspace*{.5pt}/author(s). + \or % iw3c2w3 + This paper is published under the Creative Commons Attribution~4.0 + International (CC-BY~4.0) license. Authors reserve their rights to + disseminate the work on their personal and corporate Web sites with + the appropriate attribution. + \or % iw3c2w3g + This paper is published under the Creative Commons + Attribution-NonCommercial-NoDerivs~4.0 International + (CC-BY-NC-ND~4.0) license. Authors reserve their rights to + disseminate the work on their personal and corporate Web sites with + the appropriate attribution. + \or % CC + \IfEq{\ACM@cc@type}{zero}{% + \def\ACM@CC@Url{https://creativecommons.org/publicdomain/zero/1.0/legalcode}}{% + \edef\ACM@CC@Url{https://creativecommons.org/licenses/\ACM@cc@type/\ACM@cc@version/legalcode}}% + \href{\ACM@CC@Url}{\includegraphics[height=5ex]{doclicense-CC-\ACM@cc@type-88x31}}\\ + \href{\ACM@CC@Url}{% + This work is licensed under a Creative Commons + \IfEq{\ACM@cc@type}{zero}{CC0 1.0 Universal}{% + \IfEq{\ACM@cc@type}{by}{Attribution}{}% + \IfEq{\ACM@cc@type}{by-sa}{Attribution-ShareAlike}{}% + \IfEq{\ACM@cc@type}{by-nd}{Attribution-NoDerivatives}{}% + \IfEq{\ACM@cc@type}{by-nc}{Attribution-NonCommercial}{}% + \IfEq{\ACM@cc@type}{by-nc-sa}{Attribution-NonCommercial-ShareAlike}{}% + \IfEq{\ACM@cc@type}{by-nc-nd}{Attribution-NonCommercial-NoDerivatives}{}% + ~\IfEq{\ACM@cc@version}{4.0}{4.0 International}{3.0 Unported}% + } + License.}% + \fi} +%% +\def\copyrightyear#1{\def\@copyrightyear{#1}} +\copyrightyear{\@acmYear} +\def\@teaserfigures{} +\newenvironment{teaserfigure}{\Collect@Body\@saveteaser}{} +\long\def\@saveteaser#1{\g@addto@macro\@teaserfigures{\@teaser{#1}}} +\renewcommand{\thanks}[1]{% + \@ifnotempty{#1}{% + \if@ACM@anonymous + \g@addto@macro\thankses{\thanks{A note}}% + \else + \g@addto@macro\thankses{\thanks{#1}}% + \fi}} +\newcommand{\anon}[2][ANONYMIZED]{% + \if@ACM@anonymous% + {\color{ACMOrange}#1}% + \else% + #2% + \fi} +\ifx\@beginmaketitlehook\@undefined + \let\@beginmaketitlehook\@empty +\fi +\def\AtBeginMaketitle{\g@addto@macro\@beginmaketitlehook} +\def\@acmengagemetadata{} +\def\setengagemetadata#1#2{% + \g@addto@macro{\@acmengagemetadata}{% + \@setengagemetadata{#1}{#2}}} +\newbox\mktitle@bx +\def\maketitle{\@beginmaketitlehook + \@ACM@maketitle@typesettrue + \if@ACM@anonymous + % Anonymize omission of \author-s + \ifnum\num@authorgroups=0\author{}\fi + \fi + \begingroup + \let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig + \let\@footnotemark\@footnotemark@nolink + \let\@footnotetext\@footnotetext@nolink + \renewcommand\thefootnote{\@fnsymbol\c@footnote}% + \hsize=\textwidth + \def\@makefnmark{\hbox{\@textsuperscript{\@thefnmark}}}% + \@mktitle\if@ACM@sigchiamode\else\@mkauthors\fi\@mkteasers + \@printtopmatter + \if@ACM@sigchiamode\@mkauthors\fi + \setcounter{footnote}{0}% + \def\@makefnmark{\hbox{\@textsuperscript{\normalfont\@thefnmark}}}% + \@titlenotes + \@subtitlenotes + \@authornotes + \let\@makefnmark\relax + \let\@thefnmark\relax + \let\@makefntext\noindent + \ifx\@empty\thankses\else + \footnotetextauthorsaddresses{% + \def\par{\let\par\@par}\parindent\z@\@setthanks}% + \fi + \if@ACM@acmcp\else + \ifx\@empty\@authorsaddresses\else + \if@ACM@anonymous\else + \if@ACM@journal@bibstrip@or@tog + \footnotetextauthorsaddresses{% + \def\par{\let\par\@par}\parindent\z@\@setauthorsaddresses}% + \fi + \fi + \fi + \fi + \if@ACM@nonacm + \ifnum\acm@copyrightmode=15\relax % cc + \footnotetextcopyrightpermission{\@copyrightpermission}% + \fi + \else + \if@ACM@acmcp\else + \footnotetextcopyrightpermission{% + \if@ACM@authordraft + \raisebox{-2ex}[\z@][\z@]{\makebox[0pt][l]{\large\bfseries + Unpublished working draft. Not for distribution.}}% + \color[gray]{0.9}% + \fi + \parindent\z@\parskip0.1\baselineskip + \if@ACM@authorversion\else + \if@printpermission\@copyrightpermission\par\fi + \fi + \if@ACM@manuscript\else + \if@ACM@journal@bibstrip\else % Print the conference information + \if@ACM@engage + {\itshape \@acmBooktitle, \@acmYear.}\par + \else + {\itshape \acmConference@shortname, \acmConference@date, \acmConference@venue}\par + \fi + \fi + \fi + \if@printcopyright + \copyright\ \@copyrightyear\ \@copyrightowner\\ + \else + \@copyrightyear.\ + \fi + \if@ACM@manuscript + Manuscript submitted to ACM\\ + \else + \if@ACM@authorversion + This is the author's version of the work. It is posted here for + your personal use. Not for redistribution. The definitive Version + of Record was published in + \if@ACM@journal@bibstrip + \emph{\@journalName}% + \else + \emph{\@acmBooktitle}% + \fi + \ifx\@acmDOI\@empty + . + \else + , \@formatdoi{\@acmDOI}. + \fi\\ + \else + \if@ACM@nonacm\else + \if@ACM@journal@bibstrip + ACM~\@permissionCodeTwo/\@acmYear/\@acmMonth-ART\@acmArticle\\ + \@formatdoi{\@acmDOI}% + \else % Conference + \ifx\@acmISBN\@empty\else ACM~ISBN~\@acmISBN\\\fi + \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi% + \fi + \fi + \fi + \fi}% + \fi + \fi + \endgroup + \if@ACM@engage\@typesetengagemetadata\fi + \setcounter{footnote}{0}% + \@mkabstract + \ifx\@translatedabstracts\@empty\else + \@translatedabstracts\fi + \if@ACM@printccs + \ifx\@concepts\@empty\else\bgroup + {\@specialsection{CCS Concepts}% + \noindent\@concepts\par}\egroup + \fi + \fi + \if@ACM@acmcp\else + \ifx\@keywords\@empty\else\bgroup + {\@specialsection{\keywordsname}% + \noindent\@keywords\par}\egroup + \fi + \ifx\@translatedkeywords\@empty\else + \@translatedkeywords + \fi + \fi + \let\metadata@authors=\authors + \nxandlist{, }{, }{, }\metadata@authors + \def\@ACM@checkaffil{}% + \hypersetup{% + pdfauthor={\metadata@authors}, + pdftitle={\@title}, + pdfsubject={\@concepts}, + pdfkeywords={\@keywords}, + pdfcreator={LaTeX with acmart + \csname ver@\@classname.cls\endcsname\space + and hyperref + \csname ver@hyperref.sty\endcsname}}% + \andify\authors + \andify\shortauthors + \global\let\authors=\authors + \global\let\shortauthors=\shortauthors + \if@ACM@printacmref + \@mkbibcitation + \fi + \global\@topnum\z@ % this prevents floats from falling + % at the top of page 1 + \global\@botnum\z@ % we do not want them to be on the bottom either + \@printendtopmatter + \@afterindentfalse + \@afterheading + \if@ACM@acmcp + \set@ACM@acmcpbox + \AtEndDocument{\end@ACM@color@frame}% + \@ACM@color@frame + \fi +} +\newbox\@ACM@acmcpbox +\def\set@ACM@acmcpbox{% + \bgroup + \hsize=5pc + \global\setbox\@ACM@acmcpbox=\vbox{% + \setlength{\parindent}{\z@}% + {\includegraphics[width=\hsize]{acm-jdslogo}\par}% + \scriptsize + \ifnum\getrefnumber{TotPages}>1\else + \zrefused{@ACM@acmcpbox@y}% + \zrefused{@ACM@acmcpframe@y}% + \@tempdima=\dimexpr\zposy{@ACM@acmcpbox@y}sp - + \zposy{@ACM@acmcpframe@y}sp+0.3\FrameSep+ + \@ACM@acmcp@delta\relax + \ifdim\@tempdima>0pt\relax + \vspace*{\@tempdima}% + \protected@write\@auxout{}% + {\string\global\@ACM@acmcp@delta=\the\@tempdima\relax}% + \fi + \fi + \ifx\@acmCodeDataLink\@empty\else\bigskip + Code and data links:\\ \@acmCodeDataLink\par\bigskip + \fi + \ifx\@keywords\@empty\else\bigskip + Keywords: \@keywords\par + \fi + \ifx\@acmContributions\@empty\else\bigskip + \@acmContributions\par + \fi + \ifx\@empty\@authorsaddresses\else\bigskip\@setauthorsaddresses\fi + \zsaveposy{@ACM@acmcpbox@y}% + } +\egroup} +\def\@specialsection#1{% + \let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig + \ifcase\ACM@format@nr + \relax % manuscript + \par\medskip\small\noindent#1: % + \or % acmsmall + \par\medskip\small\noindent#1: % + \or % acmlarge + \par\medskip\small\noindent#1: % + \or % acmtog + \par\medskip\small\noindent#1: % + \or % sigconf + \section*{#1}% + \or % siggraph + \section*{#1}% + \or % sigplan + \noindentparagraph*{#1:~}% + \or % sigchi + \section*{#1}% + \or % sigchi-a + \section*{#1}% + \or % acmengage + \section*{#1}% + \or % acmcp + \section*{#1}% + \fi + \let\@vspace\@vspace@acm + \let\@vspacer\@vspacer@acm +} +\def\@printtopmatter{% + \ifx\@startPage\@empty + \gdef\@startPage{1}% + \else + \setcounter{page}{\@startPage}% + \fi + \@tempdima=\ht\mktitle@bx + \advance\@tempdima by \dp\mktitle@bx + \ifdim\@tempdima>0.9\textheight + \loop + \setbox\@tempboxa=\vsplit \mktitle@bx to 0.9\textheight + \thispagestyle{firstpagestyle}% + \noindent\unvbox\@tempboxa + \clearpage + \@tempdima=\ht\mktitle@bx + \advance\@tempdima by \dp\mktitle@bx + \ifdim\@tempdima>0.9\textheight\repeat + \fi + \thispagestyle{firstpagestyle}% + \noindent + \ifcase\ACM@format@nr + \relax % manuscript + \box\mktitle@bx\par + \or % acmsmall + \box\mktitle@bx\par + \or % acmlarge + \box\mktitle@bx\par + \or % acmtog + \twocolumn[\box\mktitle@bx]% + \or % sigconf + \twocolumn[\box\mktitle@bx]% + \or % siggraph + \twocolumn[\box\mktitle@bx]% + \or % sigplan + \twocolumn[\box\mktitle@bx]% + \or % sigchi + \twocolumn[\box\mktitle@bx]% + \or % sigchi-a + \par\box\mktitle@bx\par\bigskip + \or % acmengage + \twocolumn[\box\mktitle@bx]% + \or % acmcp + \box\mktitle@bx\par + \fi +} +\def\@mktitle{% + \ifcase\ACM@format@nr + \relax % manuscript + \@mktitle@i + \or % acmsmall + \@mktitle@i + \or % acmlarge + \@mktitle@i + \or % acmtog + \@mktitle@i + \or % sigconf + \@mktitle@iii + \or % siggraph + \@mktitle@iii + \or % sigplan + \@mktitle@iii + \or % sigchi + \@mktitle@iii + \or % sigchi-a + \@mktitle@iv + \or % acmengage + \@mktitle@iii + \or % acmcp + \@mktitle@i + \fi +} +\def\@titlefont{% + \ifcase\ACM@format@nr + \relax % manuscript + \LARGE\sffamily\bfseries + \or % acmsmall + \LARGE\sffamily\bfseries + \or % acmlarge + \LARGE\sffamily\bfseries + \or % acmtog + \Huge\sffamily + \or % sigconf + \Huge\sffamily\bfseries + \or % siggraph + \Huge\sffamily\bfseries + \or % sigplan + \Huge\bfseries + \or % sigchi + \Huge\sffamily\bfseries + \or % sigchi-a + \Huge\bfseries + \or % acmengage + \Huge\sffamily\bfseries + \or % acmcp + \LARGE\sffamily\bfseries + \fi} +\def\@subtitlefont{\normalsize + \ifcase\ACM@format@nr + \relax % manuscript + \mdseries + \or % acmsmall + \mdseries + \or % acmlarge + \mdseries + \or % acmtog + \LARGE + \or % sigconf + \LARGE\mdseries + \or % siggraph + \LARGE\mdseries + \or % sigplan + \LARGE\mdseries + \or % sigchi + \LARGE\mdseries + \or % sigchi-a + \mdseries + \or % acmengage + \LARGE\mdseries + \or % acmcp + \mdseries + \fi} +\def\@mktitle@i{\hsize=\textwidth + \if@ACM@acmcp + \advance\hsize by -6pc% + \fi + \@ACM@title@width=\hsize + \setbox\mktitle@bx=\vbox{\noindent\@titlefont + \parbox[t]{\@ACM@title@width}{\raggedright + \@titlefont\noindent + \@title\@translatedtitle% + \ifx\@subtitle\@empty\else + \par\noindent{\@subtitlefont\@subtitle\@translatedsubtitle}% + \fi}% + \par\bigskip}}% +\def\@mktitle@iii{\hsize=\textwidth + \setbox\mktitle@bx=\vbox{\@titlefont\centering + \@ACM@title@width=\hsize + \parbox[t]{\@ACM@title@width}{\centering\@titlefont + \@title\@translatedtitle% + \ifx\@subtitle\@empty\else + \par\noindent{\@subtitlefont\@subtitle\@translatedsubtitle} + \fi + }% + \par\bigskip}}% +\def\@mktitle@iv{\hsize=\textwidth + \setbox\mktitle@bx=\vbox{\raggedright\leftskip5pc\@titlefont + \noindent\leavevmode\leaders\hrule height 2pt\hfill\kern0pt\par + \noindent\@title\@translatedtitle% + \ifx\@subtitle\@empty\else + \par\noindent\@subtitlefont\@subtitle\@translatedsubtitle% + \fi + \par\bigskip}}% +\newbox\@ACM@commabox +\def\@ACM@addtoaddress#1{% + \ifvmode\else + \if@ACM@affiliation@obeypunctuation\else + \setbox\@ACM@commabox=\hbox{, }% + \unskip\cleaders\copy\@ACM@commabox\hskip\wd\@ACM@commabox + \fi\fi + #1} +\def\streetaddress#1{\ClassWarning{\@classname}{ACM no longer collects + authors' postal addresses. I am ignoring your street + address}\unskip\ignorespaces} +\def\postcode#1{\ClassWarning{\@classname}{ACM no longer collects + authors' postal addresses. I am ignoring your postal + code}\unskip\ignorespaces} +\if@ACM@journal + \def\position#1{\unskip\ignorespaces} + \def\institution#1{\global\@ACM@instpresenttrue + \unskip~#1\ignorespaces} + \def\city#1{\global\@ACM@citypresenttrue\unskip\ignorespaces} + \def\state#1{\unskip\ignorespaces} + \newcommand\department[2][0]{\unskip\ignorespaces} + \def\country#1{\StrDel{#1}{ }[\@tempa]% + \ifx\@tempa\@empty\else + \global\@ACM@countrypresenttrue\fi + \if@ACM@affiliation@obeypunctuation\else, \fi#1\ignorespaces} +\else + \def\position#1{\if@ACM@affiliation@obeypunctuation#1\else#1\par\fi}% + \def\institution#1{\global\@ACM@instpresenttrue + \if@ACM@affiliation@obeypunctuation#1\else#1\par\fi}% + \newcommand\department[2][0]{\if@ACM@affiliation@obeypunctuation + #2\else#2\par\fi}% + \def\city#1{\global\@ACM@citypresenttrue\@ACM@addtoaddress{#1}}% + \let\state\@ACM@addtoaddress + \def\country#1{\global\@ACM@countrypresenttrue\@ACM@addtoaddress{#1}}% +\fi +\def\@mkauthors{\begingroup + \hsize=\textwidth + \ifcase\ACM@format@nr + \relax % manuscript + \@mkauthors@i + \or % acmsmall + \@mkauthors@i + \or % acmlarge + \@mkauthors@i + \or % acmtog + \@mkauthors@i + \or % sigconf + \@mkauthors@iii + \or % siggraph + \@mkauthors@iii + \or % sigplan + \@mkauthors@iii + \or % sigchi + \@mkauthors@iii + \or % sigchi-a + \@mkauthors@iv + \or % acmengage + \@mkauthors@iii + \or % acmcp + \@mkauthors@i + \fi + \endgroup +} +\def\@authorfont{\Large\sffamily} +\def\@affiliationfont{\normalsize\normalfont} +\ifcase\ACM@format@nr +\relax % manuscript +\or % acmsmall + \def\@authorfont{\large\sffamily} + \def\@affiliationfont{\small\normalfont} +\or % acmlarge +\or % acmtog + \def\@authorfont{\LARGE\sffamily} + \def\@affiliationfont{\large} +\or % sigconf + \def\@authorfont{\LARGE} + \def\@affiliationfont{\large} +\or % siggraph + \def\@authorfont{\normalsize\normalfont} + \def\@affiliationfont{\normalsize\normalfont} +\or % sigplan + \def\@authorfont{\Large\normalfont} + \def\@affiliationfont{\normalsize\normalfont} +\or % sigchi + \def\@authorfont{\bfseries} + \def\@affiliationfont{\mdseries} +\or % sigchi-a + \def\@authorfont{\bfseries} + \def\@affiliationfont{\mdseries} +\or % acmengage + \def\@authorfont{\LARGE} + \def\@affiliationfont{\large} +\or % acmcp + \def\@authorfont{\large\sffamily} + \def\@affiliationfont{\small\normalfont} +\fi +\def\@typeset@author@line{% + \andify\@currentauthors\par\noindent + \@currentauthors\def\@currentauthors{}% + \ifx\@currentaffiliations\@empty\else + \andify\@currentaffiliations + \unskip, {\@currentaffiliations}\par + \fi + \def\@currentaffiliations{}} +\newif\if@ACM@instpresent +\@ACM@instpresenttrue +\newif\if@ACM@citypresent +\@ACM@citypresenttrue +\newif\if@ACM@countrypresent +\@ACM@countrypresenttrue +\def\@ACM@resetaffil{% + \global\@ACM@instpresentfalse + \global\@ACM@citypresentfalse + \global\@ACM@countrypresentfalse +} +\def\@ACM@checkaffil{% + \if@ACM@instpresent\else + \ClassWarningNoLine{\@classname}{No institution present for an affiliation}% + \fi + \if@ACM@citypresent\else + \ClassWarningNoLine{\@classname}{No city present for an affiliation}% + \fi + \if@ACM@countrypresent\else + \ClassError{\@classname}{No country present for an affiliation}{ACM + requires each author to indicate their country using country macro.}% + \fi +} +\def\@mkauthors@i{% + \def\@currentauthors{}% + \def\@currentaffiliations{}% + \global\let\and\@typeset@author@line + \def\@author##1{% + \ifx\@currentauthors\@empty + \gdef\@currentauthors{\@authorfont\MakeTextUppercase{##1}}% + \else + \g@addto@macro{\@currentauthors}{\and\MakeTextUppercase{##1}}% + \fi + \gdef\and{}}% + \def\email##1##2{}% + \def\affiliation##1##2{% + \def\@tempa{##2}\ifx\@tempa\@empty\else + \ifx\@currentaffiliations\@empty + \gdef\@currentaffiliations{% + \setkeys{@ACM@affiliation@}{obeypunctuation=false}% + \setkeys{@ACM@affiliation@}{##1}% + \@ACM@resetaffil + \@affiliationfont##2\@ACM@checkaffil}% + \else + \g@addto@macro{\@currentaffiliations}{\and + \setkeys{@ACM@affiliation@}{obeypunctuation=false}% + \setkeys{@ACM@affiliation@}{##1}\@ACM@resetaffil + ##2\@ACM@checkaffil}% + \fi + \fi + \global\let\and\@typeset@author@line}% + \if@ACM@acmcp + \advance\hsize by -6pc% + \fi + \global\setbox\mktitle@bx=\vbox{\noindent\unvbox\mktitle@bx\par\medskip + \noindent\addresses\@typeset@author@line + \par\medskip}% +} +\newbox\author@bx +\newdimen\author@bx@wd +\newskip\author@bx@sep +\author@bx@sep=1pc\relax +\def\@typeset@author@bx{\bgroup\hsize=\author@bx@wd + \def\and{\par}\normalbaselines + \global\setbox\author@bx=\vtop{\if@ACM@sigchiamode\else\centering\fi + \@authorfont\@currentauthors\par\@affiliationfont + \@currentaffiliation}\egroup + \box\author@bx\hspace{\author@bx@sep}% + \gdef\@currentauthors{}% + \gdef\@currentaffiliation{}} +\def\@mkauthors@iii{% + \author@bx@wd=\textwidth\relax + \advance\author@bx@wd by -\author@bx@sep\relax + \ifnum\@ACM@authorsperrow>0\relax + \divide\author@bx@wd by \@ACM@authorsperrow\relax + \else + \ifcase\num@authorgroups + \relax % 0? + \or % 1=one author per row + \or % 2=two authors per row + \divide\author@bx@wd by \num@authorgroups\relax + \or % 3=three authors per row + \divide\author@bx@wd by \num@authorgroups\relax + \or % 4=two authors per row (!) + \divide\author@bx@wd by 2\relax + \else % three authors per row + \divide\author@bx@wd by 3\relax + \fi + \fi + \advance\author@bx@wd by -\author@bx@sep\relax + \gdef\@currentauthors{}% + \gdef\@currentaffiliation{}% + \def\@author##1{\ifx\@currentauthors\@empty + \gdef\@currentauthors{\par##1}% + \else + \g@addto@macro\@currentauthors{\par##1}% + \fi + \gdef\and{}}% + \def\email##1##2{\ifx\@currentaffiliation\@empty + \gdef\@currentaffiliation{\bgroup + \mathchardef\UrlBreakPenalty=10000\nolinkurl{##2}\egroup}% + \else + \g@addto@macro\@currentaffiliation{\par\bgroup + \mathchardef\UrlBreakPenalty=10000\nolinkurl{##2}\egroup}% + \fi}% + \def\affiliation##1##2{\ifx\@currentaffiliation\@empty + \gdef\@currentaffiliation{% + \setkeys{@ACM@affiliation@}{obeypunctuation=false}% + \setkeys{@ACM@affiliation@}{##1}\@ACM@resetaffil + ##2\@ACM@checkaffil}% + \else + \g@addto@macro\@currentaffiliation{\par + \setkeys{@ACM@affiliation@}{obeypunctuation=false}% + \setkeys{@ACM@affiliation@}{##1}\@ACM@resetaffil + ##2\@ACM@checkaffil}% + \fi + \global\let\and\@typeset@author@bx +}% + \hsize=\textwidth + \global\setbox\mktitle@bx=\vbox{\noindent + \unvbox\mktitle@bx\par\medskip\leavevmode + \lineskip=1pc\relax\centering\hspace*{-1em}% + \addresses\let\and\@typeset@author@bx\and\par\bigskip}} +\def\@mkauthors@iv{% + \author@bx@wd=\columnwidth\relax + \advance\author@bx@wd by -\author@bx@sep\relax + \ifnum\@ACM@authorsperrow>0\relax + \divide\author@bx@wd by \@ACM@authorsperrow\relax + \else + \ifcase\num@authorgroups + \relax % 0? + \or % 1=one author per row + \else % 2=two authors per row + \divide\author@bx@wd by 2\relax + \fi + \fi + \advance\author@bx@wd by -\author@bx@sep\relax + \gdef\@currentauthors{}% + \gdef\@currentaffiliation{}% + \def\@author##1{\ifx\@currentauthors\@empty + \gdef\@currentauthors{\par##1}% + \else + \g@addto@macro\@currentauthors{\par##1}% + \fi + \gdef\and{}}% + \def\email##1##2{\ifx\@currentaffiliation\@empty + \gdef\@currentaffiliation{\nolinkurl{##2}}% + \else + \g@addto@macro\@currentaffiliation{\par\nolinkurl{##2}}% + \fi}% + \def\affiliation##1##2{\ifx\@currentaffiliation\@empty + \gdef\@currentaffiliation{% + \setkeys{@ACM@affiliation@}{obeypunctuation=false}% + \setkeys{@ACM@affiliation@}{##1}\@ACM@resetaffil + ##2\@ACM@checkaffil}% + \else + \g@addto@macro\@currentaffiliation{\par + \setkeys{@ACM@affiliation@}{obeypunctuation=false}% + \setkeys{@ACM@affiliation@}{##1}\@ACM@resetaffil + ##2\@ACM@checkaffil}% + \fi + \global\let\and\@typeset@author@bx}% + \bgroup\hsize=\columnwidth + \par\raggedright\leftskip=\z@ + \lineskip=1pc\noindent + \addresses\let\and\@typeset@author@bx\and\par\bigskip\egroup} +\def\@mkauthorsaddresses{% + \ifnum\num@authors>1\relax + Authors' \else Author's \fi + Contact Information: + \bgroup + \def\streetaddress##1{\ClassWarning{\@classname}{ACM no longer collects + authors' postal addresses. I am ignoring your street + address}\unskip\ignorespaces}% + \def\postcode##1{\ClassWarning{\@classname}{ACM no longer collects + authors' postal addresses. I am ignoring your postal + code}\unskip\ignorespaces}% + \def\position##1{\unskip\ignorespaces}% + \gdef\@ACM@institution@separator{, }% + \def\institution##1{\unskip\@ACM@institution@separator ##1\gdef\@ACM@institution@separator{ and }}% + \def\city##1{\unskip, ##1}% + \def\state##1{\unskip, ##1}% + \renewcommand\department[2][0]{\unskip\@addpunct, ##2}% + \def\country##1{\unskip, ##1}% + \def\and{\unskip; \gdef\@ACM@institution@separator{, }}% + \def\@author##1{##1}% + \def\email##1##2{\unskip, \nolinkurl{##2}}% + \addresses + \egroup} +\AtEndDocument{\if@ACM@nonacm\else\if@ACM@journal + \ifx\@authorsaddresses\@empty + \ClassWarningNoLine{\@classname}{Authors' + addresses are mandatory for ACM journals}% + \fi\fi\fi} +\def\@setaddresses{} +\def\@authornotemark{\g@addto@macro\@currentauthors{\footnotemark\relax}} +\def\@@authornotemark#1{\g@addto@macro\@currentauthors{\footnotemark[#1]}} +\def\@mkteasers{% + \ifx\@teaserfigures\@empty\else + \def\@teaser##1{\par\bigskip\bgroup + \captionsetup{type=figure}##1\egroup\par} + \global\setbox\mktitle@bx=\vbox{\noindent\unvbox\mktitle@bx\par + \noindent\@Description@presentfalse + \@teaserfigures\par\if@Description@present\else + \global\@undescribed@imagestrue + \ClassWarning{\@classname}{A possible image without + description}\fi + \medskip}% + \fi} +\def\@mkabstract{\bgroup + \ifx\@abstract\@lempty\else + {\phantomsection\addcontentsline{toc}{section}{\abstractname}% + \if@ACM@journal + \everypar{\setbox\z@\lastbox\everypar{}}\small + \else + \section*{\abstractname}% + \fi + \ignorespaces\@abstract\par}% + \fi\egroup} +\def\@mktranslatedabstract#1{\selectlanguage{#1}% + \if@ACM@journal + \everypar{\setbox\z@\lastbox\everypar{}}\small + \else + \section*{\abstractname}% + \fi + \ignorespaces} +\def\@mkbibcitation{\bgroup + \let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig + \def\@pages@word{\ifnum\getrefnumber{TotPages}=1\relax page\else pages\fi}% + \def\footnotemark{}% + \def\\{\unskip{} \ignorespaces}% + \def\footnote{\ClassError{\@classname}{Please do not use footnotes + inside a \string\title{} or \string\author{} command! Use + \string\titlenote{} or \string\authornote{} instead!}}% + \def\@article@string{\ifx\@acmArticle\@empty{\ }\else, + Article~\@acmArticle\ \fi}% + \par\medskip\small\noindent{\bfseries ACM Reference Format:}\par\nobreak + \noindent\bgroup + \def\\{\unskip{}, \ignorespaces}\authors\egroup. \@acmYear. \@title + \ifx\@subtitle\@empty. \else: \@subtitle. \fi + \if@ACM@nonacm\else + % The 'nonacm' option disables 'printacmref' by default, + % and the present \@mkbibcitation definition is never used + % in this case. The conditional remains useful if the user + % explicitly sets \settopmatter{printacmref=true}. + \if@ACM@journal@bibstrip + \textit{\@journalNameShort} + \@acmVolume, \@acmNumber \@article@string (\@acmPubDate), + \ref{TotPages}~\@pages@word. + \else + In \textit{\@acmBooktitle}% + \ifx\@acmEditors\@empty\textit{.}\else + \andify\@acmEditors\textit{, }\@acmEditors~\@editorsAbbrev.% + \fi\ + ACM, New York, NY, USA% + \@article@string\unskip, \ref{TotPages}~\@pages@word. + \fi + \fi + \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi +\par\egroup} +\def\@printendtopmatter{% + \let\@vspace\@vspace@orig + \let\@vspacer\@vspacer@orig + \par\bigskip + \let\@vspace\@vspace@acm + \let\@vspacer\@vspacer@acm + } +\def\@setthanks{\long\def\thanks##1{\par##1\@addpunct.}\thankses} +\def\@setauthorsaddresses{\@authorsaddresses\unskip\@addpunct.} +\def\@typesetengagemetadata{% + \def\@setengagemetadata##1##2{\par\noindent\textbf{##1} ##2\par}% + \@acmengagemetadata} +\ExplSyntaxOn +\AddToHook{cmd/maketitle/before} + {\tagstructbegin{tag=Title}\tagmcbegin{} \tag_stop:} +\AddToHook{cmd/maketitle/after} + {\tag_start:\tagmcend\tagstructend } +\ExplSyntaxOff +\RequirePackage{fancyhdr} +\let\ACM@ps@plain\ps@plain +\let\ACM@ps@myheadings\ps@myheadings +\let\ACM@ps@headings\ps@headings +\def\ACM@restore@pagestyle{% + \let\ps@plain\ACM@ps@plain + \let\ps@myheadings\ACM@ps@myheadings + \let\ps@headings\ACM@ps@headings} +\AtBeginDocument{\ACM@restore@pagestyle} +\if@ACM@review + \newsavebox{\ACM@linecount@bx} + \newlength\ACM@linecount@bxht + \newcount\ACM@linecount + \ACM@linecount\@ne\relax + \def\ACM@mk@linecount{% + \savebox{\ACM@linecount@bx}[4em][t]{\parbox[t]{4em}{\normalfont + \normalsize + \setlength{\ACM@linecount@bxht}{0pt}% + \loop{\color{red}\scriptsize\the\ACM@linecount}\\ + \global\advance\ACM@linecount by \@ne + \addtolength{\ACM@linecount@bxht}{\baselineskip}% + \ifdim\ACM@linecount@bxht<\textheight\repeat + {\color{red}\scriptsize\the\ACM@linecount}\hfill + \global\advance\ACM@linecount by \@ne}}} +\fi +\def\ACM@linecountL{% + \if@ACM@review + \ACM@mk@linecount + \begin{picture}(0,0)% + \put(-26,-22){\usebox{\ACM@linecount@bx}}% + \end{picture}% + \fi} +\def\ACM@linecountR{% + \if@ACM@review + \ifcase\ACM@format@nr + \relax % manuscript + \relax + \or % acmsmall + \relax + \or % acmlarge + \relax + \or % acmtog + \ACM@mk@linecount + \or % sigconf + \ACM@mk@linecount + \or % siggraph + \ACM@mk@linecount + \or % sigplan + \ACM@mk@linecount + \or % sigchi + \ACM@mk@linecount + \or % sigchi-a + \ACM@mk@linecount + \or % acmengage + \ACM@mk@linecount + \or % acmcp + \relax + \fi + \begin{picture}(0,0)% + \put(20,-22){\usebox{\ACM@linecount@bx}}% + \end{picture}% + \fi} +\if@ACM@timestamp + % Subtracting 30 from \time gives us the effect of rounding down despite + % \numexpr rounding to nearest + \newcounter{ACM@time@hours} + \setcounter{ACM@time@hours}{\numexpr (\time - 30) / 60 \relax} + \newcounter{ACM@time@minutes} + \setcounter{ACM@time@minutes}{\numexpr \time - \theACM@time@hours * 60 \relax} + \newcommand\ACM@timestamp{% + \footnotesize% + \ifx\@acmSubmissionID\@empty\relax\else + Submission ID: \@acmSubmissionID.{ }% + \fi + \the\year-\two@digits{\the\month}-\two@digits{\the\day}{ }% + \two@digits{\theACM@time@hours}:\two@digits{\theACM@time@minutes}{. }% + Page \thepage\ of \@startPage--\pageref*{TotPages}.% + } +\fi +\def\@shortauthors{% + \if@ACM@anonymous + Anon. + \ifx\@acmSubmissionID\@empty\else Submission Id: \@acmSubmissionID\fi + \else\shortauthors\fi} +\def\@headfootfont{\sffamily\footnotesize} +\AtBeginDocument{% +\fancypagestyle{standardpagestyle}{% + \fancyhf{}% + \renewcommand{\headrulewidth}{\z@}% + \renewcommand{\footrulewidth}{\z@}% + \def\@acmArticlePage{% + \ifx\@acmArticle\empty% + \if@ACM@printfolios\thepage\fi% + \else% + \@acmArticle\if@ACM@printfolios:\thepage\fi% + \fi% + }% + \if@ACM@journal@bibstrip@or@tog + \ifcase\ACM@format@nr + \relax % manuscript + \fancyhead[LE]{\ACM@linecountL\if@ACM@printfolios\thepage\fi}% + \fancyhead[RO]{\if@ACM@printfolios\thepage\fi}% + \fancyhead[RE]{\@shortauthors}% + \fancyhead[LO]{\ACM@linecountL\shorttitle}% + \if@ACM@nonacm\else% + \fancyfoot[RO,LE]{\footnotesize Manuscript submitted to ACM} + \fi% + \or % acmsmall + \fancyhead[LE]{\ACM@linecountL\@headfootfont\@acmArticlePage}% + \fancyhead[RO]{\@headfootfont\@acmArticlePage}% + \fancyhead[RE]{\@headfootfont\@shortauthors}% + \fancyhead[LO]{\ACM@linecountL\@headfootfont\shorttitle}% + \if@ACM@nonacm\else% + \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No. + \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}% + \fi + \or % acmlarge + \fancyhead[LE]{\ACM@linecountL\@headfootfont + \@acmArticlePage\quad\textbullet\quad\@shortauthors}% + \fancyhead[LO]{\ACM@linecountL}% + \fancyhead[RO]{\@headfootfont + \shorttitle\quad\textbullet\quad\@acmArticlePage}% + \if@ACM@nonacm\else% + \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No. + \@acmNumber, Article \@acmArticle. Publication date: \@acmPubDate.}% + \fi + \or % acmtog + \fancyhead[LE]{\ACM@linecountL\@headfootfont + \@acmArticlePage\quad\textbullet\quad\@shortauthors}% + \fancyhead[LO]{\ACM@linecountL}% + \fancyhead[RE]{\ACM@linecountR}% + \fancyhead[RO]{\@headfootfont + \shorttitle\quad\textbullet\quad\@acmArticlePage\ACM@linecountR}% + \if@ACM@nonacm\else + \if@ACM@journal@bibstrip + \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, + Vol. \@acmVolume, No.~\@acmNumber, Article \@acmArticle. + Publication date: \@acmPubDate.}% + \else + \fancyfoot[RO,LE]{\footnotesize \acmConference@shortname, + \acmConference@date, \acmConference@venue.}% + \fi + \fi + \else % Proceedings + \fancyfoot[C]{\if@ACM@printfolios\footnotesize\thepage\fi}% + \fancyhead[LO]{\ACM@linecountL\@headfootfont\shorttitle}% + \fancyhead[RE]{\@headfootfont\@shortauthors\ACM@linecountR}% + \if@ACM@nonacm + \fancyhead[LE]{\ACM@linecountL}% + \fancyhead[RO]{\ACM@linecountR}% + \else% + \if@ACM@engage + \fancyhead[LE]{\ACM@linecountL\@headfootfont\footnotesize + EngageCSEdu. \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi}% + \fancyhead[RO]{\@headfootfont + EngageCSEdu. \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi + \ACM@linecountR}% + \else + \fancyhead[LE]{\ACM@linecountL\@headfootfont\footnotesize + \acmConference@shortname, + \acmConference@date, \acmConference@venue}% + \fancyhead[RO]{\@headfootfont + \acmConference@shortname, + \acmConference@date, \acmConference@venue\ACM@linecountR}% + \fi + \fi + \fi + \else % Proceedings + \fancyfoot[C]{\if@ACM@printfolios\footnotesize\thepage\fi}% + \fancyhead[LO]{\ACM@linecountL\@headfootfont\shorttitle}% + \fancyhead[RE]{\@headfootfont\@shortauthors\ACM@linecountR}% + \if@ACM@nonacm + \fancyhead[LE]{\ACM@linecountL}% + \fancyhead[RO]{\ACM@linecountR}% + \else% + \if@ACM@engage + \fancyhead[LE]{\ACM@linecountL\@headfootfont + EngageCSEdu. \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi}% + \fancyhead[RO]{\@headfootfont + EngageCSEdu. \ifx\@acmDOI\@empty\else\@formatdoi{\@acmDOI}\fi + \ACM@linecountR}% + \else + \fancyhead[LE]{\ACM@linecountL\@headfootfont + \acmConference@shortname, + \acmConference@date, \acmConference@venue}% + \fancyhead[RO]{\@headfootfont + \acmConference@shortname, + \acmConference@date, \acmConference@venue\ACM@linecountR}% + \fi + \fi + \fi + \if@ACM@sigchiamode + \fancyheadoffset[L]{\dimexpr(\marginparsep+\marginparwidth)}% + \fi + \if@ACM@timestamp + \fancyfoot[LO,RE]{\ACM@timestamp} + \fi + \if@ACM@acmcp + \renewcommand{\footrulewidth}{0.1\p@}% + \fancyheadoffset[L]{46pt}% + \fancyhead[L]{\makebox[\z@][l]{% + \raisebox{-\dimexpr(0.2\textheight*(\ACM@ArticleType@nr-2))}{% + \rotatebox{90}{\colorbox{@ACM@Article@color}{\color{white}% + \strut\ACM@ArticleType~Article}}}}% + \ACM@linecountL}% + \fancyhead[R]{\makebox[\z@][r]{\box\@ACM@acmcpbox}}% + \fancyfoot[L,C]{}% + \fancyfoot[R]{\footnotesize + \@journalName, Volume~\@acmVolume, Issue~\@acmNumber, + \ifx\@acmArticle\@empty\else Article~\@acmArticle\fi\space + (\@acmPubDate)\ifx\@acmDOI\@empty\else\\\@formatdoi{\@acmDOI}\fi} + \fi +}% +\pagestyle{standardpagestyle} +} +\AtBeginDocument{% +\fancypagestyle{firstpagestyle}{% + \fancyhf{}% + \renewcommand{\headrulewidth}{\z@}% + \renewcommand{\footrulewidth}{\z@}% + \if@ACM@journal@bibstrip@or@tog + \ifcase\ACM@format@nr + \relax % manuscript + \fancyhead[L]{\ACM@linecountL\@acmBadgeL}% + \fancyhead[R]{\@acmBadgeR}% + \fancyfoot[RO,LE]{\if@ACM@printfolios\small\thepage\fi}% + \if@ACM@nonacm\else% + \fancyfoot[RE,LO]{\footnotesize Manuscript submitted to ACM}% + \fi% + \or % acmsmall + \if@ACM@nonacm\else% + \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No. + \@acmNumber, Article \@acmArticle. Publication date: + \@acmPubDate.}% + \fi% + \fancyhead[LE]{\ACM@linecountL\@acmBadgeL}% + \fancyhead[LO]{\ACM@linecountL\@acmBadgeL}% + \fancyhead[RO]{\@acmBadgeR}% + \fancyhead[RE]{\@acmBadgeR}% + \or % acmlarge + \if@ACM@nonacm\else% + \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, Vol. \@acmVolume, No. + \@acmNumber, Article \@acmArticle. Publication date: + \@acmPubDate.}% + \fi% + \fancyhead[RO]{\@acmBadgeR}% + \fancyhead[RE]{\@acmBadgeR}% + \fancyhead[LE]{\ACM@linecountL\@acmBadgeL}% + \fancyhead[LO]{\ACM@linecountL\@acmBadgeL}% + \or % acmtog + \if@ACM@nonacm\else% + \if@ACM@journal@bibstrip + \fancyfoot[RO,LE]{\footnotesize \@journalNameShort, + Vol. \@acmVolume, No.~\@acmNumber, Article \@acmArticle. + Publication date: \@acmPubDate.}% + \else + \fancyfoot[RO,LE]{\footnotesize \acmConference@shortname, + \acmConference@date, \acmConference@venue.}% + \fi + \fi% + \fancyhead[L]{\ACM@linecountL\@acmBadgeL}% + \fancyhead[R]{\@acmBadgeR\ACM@linecountR}% + \else % Conference proceedings + \fancyhead[L]{\ACM@linecountL\@acmBadgeL}% + \fancyhead[R]{\@acmBadgeR\ACM@linecountR}% + \fancyfoot[C]{\if@ACM@printfolios\footnotesize\thepage\fi}% + \fi + \else + \fancyhead[L]{\ACM@linecountL\@acmBadgeL}% + \fancyhead[R]{\@acmBadgeR\ACM@linecountR}% + \fancyfoot[C]{\if@ACM@printfolios\footnotesize\thepage\fi}% + \fi + \if@ACM@timestamp + \ifnum\ACM@format@nr=0\relax % Manuscript + \fancyfoot[LO,RE]{\ACM@timestamp\quad + \if@ACM@nonacm\else + \footnotesize Manuscript submitted to ACM + \fi} + \else + \fancyfoot[LO,RE]{\ACM@timestamp} + \fi + \fi + \if@ACM@acmcp + \renewcommand{\footrulewidth}{0.1\p@}% + \fancyheadoffset[L]{46pt}% + \fancyhead[L]{\makebox[\z@][l]{% + \raisebox{-\dimexpr(0.2\textheight*(\ACM@ArticleType@nr-2))}{% + \rotatebox{90}{\colorbox{@ACM@Article@color}{\color{white}% + \strut\ACM@ArticleType~Article}}}}% + \ACM@linecountL\@acmBadgeL}% + \fancyhead[R]{\@acmBadgeR\makebox[\z@][r]{\box\@ACM@acmcpbox}}% + \fancyfoot[L,C]{}% + \fancyfoot[R]{\footnotesize + \@journalName, Volume~\@acmVolume, Issue~\@acmNumber, + \ifx\@acmArticle\@empty\else Article~\@acmArticle\fi\space + (\@acmPubDate)\ifx\@acmDOI\@empty\else\\\@formatdoi{\@acmDOI}\fi} + \fi +}} +\def\ACM@NRadjust#1{% + \begingroup + \expandafter\ifx\csname Sectionformat\endcsname\relax + % do nothing when \Sectionformat is unknown + \def\next{\endgroup #1}% + \else + \def\next{\endgroup + \let\realSectionformat\Sectionformat + \def\ACM@sect@format@{#1}% + \let\Sectionformat\ACM@NR@adjustedSectionformat + %% next lines added 2018-06-17 to ensure section number is styled + \let\real@adddotafter\@adddotafter + \let\@adddotafter\ACM@adddotafter + #1{}% imposes the styles, but nullifies \MakeUppercase + \let\@adddotafter\real@adddotafter + }% + \fi \next +} +\def\ACM@NR@adjustedSectionformat#1#2{% + \realSectionformat{\ACM@sect@format{#1}}{#2}% + \let\Sectionformat\realSectionformat} +\DeclareRobustCommand{\ACM@sect@format}{\ACM@sect@format@} +\def\ACM@sect@format@null#1{#1} +\let\ACM@sect@format@\ACM@sect@format@null +\AtBeginDocument{% + \expandafter\ifx\csname LTX@adddotafter\endcsname\relax + \let\LTX@adddotafter\@adddotafter + \fi +} +\def\ACM@adddotafter#1{\ifx\relax#1\relax\else\LTX@adddotafter{#1}\fi} +\renewcommand\section{\def\@toclevel{1}% + \@startsection{section}{1}{\z@}% + {-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}% + {.25\baselineskip}% + {\ACM@NRadjust\@secfont}} +\renewcommand\subsection{\def\@toclevel{2}% + \@startsection{subsection}{2}{\z@}% + {-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}% + {.25\baselineskip}% + {\ACM@NRadjust\@subsecfont}} +\renewcommand\subsubsection{\def\@toclevel{3}% + \@startsection{subsubsection}{3}{\z@}% + {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}% + {-3.5\p@}% + {\ACM@NRadjust{\@subsubsecfont\@adddotafter}}} +\renewcommand\paragraph{\def\@toclevel{4}% + \@startsection{paragraph}{4}{\parindent}% + {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}% + {-3.5\p@}% + {\ACM@NRadjust{\@parfont\@adddotafter}}} +\newcommand\noindentparagraph{\def\@toclevel{4}% + \@startsection{paragraph}{4}{\z@}% + {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}% + {-3.5\p@}% + {\ACM@NRadjust{\@parfont}}} +\renewcommand\part{\def\@toclevel{9}% + \@startsection{part}{9}{\z@}% + {-10\p@ \@plus -4\p@ \@minus -2\p@}% + {4\p@}% + {\ACM@NRadjust\@parfont}} +\def\section@raggedright{\@rightskip\@flushglue + \rightskip\@rightskip + \leftskip\z@skip + \parindent\z@} +\def\@secfont{\sffamily\bfseries\section@raggedright} +\def\@subsecfont{\sffamily\bfseries\section@raggedright} +\def\@subsubsecfont{\sffamily\itshape} +\def\@parfont{\itshape} +\setcounter{secnumdepth}{3} +\ifcase\ACM@format@nr +\relax % manuscript +\or % acmsmall +\or % acmlarge + \def\@secfont{\sffamily\large\section@raggedright} + \def\@subsecfont{\sffamily\large\section@raggedright} +\or % acmtog + \def\@secfont{\sffamily\large\section@raggedright} + \def\@subsecfont{\sffamily\large\section@raggedright} +\or % sigconf + \def\@secfont{\bfseries\Large\section@raggedright} + \def\@subsecfont{\bfseries\Large\section@raggedright} +\or % siggraph + \def\@secfont{\sffamily\bfseries\Large\section@raggedright} + \def\@subsecfont{\sffamily\bfseries\Large\section@raggedright} +\or % sigplan + \def\@secfont{\bfseries\Large\section@raggedright} + \def\@subsecfont{\bfseries\section@raggedright} + \def\@subsubsecfont{\bfseries\section@raggedright} + \def\@parfont{\bfseries\itshape} + \def\@subparfont{\itshape} +\or % sigchi + \setcounter{secnumdepth}{1} + \def\@secfont{\sffamily\bfseries\section@raggedright} + \def\@subsecfont{\sffamily\bfseries\section@raggedright} +\or % sigchi-a + \setcounter{secnumdepth}{0} + \def\@secfont{\sffamily\bfseries\section@raggedright} + \def\@subsecfont{\sffamily\bfseries\section@raggedright} +\or % acmengage + \def\@secfont{\bfseries\Large\section@raggedright} + \def\@subsecfont{\bfseries\Large\section@raggedright} +\or %acmcp +\fi +\def\@adddotafter#1{#1\@addpunct{.}} +\def\@addspaceafter#1{#1\@addpunct{\enspace}} +\if@ACM@acmcp + \setcounter{secnumdepth}{-1}% +\fi +\providecommand*\@dotsep{4.5} +\def\@acmplainbodyfont{\itshape} +\def\@acmplainindent{\parindent} +\def\@acmplainheadfont{\scshape} +\def\@acmplainnotefont{\@empty} +\ifcase\ACM@format@nr +\relax % manuscript +\or % acmsmall +\or % acmlarge +\or % acmtog +\or % sigconf +\or % siggraph +\or % sigplan + \def\@acmplainbodyfont{\itshape} + \def\@acmplainindent{\z@} + \def\@acmplainheadfont{\bfseries} + \def\@acmplainnotefont{\normalfont} +\or % sigchi +\or % sigchi-a +\or % acmengage +\or % acmcp +\fi +\newtheoremstyle{acmplain}% + {.5\baselineskip\@plus.2\baselineskip + \@minus.2\baselineskip}% space above + {.5\baselineskip\@plus.2\baselineskip + \@minus.2\baselineskip}% space below + {\@acmplainbodyfont}% body font + {\@acmplainindent}% indent amount + {\@acmplainheadfont}% head font + {.}% punctuation after head + {.5em}% spacing after head + {\thmname{#1}\thmnumber{ #2}\thmnote{ {\@acmplainnotefont(#3)}}}% head spec +\def\@acmdefinitionbodyfont{\normalfont} +\def\@acmdefinitionindent{\parindent} +\def\@acmdefinitionheadfont{\itshape} +\def\@acmdefinitionnotefont{\@empty} +\ifcase\ACM@format@nr +\relax % manuscript +\or % acmsmall +\or % acmlarge +\or % acmtog +\or % sigconf +\or % siggraph +\or % sigplan + \def\@acmdefinitionbodyfont{\normalfont} + \def\@acmdefinitionindent{\z@} + \def\@acmdefinitionheadfont{\bfseries} + \def\@acmdefinitionnotefont{\normalfont} +\or % sigchi +\or % sigchi-a +\or % acmengage +\or % acmcp +\fi +\newtheoremstyle{acmdefinition}% + {.5\baselineskip\@plus.2\baselineskip + \@minus.2\baselineskip}% space above + {.5\baselineskip\@plus.2\baselineskip + \@minus.2\baselineskip}% space below + {\@acmdefinitionbodyfont}% body font + {\@acmdefinitionindent}% indent amount + {\@acmdefinitionheadfont}% head font + {.}% punctuation after head + {.5em}% spacing after head + {\thmname{#1}\thmnumber{ #2}\thmnote{ {\@acmdefinitionnotefont(#3)}}}% head spec +\theoremstyle{acmplain} +\AtEndPreamble{% + \if@ACM@acmthm + \theoremstyle{acmplain} + \@ifundefined{theorem}{% + \newtheorem{theorem}{Theorem}[section] + }{} + \@ifundefined{conjecture}{% + \newtheorem{conjecture}[theorem]{Conjecture} + }{} + \@ifundefined{proposition}{% + \newtheorem{proposition}[theorem]{Proposition} + }{} + \@ifundefined{lemma}{% + \newtheorem{lemma}[theorem]{Lemma} + }{} + \@ifundefined{corollary}{% + \newtheorem{corollary}[theorem]{Corollary} + }{} + \theoremstyle{acmdefinition} + \@ifundefined{example}{% + \newtheorem{example}[theorem]{Example} + }{} + \@ifundefined{definition}{% + \newtheorem{definition}[theorem]{Definition} + }{} + \fi + \theoremstyle{acmplain} +} +\def\@proofnamefont{\scshape} +\def\@proofindent{\indent} +\ifcase\ACM@format@nr +\relax % manuscript +\or % acmsmall +\or % acmlarge +\or % acmtog +\or % sigconf +\or % siggraph +\or % sigplan + \def\@proofnamefont{\itshape} + \def\@proofindent{\noindent} +\or % sigchi +\or % sigchi-a +\or % acmengage +\or % acmcp +\fi +\renewenvironment{proof}[1][\proofname]{\par + \pushQED{\qed}% + \normalfont \topsep6\p@\@plus6\p@\relax + \trivlist + \item[\@proofindent\hskip\labelsep + {\@proofnamefont #1\@addpunct{.}}]\ignorespaces +}{% + \popQED\endtrivlist\@endpefalse +} +\AtEndPreamble{% + \if@ACM@pbalance + \global\@ACM@balancefalse + \ifcase\ACM@format@nr + \relax % manuscript + \or % acmsmall + \or % acmlarge + \or % acmtog + \RequirePackage{pbalance}% + \or % sigconf + \RequirePackage{pbalance}% + \or % siggraph + \RequirePackage{pbalance}% + \or % sigplan + \RequirePackage{pbalance}% + \or % sigchi + \RequirePackage{pbalance}% + \or % sigchi-a + \or % acmengage + \RequirePackage{pbalance}% + \or % acmcp + \fi + \fi + \if@ACM@balance + \ifcase\ACM@format@nr + \relax % manuscript + \global\@ACM@balancefalse + \or % acmsmall + \global\@ACM@balancefalse + \or % acmlarge + \global\@ACM@balancefalse + \or % acmtog + \RequirePackage{balance}% + \or % sigconf + \RequirePackage{balance}% + \or % siggraph + \RequirePackage{balance}% + \or % sigplan + \RequirePackage{balance}% + \or % sigchi + \RequirePackage{balance}% + \or % sigchi-a + \global\@ACM@balancefalse + \or % acmengage + \RequirePackage{balance}% + \or % acmcp + \global\@ACM@balancefalse + \fi + \fi +} +\AtEndDocument{% + \if@ACM@balance + \if@twocolumn + \balance + \fi\fi} +\newcommand\acksname{Acknowledgments} +\specialcomment{acks}{% + \begingroup + \section*{\acksname} + \phantomsection\addcontentsline{toc}{section}{\acksname} +}{% + \endgroup +} +\def\grantsponsor#1#2#3{#2} +\newcommand\grantnum[3][]{#3% + \def\@tempa{#1}\ifx\@tempa\@empty\else\space(\url{#1})\fi} +\AtEndPreamble{% +\if@ACM@screen + \includecomment{screenonly} + \excludecomment{printonly} +\else + \excludecomment{screenonly} + \includecomment{printonly} +\fi +\if@ACM@anonymous + \excludecomment{anonsuppress} + \excludecomment{acks} +\else + \includecomment{anonsuppress} +\fi} +\newcommand\showeprint[2][arxiv]{% + \def\@tempa{#1}% + \ifx\@tempa\@empty\def\@tempa{arxiv}\fi + \def\@tempb{arxiv}% + \ifx\@tempa\@tempb\relax + arXiv:\href{https://arxiv.org/abs/#2}{#2}% + \else + \def\@tempb{arXiv}% + \ifx\@tempa\@tempb\relax + arXiv:\href{https://arxiv.org/abs/#2}{#2}% + \else + #1:#2% + \fi + \fi} +\def\theindex{\@restonecoltrue\if@twocolumn\@restonecolfalse\fi + \columnseprule\z@ \columnsep 35\p@ + \@indextitlestyle + \let\item\@idxitem + \parindent\z@ \parskip\z@\@plus.3\p@\relax + \raggedright + \hyphenpenalty\@M + \footnotesize} +\let\@vspace@orig=\@vspace +\let\@vspacer@orig=\@vspacer +\apptocmd{\@vspace}{\ClassWarning{\@classname}{\string\vspace\space should + only be used to provide space above/below surrounding + objects}}{}{} +\apptocmd{\@vspacer}{\ClassWarning{\@classname}{\string\vspace\space should + only be used to provide space above/below surrounding + objects}}{}{} +\let\@vspace@acm=\@vspace +\let\@vspacer@acm=\@vspacer +\let\ACM@origbaselinestretch\baselinestretch +\AtEndDocument{\ifx\baselinestretch\ACM@origbaselinestretch\else + \ClassError{\@classname}{An attempt to redefine + \string\baselinestretch\space detected. Please do not do this for + ACM submissions!}\fi} +\normalsize\normalfont\frenchspacing +\endinput +%% +%% End of file `acmart-tagged.cls'. diff --git a/Master/texmf-dist/tex/latex/acmart/acmart.cls b/Master/texmf-dist/tex/latex/acmart/acmart.cls index d0bbde47afb..b6ea2e7f9c4 100644 --- a/Master/texmf-dist/tex/latex/acmart/acmart.cls +++ b/Master/texmf-dist/tex/latex/acmart/acmart.cls @@ -38,7 +38,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesClass{acmart} -[2024/05/27 v2.08 Typesetting articles for the Association for Computing Machinery] +[2024/08/25 v2.09 Typesetting articles for the Association for Computing Machinery] \def\@classname{acmart} \InputIfFileExists{acmart-preload-hook.tex}{% \ClassWarning{\@classname}{% @@ -47,13 +47,13 @@ \RequirePackage{xkeyval} \RequirePackage{xstring} \RequirePackage{iftex} -\define@choicekey*+{acmart.cls}{format}[\ACM@format\ACM@format@nr]{% +\define@choicekey*+{\@classname.cls}{format}[\ACM@format\ACM@format@nr]{% manuscript, acmsmall, acmlarge, acmtog, sigconf, siggraph, sigplan, sigchi, sigchi-a, acmengage, acmcp}[manuscript]{}{% \ClassError{\@classname}{The option format must be manuscript, acmsmall, acmlarge, acmtog, sigconf, siggraph, sigplan, sigchi or sigchi-a}} -\def\@DeclareACMFormat#1{\DeclareOptionX{#1}{\setkeys{acmart.cls}{format=#1}}} +\def\@DeclareACMFormat#1{\DeclareOptionX{#1}{\setkeys{\@classname.cls}{format=#1}}} \@DeclareACMFormat{manuscript} \@DeclareACMFormat{acmsmall} \@DeclareACMFormat{acmlarge} @@ -66,7 +66,7 @@ \@DeclareACMFormat{acmengage} \@DeclareACMFormat{acmcp} \ExecuteOptionsX{format} -\define@boolkey+{acmart.cls}[@ACM@]{screen}[true]{% +\define@boolkey+{\@classname.cls}[@ACM@]{screen}[true]{% \if@ACM@screen \PackageInfo{\@classname}{Using screen mode}% \else @@ -74,7 +74,7 @@ \fi}{\PackageError{\@classname}{The option screen can be either true or false}} \ExecuteOptionsX{screen=false} -\define@boolkey+{acmart.cls}[@ACM@]{urlbreakonhyphens}[true]{% +\define@boolkey+{\@classname.cls}[@ACM@]{urlbreakonhyphens}[true]{% \if@ACM@urlbreakonhyphens \PackageInfo{\@classname}{Using breaking urls on hyphens}% \else @@ -82,7 +82,7 @@ \fi}{\PackageError{\@classname}{The option urlbreakonhyphens can be either true or false}} \ExecuteOptionsX{urlbreakonhyphens=true} -\define@boolkey+{acmart.cls}[@ACM@]{acmthm}[true]{% +\define@boolkey+{\@classname.cls}[@ACM@]{acmthm}[true]{% \if@ACM@acmthm \PackageInfo{\@classname}{Requiring acmthm}% \else @@ -90,7 +90,7 @@ \fi}{\PackageError{\@classname}{The option acmthm can be either true or false}} \ExecuteOptionsX{acmthm=true} -\define@boolkey+{acmart.cls}[@ACM@]{review}[true]{% +\define@boolkey+{\@classname.cls}[@ACM@]{review}[true]{% \if@ACM@review \PackageInfo{\@classname}{Using review mode}% \AtBeginDocument{\@ACM@printfoliostrue}% @@ -99,7 +99,7 @@ \fi}{\PackageError{\@classname}{The option review can be either true or false}} \ExecuteOptionsX{review=false} -\define@boolkey+{acmart.cls}[@ACM@]{authorversion}[true]{% +\define@boolkey+{\@classname.cls}[@ACM@]{authorversion}[true]{% \if@ACM@authorversion \PackageInfo{\@classname}{Using authorversion mode}% \else @@ -107,7 +107,7 @@ \fi}{\PackageError{\@classname}{The option authorversion can be either true or false}} \ExecuteOptionsX{authorversion=false} -\define@boolkey+{acmart.cls}[@ACM@]{nonacm}[true]{% +\define@boolkey+{\@classname.cls}[@ACM@]{nonacm}[true]{% \if@ACM@nonacm \PackageInfo{\@classname}{Using nonacm mode}% \AtBeginDocument{\@ACM@printacmreffalse}% @@ -119,15 +119,15 @@ \fi}{\PackageError{\@classname}{The option nonacm can be either true or false}} \ExecuteOptionsX{nonacm=false} -\define@boolkey+{acmart.cls}[@ACM@]{balance}[true]{}{% +\define@boolkey+{\@classname.cls}[@ACM@]{balance}[true]{}{% \PackageError{\@classname}{The option balance can be either true or false}} \ExecuteOptionsX{balance} -\define@boolkey+{acmart.cls}[@ACM@]{pbalance}[true]{}{% +\define@boolkey+{\@classname.cls}[@ACM@]{pbalance}[true]{}{% \PackageError{\@classname}{The option pbalance can be either true or false}} \ExecuteOptionsX{pbalance=false} -\define@boolkey+{acmart.cls}[@ACM@]{natbib}[true]{% +\define@boolkey+{\@classname.cls}[@ACM@]{natbib}[true]{% \if@ACM@natbib \PackageInfo{\@classname}{Explicitly selecting natbib mode}% \else @@ -135,7 +135,7 @@ \fi}{\PackageError{\@classname}{The option natbib can be either true or false}} \ExecuteOptionsX{natbib=true} -\define@boolkey+{acmart.cls}[@ACM@]{anonymous}[true]{% +\define@boolkey+{\@classname.cls}[@ACM@]{anonymous}[true]{% \if@ACM@anonymous \PackageInfo{\@classname}{Using anonymous mode}% \else @@ -143,7 +143,7 @@ \fi}{\PackageError{\@classname}{The option anonymous can be either true or false}} \ExecuteOptionsX{anonymous=false} -\define@boolkey+{acmart.cls}[@ACM@]{timestamp}[true]{% +\define@boolkey+{\@classname.cls}[@ACM@]{timestamp}[true]{% \if@ACM@timestamp \PackageInfo{\@classname}{Using timestamp mode}% \else @@ -151,7 +151,7 @@ \fi}{\PackageError{\@classname}{The option timestamp can be either true or false}} \ExecuteOptionsX{timestamp=false} -\define@boolkey+{acmart.cls}[@ACM@]{authordraft}[true]{% +\define@boolkey+{\@classname.cls}[@ACM@]{authordraft}[true]{% \if@ACM@authordraft \PackageInfo{\@classname}{Using authordraft mode}% \@ACM@timestamptrue @@ -189,13 +189,13 @@ \ClassWarning{\@classname}{% The format siggraph is now obsolete.\MessageBreak I am switching to sigconf.} - \setkeys{acmart.cls}{format=sigconf} + \setkeys{\@classname.cls}{format=sigconf} \fi \ifnum\ACM@format@nr=7\relax % sigchi \ClassWarning{\@classname}{% The format sigchi is now obsolete.\MessageBreak I am switching to sigconf.} - \setkeys{acmart.cls}{format=sigconf} + \setkeys{\@classname.cls}{format=sigconf} \fi \ifnum\ACM@format@nr=8\relax % sigchi \ClassWarning{\@classname}{% @@ -546,7 +546,6 @@ \fi}% \fi \ignorespaces} -\def\@seccntformat#1{\csname the#1\endcsname\quad} \def\@ssect#1#2#3#4#5{% \@tempskipa #3\relax \ifdim \@tempskipa>\z@ @@ -559,6 +558,7 @@ \def\@svsechd{#4{\hskip #1\relax #5}}% \fi \@xsect{#3}} +\def\@seccntformat#1{\csname the#1\endcsname\quad} \def\@starttoc#1#2{\begingroup\makeatletter \setTrue{#1}% \par\removelastskip\vskip\z@skip @@ -2001,22 +2001,6 @@ Copyright held by the owner/author(s). \fi} \def\@formatdoi#1{\url{https://doi.org/#1}} -\def\@ACM@copyright@check@cc{% - \if@ACM@nonacm - \ClassInfo{\@classname}{Using CC license with a non-acm - material}% - \else - \if@ACM@engage - \ClassInfo{\@classname}{Using CC license with ACM Enage - material}% - \else - \ClassWarning{\@classname}{% - Sorry, Creative Commons licenses are\MessageBreak - currently not used with ACM publications\MessageBreak - typeset by the authors}{Please use nonacm - option or ACM Engage class to enable CC licenses}% - \fi - \fi} \def\@copyrightpermission{% \ifcase\acm@copyrightmode\relax % none \or % acmcopyright @@ -2145,7 +2129,6 @@ disseminate the work on their personal and corporate Web sites with the appropriate attribution. \or % CC - \@ACM@copyright@check@cc \IfEq{\ACM@cc@type}{zero}{% \def\ACM@CC@Url{https://creativecommons.org/publicdomain/zero/1.0/legalcode}}{% \edef\ACM@CC@Url{https://creativecommons.org/licenses/\ACM@cc@type/\ACM@cc@version/legalcode}}% @@ -2321,7 +2304,7 @@ pdfsubject={\@concepts}, pdfkeywords={\@keywords}, pdfcreator={LaTeX with acmart - \csname ver@acmart.cls\endcsname\space + \csname ver@\@classname.cls\endcsname\space and hyperref \csname ver@hyperref.sty\endcsname}}% \andify\authors @@ -3263,28 +3246,33 @@ \fi } \def\ACM@adddotafter#1{\ifx\relax#1\relax\else\LTX@adddotafter{#1}\fi} -\renewcommand\section{\@startsection{section}{1}{\z@}% +\renewcommand\section{\def\@toclevel{1}% + \@startsection{section}{1}{\z@}% {-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}% {.25\baselineskip}% {\ACM@NRadjust\@secfont}} -\renewcommand\subsection{\@startsection{subsection}{2}{\z@}% +\renewcommand\subsection{\def\@toclevel{2}% + \@startsection{subsection}{2}{\z@}% {-.75\baselineskip \@plus -2\p@ \@minus -.2\p@}% {.25\baselineskip}% {\ACM@NRadjust\@subsecfont}} -\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}% +\renewcommand\subsubsection{\def\@toclevel{3}% + \@startsection{subsubsection}{3}{\z@}% {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}% {-3.5\p@}% {\ACM@NRadjust{\@subsubsecfont\@adddotafter}}} -\renewcommand\paragraph{\@startsection{paragraph}{4}{\parindent}% +\renewcommand\paragraph{\def\@toclevel{4}% + \@startsection{paragraph}{4}{\parindent}% {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}% {-3.5\p@}% {\ACM@NRadjust{\@parfont\@adddotafter}}} -\newcommand\noindentparagraph{\@startsection{paragraph}{4}{\z@}% +\newcommand\noindentparagraph{\def\@toclevel{4}% + \@startsection{paragraph}{4}{\z@}% {-.5\baselineskip \@plus -2\p@ \@minus -.2\p@}% {-3.5\p@}% {\ACM@NRadjust{\@parfont}}} - -\renewcommand\part{\@startsection{part}{9}{\z@}% +\renewcommand\part{\def\@toclevel{9}% + \@startsection{part}{9}{\z@}% {-10\p@ \@plus -4\p@ \@minus -2\p@}% {4\p@}% {\ACM@NRadjust\@parfont}} diff --git a/Master/texmf-dist/tex/latex/aiplans/tikzlibraryaiplans.code.tex b/Master/texmf-dist/tex/latex/aiplans/tikzlibraryaiplans.code.tex new file mode 100644 index 00000000000..5b6d23860c6 --- /dev/null +++ b/Master/texmf-dist/tex/latex/aiplans/tikzlibraryaiplans.code.tex @@ -0,0 +1,121 @@ +\ProvidesPackage{aiplan} +\RequirePackage{tikz} +\RequirePackage{listofitems} +\usetikzlibrary{calc} +\usetikzlibrary{decorations.pathreplacing, decorations.markings} + + +\tikzset{ + action/.style n args={8}{ + draw, + minimum width=3cm, + fill=blue, + rounded corners, + minimum height={max(#1,#2)*\baseHeight cm + 0.5*\baseHeight cm}, + label={center:#7}, + append after command={ + \pgfextra{ + % Define the node name + \edef\nodename{\tikzlastnode} + \ifx#3\empty % Check if label list is empty + \else % Process only if not empty + % Read the label content + \setsepchar{,} + \readlist\nameparts{\nodename} + \setsepchar{,} + + \ifnum#8=0\relax + % Define positions for preconditions and effects relative to the node with shifts + \ifnum#1>0 + \readlist\labellist{#3} + \foreach \i in {1,...,#1} { + % Precondition coordinates and lines + \coordinate (\nodename-pre-\i) at ([xshift=-#5cm, yshift=(-\i + (#1)/2+0.25) * \baseHeight cm] \nodename.west); + \draw (\nodename.west |- \nodename-pre-\i) -- +(-#5,0) node [midway, above, sloped, font=\scriptsize] {\labellist[\i]}; + } + \fi; + \readlist\labellist{#4} + \ifnum#2>0 + \foreach \j in {1,...,#2} { + % Effect coordinates and lines + \coordinate (\nodename-eff-\j) at ([xshift=#6cm, yshift=(-\j + (#2)/2+0.25) * \baseHeight cm] \nodename.east); + \draw (\nodename.east |- \nodename-eff-\j) -- +(#6,0) node [midway, above, sloped, font=\scriptsize] {\labellist[\j]}; + } + \fi; + \else + \ifnum#1>0 + \readlist\labellist{#3} + \foreach \i in {1,...,#1} { + % Precondition coordinates and lines + \coordinate (\nodename-pre-\i) at ([xshift=-#5 cm, yshift=(-\i + (#1)/2+0.25) * \baseHeight cm] \nodename.west); + \draw (\nodename.west |- \nodename-pre-\i) -- +(-#5,0) node [midway, anchor=east, xshift=-0.5 cm, sloped, font=\scriptsize]{\labellist[\i]}; + } + \fi; + \readlist\labellist{#4} + \ifnum#2>0 + \foreach \j in {1,...,#2} { + % Effect coordinates and lines + \coordinate (\nodename-eff-\j) at ([xshift=#6 cm, yshift=(-\j + (#2)/2+0.25) * \baseHeight cm] \nodename.east); + \draw (\nodename.east |- \nodename-eff-\j) -- +(#6,0) node [midway,anchor=west, xshift=0.5 cm, font=\scriptsize] {\labellist[\j]}; + } + \fi; + \fi; + \fi; + } + }, + label content/.initial={#3} + } +} + + +% Common base style for nodes +\tikzset{ + % COMMENT MISSING + base/.style n args={5}{ + draw, + minimum width=0.05cm, + fill=black, + minimum height={#1*\baseHeight cm}, + append after command={ + \pgfextra{ + \edef\nodename{\tikzlastnode} + \setsepchar{,} + \readlist\labellist{#2} + \foreach \i in {1,...,#1} { + \coordinate (\nodename-#5-\i) at ([xshift=#3 cm, yshift=(-\i + (#1)/2+0.25) * \baseHeight cm] \nodename.#4); + \draw (\nodename.#4 |- \nodename-#5-\i) -- +(#3,0) + node [midway, above, sloped, font=\scriptsize] {\labellist[\i]}; + } + } + } + } +} + +\tikzset{ + % Init style + init/.style n args={3}{ + base={#1}{#2}{#3}{east}{eff} + } +} + +\tikzset{ + % Goal style + goal/.style n args={3}{ + base={#1}{#2}{-#3}{west}{pre} + } +} + + + +\tikzset{ + dot/.style={ + circle,fill,inner sep=0.1em + } +} + +\tikzset{ + causallink/.style={ + ->, shorten <= 0.2cm, shorten >= 0.1cm + } +} + diff --git a/Master/texmf-dist/tex/latex/animate/animate.sty b/Master/texmf-dist/tex/latex/animate/animate.sty index fc126ce70ad..7e5b746210a 100644 --- a/Master/texmf-dist/tex/latex/animate/animate.sty +++ b/Master/texmf-dist/tex/latex/animate/animate.sty @@ -13,7 +13,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] -\def\@anim@version{2023/06/18} +\def\@anim@version{2024/09/06} \ProvidesPackage{animate} [\@anim@version\space PDF & SVG animations from files and inline graphics] @@ -530,6 +530,7 @@ /Subtype/Widget% /F 2% /FT/Btn/Ff 65537% + /A <</S/ResetForm>>% to make pdf.js happy /BS <</W 0>>% /AP <</N \@anim@framexform>>% /MK <</TP 1/I \@anim@framexform% @@ -562,6 +563,7 @@ /Subtype/Widget% \@anim@annotflag% /FT/Btn/Ff 65537% + /A <</S/ResetForm>>% /BS <</W 0>>% /AP <</N \@anim@framexform>>% /MK <</TP 1/I \@anim@framexform% @@ -2072,6 +2074,8 @@ \@anim@tooltip% \if@anim@js% /AA <</D <</S/JavaScript/JS (\@anim@btnJS{#1}{\@anim@arg})>>>>% + \else% + /A <</S/ResetForm>>% \fi% }% \if@anim@js% diff --git a/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls b/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls index 186e5d49415..82ccbc2614e 100644 --- a/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls +++ b/Master/texmf-dist/tex/latex/asmeconf/asmeconf.cls @@ -5,8 +5,8 @@ %% ASME conference requirements as represented on ASME's conference web pages in 2024. %% %% This file's version and date: - \def\versionno{1.37} - \def\versiondate{2024/02/06\space} + \def\versionno{1.38} + \def\versiondate{2024/08/01\space} %% %% Author: John H. Lienhard, V %% Department of Mechanical Engineering @@ -23,7 +23,7 @@ %% 6. Provide line numbers for editing and review %% 7. Support balancing length of columns on last page %% 8. Provide copyright footer for federal employees and contractors -%% 9. Support the archival PDF/A standards 1b, 2b, 2u, 3b, and 3u +%% 9. Support archival PDF/A standards %% 10. Enable various math and text features from the newtxmath and newtxtext packages %% 11. Support inclusion of passages in languages other than English %% @@ -66,74 +66,76 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesClass{asmeconf}[\versiondate ASME Conference Paper LaTeX Template (JHL)] -\LoadClass[twoside,twocolumn,10pt]{article} +\LoadClass[twoside,10pt]{article}% twocolumn is initiated in \MakeTitle % Even/odd page layout is not used in ASME's specs, although the papers are printed in two-sided format. \RequirePackage{iftex}% provides \ifpdftex (many) & \ifluatex (once) \RequirePackage{ifthen}% ifthenelse (many) & \whiledo (once) -\RequirePackage{etoolbox}% using patchcmd in 4 places +\RequirePackage{etoolbox}% using patchcmd in 4 or 5 places +\ExplSyntaxOn + \str_const:Nn \ClassName {asmeconf} +\ExplSyntaxOff + +%%%%%%%%%%%%% Compatibility codes for older distributions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%% Test compatibility of older distributions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}% compare version to date; \If... added to latex 2020/10/01 +\providecommand\IfPackageAtLeastTF{\@ifpackagelater}% compare version to date; \If... added to latex 2020/10/01 +\providecommand\IfPDFManagementActiveTF{\@secondoftwo}% \If... added to latex 2021/07/23 +\providecommand\IfPackageLoadedTF{\@ifpackageloaded}% \If...added to latex 2021/11/15 +\providecommand\ClassNoteNoLine[2]{\typeout{^^JClass Note #1: #2.^^J}}% log & terminal note... added to latex 2021/11/15 -\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}% compare version to date; \If... added to latex 2020/10/01 -\providecommand\IfPackageAtLeastTF{\@ifpackagelater}% compare version to date; \If... added to latex 2020/10/01 -\providecommand\IfPackageLoadedTF{\@ifpackageloaded}% \If...added to latex 2021/11/15 +\IfFormatAtLeastTF{2020/10/01}{\relax}{% + \ClassError{\ClassName}{Your LaTeX format is dated \fmtversion. Formats dated 2020/10/01 or later are recommended for the asmejour class. Older formats and packages may generate errors or fail entirely!}{Please UPDATE your LaTeX distribution to obtain best results. TeX Live is available for download at no charge: \string https://www.tug.org/texlive/. You can try to click past the errors for now.}% +} + +% check whether pdfmanagement (\DocumentMetadata) has been loaded (else fall back to hyperxmp and bookmark packages after loading hyperref) +\newif\ifasme@pdfmanagement +\IfPDFManagementActiveTF{ + \asme@pdfmanagementtrue +}{ + \asme@pdfmanagementfalse + \ClassWarningNoLine{\ClassName}{pdfmanagement is not active. Will load hyperxmp and bookmark packages instead} +} -\IfFormatAtLeastTF{2020/10/01}{% - \ClassInfo{asmeconf}{Your LaTeX format is dated \fmtversion. LaTeX distributions 2020/10/01 or later are strongly recommended for best results} - }{% - \ClassError{asmeconf}{Your LaTeX format is dated \fmtversion. Formats dated 2020/10/01 or later are recommended for the asmejour class. Older formats and packages may generate errors or fail entirely!}{Please UPDATE your LaTeX distribution to obtain best results. TeX Live is available for download at no charge: \string https://www.tug.org/texlive/. You can try to click past the errors for now.}% +% Allow pre 2021/11/15 formats to see the graphicx alt key without causing an error +\IfFormatAtLeastTF{2021/11/15}{ + \relax +}{ + \AtBeginDocument{ + \IfPackageLoadedTF{graphicx}{\define@key{Gin}{alt}{}}{\relax} + } } +% Enable pre-2020/10 formats to access essential macros later moved into LaTeX kernel \ifdefined\NewDocumentCommand\else \RequirePackage{xparse}% enable older installations to access features in LaTeX kernel since 2020/10/01; but need at least 2018/04... \fi -\DeclareDocumentCommand\LogNote{m}{% - \IfFormatAtLeastTF{2021/11/15}{% - \ClassNoteNoLine{asmeconf}{#1}% Added to LaTeX in Nov. 2021 - }{% - \ClassWarningNoLine{asmeconf}{#1}% - } +% Provide pre-2020/10 installations with basic unicode character mappings +\IfFormatAtLeastTF{2020/10/01}{\relax}{% +\ifpdftex + \pdfgentounicode=1 %% enable CMaps; was moved into the latex kernel Oct 2020 + \input glyphtounicode.tex %% lists of mappings; was moved into the latex kernel Oct 2020 +\fi } \IfPackageAtLeastTF{iftex}{2019/11/07}{\relax}{% - \ClassError{asemconf}{Package iftex is too old. Go to \string https://ctan.org and download an up-to-date version.}% + \ClassError{\ClassName}{Package iftex is too old. Go to \string https://ctan.org and download an up-to-date version.}{% + Your latex installation does not have an up-to-date version of the package iftex. You can get it at CTAN: \string https://ctan.org.} } -%% Test whether \DocumentMetadata has been loaded (Thank you Ulrike Fischer) -\newif\if@asme@pdfmanagement -% \IfPDFManagementActiveTF{\@asme@pdfmanagementtrue}{\@asme@pdfmanagementfalse}% New 2021/07/23, don't implement yet -\ExplSyntaxOn - \IfFormatAtLeastTF{2020/02/02}{% - \bool_if:nTF - { - \bool_lazy_and_p:nn - {\cs_if_exist_p:N \pdfmanagement_if_active_p:} - { \pdfmanagement_if_active_p: } - } - { - \@asme@pdfmanagementtrue - } - { - \@asme@pdfmanagementfalse - } - }{\@asme@pdfmanagementfalse} -\ExplSyntaxOff - - %%%%%%%%%%%%%% Options for the class %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \RequirePackage{kvoptions} \SetupKeyvalOptions{ - family=asmeconf, + family=\ClassName, prefix=asmeconf@, setkeys=\kvsetkeys, } %%% set key [colorlinks] to have colored hyperlinks, rather than black links (use a key with new pdfmanagement, 2021/12/01) -\define@key{asmeconf}{colorlinks}[colorlinks]{% +\define@key{\ClassName}{colorlinks}[colorlinks]{% \PassOptionsToPackage{#1}{hyperref}% } @@ -182,12 +184,11 @@ \ifthenelse{\equal{#1}{\ac@main}}{\ac@cyrillictrue\def\ac@TtwoA{T2A}}{\relax}% comparing strings } -\define@key{asmeconf}{main}[english]{% +\define@key{\ClassName}{main}{% remove default 2024/07/26, to avoid conflict with subsequent logic \PassOptionsToPackage{main=#1,#1}{babel}% added #1 resolves conflict of russianb.ldf & ukrainianb.ldf under "main=". \ac@mainsettrue \ifthenelse{\equal{#1}{english}}{% - \PassOptionsToPackage{pdflang=en}{hyperref}}{% - \LogNote{Selecting #1 as the primary language}% + \ClassNoteNoLine{\ClassName}{Selecting #1 as the primary language}% \ifthenelse{\equal{#1}{greek}}{% \ac@greektrue \def\ac@LGR{LGR}% @@ -201,7 +202,7 @@ \@FindCyr{russian;belarusian;bulgarian;macedonian;serbianc;ukrainian} }% } -\define@key{asmeconf}{vietnamese}[]{% +\define@key{\ClassName}{vietnamese}[]{% \RequirePackage[vietnamese=nohyphenation]{hyphsubst}% using key, not option, to allow loading package w/o babel warning. \PassOptionsToPackage{vietnamese.noencoding}{babel}% modified.noencoding suppresses unnecessary warning about inputenc \ac@vietnamesetrue @@ -209,21 +210,20 @@ } \DeclareDefaultOption{}% suppress warnings about unused options -\ProcessKeyvalOptions{asmeconf} +\ProcessKeyvalOptions{\ClassName} -%% if main language was not chosen explicitly, default to English +%% if main language was not chosen explicitly, ensure default to English \ifac@mainset\relax\else \PassOptionsToPackage{main=english}{babel}% - \PassOptionsToPackage{pdflang=en}{hyperref} - \ClassInfo{asmeconf}{Selecting English as the primary language, since main= not set}% + \ClassInfo{\ClassName}{Selecting English as the primary language, since main= not set}% \fi %% Turn off these keys now that we're done with them -\def\@KeyFamily{asmeconf} +\def\@KeyFamily{\ClassName} \NewDocumentCommand\ac@DisableOption{m}{% \DisableKeyvalOption[% action=ignore,% - class=asmeconf% + class=\ClassName% ]{#1}{\@KeyFamily}% } \NewDocumentCommand\@DisableKeys{>{\SplitList{;}}m}{\ProcessList{#1}{\ac@DisableOption}} @@ -249,7 +249,7 @@ \ifpdftex \PassOptionsToPackage{largesc=true}{newtxtext}% largesc is a boolean key in newtxtext \else - \ClassWarningNoLine{asmeconf}{largesc option is not available under luaLateX. It will be ignored}% + \ClassWarningNoLine{\ClassName}{largesc option is not available under luaLateX. It will be ignored}% \fi } @@ -261,21 +261,23 @@ %% option to hyphenate the inconsolata typewriter font [hyphenate] and to issue a warning when that's done. \DeclareOption{hyphenate}{% \ifac@fontspec - \ClassWarningNoLine{asmeconf}{hyphenate option is not supported by fontspec, will be ignored}% + \ClassWarningNoLine{\ClassName}{hyphenate option is not supported by fontspec. It will be ignored}% \else \PassOptionsToPackage{hyphenate}{inconsolata}% hyphenate is a key via xkeyval in inconsolata - \LogNote{Allowing hyphenation of typewriter font}% + \ClassNoteNoLine{\ClassName}{Allowing hyphenation of typewriter font}% \fi } %% option for monospacing in inconsolata typewriter font [mono]. +\def\MonoNotMono{WordSpace={1,1,1}}% rescaled tt font to match pdf, 2024/07/28 \DeclareOption{mono}{% \ifac@fontspec - \def\MonoNotMono{}% + \def\MonoNotMono{WordSpace={1,0,0},PunctuationSpace={3}}% NB: these are the default WordSpace values. 20204/07/30 \else \PassOptionsToPackage{mono}{inconsolata}% mono is a key via xkeyval in inconsolata \fi } %% option for unslashed zero in inconsolata typewriter font [var0]. +\def\ssztwo{}% for Inconsolatazi4; default uses slashed zero, +ss02 uses regular zero \DeclareOption{var0}{% \ifac@fontspec \def\ssztwo{+ss02}% stylistic alternate for regular zero @@ -296,7 +298,7 @@ \newif\ifac@setpdfa\ac@setpdfafalse \newif\ifac@pdfaone\ac@pdfaonefalse -\if@asme@pdfmanagement\else +\ifasme@pdfmanagement\else \SetupKeyvalOptions{ family=pdfaopt, @@ -308,7 +310,7 @@ %%% set key [pdfa] to activate pdf/a compliance (default is pdf/A-3u) \define@key{pdfaopt}{pdf-a}[true]{% \IfFormatAtLeastTF{2018/12/01}{\relax}{% - \ClassError{asmeconf}{Your LaTeX format is dated \fmtversion. Formats dated 2018/12/01 or later are necessary for the [pdf-a] option. Older formats may generate errors}{Please UPDATE your LaTeX distribution to obtain best results. TeX Live is available for download at no charge: \string https://www.tug.org/texlive/. Meanwhile, you can remove the [pdf-a] option and try again}% + \ClassError{\ClassName}{Your LaTeX format is dated \fmtversion. Formats dated 2018/12/01 or later are necessary for the [pdf-a] option. Older formats may generate errors}{Please UPDATE your LaTeX distribution to obtain best results. TeX Live is available for download at no charge: \string https://www.tug.org/texlive/. Meanwhile, you can remove the [pdf-a] option and try again}% } \ac@setpdfatrue \PassOptionsToPackage{pdfa}{hyperref} @@ -344,7 +346,7 @@ %%%%%%%%%%%% PDF/A compliance related %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\if@asme@pdfmanagement\else +\ifasme@pdfmanagement\else \ifpdftex \ifac@pdfaone \pdfminorversion=4 % for pdf/a-1 need version 4, not 7 @@ -353,7 +355,7 @@ \fi \else \ifluatex - \ifac@setpdfa\ClassWarningNoLine{asmeconf}{pdf-a option requires pdfLaTeX engine. Under LuaLaTeX, use % + \ifac@setpdfa\ClassWarningNoLine{\ClassName}{pdf-a option requires pdfLaTeX engine. Under LuaLaTeX, use % \protect\DocumentMetadata{pdfstandard=A-3b} before \protect\documentclass[..]{asmeconf}}% \fi \directlua{ @@ -367,7 +369,7 @@ end } \else - \ClassError{asmeconf}{Please use either pdfLaTeX or LuaLaTeX}{This class has NOT been configured to support other engines, and the results will be unpredictable. Exit and rerun using either pdfLaTeX or LuaLaTeX.}% + \ClassError{\ClassName}{Please use either pdfLaTeX or LuaLaTeX}{This class has NOT been configured to support other engines, and the results will be unpredictable. Exit and rerun using either pdfLaTeX or LuaLaTeX.}% \fi \fi \fi @@ -381,19 +383,17 @@ \ifpdftex \ifasmeconf@nofontspec - \ClassWarningNoLine{asmeconf}{The [nofontspec] option requires LuaLaTeX. It will be ignored under pdfLaTeX}% + \ClassWarningNoLine{\ClassName}{The [nofontspec] option requires LuaLaTeX. It will be ignored under pdfLaTeX}% \fi \else \ifasmeconf@nofontspec - \ClassWarningNoLine{asmeconf}{The [nofontspec] option has been issued. LuaLaTeX will run without font support}% + \ClassWarningNoLine{\ClassName}{The [nofontspec] option has been issued. LuaLaTeX will run without font support}% \else \IfFormatAtLeastTF{2020/10/01}{% \ac@fontspectrue \fontspecloadedtrue - \def\ssztwo{}% for Inconsolatazi4; default uses slashed zero, +ss02 uses regular zero - \def\MonoNotMono{WordSpace={1,1.33,1.67}}% for Inconsolatazi4; default allows word spacing (is not mono) }{% - \ClassError{asmeconf}{Your LaTeX format is dated \fmtversion. LaTeX installations dated 2020/10/01 or later are needed to run LuaLaTeX with the fontspec package. Fontspec will NOT be loaded. Language support will be minimal}{Please UPDATE your LaTeX distribution to obtain best results. TeX Live is available for download at no charge: \string https://www.tug.org/texlive/. You may alternatively choose the [nofontspec] option.}% + \ClassError{\ClassName}{Your LaTeX format is dated \fmtversion. LaTeX installations dated 2020/10/01 or later are needed to run LuaLaTeX with the fontspec package. Fontspec will NOT be loaded. Language support will be minimal}{Please UPDATE your LaTeX distribution to obtain best results. TeX Live is available for download at no charge: \string https://www.tug.org/texlive/. You may alternatively choose the [nofontspec] option.}% } \fi \fi @@ -403,7 +403,7 @@ \PassOptionsToPackage{japanese}{babel}% \ac@japanesetrue \else - \ClassWarningNoLine{asmeconf}{[japanese] option is supported only under LuaLaTeX with fontspec. It will be ignored}% + \ClassWarningNoLine{\ClassName}{[japanese] option is supported only under LuaLaTeX with fontspec. It will be ignored}% \fi } @@ -426,23 +426,23 @@ % Several languages do not have .ldf files to load. Babel will call these on demand. % -\DeclareOption{arabic}{\ClassError{asmeconf}{Do not specify "arabic" as a class option}{Instead, give the option [bidi=basic] and specify "arabic" when you call the language within your document.}} +\DeclareOption{arabic}{\ClassError{\ClassName}{Do not specify "arabic" as a class option}{Instead, give the option [bidi=basic] and specify "arabic" when you call the language within your document.}} % -\DeclareOption{bengali}{\ClassError{asmeconf}{Do not specify "bengali" as a class option}{Babel does not have an ldf file for Bengali. Instead, specify "bengali" when you call the language within your document. No class option is needed.}} +\DeclareOption{bengali}{\ClassError{\ClassName}{Do not specify "bengali" as a class option}{Babel does not have an ldf file for Bengali. Instead, specify "bengali" when you call the language within your document. No class option is needed.}} % -\DeclareOption{chinese-simplified}{\ClassError{asmeconf}{Do not specify "chinese-simplified" as class option}{Babel does not have an ldf file for simplified Chinese. Instead, specify "chinese-simplified" when you call the language within your document. No class option is needed.}} +\DeclareOption{chinese-simplified}{\ClassError{\ClassName}{Do not specify "chinese-simplified" as class option}{Babel does not have an ldf file for simplified Chinese. Instead, specify "chinese-simplified" when you call the language within your document. No class option is needed.}} % -\DeclareOption{chinese-traditional}{\ClassError{asmeconf}{Do not specify "chinese-traditional" as class option}{Babel does not have an ldf file for traditional Chinese. Instead, specify "chinese-traditional" when you call the language within your document. No class option is needed.}} +\DeclareOption{chinese-traditional}{\ClassError{\ClassName}{Do not specify "chinese-traditional" as class option}{Babel does not have an ldf file for traditional Chinese. Instead, specify "chinese-traditional" when you call the language within your document. No class option is needed.}} % -\DeclareOption{chinese}{\ClassError{asmeconf}{Do not specify "chinese" as a class option}{Instead, specify either "chinese-simplified" or "chinese-traditional" when you call the language within your document. No class option is needed.}} +\DeclareOption{chinese}{\ClassError{\ClassName}{Do not specify "chinese" as a class option}{Instead, specify either "chinese-simplified" or "chinese-traditional" when you call the language within your document. No class option is needed.}} % -\DeclareOption{hindi}{\ClassError{asmeconf}{Do not specify "hindi" as a class option}{Babel does not have an ldf file for Hindi. Instead, specify "hindi" when you call the language within your document. No class option is needed.}} +\DeclareOption{hindi}{\ClassError{\ClassName}{Do not specify "hindi" as a class option}{Babel does not have an ldf file for Hindi. Instead, specify "hindi" when you call the language within your document. No class option is needed.}} % -\DeclareOption{marathi}{\ClassError{asmeconf}{Do not specify "marathi" as a class option}{Babel does not have an ldf file for Marathi. Instead, specify "marathi" when you call the language within your document. No class option is needed.}} +\DeclareOption{marathi}{\ClassError{\ClassName}{Do not specify "marathi" as a class option}{Babel does not have an ldf file for Marathi. Instead, specify "marathi" when you call the language within your document. No class option is needed.}} % -\DeclareOption{korean}{\ClassError{asmeconf}{Do not specify "korean" as class option}{Babel does not have an ldf file for Korean. Instead, specify "korean"when you call the language within your document. No class option is needed.}} +\DeclareOption{korean}{\ClassError{\ClassName}{Do not specify "korean" as class option}{Babel does not have an ldf file for Korean. Instead, specify "korean"when you call the language within your document. No class option is needed.}} % -\DeclareOption{tamil}{\ClassError{asmeconf}{Do not specify "tamil" as a class option}{Babel does not have an ldf file for Tamil. Instead, specify "tamil" when you call the language within your document. No class option is needed.}} +\DeclareOption{tamil}{\ClassError{\ClassName}{Do not specify "tamil" as a class option}{Babel does not have an ldf file for Tamil. Instead, specify "tamil" when you call the language within your document. No class option is needed.}} %% Suppress warnings about unused global options \DeclareOption*{} @@ -462,23 +462,18 @@ \RequirePackage{graphicx} % removed obsolete options, 2023/11/19 \RequirePackage[dvipsnames,svgnames,x11names]{xcolor} -% Allow pre 2021/11/15 formats to see the graphicx alt key without causing an error, in preparation for tagged pdf -\IfFormatAtLeastTF{2021/11/15}{ - \relax -}{ - \AtBeginDocument{ - \IfPackageLoadedTF{graphicx}{\define@key{Gin}{alt}{}}{\relax} - } -} %%%%%%%%%%%% Table related %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \RequirePackage{booktabs} \RequirePackage{array} -\RequirePackage{dcolumn}% alignment on decimal places -\newcolumntype{d}[1]{D{.}{.}{#1}}% NB: This conflicts with babel's Spanish language option which makes "." an active character. - % To use "," separator, put this command in your preamble: \newcolumntype{d}[1]{D{,}{,}{#1}} +\RequirePackage{dcolumn}% alignment on decimal places +% use d{x.y} to center on "." as in "12.234" +\newcolumntype{d}[1]{D{.}{.}{#1}} +% NB: The above conflicts with babel's Spanish language option which makes "." an active character. +% Instead, to use "," as the decimal separator, choose columntype "," (as in "12,234") +\newcolumntype{,}[1]{D{,}{,}{#1}} %%%%%%%%% Caption related %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -507,7 +502,7 @@ \captionsetup[table]{labelformat=uppercase,labelfont={sf,bf,small},textfont={sf,bf,small},textformat=boldmath,labelsep=colon,skip=0.5\baselineskip} %name=TABLE, \fi -%% This construction avoids a failure of hyperref in relation to uppercase caption +%% This construction avoids a failure of hyperref in relation to uppercase captions %% Discussion: https://tex.stackexchange.com/questions/375695/maketextuppercase-inside-table-captions \AtBeginDocument{ \let\scaption\caption @@ -542,8 +537,17 @@ \RequirePackage[no-math]{fontspec} \defaultfontfeatures{Ligatures=TeX,} % - \setmainfont{TeXGyreTermesX}[% Presumes these are system fonts! Available at: http://www.gust.org.pl/projects/e-foundry/tex-gyre - WordSpace = {1,1.4,1},%% This stretch matches newtxtext a little better. 1.4 + \def\FontWarning{For luaLaTeX, you MUST have these OpenType fonts installed as system fonts on your computer: TeX Gyre Termes and TeX Gyre Heros (from \string http://www.gust.org.pl/projects/e-foundry/tex-gyre) and Inconsolatazi4 (\string https://ctan.org/tex-archive/fonts/inconsolata/opentype). If you DON'T have these fonts, you will see ERROR messages!} +% + \IfFontExistsTF{TeX Gyre Termes}{}{\ClassWarningNoLine{\ClassName}{\FontWarning} } + \IfFontExistsTF{texgyreheros}{}{ \ClassWarningNoLine{\ClassName}{\FontWarning} } + \IfFontExistsTF{Inconsolatazi4}{}{ \ClassWarningNoLine{\ClassName}{\FontWarning} } +% + % The newtx package includes a modified version of TeXGyreTermes called TexGyreTermesX, which is loaded here. + % Can fall back to TeXGyreTermes if desired, available at: http://www.gust.org.pl/projects/e-foundry/tex-gyre + \setmainfont{TeXGyreTermesX}[ + WordSpace = {1,1.6,1.2},%% This stretch matches newtxtext a little better; rescaled 2024/07/28 + PunctuationSpace = 1.332,%% match fontdimen7 to newtxtext, 2024/07/28 Extension = .otf, UprightFont = *-Regular, ItalicFont = *-Italic, @@ -552,7 +556,7 @@ Numbers = Lining, ] \setsansfont{texgyreheros}[% Presumes these are system fonts! Available at: http://www.gust.org.pl/projects/e-foundry/tex-gyre - WordSpace = {1,1.4,1}, + WordSpace = {1,1,1},% These spacings match newtxtext; rescaled to unity 2024/07/28 Extension = .otf, UprightFont = *-regular, ItalicFont = *-italic, @@ -562,7 +566,6 @@ Scale=0.91,% same as for newtx; former value 0.9 too small 2022/01/15 ] \setmonofont{Inconsolatazi4}[% This otf font ships with the LaTeX Inconsolata package (it's in TeX Live) - \MonoNotMono,% match newtxtext if we enable wordspacing Scale=1.05,% rescaled from 1, 22/03/10 Extension = .otf, UprightFont = *-Regular, @@ -570,20 +573,22 @@ BoldFont = *-Bold, BoldItalicFont = *-Bold,% has no italic face RawFeature = {+ss01,\ssztwo,+ss03}, - ] + \MonoNotMono,% match newtxtext if we enable wordspacing; note wordspace def'd in option above. + ] % % For many languages, using babel commands helps font loading. + % Switched Harbbuzz to OpenType throughout, 2024/07/28 % Noto fonts are available at https://github.com/googlefonts \def\Noto@scale{0.92} \def\Ara@scale{0.91}% For the serif font only \def\NotoBan@scale{0.92}% 1.} should probably stay consistent within the Noto family. \def\NotoDev@scale{0.92}% 1.} should probably stay consistent within the Noto family. \def\NotoTam@scale{0.92} - \def\Noto@color{black} + \def\Noto@color{Color=black}% 2024/07/28. Changed this diagnostic command to by-pass a bug in luatexja-fontspec. % \babelprovide[import, language=Default]{arabic} \babelfont [arabic]{rm}[Scale=\Ara@scale, - Renderer=HarfBuzz, + %Renderer=OpenType, Extension = .ttf, UprightFont = *-Regular, ItalicFont = *-Regular,% don't use italic face, I am told @@ -591,7 +596,7 @@ BoldItalicFont = *-Bold,% don't use italic face, I am told ]{Amiri}% NotoNaskhArabic}% Some readers prefer Amiri font \babelfont [arabic]{sf}[Scale=\Noto@scale, - Renderer=HarfBuzz, + %Renderer=OpenType, Extension =.ttf, UprightFont = *-Regular, ItalicFont = *-Regular,% font has no italic face @@ -599,7 +604,7 @@ BoldItalicFont = *-SemiBold,% font has no italic face ]{NotoSansArabic}%DejaVuSans}%NotoKufiArabic}% .otf,% \babelfont [arabic]{tt}[% - Renderer=HarfBuzz, + %Renderer=OpenType, Extension =.ttf, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face @@ -610,9 +615,9 @@ % \babelprovide[import,language=Default,script=Bangla]{bengali} \babelfont [bengali]{rm}[% - Renderer=HarfBuzz, + %Renderer=OpenType, Scale=\NotoBan@scale,% same as Devanagari - Color=\Noto@color, + \Noto@color, Extension = .ttf, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face @@ -620,9 +625,9 @@ BoldItalicFont = *-Bold,% has no italic face ]{NotoSerifBengali} \babelfont [bengali]{sf}[% - Renderer=HarfBuzz, + %Renderer=OpenType, Scale=\NotoBan@scale, - Color=\Noto@color, + \Noto@color, Extension = .ttf, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face @@ -630,9 +635,9 @@ BoldItalicFont = *-Bold,% has no italic face ]{NotoSansBengali} \babelfont [bengali]{tt}[ - Renderer=HarfBuzz, + %Renderer=OpenType, Scale=\NotoBan@scale, - Color=\Noto@color, + \Noto@color, Extension = .ttf, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face @@ -646,7 +651,7 @@ \babelprovide[import,language=Default,script=Cyrillic]{#1} \babelfont [#1]{rm}[% Scale=\Noto@scale, - Color=\Noto@color, + \Noto@color, Extension = .ttf, UprightFont = *-Regular, ItalicFont = *-Italic, @@ -655,7 +660,7 @@ ]{NotoSerif} \babelfont [#1]{sf}[% Scale=\Noto@scale, - Color=\Noto@color, + \Noto@color, Extension = .ttf, UprightFont = *-Regular, ItalicFont = *-Italic, @@ -664,7 +669,7 @@ ]{NotoSans} \babelfont [#1]{tt}[% Scale=\Noto@scale, - Color=\Noto@color, + \Noto@color, Extension = .ttf, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face @@ -676,14 +681,14 @@ \setlocalecaption{serbian-cyrillic}{abstract}{Сажетак}% NB: utf-8 % % Devanagari languages - \newfontscript{Devanagari}{deva}% HarfBuzz has some problems in Hindi, see babel manual Sect. 1.13 (main issue is ra) + \newfontscript{Devanagari}{deva}% OpenType has some problems in Hindi, see babel manual Sect. 1.13 (main issue is ra) \NewDocumentCommand\@LoadBabelDev{>{\SplitList{;}}m}{\ProcessList{#1}{\@DevBabel}} \NewDocumentCommand\@DevBabel{m}{% \babelprovide[import,language=Default]{#1} \babelfont [#1]{rm}[% -% Renderer=HarfBuzz,% works for Marathi, throws errors in Hindi... +% %Renderer=OpenType,% Marathi and Hindi may respond differently... Scale=\NotoDev@scale, - Color=\Noto@color, + \Noto@color, Extension = .ttf, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face @@ -691,9 +696,9 @@ BoldItalicFont = *-Bold,% has no italic face ]{NotoSerifDevanagari} \babelfont [#1]{sf}[% -% Renderer=HarfBuzz,% works for Marathi, throws errors in Hindi... +% %Renderer=OpenType,% % Marathi and Hindi may respond differently... Scale=\NotoDev@scale, - Color=\Noto@color, + \Noto@color, Extension = .ttf, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face @@ -701,9 +706,9 @@ BoldItalicFont = *-Bold,% has no italic face ]{NotoSansDevanagari} \babelfont [#1]{tt}[ -% Renderer=HarfBuzz,% works for Marathi, throws errors in Hindi... +% %Renderer=OpenType,% % Marathi and Hindi may respond differently... Scale=\NotoDev@scale, - Color=\Noto@color, + \Noto@color, Extension = .ttf, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face @@ -719,7 +724,7 @@ \babelfont [greek]{rm}[% Scale=\Noto@scale, WordSpace={1.1},% increase word spacing slightly - Color=\Noto@color, + \Noto@color, Extension = .ttf, UprightFont = *-Regular, ItalicFont = *-Italic, @@ -729,7 +734,7 @@ \babelfont [greek]{sf}[% Scale=\Noto@scale, WordSpace={1.1},% increase word spacing slightly - Color=\Noto@color, + \Noto@color, Extension = .ttf, UprightFont = *-Regular, ItalicFont = *-Italic, @@ -738,7 +743,7 @@ ]{NotoSans} \babelfont [greek]{tt}[% Scale=\Noto@scale, - Color=\Noto@color, + \Noto@color, Extension = .ttf, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face @@ -747,11 +752,14 @@ ]{NotoSansMono} % % Japanese + % luatexja-fontspec seems to want lc "color" now, rather than normal "Color", as before. Commenting out. + % NB: luatexja-fontspec color breakage appears to be global. \ifac@japanese - \RequirePackage[match]{luatexja-fontspec}% japanese typesets *much* better with this loaded + \def\Noto@color{}% by-pass bug in luatexja-fontspec, 2024/07/28. + \RequirePackage[no-math]{luatexja-fontspec}% japanese typesets *much* better with this loaded \setmainjfont{NotoSerifCJKjp}[% Scale=\Noto@scale, - Color=\Noto@color, + \Noto@color, % Extension = .otf, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face @@ -760,7 +768,7 @@ ] \setsansjfont{NotoSansCJKjp}[% Scale=\Noto@scale, - Color=\Noto@color, + \Noto@color, % Extension = .ttc, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face @@ -769,7 +777,7 @@ ] \setmonojfont{NotoSansMonoCJKjp}[% Scale=\Noto@scale, - Color=\Noto@color, + \Noto@color, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face BoldFont = *-Bold, @@ -780,7 +788,7 @@ % Need at least one of the following to load the Japanese dictionary. \babelfont [japanese]{rm}[% Scale=\Noto@scale, - Color=\Noto@color, + \Noto@color, Extension = .otf, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face @@ -789,7 +797,7 @@ ]{NotoSerifCJKjp}% Scale estimated \babelfont [japanese]{sf}[% Scale=\Noto@scale, - Color=\Noto@color, + \Noto@color, % Extension = .ttc, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face @@ -798,7 +806,7 @@ ]{NotoSansCJKjp} \babelfont [japanese]{tt}[% Scale=\Noto@scale, - Color=\Noto@color, + \Noto@color, % Extension = .ttc, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face @@ -812,7 +820,7 @@ \babelprovide[import,language=Default]{korean} \babelfont [korean]{rm}[% Scale=\Noto@scale, - Color=\Noto@color, + \Noto@color, Extension = .otf, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face @@ -821,7 +829,7 @@ ]{NotoSerifCJKkr} \babelfont [korean]{sf}[% Scale=\Noto@scale, - Color=\Noto@color, + \Noto@color, Extension = .ttc, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face @@ -830,7 +838,7 @@ ]{NotoSansCJK} \babelfont [korean]{tt}[% Scale=\Noto@scale, - Color=\Noto@color, + \Noto@color, % Extension = .ttc, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face @@ -843,7 +851,7 @@ \babelprovide[import,language=Default]{chinese-simplified} \babelfont [chinese-simplified]{rm}[% Scale=\Noto@scale, - Color=\Noto@color, + \Noto@color, Extension = .otf, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face @@ -852,7 +860,7 @@ ]{NotoSerifCJKsc} \babelfont [chinese-simplified]{sf}[% Scale=\Noto@scale, - Color=\Noto@color, + \Noto@color, Extension = .ttc, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face @@ -861,7 +869,7 @@ ]{NotoSansCJK} \babelfont [chinese-simplified]{tt}[% Scale=\Noto@scale, - Color=\Noto@color, + \Noto@color, % Extension = .ttc, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face @@ -871,9 +879,9 @@ % % Traditional Chinese (includes characters for Cantonese also) \babelprovide[import,language=Default]{chinese-traditional} - \babelfont [chinese-tradiational]{rm}[% + \babelfont [chinese-traditional]{rm}[% fixed 2024/07/28 Scale=\Noto@scale, - Color=\Noto@color, + \Noto@color, Extension = .otf, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face @@ -882,20 +890,20 @@ ]{NotoSerifCJKtc} \babelfont [chinese-traditional]{sf}[% Scale=\Noto@scale, - Color=\Noto@color, + \Noto@color, Extension = .ttc, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face BoldFont = *-Bold, BoldItalicFont = *-Bold,% has no italic face ]{NotoSansCJK} - \babelfont [chinese-traditional]{tt}[Scale=\Noto@scale,Color=\Noto@color]{NotoSansMonoCJKtc} + \babelfont [chinese-traditional]{tt}[Scale=\Noto@scale,\Noto@color]{NotoSansMonoCJKtc} % \babelprovide[import,language=Default]{tamil} \babelfont [tamil]{rm}[% - Renderer=HarfBuzz, + %Renderer=OpenType, Scale=\NotoTam@scale, - Color=\Noto@color, + \Noto@color, Extension = .ttf, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face @@ -903,9 +911,9 @@ BoldItalicFont = *-Bold,% has no italic face ]{NotoSerifTamil} \babelfont [tamil]{sf}[% - Renderer=HarfBuzz, + %Renderer=OpenType, Scale=\NotoTam@scale, - Color=\Noto@color, + \Noto@color, Extension = .ttf, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face @@ -913,9 +921,9 @@ BoldItalicFont = *-Bold,% has no italic face ]{NotoSansTamil} \babelfont [tamil]{tt}[ - Renderer=HarfBuzz, + %Renderer=OpenType, Scale=\NotoTam@scale, - Color=\Noto@color, + \Noto@color, Extension = .ttf, UprightFont = *-Regular, ItalicFont = *-Regular,% has no italic face @@ -949,8 +957,13 @@ \RequirePackage{bm}% load after all math to give further access to bold math -%% Ensure that the current font is used for equation tags, not \normalfont as set by amsmath -\def\maketag@@@#1{\hbox{\m@th#1}} +% To free \eqref from the normal font (e.g., for use in section headings or captions). Revised 2024/07/28 +\renewcommand{\eqref}[1]{\textup{\hbox{\m@th{(\ignorespaces\ref{#1}\unskip\@@italiccorr)}}}} +% +% amsmath def: \newcommand{\eqref}[1]{\textup{\tagform@{\ref{#1}}}} +% \def\tagform@#1{\maketag@@@{(\ignorespaces#1\unskip\@@italiccorr)}} +% \def\maketag@@@#1{\hbox{\m@th\normalfont#1}} + % The article class calls \sloppy in two-column mode (\tolerance 9999, \emergencystretch 3em) % The following adjustments affect line breaking; the values below are intended to produce @@ -1000,11 +1013,11 @@ \SetMathAlphabet{\mathsf}{sans}{\encodingdefault}{\sfdefault}{m}{n}% \mathsf is upright. -% Nice solution from DPC to prevent aux file errors (due to active characters from babel) when switching from pdflatex to lualatex. -\ifx\directlua\undefined - \AtBeginDocument{\immediate\write\@auxout{\detokenize{% - \ifx\directlua\undefined\else\endinput\fi}}} -\fi +%% Nice solution from DPC to prevent aux file errors (due to active characters from babel) when switching from pdflatex to lualatex. Disabled, 2024/07/28 +%\ifx\directlua\undefined +% \AtBeginDocument{\immediate\write\@auxout{\detokenize{% +% \ifx\directlua\undefined\else\endinput\fi}}} +%\fi %%%%%%%% Footers and Footnotes %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1034,7 +1047,6 @@ \fancyfoot[CE,CO]{\@SetFont\thepage\\[1ex]\footnotesize The United States Government retains, and by accepting the article for publication, the publisher acknowledges that the United States Government retains, a non-exclusive, paid-up, irrevocable, worldwide license to publish or reproduce the published form of this work, or allow others to do so, for United States Government purposes.} \fi -% was missing from earlier versions...? \ifasmeconf@govtsome \newgeometry{left=0.5in, right=0.5in, top=0.5in, bottom = 1.in, footskip = 0.3in, columnsep = 0.38in} \fancyfoot[RO,RE]{} @@ -1088,39 +1100,36 @@ \titlespacing\subsubsection{\parindent}{6pt plus 3pt minus 2pt}{0pt plus 2pt minus 1pt} % from 12 4 3, 2019/7/7 %% Special handling of the appendices -%% Assumes that appendices are the last content in paper -\RenewDocumentCommand{\appendix}{}{% - \setcounter{section}{0} - \pdfbookmark[0]{\appendicesname}{appendices} - \renewcommand\thesection{\Alph{section}} - \titleformat{\section}{\mathversion{sansbold}\bfseries\sffamily\raggedright}{\MakeTextUppercase{\appendixname}\ \thesection.}{0.5em}{\MakeTextUppercase} -} - -%% This patches titlesec's unprotected re-definition of \footnote. -%% See discussion here: https://github.com/jbezos/titlesec/issues/48 +%% Assumes that appendices are the last content in paper +%% Code revised to better support tagged pdf, 2024/07/26. +\patchcmd{\appendix}{% + \setcounter{subsection}{0}% +}{% + \setcounter{subsection}{0}\pdfbookmark[1]{\appendicesname}{appendices}% +}{}{} +\apptocmd{\appendix}{\titleformat{\section}[block]{\mathversion{sansbold}\bfseries\sffamily\raggedright}{\MakeTextUppercase{\appendixname}\ \thesection.}{0.5em}{\MakeTextUppercase}}{}{} +% Changed to block layout (rather than default hanging) whilst retaining \raggedright, since "Appendix X." is a very wide hanging indent. 2024/07/26 + +%% This patches titlesec's unprotected re-definition of \footnote. See discussion here: https://github.com/jbezos/titlesec/issues/48 %% Without this patch, recent versions of LaTeX will require \protect\footnote in section headings. -%% This issue may be corrected in titlesec, but keeping the patch anyway. +%% This issue may be corrected in titlesec, but keeping the patch for backward compatibility. \patchcmd{\ttl@select}{\def\footnote}{\protected\def\footnote}{\typeout{Asmeconf.sty patched titlesec to have protected def of footnote}}{} %%%%%%%%%% Hyperref, bookmarks, and PDF/A %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% new pdf management in LaTeX, with \DocumentMetaData{..}, is preferred to this *legacy* approach. \ifpdftex - %%% to assist with unicode glyph mapping, following M. Sharpe's recommendation in the newtx documentation. - \IfFormatAtLeastTF{2020/10/01}{\relax}{% - \pdfgentounicode=1 %% enable CMaps; has moved into the latex kernel Oct 2020 - \input glyphtounicode.tex %% lists of mappings; has moved into the latex kernel Oct 2020 - } + %%% to assist with unicode glyph mapping, following M. Sharpe's recommendation in the newtx documentation. + %%% as of 2024/07/28, these are still necessary with \DocumentMetadata{pdfstandard=A-3u}. Note: glyphtounicode-cmex.tex is now in latex-lab. \InputIfFileExists{glyphtounicode-cmr.tex}{}{} %% additional mappings \InputIfFileExists{glyphtounicode-ntx.tex}{}{} %% additional mappings \ifac@setpdfa - %%%% pdfmanagement options, from Ulrike Fischer 2021/06/12 - \if@asme@pdfmanagement - \ClassInfo{asmeconf}{pdfmanagement is defined. Class file will not load a color profile} + %% new pdf management in LaTeX, with \DocumentMetaData{..}, is preferred to this *legacy* approach. + \ifasme@pdfmanagement + \ClassInfo{\ClassName}{pdfmanagement is defined. Class file will not load a color profile} \else - \ClassInfo{asmeconf}{NOTE: pdfmanagement not defined. Class file will load a color profile}% + \ClassInfo{\ClassName}{NOTE: pdfmanagement not defined. Class file will load a color profile}% %%% a fairly generic RGB color profile, aimed at on-screen rendering (not print production) \immediate\pdfobj stream attr{/N 3} file{sRGB.icc} \pdfcatalog{% @@ -1158,20 +1167,20 @@ \urlstyle{same} % don't switch to typewriter font for urls \RequirePackage{doi} % supports the nasty characters in some doi's \renewcommand{\doitext}{DOI } % change to this from default value, {doi:}, per ASME specification -\RequirePackage{bookmark} % improves handling of pdf bookmarks \providecommand*{\toclevel@subfigure}{1}% <== to address unknown bookmark level of subfigure. 2021/12/24 \providecommand\hrefurl[2]{\href{#1}{#2}}% to address certain issues around URL recognition with new pdf management code, 2021/12/02 -\if@asme@pdfmanagement - \ClassInfo{asmejour}{pdfmanagement is defined. Class file will not load hyperxmp} +\ifasme@pdfmanagement + \ClassInfo{asmejour}{pdfmanagement is defined. Class file will not load hyperxmp and bookmark packages} \else + \RequirePackage{bookmark}% improves handling of pdf bookmarks \RequirePackage{hyperxmp}% improve transfer of metadata to pdf % Patch bug in hyperxmp, unless a more recent version is used. \ifdefined\hyxmp@no@bad@parts% \hyxmp@no@bad@parts is not def'd in TeX Live 2019 or older - \@ifpackagelater{hyperxmp}{2022/10/15}{% v5.11 or later + \IfPackageAtLeastTF{hyperxmp}{2022/10/15}{% v5.11 or later \relax }{% \newcount\hypxmp@tempcnt @@ -1180,13 +1189,11 @@ \hyxmp@pdfstringdef\@pdfapart{\the\hypxmp@tempcnt}% } } - \else - \relax \fi \fi -%%% ==> recent and evolving development of \pdfstring removes all robust commands from bookmarks, so -%%% by early 2024, errors are not present; however, these commands serve to still suppress warnings. +%%% ==> recent development of \pdfstring removes all robust commands from bookmarks, so that +%%% by early 2024, errors are not present; these commands serve to still suppress warnings, however. %% Since \bm may be useful in headings, this fix will reduce frequency with which %% alternate pdfstrings must be given in revised section command as \section[pdfstring]{texstring} @@ -1212,7 +1219,7 @@ %% Ensure that tag color does not follow \eqref into bookmarks, 2020/02/28 \pdfstringdefDisableCommands{% - \def\eqref#1{(\ref{#1})}% + \def\eqref#1{(\ref*{#1})}% \ref* is from hyperref } % Let's make sure footnotes in section headings don't break pdf bookmarks. @@ -1222,7 +1229,6 @@ } - %% Let's also add \footnote to the \TextUppercase exception list, so that footnote text won't be capitalized %% if given in section headings. Ditto for \eqref % @@ -1244,13 +1250,12 @@ \renewcommand{\linenumberfont}{\normalfont\footnotesize\color{red}} \AtBeginDocument{\linenumbers} \ifasmeconf@balance - \ClassWarningNoLine{asmeconf}{Package lineno loaded, so final column balancing will be disabled}% + \ClassWarningNoLine{\ClassName}{Package lineno loaded, so final column balancing will be disabled}% \fi %%% Patch to allow line numbering in AMS math environments. %%% This patch is for lineno versions earlier than v5.2 [2023/05/19]. As of mid-2023, the lineno package - %%% has been corrected to account for the AMS math environments. Retaining temporarily for backward compatibility. + %%% has been corrected to account for the AMS math environments. Retaining for backward compatibility. %%% postdisplaypenalty adjusted to avoid extra line number at end, see: https://tex.stackexchange.com/a/461192/ - %%% multline has some additional problem that puts an extra line number above it. \IfPackageAtLeastTF{lineno}{2023/05/19}{\relax}{ \NewDocumentCommand{\ac@losepostpenalty}{}{\patchcmd{\linenomathWithnumbers}{\advance\postdisplaypenalty\linenopenalty}{}{}{}} % @@ -1270,7 +1275,7 @@ \ifasmeconf@balance \RequirePackage{flushend}% flushend package is NOT compatible with lineno \AtEndDocument{\flushcolsend}% - \LogNote{Calling flushend package to balance column height on last page}% + \ClassNoteNoLine{\ClassName}{Calling flushend package to balance column height on last page}% \fi% \fi \providecommand{\@LN@col}[1]{\relax}% Enable dropping lineno option without trashing .aux file @@ -1364,7 +1369,10 @@ \NewDocumentCommand\PaperNo{m}{\gdef\@PaperNo{#1}} \providecommand\@PaperNo{\protect\phantom{NO.}} -\NewDocumentCommand\PaperTitle{m}{\gdef\@PaperTitle{#1}} +\NewDocumentCommand\PaperTitle{m}{% + \gdef\@PaperTitle{#1}% + \gdef\@title{#1}% added 2024/07/28 +} \providecommand\@PaperTitle{\hbox{ }} \NewDocumentCommand\@HeaderTitle{}{% @@ -1419,7 +1427,7 @@ %%%% option to use the traditional grid layout of authors or the inline style \ifasmeconf@grid - \LogNote{Selected option for a grid of author blocks}% + \ClassNoteNoLine{\ClassName}{Selected option for a grid of author blocks}% %%%%%%%%%%%%%%%%%%%% Gridded author layout %%%%%%%%%%%%%%%%%%%%%%%%% @@ -1463,7 +1471,7 @@ \ifblank{#1}{% \expandafter\xdef\csname aut@\theauthorcnt\endcsname{}% \expandafter\xdef\csname autaffil@\theauthorcnt\endcsname{-1} - \ClassWarning{asmeconf}{Missing author name, check for extra comma}% + \ClassWarning{\ClassName}{Missing author name, check for extra comma}% }{\expandafter\xdef\csname aut@\theauthorcnt\endcsname{#1}% }% }% defines \aut@authorcnt as Name #1 @@ -1547,12 +1555,18 @@ \fi \fi \ifnum\value{authorno}>15 - \ClassWarningNoLine{asmeconf}{The class is programmed for up to 15 author blocks. If some of your authors are at the same institution, % + \ClassWarningNoLine{\ClassName}{The class is programmed for up to 15 author blocks. If some of your authors are at the same institution, % you may put more than one name above a single address. If you need more than 15 author blocks, try using the in-line author style % instead of the [grid] option} \fi }% end whiledo } + \ExplSyntaxOn + % next three are for backward compatibility + \cs_if_exist:NF \cs_gset:Npe { \cs_generate_variant:Nn \cs_gset:Npn {Npe} } + \cs_if_exist:NF \tl_set:Ne { \cs_generate_variant:Nn \tl_set:Nn {Ne} } + \cs_if_exist:NF \tl_put_right:Ne { \cs_generate_variant:Nn \tl_put_right:Nn {Ne} } + \NewDocumentCommand\@ConstructAuthorBlock{}{% \ifnum\value{authorno}>3 \JoinCoffins\firstrowauthorblock[hc,b]\secondrowauthorblock[hc,t](0pt, -1.5\baselineskip) @@ -1566,8 +1580,34 @@ \ifnum\value{authorno}>12 \JoinCoffins\firstrowauthorblock[hc,b]\fifthrowauthorblock[hc,t](0pt, -1.5\baselineskip) \fi - \centerline{\TypesetCoffin\firstrowauthorblock}%% in this instance, \centerline is better than \centering + \centerline{\TypesetCoffin\firstrowauthorblock}% in this instance, \centerline is better than \centering + \__asmeconf_concataut: + \cs_gset:Npe \@author { \tl_use:N \g_asmeconf_authors_tl } + %\iow_term:e { \tl_use:N \g_asmeconf_authors_tl }% diagnostic only } + % build comma-separated list of author names + \cs_new_protected:Nn \__asmeconf_concataut: { + \tl_new:N \g_asmeconf_authors_tl + \int_set:Nn \l_tmpa_int {1} + \int_new:N \l__asmeconf_noauts + \int_set:Nn \l__asmeconf_noauts { \value{authorcnt} } + \int_do_until:nNnn { \l_tmpa_int } > { \l__asmeconf_noauts } + { + \tl_set:Ne \l_tmpa_tl {\use:c { aut@ \int_use:N \l_tmpa_int } } + \tl_replace_all:Nnn \l_tmpa_tl {\unhbox \voidb@x \protect \penalty \@M \ } {~} + % If tex unbreakable space character "~" has expanded, replace by a simple space, which is "~" in Expl3 syntax + \tl_remove_all:Nn \l_tmpa_tl { \JointFirstAuthor } + \tl_replace_all:Nnn \l_tmpa_tl { \CorrespondingAuthor } { \use_none:n } + \tl_replace_all:Nnn \l_tmpa_tl { \affil } { \use_none:n } + \tl_replace_all:Nnn \l_tmpa_tl { \xdef } { \use_none:nn } + \tl_put_right:Ne \g_asmeconf_authors_tl \l_tmpa_tl + \int_compare:nNnT { \l_tmpa_int } < { \l__asmeconf_noauts} { + \tl_put_right:Ne \g_asmeconf_authors_tl { ,~ } + } + \int_incr:N \l_tmpa_int + } + } + \ExplSyntaxOff %%% otherwise use the new compact layout of authors \else @@ -1576,13 +1616,35 @@ \NewCoffin{\AffiliationBlock} \NewCoffin{\AffiliationsBlock} \AtBeginDocument{\SetHorizontalCoffin\AffiliationsBlock{}}% corrected 2021/12/01 - + + \ExplSyntaxOn + \cs_if_exist:NF \cs_gset:Npe { \cs_generate_variant:Nn \cs_gset:Npn {Npe} } + \cs_if_exist:NF \tl_gset:Ne { \cs_generate_variant:Nn \tl_gset:Nn {Ne} } + %% NB: \parbox width to \textwidth (full page) not \linewidth (single column) \NewDocumentCommand\SetAuthors{m}{% - \SetHorizontalCoffin\AuthorBlock{% + \SetHorizontalCoffin\AuthorBlock{% ignoring the bug in testphase tagging \parbox{\textwidth}{\centering\sffamily\bfseries\ignorespaces#1\ignorespaces}% + % NB: in vertical mode \parbox needs \noindent ahead of it, _inside_ vertical coffin + % \SetVerticalCoffin\AuthorBlock{\textwidth}{% 2024/07/30, test a vertical coffin alternative + % \centering\sffamily\bfseries\ignorespaces#1\ignorespaces% + \__asmeconf_striptokens:n {#1} + \cs_gset:Npe \@author { \tl_use:N \g_asmeconf_authors_tl }% set \@author = list of authors, 2024/07/31 } } + % strip \affil{..}, \JointFirstAuthor, \CorrespondingAuthor{...} from argument + \cs_new_protected:Nn \__asmeconf_striptokens:n { + \tl_set:Nn \l_tmpa_tl {#1} + \regex_replace_all:nnN { \cA\~ } {\ } \l_tmpa_tl % replace ~ by space in author list + %\tl_replace_all:Nnn \l__asmeconf_authors_tl {\ } {~}% change "\ " to space (but why? for text we would want this) + \tl_remove_all:Nn \l_tmpa_tl { \JointFirstAuthor } + \tl_replace_all:Nnn \l_tmpa_tl { \affil } { \use_none:n } + \tl_replace_all:Nnn \l_tmpa_tl { \CorrespondingAuthor } { \use_none:n } + \tl_new:N \g_asmeconf_authors_tl + \tl_gset:Ne \g_asmeconf_authors_tl \l_tmpa_tl + \iow_term:e { \tl_use:N \g_asmeconf_authors_tl }% diagnostic only + } + \ExplSyntaxOff \def\@makefnmark{\hbox{\@textsuperscript{\sffamily\@thefnmark}}}% @@ -1598,14 +1660,14 @@ %%% Affiliation mark \NewDocumentCommand{\affil}{m}{% \ifblank{#1}{% - \ClassWarning{asmeconf}{Empty affiliation tag}% + \ClassWarning{\ClassName}{Empty affiliation tag}% \@gobble% 9 Dec 2021, addresses modification for commas }{\bfseries\footnotemark[#1]}% } %%% to deal with sequential notes as, e.g., "1,*", or "1,2,*" %%%%%%%%%% \ExplSyntaxOn - \cs_new:Npn \__asmecome_OtherNoteComma:n { + \cs_new:Npn \__asmeconf_OtherNoteComma:n { \peek_meaning:NTF \affil { \textsuperscript{\mdseries,} } { \peek_meaning:NTF \CorrespondingAuthor @@ -1614,11 +1676,11 @@ } } \cs_new_eq:NN \__saveAF \affil - \cs_gset_protected:Npn \affil #1 { \__saveAF{#1} \__asmecome_OtherNoteComma:n } + \cs_gset_protected:Npn \affil #1 { \__saveAF{#1} \__asmeconf_OtherNoteComma:n } \cs_new_eq:NN \__saveCA \CorrespondingAuthor - \cs_gset_protected:Npn \CorrespondingAuthor #1 { \__saveCA{#1} \__asmecome_OtherNoteComma:n } + \cs_gset_protected:Npn \CorrespondingAuthor #1 { \__saveCA{#1} \__asmeconf_OtherNoteComma:n } \cs_new_eq:NN \__saveJA \JointFirstAuthor - \cs_gset_protected:Npn \JointFirstAuthor { \__saveJA \__asmecome_OtherNoteComma:n } + \cs_gset_protected:Npn \JointFirstAuthor { \__saveJA \__asmeconf_OtherNoteComma:n } \ExplSyntaxOff %%% @@ -1633,7 +1695,6 @@ %%%% Make the title and author section \NewDocumentCommand\MakeTitlePage{}{% \twocolumn[ - \begin{@twocolumnfalse} \@HeaderTitle \vspace*{2\baselineskip} \ifasmeconf@grid @@ -1642,7 +1703,6 @@ \@SetAuthorBlock \fi \vspace*{3\baselineskip} - \end{@twocolumnfalse} ] \let\@makefnmark\savemakefnmark% restore footnote mark font \renewcommand*{\thefootnote}{\fnsymbol{footnote}} @@ -1767,12 +1827,12 @@ %%%%%%%%%%%%%%%%%% Times-like fonts for specific languages %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ifpdftex % Under lualatex, babel has problems with the following approach, which assumes that fontspec has not been loaded. - % Recommend not to choose the [nofontspec] option. + % Recommend not to choose the [nofontspec] option. % Several modifications made in response to newtx v1.71, 2022/03/14 \ifac@vietnamese % \IfFormatAtLeastTF{2020/02/02}{\relax}{% - \ClassError{asmeconf}{Your LaTeX format is dated \fmtversion. LaTeX distributions 2020 are necessary to use the fonts of the [vietnamese] option with pdflatex}{Please UPDATE your LaTeX distribution: TeX Live is available for download at no charge: \string https://www.tug.org/texlive/. Alternatively, delete the class option [vietnamese].}% + \ClassError{\ClassName}{Your LaTeX format is dated \fmtversion. LaTeX distributions 2020 are necessary to use the fonts of the [vietnamese] option with pdflatex}{Please UPDATE your LaTeX distribution: TeX Live is available for download at no charge: \string https://www.tug.org/texlive/. Alternatively, delete the class option [vietnamese].}% } % \AtBeginDocument{% @@ -1831,7 +1891,7 @@ \ifac@greek % \IfFormatAtLeastTF{2020/02/02}{\relax}{% - \ClassError{asmeconf}{Your LaTeX format is dated \fmtversion. LaTeX distributions 2020 are necessary to use the fonts of the [greek] option with pdflatex}{Please UPDATE your LaTeX distribution: TeX Live is available for download at no charge: \string https://www.tug.org/texlive/. Alternatively, delete the class option [greek].}% + \ClassError{\ClassName}{Your LaTeX format is dated \fmtversion. LaTeX distributions 2020 are necessary to use the fonts of the [greek] option with pdflatex}{Please UPDATE your LaTeX distribution: TeX Live is available for download at no charge: \string https://www.tug.org/texlive/. Alternatively, delete the class option [greek].}% } % \AtBeginDocument{% @@ -1906,7 +1966,7 @@ \ifac@cyrillic % \IfFormatAtLeastTF{2020/02/02}{\relax}{% - \ClassError{asmeconf}{Your LaTeX format is dated \fmtversion. LaTeX distributions 2020 are necessary to use the fonts of the cyrillic language option with pdflatex, e.g., [russian]}{Please UPDATE your LaTeX distribution: TeX Live is available for download at no charge: \string https://www.tug.org/texlive/. Alternatively, delete the class option calling a cyrillic-alphabet language.}% + \ClassError{\ClassName}{Your LaTeX format is dated \fmtversion. LaTeX distributions 2020 are necessary to use the fonts of the cyrillic language option with pdflatex, e.g., [russian]}{Please UPDATE your LaTeX distribution: TeX Live is available for download at no charge: \string https://www.tug.org/texlive/. Alternatively, delete the class option calling a cyrillic-alphabet language.}% } % \AtBeginDocument{% diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.bbx b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.bbx index ff82f97f559..8f4e1bea05c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.bbx @@ -2,13 +2,13 @@ %% biblatex-ieee --- A biblatex implementation of the IEEE %% bibliography style %% Maintained by Joseph Wright -%% E-mail: joseph.wright@morningstar2.co.uk +%% E-mail: joseph@texdev.net %% Released under the LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% --------------------------------------------------------------- %% -\ProvidesFile{ieee-alphabetic.bbx}[2021/12/06 v1.3f biblatex bibliography style] +\ProvidesFile{ieee-alphabetic.bbx}[2024/08/14 v1.3g biblatex bibliography style] \RequireBibliographyStyle{ieee} @@ -53,8 +53,8 @@ {\item} %% -%% Copyright (C) 2011-2013,2015-2021 by -%% Joseph Wright <joseph.wright@morningstar2.co.uk> +%% Copyright (C) 2011-2013,2015-2021,2024 by +%% Joseph Wright <joseph@texdev.net> %% %% It may be distributed and/or modified under the conditions of %% the LaTeX Project Public License (LPPL), either version 1.3c of diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.cbx b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.cbx index 302517b02e1..d28449741b3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee-alphabetic.cbx @@ -2,13 +2,13 @@ %% biblatex-ieee --- A biblatex implementation of the IEEE %% bibliography style %% Maintained by Joseph Wright -%% E-mail: joseph.wright@morningstar2.co.uk +%% E-mail: joseph@texdev.net %% Released under the LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% --------------------------------------------------------------- %% -\ProvidesFile{ieee-alphabetic.cbx}[2021/12/06 v1.3f biblatex citation style] +\ProvidesFile{ieee-alphabetic.cbx}[2024/08/14 v1.3g biblatex citation style] \RequireCitationStyle{alphabetic} @@ -45,8 +45,8 @@ } %% -%% Copyright (C) 2011-2013,2015-2021 by -%% Joseph Wright <joseph.wright@morningstar2.co.uk> +%% Copyright (C) 2011-2013,2015-2021,2024 by +%% Joseph Wright <joseph@texdev.net> %% %% It may be distributed and/or modified under the conditions of %% the LaTeX Project Public License (LPPL), either version 1.3c of diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx index 77a8b6794de..088064d1f35 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.bbx @@ -2,13 +2,13 @@ %% biblatex-ieee --- A biblatex implementation of the IEEE %% bibliography style %% Maintained by Joseph Wright -%% E-mail: joseph.wright@morningstar2.co.uk +%% E-mail: joseph@texdev.net %% Released under the LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% --------------------------------------------------------------- %% -\ProvidesFile{ieee.bbx}[2021/12/06 v1.3f biblatex bibliography style] +\ProvidesFile{ieee.bbx}[2024/08/14 v1.3g biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -30,6 +30,7 @@ maxbibnames = 6, sorting = none, dashed = false, + urldate = long, } \uspunctuation @@ -50,6 +51,7 @@ {\bibstring{jourser}\addnbspace#1} \DeclareFieldFormat[online,report]{title}{\mkbibquote{#1\isdot}} \DeclareFieldFormat{url}{\bibstring{url}\addcolon\space\url{#1}} +\DeclareFieldFormat{urldate}{\bibstring{urlseen}\space#1} \DeclareFieldFormat*{volume} {\bibstring{volume}\addnbspace#1} \DeclareFieldFormat[article,periodical]{volume} @@ -76,6 +78,7 @@ presentedat = presented at the\addspace , techreport = Tech\adddot\addspace Rep\adddot , url = [Online]\adddot\addspace Available , + urlseen = Accessed\addcolon } \DefineBibliographyStrings{english}{ @@ -210,6 +213,7 @@ {% \printtext[journaltitle]{% \printfield[titlecase]{journaltitle}% + \setunit{\subtitlepunct}% \printfield[titlecase]{journalsubtitle}% }% }% @@ -331,6 +335,17 @@ \printfield{titleaddon}% } +\renewbibmacro*{url+urldate}{% + \usebibmacro{urldate}% + \setunit{\adddot\space}% + \usebibmacro{url}% +} + +\renewbibmacro*{urldate}{% + \printurldate + \newunit + } + \renewbibmacro*{volume+number+eid}{% \printfield{volume}% \newunit @@ -713,7 +728,6 @@ {\usebibmacro{eprint}} {}% \setunit{\adddot\addspace}% - \printtext[parens]{\usebibmacro{date}}% \newunit\newblock \usebibmacro{url+urldate}% \setunit{\adddot\addspace}% @@ -802,8 +816,8 @@ \usebibmacro{finentry}} %% -%% Copyright (C) 2011-2013,2015-2021 by -%% Joseph Wright <joseph.wright@morningstar2.co.uk> +%% Copyright (C) 2011-2013,2015-2021,2024 by +%% Joseph Wright <joseph@texdev.net> %% %% It may be distributed and/or modified under the conditions of %% the LaTeX Project Public License (LPPL), either version 1.3c of diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx index 877d645053f..4b1886683fd 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-ieee/ieee.cbx @@ -2,19 +2,19 @@ %% biblatex-ieee --- A biblatex implementation of the IEEE %% bibliography style %% Maintained by Joseph Wright -%% E-mail: joseph.wright@morningstar2.co.uk +%% E-mail: joseph@texdev.net %% Released under the LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% --------------------------------------------------------------- %% -\ProvidesFile{ieee.cbx}[2021/12/06 v1.3f biblatex citation style] +\ProvidesFile{ieee.cbx}[2024/08/14 v1.3g biblatex citation style] \RequireCitationStyle{numeric-comp} \ExecuteBibliographyOptions{ - maxcitenames = 3, - minnames = 3, + maxcitenames = 2, + minnames = 1, sorting = none } @@ -122,8 +122,8 @@ {}}} %% -%% Copyright (C) 2011-2013,2015-2021 by -%% Joseph Wright <joseph.wright@morningstar2.co.uk> +%% Copyright (C) 2011-2013,2015-2021,2024 by +%% Joseph Wright <joseph@texdev.net> %% %% It may be distributed and/or modified under the conditions of %% the LaTeX Project Public License (LPPL), either version 1.3c of diff --git a/Master/texmf-dist/tex/latex/biblatex-ieee/magyar-ieee.lbx b/Master/texmf-dist/tex/latex/biblatex-ieee/magyar-ieee.lbx index 79ffd21ce92..33e88122fda 100644 --- a/Master/texmf-dist/tex/latex/biblatex-ieee/magyar-ieee.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-ieee/magyar-ieee.lbx @@ -2,7 +2,7 @@ %% biblatex-ieee --- A biblatex implementation of the IEEE %% bibliography style %% Maintained by Joseph Wright -%% E-mail: joseph.wright at morningstar2.co.uk +%% E-mail: jsoeph@texdev.net %% Released under the LaTeX Project Public License v1.3c or later %% See http://www.latex-project.org/lppl.txt %% --------------------------------------------------------------- @@ -34,8 +34,8 @@ } %% -%% Copyright (C) 2011-2013,2015-2020 by -%% Joseph Wright <joseph.wright at morningstar2.co.uk> +%% Copyright (C) 2011-2013,2015-2020,2024 by +%% Joseph Wright <joseph@texdev.net> %% %% It may be distributed and/or modified under the conditions of %% the LaTeX Project Public License (LPPL), either version 1.3c of diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx b/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx index cb0c1aa4f5b..3a52993eb91 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/american-oxref.lbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{american-oxref.lbx} [\Version\space American English conventions required by the biblatex-oxref styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx b/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx index f319e7d6397..05fe2abfc79 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/british-oxref.lbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{british-oxref.lbx} [\Version\space British English conventions required by the biblatex-oxref styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx b/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx index 34619d7c2b9..52390c70e4d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/english-oxref.lbx @@ -13,14 +13,14 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{english-oxref.lbx} [\Version\space Generic English conventions required by the biblatex-oxref styles] \InheritBibliographyExtras{english} \DeclareBibliographyExtras{% \def\finalandcomma{\addcomma}% - \def\blx@ox@langbibstring#1#2{#1\addspace\bibstring{#2}}% + \def\blx@ox@langbibstring#1#2{#1\setunit*{\addspace}\bibstring{#2}}% } \UndeclareBibliographyExtras{% \def\blx@ox@langbibstring#1#2{\bibstring{#2}}% @@ -141,11 +141,11 @@ byreviser = {{revised by}{rev\adddot}}, byreviewer = {{reviewed by}{rev\adddot}}, bycollaborator = {{in collaboration with}{in collab\adddotspace with}}, - bytranslator = {{translated \lbx@lfromlang\ by}{trans\adddot\ \lbx@sfromlang}}, + bytranslator = {{translated by}{trans\adddot}}, bycommentator = {{commented by}{comm\adddot}}, byannotator = {{annotated by}{annot\adddot}}, - byeditortr = {{edited and translated \lbx@lfromlang\ by}% - {ed\adddotspace and trans\adddot\ \lbx@sfromlang}}, + byeditortr = {{edited and translated by}% + {ed\adddotspace and trans\adddot}}, byeditorco = {{edited and commented by}% {ed\adddotspace and comm\adddot}}, byeditoran = {{edited and annotated by}% @@ -156,16 +156,16 @@ {ed.\adddotspace with foreword}}, byeditoraf = {{edited, with an afterword, by}% {ed.\adddotspace with afterword}}, - byeditortrco = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented by}% - {ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and comm\adddot}}, - byeditortran = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated by}% - {ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot\adddot}}, - byeditortrin = {{edited and translated \lbx@lfromlang, with an introduction, by}% - {with introduction, ed\adddotspace and trans\adddot\ \lbx@sfromlang}}, - byeditortrfo = {{edited and translated \lbx@lfromlang, with a foreword, by}% - {with foreword, ed\adddotspace and trans\adddot\ \lbx@sfromlang}}, - byeditortraf = {{edited and translated \lbx@lfromlang, with an afterword, by}% - {with afterword, ed\adddotspace and trans\adddot\ \lbx@sfromlang}}, + byeditortrco = {{edited, translated\finalandcomma\ and commented by}% + {ed.,\addabbrvspace trans\adddot\finalandcomma\ and comm\adddot}}, + byeditortran = {{edited, translated\finalandcomma\ and annotated by}% + {ed.,\addabbrvspace trans\adddot\finalandcomma\ and annot\adddot}}, + byeditortrin = {{edited and translated, with an introduction, by}% + {with introduction, ed\adddotspace and trans\adddot}}, + byeditortrfo = {{edited and translated, with a foreword, by}% + {with foreword, ed\adddotspace and trans\adddot}}, + byeditortraf = {{edited and translated, with an afterword, by}% + {with afterword, ed\adddotspace and trans\adddot}}, byeditorcoin = {{edited and commented, with an introduction, by}% {with introduction, ed\adddotspace and comm\adddot}}, byeditorcofo = {{edited and commented, with a foreword, by}% @@ -178,41 +178,40 @@ {with foreword, ed\adddotspace and annot\adddot}}, byeditoranaf = {{edited and annotated, with an afterword, by}% {with afterword, ed\adddotspace and annot\adddot}}, - byeditortrcoin = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented, with an introduction, by}% - {with introduction, ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and comm\adddot}}, - byeditortrcofo = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented, with a foreword, by}% - {with foreword, ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and comm\adddot}}, - byeditortrcoaf = {{edited, translated \lbx@lfromlang\finalandcomma\ and commented, with an afterword, by}% - {with afterword, ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and comm\adddot}}, - byeditortranin = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated, with an introduction, by}% - {with introduction, ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot\adddot}}, - byeditortranfo = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated, with a foreword, by}% - {with foreword, ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot\adddot}}, - byeditortranaf = {{edited, translated \lbx@lfromlang\finalandcomma\ and annotated, with an afterword, by}% - {with afterword, ed.,\addabbrvspace trans\adddot\ \lbx@sfromlang\finalandcomma\ and annot\adddot}}, - bytranslatorco = {{translated \lbx@lfromlang\ and commented by}% - {trans\adddot\ \lbx@sfromlang\ and comm\adddot}}, - bytranslatoran = {{translated \lbx@lfromlang\ and annotated by}% - {trans\adddot\ \lbx@sfromlang\ and annot\adddot}}, - bytranslatorin = {{translated \lbx@lfromlang, with an introduction, by}% - {trans\adddot\ \lbx@sfromlang\ with introduction}}, - bytranslatorfo = {{translated \lbx@lfromlang, with a foreword, by}% - {trans\adddot\ \lbx@sfromlang\ with foreword}}, - bytranslatoraf = {{translated \lbx@lfromlang, with an afterword, by}% - {trans\adddot\ \lbx@sfromlang\ with afterword}}, - bytranslatorcoin = {{translated \lbx@lfromlang\ and commented, with an introduction, by}% - {with introduction, trans\adddot\ \lbx@sfromlang\ and comm\adddot}}, - bytranslatorcofo = {{translated \lbx@lfromlang\ and commented, with a foreword, by}% - {with foreword, trans\adddot\ \lbx@sfromlang\ and comm\adddot}}, - bytranslatorcoaf = {{translated \lbx@lfromlang\ and commented, with an afterword, by}% - {with afterword, trans\adddot\ \lbx@sfromlang\ and comm\adddot}}, - bytranslatoranin = {{translated \lbx@lfromlang\ and annotated, with an introduction, by}% - {with introduction, trans\adddot\ \lbx@sfromlang\ and annot\adddot}}, - bytranslatoranfo = {{translated \lbx@lfromlang\ and annotated, with a foreword, by}% - {with foreword, trans\adddot\ \lbx@sfromlang\ and annot\adddot}}, - bytranslatoranaf = {{translated \lbx@lfromlang\ and annotated, with an afterword, by}% - {with afterword, trans\adddot\ \lbx@sfromlang\ and annot\adddot}}, - withintroduction = {{with an introduction by}{with an introduction by}}, + byeditortrcoin = {{edited, translated\finalandcomma\ and commented, with an introduction, by}% + {with introduction, ed.,\addabbrvspace trans\adddot\finalandcomma\ and comm\adddot}}, + byeditortrcofo = {{edited, translated\finalandcomma\ and commented, with a foreword, by}% + {with foreword, ed.,\addabbrvspace trans\adddot\finalandcomma\ and comm\adddot}}, + byeditortrcoaf = {{edited, translated\finalandcomma\ and commented, with an afterword, by}% + {with afterword, ed.,\addabbrvspace trans\adddot\finalandcomma\ and comm\adddot}}, + byeditortranin = {{edited, translated\finalandcomma\ and annotated, with an introduction, by}% + {with introduction, ed.,\addabbrvspace trans\adddot\finalandcomma\ and annot\adddot}}, + byeditortranfo = {{edited, translated\finalandcomma\ and annotated, with a foreword, by}% + {with foreword, ed.,\addabbrvspace trans\adddot\finalandcomma\ and annot\adddot}}, + byeditortranaf = {{edited, translated\finalandcomma\ and annotated, with an afterword, by}% + {with afterword, ed.,\addabbrvspace trans\adddot\finalandcomma\ and annot\adddot}}, + bytranslatorco = {{translated and commented by}% + {trans\adddotspace and comm\adddot}}, + bytranslatoran = {{translated and annotated by}% + {trans\adddotspace and annot\adddot}}, + bytranslatorin = {{translated, with an introduction, by}% + {trans\adddotspace with introduction}}, + bytranslatorfo = {{translated, with a foreword, by}% + {trans\adddotspace with foreword}}, + bytranslatoraf = {{translated, with an afterword, by}% + {trans\adddotspace with afterword}}, + bytranslatorcoin = {{translated and commented, with an introduction, by}% + {with introduction, trans\adddotspace and comm\adddot}}, + bytranslatorcofo = {{translated and commented, with a foreword, by}% + {with foreword, trans\adddotspace and comm\adddot}}, + bytranslatorcoaf = {{translated and commented, with an afterword, by}% + {with afterword, trans\adddotspace and comm\adddot}}, + bytranslatoranin = {{translated and annotated, with an introduction, by}% + {with introduction, trans\adddotspace and annot\adddot}}, + bytranslatoranfo = {{translated and annotated, with a foreword, by}% + {with foreword, trans\adddotspace and annot\adddot}}, + bytranslatoranaf = {{translated and annotated, with an afterword, by}% + {with afterword, trans\adddotspace and annot\adddot}}, withcommentator = {{with a commentary by}{with a commentary by}}, withannotator = {{with annotations by}{with annotations by}}, withintroduction = {{with an introduction by}{with an introduction by}}, @@ -241,8 +240,10 @@ idempp = {{eidem}{eid\adddot}}, citedas = {{henceforth}{henceforth}}, thiscite = {{at}{at}}, - langamerican = {{English}{Eng\adddot}}, - langbrazilian = {{Brazilian}{Braz\adddot}}, + langamerican = {{American English}{Amer\adddotspace Eng\adddot}}, + langbasque = {{Basque}{Basq\adddot}}, + langbrazilian = {{Brazilian Portuguese}{Braz\adddotspace Port\adddot}}, + langbulgarian = {{Bulgarian}{Bulg\adddot}}, langcatalan = {{Catalan}{Catal\adddot}}, langcroatian = {{Croatian}{Croat\adddot}}, langczech = {{Czech}{Czech}}, @@ -252,17 +253,28 @@ langestonian = {{Estonian}{Eston\adddot}}, langfinnish = {{Finnish}{Finn\adddot}}, langfrench = {{French}{Fr\adddot}}, + langgalician = {{Galician}{Galic\adddot}}, langgerman = {{German}{Ger\adddot}}, langgreek = {{Greek}{Gr\adddot}}, + langhungarian = {{Hungarian}{Hung\adddot}}, langitalian = {{Italian}{It\adddot}}, + langjapanese = {{Japanese}{Jap\adddot}}, langlatin = {{Latin}{Lat\adddot}}, + langlatvian = {{Latvian}{Latv\adddot}}, + langlithuanian = {{Lithuanian}{Lith\adddot}}, + langmarathi = {{Marathi}{Mar\adddot}}, langnorwegian = {{Norwegian}{Norw\adddot}}, langpolish = {{Polish}{Pol\adddot}}, langportuguese = {{Portuguese}{Port\adddot}}, + langromanian = {{Romanian}{Rom\adddot}}, langrussian = {{Russian}{Russ\adddot}}, + langserbian = {{Serbian}{Serb\adddot}}, + langslovak = {{Slovak}{Slovak}}, langslovene = {{Slovene}{Slov\adddot}}, langspanish = {{Spanish}{Sp\adddot}}, langswedish = {{Swedish}{Swed\adddot}}, + langturkish = {{Turkish}{Turk\adddot}}, + langukrainian = {{Ukrainian}{Ukr\adddot}}, } %% %% Copyright (C) 2016–2023 Alex Ball diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx index 473f6c42d16..c73fc2c95aa 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxalph.bbx} [\Version\space Alphabetic bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx index f3541bff4a7..9c2a9ab2c46 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxalph.cbx} [\Version\space Alphabetic citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx index bd625202764..9045cf9d648 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxalph.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxalph.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx index 04b5c3b8406..ef1d0322c64 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-ibid.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx index 252b66b4f1b..848885d55e5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-ibid.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx index 28562c9fbe6..d44e3a3a5a6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-ibid.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-ibid.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx index d26e0a6d13e..e5f7d577ec8 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-inote.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx index 2f0cf8d67ef..40f4557fde4 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-inote.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx index 5b0e6eaa836..0e3d066ce73 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-inote.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-inote.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx index bb224734c16..0603f3fc93e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-note.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx index c2150b32312..e68736b15a7 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-note.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx index a9f26d759c4..2f96f373283 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-note.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-note.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx index e5d42ab3991..760d14f8daa 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad1.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx index f4e37274395..7609ff7ef85 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad1.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx index f7b6c3a0f9a..6674482e133 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad1.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad1.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx index 28c6f1c1f1f..1bb2b1ad334 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad2.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx index 7209c8cacaf..6b62164597b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad2.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx index 1df1385c14f..dcc6f60853b 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad2.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad2.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx index e024aabcdf5..8dd8c41ce17 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad3.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx index 146c6c2afb8..1afe5861dc9 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad3.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx index cf6bf1b8c2d..d0dcb90db08 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes-trad3.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes-trad3.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx index fad740be0cc..84c4da00d8e 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes.bbx} [\Version\space Footnote-based bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx index 7302e4fb091..359ea4fd779 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes.cbx} [\Version\space Footnote-based citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx index fb723c3fc58..936e7428a30 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnotes.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnotes.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx index 6adedef4b24..7ff5c440a83 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnum.bbx} [\Version\space Numeric bibliography style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx index d5d672b2ce9..c543e3adb7a 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnum.cbx} [\Version\space Numeric citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx index bc0a1e0cd0f..7f8955c4ae3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxnum.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxnum.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx index 8c904ae44ad..e761352b5f2 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxref.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxref.bbx} [\Version\space Base settings for bibliography styles inspired by the Oxford Guide to Style] @@ -55,6 +55,7 @@ \newcommand*{\uscasetitlepunct}{\addcomma\space} \renewcommand*{\relateddelim}{\addsemicolon\space} \DeclareDelimFormat{revsdnamedelim}{\addcomma} +\DeclareDelimFormat[pair]{revsdnamedelim}{} \DeclareDelimFormat{authortypedelim}{\addspace} \DeclareDelimFormat{editortypedelim}{\addspace} \DeclareDelimFormat{translatortypedelim}{\addspace} @@ -96,7 +97,7 @@ and test {\ifdefvoid{#2}}% }{}{% - \printdelim{revsdnamedelim}}% + \printdelim{revsdnamepunct}}% \ifdefvoid{#5}{}{\iftoggle{blx@ox@nametitle}{\bibnamedelimd\mkbibnametitle{#5}\isdot}{}}% \ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}% }{% @@ -111,10 +112,22 @@ and test {\ifdefvoid{#3}}% }{}{% - \printdelim{revsdnamedelim}}% + \printdelim{revsdnamepunct}}% \ifdefvoid{#5}{}{\iftoggle{blx@ox@nametitle}{\bibnamedelimd\mkbibnametitle{#5}\isdot}{}}% \ifdefvoid{#2}{}{\bibnamedelimd\mkbibnamegiven{#2}\isdot}% \ifdefvoid{#3}{}{\bibnamedelimd\mkbibnameprefix{#3}\isdot}}} +\renewbibmacro*{name:revsdelim}{% + \ifboolexpr{ + ( + test {\ifnumequal{\value{liststop}}{1}} + and + test \ifmorenames + ) + or + test {\ifnumequal{\value{liststop}}{2}} + } + {\printdelim{revsdnamedelim}} + {}} \def\blx@ox@lasthash{} \DeclareNameFormat{bib-family-given/cite-given-family}{% \iffieldannotation{inferred}{\ifnumequal{\value{listcount}}{1}{\bibopenbracket}{}}{}% @@ -159,13 +172,22 @@ \renewcommand*{\mkbibnametitle}[1]{##1}% }{}% \ifboolexpe{% - test {\ifnumgreater{\value{listcount}}{1}} - or ( + test {\ifnumequal{\value{listcount}}{\@ne}} + and + ( + test {\ifnumless{\value{listcount}}{\value{liststop}}} + or + test {\ifnumgreater{\value{listtotal}}{\value{maxnames}}} + or + test {\ifandothers{\currentname}} + ) + and not + ( test {\ifdefvoid\namepartgiven} and test {\ifdefvoid\namepartprefix} ) - }{}{\usebibmacro{name:revsdelim}}% + }{\usebibmacro{name:revsdelim}}{}% }{% \ifgiveninits{% \ifitemannotation{pseudo}{% @@ -201,6 +223,10 @@ \savefield{hash}{\blx@ox@lasthash}% }% \ifitemannotation{inferred}{\bibclosebracket}{}% + \ifitemannotation{variant}{% + \global\settoggle{blx@ox@variantname}{true}% + }{% + \global\settoggle{blx@ox@variantname}{false}}% \usebibmacro{name:andothers}% \iffieldannotation{inferred}{% \ifboolexpr{ @@ -256,13 +282,20 @@ }{% \global\settoggle{blx@ox@variantname}{false}}% \ifboolexpe{% - test {\ifnumgreater{\value{listcount}}{1}} - or ( + ( + test {\ifnumless{\value{listcount}}{\value{liststop}}} + or + test {\ifnumgreater{\value{listtotal}}{\value{maxnames}}} + or + test {\ifandothers{\currentname}} + ) + and not + ( test {\ifdefvoid\namepartgiven} and test {\ifdefvoid\namepartprefix} ) - }{}{\usebibmacro{name:revsdelim}}% + }{\usebibmacro{name:revsdelim}}{}% \usebibmacro{name:andothers}} \xpatchbibmacro{name:given-family}% {\bibnamedelimd\mkbibnamesuffix{#4}}% @@ -274,9 +307,22 @@ {}{\wlog{WARNING: biblatex-oxref failed to patch name:family-given}} \DeclareFieldFormat{nameaddon}{\mkbibbrackets{#1}} \DeclareFieldFormat{namevariant}{\mkbibparens{\bibstring{equals}\space #1}} +\newbibmacro*{namepair:delim}[3]{% + \ifnumgreater{#2}{\@ne}{% + \ifnumless{#2}{#3}{% + \printdelim{multinamedelim}% + }{% + \ifnumgreater{#3}{\c@maxnames}{% + \c@liststop\c@minnames + }{% + \c@liststop#3}% + \lbx@finalnamedelim{#1}}% + }{}} +\DeclareFieldFormat{expanded}{\mkbibparens{#1}} \newcounter{namepairs} \newsavebox{\blx@ox@namebox} \newsavebox{\blx@ox@altnamebox} +\newtoggle{blx@ox@thispairvariant}% \newbibmacro*{namepairs}[2]{% \setcounter{namepairs}{0}% \savebibmacro{name:andothers}% @@ -300,48 +346,58 @@ ) }{% \stepcounter{namepairs}% - \ifnumgreater{\value{namepairs}}{1}{% - \ifnumequal{\value{#1}}{2}{% - \setunit*{\addspace\bibstring{and}\addspace}% - }{% - \ifnumequal{\value{namepairs}}{\value{#1}}{% - \setunit*{\addcomma\space\bibstring{and}\addspace}% - }{% - \setunit*{\addcomma\space}% - }% - }% - }{}% \savebox{\blx@ox@namebox}{% \printnames[#1][\value{namepairs}-\value{namepairs}]{#1}% }% \let\blx@ox@firsthash=\blx@ox@lasthash + \savebox{\blx@ox@altnamebox}{% + \printnames[#1][\value{namepairs}-\value{namepairs}]{#2}% + }% + \let\blx@ox@secondhash=\blx@ox@lasthash + \iftoggle{blx@ox@variantname}{% + \toggletrue{blx@ox@thispairvariant}% + }{% + \togglefalse{blx@ox@thispairvariant}% + }% \IfEndWith{#2}{addon}{% - \savebox{\blx@ox@altnamebox}{% - \printnames[by#1][\value{namepairs}-\value{namepairs}]{#2}% - }% - \let\blx@ox@secondhash=\blx@ox@lasthash + \usebibmacro{namepair:delim}% + {\unhbox\blx@ox@namebox}{\value{namepairs}}{\value{#1}}% \ifdefstrequal{\blx@ox@firsthash}{\blx@ox@secondhash}{% - \unhbox\blx@ox@namebox + \hbox{}\unhbox\blx@ox@namebox }{% - \unhbox\blx@ox@namebox\addspace - \iftoggle{blx@ox@variantname}{% + \iftoggle{blx@ox@thispairvariant}{% \ifbibliography{% - \printtext[namevariant]{\printnames[#1][\value{namepairs}-\value{namepairs}]{#2}}% - }{}% + \delimcontext{pair}% + \printnames[#1][\value{namepairs}-\value{namepairs}]{#1}% + \setunit{\addspace}% + \printtext[namevariant]{% + \printnames[#1][\value{namepairs}-\value{namepairs}]{#2}}% + }{% + \hbox{}\unhbox\blx@ox@namebox + }% }{% - \printtext[nameaddon]{\unhbox\blx@ox@altnamebox}% + \delimcontext{pair}% + \printnames[#1][\value{namepairs}-\value{namepairs}]{#1}% + \setunit{\addspace}% + \printtext[nameaddon]{% + \printnames[#1][\value{namepairs}-\value{namepairs}]{#2}% + }% }% }% }{% - \savebox{\blx@ox@altnamebox}{% - \printnames[#1][\value{namepairs}-\value{namepairs}]{#2}% - }% - \let\blx@ox@secondhash=\blx@ox@lasthash \ifdefstrequal{\blx@ox@firsthash}{\blx@ox@secondhash}{% - \unhbox\blx@ox@namebox + \usebibmacro{namepair:delim}% + {\unhbox\blx@ox@namebox}{\value{namepairs}}{\value{#1}}% + \hbox{}\unhbox\blx@ox@namebox }{% - \unhbox\blx@ox@altnamebox - \addspace\mkbibparens{\unhbox\blx@ox@namebox}% + \usebibmacro{namepair:delim}% + {\unhbox\blx@ox@altnamebox}{\value{namepairs}}{\value{#1}}% + \delimcontext{pair}% + \printnames[#1][\value{namepairs}-\value{namepairs}]{#2}% + \setunit{\addspace}% + \printtext[expanded]{% + \printnames[#1][\value{namepairs}-\value{namepairs}]{#1}% + }% }% }% }% @@ -724,12 +780,12 @@ \DeclareFieldFormat{pages}{% \iffieldundef{bookpagination}% {\mkcomprange{#1}}% - {\mkcomprange[{\mkpageprefix[bookpagination]}]{#1}}% + {\mkpageprefix[bookpagination][\mkcomprange]{#1}}% } \DeclareFieldFormat{postnote}{% \iffieldundef{pagination}% {\mkcomprange{#1}}% - {\mkcomprange[{\mkpageprefix}]{#1}}% + {\mkpageprefix[pagination][\mkcomprange]{#1}}% } \DeclareBibliographyOption{nopublisher}[true]{% @@ -1116,6 +1172,7 @@ }{% \mkbibquote{#1\isdot}}} \DeclareFieldFormat[inreference]{title}{\mkbibquote{#1\isdot}} +\newcommand*{\mkvolroman}[1]{\Rn{#1}} \DeclareFieldFormat[book,mvbook,bookinbook,inbook,suppbook,% collection,mvcollection,incollection,suppcollection,% proceedings,mvproceedings,inproceedings,% @@ -1123,11 +1180,11 @@ reference,mvreference,inreference]{volume}{% \IfSubStr{#1}{-}{% \StrCount{#1}{-}[\blx@ox@dashnum]% \StrBefore{#1}{-}[\blx@ox@volnum]% - \expandafter\ifinteger\blx@ox@volnum{\Rn{\blx@ox@volnum}}{\blx@ox@volnum}\bibrangedash + \expandafter\ifinteger\blx@ox@volnum{\mkvolroman{\blx@ox@volnum}}{\blx@ox@volnum}\bibrangedash \StrBehind[\blx@ox@dashnum]{#1}{-}[\blx@ox@volnum]% - \expandafter\ifinteger\blx@ox@volnum{\Rn{\blx@ox@volnum}}{\blx@ox@volnum}% + \expandafter\ifinteger\blx@ox@volnum{\mkvolroman{\blx@ox@volnum}}{\blx@ox@volnum}% }{% - \ifinteger{#1}{\Rn{#1}}{#1}}} + \ifinteger{#1}{\mkvolroman{#1}}{#1}}} \newbibmacro*{maintitle+volume}{% \ifboolexpr{ test {\iffieldundef{maintitle}} @@ -1162,7 +1219,21 @@ reference,mvreference,inreference]{volume}{% \PackageError{biblatex-oxref} {Invalid option 'bookseries=#1'} {Valid values are 'in' and 'out'.}}}} +\newbibmacro*{listpair:delim}[3]{% + \ifnumgreater{#2}{\@ne}{% + \ifnumless{#2}{#3}{% + \printdelim{multilistdelim}% + }{% + \c@liststop#3% + \lbx@finallistdelim{#1}}% + }{}} \newcounter{locpubpairs} +\DeclareListFormat{locpub}{% + \usebibmacro{listpair:delim}% + {#1}{\value{locpubpairs}}{\value{location}}% + #1\isdot +} +\newsavebox{\blx@ox@locbox} \newbibmacro*{edition+publisher+location+date}{% \printlist{origlocation}% \iflistundef{origpublisher}% @@ -1193,19 +1264,8 @@ reference,mvreference,inreference]{volume}{% test {\ifnumcomp{\value{locpubpairs}}{<}{\value{publisher}}} }{% \stepcounter{locpubpairs}% - \ifnumcomp{\value{locpubpairs}}{>}{1}{% - \ifnumequal{\value{publisher}}{2}{% - \setunit*{\addspace\bibstring{and}\addspace}% - }{% - \ifnumequal{\value{locpubpairs}}{\value{publisher}}{% - \setunit*{\addcomma\space\bibstring{and}\addspace}% - }{% - \setunit*{\addcomma\space}% - }% - }% - }{}% - \printlist[][\value{locpubpairs}-\value{locpubpairs}]{location}% - \setunit*{\addcolon\space}% + \printlist[locpub][\value{locpubpairs}-\value{locpubpairs}]{location}% + \setunit{\addcolon\space}% \printlist[][\value{locpubpairs}-\value{locpubpairs}]{publisher}% }% \restorebibmacro{list:andothers}% @@ -2750,7 +2810,11 @@ reference,mvreference,inreference]{volume}{% \setcounter{blx@tmpcnt}{\value{listcount}}% \addtocounter{blx@tmpcnt}{1}% \ifnumequal{\value{blx@tmpcnt}}{\value{listtotal}}{% - #1\space\bibstring{and}\addspace + \ifnumgreater{\value{listtotal}}{2}{% + #1\finalandcomma\space\bibstring{and}\addspace + }{% + #1\space\bibstring{and}\addspace + } }{% #1\addcomma\space}}}% diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx index 5456cee2974..c129b90113d 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.bbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.bbx} [\Version\space Author-year bibliography style inspired by the Oxford Guide to Style] @@ -321,11 +321,6 @@ \setunit*{\addspace}% \usebibmacro{date+extradate}% }{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch author (lasthash)}}% -\xpatchbibmacro{namepairs}{% - \printnames[by#1]% -}{% - \printnames[#1]% -}{}{\wlog{WARNING: biblatex-oxref (oxyear) failed to patch namepairs}} \xpatchbibmacro{author+altauthor}{% \printnames{author}% }{% diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx index 91413cd2cdf..b25b2d2aace 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.cbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.cbx} [\Version\space Author-year citation style inspired by the Oxford Guide to Style] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx index 9f7891c9312..fdde6d5d8e1 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/oxyear.dbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{oxyear.dbx} [\Version\space Data model for the Oxref family of styles] diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/polish-oxref.lbx b/Master/texmf-dist/tex/latex/biblatex-oxref/polish-oxref.lbx new file mode 100644 index 00000000000..d0747e2f058 --- /dev/null +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/polish-oxref.lbx @@ -0,0 +1,311 @@ +%% +%% This is file `polish-oxref.lbx', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% oxref.dtx (with options: `lbx,pl') +%% ---------------------------------------------------------------- +%% biblatex-oxref --- Biblatex styles inspired by the Oxford Guide to Style +%% Author: Alex Ball +%% E-mail: a.j.ball@bath.ac.uk +%% License: Released under the LaTeX Project Public License v1.3c or later +%% See: http://www.latex-project.org/lppl.txt +%% ---------------------------------------------------------------- +%% +\def\Version{2024/08/26 v3.3} +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesFile{polish-oxref.lbx} + [\Version\space Polish conventions required by the biblatex-oxref styles] +\InheritBibliographyExtras{polish} +\DeclareBibliographyExtras{% + \DeclareDelimFormat{revsdnamedelim}{}% + \savecommand\makebbx@dateii + \def\makebbx@dateii#1#2#3{% + \blx@imc@stripzeros{#3}~\lbx@pl@mkbibmonth{#2}% + \space + #1}% + \savecommand\mkvolroman + \renewcommand*{\mkvolroman}[1]{\RN{#1}}% + \savecommand\blx@ox@compyear + \renewcommand*{\blx@ox@compyear}[2]{#2}% + \savefieldformat{pages}% + \DeclareFieldFormat{pages}{% + \iffieldundef{bookpagination}% + {\mknormrange{#1}}% + {\mkpageprefix[bookpagination][\mknormrange]{#1}}% + }% + \savefieldformat{postnote}% + \DeclareFieldFormat{postnote}{% + \iffieldundef{pagination}% + {\mknormrange{#1}}% + {\mkpageprefix[pagination][\mknormrange]{#1}}% + }% + \savefieldformat{edition}% + \DeclareFieldFormat{edition}{% + \ifinteger{#1} + {\bibstring{edition}~\mkbibordedition{#1}} + {\ifbibstring{#1}{\bibstring{#1}}{#1\isdot}}}% +} +\UndeclareBibliographyExtras{% + \DeclareDelimFormat{revsdnamedelim}{\addcomma}% + \restorecommand\makebbx@dateii + \restorecommand\mkvolroman + \restorecommand\blx@ox@compyear + \restorefieldformat{pages}% + \restorefieldformat{postnote}% + \restorefieldformat{edition}% +} +\DeclareBibliographyStrings{% + inherit = {polish}, + director = {{re\.{z}yser}{re\.{z}\adddot}}, + directors = {{re\.{z}yserzy}{re\.{z}\adddot}}, + performer = {{wykonawca}{wyk\adddot}}, + performers = {{wykonawcy}{wyk\adddot}}, + reader = {{czytelnik}{czytelnik}}, + readers = {{czytelnicy}{czytelnicy}}, + conductor = {{dyrygent}{dyr\adddot}}, + conductors = {{dyrygenci}{dyr\adddot}}, + serieseditor = {{redaktor serii}{red\adddotspace serii}}, + serieseditors = {{redaktor serii}{red\adddotspace serii}}, + holder = {{w\l a\'{s}ciciel}{w\l a\'{s}ciciel}}, + holders = {{w\l a\'{s}ciciele}{w\l a\'{s}ciciele}}, + editorcm = {{redaktor i~kompilator}{red\adddotspace i~kompilator}}, + editorcms = {{redaktorzy i~kompilatorzy}{red\adddotspace i~kompilatorzy}}, + byperformer = {{wykonawca}{wyk\adddot}}, + bydirector = {{re\.{z}yseria}{re\.{z}\adddot}}, + byreader = {{czyta}{czyta}}, + byconductor = {{kieruje}{kier\adddot}}, + byserieseditor = {{redakcja}{red\adddot}}, + byholder = {{w~posiadaniu}{w~posiadaniu}}, + byeditorcm = {{redakcja i~opracowanie}{red\adddotspace i~oprac\adddot}}, + facsimile = {{wydanie faksymile}{wyd\adddotspace faksymile}}, + revised = {{wydanie poprawione}{wyd\adddotspace popr\adddot}}, + revisedenlarged = {{wydanie poprawione i~rozszerzone}{wyd\adddotspace popr\addotspace i~rozszerz\adddot}}, + revisedreprint = {{przedruk poprawiony}{przedr\adddotspace popr\adddot}}, + suppto = {{dodatek do}{dod\adddotspace do}}, + equals = {{=}{=}}, + original = {{oryginalny}{oryg\adddot}}, + amendedby = {{zmienione przez}{zmien\adddotspace przez}}, + inpressin = {{z\l o\.{z}one do}{z\l o\.{z}one do}}, + book = {{ksi\k{e}ga}{ks\adddot}}, + books = {{ksi\k{e}gi}{ks\adddot}}, + canto = {{pie\'{s}\'{n}}{pie\'{s}\'{n}}}, + cantos = {{pie\'{s}ni}{pie\'{s}ni}}, + stanza = {{zwrotka}{zwr\adddot}}, + stanzas = {{zwrotki}{zwr\adddot}}, + act = {{akt}{a\adddot}}, + acts = {{akty}{aa\adddot}}, + scene = {{scena}{sc\adddot}}, + scenes = {{sceny}{sc\adddot}}, + folio = {{karta}{k\adddot}}, + folios = {{karty}{kk\adddot}}, + article = {{artyku\l }{art\adddot}}, + articles = {{artyku\l y}{art\adddot}}, + clause = {{klauzula}{klauz\adddot}}, + clauses = {{klauzule}{klauz\adddot}}, + regulation = {{rozporz\k{a}dzenie}{rozp\adddot}}, + regulations = {{rozporz\k{a}dzenia}{rozp\adddot}}, + rule = {{przepis}{przep\adddot}}, + rules = {{przepisy}{przep\adddot}}, + booktotal = {{ksi\k{e}ga}{ks\adddot}}, + booktotals = {{ksi\k{e}gi}{ks\adddot}}, + cantototal = {{pie\'{s}\'{n}}{pie\'{s}\'{n}}}, + cantototals = {{pie\'{s}ni}{pie\'{s}ni}}, + stanzatotal = {{zwrotka}{zwr\adddot}}, + stanzatotals = {{zwrotki}{zwr\adddot}}, + acttotal = {{akt}{a\adddot}}, + acttotals = {{akty}{aa\adddot}}, + scenetotal = {{scena}{sc\adddot}}, + scenetotals = {{sceny}{sc\adddot}}, + foliototal = {{karta}{k\adddot}}, + foliototals = {{karty}{kk\adddot}}, + articletotal = {{artyku\l }{art\adddot}}, + articletotals = {{artyku\l y}{art\adddot}}, + clausetotal = {{klauzula}{klauz\adddot}}, + clausetotals = {{klauzule}{klauz\adddot}}, + regulationtotal = {{rozporz\k{a}dzenie}{rozp\adddot}}, + regulationtotals = {{rozporz\k{a}dzenia}{rozp\adddot}}, + ruletotal = {{przepis}{przep\adddot}}, + ruletotals = {{przepisy}{przep\adddot}}, + facebook = {{wpis na Facebooku}{wpis na Facebooku}}, + tweet = {{wpis na Twitterze}{wpis na Twitterze}}, + podcast = {{podcast}{podcast}}, + clip = {{wideo}{wideo}}, + webcast = {{webcast}{webcast}}, + poster = {{plakat}{plakat}}, + nolocation = {{bez miejsca}{b\adddot m\adddot}}, + modified = {{ostatnio zmodyfikowany}{ostatnio zmodyf\adddot}}, + recorded = {{nagrane}{nagr\adddot}}, + uploaded = {{za\l adowane}{za\l ad\adddot}}, + filed = {{wniesione}{wniesione}}, + issued = {{wydany}{wyd\adddot}}, + anon = {{Anonim}{Anon\adddot}}, + pseudo = {{Pseudo-}{Ps\adddot-}}, + urldown = {{pobrane}{pobrane}}, + countryjp = {{Japonia}{JP}}, + patentjp = {{japo\'{n}ski patent}{jap\adddotspace pat\adddot}}, + patreqjp = {{japo\'{n}ski wniosek patentowy}{jap\adddotspace wniosek pat\adddot}}, + 1column = {{jedna kolumna}{1\addnbspace kol\adddot}}, + 2column = {{dwie kolumny}{2\addnbspace kol\adddot}}, + inflayer = {{warstwa ni\.{z}sza}{warstwa ni\.{z}sza}}, + suplayer = {{warstwa wy\.{z}sza}{warstwa wy\.{z}sza}}, + paper = {{gazeta}{gazeta}}, + papyrus = {{papirus}{papirus}}, + parchment = {{pergamin}{pergamin}}, + eucase = {{sprawa}{sprawa}}, + eujoinedcases = {{po\l \k{a}czone sprawy}{po\l \k{a}czone sprawy}}, + commissiondecision = {{decyzja komisji}{decyzja komisji}}, + application = {{wniosek}{wniosek}}, + order = {{polecenie}{polecenie}}, + bill = {{rachunek}{rachunek}}, + draft = {{projekt}{proj\adddot}}, + opened = {{przed\l o\.{z}one do podpisu}{przed\l\adddotspace do podp\adddot}}, + signed = {{podpisane}{podpisane}}, + adopted = {{przyj\k{e}te}{przyj\k{e}te}}, + inforce = {{wesz\l o w~\.{z}ycie}{wesz\l o w~\.{z}ycie}}, + byeditor = {{redakcja}{red\adddot}}, + bycompiler = {{opracowanie}{oprac\adddot}}, + byfounder = {{za\l o\.{z}one przez}{za\l o\.{z}\adddotspace przez}}, + bycontinuator = {{kontynuowane przez}{kont\adddotspace przez}}, + byredactor = {{redakcja}{red\adddot}}, + byreviser = {{poprawki}{popr\adddot}}, + byreviewer = {{recenzja}{rec\adddot}}, + bycollaborator = {{we wsp\'{o}\l pracy z}{we wsp\'{o}\l pr\adddotspace z}}, + bytranslator = {{t\l umaczenie}{t\l um\adddot}}, + bycommentator = {{komentarz}{kom\adddot}}, + byannotator = {{obja\'{s}nienia}{obja\'{s}n\adddot}}, + byeditortr = {{redakcja i~t\l umaczenie}% + {red\adddotspace i~t\l um\adddot}}, + byeditorco = {{redakcja i~komentarz}% + {red\adddotspace i~kom\adddot}}, + byeditoran = {{redakcja i~obja\'{s}nienia}% + {red\adddotspace i~obja\'{s}n\adddot}}, + byeditorin = {{redakcja i~wst\k{e}p}% + {red\adddotspace i~wst\k{e}p}}, + byeditorfo = {{redakcja i~przedmowa}% + {red\adddotspace i~przedm\adddot}}, + byeditoraf = {{redakcja i~pos\l owie}% + {red\adddotspace i~pos\l \adddot}}, + byeditortrco = {{redakcja, t\l umaczenie i~komentarz}% + {red.,\addabbrvspace t\l um.,\addabbrvspace kom\adddot}}, + byeditortran = {{redakcja, t\l umaczenie i~obja\'{s}nienia}% + {red.,\addabbrvspace t\l um.,\addabbrvspace obja\'{s}n\adddot}}, + byeditortrin = {{redakcja, t\l umaczenie, wst\k{e}p}% + {red.,\addabbrvspace t\l um.,\addabbrvspace wst\k{e}p}}, + byeditortrfo = {{redakcja, t\l umaczenie, przedmowa}% + {red.,\addabbrvspace t\l um.,\addabbrvspace przedm\adddot}}, + byeditortraf = {{redakcja, t\l umaczenie, pos\l \adddot}% + {red.,\addabbrvspace t\l um.,\addabbrvspace pos\l \adddot}}, + byeditorcoin = {{redakcja, komentarz, wst\k{e}p}% + {red.,\addabbrvspace kom.,\addabbrvspace wst\k{e}p}}, + byeditorcofo = {{redakcja, komentarz i~przedmowa}% + {red.,\addabbrvspace kom.,\addabbrvspace przedm\adddot}}, + byeditorcoaf = {{redakcja, komentarz, pos\l owie}% + {red.,\addabbrvspace kom.,\addabbrvspace pos\l \adddot}}, + byeditoranin = {{redakcja, obja\'{s}nienia, wst\k{e}p}% + {red.,\addabbrvspace obja\'{s}n.,\addabbrvspace wst\k{e}p}}, + byeditoranfo = {{redakcja, obja\'{s}nienia, przedmowa}% + {red.,\addabbrvspace obja\'{s}n.,\addabbrvspace przedm\adddot}}, + byeditoranaf = {{redakcja, obja\'{s}nienia, pos\l owie}% + {red.,\addabbrvspace obja\'{s}n.,\addabbrvspace pos\l \adddot}}, + byeditortrcoin = {{redakcja, t\l umaczenie, komentarz, wst\k{e}p}% + {red.,\addabbrvspace t\l um.,\addabbrvspace kom.,\addabbrvspace wst\k{e}p}}, + byeditortrcofo = {{redakcja, t\l umaczenie, komentarz, przedmowa}% + {red.,\addabbrvspace t\l um.,\addabbrvspace kom.,\addabbrvspace przedm\adddot}}, + byeditortrcoaf = {{redakcja, t\l umaczenie, komentarz, pos\l owie}% + {red.,\addabbrvspace t\l um.,\addabbrvspace kom.,\addabbrvspace pos\l \adddot}}, + byeditortranin = {{redakcja, t\l umaczenie, obja\'{s}nienia, wst\k{e}p}% + {red.,\addabbrvspace t\l um.,\addabbrvspace obja\'{s}n.,\addabbrvspace wst\k{e}p}}, + byeditortranfo = {{redakcja, t\l umaczenie, obja\'{s}nienia, przedmowa}% + {red.,\addabbrvspace t\l um.,\addabbrvspace obja\'{s}n.,\addabbrvspace przedm\adddot}}, + byeditortranaf = {{redakcja, t\l umaczenie, obja\'{s}nienia, pos\l owie}% + {red.,\addabbrvspace t\l um.,\addabbrvspace obja\'{s}n.,\addabbrvspace pos\l \adddot}}, + bytranslatorco = {{t\l umaczenie i~komentarz}% + {t\l um\adddotspace i~kom\adddot}}, + bytranslatoran = {{t\l umaczenie i~obja\'{s}nienia}% + {t\l um\adddotspace i~obja\'{s}n\adddot}}, + bytranslatorin = {{t\l umaczenie i~wst\k{e}p}% + {t\l um.,\addabbrvspace wst\k{e}p}}, + bytranslatorfo = {{t\l umaczenie i~przedmowa}% + {t\l um.,\addabbrvspace przedm\adddot}}, + bytranslatoraf = {{t\l umaczenie i~pos\l owie}% + {t\l um.,\addabbrvspace pos\l \adddot}}, + bytranslatorcoin = {{t\l umaczenie, komentarz i~wst\k{e}p}% + {t\l um.,\addabbrvspace kom.,\addabbrvspace wst\k{e}p}}, + bytranslatorcofo = {{t\l umaczenie, komentarz i~przedmowa}% + {t\l um.,\addabbrvspace kom.,\addabbrvspace przedm\adddot}}, + bytranslatorcoaf = {{t\l umaczenie, komentarz i~pos\l owie}% + {t\l um.,\addabbrvspace kom.,\addabbrvspace pos\l \adddot}}, + bytranslatoranin = {{t\l umaczenie, obja\'{s}nienia i~wst\k{e}p}% + {t\l um.,\addabbrvspace obja\'{s}n.,\addabbrvspace wst\k{e}p}}, + bytranslatoranfo = {{t\l umaczenie, obja\'{s}nienia i~przedmowa}% + {t\l um.,\addabbrvspace obja\'{s}n.,\addabbrvspace przedm\adddot}}, + bytranslatoranaf = {{t\l umaczenie, obja\'{s}nienia i~pos\l owie}% + {t\l um.,\addabbrvspace obja\'{s}n.,\addabbrvspace pos\l \adddot}}, + withcommentator = {{komentarz}{komentarz}}, + withannotator = {{obja\'{s}nienia}{obja\'{s}nienia}}, + withintroduction = {{wst\k{e}p}{wst\k{e}p}}, + withforeword = {{przedmowa}{przedmowa}}, + withafterword = {{pos\l owie}{pos\l owie}}, + introduction = {{wst\k{e}p}{wst\k{e}p}}, + newseries = {{nowa seria}{nowa seria}}, + oldseries = {{dawna seria}{dawna seria}}, + edition = {{wydanie}{wyd\adddot}}, + reviewof = {{recenzja}{rec\adddot}}, + reprintfrom = {{przedruk z}{przedr\adddotspace z}}, + translationas = {{t\l umaczenie polskie}{t\l um\adddotspace pol\adddotspace}}, + origpubin = {{pierwodruk w}{pierwodr\adddotspace w}}, + paragraph = {{ust\k{e}p}{ust\adddot}}, + paragraphs = {{ust\k{e}py}{ust\adddot}}, + urlseen = {{dost\k{e}p}{dost\k{e}p}}, + idem = {{idem}{id\adddot}}, + idemsm = {{idem}{id\adddot}}, + idemsf = {{eadem}{ead\adddot}}, + idemsn = {{idem}{id\adddot}}, + idempm = {{eidem}{eid\adddot}}, + idempf = {{eaedem}{eaed\adddot}}, + idempn = {{eadem}{ead\adddot}}, + idempp = {{eidem}{eid\adddot}}, + citedas = {{dalej}{dalej}}, + thiscite = {{na}{na}}, + langamerican = {{ameryka\'{n}ski angielski}{amer\adddotspace ang\adddot}}, + langbasque = {{baskijski}{bask\adddot}}, + langbrazilian = {{brazylijski portugalski}{braz\adddot port\adddot}}, + langbulgarian = {{bu\l garski}{bu\l g\adddot}}, + langcatalan = {{katalo\'{n}ski}{katal\adddot}}, + langcroatian = {{chorwacki}{chorw\adddot}}, + langczech = {{czeski}{czeski}}, + langdanish = {{du\'{n}ski}{du\'{n}\adddot}}, + langdutch = {{holenderski}{holend\adddot}}, + langenglish = {{angielski}{ang\adddot}}, + langestonian = {{esto\'{n}ski}{est\adddot}}, + langfinnish = {{fi\'{n}ski}{fi\'{n}\adddot}}, + langfrench = {{francuski}{fr\adddot}}, + langgalician = {{galicyjski}{galic\adddot}}, + langgerman = {{niemiecki}{niem\adddot}}, + langgreek = {{grecki}{gr\adddot}}, + langhungarian = {{w\k{e}gierski}{w\k{e}g\adddot}}, + langitalian = {{w\l oski}{w\l \adddot}}, + langjapanese = {{japo\'{n}ski}{jap\adddot}}, + langlatin = {{\l aci\'{n}ski}{\l ac\adddot}}, + langlatvian = {{\l otewski}{\l ot\adddot}}, + langlithuanian = {{litewski}{lit\adddot}}, + langmarathi = {{marathi}{mar\adddot}}, + langnorwegian = {{norweski}{norw\adddot}}, + langpolish = {{polski}{pol\adddot}}, + langportuguese = {{portugalski}{port\adddot}}, + langromanian = {{rumu\'{n}ski}{rum\adddot}}, + langrussian = {{rosyjski}{ros\adddot}}, + langserbian = {{serbski}{serb\adddot}}, + langslovak = {{s\l owacki}{s\l c\adddot}}, + langslovene = {{s\l owe\'{n}ski}{s\l owe\'{n}\adddot}}, + langspanish = {{hiszpa\'{n}ski}{hiszp\adddot}}, + langswedish = {{szwedzki}{szw\adddot}}, + langturkish = {{turecki}{tur\adddot}}, + langukrainian = {{ukrai\'{n}ski}{ukr\adddot}}, +} +%% +%% Copyright (C) 2016–2023 Alex Ball +%% +%% End of file `polish-oxref.lbx'. diff --git a/Master/texmf-dist/tex/latex/biblatex-oxref/spanish-oxref.lbx b/Master/texmf-dist/tex/latex/biblatex-oxref/spanish-oxref.lbx index d0f2a9e700f..6bf12a1ba55 100644 --- a/Master/texmf-dist/tex/latex/biblatex-oxref/spanish-oxref.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-oxref/spanish-oxref.lbx @@ -13,7 +13,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/11/23 v3.2} +\def\Version{2024/08/26 v3.3} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{spanish-oxref.lbx} [\Version\space Spanish conventions required by the biblatex-oxref styles] @@ -133,11 +133,11 @@ byfounder = {{fundado por}{fund\adddotspace}}, bycontinuator = {{continuado por}{cont\adddotspace}}, bycollaborator = {{colaboraci\'on de}{col\adddotspace de}}, - bytranslator = {{traducido \lbx@lfromlang\ por}{trad\adddotspace \lbx@sfromlang}}, + bytranslator = {{traducido por}{trad\adddotspace}}, bycommentator = {{comentado por}{com\adddotspace}}, byannotator = {{anotado por}{anot\adddotspace}}, - byeditortr = {{editado y traducido \lbx@lfromlang\ por}% - {ed\adddotspace y trad\adddotspace \lbx@sfromlang}}, + byeditortr = {{editado y traducido por}% + {ed\adddotspace y trad\adddotspace}}, byeditorco = {{editado y comentado por}% {ed\adddotspace y com\adddotspace }}, byeditoran = {{edici\'on y notas de}% @@ -148,16 +148,16 @@ {ed\adddotspace y pr\'ol\adddotspace}}, byeditoraf = {{edici\'on y ep\'ilogo de}% {ed\adddotspace y ep\'il\adddotspace}}, - byeditortrco = {{editado, traducido \lbx@lfromlang\ y comentado por}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y com\adddotspace}}, - byeditortran = {{edici\'on, traducci\'on \lbx@lfromlang\ y notas de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y not\adddotspace}}, - byeditortrin = {{edici\'on, traducci\'on \lbx@lfromlang\ e introducci\'on de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ e intr\adddotspace}}, - byeditortrfo = {{edici\'on, traducci\'on \lbx@lfromlang\ y pr\'ologo de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y pr\'ol\adddotspace}}, - byeditortraf = {{editado, traducido \lbx@lfromlang\ y epilogado}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang\ y ep\'il\adddotspace}}, + byeditortrco = {{editado, traducido y comentado por}% + {ed.,\addabbrvspace trad\adddotspace y com\adddotspace}}, + byeditortran = {{edici\'on, traducci\'on y notas de}% + {ed.,\addabbrvspace trad\adddotspace y not\adddotspace}}, + byeditortrin = {{edici\'on, traducci\'on e introducci\'on de}% + {ed.,\addabbrvspace trad\adddotspace e intr\adddotspace}}, + byeditortrfo = {{edici\'on, traducci\'on y pr\'ologo de}% + {ed.,\addabbrvspace trad\adddotspace y pr\'ol\adddotspace}}, + byeditortraf = {{editado, traducido y epilogado}% + {ed.,\addabbrvspace trad\adddotspace y ep\'il\adddotspace}}, byeditorcoin = {{editado, comentado e introducido}% {ed.,\addabbrvspace com\adddotspace e intr\adddotspace}}, byeditorcofo = {{edici\'on, comentarios y pr\'ologo de}% @@ -170,40 +170,40 @@ {ed.,\addabbrvspace anot\adddotspace y pr\'ol\adddotspace}}, byeditoranaf = {{edici\'on, notas y ep\'ilogo de}% {ed.,\addabbrvspace anot\adddotspace y ep\'il\adddotspace}}, - byeditortrcoin = {{edici\'on, traducci\'on \lbx@lfromlang, comentarios e introducci\'on de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, com\adddotspace e intr\adddotspace}}, - byeditortrcofo = {{edici\'on, traducci\'on \lbx@lfromlang, comentarios y pr\'ologo de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, com\adddotspace y pr\'ol\adddotspace}}, - byeditortrcoaf = {{edici\'on, traducci\'on \lbx@lfromlang, comentarios y ep\'ilogo de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, com\adddotspace y ep\'il\adddotspace}}, - byeditortranin = {{edici\'on, traducci\'on \lbx@lfromlang, notas e introducci\'on de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, anot\adddotspace e intr\adddotspace}}, - byeditortranfo = {{edici\'on, traducci\'on \lbx@lfromlang, notas y pr\'ologo de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, anot\adddotspace y pr\'ol\adddotspace}}, - byeditortranaf = {{edici\'on, traducci\'on \lbx@lfromlang, notas y ep\'ilogo de}% - {ed.,\addabbrvspace trad\adddotspace \lbx@sfromlang, anot\adddotspace y ep\'il\adddotspace}}, - bytranslatorco = {{traducci\'on \lbx@lfromlang\ y comentarios de}% - {trad\adddotspace \lbx@sfromlang\ y com\adddotspace}}, - bytranslatoran = {{traducci\'on \lbx@lfromlang\ y notas de}% - {trad\adddotspace \lbx@sfromlang\ y not\adddotspace}}, - bytranslatorin = {{traducci\'on \lbx@lfromlang\ e introducci\'on de}% - {trad\adddotspace \lbx@sfromlang\ e introd\adddotspace}}, - bytranslatorfo = {{traducci\'on \lbx@lfromlang\ y pr\'ologo de}% - {trad\adddotspace \lbx@sfromlang\ y pr\'ol\adddotspace}}, - bytranslatoraf = {{traducci\'on \lbx@lfromlang\ y ep\'ilogo de}% - {trad\adddotspace \lbx@sfromlang\ y ep\'il\adddotspace}}, - bytranslatorcoin = {{traducci\'on \lbx@lfromlang, comentarios e introducci\'on de}% - {trad\adddotspace \lbx@sfromlang, com\adddotspace e intr\adddotspace}}, - bytranslatorcofo = {{traducci\'on \lbx@lfromlang, comentarios y pr\'ologo de}% - {trad\adddotspace \lbx@sfromlang, com\adddotspace y pr\'ol\adddotspace}}, - bytranslatorcoaf = {{traducci\'on \lbx@lfromlang, comentarios y ep\'ilogo de}% - {trad\adddotspace \lbx@sfromlang, com\adddotspace y ep\'il\adddotspace}}, - bytranslatoranin = {{traducci\'on \lbx@lfromlang, notas e introducci\'on de}% - {trad\adddotspace \lbx@sfromlang, anot\adddotspace e intr\adddotspace}}, - bytranslatoranfo = {{traducci\'on \lbx@lfromlang, notas y pr\'ologo}% - {trad\adddotspace \lbx@sfromlang, anot\adddotspace y pr\'ol\adddotspace}}, - bytranslatoranaf = {{traducci\'on \lbx@lfromlang, notas y ep\'ilogo}% - {trad\adddotspace \lbx@sfromlang, anot\adddotspace y ep\'il\adddotspace}}, + byeditortrcoin = {{edici\'on, traducci\'on, comentarios e introducci\'on de}% + {ed.,\addabbrvspace trad.,\addabbrvspace com\adddotspace e intr\adddotspace}}, + byeditortrcofo = {{edici\'on, traducci\'on, comentarios y pr\'ologo de}% + {ed.,\addabbrvspace trad.,\addabbrvspace com\adddotspace y pr\'ol\adddotspace}}, + byeditortrcoaf = {{edici\'on, traducci\'on, comentarios y ep\'ilogo de}% + {ed.,\addabbrvspace trad.,\addabbrvspace com\adddotspace y ep\'il\adddotspace}}, + byeditortranin = {{edici\'on, traducci\'on, notas e introducci\'on de}% + {ed.,\addabbrvspace trad.,\addabbrvspace anot\adddotspace e intr\adddotspace}}, + byeditortranfo = {{edici\'on, traducci\'on, notas y pr\'ologo de}% + {ed.,\addabbrvspace trad.,\addabbrvspace anot\adddotspace y pr\'ol\adddotspace}}, + byeditortranaf = {{edici\'on, traducci\'on, notas y ep\'ilogo de}% + {ed.,\addabbrvspace trad.,\addabbrvspace anot\adddotspace y ep\'il\adddotspace}}, + bytranslatorco = {{traducci\'on y comentarios de}% + {trad\adddotspace y com\adddotspace}}, + bytranslatoran = {{traducci\'on y notas de}% + {trad\adddotspace y not\adddotspace}}, + bytranslatorin = {{traducci\'on e introducci\'on de}% + {trad\adddotspace e introd\adddotspace}}, + bytranslatorfo = {{traducci\'on y pr\'ologo de}% + {trad\adddotspace y pr\'ol\adddotspace}}, + bytranslatoraf = {{traducci\'on y ep\'ilogo de}% + {trad\adddotspace y ep\'il\adddotspace}}, + bytranslatorcoin = {{traducci\'on, comentarios e introducci\'on de}% + {trad.,\addabbrvspace com\adddotspace e intr\adddotspace}}, + bytranslatorcofo = {{traducci\'on, comentarios y pr\'ologo de}% + {trad.,\addabbrvspace com\adddotspace y pr\'ol\adddotspace}}, + bytranslatorcoaf = {{traducci\'on, comentarios y ep\'ilogo de}% + {trad.,\addabbrvspace com\adddotspace y ep\'il\adddotspace}}, + bytranslatoranin = {{traducci\'on, notas e introducci\'on de}% + {trad.,\addabbrvspace anot\adddotspace e intr\adddotspace}}, + bytranslatoranfo = {{traducci\'on, notas y pr\'ologo}% + {trad.,\addabbrvspace anot\adddotspace y pr\'ol\adddotspace}}, + bytranslatoranaf = {{traducci\'on, notas y ep\'ilogo}% + {trad.,\addabbrvspace anot\adddotspace y ep\'il\adddotspace}}, withcommentator = {{con comentario de}{con comentario de}}, withannotator = {{con notas de}{con notas de}}, withintroduction = {{con introduci\'on de}{con introduci\'on de}}, @@ -217,38 +217,50 @@ translationas = {{traducido espa\~nol como}{trad\adddotspace espa\~nol como}}, origpubin = {{publicado originalmente en}{pub\adddot orig\adddotspace}}, urlseen = {{accedido}{accedido}}, + idem = {{idem}{id\adddot}}, + idemsm = {{idem}{id\adddot}}, + idemsf = {{eadem}{ead\adddot}}, + idemsn = {{idem}{id\adddot}}, + idempm = {{eidem}{eid\adddot}}, + idempf = {{eaedem}{eaed\adddot}}, + idempn = {{eadem}{ead\adddot}}, + idempp = {{eidem}{eid\adddot}}, citedas = {{en adelante}{en adelante}}, thiscite = {{en}{en}}, - langamerican = {{ingl\'es americano}{ing\adddotspace amer\adddotspace}}, - langbrazilian = {{brasile\~no}{por\adddotspace bras\adddotspace}}, - langbulgarian = {{b\'ulgaro}{bul\adddotspace}}, - langcatalan = {{catal\'an}{cat\adddotspace}}, - langcroatian = {{croata}{hrv\adddotspace}}, - langczech = {{checo}{ces\adddotspace}}, - langdanish = {{dan\'es}{dan\adddotspace}}, - langdutch = {{neerland\'es}{nld\adddotspace}}, - langenglish = {{ingl\'es}{ing\adddotspace}}, - langestonian = {{estonio}{est\adddotspace}}, - langfinnish = {{fin\'es}{fin\adddotspace}}, - langfrench = {{franc\'es}{fra\adddotspace}}, - langgalician = {{gallego}{glg\adddotspace}}, - langgerman = {{alem\'an}{ale\adddotspace}}, - langgreek = {{griego}{gr\adddotspace}}, - langhungarian = {{h\'ungaro}{hun\adddotspace}}, - langitalian = {{italiano}{ita\adddotspace}}, - langjapanese = {{japon\'es}{jap\adddotspace}}, - langlatin = {{lat\'in}{lat\adddotspace}}, - langlatvian = {{lituano}{lit\adddotspace}}, - langnorwegian = {{noruego}{nor\adddotspace}}, - langpolish = {{polaco}{pol\adddotspace}}, - langportuguese = {{portugu\'es}{port\adddotspace}}, - langrussian = {{ruso}{rus\adddotspace}}, - langserbian = {{serbio}{srp\adddotspace}}, - langslovak = {{eslovaco}{slk\adddotspace}}, - langslovene = {{esloveno}{slv\adddotspace}}, - langspanish = {{espa\~nol}{esp\adddotspace}}, + langamerican = {{ingl\'es americano}{ing\adddotspace amer\adddot}}, + langbasque = {{vasco}{vasc\adddot}}, + langbrazilian = {{portugu\'es brasile\~no}{por\adddotspace bras\adddot}}, + langbulgarian = {{b\'ulgaro}{bul\adddot}}, + langcatalan = {{catal\'an}{cat\adddot}}, + langcroatian = {{croata}{hrv\adddot}}, + langczech = {{checo}{ces\adddot}}, + langdanish = {{dan\'es}{dan\adddot}}, + langdutch = {{neerland\'es}{nld\adddot}}, + langenglish = {{ingl\'es}{ing\adddot}}, + langestonian = {{estonio}{est\adddot}}, + langfinnish = {{fin\'es}{fin\adddot}}, + langfrench = {{franc\'es}{fra\adddot}}, + langgalician = {{gallego}{glg\adddot}}, + langgerman = {{alem\'an}{ale\adddot}}, + langgreek = {{griego}{gr\adddot}}, + langhungarian = {{h\'ungaro}{hun\adddot}}, + langitalian = {{italiano}{ita\adddot}}, + langjapanese = {{japon\'es}{jap\adddot}}, + langlatin = {{lat\'in}{lat\adddot}}, + langlatvian = {{let\'on}{let\adddot}}, + langlithuanian = {{lituano}{lit\adddot}}, + langmarathi = {{marathi}{mar\adddot}}, + langnorwegian = {{noruego}{nor\adddot}}, + langpolish = {{polaco}{pol\adddot}}, + langportuguese = {{portugu\'es}{port\adddot}}, + langrussian = {{ruso}{rus\adddot}}, + langserbian = {{serbio}{srp\adddot}}, + langslovak = {{eslovaco}{slk\adddot}}, + langslovene = {{esloveno}{slv\adddot}}, + langspanish = {{espa\~nol}{esp\adddot}}, langswedish = {{sueco}{sueco}}, - langukrainian = {{ucraniano}{ucr\adddotspace}}, + langturkish = {{turco}{turco}}, + langukrainian = {{ucraniano}{ucr\adddot}}, } %% %% Copyright (C) 2016–2023 Alex Ball diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/UKenglish-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/UKenglish-publist.lbx index 320c493f40f..0b5cce13f51 100644 --- a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/UKenglish-publist.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/UKenglish-publist.lbx @@ -23,8 +23,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\bpl@version{2.12} -\def\bpl@rdate{2024/07/16} +\def\bpl@version{2.13} +\def\bpl@rdate{2024/08/21} \ProvidesFile{UKenglish-publist.lbx}[\bpl@rdate\space v.\bpl@version\space biblatex-publist UK English localisation (JSP)] diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/USenglish-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/USenglish-publist.lbx index f20be86b76d..cc6526761d5 100644 --- a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/USenglish-publist.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/USenglish-publist.lbx @@ -23,8 +23,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\bpl@version{2.12} -\def\bpl@rdate{2024/07/16} +\def\bpl@version{2.13} +\def\bpl@rdate{2024/08/21} \ProvidesFile{USenglish-publist.lbx}[\bpl@rdate\space v.\bpl@version\space biblatex-publist US English localisation (JSP)] diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/american-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/american-publist.lbx index ae889e02167..5476f022ab0 100644 --- a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/american-publist.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/american-publist.lbx @@ -23,8 +23,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\bpl@version{2.12} -\def\bpl@rdate{2024/07/16} +\def\bpl@version{2.13} +\def\bpl@rdate{2024/08/21} \ProvidesFile{american-publist.lbx}[\bpl@rdate\space v.\bpl@version\space biblatex-publist US English localisation (JSP)] diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/australian-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/australian-publist.lbx index ae6d96e9326..0df359aa827 100644 --- a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/australian-publist.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/australian-publist.lbx @@ -23,8 +23,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\bpl@version{2.12} -\def\bpl@rdate{2024/07/16} +\def\bpl@version{2.13} +\def\bpl@rdate{2024/08/21} \ProvidesFile{australian-publist.lbx}[\bpl@rdate\space v.\bpl@version\space biblatex-publist AU English localisation (JSP)] diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/austrian-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/austrian-publist.lbx index 0ad5c4119e9..0a82a48b773 100644 --- a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/austrian-publist.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/austrian-publist.lbx @@ -23,8 +23,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\bpl@version{2.12} -\def\bpl@rdate{2024/07/16} +\def\bpl@version{2.13} +\def\bpl@rdate{2024/08/21} \ProvidesFile{austrian-publist.lbx}[\bpl@rdate\space v.\bpl@version\space biblatex-publist Austrian localisation (JSP)] @@ -35,8 +35,9 @@ % Localizations \DeclareBibliographyStrings{% inherit = {austrian}, - parttranslationof = {{Teil\"ubersetzung von}{Teil\"ubers\adddotspace von}}, + peerreview:pp = {{Post-Publication-Begutachtung}{Post-Pub\adddot-Beg\adddot}}, with = {{mit}{mit}}, + citations = {{Zitationen}{Zit\adddot}}, impactfactor = {{Impactfaktor}{JIF}}, openaccess:true = {{OpenAccess}{OA}}, openaccess:gold = {{OpenAccess (gold)}{OA (gold)}}, @@ -48,7 +49,9 @@ peerreview:cc = {{Cascading-Begutachtung}{Cascading-Beg\adddot}}, peerreview:tp = {{Begutachtung durch Dritte}{Beg\adddotspace durch Dritte}}, peerreview:pp = {{Post-Publication-Begutachtung}{Post-Pub\adddot-Beg\adddot}}, - peerreview:no = {{keine Begutachtung}{keine Beg\adddot}} + peerreview:no = {{keine Begutachtung}{keine Beg\adddot}}, + annot:main = {{Hauptautor}{Hauptaut\adddot}}, + annot:corresponding = {{Korrespondenzautor}{Korr.-aut\adddot}} } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/british-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/british-publist.lbx index dbfe6131180..b1dbaea5be3 100644 --- a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/british-publist.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/british-publist.lbx @@ -23,8 +23,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\bpl@version{2.12} -\def\bpl@rdate{2024/07/16} +\def\bpl@version{2.13} +\def\bpl@rdate{2024/08/21} \ProvidesFile{british-publist.lbx}[\bpl@rdate\space v.\bpl@version\space biblatex-publist UK English localisation (JSP)] @@ -37,6 +37,7 @@ inherit = {british}, parttranslationof = {{partial translation of}{part\adddotspace trans\adddotspace of}}, with = {{with}{with}}, + citations = {{citations}{cit\adddot}}, impactfactor = {{impact factor}{JIF}}, openaccess:true = {{OpenAccess}{OA}}, openaccess:gold = {{OpenAccess (gold)}{OA (gold)}}, @@ -48,7 +49,9 @@ peerreview:cc = {{cascading peer review}{casc\adddotspace peer rev\adddot}}, peerreview:tp = {{third-party peer review}{3rd-party peer rev\adddot}}, peerreview:pp = {{post-publication peer review}{post-pub\adddotspace peer rev\adddot}}, - peerreview:no = {{no peer review}{no peer rev\adddot}} + peerreview:no = {{no peer review}{no peer rev\adddot}}, + annot:main = {{main author}{main auth\adddot}}, + annot:corresponding = {{corresponding author}{corr\adddotspace auth\adddot}} } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/canadian-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/canadian-publist.lbx index f92334b5bae..288c6941558 100644 --- a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/canadian-publist.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/canadian-publist.lbx @@ -23,8 +23,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\bpl@version{2.12} -\def\bpl@rdate{2024/07/16} +\def\bpl@version{2.13} +\def\bpl@rdate{2024/08/21} \ProvidesFile{canadian-publist.lbx}[\bpl@rdate\space v.\bpl@version\space biblatex-publist CDN English localisation (JSP)] diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/english-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/english-publist.lbx index a51deb5583c..a9dc25db89f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/english-publist.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/english-publist.lbx @@ -23,8 +23,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\bpl@version{2.12} -\def\bpl@rdate{2024/07/16} +\def\bpl@version{2.13} +\def\bpl@rdate{2024/08/21} \ProvidesFile{english-publist.lbx}[\bpl@rdate\space v.\bpl@version\space biblatex-publist English localisation (JSP)] @@ -37,6 +37,7 @@ inherit = {english}, parttranslationof = {{partial translation of}{part\adddotspace trans\adddotspace of}}, with = {{with}{with}}, + citations = {{citations}{cit\adddot}}, impactfactor = {{impact factor}{JIF}}, openaccess:true = {{OpenAccess}{OA}}, openaccess:gold = {{OpenAccess (gold)}{OA (gold)}}, @@ -48,7 +49,9 @@ peerreview:cc = {{cascading peer review}{casc\adddotspace peer rev\adddot}}, peerreview:tp = {{third-party peer review}{3rd-party peer rev\adddot}}, peerreview:pp = {{post-publication peer review}{post-pub\adddotspace peer rev\adddot}}, - peerreview:no = {{no peer review}{no peer rev\adddot}} + peerreview:no = {{no peer review}{no peer rev\adddot}}, + annot:main = {{main author}{main auth\adddot}}, + annot:corresponding = {{corresponding author}{corr\adddotspace auth\adddot}} } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/french-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/french-publist.lbx index e49a00b8c8f..e2f982b03c6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/french-publist.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/french-publist.lbx @@ -23,8 +23,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\bpl@version{2.12} -\def\bpl@rdate{2024/07/16} +\def\bpl@version{2.13} +\def\bpl@rdate{2024/08/21} \ProvidesFile{french-publist.lbx}[\bpl@rdate\space v.\bpl@version\space biblatex-publist French localisation (JSP)] @@ -37,6 +37,7 @@ inherit = {french}, parttranslationof = {{traduction partielle de}{trad\adddotspace part\adddotspace de}}, with = {{avec}{avec}}, + citations = {{citations}{cit\adddot}}, impactfactor = {{facteur d'impact}{FI}}, openaccess:true = {{libre acc\`es}{libre acc\`es}}, openaccess:gold = {{libre acc\`es (dorée)}{libre acc\`es (dorée)}}, @@ -48,7 +49,9 @@ peerreview:cc = {{\'{e}valuation par les pairs en cascade}{\'{e}val\adddotspace par les pairs en cascade}}, peerreview:tp = {{\'{e}valuation par des pairs ext\'{e}rieurs}{\'{e}val\adddotspace par des pairs ext\adddot}}, peerreview:pp = {{\'{e}valuation par les pairs apr\`{e}s publication}{\'{e}val\adddotspace par les pairs apr\`{e}s pub\adddot}}, - peerreview:no = {{pas d'\'{e}valuation par les pairs}{pas d'\'{e}val\adddotspace par les pairs}} + peerreview:no = {{pas d'\'{e}valuation par les pairs}{pas d'\'{e}val\adddotspace par les pairs}}, + annot:main = {{auteur principale}{aut\adddotspace princ\adddot}}, + annot:corresponding = {{auteur correspondant}{aut\adddotspace corr\adddot}} } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/german-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/german-publist.lbx index c7b4570f06b..e67d8d44b10 100644 --- a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/german-publist.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/german-publist.lbx @@ -23,8 +23,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\bpl@version{2.12} -\def\bpl@rdate{2024/07/16} +\def\bpl@version{2.13} +\def\bpl@rdate{2024/08/21} \ProvidesFile{german-publist.lbx}[\bpl@rdate\space v.\bpl@version\space biblatex-publist German localisation (JSP)] @@ -37,6 +37,7 @@ inherit = {german}, parttranslationof = {{Teil\"ubersetzung von}{Teil\"ubers\adddotspace von}}, with = {{mit}{mit}}, + citations = {{Zitationen}{Zit\adddot}}, impactfactor = {{Impactfaktor}{JIF}}, openaccess:true = {{OpenAccess}{OA}}, openaccess:gold = {{OpenAccess (gold)}{OA (gold)}}, @@ -48,7 +49,9 @@ peerreview:cc = {{Cascading-Begutachtung}{Cascading-Beg\adddot}}, peerreview:tp = {{Begutachtung durch Dritte}{Beg\adddotspace durch Dritte}}, peerreview:pp = {{Post-Publication-Begutachtung}{Post-Pub\adddot-Beg\adddot}}, - peerreview:no = {{keine Begutachtung}{keine Beg\adddot}} + peerreview:no = {{keine Begutachtung}{keine Beg\adddot}}, + annot:main = {{Hauptautor}{Hauptaut\adddot}}, + annot:corresponding = {{Korrespondenzautor}{Korr.-aut\adddot}} } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/naustrian-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/naustrian-publist.lbx index 85e0c9a92c7..3b202fe4594 100644 --- a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/naustrian-publist.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/naustrian-publist.lbx @@ -23,8 +23,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\bpl@version{2.12} -\def\bpl@rdate{2024/07/16} +\def\bpl@version{2.13} +\def\bpl@rdate{2024/08/21} \ProvidesFile{naustrian-publist.lbx}[\bpl@rdate\space v.\bpl@version\space biblatex-publist Austrian localisation (JSP)] diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/newzealand-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/newzealand-publist.lbx index 4f9d872e9d8..504410f851f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/newzealand-publist.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/newzealand-publist.lbx @@ -23,8 +23,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\bpl@version{2.12} -\def\bpl@rdate{2024/07/16} +\def\bpl@version{2.13} +\def\bpl@rdate{2024/08/21} \ProvidesFile{newzealand-publist.lbx}[\bpl@rdate\space v.\bpl@version\space biblatex-publist NZ English localisation (JSP)] @@ -37,6 +37,7 @@ inherit = {newzealand}, parttranslationof = {{partial translation of}{part\adddotspace trans\adddotspace of}}, with = {{with}{with}}, + citations = {{citations}{cit\adddot}}, impactfactor = {{impact factor}{JIF}}, openaccess:true = {{OpenAccess}{OA}}, openaccess:gold = {{OpenAccess (gold)}{OA (gold)}}, @@ -48,7 +49,9 @@ peerreview:cc = {{cascading peer review}{casc\adddotspace peer rev\adddot}}, peerreview:tp = {{third-party peer review}{3rd-party peer rev\adddot}}, peerreview:pp = {{post-publication peer review}{post-pub\adddotspace peer rev\adddot}}, - peerreview:no = {{no peer review}{no peer rev\adddot}} + peerreview:no = {{no peer review}{no peer rev\adddot}}, + annot:main = {{main author}{main auth\adddot}}, + annot:corresponding = {{corresponding author}{corr\adddotspace auth\adddot}} } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/ngerman-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/ngerman-publist.lbx index 54f65ef3838..185cbe903a6 100644 --- a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/ngerman-publist.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/ngerman-publist.lbx @@ -23,8 +23,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\bpl@version{2.12} -\def\bpl@rdate{2024/07/16} +\def\bpl@version{2.13} +\def\bpl@rdate{2024/08/21} \ProvidesFile{ngerman-publist.lbx}[\bpl@rdate\space v.\bpl@version\space biblatex-publist German localisation (JSP)] diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/nswissgerman-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/nswissgerman-publist.lbx index be8a9d148ad..a2f1813b38f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/nswissgerman-publist.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/nswissgerman-publist.lbx @@ -23,8 +23,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\bpl@version{2.12} -\def\bpl@rdate{2024/07/16} +\def\bpl@version{2.13} +\def\bpl@rdate{2024/08/21} \ProvidesFile{nswissgerman-publist.lbx}[\bpl@rdate\space v.\bpl@version\space biblatex-publist Swiss German localisation (JSP)] diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/swissgerman-publist.lbx b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/swissgerman-publist.lbx index 5d4be275abd..9bc6f051187 100644 --- a/Master/texmf-dist/tex/latex/biblatex-publist/lbx/swissgerman-publist.lbx +++ b/Master/texmf-dist/tex/latex/biblatex-publist/lbx/swissgerman-publist.lbx @@ -23,8 +23,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\bpl@version{2.12} -\def\bpl@rdate{2024/07/16} +\def\bpl@version{2.13} +\def\bpl@rdate{2024/08/21} \ProvidesFile{swissgerman-publist.lbx}[\bpl@rdate\space v.\bpl@version\space biblatex-publist Swiss German localisation (JSP)] @@ -37,6 +37,7 @@ inherit = {swissgerman}, parttranslationof = {{Teil\"ubersetzung von}{Teil\"ubers\adddotspace von}}, with = {{mit}{mit}}, + citations = {{Zitationen}{Zit\adddot}}, impactfactor = {{Impactfaktor}{JIF}}, openaccess:true = {{OpenAccess}{OA}}, openaccess:gold = {{OpenAccess (gold)}{OA (gold)}}, @@ -48,7 +49,9 @@ peerreview:cc = {{Cascading-Begutachtung}{Cascading-Beg\adddot}}, peerreview:tp = {{Begutachtung durch Dritte}{Beg\adddotspace durch Dritte}}, peerreview:pp = {{Post-Publication-Begutachtung}{Post-Pub\adddot-Beg\adddot}}, - peerreview:no = {{keine Begutachtung}{keine Beg\adddot}} + peerreview:no = {{keine Begutachtung}{keine Beg\adddot}}, + annot:main = {{Hauptautor}{Hauptaut\adddot}}, + annot:corresponding = {{Korrespondenzautor}{Korr.-aut\adddot}} } \endinput diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/publist.bbx b/Master/texmf-dist/tex/latex/biblatex-publist/publist.bbx index 371a06232b1..d3f31a7a03c 100644 --- a/Master/texmf-dist/tex/latex/biblatex-publist/publist.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-publist/publist.bbx @@ -25,8 +25,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\bpl@version{2.12} -\def\bpl@rdate{2024/07/16} +\def\bpl@version{2.13} +\def\bpl@rdate{2024/08/21} \ProvidesFile{publist.bbx}[\bpl@rdate\space v.\bpl@version\space biblatex bibliography style (JSP)] @@ -61,13 +61,14 @@ \newtoggle{bpl@linktitleissn} \newtoggle{bpl@linktitleurl} \newtoggle{bpl@linktitledoi} +\newtoggle{bpl@citinfo} \newtoggle{bpl@jifinfo} \newtoggle{bpl@prinfo} \toggletrue{bpl@prinfo} \newtoggle{bpl@oainfo} \newtoggle{bpl@oainfosimple} \newif\if@bpl@reversenum\@bpl@reversenumfalse - +\def\bpl@annots{} % Valid options % @@ -188,6 +189,9 @@ }, plnumbering.default:n = { global }, plnumbering.usage:n = preamble, + % annotations=<csv> + % Store author name prefix + annotations.tl_set:N = \bpl@annots, % linktitles=<all|url|doi|isbn|issn|none> linktitles .multichoice:, % Link all titles @@ -233,6 +237,18 @@ \toggletrue{bpl@linktitle} }, linktitles.default:n = { all }, + % citinfo=<true|false> + % Information about citation numbers + citinfo.code:n = + { + \str_if_eq:nnTF { #1 } { true } + { + \toggletrue{bpl@citinfo} + }{ + \togglefalse{bpl@citinfo} + } + }, + citinfo.default:n = { true }, % jifinfo=<true|false> % Impact factor information jifinfo.code:n = @@ -428,6 +444,7 @@ \DeclareBibliographyOption{plauthorhandling}[omit]{\ExecutePublistOptions{plauthorhandling=#1}} \DeclareBibliographyOption{nameorder}[family-given]{\ExecutePublistOptions{nameorder=#1}} \DeclareBibliographyOption{plsorting}[ydt]{\ExecutePublistOptions{plsorting=#1}} +\DeclareBibliographyOption{annotations}{\ExecutePublistOptions{annotations={#1}}} \DeclareBibliographyOption{plnumbering}[global]{\ExecutePublistOptions{plnumbering=#1}} \DeclareBibliographyOption{marginyear}[true]{\ExecutePublistOptions{marginyear=#1}} @@ -437,6 +454,7 @@ \DeclareBibliographyOption{jifinfo}[true]{\ExecutePublistOptions{jifinfo=#1}} \DeclareBibliographyOption{oainfo}[simple]{\ExecutePublistOptions{oainfo=#1}} \DeclareBibliographyOption{prinfo}[true]{\ExecutePublistOptions{prinfo=#1}} +\DeclareBibliographyOption{citinfo}[true]{\ExecutePublistOptions{citinfo=#1}} \DeclareBibliographyOption{linktitles}[all]{\ExecutePublistOptions{linktitles={#1}}}% Extra braces needed (multichoice) @@ -986,23 +1004,37 @@ % Print the labelnumber as the total number of entries in the % current refsection, minus the actual labelnumber, plus one \ifbool{plnumgroup}{% - \number\numexpr\csuse{bpl@itemtotal}-#1+1\relax% + \xdef\bpl@current@item@no{\number\numexpr\csuse{bpl@itemtotal}-#1+1\relax}% + \bpl@current@item@no% }{% \ifcsdef{bpl@secitems:\therefsection}{% - \number\numexpr\csuse{bpl@secitems:\therefsection}-#1+1% - +\csuse{bpl@shift@itemtotal}\relax% + \xdef\bpl@current@item@no{\number\numexpr\csuse{bpl@secitems:\therefsection}-#1+1% + +\csuse{bpl@shift@itemtotal}\relax}% + \bpl@current@item@no% }{% - \number\numexpr\csuse{bpl@itemtotal}-#1+1\relax% + \xdef\bpl@current@item@no{\number\numexpr\csuse{bpl@itemtotal}-#1+1\relax}% + \bpl@current@item@no% }% }% }{% % Use decreasing counter \ifcsdef{bpl@items:\theprevrefsection}{% - \number\numexpr\csuse{bpl@itemtotal}-#1+1-\csuse{bpl@items:\theprevrefsection}\relax% + \xdef\bpl@current@item@no{\number\numexpr\csuse{bpl@itemtotal}-#1+1% + -\csuse{bpl@items:\theprevrefsection}\relax}% + \bpl@current@item@no% }{% - \number\numexpr\csuse{bpl@itemtotal}-#1+1\relax% + \xdef\bpl@current@item@no{\number\numexpr\csuse{bpl@itemtotal}-#1+1\relax}% + \bpl@current@item@no% }% }% + % Store number in pbx file + \if@filesw% + \protected@write\bpl@bpxfile{}{% + \csedef{bpl@itemnumber:\thefield{entrykey}}{\bpl@current@item@no}% + \csedef{bpl@itemsec:\thefield{entrykey}}{\therefsection}% + \csedef{bpl@itemtotal}{\csuse{bpl@itemtotal}}% + }% + \fi% }% \renewrobustcmd{\mkbibsecstart}[1]{% \setcounter{prevrefsection}{\therefsection}% @@ -1037,6 +1069,64 @@ \fi }% +% +% Data annotation +% + +\newcommand*\mkbplannot[1]{\textsuperscript{#1}} + +% Symbol helpers +\ExplSyntaxOn + \clist_new:N \l_bpl_annot_symbols + \cs_new_nopar:Npn \SetAnnotSymbols #1 + { + \clist_gset:Nn \l_bpl_annot_symbols { #1 } + } + \SetAnnotSymbols + { \textasteriskcentered, \textdaggerdbl, \textsection, \textparagraph, + \textbardbl, \textdagger, {\textasteriskcentered\textasteriskcentered}, + {\textdaggerdbl\textdaggerdbl}, {\textdagger\textdagger} + } + % get symbol by position (int) + \cs_new_nopar:Npn \bpl@get@annot@symbol #1 + { + \clist_item:Nn \l_bpl_annot_symbols { #1 } + } +\ExplSyntaxOff + +% get symbol by category name +\NewDocumentCommand\GetAnnotSymbol { s m }{ + \edef\tmpa{}% + \setcounter{annotsymb}{1}% + \renewcommand*{\do}[1]{% + \ifstrequal{#2}{##1} + {\edef\tmpa{\bpl@get@annot@symbol{\theannotsymb}}}% + {}% + \stepcounter{annotsymb}% + }% + \expandafter\docsvlist\expandafter{\bpl@annots}% + \IfBooleanTF{#1}{\tmpa}{\mkbplannot{\tmpa}}% +} + +% handle the annotations as passed by annotations option +\AtEndOfPackage{% +\ifx\bpl@annots\empty\else + % helper function for annotations + \newcounter{annotsymb} + \newcommand*\bplannot{% + \setcounter{annotsymb}{1}% + \renewcommand*{\do}[1]{% + \ifitemannotation{##1} + {\mkbplannot{\bpl@get@annot@symbol{\theannotsymb}}}% + {}% + \stepcounter{annotsymb}% + }% + \expandafter\docsvlist\expandafter{\bpl@annots}% + } + % do annotation in family names + \renewcommand*{\mkbibnamefamily}[1]{\bplannot #1} +\fi +} % % New environment for (foreign) reviews @@ -1078,6 +1168,13 @@ } % +% Citation info +% +\DeclareFieldFormat{citations}{% + \bibstring{citations}\addcolon\addspace#1% +} + +% % Impact factor % \DeclareFieldFormat{impactfactor}{% @@ -1379,6 +1476,26 @@ \iftoggle{isplauthor}% {% <- TRUE condition \global\toggletrue{hadplauthor}% + \ifx\bpl@annots\empty\else + \gdef\bpl@extra@annots{}% + \renewcommand*{\do}[1]{% + \ifitemannotation{##1} + {% + \iftoggle{bpl@have@extrainfo}% + {\gappto\bpl@extra@annots{\plextrainfosep\ifbibstring{annot:##1}% + {\bibstring{annot:##1}}% + {##1}}% + }% + {\gappto\bpl@extra@annots{\ifbibstring{annot:##1}% + {\bibstring{annot:##1}}% + {##1}}% + }% + \toggletrue{bpl@have@extrainfo}% + }% + {}% + }% + \expandafter\docsvlist\expandafter{\bpl@annots}% + \fi% }% <- end TRUE condition {% <- FALSE condition \stepcounter{nonpl#1}% @@ -1402,7 +1519,7 @@ {\ifdefvoid{\namepartgiven}{}{\mkbibnamegiven{\namepartgiven}\addspace}}% \ifdefvoid{\namepartprefix}{}{\mkbibnameprefix{\namepartprefix}\addspace}% \global\togglefalse{plauthorprecedes}% - \namepartfamily% + \mkbibnamefamily{\namepartfamily}% }% }% <- end FALSE condition % @@ -1741,6 +1858,12 @@ }% } +% +% Extra information +% + +\def\bpl@extra@annots{} + \newtoggle{bpl@have@extrainfo} \renewbibmacro*{addendum+pubstate}{% @@ -1762,14 +1885,35 @@ not test {\iffieldundef{impactfactor}} and test {\iftoggle{bpl@jifinfo}} ) + or + ( + not test {\iffieldundef{citations}} + and test {\iftoggle{bpl@citinfo}} + ) + or + ( + not test {\ifcsvoid{bpl@extra@annots}} + ) }{% \newunit\newblock% \printtext[plextrainfo]{% + \ifx\bpl@extra@annots\empty\else + \bpl@extra@annots% + \toggletrue{bpl@have@extrainfo}% + \fi \ifboolexpr{ not test {\iffieldundef{peerreview}} and test {\iftoggle{bpl@prinfo}} }{% - \toggletrue{bpl@have@extrainfo}% + \iftoggle{bpl@have@extrainfo}{\plextrainfosep}{}% \printfield{peerreview}% + \toggletrue{bpl@have@extrainfo}% + }{}% + \ifboolexpr{ not test {\iffieldundef{citations}} + and test {\iftoggle{bpl@citinfo}} + }{% + \iftoggle{bpl@have@extrainfo}{\plextrainfosep}{}% + \printfield{citations}% + \toggletrue{bpl@have@extrainfo}% }{}% \ifboolexpr{ not test {\iffieldundef{openaccess}} and test {\iftoggle{bpl@oainfo}} @@ -1795,6 +1939,7 @@ \DeclareLanguageMappingSuffix{-publist} % publist-specific bibstrings +\NewBibliographyString{citations} \NewBibliographyString{with} \NewBibliographyString{parttranslationof} \NewBibliographyString{impactfactor} @@ -1809,6 +1954,8 @@ \NewBibliographyString{peerreview:tp} \NewBibliographyString{peerreview:pp} \NewBibliographyString{peerreview:no} +\NewBibliographyString{annot:main} +\NewBibliographyString{annot:corresponding} % diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/publist.cbx b/Master/texmf-dist/tex/latex/biblatex-publist/publist.cbx index 8176810996a..d384445d635 100644 --- a/Master/texmf-dist/tex/latex/biblatex-publist/publist.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-publist/publist.cbx @@ -26,8 +26,8 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\bpl@version{2.12} -\def\bpl@rdate{2024/07/16} +\def\bpl@version{2.13} +\def\bpl@rdate{2024/08/21} \ProvidesFile{publist.cbx}[\bpl@rdate\space v.\bpl@version\space biblatex citation style (JSP)] diff --git a/Master/texmf-dist/tex/latex/biblatex-publist/publist.dbx b/Master/texmf-dist/tex/latex/biblatex-publist/publist.dbx index 9e4b798f8c3..27cb4068f5f 100644 --- a/Master/texmf-dist/tex/latex/biblatex-publist/publist.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-publist/publist.dbx @@ -1,5 +1,5 @@ % publist.dbx, biblatex data model specification for the biblatex-publist -% package, version 2.12 (2024/07/16). +% package, version 2.13 (2024/08/21). % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3 @@ -22,11 +22,13 @@ % Add peerreview and openaccess (literal) field \DeclareDatamodelFields[type=field, datatype=literal]{ + citations, impactfactor, openaccess, peerreview} \DeclareDatamodelEntryfields{ + citations, impactfactor, openaccess, peerreview} diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/BMSTU-IU8.cls b/Master/texmf-dist/tex/latex/bmstu-iu8/BMSTU-IU8.cls index e50cde4c75e..17c168f9f21 100644 --- a/Master/texmf-dist/tex/latex/bmstu-iu8/BMSTU-IU8.cls +++ b/Master/texmf-dist/tex/latex/bmstu-iu8/BMSTU-IU8.cls @@ -1,6 +1,6 @@ % Author: CatInCosmicSpace \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{BMSTU-IU8}[2020/06/01 IU8 class] +\ProvidesClass{BMSTU-IU8}[2024/08/17 IU8 class] \LoadClass{article} @@ -26,28 +26,28 @@ \RequirePackage[russian]{babel} \RequirePackage{hyphsubst} -\RequirePackage{01-IU8-base} -\RequirePackage{02-IU8-construction} -\RequirePackage{03-IU8-numbering} -\RequirePackage{04-IU8-section-numbering} -\RequirePackage{05-IU8-figures} -\RequirePackage{06-IU8-tables} -\RequirePackage{07-IU8-footnotes} -\RequirePackage{08-IU8-formulas} -\RequirePackage{09-IU8-cites} -\RequirePackage{10-IU8-titlepage} -\RequirePackage{11-IU8-performers} -\RequirePackage{12-IU8-abstract} -\RequirePackage{13-IU8-contents} -\RequirePackage{14-IU8-terms-and-definitions} -\RequirePackage{15-IU8-list-of-abbreviations} -\RequirePackage{16-IU8-references} -\RequirePackage{17-IU8-appendices} -\RequirePackage{18-IU8-extra} -\RequirePackage{19-IU8-counters} -\RequirePackage{20-IU8-listing} -\RequirePackage{21-IU8-math} -\RequirePackage{22-IU8-algorithms} +\RequirePackage{IU8-01-base} +\RequirePackage{IU8-02-construction} +\RequirePackage{IU8-03-numbering} +\RequirePackage{IU8-04-section-numbering} +\RequirePackage{IU8-05-figures} +\RequirePackage{IU8-06-tables} +\RequirePackage{IU8-07-footnotes} +\RequirePackage{IU8-08-formulas} +\RequirePackage{IU8-09-cites} +\RequirePackage{IU8-10-titlepage} +\RequirePackage{IU8-11-performers} +\RequirePackage{IU8-12-abstract} +\RequirePackage{IU8-13-contents} +\RequirePackage{IU8-14-terms-and-definitions} +\RequirePackage{IU8-15-list-of-abbreviations} +\RequirePackage{IU8-16-references} +\RequirePackage{IU8-17-appendices} +\RequirePackage{IU8-18-extra} +\RequirePackage{IU8-19-counters} +\RequirePackage{IU8-20-listing} +\RequirePackage{IU8-21-math} +\RequirePackage{IU8-22-algorithms} \RequirePackage{csquotes} diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/01-IU8-base.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-01-base.sty index f3df2d3f5ed..c51f336b7cc 100644 --- a/Master/texmf-dist/tex/latex/bmstu-iu8/01-IU8-base.sty +++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-01-base.sty @@ -1,6 +1,6 @@ % Author: CatInCosmicSpace \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{01-IU8-base}[2021/03/21 v1.2 Общие требования] +\ProvidesPackage{IU8-01-base}[2024/08/17 v1.3 Общие требования] % 6.1.1 Изложение текста и оформление отчета выполняют в соответствии с % требованиями настоящего стандарта. Страницы текста отчета о НИР и включенные в diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/02-IU8-construction.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-02-construction.sty index b94615c0039..0c684a57004 100644 --- a/Master/texmf-dist/tex/latex/bmstu-iu8/02-IU8-construction.sty +++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-02-construction.sty @@ -1,6 +1,6 @@ % Author: CatInCosmicSpace \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{02-IU8-construction}[2021/03/21 v1.2 Построение отчета] +\ProvidesPackage{IU8-02-construction}[2024/08/17 v1.3 Построение отчета] % 6.2.1 Наименования структурных элементов отчета: % "СПИСОК ИСПОЛНИТЕЛЕЙ", % у нас не используется diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/03-IU8-numbering.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-03-numbering.sty index b8696c01f3b..3d0bb94e9fe 100644 --- a/Master/texmf-dist/tex/latex/bmstu-iu8/03-IU8-numbering.sty +++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-03-numbering.sty @@ -1,6 +1,6 @@ % Author: CatInCosmicSpace \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{03-IU8-numbering}[2021/03/21 v1.2 Нумерация страниц отчета] +\ProvidesPackage{IU8-03-numbering}[2024/08/17 v1.3 Нумерация страниц отчета] % 6.3.1 Страницы отчета следует нумеровать арабскими цифрами, соблюдая сквозную % нумерацию по всему тексту отчета, включая приложения. Номер страницы diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/04-IU8-section-numbering.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-04-section-numbering.sty index 839c34816e4..af812f58553 100644 --- a/Master/texmf-dist/tex/latex/bmstu-iu8/04-IU8-section-numbering.sty +++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-04-section-numbering.sty @@ -1,6 +1,6 @@ % Author: CatInCosmicSpace \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{04-IU8-section-numbering}[2021/03/21 v1.2 Нумерация разделов, подразделов, пунктов, подпунктов и книг отчета] +\ProvidesPackage{IU8-04-section-numbering}[2024/08/17 v1.3 Нумерация разделов, подразделов, пунктов, подпунктов и книг отчета] % 6.4.1 Разделы должны иметь порядковые номера в пределах всего отчета, % обозначенные арабскими цифрами без точки и расположенные с абзацного отступа. @@ -10,7 +10,7 @@ % подразделы, могут состоять из одного или нескольких пунктов. % Это настройка по умолчанию, так что её не меняю -% Про абзацный отступ учетно в 02-IU8-construction +% Про абзацный отступ учетно в IU8-02-construction % 6.4.2 Если отчет не имеет подразделов, то нумерация пунктов в нем должна % быть в пределах каждого раздела и номер пункта должен состоять из номеров diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/05-IU8-figures.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-05-figures.sty index 7210da52453..4ccda32cdaa 100644 --- a/Master/texmf-dist/tex/latex/bmstu-iu8/05-IU8-figures.sty +++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-05-figures.sty @@ -1,6 +1,6 @@ % Author: CatInCosmicSpace \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{05-IU8-figures}[2021/03/21 v1.2 Иллюстрации] +\ProvidesPackage{IU8-05-figures}[2024/08/17 v1.3 Иллюстрации] % 6.5.1 Иллюстрации (чертежи, графики, схемы, компьютерные распечатки, диаграммы, % фотоснимки) следует располагать в отчете непосредственно после текста отчета, diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/06-IU8-tables.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-06-tables.sty index eedb9d94df9..705924bd99f 100644 --- a/Master/texmf-dist/tex/latex/bmstu-iu8/06-IU8-tables.sty +++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-06-tables.sty @@ -1,6 +1,6 @@ % Author: CatInCosmicSpace \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{06-IU8-tables}[2021/03/21 v1.2 Таблицы] +\ProvidesPackage{IU8-06-tables}[2024/08/17 v1.3 Таблицы] % Пакеты, которые скорее всего пригодятся \RequirePackage{tabularx} diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/07-IU8-footnotes.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-07-footnotes.sty index 689cdd0337e..9efd173fb08 100644 --- a/Master/texmf-dist/tex/latex/bmstu-iu8/07-IU8-footnotes.sty +++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-07-footnotes.sty @@ -1,6 +1,6 @@ % Author: CatInCosmicSpace \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{07-IU8-footnotes}[2021/03/21 v1.2 Примечания и сноски] +\ProvidesPackage{IU8-07-footnotes}[2024/08/17 v1.3 Примечания и сноски] % 6.7.1 Примечания приводят в отчете, если необходимы пояснения или справочные % данные к содержанию текста, таблиц или графического материала. diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/08-IU8-formulas.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-08-formulas.sty index aa65770e77e..cfe0b98dbda 100644 --- a/Master/texmf-dist/tex/latex/bmstu-iu8/08-IU8-formulas.sty +++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-08-formulas.sty @@ -1,5 +1,5 @@ % Author: CatInCosmicSpace \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{08-IU8-formulas}[2021/03/21 v1.2 Формулы] +\ProvidesPackage{IU8-08-formulas}[2024/08/17 v1.3 Формулы] % Настройки по умолчанию в целом соответствуют ГОСТ
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/09-IU8-cites.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-09-cites.sty index 651f2a3e4e0..6d070074b3d 100644 --- a/Master/texmf-dist/tex/latex/bmstu-iu8/09-IU8-cites.sty +++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-09-cites.sty @@ -1,6 +1,6 @@ % Author: CatInCosmicSpace \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{09-IU8-cites}[2021/03/21 v1.2 Ссылки] +\ProvidesPackage{IU8-09-cites}[2024/08/17 v1.3 Ссылки] % 6.9.1 В отчете о НИР рекомендуется приводить ссылки на использованные % источники. При нумерации ссылок на документы, использованные при составлении diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/10-IU8-titlepage.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-10-titlepage.sty index e9834bc07b2..97fc11ecc55 100644 --- a/Master/texmf-dist/tex/latex/bmstu-iu8/10-IU8-titlepage.sty +++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-10-titlepage.sty @@ -1,6 +1,6 @@ % Author: CatInCosmicSpace \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{10-IU8-titlepage}[2021/03/21 v1.2 Титульный лист] +\ProvidesPackage{IU8-10-titlepage}[2024/08/17 v1.3 Титульный лист] % Поля для заполнения для ВКР \def\student#1{\gdef\@student{#1}} diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/11-IU8-performers.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-11-performers.sty index 14b659de63c..e628023df4d 100644 --- a/Master/texmf-dist/tex/latex/bmstu-iu8/11-IU8-performers.sty +++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-11-performers.sty @@ -1,5 +1,5 @@ % Author: CatInCosmicSpace \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{11-IU8-performers}[2021/03/21 v1.2 Список исполниетелей] +\ProvidesPackage{IU8-11-performers}[2024/08/17 v1.3 Список исполниетелей] % Т.к. у нас это не используется, я оставляю это пустымы
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/12-IU8-abstract.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-12-abstract.sty index 946d3360bce..c1e1a6dc869 100644 --- a/Master/texmf-dist/tex/latex/bmstu-iu8/12-IU8-abstract.sty +++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-12-abstract.sty @@ -1,6 +1,6 @@ % Author: CatInCosmicSpace \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{12-IU8-abstract}[2021/03/21 v1.2 Реферат] +\ProvidesPackage{IU8-12-abstract}[2024/08/17 v1.3 Реферат] % 6.12.1 Сведения об общем объеме отчета, количестве книг отчета, иллюстраций, % таблиц, использованных источников, приложений являются первой компонентой diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/13-IU8-contents.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-13-contents.sty index bf51955ac00..3bd4e677168 100644 --- a/Master/texmf-dist/tex/latex/bmstu-iu8/13-IU8-contents.sty +++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-13-contents.sty @@ -1,6 +1,6 @@ % Author: CatInCosmicSpace \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{13-IU8-contents}[2021/03/21 v1.2 Содержание] +\ProvidesPackage{IU8-13-contents}[2024/08/17 v1.3 Содержание] % Каждую запись содержания оформляют как отдельный абзац, выровненный влево. % Номера страниц указывают выровненными по правому краю поля и соединяют diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/14-IU8-terms-and-definitions.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-14-terms-and-definitions.sty index e3e15e2d2e7..8378ff28261 100644 --- a/Master/texmf-dist/tex/latex/bmstu-iu8/14-IU8-terms-and-definitions.sty +++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-14-terms-and-definitions.sty @@ -1,6 +1,6 @@ % Author: CatInCosmicSpace \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{14-IU8-terms-and-definitions}[2021/03/21 v1.2 Содержание] +\ProvidesPackage{IU8-14-terms-and-definitions}[2024/08/17 v1.3 Содержание] \RequirePackage[ acronym, diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/15-IU8-list-of-abbreviations.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-15-list-of-abbreviations.sty index d8345fdd1fe..49a5aeb8aa3 100644 --- a/Master/texmf-dist/tex/latex/bmstu-iu8/15-IU8-list-of-abbreviations.sty +++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-15-list-of-abbreviations.sty @@ -1,6 +1,6 @@ % Author: CatInCosmicSpace \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{15-IU8-list-of-abbreviations}[2021/03/21 v1.2 Содержание] +\ProvidesPackage{IU8-15-list-of-abbreviations}[2024/08/17 v1.3 Содержание] \RequirePackage[abbreviations]{glossaries-extra} diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/16-IU8-references.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-16-references.sty index 7a51a9235af..7e7fd9d3475 100644 --- a/Master/texmf-dist/tex/latex/bmstu-iu8/16-IU8-references.sty +++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-16-references.sty @@ -1,6 +1,6 @@ % Author: CatInCosmicSpace \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{16-IU8-references}[2021/03/21 v1.2 Список использованных источников] +\ProvidesPackage{IU8-16-references}[2024/08/17 v1.3 Список использованных источников] % Сведения об источниках следует располагать в порядке появления ссылок на % источники в тексте отчета и нумеровать арабскими цифрами с точкой и печатать @@ -16,3 +16,6 @@ \addto{\captionsrussian}{% \renewcommand{\contentsname}{СОДЕРЖАНИЕ} } + +% Специально изменим шрифт для URL, чтобы он соответсвовал ГОСТ и остальному тексту документа +\renewcommand{\UrlFont}{\normalfont} diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/17-IU8-appendices.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-17-appendices.sty index 025e70b5c8f..e89c637ec60 100644 --- a/Master/texmf-dist/tex/latex/bmstu-iu8/17-IU8-appendices.sty +++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-17-appendices.sty @@ -1,6 +1,6 @@ % Author: CatInCosmicSpace \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{17-IU8-appendices}[2021/03/21 v1.2 Приложения] +\ProvidesPackage{IU8-17-appendices}[2024/08/17 v1.3 Приложения] \newcommand{\appendixsection}[1]{ \stepcounter{apps} diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/18-IU8-extra.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-18-extra.sty index 6fb1570340a..44e932a3e9f 100644 --- a/Master/texmf-dist/tex/latex/bmstu-iu8/18-IU8-extra.sty +++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-18-extra.sty @@ -1,6 +1,6 @@ % Author: CatInCosmicSpace \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{18-IU8-extra}[2021/03/21 v1.2 Разные улучшения] +\ProvidesPackage{IU8-18-extra}[2024/08/17 v1.3 Разные улучшения] \RequirePackage{graphicx} diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/19-IU8-counters.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-19-counters.sty index 991f9f4d43f..c5e7d801363 100644 --- a/Master/texmf-dist/tex/latex/bmstu-iu8/19-IU8-counters.sty +++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-19-counters.sty @@ -1,6 +1,6 @@ % Author: CatInCosmicSpace \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{19-IU8-counters}[2021/03/21 v1.2 Счётчики] +\ProvidesPackage{IU8-19-counters}[2024/08/17 v1.3 Счётчики] \RequirePackage{calc} \RequirePackage{xassoccnt} diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/20-IU8-listing.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-20-listing.sty index c90194a1d25..22dd68b97bf 100644 --- a/Master/texmf-dist/tex/latex/bmstu-iu8/20-IU8-listing.sty +++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-20-listing.sty @@ -1,6 +1,6 @@ % Author: CatInCosmicSpace \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{20-IU8-listing}[2021/03/21 v1.2 Листинги] +\ProvidesPackage{IU8-20-listing}[2024/08/17 v1.3 Листинги] \RequirePackage{listings} \RequirePackage{xcolor} diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/21-IU8-math.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-21-math.sty index b60a4fd6d2c..b72be1370ce 100644 --- a/Master/texmf-dist/tex/latex/bmstu-iu8/21-IU8-math.sty +++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-21-math.sty @@ -1,6 +1,6 @@ % Author: CatInCosmicSpace \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{21-IU8-math}[2021/03/21 v1.2 Математика] +\ProvidesPackage{IU8-21-math}[2024/08/17 v1.3 Математика] \RequirePackage{amsthm} \theoremstyle{definition} diff --git a/Master/texmf-dist/tex/latex/bmstu-iu8/22-IU8-algorithms.sty b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-22-algorithms.sty index f3fdcee25ef..5cf88314627 100644 --- a/Master/texmf-dist/tex/latex/bmstu-iu8/22-IU8-algorithms.sty +++ b/Master/texmf-dist/tex/latex/bmstu-iu8/IU8-22-algorithms.sty @@ -1,6 +1,6 @@ % Author: CatInCosmicSpace \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{22-IU8-algorithms}[2021/03/21 v1.2 Алгоритмы] +\ProvidesPackage{IU8-22-algorithms}[2024/08/17 v1.3 Алгоритмы] \RequirePackage[linesnumbered,boxruled]{algorithm2e} \SetAlCapSty{} diff --git a/Master/texmf-dist/tex/latex/bxpdfver/bxpdfver.sty b/Master/texmf-dist/tex/latex/bxpdfver/bxpdfver.sty index 46c65cd9a26..296774068c6 100644 --- a/Master/texmf-dist/tex/latex/bxpdfver/bxpdfver.sty +++ b/Master/texmf-dist/tex/latex/bxpdfver/bxpdfver.sty @@ -10,12 +10,8 @@ %% package declaration \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bxpdfver}[2024/07/24 v0.7] +\ProvidesPackage{bxpdfver}[2024/08/03 v0.8] \def\bxpv@pkgname{bxpdfver} - -%% preparations -\RequirePackage{ifthen}[]% for \newboolean -\newif\ifbxpv@ok \providecommand\bxDebug[1]{} %--------------------------------------- package options @@ -124,13 +120,23 @@ \fi \fi -%--------------------------------------- helpers +%--------------------------------------- general + +%% packages +\RequirePackage{ifthen}[]% for \newboolean + +%% variables +\newif\ifbxpv@ok %% unique tokens \def\bxpv@end{\bxpv@end@} \def\bxpv@mt{\bxpv@mt@} \let\bxpv@mk\noindent +%% \ifbxpv@read@file@ok +% Whether or not the last \bxpv@read@file succeeded. +\newif\ifbxpv@read@file@ok + %% \bxpv@csletcs \def\bxpv@csletcs#1#2{% \expandafter\let\csname#1\expandafter\endcsname\csname#2\endcsname @@ -187,10 +193,51 @@ \bxpv@csletcs{ifbxpv@defined}{% if\ifx\ifdefined\@undefined false\else defined\fi} +%% \bxpv@begin@document@hook +% The begin-document hook. +\@onlypreamble\bxpv@begin@document@hook +\let\bxpv@begin@document@hook\@empty +\AtBeginDocument{\bxpv@begin@document@hook} + +%--------------------------------------- environment check + %% \ifbxpv@old@hook@system \newif\ifbxpv@old@hook@system \@ifl@t@r\fmtversion{2020/10/01}{}{\bxpv@old@hook@systemtrue} +%% \ifbxpv@pdfmanagement@ok +% Whether this package is supporting the LaTeX PDF management +% of the current kernel. +% (If the PDF management is active but this switch is off, +% then this package will switch to no-op mode.) +\newif\ifbxpv@pdfmanagement@ok + +%% check for new PDF management +\if t\bxpv@ignore@pdfmanagement\else + \ifx\IfPDFManagementActiveTF\@undefined\else + \IfPDFManagementActiveTF{% + \let\bxpv@drv@type=m% + \def\bxpv@drv@name{latex-pdf}% + \@ifl@t@r\fmtversion{2022/06/01}{% + \bxpv@pdfmanagement@oktrue + }{} + }{} + \fi +\fi +\ifx m\bxpv@drv@type + \ifbxpv@pdfmanagement@ok + \bxpv@warn + {New PDF management is active.\MessageBreak + The driver is set to '\bxpv@drv@name'}% + % Here \ExplSyntaxOn should be available. + \else + \bxpv@warn + {New PDF management is active, but\MessageBreak + the kernel is too old (before 2022/06/01).\MessageBreak + Thus this package will not work}% + \fi +\fi + %--------------------------------------- internal dispatchers % Initially all dispatchers are "unavailable". @@ -234,24 +281,10 @@ \@onlypreamble\bxpv@cancel@obj@compress \let\bxpv@cancel@obj@compress\relax -%% \bxpv@begin@document@hook -% The begin-document hook. -\@onlypreamble\bxpv@begin@document@hook -\let\bxpv@begin@document@hook\@empty -\AtBeginDocument{\bxpv@begin@document@hook} \g@addto@macro\bxpv@begin@document@hook{% \bxpv@check@hyperref % must come first } -%% check for new PDF management -\if t\bxpv@ignore@pdfmanagement\else - \ifx\IfPDFManagementActiveTF\@undefined\else - \IfPDFManagementActiveTF{% - \global\let\bxpv@drv@type=m% - }{} - \fi -\fi - %% Redefine internal dispatchers. \ifx 0\bxpv@drv@type\else %-------- \begingroup @@ -274,9 +307,31 @@ %% switch \if m\bxpv@drv@type - %% when in new PDF management - \bxpv@warn - {New PDF management is active}% + \ifbxpv@pdfmanagement@ok + % Here all l3pdf function is assumed to be available. + \gdef\bxpv@check@version{\bxpv@oktrue} + \ExplSyntaxOn %!!!!!! + \tl_new:N \g__bxpv_org_version + \exp_args:NNe \tl_gset:Nn \g__bxpv_org_version { \pdf_version: } + \cs_gset:Npn \bxpv@set@version + { + \token_if_eq_meaning:NNTF \bxpdfverMinorVersion \relax + { \pdf_version_gset:n { \g__bxpv_org_version } } + { + \pdf_version_gset:n + { + \int_use:N \bxpdfverMajorVersion + . \int_use:N \bxpdfverMinorVersion + } + } + } + % \pdf_uncompress: does both. + \cs_gset:Npn \bxpv@suppress@compress + { \pdf_uncompress: } + \cs_gset:Npn \bxpv@suppress@obj@compress + { \pdf_uncompress: } + \ExplSyntaxOff %!!!!!! + \fi \else\ifnum\bxpv@pdfoutput>\z@ %% when in PDF mode \global\let\bxpv@drv@type=p @@ -683,7 +738,7 @@ \fi %% variables -\let\bxpv@dvipdfmx@known@min\relax +\let\bxpv@dvipdfmx@known@min\relax % minimum known dviodfmx version \let\bxpv@C@value\relax %% \bxpv@C@bits @@ -765,7 +820,7 @@ % C option value \ifx\bxpv@C@bits\@empty\else % When C option is used, its value is automatically OR'ed with - % the current value, so we need read the config for that. + % the current value, so we need not read the config for that. \def\bxpv@C@value{0}% \def\do##1{% \bxpv@rc@bitset{\bxpv@C@value}{##1}% @@ -792,18 +847,27 @@ } %% \bxpv@get@dvipdfmx@known@min +% Gathers the information and sets \bxpv@dvipdfmx@known@min, +% without actually spawning extractbb. +% (Called in the begin-document hook.) \@onlypreamble\bxpv@get@dvipdfmx@known@min \def\bxpv@get@dvipdfmx@known@min{% + % initially no information \def\bxpv@dvipdfmx@known@min{0}% + % l3backend-dvipdfmx of revision 2022-04-10 or later requires + % dvipdfmx of version 20201111 or later. \def\bxpv@tmpa{def}% \let\bxpv@tmpb\@gobbletwo \@ifl@aded\bxpv@tmpa{l3backend-dvipdfmx}{% \def\bxpv@tmpb{\@ifl@ter\bxpv@tmpa{l3backend-dvipdfmx}}% }{}% + % Just in case.... \@ifl@aded\bxpv@tmpa{l3backend-dvips}{% \def\bxpv@tmpb{\@ifl@ter\bxpv@tmpa{l3backend-dvips}}% }{}% \bxpv@tmpb{2022/04/10}{% + % Now the version is known to be 20201111 or later. + % This information can save much need for spawning extractbb. \def\bxpv@dvipdfmx@known@min{20201111}% }{}% \bxDebug{dvipdfmx-known-min:\bxpv@dvipdfmx@known@min}% @@ -998,10 +1062,6 @@ \let\bxpv@rf@line\relax % line content \let\bxpv@rf@cont\relax % continue to read? -%% \ifbxpv@read@file@ok -% Whether or not the last \bxpv@read@file succeeded. -\newboolean{bxpv@read@file@ok} - %% \bxpv@read@file{<file-name>}{<line-parser-code>} % Reads from a text file. The line parser takes as #1 the % content of each line. diff --git a/Master/texmf-dist/tex/latex/catppuccinpalette/catppuccinpalette.sty b/Master/texmf-dist/tex/latex/catppuccinpalette/catppuccinpalette.sty index 4a907a6c0d2..7d9677428d1 100644 --- a/Master/texmf-dist/tex/latex/catppuccinpalette/catppuccinpalette.sty +++ b/Master/texmf-dist/tex/latex/catppuccinpalette/catppuccinpalette.sty @@ -8,19 +8,29 @@ %% %% This is a generated file. %% -%% Copyright (C) 2024 by Lukas Heindl <oss.heindl+latex@protonmail.com> -%% -------------------------------------------------------------------------- -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX -%% version 2005/12/01 or later. +%% Copyright (c) 2021 Catppuccin +%% +%% Permission is hereby granted, free of charge, to any person obtaining a copy +%% of this software and associated documentation files (the "Software"), to deal +%% in the Software without restriction, including without limitation the rights +%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +%% copies of the Software, and to permit persons to whom the Software is +%% furnished to do so, subject to the following conditions: +%% +%% The above copyright notice and this permission notice shall be included in all +%% copies or substantial portions of the Software. +%% +%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +%% SOFTWARE. %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{catppuccinpalette} - [2024/05/22 v1.0.2 catppuccin xcolor palette] + [2024/08/13 v1.1.0 catppuccin xcolor palette] \NeedsTeXFormat{LaTeX2e}[1994/06/01] \RequirePackage{pgfopts} \RequirePackage{xcolor} @@ -28,16 +38,24 @@ \newif\ifcatppuccinpalette@textcolor \pgfkeys{ /catppuccinPalette/.cd, +Latte/.style={style=Latte}, +latte/.style={style=Latte}, +Frappe/.style={style=Frappe}, +frappe/.style={style=Frappe}, +Macchiato/.style={style=Macchiato}, +macchiato/.style={style=Macchiato}, +Mocha/.style={style=Mocha}, +mocha/.style={style=Mocha}, style/.is choice, style/.value required, style/Latte/.code = {\def\catppuccinpalette@style{Latte}}, -style/latte/.forward to = /catppuccinPalette/style/Latte, +style/latte/.style = {style=Latte}, style/Frappe/.code = {\def\catppuccinpalette@style{Frappe}}, -style/frappe/.forward to = /catppuccinPalette/style/frappe, +style/frappe/.style = {style=Frappe}, style/Macchiato/.code = {\def\catppuccinpalette@style{Macchiato}}, -style/macchiato/.forward to = /catppuccinPalette/style/Macchiato, +style/macchiato/.style = {style=Macchiato}, style/Mocha/.code = {\def\catppuccinpalette@style{Mocha}}, -style/mocha/.forward to = /catppuccinPalette/style/Mocha, +style/mocha/.style = {style=Mocha}, textcolor/.is if = catppuccinpalette@textcolor, textcolor/.default = true, pagecolor/.is if = catppuccinpalette@pagecolor, @@ -47,7 +65,7 @@ textcolor = false, pagecolor = false, style = Latte, } -\ProcessPgfOptions* +\ProcessPgfOptions{catppuccinPalette} \preparecolorset{RGB/HTML}{CatLatte}{}{% Rosewater,220,138,120/DC8A78;% Flamingo,221,120,120/DD7878;% @@ -81,6 +99,40 @@ Crust,220,224,232/DCE0E8% \colorlet{CatLatteSuccess}{CatLatteGreen} \colorlet{CatLatteWarning}{CatLatteYellow} \colorlet{CatLatteError}{CatLatteRed} + +\preparecolorset{RGB/HTML}{CtpLatte}{}{% +Rosewater,220,138,120/DC8A78;% +Flamingo,221,120,120/DD7878;% +Pink,234,118,203/EA76CB;% +Mauve,136,57,239/8839EF;% +Red,210,15,57/D20F39;% +Maroon,230,69,83/E64553;% +Peach,254,100,11/FE640B;% +Yellow,223,142,29/DF8E1D;% +Green,64,160,43/40A02B;% +Teal,23,146,153/179299;% +Sky,4,165,229/04A5E5;% +Sapphire,32,159,181/209FB5;% +Blue,30,102,245/1E66F5;% +Lavender,114,135,253/7287FD;% +Text,76,79,105/4C4F69;% +Subtext1,92,95,119/5C5F77;% +Subtext0,108,111,133/6C6F85;% +Overlay2,124,127,147/7C7F93;% +Overlay1,140,143,161/8C8FA1;% +Overlay0,156,160,176/9CA0B0;% +Surface2,172,176,190/ACB0BE;% +Surface1,188,192,204/BCC0CC;% +Surface0,204,208,218/CCD0DA;% +Base,239,241,245/EFF1F5;% +Mantle,230,233,239/E6E9EF;% +Crust,220,224,232/DCE0E8% +} +\colorlet{CtpLatteBackground}{CtpLatteBase} +\colorlet{CtpLatteLink}{CtpLatteBlue} +\colorlet{CtpLatteSuccess}{CtpLatteGreen} +\colorlet{CtpLatteWarning}{CtpLatteYellow} +\colorlet{CtpLatteError}{CtpLatteRed} \preparecolorset{RGB/HTML}{CatFrappe}{}{% Rosewater,242,213,207/F2D5CF;% Flamingo,238,190,190/EEBEBE;% @@ -114,6 +166,41 @@ Crust,35,38,52/232634% \colorlet{CatFrappeSuccess}{CatFrappeGreen} \colorlet{CatFrappeWarning}{CatFrappeYellow} \colorlet{CatFrappeError}{CatFrappeRed} + +\preparecolorset{RGB/HTML}{CtpFrappe}{}{% +Rosewater,242,213,207/F2D5CF;% +Flamingo,238,190,190/EEBEBE;% +Pink,244,184,228/F4B8E4;% +Mauve,202,158,230/CA9EE6;% +Red,231,130,132/E78284;% +Maroon,234,153,156/EA999C;% +Peach,239,159,118/EF9F76;% +Yellow,229,200,144/E5C890;% +Green,166,209,137/A6D189;% +Teal,129,200,190/81C8BE;% +Sky,153,209,219/99D1DB;% +Sapphire,133,193,220/85C1DC;% +Blue,140,170,238/8CAAEE;% +Lavender,186,187,241/BABBF1;% +Text,198,208,245/C6D0F5;% +Subtext1,181,191,226/B5BFE2;% +Subtext0,165,173,206/A5ADCE;% +Overlay2,148,156,187/949CBB;% +Overlay1,131,139,167/838BA7;% +Overlay0,115,121,148/737994;% +Surface2,98,104,128/626880;% +Surface1,81,87,109/51576D;% +Surface0,65,69,89/414559;% +Base,48,52,70/303446;% +Mantle,41,44,60/292C3C;% +Crust,35,38,52/232634% +} +\colorlet{CtpFrappeBackground}{CtpFrappeBase} +\colorlet{CtpFrappeLink}{CtpFrappeBlue} +\colorlet{CtpFrappeSuccess}{CtpFrappeGreen} +\colorlet{CtpFrappeWarning}{CtpFrappeYellow} +\colorlet{CtpFrappeError}{CtpFrappeRed} + \preparecolorset{RGB/HTML}{CatMacchiato}{}{% Rosewater,244,219,214/F4DBD6;% Flamingo,240,198,198/F0C6C6;% @@ -147,6 +234,41 @@ Crust,24,25,38/181926% \colorlet{CatMacchiatoSuccess}{CatMacchiatoGreen} \colorlet{CatMacchiatoWarning}{CatMacchiatoYellow} \colorlet{CatMacchiatoError}{CatMacchiatoRed} + +\preparecolorset{RGB/HTML}{CtpMacchiato}{}{% +Rosewater,244,219,214/F4DBD6;% +Flamingo,240,198,198/F0C6C6;% +Pink,245,189,230/F5BDE6;% +Mauve,198,160,246/C6A0F6;% +Red,237,135,150/ED8796;% +Maroon,238,153,160/EE99A0;% +Peach,245,169,127/F5A97F;% +Yellow,238,212,159/EED49F;% +Green,166,218,149/A6DA95;% +Teal,139,213,202/8BD5CA;% +Sky,145,215,227/91D7E3;% +Sapphire,125,196,228/7DC4E4;% +Blue,138,173,244/8AADF4;% +Lavender,183,189,248/B7BDF8;% +Text,202,211,245/CAD3F5;% +Subtext1,184,192,224/B8C0E0;% +Subtext0,165,173,203/A5ADCB;% +Overlay2,147,154,183/939AB7;% +Overlay1,128,135,162/8087A2;% +Overlay0,110,115,141/6E738D;% +Surface2,91,96,120/5B6078;% +Surface1,73,77,100/494D64;% +Surface0,54,58,79/363A4F;% +Base,36,39,58/24273A;% +Mantle,30,32,48/1E2030;% +Crust,24,25,38/181926% +} +\colorlet{CtpMacchiatoBackground}{CtpMacchiatoBase} +\colorlet{CtpMacchiatoLink}{CtpMacchiatoBlue} +\colorlet{CtpMacchiatoSuccess}{CtpMacchiatoGreen} +\colorlet{CtpMacchiatoWarning}{CtpMacchiatoYellow} +\colorlet{CtpMacchiatoError}{CtpMacchiatoRed} + \preparecolorset{RGB/HTML}{CatMocha}{}{% Rosewater,245,224,220/F5E0DC;% Flamingo,242,205,205/F2CDCD;% @@ -180,43 +302,117 @@ Crust,17,17,27/11111B% \colorlet{CatMochaSuccess}{CatMochaGreen} \colorlet{CatMochaWarning}{CatMochaYellow} \colorlet{CatMochaError}{CatMochaRed} -\colorlet{CatRosewater}{Cat\catppuccinpalette@style Rosewater} -\colorlet{CatFlamingo}{Cat\catppuccinpalette@style Flamingo} -\colorlet{CatPink}{Cat\catppuccinpalette@style Pink} -\colorlet{CatMauve}{Cat\catppuccinpalette@style Mauve} -\colorlet{CatRed}{Cat\catppuccinpalette@style Red} -\colorlet{CatMaroon}{Cat\catppuccinpalette@style Maroon} -\colorlet{CatPeach}{Cat\catppuccinpalette@style Peach} -\colorlet{CatYellow}{Cat\catppuccinpalette@style Yellow} -\colorlet{CatGreen}{Cat\catppuccinpalette@style Green} -\colorlet{CatTeal}{Cat\catppuccinpalette@style Teal} -\colorlet{CatSky}{Cat\catppuccinpalette@style Sky} -\colorlet{CatSapphire}{Cat\catppuccinpalette@style Sapphire} -\colorlet{CatBlue}{Cat\catppuccinpalette@style Blue} -\colorlet{CatLavender}{Cat\catppuccinpalette@style Lavender} -\colorlet{CatText}{Cat\catppuccinpalette@style Text} -\colorlet{CatSubtext1}{Cat\catppuccinpalette@style Subtext1} -\colorlet{CatSubtext0}{Cat\catppuccinpalette@style Subtext0} -\colorlet{CatOverlay2}{Cat\catppuccinpalette@style Overlay2} -\colorlet{CatOverlay1}{Cat\catppuccinpalette@style Overlay1} -\colorlet{CatOverlay0}{Cat\catppuccinpalette@style Overlay0} -\colorlet{CatSurface2}{Cat\catppuccinpalette@style Surface2} -\colorlet{CatSurface1}{Cat\catppuccinpalette@style Surface1} -\colorlet{CatSurface0}{Cat\catppuccinpalette@style Surface0} -\colorlet{CatBase}{Cat\catppuccinpalette@style Base} -\colorlet{CatMantle}{Cat\catppuccinpalette@style Mantle} -\colorlet{CatCrust}{Cat\catppuccinpalette@style Crust} -\colorlet{CatBackground}{Cat\catppuccinpalette@style Base} -\colorlet{CatLink}{Cat\catppuccinpalette@style Blue} -\colorlet{CatSuccess}{Cat\catppuccinpalette@style Green} -\colorlet{CatWarning}{Cat\catppuccinpalette@style Yellow} -\colorlet{CatError}{Cat\catppuccinpalette@style Red} -\ifcatppuccinpalette@pagecolor -\pagecolor{CatBackground} -\fi -\ifcatppuccinpalette@textcolor -\color{CatText} -\fi + +\preparecolorset{RGB/HTML}{CtpMocha}{}{% +Rosewater,245,224,220/F5E0DC;% +Flamingo,242,205,205/F2CDCD;% +Pink,245,194,231/F5C2E7;% +Mauve,203,166,247/CBA6F7;% +Red,243,139,168/F38BA8;% +Maroon,235,160,172/EBA0AC;% +Peach,250,179,135/FAB387;% +Yellow,249,226,175/F9E2AF;% +Green,166,227,161/A6E3A1;% +Teal,148,226,213/94E2D5;% +Sky,137,220,235/89DCEB;% +Sapphire,116,199,236/74C7EC;% +Blue,137,180,250/89B4FA;% +Lavender,180,190,254/B4BEFE;% +Text,205,214,244/CDD6F4;% +Subtext1,186,194,222/BAC2DE;% +Subtext0,166,173,200/A6ADC8;% +Overlay2,147,153,178/9399B2;% +Overlay1,127,132,156/7F849C;% +Overlay0,108,112,134/6C7086;% +Surface2,88,91,112/585B70;% +Surface1,69,71,90/45475A;% +Surface0,49,50,68/313244;% +Base,30,30,46/1E1E2E;% +Mantle,24,24,37/181825;% +Crust,17,17,27/11111B% +} +\colorlet{CtpMochaBackground}{CtpMochaBase} +\colorlet{CtpMochaLink}{CtpMochaBlue} +\colorlet{CtpMochaSuccess}{CtpMochaGreen} +\colorlet{CtpMochaWarning}{CtpMochaYellow} +\colorlet{CtpMochaError}{CtpMochaRed} + +\colorlet{CatRosewater}{Ctp\catppuccinpalette@style Rosewater} +\colorlet{CatFlamingo}{Ctp\catppuccinpalette@style Flamingo} +\colorlet{CatPink}{Ctp\catppuccinpalette@style Pink} +\colorlet{CatMauve}{Ctp\catppuccinpalette@style Mauve} +\colorlet{CatRed}{Ctp\catppuccinpalette@style Red} +\colorlet{CatMaroon}{Ctp\catppuccinpalette@style Maroon} +\colorlet{CatPeach}{Ctp\catppuccinpalette@style Peach} +\colorlet{CatYellow}{Ctp\catppuccinpalette@style Yellow} +\colorlet{CatGreen}{Ctp\catppuccinpalette@style Green} +\colorlet{CatTeal}{Ctp\catppuccinpalette@style Teal} +\colorlet{CatSky}{Ctp\catppuccinpalette@style Sky} +\colorlet{CatSapphire}{Ctp\catppuccinpalette@style Sapphire} +\colorlet{CatBlue}{Ctp\catppuccinpalette@style Blue} +\colorlet{CatLavender}{Ctp\catppuccinpalette@style Lavender} +\colorlet{CatText}{Ctp\catppuccinpalette@style Text} +\colorlet{CatSubtext1}{Ctp\catppuccinpalette@style Subtext1} +\colorlet{CatSubtext0}{Ctp\catppuccinpalette@style Subtext0} +\colorlet{CatOverlay2}{Ctp\catppuccinpalette@style Overlay2} +\colorlet{CatOverlay1}{Ctp\catppuccinpalette@style Overlay1} +\colorlet{CatOverlay0}{Ctp\catppuccinpalette@style Overlay0} +\colorlet{CatSurface2}{Ctp\catppuccinpalette@style Surface2} +\colorlet{CatSurface1}{Ctp\catppuccinpalette@style Surface1} +\colorlet{CatSurface0}{Ctp\catppuccinpalette@style Surface0} +\colorlet{CatBase}{Ctp\catppuccinpalette@style Base} +\colorlet{CatMantle}{Ctp\catppuccinpalette@style Mantle} +\colorlet{CatCrust}{Ctp\catppuccinpalette@style Crust} +\colorlet{CatBackground}{Ctp\catppuccinpalette@style Base} +\colorlet{CatLink}{Ctp\catppuccinpalette@style Blue} +\colorlet{CatSuccess}{Ctp\catppuccinpalette@style Green} +\colorlet{CatWarning}{Ctp\catppuccinpalette@style Yellow} +\colorlet{CatError}{Ctp\catppuccinpalette@style Red} + +\NewDocumentCommand\CtpReinit{O{}}{% +\pgfkeys{% +/catppuccinPalette/.cd,% +#1% +}% +\colorlet{CtpRosewater}{Ctp\catppuccinpalette@style Rosewater}% +\colorlet{CtpFlamingo}{Ctp\catppuccinpalette@style Flamingo}% +\colorlet{CtpPink}{Ctp\catppuccinpalette@style Pink}% +\colorlet{CtpMauve}{Ctp\catppuccinpalette@style Mauve}% +\colorlet{CtpRed}{Ctp\catppuccinpalette@style Red}% +\colorlet{CtpMaroon}{Ctp\catppuccinpalette@style Maroon}% +\colorlet{CtpPeach}{Ctp\catppuccinpalette@style Peach}% +\colorlet{CtpYellow}{Ctp\catppuccinpalette@style Yellow}% +\colorlet{CtpGreen}{Ctp\catppuccinpalette@style Green}% +\colorlet{CtpTeal}{Ctp\catppuccinpalette@style Teal}% +\colorlet{CtpSky}{Ctp\catppuccinpalette@style Sky}% +\colorlet{CtpSapphire}{Ctp\catppuccinpalette@style Sapphire}% +\colorlet{CtpBlue}{Ctp\catppuccinpalette@style Blue}% +\colorlet{CtpLavender}{Ctp\catppuccinpalette@style Lavender}% +\colorlet{CtpText}{Ctp\catppuccinpalette@style Text}% +\colorlet{CtpSubtext1}{Ctp\catppuccinpalette@style Subtext1}% +\colorlet{CtpSubtext0}{Ctp\catppuccinpalette@style Subtext0}% +\colorlet{CtpOverlay2}{Ctp\catppuccinpalette@style Overlay2}% +\colorlet{CtpOverlay1}{Ctp\catppuccinpalette@style Overlay1}% +\colorlet{CtpOverlay0}{Ctp\catppuccinpalette@style Overlay0}% +\colorlet{CtpSurface2}{Ctp\catppuccinpalette@style Surface2}% +\colorlet{CtpSurface1}{Ctp\catppuccinpalette@style Surface1}% +\colorlet{CtpSurface0}{Ctp\catppuccinpalette@style Surface0}% +\colorlet{CtpBase}{Ctp\catppuccinpalette@style Base}% +\colorlet{CtpMantle}{Ctp\catppuccinpalette@style Mantle}% +\colorlet{CtpCrust}{Ctp\catppuccinpalette@style Crust}% +\colorlet{CtpBackground}{Ctp\catppuccinpalette@style Base}% +\colorlet{CtpLink}{Ctp\catppuccinpalette@style Blue}% +\colorlet{CtpSuccess}{Ctp\catppuccinpalette@style Green}% +\colorlet{CtpWarning}{Ctp\catppuccinpalette@style Yellow}% +\colorlet{CtpError}{Ctp\catppuccinpalette@style Red}% +\ifcatppuccinpalette@pagecolor% +\pagecolor{CtpBackground}% +\fi% +\ifcatppuccinpalette@textcolor% +\color{CtpText}% +\fi% +} +\CtpReinit[] \endinput %% %% End of file `catppuccinpalette.sty'. diff --git a/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty b/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty index afa91d4b2b1..4f5ce00a0fc 100644 --- a/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty +++ b/Master/texmf-dist/tex/latex/circuitikz/circuitikz.sty @@ -16,8 +16,8 @@ \providecommand\DeclareRelease[3]{} \providecommand\DeclareCurrentRelease[2]{} -\def\pgfcircversion{1.6.9} -\def\pgfcircversiondate{2024/05/25} +\def\pgfcircversion{1.7.0} +\def\pgfcircversiondate{2024/08/03} \DeclareRelease{0.4}{2012/12/20}{circuitikz-0.4-body.tex} \DeclareRelease{v0.4}{2012/12/20}{circuitikz-0.4-body.tex} diff --git a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-bib.sty b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-bib.sty index 19619e1f5b1..2a2af3a7d2b 100644 --- a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-bib.sty +++ b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-bib.sty @@ -34,7 +34,7 @@ \__csl_collect_bibliography:n { \lua_now:e - { csl.bibliography("\l__csl_bib_filter_tl") } + { csl_citation_manager:bibliography("\l__csl_bib_filter_tl") } } } } @@ -53,11 +53,11 @@ } \tl_use:N \l__csl_bibliography_tl } - { \msg_warning:nn { citation-style-language } { bibliography / empty } } + { \msg_warning:nn { citation-style-language } { empty-bibliography } } \group_end: } -\msg_new:nnn { citation-style-language } { bibliography / empty } +\msg_new:nnn { citation-style-language } { empty-bibliography } { The~ bibliography~ is~ empty. } \DeclareDocumentCommand \bibliography { m } @@ -108,11 +108,16 @@ \cs_new:Npn \__csl_write_aux_bibliography:n #1 { \if@filesw - \iow_now:Nn \@auxout { \csl@aux@bibliography {#1} } + \iow_now:Nx \@auxout + { + \token_to_str:N \csl@aux@bibliography + { \int_use:N \g__csl_ref_section_index_int } + {#1} + } \fi } -\cs_new:Npn \csl@aux@bibliography #1 { } +\cs_new:Npn \csl@aux@bibliography #1#2 { } \tl_new:N \l__csl_bib_index_tl @@ -182,7 +187,7 @@ } { \tl_set:Nn \@noitemerr - { \msg_warning:nn { citation-style-language } { bibliography / empty } } + { \msg_warning:nn { citation-style-language } { empty-bibliography } } \endlist \group_end: \exp_args:NV \__csl_print_bib_note:n \l__csl_bib_post_note_tl @@ -355,6 +360,96 @@ } +% ### Bibliography sections and segments + + +\int_new:N \g__csl_ref_section_index_int +\int_new:N \g__csl_max_ref_section_index_int +\int_gset:Nn \g__csl_ref_section_index_int { 0 } +\int_gset:Nn \g__csl_max_ref_section_index_int { 0 } + +\keys_define:nn { csl / ref-section } + { + style .code:n = + { + \tl_set:Nn \l__csl_style_tl {#1} + \renewcommand \csl@style {#1} + } , + bib-resource .clist_set:N = \l__csl_bib_resources_clist , + locale .tl_set:N = \l__csl_locale_tl , + } + +\NewDocumentCommand \refsection { O { } } + { + \int_gincr:N \g__csl_max_ref_section_index_int + \int_gset_eq:NN \g__csl_ref_section_index_int \g__csl_max_ref_section_index_int + + \tl_clear:N \l__csl_style_tl + \clist_clear:N \l__csl_bib_resources_clist + \tl_clear:N \l__csl_locale_tl + \keys_set:nn { csl / ref-section } { #1 } + \tl_if_empty:NTF \l__csl_style_tl + { + \tl_set_eq:NN \l__csl_style_tl \g__csl_global_style_tl + \tl_set_eq:NN \csl@style \l__csl_style_tl + } + { + \tl_set_eq:NN \csl@style \l__csl_style_tl + \exp_args:NV \__csl_write_aux_bibstyle:n \l__csl_style_tl + } + \clist_if_empty:NF \l__csl_bib_resources_clist + % { \clist_set_eq:NN \l__csl_bib_resources_clist \g__csl_global_bib_resources_clist } + { + \exp_args:Nx \__csl_write_aux_bibdata:n + { \clist_use:Nn \l__csl_bib_resources_clist { , } } + } + \tl_if_empty:NTF \l__csl_locale_tl + { \tl_set_eq:NN \l__csl_locale_tl \g__csl_global_locale_tl } + { + \exp_args:Nx \__csl_write_aux_options:n + { locale = \l__csl_locale_tl } + } + \sys_if_engine_luatex:TF + { + \lua_now:e + { + csl_citation_manager:begin_ref_section( + "\l__csl_style_tl", + "\clist_use:Nn \l__csl_bib_resources_clist { , }", + "\l__csl_locale_tl" + ) + } + \str_if_eq:eeTF + { + \lua_now:n + { + tex.print(tostring( + csl_citation_manager.ref_section.initialized + )) + } + } + { true } + { \bool_set_true:N \l__csl_engine_initialized_bool } + { \bool_set_false:N \l__csl_engine_initialized_bool } + \__csl_get_style_class_luatex: + } + { + \__csl_get_style_class: + } + } + +\cs_set_eq:NN \newrefsection \refsection + +\cs_new:Npn \endrefsection { + \int_compare:nNnT { \g__csl_ref_section_index_int } > { 0 } + { + \int_gzero:N \g__csl_ref_section_index_int + \sys_if_engine_luatex:T + { \lua_now:n { csl_citation_manager:end_ref_section() } } + } +} + + % ### Bibliography Headings and Environments \prop_new:N \l__csl_bib_env_begin_prop @@ -381,7 +476,7 @@ { \cs_if_exist:cF { __csl_head_ #1 :n } { - \msg_error:nnn { citation-style-language } { bib-heading-undefined } + \msg_error:nnn { citation-style-language } { undefined-bib-heading } {#1} } \tl_if_blank:nTF {#2} @@ -393,7 +488,7 @@ { \exp_args:NV \label \l__csl_bib_head_label_tl } } -\msg_new:nnn { citation-style-language } { bib-heading-undefined } +\msg_new:nnn { citation-style-language } { undefined-bib-heading } { Bibliography~ heading~ '#1'~ undefined. } \keys_define:nn { csl / bib-heading } @@ -426,6 +521,10 @@ \expandafter \newcommand \csname __csl_head_ #1 :n \endcsname [1] [ {#2} ] } + +\cs_if_exist:NF \refname + { \cs_set:Npn \refname { References } } + \cs_if_exist:NTF \chapter { % `book` or `report` @@ -437,19 +536,19 @@ \defbibheading { biblist } [ \biblistname ] { \chapter* {#1} - \@mkboth { \MakeMarkcase {#1} } { \MakeMarkcase {#1} } + \@mkboth { \MakeUppercase {#1} } { \MakeUppercase {#1} } } \defbibheading { bibintoc } [ \bibname ] { \chapter* {#1} \addcontentsline { toc } { chapter } {#1} - \@mkboth { \MakeMarkcase {#1} } { \MakeMarkcase {#1} } + \@mkboth { \MakeUppercase {#1} } { \MakeUppercase {#1} } } \defbibheading { biblistintoc } [ \biblistname ] { \chapter* {#1} \addcontentsline { toc } { chapter } {#1} - \@mkboth { \MakeMarkcase {#1} } { \MakeMarkcase {#1} } + \@mkboth { \MakeUppercase {#1} } { \MakeUppercase {#1} } } \defbibheading { bibnumbered } [ \bibname ] { \chapter {#1} } @@ -459,7 +558,7 @@ { \section* {#1} \if@twoside - \markright { \MakeMarkcase {#1} } + \markright { \MakeUppercase {#1} } \fi } \defbibheading { subbibintoc } [ \refname ] @@ -467,7 +566,7 @@ \section* {#1} \addcontentsline { toc } { section } {#1} \if@twoside - \markright { \MakeMarkcase {#1} } + \markright { \MakeUppercase {#1} } \fi } \defbibheading { subbibnumbered } [ \refname ] @@ -483,19 +582,19 @@ \defbibheading { biblist } [ \biblistname ] { \section* {#1} - \@mkboth { \MakeMarkcase {#1} } { \MakeMarkcase {#1} } + \@mkboth { \MakeUppercase {#1} } { \MakeUppercase {#1} } } \defbibheading { bibintoc } [ \refname ] { \section* {#1} \addcontentsline { toc } { section } {#1} - \@mkboth { \MakeMarkcase {#1} } { \MakeMarkcase {#1} } + \@mkboth { \MakeUppercase {#1} } { \MakeUppercase {#1} } } \defbibheading { biblistintoc } [ \biblistname ] { \section* {#1} \addcontentsline { toc } { section } {#1} - \@mkboth { \MakeMarkcase {#1} } { \MakeMarkcase {#1} } + \@mkboth { \MakeUppercase {#1} } { \MakeUppercase {#1} } } \defbibheading { bibnumbered } [ \refname ] { \section {#1} } @@ -531,7 +630,7 @@ { \prop_get:NnNF \l__csl_bib_notes_prop {#1} \l_tmpa_tl { - \msg_error:nnn { citation-style-language } { bib-note-undefined } + \msg_error:nnn { citation-style-language } { undefined-bib-note } {#1} } \tl_if_empty:NF \l_tmp_tl @@ -547,7 +646,7 @@ } } -\msg_new:nnn { citation-style-language } { bib-note-undefined } +\msg_new:nnn { citation-style-language } { undefined-bib-note } { Bibliography~ note~ '#1'~ undefined. } @@ -593,7 +692,7 @@ \tl_put_right:Nn \l_tmpa_tl { ##1 = {##2} } } \sys_if_engine_luatex:T - { \lua_now:e { csl.set_categories("\l_tmpa_tl") } } + { \lua_now:e { csl_citation_manager:set_categories("\l_tmpa_tl") } } { \tl_put_left:Nx \l_tmpa_tl { categories = \c_left_brace_str } \tl_put_right:NV \l_tmpa_tl \c_right_brace_str diff --git a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-cite.sty b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-cite.sty index e7683b5a900..38128a99d82 100644 --- a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-cite.sty +++ b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-cite.sty @@ -7,13 +7,33 @@ % ## Citation commands \DeclareDocumentCommand \cite { s o o m } - { \__csl_cite:nnnn {#1} {#2} {#3} {#4} } + { + \IfBooleanTF {#1} + { + \bool_if:NTF \l__csl_note_bool + { \__csl_cite_in_text:nnnn {#2} {#3} {#4} { } } + { \__csl_cite_in_text:nnnn {#2} {#3} {#4} { suppress-author } } + } + { + \bool_if:NTF \l__csl_note_bool + { \__csl_cite_note:nnnn {#2} {#3} {#4} { } } + { \__csl_cite_in_text:nnnn {#2} {#3} {#4} { } } + } + } \NewDocumentCommand \parencite { s o o m } - { \__csl_cite:nnnn {#1} {#2} {#3} {#4} } + { + \IfBooleanTF {#1} + { + \bool_if:NTF \l__csl_note_bool + { \__csl_cite_in_text:nnnn {#2} {#3} {#4} { } } + { \__csl_cite_in_text:nnnn {#2} {#3} {#4} { suppress-author } } + } + { \__csl_cite_parens:nnn {#2} {#3} {#4} } + } \NewDocumentCommand \citep { o o m } - { \__csl_cite:nnnn { \BooleanFalse } {#1} {#2} {#3} } + { \__csl_cite_parens:nnn {#1} {#2} {#3} } \NewDocumentCommand \textcite { o o m } { \__csl_text_cite:nnn {#1} {#2} {#3} } @@ -22,7 +42,7 @@ { \__csl_text_cite:nnn {#1} {#2} {#3} } \NewDocumentCommand \footcite { o o m } - { \__csl_cite:nnnn { \BooleanFalse } {#1} {#2} {#3} } + { \__csl_cite_note:nnnn {#1} {#2} {#3} { } } % \cites[⟨prenote⟩][⟨postnote⟩]{⟨key⟩}...[⟨prenote⟩][⟨postnote⟩]{⟨key⟩} @@ -30,23 +50,16 @@ { \__csl_cites: } \NewDocumentCommand \citeauthor { o o m } - { \__csl_cite_author:nnn {#1} {#2} {#3} } + { \__csl_cite_in_text:nnnn {#1} {#2} {#3} { author-only } } % TODO: \citeyear -% ATM the starred form is the same as non-star form. -\NewDocumentCommand \citeyearpar { s o o m } - { - \IfBooleanT {#1} - { - \bool_if:NTF \l__csl_note_bool - { \msg_error:nn { citation-style-language } { starred-cite-in-note-style } } - } - \__csl_cite_suppress_author:nnn {#2} {#3} {#4} - } +% Suppresses the author (from `natbib`). +\NewDocumentCommand \citeyearpar { o o m } + { \__csl_cite_in_text:nnnn {#1} {#2} {#3} { suppress-author } } \NewDocumentCommand \fullcite { o o m } - { \__csl_full_cite:nnn {#1} {#2} {#3} } + { \__csl_cite_in_text:nnnn {#1} {#2} {#3} { full-cite } } \seq_new:N \l__csl_cite_keys_seq @@ -54,36 +67,77 @@ \prop_new:N \l__csl_citation_properties_prop \prop_new:N \l__csl_citation_info_prop -% \__csl_cite:nnnn #1#2#3# -% #1: boolean of star form -% #2: prenote -% #3: postnote -% #4: cite keys -\cs_new:Npn \__csl_cite:nnnn #1#2#3#4 +% #1: prenote +% #2: postnote +% #3: cite keys +% #4: mode +\cs_new:Npn \__csl_cite_in_text:nnnn #1#2#3#4 { - \tl_if_blank:nTF {#4} - { \__csl_print_undefined_citation:n {#4} } + \tl_if_blank:nTF {#3} + { \__csl_print_undefined_citation:n {#3} } { - \seq_clear:N \l__csl_cite_keys_seq - \seq_clear:N \l__csl_citation_items_seq - \prop_clear:N \l__csl_citation_properties_prop - \__csl_process_cite_input:nnn {#2} {#3} {#4} - \__csl_process_citation_info:NN \l__csl_cite_keys_seq \l__csl_citation_items_seq - \IfBooleanT {#1} + \__csl_cite_init: + \__csl_collect_citation_items:nnn {#1} {#2} {#3} + \__csl_process_citation_info: + \prop_put:Nnn \l__csl_citation_properties_prop { noteIndex } { 0 } + \tl_if_empty:nF {#4} { - \bool_if:NTF \l__csl_note_bool - { \msg_warning:nn { citation-style-language } { starred-cite-in-note-style } } + \prop_put:Nnn \l__csl_citation_properties_prop { mode } {#4} + } + \__csl_make_citation: + } + } + +% #1: prenote +% #2: postnote +% #3: cite keys +% #4: mode +\cs_new:Npn \__csl_cite_note:nnnn #1#2#3#4 + { + \bool_if:NTF \l__csl_in_note_bool + { + \tl_if_blank:nTF {#3} + { \__csl_print_undefined_citation:n {#3} } + { + \__csl_cite_init: + \__csl_collect_citation_items:nnn {#1} {#2} {#3} + \__csl_process_citation_info: + \tl_if_empty:nF {#4} + { + \prop_put:Nnn \l__csl_citation_properties_prop { mode } {#4} + } + \__csl_make_citation: + } + } + { + \footnote + { + \tl_if_blank:nTF {#3} + { \__csl_print_undefined_citation:n {#3} } { - \prop_put:Nnn \l__csl_citation_properties_prop { noteIndex } { 0 } - \prop_put:Nnn \l__csl_citation_properties_prop { mode } { suppress-author } + \__csl_cite_init: + \__csl_collect_citation_items:nnn {#1} {#2} {#3} + \__csl_process_citation_info: + \tl_if_empty:nF {#4} + { + \prop_put:Nnn \l__csl_citation_properties_prop { mode } {#4} + } + \__csl_make_citation: } } - \__csl_make_citation:N \l__csl_citation_info_prop } } -\msg_new:nnn { citation-style-language } { starred-cite-in-note-style } - { Starred~ variant~ of~ cite~ command~ does~ not~ work~ with~ note~ styles. } + +% #1: prenote +% #2: postnote +% #3: cite keys +\cs_new:Npn \__csl_cite_parens:nnn #1#2#3 + { + \bool_if:NTF \l__csl_note_bool + { ( \__csl_cite_in_text:nnnn {#1} {#2} {#3} { } ) } + { \__csl_cite_in_text:nnnn {#1} {#2} {#3} { } } + } \cs_new:Npn \__csl_text_cite:nnn #1#2#3 @@ -91,29 +145,19 @@ \bool_if:NTF \l__csl_note_bool { % In note styles, the authors are printed in-text followed by a note. - \bool_set_false:N \l__csl_note_bool - \__csl_cite_author:nnn {#1} {#2} {#3} - \bool_set_true:N \l__csl_note_bool - \__csl_cite:nnnn { \BooleanFalse } {#1} {#2} {#3} - } - { - \seq_clear:N \l__csl_cite_keys_seq - \seq_clear:N \l__csl_citation_items_seq - \prop_clear:N \l__csl_citation_properties_prop - \__csl_process_cite_input:nnn {#1} {#2} {#3} - \__csl_process_citation_info:NN \l__csl_cite_keys_seq \l__csl_citation_items_seq - \prop_put:Nnn \l__csl_citation_properties_prop { noteIndex } { 0 } - \prop_put:Nnn \l__csl_citation_properties_prop { mode } { composite } - \__csl_make_citation:N \l__csl_citation_info_prop + \__csl_cite_in_text:nnnn {#1} {#2} {#3} { author-only } + \__csl_cite_note:nnnn {#1} {#2} {#3} { } } + { \__csl_cite_in_text:nnnn {#1} {#2} {#3} { composite } } } +\bool_new:N \l__csl_multi_cite_bool + \cs_new:Npn \__csl_cites: { - \seq_clear:N \l__csl_cite_keys_seq - \seq_clear:N \l__csl_citation_items_seq - \prop_clear:N \l__csl_citation_properties_prop + \__csl_cite_init: + \bool_set_true:N \l__csl_multi_cite_bool \__csl_next_cites:nnn } @@ -121,55 +165,35 @@ { \tl_if_novalue:nTF {#3} { - \__csl_process_citation_info:NN \l__csl_cite_keys_seq \l__csl_citation_items_seq - \__csl_make_citation:N \l__csl_citation_info_prop + \bool_if:NTF \l__csl_note_bool + { + \footnote + { + \__csl_process_citation_info: + \__csl_make_citation: + } + } + { + \__csl_process_citation_info: + \__csl_make_citation: + } } { - \__csl_process_cite_input:nnn {#1} {#2} {#3} + \__csl_collect_citation_items:nnn {#1} {#2} {#3} \__csl_next_cites:nnn } } -\cs_new:Npn \__csl_cite_author:nnn #1#2#3 - { - \seq_clear:N \l__csl_cite_keys_seq - \seq_clear:N \l__csl_citation_items_seq - \prop_clear:N \l__csl_citation_properties_prop - \__csl_process_cite_input:nnn {#1} {#2} {#3} - \__csl_process_citation_info:NN \l__csl_cite_keys_seq \l__csl_citation_items_seq - \prop_put:Nnn \l__csl_citation_properties_prop { noteIndex } { 0 } - \prop_put:Nnn \l__csl_citation_properties_prop { mode } { author-only } - \bool_set_false:N \l__csl_note_bool - \__csl_make_citation:N \l__csl_citation_info_prop - } - - -\cs_new:Npn \__csl_cite_suppress_author:nnn #1#2#3 - { - \seq_clear:N \l__csl_cite_keys_seq - \seq_clear:N \l__csl_citation_items_seq - \prop_clear:N \l__csl_citation_properties_prop - \__csl_process_cite_input:nnn {#1} {#2} {#3} - \__csl_process_citation_info:NN \l__csl_cite_keys_seq \l__csl_citation_items_seq - \prop_put:Nnn \l__csl_citation_properties_prop { noteIndex } { 0 } - \prop_put:Nnn \l__csl_citation_properties_prop { mode } { suppress-author } - \bool_set_false:N \l__csl_note_bool - \__csl_make_citation:N \l__csl_citation_info_prop - } - - -\cs_new:Npn \__csl_full_cite:nnn #1#2#3 +\cs_new:Npn \__csl_cite_init: { + \bool_set_false:N \l__csl_multi_cite_bool + \prop_clear:N \l__csl_citation_info_prop \seq_clear:N \l__csl_cite_keys_seq \seq_clear:N \l__csl_citation_items_seq \prop_clear:N \l__csl_citation_properties_prop - \__csl_process_cite_input:nnn {#1} {#2} {#3} - \__csl_process_citation_info:NN \l__csl_cite_keys_seq \l__csl_citation_items_seq - \prop_put:Nnn \l__csl_citation_properties_prop { noteIndex } { 0 } - \prop_put:Nnn \l__csl_citation_properties_prop { mode } { full-cite } - \bool_set_false:N \l__csl_note_bool - \__csl_make_citation:N \l__csl_citation_info_prop + \tl_clear:N \l__csl_cite_prefix_tl + \tl_clear:N \l__csl_cite_suffix_tl } @@ -177,7 +201,7 @@ % \l__csl_citation_items_seq % #1, #2: prenote/postnote % #3: keys -\cs_new:Npn \__csl_process_cite_input:nnn #1#2#3 +\cs_new:Npn \__csl_collect_citation_items:nnn #1#2#3 { \tl_if_novalue:nTF {#2} { @@ -205,12 +229,13 @@ \prop_new:N \l__csl_cite_item_prop -\tl_new:N \l__csl_prefix_tl -\tl_new:N \l__csl_suffix_tl +% Collect citation items into \l__csl_citation_items_seq +% Append "{id={ITEM},locator={42},label={page}}" into \l__csl_citation_items_seq +% #1: prenote +% #2: postnote +% #3: key \cs_new:Npn \__csl_process_cite_item:nnn #1#2#3 - % #1: prenote, #2: postnote, #3: key - % Save "{id={ITEM},locator={42},label={page}}" into \l__csl_citation_items_seq { \prop_clear:N \l__csl_cite_item_prop \prop_put:Nnn \l__csl_cite_item_prop { id } {#3} @@ -218,11 +243,12 @@ % { \prop_put:Nnn \l__csl_cite_item_prop { suppress-author } { true } } % \bool_if:T \l__csl_author_only_bool % { \prop_put:Nnn \l__csl_cite_item_prop { author-only } { true } } + \tl_clear:N \l__csl_cite_prefix_tl + \tl_clear:N \l__csl_cite_suffix_tl \tl_if_empty:nF {#1} { - \tl_set:Nn \l__csl_prefix_tl {#1} - \tl_put_right:NV \l__csl_prefix_tl \l__csl_prefix_separator_tl - \prop_put:NnV \l__csl_cite_item_prop { prefix } \l__csl_prefix_tl + \tl_set:Nn \l__csl_cite_prefix_tl {#1} + \tl_put_right:NV \l__csl_cite_prefix_tl \l__csl_prefix_separator_tl } \tl_if_empty:nF {#2} { @@ -232,12 +258,26 @@ \regex_match:nnTF { \d+ } {#2} { \__csl_set_locator:nn { page } {#2} } { - \tl_set:Nn \l__csl_suffix_tl {#2} - \tl_put_left:NV \l__csl_suffix_tl \l__csl_suffix_separator_tl - \prop_put:NnV \l__csl_cite_item_prop { suffix } \l__csl_suffix_tl + \tl_set:Nn \l__csl_cite_suffix_tl {#2} + \tl_put_left:NV \l__csl_cite_suffix_tl \l__csl_suffix_separator_tl } } } + % The affixes are treated as cite item affixes in a multi-cite command + % (like `\cites`). Otherwise they are citation affixes. + \bool_if:NTF \l__csl_multi_cite_bool + { + \tl_if_empty:NF \l__csl_cite_prefix_tl + { \prop_put:NnV \l__csl_cite_item_prop { prefix } \l__csl_cite_prefix_tl } + \tl_if_empty:NF \l__csl_cite_suffix_tl + { \prop_put:NnV \l__csl_cite_item_prop { suffix } \l__csl_cite_suffix_tl } + } + { + \tl_if_empty:NF \l__csl_cite_prefix_tl + { \prop_put:NnV \l__csl_citation_properties_prop { prefix } \l__csl_cite_prefix_tl } + \tl_if_empty:NF \l__csl_cite_suffix_tl + { \prop_put:NnV \l__csl_citation_properties_prop { suffix } \l__csl_cite_suffix_tl } + } \__csl_serialize_prop:NN \l__csl_cite_item_prop \l_tmpa_tl \tl_put_left:NV \l_tmpa_tl { \c_left_brace_str } \tl_put_right:NV \l_tmpa_tl { \c_right_brace_str } @@ -246,14 +286,24 @@ \cs_new:Npn \__csl_set_locator:nn #1#2 { - \prop_put:Nnn \l__csl_cite_item_prop { label } {#1} - \prop_put:Nnn \l__csl_cite_item_prop { locator } {#2} + \tl_if_empty:nTF {#2} + { \msg_warning:nnn { citation-style-language } { empty-locator } {#1} } + { + \prop_put:Nnn \l__csl_cite_item_prop { label } {#1} + \prop_put:Nnn \l__csl_cite_item_prop { locator } {#2} + } } +\msg_new:nnn { citation-style-language } { empty-locator } + { Empty~ '#1'~ locator. } + +\tl_new:N \l__csl_cite_prefix_tl +\tl_new:N \l__csl_cite_suffix_tl + \keys_define:nn { csl / cite-item } { - prefix .prop_put:N = \l__csl_cite_item_prop, - suffix .prop_put:N = \l__csl_cite_item_prop, + prefix .tl_set:N = \l__csl_cite_prefix_tl, + suffix .tl_set:N = \l__csl_cite_suffix_tl, locator .prop_put:N = \l__csl_cite_item_prop, label .prop_put:N = \l__csl_cite_item_prop, suppress-author .prop_put:N = \l__csl_cite_item_prop, @@ -301,17 +351,24 @@ % Load the cite keys and prepare: % - \l__csl_citation_id_tl % - \l__csl_citation_properties_prop -% -% #1: \l__csl_cite_keys_seq -% #2: \l__csl_citation_items_seq -\cs_new:Npn \__csl_process_citation_info:NN #1#2 +\cs_new:Npn \__csl_process_citation_info: { - \__csl_process_citation_id:NN \l__csl_citation_id_tl #1 - \__csl_get_note_index:N \l__csl_note_index_tl + \__csl_process_citation_id: + \__csl_get_note_index: \prop_put:NnV \l__csl_citation_properties_prop { noteIndex } \l__csl_note_index_tl + \__csl_make_chapter_property: \__csl_add_back_ref_info: } +\cs_new:Npn \__csl_make_chapter_property: + { + \int_if_exist:NT \c@chapter + { + \prop_put:Nnx \l__csl_citation_properties_prop { chapterIndex } + { \int_use:N \c@chapter } + } + } + \tl_new:N \l__csl_back_ref_tl \prop_new:N \g__csl_back_ref_info_prop @@ -361,8 +418,7 @@ \tl_new:N \l__csl_citation_properties_tl % Write citation info to aux and print the citation contents. -% #1: \l__csl_citation_info_prop -\cs_new:Npn \__csl_make_citation:N #1 +\cs_new:Npn \__csl_make_citation: { \prop_clear:N \l__csl_citation_info_prop % citationID @@ -376,13 +432,13 @@ \__csl_serialize_prop:NN \l__csl_citation_info_prop \l__csl_citation_info_tl % Write to .aux file % \tl_show:N \l__csl_citation_info_tl - \exp_args:NV \__csl_write_aux_citation:n \l__csl_citation_info_tl + \exp_args:NVV \__csl_write_aux_citation:nn \g__csl_ref_section_index_int \l__csl_citation_info_tl \bool_if:NT \l__csl_regression_test_bool { \tl_show:N \l__csl_citation_info_tl } % Print the citation string \prop_get:NVNTF \g__csl_citations_prop \l__csl_citation_id_tl \l__csl_citation_tl - { \__csl_print_citation:N \l__csl_citation_tl } + { \__csl_print_citation: } { \bool_if:NTF \l__csl_engine_initialized_bool { @@ -393,7 +449,7 @@ \char_set_catcode_other:N \% \char_set_catcode_other:N \# \exp_args:NV \__csl_cite_aux:n \l__csl_citation_info_tl - \__csl_print_citation:N \l__csl_citation_tl + \__csl_print_citation: \group_end: } { @@ -404,7 +460,7 @@ } \cs_new:Npn \__csl_cite_aux:n #1 - { \lua_now:e { csl.cite("\lua_escape:n {#1}") } } + { \lua_now:e { csl_citation_manager:cite("\lua_escape:n {#1}") } } % #1: seq % #2: tl @@ -437,13 +493,12 @@ \int_new:N \l__csl_citation_count_int \prop_new:N \g__csl_citations_count_prop -\cs_new:Npn \__csl_process_citation_id:NN #1#2 - % #1: \l__csl_citation_id_tl - % #2: \l__csl_cite_keys_seq - % Set \l__csl_citation_id_tl = "ITEM-1,ITEM-2@4". +% Load cite keys from `\l__csl_cite_keys_seq` and make `\l__csl_citation_id_tl`. +% Set \l__csl_citation_id_tl = "ITEM-1,ITEM-2@4". +\cs_new:Npn \__csl_process_citation_id: { \tl_set:Nx \l__csl_cite_keys_tl - { \seq_use:Nn #2 { , } } + { \seq_use:Nn \l__csl_cite_keys_seq { , } } % \prop_show:N \g__csl_citations_count_prop % \tl_show:N \l__csl_cite_keys_tl \prop_get:NVNTF \g__csl_citations_count_prop \l__csl_cite_keys_tl @@ -455,7 +510,7 @@ { \int_set_eq:NN \l__csl_citation_count_int \c_one_int } \prop_gput:NVV \g__csl_citations_count_prop \l__csl_cite_keys_tl \l__csl_citation_count_int - \tl_set:Nx #1 + \tl_set:Nx \l__csl_citation_id_tl { \l__csl_cite_keys_tl @ \int_use:N \l__csl_citation_count_int } } @@ -465,15 +520,11 @@ % Save the note number to \l__csl_note_index_tl % TODO: multiple citations in a note -\cs_new:Npn \__csl_get_note_index:N #1 +\cs_new:Npn \__csl_get_note_index: % #1: \l__csl_note_index_tl { \bool_if:NTF \l__csl_note_bool - { - \int_set_eq:Nc \l_tmpa_int { c@ \@mpfn } - \int_incr:N \l_tmpa_int - \tl_set:Nx #1 { \int_use:N \l_tmpa_int } - } + { \tl_set:Nx \l__csl_note_index_tl { \int_use:c { c@ \@mpfn } } } { \tl_if_empty:NTF \l__csl_class_tl { @@ -481,18 +532,19 @@ \int_set_eq:Nc \l_tmpa_int { c@ \@mpfn } \int_gincr:N \g__csl_pseudo_note_index_int \int_add:Nn \l_tmpa_int { \g__csl_pseudo_note_index_int } - \tl_set:Nx #1 { \int_use:N \l_tmpa_int } + \tl_set:Nx \l__csl_note_index_tl { \int_use:N \l_tmpa_int } } - { \tl_set:Nx #1 { 0 } } + { \tl_set:Nn \l__csl_note_index_tl { 0 } } } } -\cs_new:Npn \__csl_write_aux_citation:n #1 - % #1: citation info "{<citationID>}{{id=ITEM-1},{id=ITEM-2}}{<noteIndex>}" +\cs_new:Npn \__csl_write_aux_citation:nn #1#2 + % #1: refsection index (already converted to tl) + % #2: citation info "{<citationID>}{{id=ITEM-1},{id=ITEM-2}}{<noteIndex>}" { \if@filesw - \iow_now:Nn \@auxout { \csl@aux@cite {#1} } + \iow_now:Nn \@auxout { \csl@aux@cite {#1} {#2} } \fi } @@ -507,17 +559,11 @@ % #1: \l__csl_citation_tl -\cs_new:Npn \__csl_print_citation:N #1 +\cs_new:Npn \__csl_print_citation: { \bool_if:NT \l__csl_regression_test_bool - { \tl_show:N #1 } - \bool_if:NTF \l__csl_note_bool - { - \bool_if:NTF \l__csl_in_note_bool - {#1} - { \footnote {#1} } - } - {#1} + { \tl_show:N \l__csl_citation_tl } + \l__csl_citation_tl } @@ -539,9 +585,7 @@ \bool_if:NT \l__csl_regression_test_bool { \tl_show:N \l__csl_citation_tl } \group_begin: - \bool_if:NTF \l__csl_note_bool - { \footnote { \reset@font \l__csl_citation_tl } } - { \reset@font \l__csl_citation_tl } + \reset@font \l__csl_citation_tl \group_end: } @@ -550,8 +594,8 @@ \tl_set:Nn \l__csl_citation_tl { [ \textbf {#1} ] } } -% \msg_new:nnn { citation-style-language } { citation / undefined } -% { Citation~ `#1'~ on~ page~ \thepage \space undefined~ \msg_line_context: . } +% \msg_new:nnn { citation-style-language } { undefined-citation } +% { Citation~ '#1'~ on~ page~ \thepage \space undefined~ \msg_line_context: . } \cs_new:Npn \__csl_warn_citation_undefined:n #1 { @@ -567,36 +611,39 @@ \cs_new:Npn \__csl_no_cite:n #1 { - \seq_clear:N \l__csl_cite_keys_seq - \seq_clear:N \l__csl_citation_items_seq - \__csl_process_cite_input:nnn { } { } {#1} + \__csl_cite_init: + \__csl_collect_citation_items:nnn { } { } {#1} \tl_set:Nx \l__csl_cite_items_tl { \seq_use:Nn \l__csl_citation_items_seq { , } } + \prop_clear:N \l__csl_citation_properties_prop + \prop_put:Nnn \l__csl_citation_properties_prop { noteIndex } { 0 } + \__csl_make_chapter_property: + \__csl_serialize_prop:NN \l__csl_citation_properties_prop \l__csl_citation_properties_tl \tl_set:Nx \l__csl_citation_info_tl { citationID = { @nocite } , - citationItems = { \l__csl_cite_items_tl } , - properties = { noteIndex = { 0 } } + citationItems = { \tl_use:N \l__csl_cite_items_tl } , + properties = { \tl_use:N \l__csl_citation_properties_tl } } \bool_if:NT \l__csl_regression_test_bool { \tl_show:N \l__csl_citation_info_tl } - \exp_args:NV \__csl_no_cite_write_aux:n \l__csl_citation_info_tl + \exp_args:NVV \__csl_no_cite_write_aux:nn \g__csl_ref_section_index_int \l__csl_citation_info_tl \sys_if_engine_luatex:T - { \lua_now:n { csl.nocite("#1") } } + { \lua_now:n { csl_citation_manager:nocite("#1") } } \tl_clear:N \l__csl_citation_tl \bool_if:NT \l__csl_regression_test_bool { \tl_show:N \l__csl_citation_tl } } -\cs_new:Npn \__csl_no_cite_write_aux:n #1 +\cs_new:Npn \__csl_no_cite_write_aux:nn #1#2 { \__csl_if_preamble:TF { \hook_gput_code:nnn { begindocument } { . } - { \exp_args:Nx \__csl_write_aux_citation:n { #1 } } + { \__csl_write_aux_citation:nn {#1} {#2} } } - { \exp_args:Nx \__csl_write_aux_citation:n { #1 } } + { \__csl_write_aux_citation:nn {#1} {#2} } } @@ -612,10 +659,10 @@ % Used in aux files to register cite items. % #1: a citation object -\cs_set:Npn \csl@aux@cite #1 +\cs_set:Npn \csl@aux@cite #1#2 { \sys_if_engine_luatex:T - { \lua_now:e { csl.register_citation_info("\lua_escape:n {#1}") } } + { \lua_now:e { csl_citation_manager:register_citation_info(#1, "\lua_escape:n {#2}") } } } @@ -627,3 +674,10 @@ % #1: cite id % #2: cite contents \cs_new:Npn \cslcite #1#2 {#2} + +% This command is for use with hyperref. +% #1: cite id +\cs_new:Npn \cslundefinedcite #1 { + \textbf {#1} + \__csl_warn_citation_undefined:n {#1} +} diff --git a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-compatible.sty b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-compatible.sty index ca44d0e4579..8de98b6a9c6 100644 --- a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-compatible.sty +++ b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-compatible.sty @@ -89,8 +89,8 @@ { \BlockquoteDisable { - \cs_set_eq:NN \__csl_process_citation_info:NN \use_none:nn - \cs_set_eq:NN \__csl_make_citation:N \use_none:n + \cs_set_eq:NN \__csl_process_citation_info: \relax + \cs_set_eq:NN \__csl_make_citation: \relax } } @@ -98,25 +98,33 @@ % ### `hyperref` \cs_set:Npn \__csl_hyperref_cite_item:nn #1#2 - { \hyper@@link [ cite ] { } { cite. #1 \@extra@b@citeb } { #2 } } + { + \hyper@@link [ cite ] { } + { cite \int_use:N \g__csl_ref_section_index_int . #1 \@extra@b@citeb } { #2 } + } \cs_new:Npn \__csl_hyperref_lbibitem:nn [#1]#2 { \clist_gput_right:Nn \g__csl_bib_items_clist {#2} \@skiphyperreftrue - \H@item[% - \ifx\Hy@raisedlink\@empty - \hyper@anchorstart{cite.#2\@extra@b@citeb}% - \@BIBLABEL{#1}% - \hyper@anchorend - \else - \Hy@raisedlink{% - \hyper@anchorstart{cite.#2\@extra@b@citeb}\hyper@anchorend - }% - \@BIBLABEL{#1}% - \fi - \hfill - ]% + \H@item + [ + \ifx \Hy@raisedlink \@empty + \hyper@anchorstart + { cite \int_use:N \g__csl_ref_section_index_int . #2 \@extra@b@citeb } + \@BIBLABEL {#1} + \hyper@anchorend + \else + \Hy@raisedlink + { + \hyper@anchorstart + { cite \int_use:N \g__csl_ref_section_index_int . #2 \@extra@b@citeb } + \hyper@anchorend + } + \@BIBLABEL {#1} + \fi + \hfill + ] \@skiphyperreffalse \ignorespaces } @@ -128,7 +136,8 @@ \Hy@raisedlink { \hyper@anchorstart - { cite. #1 \@extra@b@citeb } \relax + { cite \int_use:N \g__csl_ref_section_index_int . #1 \@extra@b@citeb } + \relax \hyper@anchorend } \ignorespaces @@ -153,3 +162,21 @@ \cs_gset_eq:NN \cslcite \__csl_hyperref_cite_item:nn } } + + +% ### `perpage` + +\hook_gput_code:nnn { package / perpage / after } { . } + { + \hook_gput_code:nnn { begindocument } { . } + { + \cs_if_exist:cT { c@pchk@footnote } + { + \cs_set:Npn \__csl_make_chapter_property: + { + \prop_put:Nnx \l__csl_citation_properties_prop { chapterIndex } + { \int_use:N \c@page } + } + } + } + } diff --git a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-init.sty b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-init.sty index db83bced06c..de5b5bed4ce 100644 --- a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-init.sty +++ b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language-init.sty @@ -16,8 +16,9 @@ { \__csl_initialize_lua_module: } { \__csl_load_bbl: - \__csl_read_style_class: + \__csl_get_style_class: } + \__csl_set_ref_section_level: } @@ -25,19 +26,20 @@ \cs_new:Npn \__csl_write_aux_info: { + \tl_if_empty:NF \l__csl_style_tl + { \exp_args:NV \__csl_write_aux_bibstyle:n \l__csl_style_tl } + \tl_if_empty:NT \l__csl_style_tl + { \tl_set_eq:NN \l__csl_style_tl \g__csl_aux_bibstyle_tl } \tl_if_empty:NT \l__csl_style_tl - { - \tl_set_eq:NN \l__csl_style_tl \g__csl_aux_bibstyle_tl - \edef \csl@style { \g__csl_aux_bibstyle_tl } - } - \tl_if_empty:VTF \l__csl_style_tl { \msg_warning:nn { citation-style-language } { missing-style-name } \tl_set:Nn \l__csl_style_tl { apa } } - { \exp_args:NV \__csl_write_aux_bibstyle:n \l__csl_style_tl } - \clist_if_empty:NTF \l__csl_bib_resources_clist + \tl_set_eq:NN \csl@style \l__csl_style_tl + \clist_if_empty:NT \l__csl_bib_resources_clist { \clist_set_eq:NN \l__csl_bib_resources_clist \g__csl_aux_bib_files_clist } + \clist_if_empty:NTF \l__csl_bib_resources_clist + { \msg_warning:nn { citation-style-language } { empty-bib-resources } } { \exp_args:Nx \__csl_write_aux_bibdata:n { \clist_use:Nn \l__csl_bib_resources_clist { , } } @@ -48,7 +50,11 @@ \cs_new:Npn \__csl_write_aux_bibstyle:n #1 { \if@filesw - \iow_now:Nx \@auxout { \token_to_str:N \csl@aux@style {#1} } + \iow_now:Nx \@auxout + { + \token_to_str:N \csl@aux@style + { \int_use:N \g__csl_ref_section_index_int } {#1} + } \fi } @@ -56,42 +62,56 @@ { \if@filesw % Full expansion for files like \jobname.bib - \iow_now:Nx \@auxout { \token_to_str:N \csl@aux@data {#1} } + \iow_now:Nx \@auxout + { + \token_to_str:N \csl@aux@data + { \int_use:N \g__csl_ref_section_index_int } {#1} + } \fi } % In earlier time, \bibdata{xxx.json} was used but this causes latexmk unable % to find xxx.json.bib and it refuses to run the $bibtex procedure. % John Collins suggests using a different command than \bibdata. -\cs_new:Npn \csl@aux@data #1 - { \clist_gput_right:Nn \g__csl_aux_bib_files_clist {#1} } +\cs_new:Npn \csl@aux@data #1#2 + { + \str_if_eq:nnT {#1} { 0 } + { \clist_gput_right:Nn \g__csl_aux_bib_files_clist {#2} } + } \cs_new:Npn \__csl_initialize_lua_module: { - \clist_if_empty:NT \l__csl_bib_resources_clist - { \msg_warning:nn { citation-style-language } { empty-bib-resources } } + \tl_set:Nx \l_tmpa_tl { \clist_use:Nn \l__csl_bib_resources_clist { , } } \lua_now:e { - csl.init( + csl_citation_manager:init( "\l__csl_style_tl", - "\l__csl_bib_resources_clist", + "\l_tmpa_tl", "\l__csl_locale_tl" ) } - - - \str_if_eq:eeT { \lua_now:n { tex.print(csl.initialized) } } { true } + \str_if_eq:eeTF + { + \lua_now:n + { + tex.print(tostring( + csl_citation_manager.ref_section.initialized + )) + } + } + { true } { \bool_set_true:N \l__csl_engine_initialized_bool } - \__csl_get_style_class: + { \bool_set_false:N \l__csl_engine_initialized_bool } + \__csl_get_style_class_luatex: \@ifpackageloaded { hyperref } - { \lua_now:n { csl.enable_linking() } } + { \lua_now:n { csl_citation_manager:enable_linking() } } { } } \msg_new:nnn { citation-style-language } { missing-style-name } - { Missing~ style~ name.\\Will~ use~ default~ APA~ style. } + { Missing~ style~ name.~ Will~ use~ default~ APA~ style. } \msg_new:nnn { citation-style-language } { empty-bib-resources } { Empty~ bibliographic~ resources.~ Use~ \token_to_str:N \addbibresource. } @@ -101,13 +121,16 @@ % In-text (including numeric or author-date) or note style % \bool_new:N \l__csl_note_style_bool -\cs_new:Npn \__csl_get_style_class: { +\cs_new:Npn \__csl_get_style_class_luatex: { + \bool_set_false:N \l__csl_note_bool \bool_if:NT \l__csl_engine_initialized_bool { - \tl_set:Nx \l__csl_class_tl { \lua_now:n { csl.get_style_class() } } + \tl_set:Nx \l__csl_class_tl { \lua_now:n { tex.print(csl_citation_manager:get_style_class()) } } \tl_if_eq:NnT \l__csl_class_tl { note } { \bool_set_true:N \l__csl_note_bool } } + \int_compare:nNnT { \g__csl_ref_section_index_int } = { 0 } + { \bool_gset_eq:NN \g__csl_global_note_class_bool \l__csl_note_bool } } @@ -225,7 +248,7 @@ turkmen = tk-TM, ukrainian = uk-UA, urdu = ur-IN, - UKenglish = en-UK, + UKenglish = en-GB, uppersorbian = hsb-DE, USenglish = en-US, usorbian = hsb-DE, @@ -266,14 +289,16 @@ \cs_new:Npn \__csl_write_aux_options:n #1 { \if@filesw - \iow_now:Nn \@auxout { \csl@aux@options {#1} } + \iow_now:Nx \@auxout + { + \token_to_str:N \csl@aux@options + { \int_use:N \g__csl_ref_section_index_int } {#1} + } \fi } -\cs_new:Npn \csl@aux@options #1 { } - +\cs_new:Npn \csl@aux@options #1#2 { } -\tl_new:N \g__csl_bibliography_setup_tl % Load .bbl at the beginning of document to save one pass of latex. % In this procedure, the \cslcitation command is processed and the contents @@ -283,10 +308,6 @@ % The \@input@ prints "No file ....bbl" in the .log file from which % the latexmk decides to run $bibtex or not. \__csl_collect_bibliography:n { \@input@ { \jobname .bbl } } - % Execute the \cslsetup part to set the style class. - % \tl_show:N \g__csl_bibliography_setup_tl - \tl_use:N \g__csl_bibliography_setup_tl - % \bool_show:N \l__csl_note_bool } @@ -302,8 +323,6 @@ % URLs may contain "%" and "#" characters. \char_set_catcode_other:N \% \char_set_catcode_other:N \# - \RenewDocumentCommand \cslsetup { m } - { \tl_gset:Nn \g__csl_bibliography_setup_tl { \cslsetup { ##1 } } } \RenewDocumentEnvironment { thebibliography } { m +b } { \tl_set:Nn \l__csl_bib_index_tl { 1 } @@ -321,29 +340,121 @@ \group_end: } +% At the moment, the `\csloptions` only reads the style class from `.bbl` +% generated by `citeproc-lua`. +% #1: refsection index +% #2: refsection options +\NewDocumentCommand \csloptions { m m } + { \keys_set:nn { csl / options } { #2 } } + +% The class option is in the `<style>=<class>` form +% (e.g. `\csloptions{class={apa=in-text}}`). +\keys_define:nn { csl / options } + { + class .code:n = { \prop_gput_from_keyval:Nn \g__csl_style_class_prop {#1} }, + } + +\prop_new:N \g__csl_style_class_prop % The `\textcite` bahaves differently with note styles. % Thus we read the style class from the `.csl` file with non-LuaTeX engines. \ior_new:N \l__csl_style_ior -\cs_new:Npn \__csl_read_style_class: +\cs_new:Npn \__csl_get_style_class: { + \tl_clear:N \l__csl_class_tl \bool_set_false:N \l__csl_note_bool + \prop_get:NVNF \g__csl_style_class_prop \l__csl_style_tl \l__csl_class_tl + { \__csl_read_style_class: } + \tl_if_empty:NF \l__csl_class_tl + { + \str_case:VnTF \l__csl_class_tl + { + { note } { \bool_set_true:N \l__csl_note_bool } + { in-text } { \bool_set_false:N \l__csl_note_bool } + } + { + \int_compare:nNnT { \g__csl_ref_section_index_int } = { 0 } + { + \bool_gset_eq:NN \g__csl_global_note_class_bool \l__csl_note_bool + } + } + { + \msg_error:nnV { citation-style-language } { invalid-style-class } + \l__csl_class_tl + } + } + } + +\cs_new:Npn \__csl_read_style_class: + { \tl_if_blank:VF \l__csl_style_tl { \exp_args:NNx \ior_open:Nn \l__csl_style_ior { \l__csl_style_tl .csl } \ior_map_inline:Nn \l__csl_style_ior { % \tl_show:n {##1} - \tl_if_in:nnT {##1} { class="note" } + \tl_if_in:nnTF {##1} { class="note" } { \tl_set:Nn \l__csl_class_tl { note } \bool_set_true:N \l__csl_note_bool + \prop_gput:NVn \g__csl_style_class_prop \l__csl_style_tl { note } \ior_map_break: } + { + \tl_if_in:nnT {##1} { class="in-text" } + { + \tl_set:Nn \l__csl_class_tl { in-text } + \bool_set_false:N \l__csl_note_bool + \prop_gput:NVn \g__csl_style_class_prop \l__csl_style_tl { in-text } + \ior_map_break: + } + } } \ior_close:N \l__csl_style_ior } } -% \msg_new:nnn { citation-style-language } { file / non-exist } +\msg_new:nnn { citation-style-language } { invalid-style-class } + { Invalid~ style~ class~ '#1'. } + +% \msg_new:nnn { citation-style-language } { file-non-exist } % { No~ file~ #1. } + +\cs_new:Npn \__csl_set_ref_section_level: + { + \str_case:Vn \l__csl_bib_ref_section_str + { + { none } { } + { part } + { \__csl_patch_ref_section:n { part } } + { chapter } + { \__csl_patch_ref_section:n { chapter } } + { chapter+ } + { + \__csl_patch_ref_section:n { part } + \__csl_patch_ref_section:n { chapter } + } + { section } + { \__csl_patch_ref_section:n { section } } + { section+ } + { + \__csl_patch_ref_section:n { part } + \__csl_patch_ref_section:n { chapter } + \__csl_patch_ref_section:n { section } + } + { subsection } + { \__csl_patch_ref_section:n { subsection } } + { subsection+ } + { + \__csl_patch_ref_section:n { part } + \__csl_patch_ref_section:n { chapter } + \__csl_patch_ref_section:n { section } + \__csl_patch_ref_section:n { subsection } + } + } + } + +\cs_new:Npn \__csl_patch_ref_section:n #1 + { + \hook_gput_code:nnn { cmd / #1 / before } { . } { \newrefsection } + } diff --git a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language.sty b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language.sty index ebd497bcb71..f6039b4008c 100644 --- a/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language.sty +++ b/Master/texmf-dist/tex/latex/citation-style-language/citation-style-language.sty @@ -9,16 +9,23 @@ \RequirePackage{expl3} \RequirePackage{xparse} -\ProvidesExplPackage {citation-style-language} {2024-06-09} {0.5.0} +\ProvidesExplPackage {citation-style-language} {2024-08-28} {0.6.3} {Citation Style Language for LaTeX} \RequirePackage { l3keys2e } \RequirePackage { url } +\prop_gput:Nnn \g_msg_module_name_prop { citation-style-language } { CSL } +\prop_gput:Nnn \g_msg_module_type_prop { citeproc } { Module } + +\msg_new:nnn { citeproc } { citeproc-error } {#1} +\msg_new:nnn { citeproc } { citeproc-warning } {#1} + + % Check incompatible packages \msg_new:nnn { citation-style-language } { incompatible-package } - { The~ `#1'~ package~ is~ incompatible~ with~ `citation-style-language'. } + { Package~ '#1'~ is~ incompatible~ with~ 'citation-style-language'. } \clist_map_inline:nn { @@ -34,7 +41,13 @@ % Load Lua module in LuaTeX \sys_if_engine_luatex:T - { \lua_now:n { csl = require("citeproc-latex") } } + { + \lua_now:n + { + citeproc_manager = require("citeproc-manager") + csl_citation_manager = citeproc_manager.CslCitationManager:new() + } + } % Global options @@ -44,11 +57,15 @@ \bool_new:N \l__csl_regression_test_bool +\tl_new:N \g__csl_global_style_tl \tl_new:N \l__csl_style_tl \newcommand \csl@style {} % For latex2e interface \tl_new:N \l__csl_class_tl % TODO: This should be removed +\bool_new:N \g__csl_global_note_class_bool \bool_new:N \l__csl_note_bool +\clist_new:N \g__csl_global_bib_resources_clist \clist_new:N \l__csl_bib_resources_clist +\tl_new:N \g__csl_global_locale_tl \tl_new:N \l__csl_locale_tl \bool_new:N \l__csl_back_ref_bool \str_new:N \l__csl_back_ref_type_str @@ -62,6 +79,7 @@ \tl_new:N \l__csl_bib_item_sep_tl \tl_new:N \l__csl_bib_par_indent_tl \tl_new:N \l__csl_bib_hang_tl +\str_new:N \l__csl_bib_ref_section_str \keys_define:nn { csl } @@ -71,14 +89,19 @@ { \tl_set:Nn \l__csl_style_tl {#1} \renewcommand \csl@style {#1} + \tl_gset:Nn \g__csl_global_style_tl {#1} } , - class .code:n = + class .code:n = {} , % Deprecated, should be removed in the next release. + bib-resource .code:n = { - \tl_set:Nn \l__csl_class_tl {#1} - \tl_if_eq:NnT \l__csl_class_tl { note } - { \bool_set_true:N \l__csl_note_bool } + \clist_set:Nn \l__csl_bib_resources_clist {#1} + \clist_gset_eq:NN \g__csl_global_bib_resources_clist \l__csl_bib_resources_clist + } , + locale .code:n = + { + \tl_set:Nn \l__csl_locale_tl {#1} + \tl_gset:Nn \g__csl_global_locale {#1} } , - locale .tl_set:N = \l__csl_locale_tl , backref .choices:nn = { true, page, section, false } { \exp_args:NV \__csl_set_back_ref:n \l_keys_choice_tl } , @@ -92,13 +115,10 @@ bib-item-sep .tl_set:N = \l__csl_bib_item_sep_tl , bib-par-indent .tl_set:N = \l__csl_bib_par_indent_tl , bib-hang .tl_set:N = \l__csl_bib_hang_tl , - % The following keys are for easier interaction between LaTeX and - % citeproc-lua engine and they are not designed for end-users. - undefined-cites .code:n = - { - \clist_map_inline:nn {#1} - { \__csl_warn_citation_undefined:n {##1} } - } , + % ref section + ref-section .choices:nn = + { none, part, chapter, chapter+, section, section+, subsection, subsection+ } + { \str_set:NV \l__csl_bib_ref_section_str \l_keys_choice_tl } , } \cs_new:Npn \__csl_set_back_ref:n #1 @@ -124,6 +144,7 @@ bib-entry-page-break = true , bib-par-indent = { \parindent } , bib-hang = { 1 em } , + ref-section = none , } @@ -138,8 +159,11 @@ } \tl_new:N \g__csl_aux_bibstyle_tl -\cs_set:Npn \csl@aux@style #1 - { \tl_gset:Nn \g__csl_aux_bibstyle_tl {#1} } +\cs_set:Npn \csl@aux@style #1#2 + { + \str_if_eq:nnT {#1} { 0 } + { \tl_gset:Nn \g__csl_aux_bibstyle_tl {#2} } + } % Write to an empty `.ccf` file for use with latexmk diff --git a/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-en-US.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-en-US.xml index 93e874ce367..d9dd7552501 100644 --- a/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-en-US.xml +++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-en-US.xml @@ -17,7 +17,7 @@ <name>Brenton M. Wiernik</name> </translator> <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights> - <updated>2024-03-12T12:31:23-04:00</updated> + <updated>2024-08-12T16:22:23-04:00</updated> </info> <style-options punctuation-in-quote="true"/> <date form="text"> @@ -685,7 +685,6 @@ </term> <!-- VERB ROLE FORMS --> - <term name="author" form="verb">by</term> <term name="chair" form="verb">chaired by</term> <term name="collection-editor" form="verb">edited by</term> <term name="compiler" form="verb">compiled by</term> diff --git a/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-zh-TW.xml b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-zh-TW.xml index e4a0e9ef05d..acd44019875 100644 --- a/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-zh-TW.xml +++ b/Master/texmf-dist/tex/latex/citation-style-language/locales/csl-locales-zh-TW.xml @@ -5,7 +5,7 @@ <name>sati-bodhi</name> </translator> <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights> - <updated>2024-03-09T15:20:54-05:00</updated> + <updated>2024-08-12T16:22:23-04:00</updated> </info> <style-options punctuation-in-quote="false"/> <date form="text"> @@ -433,7 +433,6 @@ <single>series creator</single> <multiple>series creators</multiple> </term> - <term name="author">作者</term> <term name="director">導演</term> <term name="editor">編輯</term> <term name="editorial-director">主編</term> @@ -485,7 +484,6 @@ <single>cre.</single> <multiple>cres.</multiple> </term> - <term name="author" form="short">作者</term> <term name="director" form="short">導演</term> <term name="editor" form="short">編輯</term> <term name="editorial-director" form="short">主編</term> @@ -511,7 +509,6 @@ <term name="producer" form="verb">produced by</term> <term name="script-writer" form="verb">written by</term> <term name="series-creator" form="verb">created by</term> - <term name="author" form="verb">著</term> <term name="container-author" form="verb">著</term> <term name="director" form="verb">指導</term> <term name="editor" form="verb">編輯</term> diff --git a/Master/texmf-dist/tex/latex/citation-style-language/styles/american-medical-association.csl b/Master/texmf-dist/tex/latex/citation-style-language/styles/american-medical-association.csl index 86dd573abcc..2b84d6e57a1 100644 --- a/Master/texmf-dist/tex/latex/citation-style-language/styles/american-medical-association.csl +++ b/Master/texmf-dist/tex/latex/citation-style-language/styles/american-medical-association.csl @@ -27,7 +27,7 @@ <category citation-format="numeric"/> <category field="medicine"/> <summary>The American Medical Association style as used in JAMA. Version 11 as per November-2019.</summary> - <updated>2022-09-28T07:33:04-04:00</updated> + <updated>2024-08-04T17:48:30-04:00</updated> <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights> </info> <locale xml:lang="en"> @@ -66,7 +66,7 @@ <group delimiter=". "> <choose> <if type="webpage post post-weblog" match="any"> - <date variable="issued" prefix="Published " form="text"/> + <date variable="issued" form="text"/> </if> </choose> <group> @@ -173,7 +173,7 @@ <if variable="URL"> <group delimiter=". " suffix="."> <text variable="URL"/> - <group prefix="Published "> + <group> <date variable="issued"> <date-part name="month" suffix=" "/> <date-part name="day" suffix=", "/> diff --git a/Master/texmf-dist/tex/latex/citation-style-language/styles/apa.csl b/Master/texmf-dist/tex/latex/citation-style-language/styles/apa.csl index 79208912e77..a78e7f315fd 100644 --- a/Master/texmf-dist/tex/latex/citation-style-language/styles/apa.csl +++ b/Master/texmf-dist/tex/latex/citation-style-language/styles/apa.csl @@ -14,7 +14,7 @@ <category citation-format="author-date"/> <category field="psychology"/> <category field="generic-base"/> - <updated>2024-06-06T05:59:25+00:00</updated> + <updated>2024-08-24T12:16:51-04:00</updated> <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights> </info> <locale xml:lang="en"> @@ -23,6 +23,10 @@ <single>ed. & trans.</single> <multiple>eds. & trans.</multiple> </term> + <term name="editor-translator" form="short"> + <single>ed. & trans.</single> + <multiple>eds. & trans.</multiple> + </term> <term name="translator" form="short">trans.</term> <term name="interviewer" form="short"> <single>interviewer</single> @@ -32,6 +36,7 @@ <single>ed.</single> <multiple>eds.</multiple> </term> + <term name="performer" form="verb">recorded by</term> <term name="circa" form="short">ca.</term> <term name="bc"> B.C.E.</term> <term name="ad"> C.E.</term> @@ -41,7 +46,12 @@ </term> <term name="software">computer software</term> <term name="at" form="long">before the</term> + <term name="collection">archival collection</term> + <term name="post">online post</term> + <term name="at" form="long">before the</term> <term name="hearing" form="verb">testimony of</term> + <term name="review-of" form="long">review of the</term> + <term name="review-of" form="short">review of</term> </terms> </locale> <locale xml:lang="da"> @@ -82,101 +92,172 @@ <term name="et-al">et al.</term> </terms> </locale> - <!-- TODO: New types: classic collection document event hearing performance periodical regulation -software- standard --> - <!-- TODO: New creator roles: chair compiler contributor curator executive-producer guest host narrator organizer performer producer script-writer series-creator --> - <!-- TODO: New variables: - available-date submitted - part-number printing-number supplement-number - part-title volume-title - archive_collection - division jurisdiction - event-title - language - license - reviewed-genre + <!-- For Indigeneous Knowledge, assume the item is stored as `document` or `speech` + and that Nation/Community, treaty, where the Elder lives, + and topic are all stored in `title` + cf. https://libguides.norquest.ca/c.php?g=314831&p=5188823. + If the item is stored as `interview`, assume that Nation/Community, treat, and topic + are stored in `title`, 'Oral teaching' or similar is stored in `archive`, and where + the Elder lives is stored in `archive-place`. --> - <!-- TODO: New terms: - advance-online-publication - album on audio-recording - original-work-published - personal-communication - preprint - review-of - item types + <!-- Reviews are detected if an item has type `review` or `review-book` or if it has any of the variables + `reviewed-title`, `reviewed-author`, or `reviewed-genre`. For the latter case, reviews are commonly + stored as types `article-journal`, `article-magazine`, `article-newspaper`, `post-weblog`, or `webpage` --> - <!-- TODO: Check Indigeneous Knowledge format --> <!-- General categories of item types: - Periodical: article-journal article-magazine article-newspaper post-weblog review review-book + Periodical: article-journal article-magazine article-newspaper periodical post-weblog review review-book Periodical or Booklike: paper-conference Booklike: article book broadcast chapter classic collection dataset document entry entry-dictionary entry-encyclopedia event figure - graphic interview manuscript map motion_picture musical_score pamphlet patent - performance periodical personal_communication post report + graphic interview manuscript map motion_picture musical_score + pamphlet patent performance personal_communication post report software song speech standard thesis webpage Legal: bill hearing legal_case legislation regulation treaty --> + <!-- Equivalencies: + classic == book + document == report, but give full date + standard == report + performance == speech + event == speech + collection == book, but give full date + --> + <!-- Role equivalencies: + compiler == editor + organizer, curator == chair + script-writer == director + producer == director (but don't print both) + guest, host == director + series-creator, executive-producer == editor + --> <!-- APA references contain four parts: author, date, title, source --> <macro name="author-bib"> - <!-- TODO: New creator roles (media, contributor) --> - <!-- TODO: Add new item types --> - <names variable="composer" delimiter=", "> - <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/> - <substitute> - <names variable="author"/> - <names variable="illustrator"/> - <names variable="director"> - <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/> - <label form="long" prefix=" (" suffix=")" text-case="title"/> - </names> - <choose> - <if variable="container-title"> - <choose> - <if type="book entry entry-dictionary entry-encyclopedia" match="any"> - <choose> - <if variable="title"> - <group delimiter=" "> - <text macro="title"/> - <text macro="parenthetical"/> - </group> - </if> - <else> - <text macro="title-and-descriptions"/> - </else> - </choose> - </if> - </choose> - </if> - </choose> - <!-- TODO: Test for editortranslator and put that first as that becomes available --> - <names variable="editor" delimiter=", "> - <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/> - <label form="short" prefix=" (" suffix=")" text-case="title"/> - </names> - <names variable="editorial-director"> - <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/> - <label form="short" prefix=" (" suffix=")" text-case="title"/> - </names> - <names variable="collection-editor"> - <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/> - <label form="short" prefix=" (" suffix=")" text-case="title"/> - </names> - <choose> - <if variable="title"> - <group delimiter=" "> - <text macro="title"/> - <text macro="parenthetical"/> - </group> - </if> - <else> - <text macro="title-and-descriptions"/> - </else> - </choose> - </substitute> - </names> + <group delimiter=" "> + <names variable="composer" delimiter=", "> + <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/> + <substitute> + <names variable="author"/> + <!-- Note: `narrator` only cited in secondary-contributors --> + <names variable="illustrator"/> + <!-- TODO: Replace `delimiter` with `collapse` to combine names variables when that becomes available. --> + <choose> + <if type="broadcast"> + <names variable="script-writer director" delimiter=", & "> + <!-- Note: Actors/performers and producers [not executive] not cited in APA style. --> + <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/> + <label form="long" prefix=" (" suffix=")" text-case="title"/> + </names> + </if> + </choose> + <names variable="director"> + <!-- For non-broadcast items, APA only cites directors and not writers. --> + <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/> + <label form="long" prefix=" (" suffix=")" text-case="title"/> + </names> + <!-- TODO: Replace `delimiter` with `collapse` to combine names variables when that becomes available. --> + <names variable="guest host" delimiter=", & "> + <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/> + <label form="long" prefix=" (" suffix=")" text-case="title"/> + </names> + <names variable="producer"> + <!-- Note: Producers not cited if there is a writer/director, but use if they are the principle creator. --> + <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/> + <label form="long" prefix=" (" suffix=")" text-case="title"/> + </names> + <choose> + <if variable="container-title"> + <choose> + <if type="book classic collection entry entry-dictionary entry-encyclopedia" match="any"> + <!-- Items with book-like container-title substitute with their title and parenthetical, + but leave bracketed after container-title. This mimics the `container-booklike` formatting. --> + <choose> + <if variable="title"> + <group delimiter=" "> + <text macro="title"/> + <text macro="parenthetical"/> + </group> + </if> + <else> + <text macro="title-and-descriptions"/> + </else> + </choose> + </if> + </choose> + </if> + </choose> + <names variable="executive-producer"> + <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/> + <label form="long" prefix=" (" suffix=")" text-case="title"/> + </names> + <names variable="series-creator"> + <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/> + <label form="long" prefix=" (" suffix=")" text-case="title"/> + </names> + <names variable="editor-translator"> + <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/> + <label form="short" prefix=" (" suffix=")" text-case="title"/> + </names> + <!-- Note: Translator is not cited as a primary creator (only as Ed. & Trans.). --> + <names variable="editor"> + <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/> + <label form="short" prefix=" (" suffix=")" text-case="title"/> + </names> + <names variable="editorial-director"> + <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/> + <label form="short" prefix=" (" suffix=")" text-case="title"/> + </names> + <names variable="compiler"> + <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/> + <label form="long" prefix=" (" suffix=")" text-case="title"/> + </names> + <choose> + <if type="event performance speech" match="any"> + <names variable="chair"> + <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/> + <label form="long" prefix=" (" suffix=")" text-case="title"/> + </names> + <names variable="organizer"> + <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/> + <label form="long" prefix=" (" suffix=")" text-case="title"/> + </names> + </if> + </choose> + <names variable="curator"> + <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/> + <label form="long" prefix=" (" suffix=")" text-case="title"/> + </names> + <names variable="collection-editor"> + <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/> + <label form="short" prefix=" (" suffix=")" text-case="title"/> + </names> + <choose> + <if variable="title"> + <!-- If an item has a title, substitute missing author with title and parenthetical, but leave bracketed + after the date (in the 'title' position). --> + <group delimiter=" "> + <text macro="title"/> + <text macro="parenthetical"/> + </group> + </if> + <else> + <!-- If an item has no title, substitute with bracketed followed by parenthetical. --> + <text macro="title-and-descriptions"/> + </else> + </choose> + </substitute> + </names> + <choose> + <!-- Print "with" contributor for books, but not for other types that commonly have them (eg, thesis, software) --> + <if type="book classic collection" match="any"> + <names variable="contributor" prefix="(" suffix=")"> + <label form="verb" suffix=" "/> + <name name-as-sort-order="all" and="symbol" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="always"/> + </names> + </if> + </choose> + </group> </macro> <macro name="author-intext"> - <!-- TODO: New creator roles --> - <!-- TODO: Add new item types --> <choose> <if type="bill hearing legal_case legislation regulation treaty" match="any"> <text macro="title-intext"/> @@ -212,18 +293,37 @@ <substitute> <names variable="author"/> <names variable="illustrator"/> + <!-- TODO: Replace `delimiter` with `collapse` to combine names variables when that becomes available. --> + <choose> + <if type="broadcast"> + <names variable="script-writer director" delimiter=", & "/> + </if> + </choose> <names variable="director"/> + <!-- TODO: Replace `delimiter` with `collapse` to combine names variables when that becomes available. --> + <names variable="guest host" delimiter=", & "/> + <names variable="producer"/> <choose> <if variable="container-title"> <choose> - <if type="book entry entry-dictionary entry-encyclopedia" match="any"> + <if type="book classic collection entry entry-dictionary entry-encyclopedia" match="any"> <text macro="title-intext"/> </if> </choose> </if> </choose> + <names variable="executive-producer"/> + <names variable="series-creator"/> <names variable="editor"/> <names variable="editorial-director"/> + <names variable="compiler"/> + <choose> + <if type="event performance speech" match="any"> + <names variable="chair"/> + <names variable="organizer"/> + </if> + </choose> + <names variable="curator"/> <text macro="title-intext"/> </substitute> </names> @@ -241,7 +341,6 @@ </choose> </macro> <macro name="date-bib"> - <!-- TODO: Add new item types --> <group delimiter=" " prefix="(" suffix=")"> <choose> <if is-uncertain-date="issued"> @@ -257,7 +356,7 @@ <text variable="year-suffix"/> </group> <choose> - <if type="article-magazine article-newspaper broadcast interview motion_picture pamphlet personal_communication post post-weblog song speech webpage" match="any"> + <if type="article-magazine article-newspaper broadcast collection document event interview motion_picture pamphlet performance personal_communication post post-weblog song speech webpage" match="any"> <!-- Many video and audio examples in manual give full dates. Err on the side of too much information. --> <date variable="issued"> <date-part name="month"/> @@ -267,7 +366,7 @@ <else-if type="paper-conference"> <!-- Capture 'speech' stored as 'paper-conference' --> <choose> - <if variable="collection-editor editor editorial-director issue page volume" match="none"> + <if variable="collection-editor compiler editor editorial-director issue page volume" match="none"> <date variable="issued"> <date-part name="month"/> <date-part name="day" prefix=" "/> @@ -275,14 +374,14 @@ </if> </choose> </else-if> - <!-- Only year: article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic - manuscript map musical_score paper-conference[published] patent report review review-book thesis --> + <!-- Only year: article article-journal book chapter classic entry entry-dictionary entry-encyclopedia dataset figure graphic + manuscript map musical_score paper-conference[published] patent periodical report review review-book software standard thesis --> </choose> </group> </if> <else-if variable="status"> <group> - <!-- TODO: Should I print status as-is, or should I print the in-press term? --> + <!-- We print the status variable directly rather than using in-press, etc. terms. --> <text variable="status" text-case="lowercase"/> <text variable="year-suffix" prefix="-"/> </group> @@ -296,6 +395,7 @@ </group> </macro> <macro name="date-sort"> + <!-- This is necessary to ensure that citeproc sorts all item types chonologically in the same list. --> <choose> <if type="article article-journal book chapter entry entry-dictionary entry-encyclopedia dataset figure graphic manuscript map musical_score patent report review review-book thesis" match="any"> <date variable="issued" date-parts="year" form="numeric"/> @@ -303,7 +403,7 @@ <else-if type="paper-conference"> <!-- Capture 'speech' stored as 'paper-conference' --> <choose> - <if variable="collection-editor editor editorial-director issue page volume" match="any"> + <if variable="collection-editor compiler editor editorial-director issue page volume" match="any"> <date variable="issued" date-parts="year" form="numeric"/> </if> <else> @@ -339,7 +439,6 @@ </choose> </macro> <macro name="date-intext"> - <!-- TODO: Add new item types --> <choose> <if variable="issued"> <group delimiter="/"> @@ -387,7 +486,7 @@ </group> </if> <else-if variable="status"> - <!-- TODO: Should I print status as-is, or should I print the in-press term? --> + <!-- We print the status variable directly rather than using in-press, etc. terms. --> <text variable="status" text-case="lowercase"/> <text variable="year-suffix" prefix="-"/> </else-if> @@ -398,7 +497,7 @@ </choose> </macro> <!-- APA has two description elements following the title: - title (parenthetical) [bracketed] --> + title (parenthetical) [bracketed] --> <macro name="title-and-descriptions"> <choose> <if variable="title"> @@ -412,7 +511,7 @@ <choose> <if type="bill report" match="any"> <!-- Bills, resolutions, and congressional reports are not italicized and substitute bill number if no title. --> - <!-- Can't distinguish congressional reports from other reports, + <!-- Can't distinguish congressional reports from other reports, but giving the genre and number seems fine for other reports too. --> <text macro="number"/> <text macro="bracketed"/> @@ -429,68 +528,125 @@ </choose> </macro> <macro name="title"> - <!-- TODO: Add new item types --> <choose> <if type="post webpage" match="any"> <!-- Webpages are always italicized --> - <text variable="title" font-style="italic"/> + <text macro="title-plus-part-title" font-style="italic"/> </if> - <else-if variable="container-title" match="any"> - <!-- Other types are italicized based on presence of container-title. + <!-- Other types are italicized based on presence of container-title. Assume that review and review-book are published in periodicals/blogs, not just on a web page (ex. 69) --> - <text variable="title"/> + <else-if type="article-journal article-magazine article-newspaper periodical post-weblog review review-book" match="any"> + <text macro="periodical-title"/> </else-if> - <else> + <else-if type="paper-conference"> + <!-- Treat paper-conference as book-like if it has an editor, otherwise as periodical-like --> <choose> - <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any"> - <text variable="title" font-style="italic"/> + <if variable="collection-editor compiler editor editorial-director" match="any"> + <text macro="booklike-title"/> </if> - <else-if type="paper-conference"> - <choose> - <if variable="collection-editor editor editorial-director" match="any"> - <group delimiter=": " font-style="italic"> - <text variable="title"/> - <!-- TODO: Replace with volume-title --> - <choose> - <if is-numeric="volume" match="none"> - <group delimiter=" "> - <label variable="volume" form="short" text-case="capitalize-first"/> - <text variable="volume"/> - </group> - </if> - </choose> - </group> - </if> - <else> - <text variable="title" font-style="italic"/> - </else> - </choose> - </else-if> <else> - <group delimiter=": " font-style="italic"> + <text macro="periodical-title"/> + </else> + </choose> + </else-if> + <else> + <text macro="booklike-title"/> + </else> + </choose> + </macro> + <macro name="periodical-title"> + <!-- For periodicals, assume that part-number and part-title refer to the article and append to title --> + <choose> + <if variable="container-title" match="any"> + <text macro="title-plus-part-title"/> + </if> + <else> + <!-- for periodical items without container titles, don't append volume-title to title --> + <text macro="title-plus-part-title" font-style="italic"/> + </else> + </choose> + </macro> + <macro name="booklike-title"> + <!-- For book-like items, assume part-number and part-title refer to the book/volume. --> + <choose> + <if variable="container-title" match="any"> + <text variable="title"/> + </if> + <else> + <!-- For book-like items without container titles and with volume-title, append volume-title to title (ex. 30) --> + <text macro="title-plus-volume-title" font-style="italic"/> + </else> + </choose> + </macro> + <macro name="title-plus-part-title"> + <choose> + <if variable="reviewed-author reviewed-genre reviewed-title" type="review review-book" match="any"> + <!-- If a review has no `reviewed-title`, assume that `title` contains the title of the reviewed work + and omit it here; it is printed in the `reviewed-item` macro. --> + <choose> + <if variable="reviewed-title" match="none"/> + <else> + <group delimiter=": "> <text variable="title"/> - <!-- TODO: Replace with volume-title --> - <choose> - <if is-numeric="volume" match="none"> - <group delimiter=" "> - <label variable="volume" form="short" text-case="capitalize-first"/> - <text variable="volume"/> - </group> - </if> - </choose> + <text macro="part-title"/> </group> </else> </choose> + </if> + <else> + <group delimiter=": "> + <text variable="title"/> + <text macro="part-title"/> + </group> </else> </choose> </macro> + <macro name="part-title"> + <group delimiter=". "> + <group delimiter=" "> + <label variable="part-number" form="short" text-case="capitalize-first"/> + <text variable="part-number"/> + </group> + <text variable="part-title" text-case="capitalize-first"/> + </group> + </macro> + <macro name="title-plus-volume-title"> + <group delimiter=": "> + <text variable="title"/> + <text macro="volume-title"/> + </group> + </macro> + <macro name="volume-title"> + <group delimiter=": "> + <choose> + <if variable="volume-title"> + <group delimiter=" "> + <group delimiter=". "> + <group delimiter=" "> + <label variable="volume" form="short" text-case="capitalize-first"/> + <text variable="volume"/> + </group> + <text variable="volume-title"/> + </group> + </group> + </if> + <else-if is-numeric="volume" match="none"> + <group delimiter=" "> + <label variable="volume" form="short" text-case="capitalize-first"/> + <text variable="volume"/> + </group> + </else-if> + </choose> + <!-- For book-like items, assume part-number and part-title refer to the book/volume. --> + <text macro="part-title"/> + </group> + </macro> <macro name="title-intext"> - <!-- TODO: Add new item types --> <choose> <if type="bill report"> <!-- Bills, resolutions, and congressional reports are not italicized and substitute bill number if no title. --> - <!-- Can't distinguish congressional reports from other reports, + <!-- Can't distinguish congressional reports from other reports, but giving the genre and number seems fine for other reports too. --> <choose> <if variable="title"> @@ -544,7 +700,6 @@ </choose> </macro> <macro name="parenthetical"> - <!-- TODO: Add new item types --> <!-- (Secondary contributors; Database location; Genre no. 123; Report Series 123, Version, Edition, Volume, Page) --> <group prefix="(" suffix=")"> <choose> @@ -604,7 +759,7 @@ <text macro="secondary-contributors"/> <choose> <if type="broadcast graphic map motion_picture song" match="any"> - <!-- For audiovisual media, number information comes after title, not container-title --> + <!-- For audiovisual media, number information comes after title, not container-title (ex. 94) --> <text macro="number"/> </if> </choose> @@ -622,7 +777,6 @@ </group> </macro> <macro name="parenthetical-container"> - <!-- TODO: Add new item types --> <choose> <if variable="container-title" match="any"> <group prefix="(" suffix=")"> @@ -630,7 +784,7 @@ <text macro="database-location"/> <choose> <if type="broadcast graphic map motion_picture song" match="none"> - <!-- For audiovisual media, number information comes after title, not container-title --> + <!-- For audiovisual media, number information comes after title, not container-title (ex. 94) --> <text macro="number"/> </if> </choose> @@ -641,65 +795,12 @@ </choose> </macro> <macro name="bracketed"> - <!-- TODO: Add new item types --> <!-- [Descriptive information] --> <!-- If there is a number, genre is already printed in macro="number" --> <group prefix="[" suffix="]"> <choose> - <if variable="reviewed-author reviewed-title" type="review review-book" match="any"> - <!-- Reviewed item --> - <group delimiter="; "> - <group delimiter=", "> - <group delimiter=" "> - <!-- Assume that genre is entered as 'Review of the book' or similar --> - <choose> - <if variable="number" match="none"> - <choose> - <if variable="genre"> - <text variable="genre" text-case="capitalize-first"/> - </if> - <else-if variable="medium"> - <text variable="medium" text-case="capitalize-first"/> - </else-if> - <else> - <!-- TODO: Replace with term="review" --> - <!-- TODO: Handle review vs review-of depending on presence of reviewed-title --> - <!-- TODO: Add reviewed-genre --> - <text value="Review of"/> - </else> - </choose> - </if> - <else> - <choose> - <if variable="medium"> - <text variable="medium" text-case="capitalize-first"/> - </if> - <else> - <!-- TODO: Replace with term="review" --> - <!-- TODO: Handle review vs review-of depending on presence of reviewed-title --> - <!-- TODO: Add reviewed-genre --> - <text value="Review of"/> - </else> - </choose> - </else> - </choose> - <text macro="reviewed-title"/> - </group> - <names variable="reviewed-author"> - <label form="verb-short" suffix=" "/> - <name and="symbol" initialize-with=". " delimiter=", "/> - </names> - </group> - <choose> - <if variable="genre" match="any"> - <choose> - <if variable="number" match="none"> - <text variable="medium" text-case="capitalize-first"/> - </if> - </choose> - </if> - </choose> - </group> + <if variable="reviewed-author reviewed-genre reviewed-title" type="review review-book" match="any"> + <text macro="reviewed-item"/> </if> <else-if type="thesis"> <!-- Thesis type and institution --> @@ -814,22 +915,35 @@ <choose> <if variable="genre"> <text variable="genre" text-case="capitalize-first"/> - <!-- TODO: Replace prefix with performer label --> - <names variable="author" prefix="recorded by "> - <name and="symbol" initialize-with=". " delimiter=", "/> - </names> + <group delimiter=" "> + <text term="performer" form="verb"/> + <names variable="author"> + <name and="symbol" initialize-with=". " delimiter=", "/> + <substitute> + <names variable="performer"/> + </substitute> + </names> + </group> </if> <else-if variable="medium"> <text variable="medium" text-case="capitalize-first"/> - <!-- TODO: Replace prefix with performer label --> - <names variable="author" prefix="recorded by "> - <name and="symbol" initialize-with=". " delimiter=", "/> - </names> + <group delimiter=" "> + <text term="performer" form="verb"/> + <names variable="author"> + <name and="symbol" initialize-with=". " delimiter=", "/> + <substitute> + <names variable="performer"/> + </substitute> + </names> + </group> </else-if> <else> - <!-- TODO: Replace prefix with performer label --> - <names variable="author" prefix="Recorded by "> + <text term="performer" form="verb" text-case="capitalize-first"/> + <names variable="author"> <name and="symbol" initialize-with=". " delimiter=", "/> + <substitute> + <names variable="performer"/> + </substitute> </names> </else> </choose> @@ -840,15 +954,23 @@ <choose> <if variable="medium"> <text variable="medium" text-case="capitalize-first"/> - <!-- TODO: Replace prefix with performer label --> - <names variable="author" prefix="recorded by "> - <name and="symbol" initialize-with=". " delimiter=", "/> - </names> + <group delimiter=" "> + <text term="performer" form="verb"/> + <names variable="author"> + <name and="symbol" initialize-with=". " delimiter=", "/> + <substitute> + <names variable="performer"/> + </substitute> + </names> + </group> </if> <else> - <!-- TODO: Replace prefix with performer label --> - <names variable="author" prefix="Recorded by "> + <text term="performer" form="verb" text-case="capitalize-first"/> + <names variable="author"> <name and="symbol" initialize-with=". " delimiter=", "/> + <substitute> + <names variable="performer"/> + </substitute> </names> </else> </choose> @@ -871,16 +993,17 @@ <text macro="format"/> </else-if> <else> - <!-- For conference presentations, chapters in reports, software, place bracketed after the container title --> + <!-- For conference presentations/performances/events, chapters in reports/standards/generic documents, software, + place bracketed after the container title --> <choose> - <if type="paper-conference speech" match="any"> + <if type="event paper-conference performance speech" match="any"> <choose> - <if variable="collection-editor editor editorial-director issue page volume" match="any"> + <if variable="collection-editor compiler editor editorial-director issue page volume" match="any"> <text macro="format"/> </if> </choose> </if> - <else-if type="report software" match="none"> + <else-if type="document report software standard" match="none"> <text macro="format"/> </else-if> </choose> @@ -889,10 +1012,9 @@ </group> </macro> <macro name="bracketed-intext"> - <!-- TODO: Add new item types --> <group prefix="[" suffix="]"> <choose> - <if variable="reviewed-author reviewed-title" type="review review-book" match="any"> + <if variable="reviewed-title" match="any"> <group delimiter=" "> <text term="review-of" text-case="capitalize-first"/> <text macro="reviewed-title-intext"/> @@ -937,14 +1059,80 @@ </choose> </group> </macro> + <macro name="reviewed-item"> + <!-- Reviewed item --> + <group delimiter="; "> + <group delimiter=", "> + <group delimiter=" "> + <choose> + <if variable="reviewed-genre"> + <group delimiter=" "> + <text term="review-of" form="long" text-case="capitalize-first"/> + <text variable="reviewed-genre" text-case="lowercase"/> + </group> + </if> + <!-- If no `reviewed-genre`, assume that `genre` or `medium` is entered as 'Review of the book' or similar --> + <else-if variable="number" match="none"> + <choose> + <if variable="genre"> + <text variable="genre" text-case="capitalize-first"/> + </if> + <else-if variable="medium"> + <text variable="medium" text-case="capitalize-first"/> + </else-if> + <else-if type="review-book"> + <group delimiter=" "> + <text term="review-of" form="long" text-case="capitalize-first"/> + <text term="book" form="long" text-case="lowercase"/> + </group> + </else-if> + <else> + <text term="review-of" form="short" text-case="capitalize-first"/> + </else> + </choose> + </else-if> + <else> + <choose> + <if variable="medium"> + <text variable="medium" text-case="capitalize-first"/> + </if> + <else-if type="review-book"> + <group delimiter=" "> + <text term="review-of" form="long" text-case="capitalize-first"/> + <text term="book" form="long" text-case="lowercase"/> + </group> + </else-if> + <else> + <text term="review-of" form="short" text-case="capitalize-first"/> + </else> + </choose> + </else> + </choose> + <text macro="reviewed-title"/> + </group> + <names variable="reviewed-author"> + <label form="verb-short" suffix=" "/> + <name and="symbol" initialize-with=". " delimiter=", "/> + </names> + </group> + <choose> + <if variable="genre" match="any"> + <choose> + <if variable="number" match="none"> + <text variable="medium" text-case="capitalize-first"/> + </if> + </choose> + </if> + </choose> + </group> + </macro> <macro name="bracketed-container"> - <!-- TODO: Add new item types --> <group prefix="[" suffix="]"> <choose> - <if type="paper-conference speech" match="any"> + <if type="event paper-conference performance speech" match="any"> <!-- Conference presentations should describe the session [container] in bracketed unless published in a proceedings --> <choose> - <if variable="collection-editor editor editorial-director issue page volume" match="none"> + <if variable="collection-editor compiler editor editorial-director issue page volume" match="none"> <text macro="format"/> </if> </choose> @@ -953,23 +1141,21 @@ <!-- For entries in mobile app reference works, place bracketed after the container-title --> <text macro="format"/> </else-if> - <else-if type="report"> - <!-- For chapters in reports, place bracketed after the container title --> + <else-if type="document report standard"> + <!-- For chapters in report, standards, and generic documents, place bracketed after the container title --> <text macro="format"/> </else-if> </choose> </group> </macro> <macro name="secondary-contributors"> - <!-- TODO: Add new item types --> - <!-- TODO: Add new creator roles --> <choose> - <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any"> + <if type="article-journal article-magazine article-newspaper periodical post-weblog review review-book" match="any"> <text macro="secondary-contributors-periodical"/> </if> <else-if type="paper-conference"> <choose> - <if variable="collection-editor editor editorial-director" match="any"> + <if variable="collection-editor compiler editor editorial-director" match="any"> <text macro="secondary-contributors-booklike"/> </if> <else> @@ -992,14 +1178,13 @@ </names> </if> </choose> - <names variable="translator" delimiter="; "> + <names variable="translator narrator" delimiter="; "> <name and="symbol" initialize-with=". " delimiter=", "/> <label form="short" prefix=", " text-case="title"/> </names> </group> </macro> <macro name="secondary-contributors-booklike"> - <!-- TODO: Add new item types --> <group delimiter="; "> <choose> <if variable="title"> @@ -1009,24 +1194,44 @@ </names> </if> </choose> - <!-- TODO: When editortranslator becomes available, add a test: variable="editortranslator" match="none"; then print translator --> <choose> <if type="post webpage" match="none"> <!-- Webpages treat container-title like publisher --> - <choose> - <if variable="container-title" match="none"> - <group delimiter="; "> - <names variable="container-author"> - <label form="verb-short" suffix=" " text-case="title"/> - <name and="symbol" initialize-with=". " delimiter=", "/> - </names> - <names variable="editor translator" delimiter="; "> - <name and="symbol" initialize-with=". " delimiter=", "/> - <label form="short" prefix=", " text-case="title"/> - </names> - </group> - </if> - </choose> + <group delimiter="; "> + <names variable="illustrator narrator" delimiter="; "> + <name and="symbol" initialize-with=". " delimiter=", "/> + <label form="short" prefix=", " text-case="title"/> + </names> + <choose> + <if variable="container-title" match="none"> + <group delimiter="; "> + <names variable="container-author"> + <label form="verb-short" suffix=" " text-case="title"/> + <name and="symbol" initialize-with=". " delimiter=", "/> + </names> + <names variable="editor translator" delimiter="; "> + <name and="symbol" initialize-with=". " delimiter=", "/> + <label form="short" prefix=", " text-case="title"/> + </names> + <names variable="compiler chair organizer curator series-creator executive-producer" delimiter="; "> + <name and="symbol" initialize-with=". " delimiter=", "/> + <label form="long" prefix=", " text-case="title"/> + </names> + </group> + </if> + <else> + <choose> + <!-- TODO: Check logic once processors start to automatically populate editor-translator. --> + <if variable="editor-translator" match="none"> + <names variable="translator" delimiter="; "> + <name and="symbol" initialize-with=". " delimiter=", "/> + <label form="short" prefix=", " text-case="title"/> + </names> + </if> + </choose> + </else> + </choose> + </group> </if> <else> <group delimiter="; "> @@ -1038,6 +1243,14 @@ <name and="symbol" initialize-with=". " delimiter=", "/> <label form="short" prefix=", " text-case="title"/> </names> + <names variable="illustrator narrator" delimiter="; "> + <name and="symbol" initialize-with=". " delimiter=", "/> + <label form="short" prefix=", " text-case="title"/> + </names> + <names variable="compiler chair organizer curator series-creator executive-producer" delimiter="; "> + <name and="symbol" initialize-with=". " delimiter=", "/> + <label form="long" prefix=", " text-case="title"/> + </names> </group> </else> </choose> @@ -1047,13 +1260,11 @@ <choose> <if variable="archive-place" match="none"> <!-- With `archive-place`: physical archives. Without: online archives. --> - <!-- TODO: Add archive_collection --> <text variable="archive_location"/> </if> </choose> </macro> <macro name="number"> - <!-- TODO: Add new item types --> <choose> <if variable="number"> <group delimiter=", "> @@ -1079,12 +1290,11 @@ </choose> </macro> <macro name="locators-booklike"> - <!-- TODO: Add new item types --> <choose> - <if type="article-journal article-magazine article-newspaper broadcast interview patent post post-weblog review review-book speech webpage" match="any"/> + <if type="article-journal article-magazine article-newspaper broadcast event interview patent performance periodical post post-weblog review review-book speech webpage" match="any"/> <else-if type="paper-conference"> <choose> - <if variable="collection-editor editor editorial-director" match="any"> + <if variable="collection-editor compiler editor editorial-director" match="any"> <group delimiter=", "> <text macro="version"/> <text macro="edition"/> @@ -1103,17 +1313,10 @@ </choose> </macro> <macro name="version"> - <choose> - <if is-numeric="version"> - <group delimiter=" "> - <label variable="version" text-case="capitalize-first"/> - <text variable="version"/> - </group> - </if> - <else> - <text variable="version"/> - </else> - </choose> + <group delimiter=" "> + <label variable="version" text-case="capitalize-first"/> + <text variable="version"/> + </group> </macro> <macro name="edition"> <choose> @@ -1129,23 +1332,26 @@ </choose> </macro> <macro name="volume-booklike"> - <!-- TODO: Add new item types --> <group delimiter=", "> <!-- Report series [ex. 52] --> <choose> - <if type="report"> + <if type="document report standard"> <group delimiter=" "> <text variable="collection-title" text-case="title"/> <text variable="collection-number"/> </group> </if> </choose> + <group delimiter=" "> + <label variable="supplement-number" text-case="capitalize-first"/> + <text variable="supplement-number"/> + </group> <choose> <if variable="volume" match="any"> - <!-- TODO: Update using volume-title --> <choose> <!-- Non-numeric volumes are already printed as part of the book title --> - <if is-numeric="volume" match="none"/> + <if variable="volume-title"/> + <else-if is-numeric="volume" match="none"/> <else> <group delimiter=" "> <label variable="volume" form="short" text-case="capitalize-first"/> @@ -1176,7 +1382,8 @@ <choose> <if variable="reviewed-title"> <!-- Not possible to distinguish TV series episode from other reviewed - works [Ex. 69] --> + works without reviewed-container-title [Ex. 69] --> + <!-- Adapt for reviewed-container-title if that becomes available --> <text variable="reviewed-title" font-style="italic"/> </if> <else> @@ -1188,7 +1395,9 @@ <macro name="reviewed-title-intext"> <choose> <if variable="reviewed-title"> - <!-- Not possible to distinguish TV series episode from other reviewed works [Ex. 69] --> + <!-- Not possible to distinguish TV series episode from other reviewed + works without reviewed-container-title [Ex. 69] --> + <!-- Adapt for reviewed-container-title if that becomes available --> <text variable="reviewed-title" form="short" font-style="italic" text-case="title"/> </if> <else> @@ -1198,7 +1407,6 @@ </choose> </macro> <macro name="format"> - <!-- TODO: Add new item types --> <choose> <if variable="genre medium" match="any"> <group delimiter="; "> @@ -1210,31 +1418,12 @@ <text variable="medium" text-case="capitalize-first"/> </group> </if> - <!-- Generic labels for specific types --> - <!-- TODO: Add terms for other types? --> - <else-if type="dataset"> - <text term="dataset"/> - </else-if> - <else-if type="software"> - <text term="software" text-case="capitalize-first"/> - </else-if> - <else-if type="interview personal_communication" match="any"> - <choose> - <if variable="archive container-title DOI publisher URL" match="none"> - <text term="personal-communication" text-case="capitalize-first"/> - </if> - <else-if type="interview"> - <text term="interview" text-case="capitalize-first"/> - </else-if> - </choose> - </else-if> - <else-if type="map"> - <text term="map" text-case="capitalize-first"/> - </else-if> + <else> + <text macro="generic-type-label"/> + </else> </choose> </macro> <macro name="format-intext"> - <!-- TODO: Add new item types --> <choose> <if variable="genre" match="any"> <text variable="genre" text-case="capitalize-first"/> @@ -1242,11 +1431,17 @@ <else-if variable="medium"> <text variable="medium" text-case="capitalize-first"/> </else-if> - <!-- Generic labels for specific types --> - <!-- TODO: Add terms for other types? --> - <else-if type="dataset"> - <text term="dataset"/> - </else-if> + <else> + <text macro="generic-type-label"/> + </else> + </choose> + </macro> + <macro name="generic-type-label"> + <!-- Generic labels for specific types --> + <choose> + <if type="dataset"> + <text term="dataset" text-case="capitalize-first"/> + </if> <else-if type="software"> <text term="software" text-case="capitalize-first"/> </else-if> @@ -1261,21 +1456,47 @@ </choose> </else-if> <else-if type="map"> - <text term="map"/> + <text term="map" text-case="capitalize-first"/> + </else-if> + <else-if type="collection"> + <text term="collection" text-case="capitalize-first"/> + </else-if> + <else-if type="song"> + <text term="song" text-case="capitalize-first"/> + </else-if> + <else-if type="motion_picture"> + <text term="motion_picture" text-case="capitalize-first"/> + </else-if> + <else-if type="post"> + <text term="post" text-case="capitalize-first"/> + </else-if> + <else-if type="review"> + <text term="review" text-case="capitalize-first"/> + </else-if> + <else-if type="review-book"> + <text term="review-book" text-case="capitalize-first"/> + </else-if> + <else-if type="broadcast"> + <text term="broadcast" text-case="capitalize-first"/> + </else-if> + <else-if type="figure"> + <text term="figure" text-case="capitalize-first"/> + </else-if> + <else-if type="graphic"> + <text term="graphic" text-case="capitalize-first"/> </else-if> </choose> </macro> <!-- APA 'source' element contains four parts: container, event, publisher, access --> <macro name="container"> - <!-- TODO: Add new item types --> <choose> - <if type="article-journal article-magazine article-newspaper post-weblog review review-book" match="any"> + <if type="article-journal article-magazine article-newspaper periodical post-weblog review review-book" match="any"> <!-- Periodical items --> <text macro="container-periodical"/> </if> <else-if type="paper-conference"> - <!-- Determine if paper-conference is a periodical or booklike --> + <!-- Determine if paper-conference is a periodical- or book-like --> <choose> <if variable="editor editorial-director collection-editor container-author" match="any"> <text macro="container-booklike"/> @@ -1309,7 +1530,6 @@ <choose> <if variable="number"> <!-- Ex. 6: Journal article with article number or eLocator --> - <!-- This should be localized --> <group delimiter=" "> <text term="article-locator" text-case="capitalize-first"/> <text variable="number"/> @@ -1323,8 +1543,8 @@ <choose> <if variable="issued"> <choose> - <if variable="issue page volume" match="none"> - <!-- TODO: Should I print status as-is, or should I print the in-press term? --> + <if variable="issue number page volume" match="none"> + <!-- We print the status variable directly rather than using in-press, etc. terms. --> <text variable="status" text-case="capitalize-first"/> </if> </choose> @@ -1333,33 +1553,56 @@ </group> </macro> <macro name="container-booklike"> - <!-- TODO: Add new item types --> <choose> <if variable="container-title" match="any"> <group delimiter=" "> - <text term="in" text-case="capitalize-first"/> + <choose> + <if type="song"> + <text term="on" text-case="capitalize-first"/> + </if> + <else> + <text term="in" text-case="capitalize-first"/> + </else> + </choose> <group delimiter=", "> - <names variable="editor translator" delimiter=", & "> - <!-- TODO: Change to editortranslator and move editor to substitute --> + <names variable="executive-producer"> <name and="symbol" initialize-with=". " delimiter=", "/> - <label form="short" text-case="title" prefix=" (" suffix=")"/> + <label form="long" text-case="title" prefix=" (" suffix=")"/> <substitute> - <names variable="editorial-director"/> - <names variable="collection-editor"/> + <names variable="series-creator"/> + <names variable="editor-translator"> + <name and="symbol" initialize-with=". " delimiter=", "/> + <label form="short" text-case="title" prefix=" (" suffix=")"/> + </names> + <!-- TODO: Translator omitted here on the assumption that editor-translators are uncommon + for chapter citations. If needed, direct entry or automatic population of + `editor-translator` can produce combined labels. --> + <names variable="editor"> + <name and="symbol" initialize-with=". " delimiter=", "/> + <label form="short" text-case="title" prefix=" (" suffix=")"/> + </names> + <names variable="editorial-director"> + <name and="symbol" initialize-with=". " delimiter=", "/> + <label form="short" text-case="title" prefix=" (" suffix=")"/> + </names> + <names variable="compiler"/> + <choose> + <if type="event performance speech" match="any"> + <names variable="chair"/> + <names variable="organizer"/> + </if> + </choose> + <names variable="curator"/> + <names variable="collection-editor"> + <name and="symbol" initialize-with=". " delimiter=", "/> + <label form="short" text-case="title" prefix=" (" suffix=")"/> + </names> <names variable="container-author"/> </substitute> </names> <group delimiter=": " font-style="italic"> <text variable="container-title"/> - <!-- TODO: Replace with volume-title --> - <choose> - <if is-numeric="volume" match="none"> - <group delimiter=" "> - <label variable="volume" form="short" text-case="capitalize-first"/> - <text variable="volume"/> - </group> - </if> - </choose> + <text macro="volume-title"/> </group> </group> <text macro="parenthetical-container"/> @@ -1369,7 +1612,6 @@ </choose> </macro> <macro name="publisher"> - <!-- TODO: Add new item types --> <group delimiter="; "> <choose> <if type="thesis"> @@ -1389,12 +1631,12 @@ <else-if type="paper-conference"> <!-- For paper-conference, don't print publisher if in a journal-like proceedings --> <choose> - <if variable="collection-editor editor editorial-director" match="any"> + <if variable="collection-editor compiler editor editorial-director" match="any"> <text variable="publisher"/> </if> </choose> </else-if> - <else-if type="article-journal article-magazine article-newspaper post-weblog" match="none"> + <else-if type="article-journal article-magazine article-newspaper periodical post-weblog review review-book" match="none"> <text variable="publisher"/> </else-if> </choose> @@ -1404,16 +1646,32 @@ <!-- With `archive-place`: physical archives. Without: online archives. --> <!-- For physical archives, print the location before the archive name. For electronic archives, these are printed in macro="description". --> - <!-- TODO: Split "archive_location" into "archive_collection" and "archive_location" --> <!-- Must test for archive_collection: With collection: archive_collection (archive_location), archive, archive-place No collection: archive (archive_location), archive-place --> - <text variable="archive_location"/> + <choose> + <if variable="archive_collection"> + <group delimiter=" "> + <text variable="archive_collection"/> + <text variable="archive_location" prefix="(" suffix=")"/> + </group> + <text variable="archive"/> + <text variable="archive-place"/> + </if> + <else> + <group delimiter=" "> + <text variable="archive"/> + <text variable="archive_location" prefix="(" suffix=")"/> + </group> + <text variable="archive-place"/> + </else> + </choose> </if> + <else> + <text variable="archive"/> + </else> </choose> - <text variable="archive"/> - <text variable="archive-place"/> </group> </group> </macro> @@ -1439,19 +1697,30 @@ </choose> </macro> <macro name="event"> - <!-- TODO: Add new item types (e.g., event, collection, performance) --> <choose> <if variable="event event-title" match="any"> <!-- To prevent Zotero from printing event-place due to its double-mapping of all 'place' to both publisher-place and event-place. Remove this 'choose' when that is changed. --> <choose> - <if variable="collection-editor editor editorial-director issue page volume" match="none"> - <!-- Don't print event info if published in a proceedings --> + <if type="paper-conference"> + <choose> + <if variable="collection-editor compiler editor editorial-director issue page volume" match="none"> + <!-- Don't print event info for conference papers published in a proceedings --> + <group delimiter=", "> + <text macro="event-title"/> + <text variable="event-place"/> + </group> + </if> + </choose> + </if> + <else> + <!-- For other item types, print event info even if published (e.g., for collection catalogs, performance programs. + These items aren't given explicit examples in the APA manual, so err on the side of providing too much information. --> <group delimiter=", "> <text macro="event-title"/> <text variable="event-place"/> </group> - </if> + </else> </choose> </if> </choose> @@ -1472,19 +1741,30 @@ </macro> <!-- After 'source', APA also prints publication history (original publication, reprint info, retraction info) --> <macro name="publication-history"> - <!-- TODO: Add new item types --> <choose> - <if type="patent" match="none"> - <group prefix="(" suffix=")"> + <if type="patent"> + <text variable="references" prefix="(" suffix=")"/> + </if> + <else> + <group delimiter="; " prefix="(" suffix=")"> + <!-- Print `status` here for things like "retracted" if it's not printed elsewhere already. --> + <choose> + <if variable="issued"> + <choose> + <if variable="issue number page volume" match="any"> + <text variable="status" text-case="capitalize-first"/> + </if> + </choose> + </if> + </choose> <choose> <if variable="references"> <!-- This provides the option for more elaborate description - of publication history, such as full "reprinted" references - (examples 11, 43, 44) or retracted references --> + of publication history, such as full "reprinted" references + (examples 11, 43, 44) --> <text variable="references"/> </if> <else> - <!-- TODO: Replace these with terms --> <group delimiter=" "> <text term="original-work-published" text-case="capitalize-first"/> <choose> @@ -1499,9 +1779,6 @@ </else> </choose> </group> - </if> - <else> - <text variable="references" prefix="(" suffix=")"/> </else> </choose> </macro> @@ -1510,24 +1787,24 @@ <!-- `treaty`: for treaties --> <!-- `legal_case`: for all legal and court cases --> <!-- `bill`: for bills, resolutions, federal reports --> - <!-- `hearing`: TODO for hearings and testimony --> + <!-- `hearing`: for hearings and testimony --> <!-- `legislation`: for statutes, constitutional items, and charters --> - <!-- `regulation`: TODO codified regulations, uncodified regulations, executive orders --> + <!-- `regulation`: codified regulations, uncodified regulations, executive orders --> <group delimiter=" "> <choose> <if type="treaty"> <group delimiter=", " suffix="."> <!-- APA generally defers to Bluebook for legal citations, but diverges without - explanation for treaty items. We follow the Bluebook format that was used + explanation for treaty items. We follow the Bluebook format that was used in APA 6th ed. --> - <!-- APA manual omits treaty parties/authors, but per Bluebook + <!-- APA manual omits treaty parties/authors, but per Bluebook they should be included at least for bilateral treaties. --> <names variable="author"> <name initialize-with="." form="short" delimiter="-"/> </names> <text macro="date-legal"/> - <!-- APA manual omits treaty source/report called for by Bluebook in favor of just URL. - Both are included here, following the APA style used for all other item types + <!-- APA manual omits treaty source/report called for by Bluebook in favor of just URL. + Both are included here, following the APA style used for all other item types to end the reference with a period, then give the URL afterward. --> <text macro="container-legal"/> </group> @@ -1553,7 +1830,7 @@ <text variable="title" text-case="title"/> </if> <else-if type="hearing"> - <!-- APA uses a comma delimiter and omits "hearing before the" for hearings with testimony, + <!-- APA uses a comma delimiter and omits "hearing before the" for hearings with testimony, but follows Bluebook rules (colon delimiter, prefix before the committee name) for references to the whole hearing. We simply follow the Bluebook rules for both, but use APA style capitalization (not capitalizing "Before" or the title of the hearing). --> @@ -1609,14 +1886,14 @@ </group> <choose> <if variable="issued"> - <!-- APA manual includes "rev." before the revision year, + <!-- APA manual includes "rev." before the revision year, but this isn't part of the Bluebook rules. --> <date variable="issued"> <date-part name="year"/> </date> </if> <else> - <!-- Show proposal date for uncodified regualtions. + <!-- Show proposal date for uncodified regualtions. Assume date is entered literally ala "proposed May 23, 2016". TODO: Add 'proposed' term here if that becomes available --> <date variable="submitted" form="text"/> @@ -1682,10 +1959,10 @@ <text variable="genre"/> <group delimiter=" "> <choose> - <!-- TODO: What was the logic for this? Do we still need this? --> - <!-- If there is no session number or code/record title, print number. - Is that trying to capture congressional reports/documents? --> + <!-- If there is no session number or code/record title, assume + assume the item is a congressional report and include 'No.' term. --> <if variable="chapter-number container-title" match="none"> + <!-- The item is a congressional report, rather than a bill or resultion. --> <label variable="number" form="short" text-case="capitalize-first"/> </if> </choose> @@ -1789,14 +2066,14 @@ </choose> </macro> <macro name="citation-locator"> - <!-- TODO: Add new locator types? --> + <!-- Abbreviate page and paragraph, leave other locator labels in long form, cf. Rule 8.13 --> <group delimiter=" "> <choose> - <if locator="chapter"> - <label variable="locator" text-case="capitalize-first"/> + <if locator="page paragraph" match="any"> + <label variable="locator" form="short"/> </if> <else> - <label variable="locator" form="short"/> + <label variable="locator" text-case="capitalize-first"/> </else> </choose> <text variable="locator"/> @@ -1827,17 +2104,9 @@ </sort> <layout> <choose> - <!-- TODO: Add new item types --> <if type="bill hearing legal_case legislation regulation treaty" match="any"> <!-- Legal items have different orders and delimiters --> - <choose> - <if variable="DOI URL" match="any"> - <text macro="legal-cites"/> - </if> - <else> - <text macro="legal-cites" suffix="."/> - </else> - </choose> + <text macro="legal-cites"/> </if> <else> <group delimiter=" "> diff --git a/Master/texmf-dist/tex/latex/citation-style-language/styles/ieee.csl b/Master/texmf-dist/tex/latex/citation-style-language/styles/ieee.csl index 9ac71c63eaf..98b666b83e9 100644 --- a/Master/texmf-dist/tex/latex/citation-style-language/styles/ieee.csl +++ b/Master/texmf-dist/tex/latex/citation-style-language/styles/ieee.csl @@ -44,8 +44,8 @@ <category citation-format="numeric"/> <category field="engineering"/> <category field="generic-base"/> - <summary>IEEE style as per the 2021 guidelines, V 01.29.2021.</summary> - <updated>2024-01-11T14:39:58-05:00</updated> + <summary>IEEE style as per the 2023 guidelines, V 11.29.2023.</summary> + <updated>2024-07-15T10:30:07-04:00</updated> <rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights> </info> <locale xml:lang="en"> @@ -56,6 +56,7 @@ </date> <terms> <term name="chapter" form="short">ch.</term> + <term name="chapter-number" form="short">ch.</term> <term name="presented at">presented at the</term> <term name="available at">available</term> </terms> @@ -120,6 +121,7 @@ <substitute> <names variable="editor"/> <names variable="translator"/> + <text macro="director"/> </substitute> </names> </macro> @@ -129,6 +131,12 @@ <label form="short" prefix=", " text-case="capitalize-first"/> </names> </macro> + <macro name="director"> + <names variable="director"> + <name and="text" et-al-min="7" et-al-use-first="1" initialize-with=". "/> + <et-al font-style="italic"/> + </names> + </macro> <macro name="locators"> <group delimiter=", "> <text macro="edition"/> @@ -148,7 +156,7 @@ </macro> <macro name="title"> <choose> - <if type="bill book graphic legal_case legislation motion_picture song" match="any"> + <if type="bill book graphic legal_case legislation motion_picture song standard software" match="any"> <text variable="title" font-style="italic"/> </if> <else> @@ -374,6 +382,10 @@ <text macro="collection"/> <text macro="publisher"/> <text macro="issued"/> + <group delimiter=" "> + <label variable="chapter-number" form="short"/> + <text variable="chapter-number"/> + </group> <text macro="page"/> </group> <text macro="access"/> @@ -399,6 +411,26 @@ </group> <text macro="access"/> </else-if> + <else-if type="software"> + <group delimiter=". " suffix="."> + <text macro="title"/> + <text macro="issued" prefix="(" suffix=")"/> + <text variable="genre"/> + <text macro="publisher"/> + </group> + <text macro="access"/> + </else-if> + <else-if type="article"> + <group delimiter=", " suffix="."> + <text macro="title"/> + <text macro="issued"/> + <group delimiter=": "> + <text macro="publisher" font-style="italic"/> + <text variable="number"/> + </group> + </group> + <text macro="access"/> + </else-if> <else-if type="webpage post-weblog post" match="any"> <group delimiter=", " suffix="."> <text macro="title"/> @@ -423,6 +455,18 @@ </group> <text macro="access"/> </else-if> + <else-if type="standard"> + <group delimiter=", " suffix="."> + <text macro="title"/> + <group delimiter=" "> + <text variable="genre"/> + <text variable="number"/> + </group> + <text macro="geographic-location"/> + <text macro="issued"/> + </group> + <text macro="access"/> + </else-if> <!-- Generic/Fallback Formats --> <else-if type="bill book graphic legal_case legislation report song" match="any"> <group delimiter=", " suffix=". "> diff --git a/Master/texmf-dist/tex/latex/coloredtheorem/coloredtheorem.sty b/Master/texmf-dist/tex/latex/coloredtheorem/coloredtheorem.sty index 4e128bf80bb..c35850cc224 100644 --- a/Master/texmf-dist/tex/latex/coloredtheorem/coloredtheorem.sty +++ b/Master/texmf-dist/tex/latex/coloredtheorem/coloredtheorem.sty @@ -14,7 +14,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2020/06/01] \ProvidesPackage{coloredtheorem} - [2024/04/03 v1.0.2 - A colorful boxed theorem environment] + [2024/08/28 v1.0.3 - A colorful boxed theorem environment] \RequirePackage{tcolorbox} \tcbuselibrary{breakable} @@ -27,7 +27,7 @@ \expandafter\gdef\csname\tcbth list#1name\endcsname{List of #2s}% \expandafter\gdef\csname#1autorefname\endcsname{#2}% \AtEndPreamble{% - \ifdefined\crefname\expandafter\crefname\csname\tcbth#1\endcsname{#2}{#2s}\fi}% + \ifdefined\crefname\expandafter\crefname\expandafter{\tcbth#1}{#2}{#2s}\fi}% \expandafter\gdef\csname\tcbth listof#1s\endcsname {% \section*{\csname\tcbth list#1name\endcsname}% @@ -53,6 +53,9 @@ ~\csname the\tcbth#1\endcsname\fi}~~##2}, #3, ##3, ]% + \let\origpar=\par% + \def\par{\origpar\medskip}% + \ignorespaces% }{% \end{tcb<SOMETHING>} \end{tcolorbox}% \end{center}% diff --git a/Master/texmf-dist/tex/latex/csthm/csthm.sty b/Master/texmf-dist/tex/latex/csthm/csthm.sty new file mode 100644 index 00000000000..e12fbdc192e --- /dev/null +++ b/Master/texmf-dist/tex/latex/csthm/csthm.sty @@ -0,0 +1,146 @@ +%% +%% This is file `csthm.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% csthm.dtx (with options: `package') +%% +%% This is a generated file. +%% +%% Copyright (C) 2024 by Agni Datta <agnidatta.org@gmail.com> +%% +%% This file may be distributed and/or modified under the conditions of +%% the LaTeX Project Public License, either version 1.3c of this license +%% or (at your option) any later version. The latest version of this +%% license is in: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% and version 1.3c or later is part of all distributions of LaTeX +%% version 2008/05/04 or later. +%% +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesPackage{csthm} + [2024/08/31 v1.2 Theorem Environments for Computer Science] +\newif\if@csthm@loadcleveref +\DeclareOption{cleveref}{\@csthm@loadclevereftrue} +\ProcessOptions\relax + +\RequirePackage{amsmath} +\RequirePackage{amssymb} +\RequirePackage{amsthm} +\RequirePackage{enumitem} +\RequirePackage{thmtools} + +\if@csthm@loadcleveref +\AtBeginDocument{% +\@ifpackageloaded{hyperref}{% +\RequirePackage{cleveref} +}{% +\PackageWarning{csthm}{The 'cleveref' option was set, but 'hyperref' is not loaded. Skipping 'cleveref' loading.} +}% +} +\fi + +\declaretheoremstyle[ +spaceabove=\topsep, +spacebelow=\topsep, +headfont=\scshape, +notefont=\scshape, +bodyfont=\normalfont, +postheadspace=5pt, +numberwithin=section, +qed=$\scriptstyle\star$, +headpunct={.} +]{thmstyle} + +\declaretheoremstyle[ +spaceabove=\topsep, +spacebelow=\topsep, +headfont=\bfseries, +notefont=\bfseries, +bodyfont=\normalfont, +postheadspace=5pt, +numberwithin=section, +qed=$\scriptstyle\maltese$, +headpunct={.} +]{defstyle} + +\declaretheoremstyle[ +spaceabove=\topsep, +spacebelow=\topsep, +headfont=\itshape, +notefont=\itshape, +bodyfont=\normalfont, +postheadspace=5pt, +numberwithin=section, +qed=$\scriptstyle\maltese$, +headpunct={.} +]{remarkstyle} + +\declaretheoremstyle[ +spaceabove=\topsep, +spacebelow=\topsep, +headfont=\sffamily\scshape, +notefont=\sffamily\scshape, +bodyfont=\normalfont\sffamily, +postheadspace=5pt, +numberwithin=section, +qed=$\scriptstyle\maltese$, +headpunct={.} +]{hltstyle} + +\declaretheorem[style=thmstyle,name=Theorem]{theorem} +\declaretheorem[style=defstyle,sibling=theorem]{fact} +\declaretheorem[style=thmstyle,sibling=theorem]{assumption} +\declaretheorem[style=thmstyle,sibling=theorem]{claim} +\declaretheorem[style=thmstyle,sibling=theorem]{conjecture} +\declaretheorem[style=thmstyle,sibling=theorem]{corollary} +\declaretheorem[style=thmstyle,sibling=theorem]{lemma} +\declaretheorem[style=thmstyle,sibling=theorem]{property} +\declaretheorem[style=thmstyle,sibling=theorem]{proposition} + +\declaretheorem[style=defstyle,sibling=theorem]{definition} +\declaretheorem[style=defstyle,sibling=theorem]{example} +\declaretheorem[style=defstyle,sibling=theorem]{exercise} +\declaretheorem[style=defstyle,sibling=theorem]{problem} +\declaretheorem[style=defstyle,sibling=theorem]{question} + +\declaretheorem[style=remarkstyle,sibling=theorem]{note} +\declaretheorem[style=remarkstyle,sibling=theorem]{remark} +\declaretheorem[style=remarkstyle,sibling=theorem]{solution} + +\declaretheorem[style=hltstyle,name=Important]{important} +\declaretheorem[style=hltstyle]{highlight} +\declaretheorem[style=hltstyle]{keypoint} + +\newlist{caseList}{enumerate}{1} +\setlist[caseList]{label=\textbf{Case~\arabic*:},leftmargin=*} + +\NewDocumentEnvironment{case}{O{}}{% +\begin{caseList}[#1]% +}{% +\end{caseList}% +} + +\newlist{axiomList}{enumerate}{1} +\setlist[axiomList]{label=\textbf{Axiom~\Alph*:}, leftmargin=*} + +\NewDocumentEnvironment{axiom}{O{}}{% +\begin{axiomList}[#1]% +}{% +\end{axiomList}% +} + +\renewcommand\qedsymbol{$\scriptstyle\blacksquare$} + +\providecommand{\accentcolor}{black} + +\providecommand{\csthmpkg}{\textsf{csthm}} +\providecommand{\email}[1]{\href{mailto:#1}{\texttt{#1}}} + +\newcommand{\setaccentcolor}[1]{\renewcommand{\accentcolor}{#1}} +\endinput +%% +%% End of file `csthm.sty'. diff --git a/Master/texmf-dist/tex/latex/customenvs/customenvs.sty b/Master/texmf-dist/tex/latex/customenvs/customenvs.sty index af81d0b88dd..ee87f340d2d 100644 --- a/Master/texmf-dist/tex/latex/customenvs/customenvs.sty +++ b/Master/texmf-dist/tex/latex/customenvs/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/07/13 0.1.8 Custom classic environments] +\ProvidesPackage{customenvs}[2024/09/01 0.2.1 Custom classic environments] %====HISTORIQUE +% v 0.2.1 Modification mineure de la gestion des étoiles tikz (baseline) + grille auto tikzpicture +% v 0.2.0 Ajout d'étoiles pour les difficultés d'exercices (2 versions) +% v 0.1.9 tkzBanner + tkzBannerTri + includegraphicsfill % v 0.1.8 Nutriscore % v 0.1.7 Style perso pour les vignettes % v 0.1.6 DisplaySkip patch + Patchs pas-tableur @@ -677,7 +680,155 @@ } %====EXERCICE PERSO +\newlength{\largstarsempty} +\newlength{\largstarsmid} +\newlength{\largstarfull} +\newlength{\largmaxstars} + +%commande annexe tkzlevelstars [en] + [fr] +\usetikzlibrary{shapes.geometric} + +\newlength{\tmphauteuretoiles} +\newlength{\tmpprofondeuretoiles} +\newlength{\tmpoffsetetoiles}\setlength{\tmpoffsetetoiles}{0.25pt} + +\defKV[levelstars]{% + colframe=\def\tkzLevelStarsColor{#1}, + colback=\def\tkzLevelStarsColorBg{#1}, + offset=\setlength{\tmpoffsetetoiles}{#1}, + maxlevel=\def\tkzLevelStarsMaxLevel{#1} +} + +\setKVdefault[levelstars]{% + colframe=black, + colback=gray, + offset={0.025em}, + maxlevel=3, + valign=true +} + +\NewDocumentCommand{\tkzLevelStars}{ O{} m }{% + %lectures des clés + \restoreKV[levelstars]% + \setKV[levelstars]{#1}% + %dimensions + \settototalheight{\tmphauteuretoiles}{\hbox{azertyuiopqsdfghjklmwxcvbnAZERTYUIOPQSDFGHJKLMWXCVBN}}% + \setlength{\tmphauteuretoiles}{0.95\tmphauteuretoiles}% + \ifboolKV[levelstars]{valign}% + {% + \settodepth{\tmpprofondeuretoiles}{\hbox{azertyuiopqsdfghjklmwxcvbnAZERTYUIOPQSDFGHJKLMWXCVBN}}% + \begin{tikzpicture}[baseline={-1.25\tmpprofondeuretoiles},fill=\tkzLevelStarsColorBg,draw=\tkzLevelStarsColor,rounded corners={0.05\tmphauteuretoiles},line width={0.04\tmphauteuretoiles}] + }% + {% + \begin{tikzpicture}[fill=\tkzLevelStarsColorBg,draw=\tkzLevelStarsColor,rounded corners={0.05\tmphauteuretoiles},line width={0.04\tmphauteuretoiles}] + }% + \foreach \X in {1,...,\tkzLevelStarsMaxLevel}{% + \xdef\tmpxfill{\xintfloateval{min(1,max(1+#2-\X,0))}}% + %\pgfmathsetmacro{\tmpxfill}{min(1,max(1+#2-\X,0))} + \path ({\X*(\tmphauteuretoiles+\tmpoffsetetoiles)},0) node[star,draw,star point height={0.25\tmphauteuretoiles},minimum size={\tmphauteuretoiles},inner sep=0pt,path picture={\fill (path picture bounding box.south west) rectangle ([xshift=\tmpxfill*0.9515*\tmphauteuretoiles]path picture bounding box.north west);}]{}; + } + \end{tikzpicture}% +} + +\defKV[tkznivetoiles]{% + Couleur=\def\tkzLevelStarsColor{#1}, + CouleurFond=\def\tkzLevelStarsColorBg{#1}, + Offset=\setlength{\tmpoffsetetoiles}{#1}, + NiveauMax=\def\tkzLevelStarsMaxLevel{#1} +} + +\setKVdefault[tkznivetoiles]{% + Couleur=black, + CouleurFond=gray, + Offset={0.025em}, + NiveauMax=3, + AlignV=true +} + +\NewDocumentCommand{\tkzEtoiles}{ O{} m }{% + %lectures des clés + \restoreKV[tkznivetoiles]% + \setKV[tkznivetoiles]{#1}% + %dimensions + \settototalheight{\tmphauteuretoiles}{\hbox{azertyuiopqsdfghjklmwxcvbnAZERTYUIOPQSDFGHJKLMWXCVBN}}% + \setlength{\tmphauteuretoiles}{0.95\tmphauteuretoiles}% + \ifboolKV[tkznivetoiles]{AlignV}% + {% + \settodepth{\tmpprofondeuretoiles}{\hbox{azertyuiopqsdfghjklmwxcvbnAZERTYUIOPQSDFGHJKLMWXCVBN}}% + \begin{tikzpicture}[baseline={-1.25\tmpprofondeuretoiles},fill=\tkzLevelStarsColorBg,draw=\tkzLevelStarsColor,rounded corners={0.05\tmphauteuretoiles},line width={0.04\tmphauteuretoiles}] + }% + {% + \begin{tikzpicture}[fill=\tkzLevelStarsColorBg,draw=\tkzLevelStarsColor,rounded corners={0.05\tmphauteuretoiles},line width={0.04\tmphauteuretoiles}] + }% + \foreach \X in {1,...,\tkzLevelStarsMaxLevel}{% + \xdef\tmpxfill{\xintfloateval{min(1,max(1+#2-\X,0))}}% + %\pgfmathsetmacro{\tmpxfill}{min(1,max(1+#2-\X,0))} + \path ({\X*(\tmphauteuretoiles+\tmpoffsetetoiles)},0) node[star,draw,star point height={0.25\tmphauteuretoiles},minimum size={\tmphauteuretoiles},inner sep=0pt,path picture={\fill (path picture bounding box.south west) rectangle ([xshift=\tmpxfill*0.9515*\tmphauteuretoiles]path picture bounding box.north west);}]{}; + } + \end{tikzpicture}% +} + +%commande annexe ;-) +\NewDocumentCommand\NiveauDiffExos{ O{3} m }{%avec des demis ?? + %les tailles de boîtes + \settowidth{\largstarsempty}{{\faStar[regular]}}% + \settowidth{\largstarsmid}{{\faIcon{star-half-alt}}}% + \settowidth{\largstarfull}{{\faStar}}% + \pgfmathsetlength{\largmaxstars}{max(\largstarsempty,\largstarsmid,\largstarfull)}% + %les calculs intermédiaires + \xintifboolexpr{#1 < 0}{\xdef\tmpstarsmax{3}}{\xdef\tmpstarsmax{#1}}%on met à 3 si pas valide + \xintifboolexpr{#2 >= 0 'and' #2 <= \tmpstarsmax 'and' isint(2*#2) == 1}{\xdef\tmpstars{#2}}{\xdef\tmpstars{0}}%on met à zéro si pas valide + % + \xintifboolexpr{isint(\tmpstars) == 1}% + {% + \xdef\tmpstarsexosfull{\tmpstars}% + \xdef\tmpstarsexosmid{0}% + \xdef\tmpstarsexosempty{\xinteval{\tmpstarsmax-\tmpstars}}% + }% + {% + \xdef\tmpstarsexosmid{1}% + \xdef\tmpstarsexosfull{\xinteval{(\tmpstars-0.5)}}% + \xdef\tmpstarsexosempty{\xinteval{\tmpstarsmax-1-\tmpstarsexosfull}}% + }% + %affichage des full + \xintifboolexpr{\tmpstarsexosfull > 0}{\xintFor* ##1 in {\xintSeq{1}{\tmpstarsexosfull}}\do{\makebox[\largmaxstars][c]{\faStar}}}{}% + %affichage des mid + \xintifboolexpr{\tmpstarsexosmid > 0}{\xintFor* ##1 in {\xintSeq{1}{\tmpstarsexosmid}}\do{\makebox[\largmaxstars][c]{\faIcon{star-half-alt}}}}{}% + %affichage des vides + \xintifboolexpr{\tmpstarsexosempty > 0}{\xintFor* ##1 in {\xintSeq{1}{\tmpstarsexosempty}}\do{\makebox[\largmaxstars][c]{\faStar[regular]}}}{}% +} + +%commande annexe [en] ;-) +\NewDocumentCommand\DiffLevelStars{ O{3} m }{%avec des demis ?? + %les tailles de boîtes + \settowidth{\largstarsempty}{{\faStar[regular]}}% + \settowidth{\largstarsmid}{{\faIcon{star-half-alt}}}% + \settowidth{\largstarfull}{{\faStar}}% + \pgfmathsetlength{\largmaxstars}{max(\largstarsempty,\largstarsmid,\largstarfull)}% + %les calculs intermédiaires + \xintifboolexpr{#1 < 0}{\xdef\tmpstarsmax{3}}{\xdef\tmpstarsmax{#1}}%on met à 3 si pas valide + \xintifboolexpr{#2 >= 0 'and' #2 <= \tmpstarsmax 'and' isint(2*#2) == 1}{\xdef\tmpstars{#2}}{\xdef\tmpstars{0}}%on met à zéro si pas valide + % + \xintifboolexpr{isint(\tmpstars) == 1}% + {% + \xdef\tmpstarsexosfull{\tmpstars}% + \xdef\tmpstarsexosmid{0}% + \xdef\tmpstarsexosempty{\xinteval{\tmpstarsmax-\tmpstars}}% + }% + {% + \xdef\tmpstarsexosmid{1}% + \xdef\tmpstarsexosfull{\xinteval{(\tmpstars-0.5)}}% + \xdef\tmpstarsexosempty{\xinteval{\tmpstarsmax-1-\tmpstarsexosfull}}% + }% + %affichage des full + \xintifboolexpr{\tmpstarsexosfull > 0}{\xintFor* ##1 in {\xintSeq{1}{\tmpstarsexosfull}}\do{\makebox[\largmaxstars][c]{\faStar}}}{}% + %affichage des mid + \xintifboolexpr{\tmpstarsexosmid > 0}{\xintFor* ##1 in {\xintSeq{1}{\tmpstarsexosmid}}\do{\makebox[\largmaxstars][c]{\faIcon{star-half-alt}}}}{}% + %affichage des vides + \xintifboolexpr{\tmpstarsexosempty > 0}{\xintFor* ##1 in {\xintSeq{1}{\tmpstarsexosempty}}\do{\makebox[\largmaxstars][c]{\faStar[regular]}}}{}% +} +%code ppal \newcounter{numeroexo} \setcounter{numeroexo}{0} \newlength{\eptraitexo} @@ -688,6 +839,8 @@ \newlength{\tmp@image@profondeur} \colorlet{macouleurexo}{blue!50!black} +\colorlet{macouleurexodeco}{blue!50!black} +\colorlet{macouleurexodecofond}{blue!50!black} \newcommand\tmpstyleexo{\bfseries\LARGE\sffamily}% \newcommand\tmplabelexo{Exercice~}% @@ -695,15 +848,21 @@ \defKV[globalstyleexo]{% Libelle=\renewcommand\tmplabelexo{#1},% Couleur=\colorlet{macouleurexo}{#1},% + CouleurDeco=\colorlet{macouleurexodeco}{#1},% + CouleurFondDeco=\colorlet{macouleurexodecofond}{#1},% Police=\renewcommand\tmpstyleexo{#1},% - EpTrait=\setlength{\eptraitexo}{#1} + EpTrait=\setlength{\eptraitexo}{#1},% + EchelleEtoiles=\def\tmpscalestarsexos{#1} } \setKVdefault[globalstyleexo]{% Libelle={Exercice~},% Couleur={blue!50!black},% + CouleurDeco={blue!50!black},% + CouleurFondDeco={macouleurexodeco!50},% Police={\bfseries\LARGE\sffamily},% - EpTrait={1.1pt} + EpTrait={1.1pt},% + EchelleEtoiles=0.85 } \NewDocumentCommand\StyleEnvtExo{ O{} }{% @@ -718,20 +877,20 @@ Type=\def\EnvtExoType{#1},% ComplementTitre=\def\EnvtExoCpltTitre{#1},% CodeDebut=\def\EnvtExoCodeAvant{#1},% - %Couleur=\def\EnvtExoCouleur{#1},% EchelleImage=\def\EnvtExoScaleImg{#1},% Decoration=\def\EnvtExoDeco{#1},% - Trait=\def\EnvtExoTrait{#1} + Trait=\def\EnvtExoTrait{#1},% + Etoiles=\def\EnvtExoEtoiles{#1} } \setKVdefault[EnvtExercice]{ Type=Classique,% ComplementTitre={},% CodeDebut={},% - %Couleur=macouleurexo,% EchelleImage=1.15,% Compteur=true,% Decoration={},% - Trait=plein + Trait=plein,% + Etoiles={} } \NewDocumentEnvironment{EnvtExo}{ !O{} }% @@ -746,18 +905,32 @@ {% %label avec numéro et complément \tmpstyleexo\tmplabelexo\ifboolKV[EnvtExercice]{Compteur}{\thenumeroexo}{}\EnvtExoCpltTitre% + %étoiles eventuelles + \IfStrEq{\EnvtExoEtoiles}{}{}% + {% + \,(\IfSubStr{\EnvtExoEtoiles}{§}% + {% + \StrCut{\EnvtExoEtoiles}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}% + \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond,NiveauMax=\EnvtExoStarTot]{\EnvtExoStarNb}% + }% + {% + \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond]{\EnvtExoEtoiles}% + }% + )% + }% %trait éventuel \IfStrEqCase{\EnvtExoTrait}{% {plein}{\,\hrulefill}% {pointilles}{\,\dotfill}% {dashilles}{\,\hdashrule{\fill}{\eptraitexo}{\eptraitexospace}}% {non}{\hfill}% + {aucun}{~}% }% %décoration éventuelle \IfSubStr{\EnvtExoDeco}{Icone}% {% \StrBehind{\EnvtExoDeco}{/}[\EnvtExoIcon]% - \,\scalebox{0.85}[0.85]{\EnvtExoIcon}% + \,\textcolor{macouleurexodeco}{\scalebox{0.85}[0.85]{\EnvtExoIcon}}% }{}% \IfSubStr{\EnvtExoDeco}{Ceinture}% {% @@ -767,13 +940,13 @@ \IfSubStr{\EnvtExoDeco}{Chrono}% {% \StrBehind{\EnvtExoDeco}{/}[\EnvtExoChrono]% - \,\pictochrono[ColTime=macouleurexo!50]{\EnvtExoChrono}% + \,\pictochrono[ColTime=macouleurexodeco!50]{\EnvtExoChrono}% }{}% \IfSubStr{\EnvtExoDeco}{Points}% {% \StrBehind{\EnvtExoDeco}{/}[\EnvtExoPts]% \IfStrEq{\EnvtExoPts}{1}{\def\pts{point}}{\def\pts{points}}% - \,(\EnvtExoPts\ \pts)% + \,\textcolor{macouleurexodeco}{(\EnvtExoPts\ \pts)}% }{}% \IfSubStr{\EnvtExoDeco}{Image}% {% @@ -781,12 +954,49 @@ \settototalheight{\tmp@image@hauteur@totale}{\hbox{\tmpstyleexo qB}}% \,$\vcenter{\hbox{\includegraphics[height=\EnvtExoScaleImg\tmp@image@hauteur@totale]{\EnvtExoImg}}}$% }{}% + \IfSubStr{\EnvtExoDeco}{faEtoiles}% + {% + \StrBehind{\EnvtExoDeco}{/}[\EnvtExoStars]% + \IfSubStr{\EnvtExoStars}{§}% + {% + \StrCut{\EnvtExoStars}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}% + \textcolor{macouleurexodeco}{\scalebox{\tmpscalestarsexos}[\tmpscalestarsexos]{\NiveauDiffExos[\EnvtExoStarTot]{\EnvtExoStarNb}}}% + }% + {% + \textcolor{macouleurexodeco}{\scalebox{\tmpscalestarsexos}[\tmpscalestarsexos]{\NiveauDiffExos{\EnvtExoStars}}}% + }% + }{}% + \IfSubStr{\EnvtExoDeco}{tkzEtoiles}% + {% + \StrBehind{\EnvtExoDeco}{/}[\EnvtExoStars]% + \IfSubStr{\EnvtExoStars}{§}% + {% + \StrCut{\EnvtExoStars}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}% + \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond,NiveauMax=\EnvtExoStarTot]{\EnvtExoStarNb}% + }% + {% + \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond]{\EnvtExoStars}% + }% + }{}% }{}% \IfSubStr{\EnvtExoType}{Perso}%OK perso____déco {% \StrBehind{\EnvtExoType}{/}[\EnvtExoLabel]% %label avec numéro et complément \tmpstyleexo\EnvtExoLabel\ifboolKV[EnvtExercice]{Compteur}{\thenumeroexo}{}\EnvtExoCpltTitre% + %étoiles eventuelles + \IfStrEq{\EnvtExoEtoiles}{}{}% + {% + \,(\IfSubStr{\EnvtExoEtoiles}{§}% + {% + \StrCut{\EnvtExoEtoiles}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}% + \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond,NiveauMax=\EnvtExoStarTot]{\EnvtExoStarNb}% + }% + {% + \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond]{\EnvtExoEtoiles}% + }% + )% + }% %trait éventuel \IfStrEqCase{\EnvtExoTrait}{% {plein}{\,\hrulefill}% @@ -798,7 +1008,7 @@ \IfSubStr{\EnvtExoDeco}{Icone}% {% \StrBehind{\EnvtExoDeco}{/}[\EnvtExoIcon]% - \,\scalebox{0.85}[0.85]{\EnvtExoIcon}% + \,\textcolor{macouleurexodeco}{\scalebox{0.85}[0.85]{\EnvtExoIcon}}% }{}% \IfSubStr{\EnvtExoDeco}{Ceinture}% {% @@ -808,13 +1018,13 @@ \IfSubStr{\EnvtExoDeco}{Chrono}% {% \StrBehind{\EnvtExoDeco}{/}[\EnvtExoChrono]% - \,\pictochrono[ColTime=macouleurexo!50]{\EnvtExoChrono}% + \,\pictochrono[ColTime=macouleurexodeco!50]{\EnvtExoChrono}% }{}% \IfSubStr{\EnvtExoDeco}{Points}% {% \StrBehind{\EnvtExoDeco}{/}[\EnvtExoPts]% \IfStrEq{\EnvtExoPts}{1}{\def\pts{point}}{\def\pts{points}}% - \,(\EnvtExoPts\ \pts)% + \,\textcolor{macouleurexodeco}{(\EnvtExoPts\ \pts)}% }{}% \IfSubStr{\EnvtExoDeco}{Image}% {% @@ -822,6 +1032,30 @@ \settototalheight{\tmp@image@hauteur@totale}{\hbox{\tmpstyleexo qB}}% \,$\vcenter{\hbox{\includegraphics[height=\EnvtExoScaleImg\tmp@image@hauteur@totale]{\EnvtExoImg}}}$% }{}% + \IfSubStr{\EnvtExoDeco}{faEtoiles}% + {% + \StrBehind{\EnvtExoDeco}{/}[\EnvtExoStars]% + \IfSuStr{\EnvtExoStars}{§}% + {% + \StrCut{\EnvtExoStars}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}% + \textcolor{macouleurexodeco}{\scalebox{\tmpscalestarsexos}[\tmpscalestarsexos]{\NiveauDiffExos[\EnvtExoStarTot]{\EnvtExoStarNb}}}% + }% + {% + \textcolor{macouleurexodeco}{\scalebox{\tmpscalestarsexos}[\tmpscalestarsexos]{\NiveauDiffExos{\EnvtExoStars}}}% + }% + }{}% + \IfSubStr{\EnvtExoDeco}{tkzEtoiles}% + {% + \StrBehind{\EnvtExoDeco}{/}[\EnvtExoStars]% + \IfSubStr{\EnvtExoStars}{§}% + {% + \StrCut{\EnvtExoStars}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}% + \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond,NiveauMax=\EnvtExoStarTot]{\EnvtExoStarNb}% + }% + {% + \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond]{\EnvtExoStars}% + }% + }{}% }{}% \endgroup% \def\hrulefill{\leavevmode\leaders\hrule height 0.4pt\hfill\kern\z@}% @@ -841,6 +1075,19 @@ {% %label avec numéro et complément \tmpstyleexo\tmplabelexo\ifboolKV[EnvtExercice]{Compteur}{\thenumeroexo}{}\EnvtExoCpltTitre% + %étoiles eventuelles + \IfStrEq{\EnvtExoEtoiles}{}{}% + {% + \,(\IfSubStr{\EnvtExoEtoiles}{§}% + {% + \StrCut{\EnvtExoEtoiles}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}% + \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond,NiveauMax=\EnvtExoStarTot]{\EnvtExoStarNb}% + }% + {% + \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond]{\EnvtExoEtoiles}% + }% + )% + }% %trait éventuel \IfStrEqCase{\EnvtExoTrait}{% {plein}{\,\hrulefill}% @@ -876,12 +1123,49 @@ \settototalheight{\tmp@image@hauteur@totale}{\hbox{\tmpstyleexo qB}}% \,$\vcenter{\hbox{\includegraphics[height=\EnvtExoScaleImg\tmp@image@hauteur@totale]{\EnvtExoImg}}}$% }{}% + \IfSubStr{\EnvtExoDeco}{faEtoiles}% + {% + \StrBehind{\EnvtExoDeco}{/}[\EnvtExoStars]% + \IfSuStr{\EnvtExoStars}{§}% + {% + \StrCut{\EnvtExoStars}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}% + \textcolor{macouleurexodeco}{\scalebox{\tmpscalestarsexos}[\tmpscalestarsexos]{\NiveauDiffExos[\EnvtExoStarTot]{\EnvtExoStarNb}}}% + }% + {% + \textcolor{macouleurexodeco}{\scalebox{\tmpscalestarsexos}[\tmpscalestarsexos]{\NiveauDiffExos{\EnvtExoStars}}}% + }% + }{}% + \IfSubStr{\EnvtExoDeco}{tkzEtoiles}% + {% + \StrBehind{\EnvtExoDeco}{/}[\EnvtExoStars]% + \IfSubStr{\EnvtExoStars}{§}% + {% + \StrCut{\EnvtExoStars}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}% + \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond,NiveauMax=\EnvtExoStarTot]{\EnvtExoStarNb}% + }% + {% + \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond]{\EnvtExoStars}% + }% + }{}% }{}% \IfSubStr{\EnvtExoType}{Perso}%OK perso____déco {% \StrBehind{\EnvtExoType}{/}[\EnvtExoLabel]% %label avec numéro et complément \tmpstyleexo\EnvtExoLabel\ifboolKV[EnvtExercice]{Compteur}{\thenumeroexo}{}\EnvtExoCpltTitre% + %étoiles eventuelles + \IfStrEq{\EnvtExoEtoiles}{}{}% + {% + \,(\IfSubStr{\EnvtExoEtoiles}{§}% + {% + \StrCut{\EnvtExoEtoiles}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}% + \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond,NiveauMax=\EnvtExoStarTot]{\EnvtExoStarNb}% + }% + {% + \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond]{\EnvtExoEtoiles}% + }% + )% + }% %trait éventuel \IfStrEqCase{\EnvtExoTrait}{% {plein}{\,\hrulefill}% @@ -917,6 +1201,30 @@ \settototalheight{\tmp@image@hauteur@totale}{\hbox{\tmpstyleexo qB}}% \,$\vcenter{\hbox{\includegraphics[height=\EnvtExoScaleImg\tmp@image@hauteur@totale]{\EnvtExoImg}}}$% }{}% + \IfSubStr{\EnvtExoDeco}{faEtoiles}% + {% + \StrBehind{\EnvtExoDeco}{/}[\EnvtExoStars]% + \IfSuStr{\EnvtExoStars}{§}% + {% + \StrCut{\EnvtExoStars}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}% + \textcolor{macouleurexodeco}{\scalebox{\tmpscalestarsexos}[\tmpscalestarsexos]{\NiveauDiffExos[\EnvtExoStarTot]{\EnvtExoStarNb}}}% + }% + {% + \textcolor{macouleurexodeco}{\scalebox{\tmpscalestarsexos}[\tmpscalestarsexos]{\NiveauDiffExos{\EnvtExoStars}}}% + }% + }{}% + \IfSubStr{\EnvtExoDeco}{tkzEtoiles}% + {% + \StrBehind{\EnvtExoDeco}{/}[\EnvtExoStars]% + \IfSubStr{\EnvtExoStars}{§}% + {% + \StrCut{\EnvtExoStars}{§}{\EnvtExoStarNb}{\EnvtExoStarTot}% + \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond,NiveauMax=\EnvtExoStarTot]{\EnvtExoStarNb}% + }% + {% + \tkzEtoiles[Couleur=macouleurexodeco,CouleurFond=macouleurexodecofond]{\EnvtExoStars}% + }% + }{}% }{}% \endgroup% \def\hrulefill{\leavevmode\leaders\hrule height 0.4pt\hfill\kern\z@}% @@ -2107,4 +2415,302 @@ \end{tikzpicture}% } +%====vincludegraphics [fr] +\newlength{\tmp@includegraphics@vfill@offset} + +\defKV[vfillincludegphcs]{vOffset=\setlength\tmp@includegraphics@vfill@offset{#1},vCentrer=\def\tmpincludegpvcenter{#1}} +\setKVdefault[vfillincludegphcs]{vRemplir=false,vOffset=0pt,vCentrer=n} + +\NewDocumentCommand\InsererImage{ D<>{} O{} m }{% + \restoreKV[vfillincludegphcs]% + \setKV[vfillincludegphcs]{#1}% + \ifboolKV[vfillincludegphcs]{vRemplir}% + {% + \IfStrEqCase{\tmpincludegpvcenter}{% + {m}{\vfill\includegraphics[height=\dimexpr\pagegoal-\pagetotal-\tmp@includegraphics@vfill@offset\relax,#2]{#3}\vfill}% + {h}{\includegraphics[height=\dimexpr\pagegoal-\pagetotal-\tmp@includegraphics@vfill@offset\relax,#2]{#3}\vfill}% + {b}{\vfill\includegraphics[height=\dimexpr\pagegoal-\pagetotal-\tmp@includegraphics@vfill@offset\relax,#2]{#3}}% + {n}{\includegraphics[height=\dimexpr\pagegoal-\pagetotal-\tmp@includegraphics@vfill@offset\relax,#2]{#3}}% + }[{\includegraphics[height=\dimexpr\pagegoal-\pagetotal-\tmp@includegraphics@vfill@offset\relax,#2]{#3}}]% + }% + {% + \includegraphics[#2]{#3}% + }% +} + +%===tkzBanner mixte +\defKV[tkzBannerKeys]{% + maincolor=\def\tkzBannermaincol{#1} +} + +\setKVdefault[tkzBannerKeys]{% + height=2.1cm,% + width=\linewidth,% + collight=teal!25,% + colmedium=teal!75,% + coldark=teal,% + coltxt=white,% + fonttxt=\sffamily\bfseries,% + swap=false,% + maincolor={},% + num=true +} + +\NewDocumentCommand\tkzBanner{ O{} m m }{% + \noindent% + \restoreKV[tkzBannerKeys]% + \setKV[tkzBannerKeys]{#1}% + \pgfmathsetmacro{\tkzBannerscale}{\useKV[tkzBannerKeys]{width}/\linewidth}% + \begin{tikzpicture} + \IfEq{\tkzBannermaincol}{}% + {% + \tikzset{tkzbannerdark/.style={\useKV[tkzBannerKeys]{coldark}}} + \tikzset{tkzbannermedium/.style={\useKV[tkzBannerKeys]{colmedium}}} + \tikzset{tkzbannerlight/.style={\useKV[tkzBannerKeys]{collight}}} + }% + {% + \tikzset{tkzbannerdark/.style={\tkzBannermaincol}} + \tikzset{tkzbannermedium/.style={\tkzBannermaincol!75}} + \tikzset{tkzbannerlight/.style={\tkzBannermaincol!25}} + }% + %coordinates + \coordinate (tkzBanner-NW) at (0,{\useKV[tkzBannerKeys]{height}}) ; + \coordinate (tkzBanner-SW) at (0,0) ; + \coordinate (tkzBanner-NE) at ({\useKV[tkzBannerKeys]{width}},{\useKV[tkzBannerKeys]{height}}) ; + \coordinate (tkzBanner-SE) at ({\useKV[tkzBannerKeys]{width}},0) ;% + %swap or note + \ifboolKV[tkzBannerKeys]{swap}% + {% + \coordinate (tkzBanner-A) at ($(tkzBanner-SE)!0.57!(tkzBanner-SW)$) ; + \coordinate (tkzBanner-B) at ($(tkzBanner-NE)!0.91!(tkzBanner-NW)$) ; + \coordinate (tkzBanner-C) at ($(tkzBanner-NE)!0.92!(tkzBanner-NW)$) ; + \coordinate (tkzBanner-D) at ($(tkzBanner-SE)!0.63!(tkzBanner-SW)$) ; + }% + {% + \coordinate (tkzBanner-A) at ($(tkzBanner-SW)!0.57!(tkzBanner-SE)$) ; + \coordinate (tkzBanner-B) at ($(tkzBanner-NW)!0.91!(tkzBanner-NE)$) ; + \coordinate (tkzBanner-C) at ($(tkzBanner-NW)!0.92!(tkzBanner-NE)$) ; + \coordinate (tkzBanner-D) at ($(tkzBanner-SW)!0.63!(tkzBanner-SE)$) ; + }% + %drawing + \fill[tkzbannerdark] (0,0) rectangle ({\useKV[tkzBannerKeys]{width}},{\useKV[tkzBannerKeys]{height}}); + \ifboolKV[tkzBannerKeys]{swap}% + {% + \fill[tkzbannerlight] (tkzBanner-A) to[bend left=8] (tkzBanner-B) -- (tkzBanner-C) to[bend right=7] (tkzBanner-D) -- cycle ; + \fill[tkzbannermedium] (tkzBanner-C) to[bend right=7] (tkzBanner-D) -- (tkzBanner-SW) |- cycle ; + }% + {% + \fill[tkzbannerlight] (tkzBanner-A) to[bend right=8] (tkzBanner-B) -- (tkzBanner-C) to[bend left=7] (tkzBanner-D) -- cycle ; + \fill[tkzbannermedium] (tkzBanner-C) to[bend left=7] (tkzBanner-D) -- (tkzBanner-SE) |- cycle ; + }% + %nodes + \ifboolKV[tkzBannerKeys]{swap}% + {% + \node[inner sep=2pt,text={\useKV[tkzBannerKeys]{coltxt}},below left,font={\useKV[tkzBannerKeys]{fonttxt}},scale={2*\tkzBannerscale}] at (tkzBanner-NE) {\vphantom{qÉ}#2}; + \ifboolKV[tkzBannerKeys]{num}% + {% + \node[inner sep=2pt,text={\useKV[tkzBannerKeys]{coltxt}},above right,font={\useKV[tkzBannerKeys]{fonttxt}},scale={1.25*\tkzBannerscale}] at (tkzBanner-SW) {\vphantom{qÉ}#3}; + }% + {}% + }% + {% + \ifboolKV[tkzBannerKeys]{num}% + {% + \node[inner sep=2pt,text={\useKV[tkzBannerKeys]{coltxt}},above left,font={\useKV[tkzBannerKeys]{fonttxt}},scale={1.25*\tkzBannerscale}] at (tkzBanner-SE) {\vphantom{qÉ}#3}; + }% + {}% + \node[inner sep=2pt,text={\useKV[tkzBannerKeys]{coltxt}},below right,font={\useKV[tkzBannerKeys]{fonttxt}},scale={2*\tkzBannerscale}] at (tkzBanner-NW) {\vphantom{qÉ}#2}; + }% + \end{tikzpicture}% +} + +%====titre stylisé [fr], à voir avec part ?? +\newlength{\tmp@tkzbanner@autowidthtype} +\setlength\tmp@tkzbanner@autowidthtype{2.5em} +\newlength{\tmp@tkzbanner@autowidthnum} +\setlength\tmp@tkzbanner@autowidthnum{2em} +\newlength{\tmp@tkzbanner@marginoffsetbanner} +\setlength\tmp@tkzbanner@marginoffsetbanner{2pt} +\newlength{\tmp@tkzbanner@autowidth} +\setlength\tmp@tkzbanner@autowidth{2.5em} + +\defKV[tkzBannerpartKeys]{% + maincolor=\def\tkzBannermaintricol{#1},% + logo=\def\tkzBannermaintrilogo{#1},% + type=\def\tkzBannermaintritype{#1},% + blockwidth=\def\tkzBannermaintriblockwidth{#1},% + customtype=\def\tkzBannermaintritypelibre{#1} +} + +\setKVdefault[tkzBannerpartKeys]{% + height=2.5em,% + width={\linewidth-0.5pt},% + blockwidth=2.75em,% + collight=darkgray!25,% + colmedium=darkgray!50,% + coldark=darkgray,% + coltxt=white,% + fonttxt=\sffamily\bfseries,% + swap=false,% + maincolor={},% + logo={},% + type={},% + num=true, + dispblock=true,% + customtype={} +} + +\NewDocumentCommand\tkzBannerTri{ O{} m m }{% + %#1 := clés + %#2 := numéro + %#3 := titre + \noindent% + \restoreKV[tkzBannerpartKeys]% + \setKV[tkzBannerpartKeys]{#1}% + \pgfmathsetmacro{\tkzBannertriscale}{0.75*(\useKV[tkzBannerpartKeys]{height})/1.25cm}% + \pgfmathsetmacro{\scaletypedoctribanner}{1.05*0.75*(\useKV[tkzBannerpartKeys]{height})/1.25cm}% + \pgfmathsetmacro{\scaletypedoctribannernum}{2.5*0.75*(\useKV[tkzBannerpartKeys]{height})/1.25cm}% + \pgfmathsetmacro{\tkzBannertriangle}{0.10*(\useKV[tkzBannerpartKeys]{height})/(\useKV[tkzBannerpartKeys]{width})}% + \IfEq{\tkzBannermaintriblockwidth}{auto}% + {% + \settowidth{\tmp@tkzbanner@autowidthtype}{\scalebox{\scaletypedoctribanner}[\scaletypedoctribanner]{\sffamily\bfseries\vphantom{qÉ}\tkzBannermaintritype}}% + \addtolength{\tmp@tkzbanner@autowidthtype}{4pt}% + \settowidth{\tmp@tkzbanner@autowidthnum}{\scalebox{\scaletypedoctribannernum}[\scaletypedoctribannernum]{\sffamily\bfseries\vphantom{qÉ}00}}% + \addtolength{\tmp@tkzbanner@autowidthnum}{4pt}% + \pgfmathsetlength{\tmp@tkzbanner@autowidth}{max(\tmp@tkzbanner@autowidthtype,\tmp@tkzbanner@autowidthnum)}% + }% + {% + \setlength\tmp@tkzbanner@autowidth{\tkzBannermaintriblockwidth}% + }% + \begin{tikzpicture} + \IfEq{\tkzBannermaintricol}{}% + {% + \tikzset{tkzbannertridark/.style={\useKV[tkzBannerpartKeys]{coldark}}} + \tikzset{tkzbannertrimedium/.style={\useKV[tkzBannerpartKeys]{colmedium}}} + \tikzset{tkzbannertrilight/.style={\useKV[tkzBannerpartKeys]{collight}}} + }% + {% + \tikzset{tkzbannertridark/.style={\tkzBannermaintricol}} + \tikzset{tkzbannertrimedium/.style={\tkzBannermaintricol!50}} + \tikzset{tkzbannertrilight/.style={\tkzBannermaintricol!25}} + }% + %coordinates + \coordinate (tkzBannerTri-NW) at (0,{\useKV[tkzBannerpartKeys]{height}}) ; + \coordinate (tkzBannerTri-SW) at (0,0) ; + \coordinate (tkzBannerTri-NE) at ({\useKV[tkzBannerpartKeys]{width}},{\useKV[tkzBannerpartKeys]{height}}) ; + \coordinate (tkzBannerTri-SE) at ({\useKV[tkzBannerpartKeys]{width}},0) ;% + \coordinate (tkzBannerTri-SWd) at ($(tkzBannerTri-SW)!0.05!(tkzBannerTri-NW)$) ;% + \coordinate (tkzBannerTri-SEd) at ($(tkzBannerTri-SE)!0.15!(tkzBannerTri-NE)$) ;% + %drawing & shadow + \fill[lightgray!75] ([yshift=-1pt]tkzBannerTri-SWd) -- ([yshift=-1pt]tkzBannerTri-SEd) -- (tkzBannerTri-NE) -| cycle ; + \ifboolKV[tkzBannerpartKeys]{swap}% + {% + \fill[white] (tkzBannerTri-SWd) -- (tkzBannerTri-SEd) -- (tkzBannerTri-NE) -| cycle ; + \draw[line width=1pt,tkzbannertridark] ([shift={(0.5pt,-0.5pt)}]tkzBannerTri-NW) -| ([shift={(-0.5pt,0)}]tkzBannerTri-SEd) -- (tkzBannerTri-SWd) ; + }% + {% + \fill[tkzbannertrimedium] (tkzBannerTri-SWd) -- (tkzBannerTri-SEd) -- (tkzBannerTri-NE) -| cycle ; + }% + \ifboolKV[tkzBannerpartKeys]{dispblock}% + {% + \begin{scope} + \clip ($(tkzBannerTri-SW)!0.0375!(tkzBannerTri-NW)$) -- ($(tkzBannerTri-SE)!0.1375!(tkzBannerTri-NE)$) -- (tkzBannerTri-NE) -| cycle ; + %light + \fill[tkzbannertrilight] (tkzBannerTri-NW) --++ ({\tmp@tkzbanner@autowidth+2*\tmp@tkzbanner@marginoffsetbanner},0) -- ({\tmp@tkzbanner@autowidth+2*\tmp@tkzbanner@marginoffsetbanner+1em},{0.5*(\useKV[tkzBannerpartKeys]{height})}) -- ({\tmp@tkzbanner@autowidth+2*\tmp@tkzbanner@marginoffsetbanner},0) -- (tkzBannerTri-SW) -- cycle ; + \end{scope} + \begin{scope} + \clip ($(tkzBannerTri-SW)!0.025!(tkzBannerTri-NW)$) -- ($(tkzBannerTri-SE)!0.125!(tkzBannerTri-NE)$) -- (tkzBannerTri-NE) -| cycle ; + %medium + \fill[tkzbannertrimedium] (tkzBannerTri-NW) --++ ({\tmp@tkzbanner@autowidth+\tmp@tkzbanner@marginoffsetbanner},0) -- ({\tmp@tkzbanner@autowidth+\tmp@tkzbanner@marginoffsetbanner+1em},{0.5*(\useKV[tkzBannerpartKeys]{height})}) -- ({\tmp@tkzbanner@autowidth+\tmp@tkzbanner@marginoffsetbanner},0) -- (tkzBannerTri-SW) -- cycle ; + \end{scope} + \begin{scope} + \clip ($(tkzBannerTri-SW)!0.0125!(tkzBannerTri-NW)$) -- ($(tkzBannerTri-SE)!0.1125!(tkzBannerTri-NE)$) -- (tkzBannerTri-NE) -| cycle ; + %dark + \fill[tkzbannertridark] (tkzBannerTri-NW) --++ ({\tmp@tkzbanner@autowidth},0) -- ({\tmp@tkzbanner@autowidth+1em},{0.5*(\useKV[tkzBannerpartKeys]{height})}) -- ({\tmp@tkzbanner@autowidth},0) -- (tkzBannerTri-SW) -- cycle ; + \IfEq{\tkzBannermaintritypelibre}{}% + {% + \ifboolKV[tkzBannerpartKeys]{num}% + {% + \IfEq{\tkzBannermaintritype}{}% + {% + \node[inner sep=2pt,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.5*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({0.5*\tmp@tkzbanner@autowidth},{0.5*(\useKV[tkzBannerpartKeys]{height})}) {\vphantom{qÉ}#2}; + }% + {% + \node[inner sep=2pt,below=1pt,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={1.05*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({0.5*\tmp@tkzbanner@autowidth},{\useKV[tkzBannerpartKeys]{height}}) {\vphantom{qÉ}\tkzBannermaintritype}; + \node[inner sep=2pt,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.5*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({0.5*\tmp@tkzbanner@autowidth},{0.425*(\useKV[tkzBannerpartKeys]{height})}) {\vphantom{qÉ}#2}; + }% + }% + {}% + }% + {% + \node[inner sep=2pt,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.5*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({0.5*\tmp@tkzbanner@autowidth},{0.5*(\useKV[tkzBannerpartKeys]{height})}) {\vphantom{qÉ}\tkzBannermaintritypelibre}; + }% + \end{scope} + }% + {}% + %nodes + \begin{scope} + \clip (tkzBannerTri-SWd) -- (tkzBannerTri-SEd) -- (tkzBannerTri-NE) -| cycle ; + \ifboolKV[tkzBannerpartKeys]{swap}% + {% + \node[inner sep=2pt,right,text=\tkzBannermaintricol,font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.75*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({\tmp@tkzbanner@autowidth+2*\tmp@tkzbanner@marginoffsetbanner+1.25em},{0.5*(\useKV[tkzBannerpartKeys]{height})}) {\vphantom{qÉ}#3}; + %logo + \IfEq{\tkzBannermaintrilogo}{}% + {}% + {% + \node[inner sep=2pt,left,text=\tkzBannermaintricol,font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.5*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({\useKV[tkzBannerpartKeys]{width}},{0.55*(\useKV[tkzBannerpartKeys]{height})}) {\vphantom{qÉ}\tkzBannermaintrilogo}; + }% + }% + {% + \node[inner sep=2pt,right,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.75*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({\tmp@tkzbanner@autowidth+2*\tmp@tkzbanner@marginoffsetbanner+1.25em},{0.5*(\useKV[tkzBannerpartKeys]{height})}) {\vphantom{qÉ}#3}; + %logo + \IfEq{\tkzBannermaintrilogo}{}% + {}% + {% + \node[inner sep=2pt,left,text={\useKV[tkzBannerpartKeys]{coltxt}},font={\useKV[tkzBannerpartKeys]{fonttxt}},scale={2.5*\tkzBannertriscale},rotate={atan(\tkzBannertriangle)}] at ({\useKV[tkzBannerpartKeys]{width}},{0.55*(\useKV[tkzBannerpartKeys]{height})}) {\vphantom{qÉ}\tkzBannermaintrilogo}; + }% + }% + \end{scope} + \end{tikzpicture}% +} + +%====grille automatique tikz ? +\NewDocumentCommand\tkzGrilleAuto{ s O{thin,lightgray} m }{% + \IfBooleanT{#1}{\filldraw (0,0) circle[radius=2pt] ;} + \StrCut{#3}{§}{\tkzautogridx}{\tkzautogridy}% + \draw[xstep=\tkzautogridx,ystep=\tkzautogridy,#2] (current bounding box.south west) grid (current bounding box.north east) ; +} +\NewDocumentCommand\tkzAutoGrid{ s O{thin,lightgray} m }{% + \IfBooleanT{#1}{\filldraw (0,0) circle[radius=2pt] ;} + \StrCut{#3}{§}{\tkzautogridx}{\tkzautogridy}% + \draw[xstep=\tkzautogridx,ystep=\tkzautogridy,#2] (current bounding box.south west) grid (current bounding box.north east) ; +} + +\tikzset{grilleauto/.store in=\tkzautogrid,grilleauto/.default={},grilleauto={}} +\tikzset{autogrid/.store in=\tkzautogrid,autogrid/.default={},autogrid={}} + +\NewDocumentCommand\tkzAutoGridActivate{ s }{% + \@ifundefined{tkzautogrid}% + {}% + {% + \tikzset{every picture/.style={% + execute at end picture={% + \IfEq{\tkzautogrid}{}{}{\IfBooleanTF{#1}{\tkzGrilleAuto*{\tkzautogrid}}{\tkzGrilleAuto{\tkzautogrid}}}% + }, + }, + }% + }% +} + +\NewDocumentCommand\tkzAutoGridLocal{ s }{% + \@ifundefined{tkzautogrid}% + {}% + {% + \tikzset{execute at end picture={% + \IfEq{\tkzautogrid}{}{}{\IfBooleanTF{#1}{\tkzGrilleAuto*{\tkzautogrid}}{\tkzGrilleAuto{\tkzautogrid}}}% + }, + }, + }% +} + \endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/dccpaper/dccpaper-base.sty b/Master/texmf-dist/tex/latex/dccpaper/dccpaper-base.sty index 5e2af203063..3a5f08ca8c5 100644 --- a/Master/texmf-dist/tex/latex/dccpaper/dccpaper-base.sty +++ b/Master/texmf-dist/tex/latex/dccpaper/dccpaper-base.sty @@ -14,7 +14,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/08/11 v2.4} +\def\Version{2024/08/23 v2.5} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{dccpaper-base} [\Version\space Common class code for IJDC and IDCC papers.] @@ -818,7 +818,7 @@ } \endgroup %% -%% Copyright (C) 2023 Digital Curation Centre, University of Edinburgh +%% Copyright (C) 2024 Digital Curation Centre, University of Edinburgh %% <info@dcc.ac.uk> %% %% End of file `dccpaper-base.sty'. diff --git a/Master/texmf-dist/tex/latex/dccpaper/idcc.cls b/Master/texmf-dist/tex/latex/dccpaper/idcc.cls index 0e8345f25cb..bbc5329095b 100644 --- a/Master/texmf-dist/tex/latex/dccpaper/idcc.cls +++ b/Master/texmf-dist/tex/latex/dccpaper/idcc.cls @@ -14,7 +14,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/08/11 v2.4} +\def\Version{2024/08/23 v2.5} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{idcc} [\Version\space Class for submissions to the International Digital Curation Conference.] @@ -109,9 +109,15 @@ \DeclareOption{24}{% \def\dccp@publ@short{IDCC} \def\dccp@publ@msg{The 18th \dccp@publ@long\ takes place on 19--21 February - 2024 in Edinburgh, Scotland.\par\bigskip URL: \url{https://www.dcc.ac.uk/events/18th-international-digital-curation-conference}} + 2024 in Edinburgh, Scotland.\par\bigskip URL: \url{https://www.dcc.ac.uk/events/idcc24}} \def\dccp@subject{18th \dccp@publ@long, 2024} } +\DeclareOption{25}{% + \def\dccp@publ@short{IDCC25} + \def\dccp@publ@msg{The 19th \dccp@publ@long\ takes place on 17--19 February + 2025 in The Hague, Netherlands.\par\bigskip URL: \url{https://www.dcc.ac.uk/events/idcc25}} + \def\dccp@subject{19th \dccp@publ@long, 2025} +} \ProcessOptions\relax \def\@clearglobaloption#1{% @@ -135,7 +141,7 @@ \RequirePackage{dccpaper-base} %% -%% Copyright (C) 2023 Digital Curation Centre, University of Edinburgh +%% Copyright (C) 2024 Digital Curation Centre, University of Edinburgh %% <info@dcc.ac.uk> %% %% End of file `idcc.cls'. diff --git a/Master/texmf-dist/tex/latex/dccpaper/ijdc-v14.cls b/Master/texmf-dist/tex/latex/dccpaper/ijdc-v14.cls index 1d88c3e3bfb..bccd3b5f7a9 100644 --- a/Master/texmf-dist/tex/latex/dccpaper/ijdc-v14.cls +++ b/Master/texmf-dist/tex/latex/dccpaper/ijdc-v14.cls @@ -14,7 +14,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/08/11 v2.4} +\def\Version{2024/08/23 v2.5} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{ijdc-v14} [\Version\space Class for submissions to the International Journal of Digital Curation, volume 14 onwards.] @@ -58,7 +58,7 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN: \RequirePackage{dccpaper-base} %% -%% Copyright (C) 2023 Digital Curation Centre, University of Edinburgh +%% Copyright (C) 2024 Digital Curation Centre, University of Edinburgh %% <info@dcc.ac.uk> %% %% End of file `ijdc-v14.cls'. diff --git a/Master/texmf-dist/tex/latex/dccpaper/ijdc-v9.cls b/Master/texmf-dist/tex/latex/dccpaper/ijdc-v9.cls index 8f4d08311bd..4c60ec50b0d 100644 --- a/Master/texmf-dist/tex/latex/dccpaper/ijdc-v9.cls +++ b/Master/texmf-dist/tex/latex/dccpaper/ijdc-v9.cls @@ -14,7 +14,7 @@ %% See: http://www.latex-project.org/lppl.txt %% ---------------------------------------------------------------- %% -\def\Version{2023/08/11 v2.4} +\def\Version{2024/08/23 v2.5} \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{ijdc-v9} [\Version\space Class for submissions to the International Journal of Digital Curation, volumes 9--13 inclusive.] @@ -58,7 +58,7 @@ the University of Edinburgh on behalf of the Digital Curation Centre. ISSN: \RequirePackage{dccpaper-base} %% -%% Copyright (C) 2023 Digital Curation Centre, University of Edinburgh +%% Copyright (C) 2024 Digital Curation Centre, University of Edinburgh %% <info@dcc.ac.uk> %% %% End of file `ijdc-v9.cls'. diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index efd19297b3b..083739ce10e 100644 --- a/Master/texmf-dist/tex/latex/easybook/easybase.sty +++ b/Master/texmf-dist/tex/latex/easybook/easybase.sty @@ -20,7 +20,7 @@ %% This work has the LPPL maintenance status `maintained'. \NeedsTeXFormat{LaTeX2e}[2021/11/15] \RequirePackage{etoolbox} -\ProvidesExplPackage{easybase}{2024/07/29}{2024da} +\ProvidesExplPackage{easybase}{2024/09/06}{2024dm} {Easily typesetting Chinese theses or books} \cs_generate_variant:Nn \dim_set:Nn { NV } @@ -51,7 +51,7 @@ \clist_map_inline:nn {#1} { \AtBeginEnvironment{##1}{#2} } } -\cs_new_protected:Npn \eb_at_end_preamble:n +\cs_set_protected:Npn \ctex_before_end_preamble:n { \BeforeBeginEnvironment{document} } \cs_new_protected:Npn \eb_if_package_loaded:nnF #1#2#3 { @@ -171,9 +171,9 @@ \seq_set_from_clist:Nn \l__eb_module_paths_seq { - tools,font,space, - bib,thmt,toc, - hdr,float,ref,geo + tools,font,space,bib, + thmt,toc,hdr,float, + ref,geo,cap } \seq_map_inline:Nn \l__eb_module_paths_seq { @@ -228,7 +228,6 @@ \ebloadpackage { [text]{spbmark}, - [normalem]{ulem}, [{shortlabels,inline}]{enumitem}, chemformula,siunitx,pifont, geometry,marginnote, @@ -677,7 +676,7 @@ unknown .code:n = \eb_msg_deprecated_option:n { hdr } } -\eb_at_end_preamble:n +\ctex_before_end_preamble:n { \bool_if:NT \l__eb_chap_counter_withpart_bool { \counterwithin*{chapter}{part} } @@ -843,12 +842,12 @@ \ctex_at_end_package:nn { footmisc } { \eb_package_date_check:nn { footmisc } { 2022/02/10 } - \boolfalse{FN@setspace} - \ifbool{FN@para}{} + \ifboolexpr{not (bool {FN@para} or bool {FN@sidefn})} { + \boolfalse{FN@setspace} \cs_set_eq:NN \@makefntext \eb@@makefntext \cs_set_eq:NN \@footnotetext \eb@@footnotetext - } + }{} \ifboolexpr { bool {FN@hangfoot} or @@ -1693,7 +1692,7 @@ \ctex_at_end_package:nn { imakeidx } { - \RenewDocumentCommand{\printindex}{st+od()} + \RenewDocumentCommand{\printindex}{st++o} { \group_begin: \tl_set_eq:NN \eb@toc@title \indexname @@ -1848,6 +1847,28 @@ } \AfterPreamble{\skip_set:Nn \abovedisplayshortskip { 0ex plus .1ex }} +\cs_new_protected:Npn \eb@register@cap@options #1 + { + \ctex_define:nn { cap } + { + #1/unknown .code:n = + { + \use:x + { + \exp_not:N \captionsetup[#1] + { \eb_unknown_kv_handle: } + } + }, + #1/unknown .default:V = \c_novalue_tl, + #1 .meta:nn = { ctex/cap/#1 } {##1} + } + } +\cs_new_protected:Npn \RegisterCapOptions #1 + { + \clist_map_function:nN {#1} + \eb@register@cap@options + } +\RegisterCapOptions{table,figure,lstlisting} \clist_map_inline:nn { table,figure,lstlisting } { @@ -2175,7 +2196,7 @@ { \exp_args:NV \bibliographystyle \l__eb_bib_both_style_tl } \tl_if_blank:VF \l__eb_bib_cite_style_tl { \exp_args:NV \setcitestyle \l__eb_bib_cite_style_tl } - \NewDocumentCommand{\printbibliography}{st+o} + \NewDocumentCommand{\printbibliography}{st++o} { \group_begin: \tl_set_eq:NN \eb@toc@title \bibname @@ -2223,7 +2244,7 @@ \setcounter{biburllcpenalty}{1} \setcounter{biburlnumpenalty}{1} } -\eb_at_end_preamble:n +\ctex_before_end_preamble:n { \providecommand{\bibname}{\refname} \clist_if_empty:NF \l__eb_bib_datafile_clist @@ -2448,6 +2469,97 @@ lstlistingname = Code } } + +\cs_if_exist:NF \DeclareObjectType + { \RequirePackage{xtemplate} } +\DeclareObjectType{easybook}{0} +\DeclareTemplateInterface{easybook}{cover}{0} + { + content : tokenlist = \c_empty_tl, + beforecode : tokenlist = \c_empty_tl, + aftercode : tokenlist = \c_empty_tl, + align : choice {l,r,c,n} = c + } +\DeclareTemplateCode{easybook}{cover}{0} + { + content = \l__eb_cover_content_tl, + beforecode = \l__eb_cover_before_code_tl, + aftercode = \l__eb_cover_after_code_tl, + align = + { + l = \cs_set_eq:NN \eb_cover_align: \raggedright, + r = \cs_set_eq:NN \eb_cover_align: \raggedleft, + c = \cs_set_eq:NN \eb_cover_align: \centering, + n = \cs_set:Npn \eb_cover_align: { } + } + } + { + \AssignTemplateKeys + \tl_use:N \l__eb_cover_before_code_tl + \group_begin: + \eb_cover_align: + \tl_use:N \l__eb_cover_content_tl + \tex_par:D + \group_end: + \tl_use:N \l__eb_cover_after_code_tl + } +\DeclareInstance{easybook}{top}{cover}{} +\DeclareInstance{easybook}{bottom}{cover}{} +\DeclareInstance{easybook}{middle}{cover} + { + content = + { + \notbool{@titlepage} + { + \renewcommand{\theupfootnote}{\@fnsymbol\c@footnote} + \renewcommand{\thefootnote}{\@fnsymbol\c@footnote} + } + {} + \LARGE\@title\par\vskip 3em + \large + \begin{tabular}[t]{c} + \@author + \end{tabular}\par\vskip 1.5em + \@date + \notbool{@titlepage}{\par\vskip 1.5em}{} + \@thanks + }, + beforecode = + { + \ifbool{@titlepage} + { + \begin{titlepage} + \let\footnotesize\small + \let\footnoterule\relax + \let\footnote\thanks + \null\vfil\vskip 60\p@ + } + {\null\vskip 20\p@} + }, + aftercode = + { + \ifbool{@titlepage} + { + \vfil\null + \end{titlepage} + } + {\thispagestyle{plain}} + \setcounter{footnote}{0} + } + } +\keys_define:nn { eb/cover } + { + title .tl_set:N = \@title, + author .tl_set:N = \@author, + date .tl_set:N = \@date + } +\RenewDocumentCommand{\maketitle}{+O{}} + { + \keys_set:nn { eb/cover } {#1} + \UseInstance{easybook}{top} + \UseInstance{easybook}{middle} + \UseInstance{easybook}{bottom} + } \endinput %% %% End of file `easybase.sty'. diff --git a/Master/texmf-dist/tex/latex/easybook/easybook.cls b/Master/texmf-dist/tex/latex/easybook/easybook.cls index 519d505baae..cf5437b9198 100644 --- a/Master/texmf-dist/tex/latex/easybook/easybook.cls +++ b/Master/texmf-dist/tex/latex/easybook/easybook.cls @@ -19,7 +19,7 @@ %% %% This work has the LPPL maintenance status `maintained'. \NeedsTeXFormat{LaTeX2e}[2021/11/15] -\ProvidesExplClass{easybook}{2024/07/29}{2024da} +\ProvidesExplClass{easybook}{2024/09/06}{2024dm} {Easily typesetting Chinese theses or books} \bool_new:N \l__eb_compile_draft_bool diff --git a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg index ad2102cb316..b51c645edf4 100644 --- a/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg +++ b/Master/texmf-dist/tex/latex/easybook/eb-tcolorbox.cfg @@ -18,7 +18,7 @@ %% LaTeX version 2005/12/01 or later. %% %% This work has the LPPL maintenance status `maintained'. -\ProvidesExplFile{eb-tcolorbox.cfg}{2024/07/29}{2024da} +\ProvidesExplFile{eb-tcolorbox.cfg}{2024/09/06}{2024dm} {Customization of tcolorbox for easybook} \cs_set_protected:Npn \addtotcbstyle #1#2 diff --git a/Master/texmf-dist/tex/latex/edmaths/edmaths.sty b/Master/texmf-dist/tex/latex/edmaths/edmaths.sty new file mode 100644 index 00000000000..cbfd89a5bed --- /dev/null +++ b/Master/texmf-dist/tex/latex/edmaths/edmaths.sty @@ -0,0 +1,258 @@ +%% Package `edmaths' v0.99 +%% File edmaths.sty +%% Copyright 2024 Josh Fogg +%% +%% edmaths.sty is a LaTeX style file for typesetting reports and theses in the +%% School of Mathematics at the University of Edinburgh. Suitable for use for +%% theses, yearly reports, and undergraduate projects. Part of the more general +%% `edmaths' package. See README.md for usage instructions. +%% +%% This work may be distributed and/or modified under the conditions of the +%% LaTeX Project Public License, either version 1.3 of this license or (at +%% your option) any later version. +%% +%% The latest version of this license is in http://latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX version +%% 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained' and the current +%% maintainer of this work is Josh Fogg. Originally written by Thomas Koeppe in +%% 2007/07, it has since been updated by Josh Fogg from 2020 onwards. +%% +%% This work consists of the file edmaths.sty. + +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{edmaths}[2024-08-30 Edinburgh maths thesis/report style v0.99] +\RequirePackage{calc,ifthen,setspace,amsmath,amsthm,amscd,amssymb} + + + +% PAGE SIZE AND MARGINS +% These settings control the size of the page and its margins. All measurements are +% compliant wih the school's typesetting requirements. + +\setlength{\paperheight}{297mm} % A4 Paper +\setlength{\paperwidth}{210mm} % +\setlength{\oddsidemargin}{14.6mm} % Left/Inside: 4.0cm (rel. -1in) +\setlength{\evensidemargin}{-.4mm} % Right/Outside: 2.5cm (rel. -1in) +\setlength{\topmargin}{-17.4mm} % \ +\setlength{\headheight}{6mm} % | Top: 2.0cm (rel. -1in), out of which 6mm for the header +\setlength{\headsep}{6mm} % / +\setlength{\textwidth}{145mm} % Margins: 2.5cm + 4cm +% Textheight delayed until we know the line spacing. + +% The following is removed in favour of the `report' class options "oneside/twoside". +% \@twosidefalse \@mparswitchfalse % Single-sided by default + + + +% PACKAGE OPTIONS +% These options can be selected wihin \usepackage[...]{edmaths} to modify the +% appearance of different parts of the document. + +% Options relating to external packages +\newboolean{with-fourier} % Use the `fourier' package for Adobe Utopia font +\newboolean{with-cmbright} % Use the `cmbright' package for Computer Modern Bright (sans serif) font +\newboolean{with-comicsans} % :) +\newboolean{with-hyperref} % Use the `hyperref' package for hyperlinks and bookmarks, all black +\newboolean{with-colour} % Add sane colours to the hyperref links +\newboolean{with-fancyhdr} % Use the `fancyhdr' package to provide header and footer +\DeclareOption{fourier}{\setboolean{with-fourier}{true}} +\DeclareOption{cmbright}{\setboolean{with-cmbright}{true}} +\DeclareOption{comicsans}{\setboolean{with-comicsans}{true}} +\DeclareOption{hyperref}{\setboolean{with-hyperref}{true}} +\DeclareOption{colour}{\setboolean{with-colour}{true}} +\DeclareOption{fancyhdr}{\setboolean{with-fancyhdr}{true}} + +% Options relating to document type (thesis, report, etc) +\ifthenelse{\isundefined{\degreetext}}{\newcommand{\degreetext}{Specify a degree option!}}{} +\DeclareOption{phd}{\renewcommand{\degreetext}{Doctor of Philosophy}} +\DeclareOption{firstyear}{\renewcommand{\degreetext}{First-Year Report\\Maxwell Institute Graduate School}} +\DeclareOption{secondyear}{\renewcommand{\degreetext}{Second-Year Report\\Maxwell Institute Graduate School}} +\DeclareOption{thirdyear}{\renewcommand{\degreetext}{Third-Year Report\\Maxwell Institute Graduate School}} +\DeclareOption{y4project}{\renewcommand{\degreetext}{Year 4 Project\\School of Mathematics}} +\DeclareOption{mmath}{\renewcommand{\degreetext}{Master of Mathematics with Honours \\ School of Mathematics}} +\DeclareOption{masterph}{\renewcommand{\degreetext}{Master of Philosophy}} +\DeclareOption{mastersc}{\renewcommand{\degreetext}{Master of Science by Research}} + +% Options relating to stretchfactor (used for margin spacing) +\ifthenelse{\isundefined{\stretchfactor}}{\newcommand{\stretchfactor}{1}}{} +\DeclareOption{single}{\renewcommand{\stretchfactor}{1}} +\DeclareOption{onehalf}{\renewcommand{\stretchfactor}{1.5}} +\DeclareOption{double}{\renewcommand{\stretchfactor}{2}} + +% Options relating to having single or double sided documents +% \DeclareOption{oneside}{\@twosidefalse \@mparswitchfalse} % Single-sided by default +% \DeclareOption{twosides}{\@twosidetrue \@mparswitchtrue} + + +\ProcessOptions + +% If with-fourier selected, use the Adobe Utopia font. +\ifthenelse{\boolean{with-fourier}}{ + \RequirePackage{cmap} + \RequirePackage{fourier} + \RequirePackage[T1]{fontenc} + \RequirePackage{microtype} +} {} + +% If with-cmbright selected, use the (sans-serif) Computer Modern Bright font. +\ifthenelse{\boolean{with-cmbright}}{ + % NOTE if it doesn't compile, make sure you have CM Bright installed! + \RequirePackage{cmap} + \RequirePackage{cmbright} + \RequirePackage[T1]{fontenc} + \RequirePackage{microtype} +} {} + +% :) +\ifthenelse{\boolean{with-comicsans}}{ + % NOTE must be compiled with xelatex or luatex + \usepackage{fontspec} + \setmainfont{Comic Sans MS} +} {} + +% If with-hyperref selected, configure its default settings +\ifthenelse{\boolean{with-hyperref}}{ + \RequirePackage[dvipsnames]{xcolor} + \RequirePackage[pdftitle={\@title}, pdfauthor={\@author}, pdfcreator={PDFLaTeX with edmaths}, pdfpagelayout=OneColumn, colorlinks=true, linkcolor=black, urlcolor=black, citecolor=black]{hyperref} + % If with-colour selected, use it to make hyperlinks blue not black + \ifthenelse{\boolean{with-colour}}{ + \hypersetup{linkcolor=Sepia, urlcolor=NavyBlue, citecolor=Sepia} + } {} +} {} + +% If with-fancyhdr selected, use it to provide fancier headers and footers +\ifthenelse{\boolean{with-fancyhdr}}{ + \RequirePackage{fancyhdr} + % Define a short title for use in headers if title is too long. Default is the same as title. Usage: use command \shortitle{<your short title here>} *after* calling edmaths. + \newcommand\@shorttitle{\@title} + \newcommand\shorttitle[1]{\renewcommand\@shorttitle{#1}} + \pagestyle{fancy} + \fancyhf{} + % if \fancyhead or \fancyfoot are used without `twoside` in \documentclass{...} then + % fancyhdr will complain that the 'E' used here is useless, so need to condition. + \if@twoside% + %%% put the stuff for true here (twoside=true) + \fancyhead[RO,LE]{\thepage} + \fancyfoot[RO,LE]{\thepage} + \fancyhead[LO]{\it\@shorttitle} + \fancyhead[RE]{\@author} + \fancyfoot[RE,LO]{} + \else% + %%% put the stuff for false here (twoside=false) + \fancyhead[LO]{\it\@shorttitle~~$\cdot$~~\@author} + \fancyhead[R]{\thepage} + \fancyfoot[R,LO]{} + \fi% +} {} + + + +% BODY HEIGHT +% Set up the text body height. For the text height, we calculate the largest number of +% lines that gives us no more than 4cm bottom margin. This depends on the line spacing, +% which we need first. + +\setstretch{\stretchfactor} + +% Debug only: In the next line, \XXXfactor contains the number of lines on a text-only page. +% \newlength{\XXXunit}\setlength{\XXXunit}{1pt}\newlength{\XXXfactor}\setlength{\XXXfactor}{1pt + ((672pt - \topskip) / \baselineskip) * \XXXunit} +\newlength{\scratchlength}\setlength{\scratchlength}{\topskip + ((672pt - \topskip) / \baselineskip) * \baselineskip + \baselineskip} +\setlength{\textheight}{\scratchlength} + + + +% DOCUMENT COMPONENTS +% Provides the formatting for the required document components. Specifically, these are +% the titlepage, declaration, dedication, abstract, and undergraduate project fulfilment. + +\renewcommand{\maketitle}{% + \begin{titlepage} + \singlespacing + \addtolength{\oddsidemargin}{-0.75cm} + \begin{center} + \null\vskip 4.1cm + \begin{minipage}[t][7.6cm]{10.5cm} + \begin{center} + {\LARGE\textbf{\@title}\par} + {\Large\textit{\@author}\par} + \end{center} + \end{minipage} + \vfill + {\Large\degreetext \par The University of Edinburgh \par\@date \par} + \end{center} + \end{titlepage} + % For two-sided documents it's required that a blank page follow the title page. For + % one-sided documents it's required that the title page contribute to the page count. + \if@twoside + \thispagestyle{empty} + \cleardoublepage + \else + \addtocounter{page}{1} + \fi +} + + +% Declaration style for everything except year 4 projects +\newcommand{\declaration}[1]{ + % Doesn't need a chapter number or adding to the contents page + \chapter*{Declaration} + % Must always be single spaced + \begin{singlespace} + \def\param{#1} + \ifx\param\empty + I declare that this thesis was composed by myself + and that the work contained therein is my own, + except where explicitly stated otherwise in the text. + \else + {#1} + \fi + \end{singlespace} + {\raggedleft\vspace{2cm}(\textit{\@author})} +} + + +% Declaration style for year 4 project, argument is degree programme (e.g. MMath) +\newcommand{\yfourdeclaration}[1]{ + \vfill + \noindent + This project report is submitted in partial fulfilment + of the requirements for the degree of \textit{#1}. +} + + +\renewenvironment{abstract}{ + % Abstracts don't need a chapter number... + \chapter*{\abstractname} +}{ + % ...but do need adding to the contents page. + \addcontentsline{toc}{chapter}{\abstractname} +} + + +\newenvironment{laysummary}{ + % A lay summary is required for PhD theses and is not included in the page count. We treat it in a similar way to the abstract here. + \chapter*{Lay Summary} +}{ + \addcontentsline{toc}{chapter}{Lay Summary} +} + + +\newenvironment{acknowledgements}{ + % Acknowledgements environment similar to abtract and lay summary. + \chapter*{Acknowledgements} +}{ + \addcontentsline{toc}{chapter}{Acknowledgements} +} + + +\newcommand{\dedication}[1]{% + % Handled dedications (e.g. 'For Alex', not acknowledgements) + \clearpage + \thispagestyle{plain} + \vspace*{7cm} + \begin{center} + \Large\it #1 + \end{center} +}
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/enverb/enverb.sty b/Master/texmf-dist/tex/latex/enverb/enverb.sty new file mode 100644 index 00000000000..bb15d3fec61 --- /dev/null +++ b/Master/texmf-dist/tex/latex/enverb/enverb.sty @@ -0,0 +1,380 @@ +%% +%% This is file `enverb.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% enverb.dtx (with options: `pkg') +%% +%% -------------------------------------------------------------- +%% enverb -- read an environment verbatim +%% E-mail: jspratte@yahoo.de +%% Released under the LaTeX Project Public License v1.3c or later +%% See http://www.latex-project.org/lppl.txt +%% -------------------------------------------------------------- +%% +%% Copyright (C) 2023-2024 Jonathan P. Spratte +%% +%% This work may be distributed and/or modified under the conditions of the +%% LaTeX Project Public License (LPPL), either version 1.3c of this license or +%% (at your option) any later version. The latest version of this license is in +%% the file: +%% +%% http://www.latex-project.org/lppl.txt +%% +%% This work is "maintained" (as per LPPL maintenance status) by +%% Jonathan P. Spratte. +%% +%% This work consists of the files enverb.dtx +%% enverb-doc.tex +%% and the derived files enverb-doc.pdf +%% enverb.sty +%% +\newcommand*\enverb@date{2024-08-28} +\newcommand*\enverb@version{1.0} +\ProvidesPackage{enverb} + [\enverb@date\space v\enverb@version\space read an environment verbatim] +\providecommand\@thirdofthree[3]{#3} +\providecommand\@firstofnine[9]{#1} +\ExplSyntaxOn +\cs_new_eq:NN \enverb@count \tl_count:n +\cs_new_eq:NN \enverb@ifxTF \token_if_eq_meaning:NNTF +\cs_new_eq:NN \enverb@chargen \char_generate:nn +\cs_set:Npx \enverb@othercr { \char_generate:nn {13} {12} } +\ExplSyntaxOff +\RequirePackage{expkv-def} +\ekvdefinekeys{enverb} + { + protect code ignore = \let\enverb@ifautoignore\@secondoftwo + ,also eint ignore = \enverb@ignore + ,boolTF auto-ignore = \enverb@ifautoignore + ,initial auto-ignore + ,eint more-ignore = \enverb@moreignore + ,initial more-ignore = 2 + ,long store bol = \enverb@bol@content + ,long code bol+ = \enverb@add\enverb@bol@content{#1} + ,long code +bol = \enverb@pre\enverb@bol@content{#1} + ,long store eol = \enverb@eol@content + ,einitial eol = \enverb@othercr + ,long code eol+ = \enverb@add\enverb@eol@content{#1} + ,long code +eol = \enverb@pre\enverb@eol@content{#1} + ,protect code key-handler = \protected\long\def\enverb@keyhandler##1{#1} + ,protect code key-set = \protected\long\ekvsetdef\enverb@keyhandler{#1} + ,unknown code = \enverb@add\enverb@unknown@kv{, {#3} = {#2} } + ,unknown noval = \enverb@add\enverb@unknown@kv{, {#2} } + ,boolTF oarg-not-enverb = \enverb@ifoargtokeyhandler + } +\protected\long\ekvsetdef\enverbsetup{enverb} +\let\enverb@unknown@kv\@empty +\long\def\enverb@stop#1\enverb@stop{} +\protected\def\enverb@error{\PackageError{enverb}} +\protected\def\enverb@misused + {% + \enverb@error + {Misused \string\enverb. Input already tokenised}% + {% + It seems you used the \string\enverb\space based environment + {\@currenvir} inside another\MessageBreak + macro's or a primitive's argument; that doesn't work.% + }% + } +\protected\long\def\enverb@keyhandler#1% + {% + \if\relax\detokenize{#1}\relax + \expandafter\@gobbletwo + \fi + \@firstofone + {% + \enverb@error + {% + Unknown keys encountered: + \expanded + {% + \ekvparse + {\MessageBreak\@spaces\unexpanded}% + {\MessageBreak\@spaces\enverb@keyhandler@}% + {#1}% + }% + \@gobble + }% + {% + Perhaps you misspelled some key names? Or you forgot to set up + custom key\MessageBreak + parsing.% + }% + }% + } +\long\def\enverb@keyhandler@#1{\unexpanded{#1} = \unexpanded} +\begingroup +\lccode`\~=`\^^M +\catcode`\:=13 +\lccode`\:=`\ % <- space +\catcode`\;=13 +\lccode`\;=`\^^I % <- tab +\lowercase{\endgroup +\def\enverb@body@space{} +\def\enverb@body@tab{} +\def\enverb@body@newline{\enverb@collect} +\def\enverb@collect#1~% + {\enverb@ifnotend{#1}{\enverb@bol\unexpanded{#1}\enverb@eol\enverb@collect}} +\protected\def\enverb@body@setup + {% + \let\enverbBody\@empty + \let\do\@makeother\dospecials + \endlinechar=`\^^M + \catcode`\^^M=13 \let~\enverb@body@newline + \catcode`\ =13 \let:\enverb@body@space + \catcode`\^^I=13 \let;\enverb@body@tab + \let\enverb@bol\relax + \let\enverb@eol\relax + } +\long\def\enverb@ifxanyTF#1#2% + {\enverb@ifxanyTF@#1#2\enverb@ifxanyTF@} +\long\def\enverb@ifxanyTF@#1#2% + {% + \enverb@ifxanyTF@ifdone#2\enverb@ifxanyTF@F\enverb@ifxanyTF@ + \enverb@ifxTF#1#2\enverb@ifxanyTF@T{\enverb@ifxanyTF@#1}% + } +\long\def\enverb@ifxanyTF@ifdone#1\enverb@ifxanyTF@{} +\long\def\enverb@ifxanyTF@F + \enverb@ifxanyTF@\enverb@ifxTF#1\enverb@ifxanyTF@T#2#3#4% + {#4} +\long\def\enverb@ifxanyTF@T#1\enverb@ifxanyTF@#2#3{#2} +\def\enverb@search@oarg@ifx#1#2% + {% + \enverb@ifxTF#1\@let@token + {% + \ifenverb@firsteol#2\else\enverb@body@add{#1}\fi + \enverb@search@oarg@b + }% + } +\protected\def\enverb@search@oarg@a + {% + \enverb@search@oarg@ifx:{}% + {% + \enverb@search@oarg@ifx;{}% + {% + \enverb@search@oarg@ifx~\enverb@firsteolfalse + {% + \enverb@ifxTF{[}\@let@token + {\enverb@oarg}% + {% + \enverb@ifxanyTF\@let@token + {% + \@sptoken\par\bgroup\egroup$&##^_% $ + } + {% + \enverb@misused + \endgroup + }% + {% + \ifenverb@firsteol + \expandafter\enverb@body@after@begin + \else + \expandafter\enverb@body + \fi + }% + }% + }% + }% + }% + } +\protected\def\enverb@body + {\edef\enverbBody{\iffalse}\fi\expandafter\enverb@collect\enverbBody} +\def\enverb@body@after@oarg#1~% + {\enverb@ensure@blank{#1}{closing bracket}\enverb@body} +\def\enverb@body@after@begin#1~% + {\enverb@ensure@blank{#1}{\string\begin}\enverb@body} +} +\newcommand\enverb@ensure@blank[2] + {% + \expandafter\enverb@ifempty\expanded{{#1}}{}% + {% + \expanded + {% + \noexpand\enverb@error + {% + Line after #2 not empty.\noexpand\MessageBreak + Contains: \detokenize\expandafter{\romannumeral`\^^@#1}% + }% + {% + \noexpand\enverb will try to ignore this. You should clean up + your input.% + }% + }% + }% + } +\newcommand\enverb@ifempty[1] + {% + \enverb@ifempty@\enverb@ifempty@A#1\enverb@ifempty@B.\enverb@ifempty@true + \enverb@ifempty@A\enverb@ifempty@B + } +\def\enverb@ifempty@#1\enverb@ifempty@A\enverb@ifempty@B#2#3{#3} +\def\enverb@ifempty@true\enverb@ifempty@A\enverb@ifempty@B#1#2{#1} +\protected\long\def\enverb@add#1#2{\edef#1{\unexpanded\expandafter{#1#2}}} +\protected\long\def\enverb@pre#1#2% + {\edef#1{\unexpanded{#2}\unexpanded\expandafter{#1}}} +\protected\def\enverb@body@add{\enverb@add\enverbBody} +\NewDocumentCommand \enverb { s +m } + {% + \expandafter\enverb@ifnotend@setup@perhaps\expanded + {{\string{\@currenvir\string}}}% + \let\enverb@collected@oarg\@empty + \edef\enverb@collected@marg{\unexpanded{#2}}% + \begingroup + \enverb@body@setup + \IfBooleanTF{#1}% + {\enverb@body@after@begin}% + {% + \enverb@firsteoltrue + \enverb@search@oarg + }% + } +\newif\ifenverb@firsteol +\protected\def\enverb@search@oarg{\futurelet\@let@token\enverb@search@oarg@a} +\protected\def\enverb@search@oarg@b{\expandafter\enverb@search@oarg\@gobble} +\protected\def\enverb@oarg{\endgroup\enverb@oarg@} +\NewDocumentCommand\enverb@oarg@{+O{}} + {% + \enverb@add\enverb@collected@oarg{#1}% + \begingroup + \enverb@body@setup + \enverb@body@after@oarg + } +\newcommand\enverb@ifnotend[1]% + {% + \def\enverb@ifnotend##1% + {% + \enverb@ifnotend@ + ##1\enverb@mark\enverb@ifnotend@maybe + #1\enverb@mark\@thirdofthree + \enverb@stop + }% + \def\enverb@ifnotend@##1#1##2\enverb@mark##3##4\enverb@stop{##3{##1}{##2}}% + } +\expandafter\enverb@ifnotend\expanded{{\expandafter\@gobble\string\\end}} +\newcommand\enverb@ifnotend@maybe[2] + {\expandafter\enverb@ifnotend@perhaps\expandafter{\romannumeral`\^^@#2}{#1}} +\protected\def\enverb@ifnotend@setup@perhaps#1% + {% + \def\enverb@ifnotend@perhaps##1% + {% + \enverb@ifnotend@perhaps@\enverb@mark##1\enverb@mark\enverb@ifnotend@end + \enverb@mark#1\enverb@mark\@thirdofthree + \enverb@stop + }% + \def\enverb@ifnotend@perhaps@ + ##1\enverb@mark#1##2\enverb@mark##3##4\enverb@stop + {##3{##2}}% + } +\def\enverb@ifnotend@end#1#2#3% + {% + \iffalse{\fi}% + \enverb@ensure@blank{#1}{\string\end}% + \expandafter\enverb@finalise\expandafter{\enverbBody}{#2}% + } +\protected\def\enverb@finalise#1#2% + {% + \endgroup + \expandafter\enverbsetup\expandafter{\enverb@collected@marg}% + \enverb@ifoargtokeyhandler + {% + \expandafter\enverb@keyhandler\expanded + {{% + \unexpanded\expandafter{\enverb@unknown@kv},% + \unexpanded\expandafter{\enverb@collected@oarg}% + }}% + }% + {% + \expandafter\enverbsetup\expandafter{\enverb@collected@oarg}% + \expandafter\enverb@keyhandler\expandafter{\enverb@unknown@kv}% + }% + \enverb@ifautoignore + {\enverb@setup@ignore{\enverb@count{#2}+\enverb@moreignore}}% + {\enverb@setup@ignore\enverb@ignore}% + \edef\enverb@line##1\enverb@eol + {% + \noexpand\unexpanded{##1}% + %\noexpand\detokenize{##1}% % TODO + \noexpand\unexpanded{\unexpanded\expandafter{\enverb@eol@content}}% + }% + \edef\enverbBody{#1}% + \expandafter\end\expandafter{\@currenvir}% + } +\protected\def\enverb@setup@ignore#1% + {\expandafter\enverb@setup@ignore@\the\numexpr#1\relax;\enverb@line} +\protected\def\enverb@setup@ignore@#1;#2% + {% + \ifnum#1>9 + \expandafter\@firstoftwo + \else + \expandafter\@secondoftwo + \fi + {\expandafter\enverb@setup@ignore@\the\numexpr#1-8;{\@firstofnine{#2}}}% + {% + \let\enverb@bol@gobble\@empty + \expanded + {% + \unexpanded{\renewcommand\enverb@bol@gobble}\ifnum#1>\z@[#1]\fi + {\unexpanded{#2}}% + \unexpanded{\def\enverb@bol##1\enverb@eol}% + {% + \noexpand\unexpanded + {\unexpanded\expandafter{\enverb@bol@content}}% + \unexpanded{\expandafter\enverb@ifempty\expanded}{{##1}}% + {\noexpand\enverb@line}% + {\noexpand\enverb@bol@gobble}% + ##1\noexpand\enverb@eol + }% + }% + }% + } +\def\enverb@rmeol + {% + \ifnum\catcode`\%=14 + \enverb@chargen{`\%}{12}% + \expandafter\enverb@stop + \fi + \enverb@rmeol@0;% + \enverb@stop + } +\def\enverb@rmeol@#1;% + {% + \ifnum#1=128 + \string\relax + \expandafter\enverb@stop + \fi + \@firstofone + {% + \ifnum\catcode`\%=14 + \enverb@chargen{#1}{12}% + \expandafter\enverb@stop + \fi + \expandafter\enverb@rmeol@\the\numexpr#1+1;% + }% + } +\NewDocumentCommand\enverbExecute{} + {% + \begingroup + \newlinechar=`\^^M + \expandafter + \endgroup + \scantokens\expanded + {{% + \detokenize\expandafter{\enverbBody}% + \enverb@rmeol + }}% + } +\NewDocumentCommand \enverbListing { m m } + {% + \scantokens\expanded + {{% + \string\begin{#1}\detokenize{#2}\enverb@othercr + \detokenize\expandafter{\enverbBody}% + \string\end{#1}\enverb@othercr + \enverb@rmeol + }}% + } +%% +%% +%% End of file `enverb.sty'. diff --git a/Master/texmf-dist/tex/latex/fillwith/fillwith.sty b/Master/texmf-dist/tex/latex/fillwith/fillwith.sty new file mode 100644 index 00000000000..9e15d13bf81 --- /dev/null +++ b/Master/texmf-dist/tex/latex/fillwith/fillwith.sty @@ -0,0 +1,349 @@ +%% +%% This is file `fillwith.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% fillwith.dtx (with options: `sty') +%% Copyright (C) 2024 Clea F. Rees. +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3c +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% https://www.latex-project.org/lppl.txt +%% and version 1.3c or later is part of all distributions of LaTeX +%% version 2008-05-04 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Clea F. Rees. +%% +%% This file may only be distributed together with a copy of the package +%% fillwith. You may however distribute the package fillwith without +%% such generated files. +%% +%% This work consists of all files listed in manifest.txt. +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\NeedsTeXFormat{LaTeX2e}[2021-11-15] +\RequirePackage{svn-prov} +\ProvidesPackageSVN[\filebase.sty]{$Id: fillwith.dtx 10202 2024-08-08 15:33:47Z cfrees $}[v0.0 \revinfo][\filebase: fill vertically with non-space] +\DefineFileInfoSVN +\RequirePackage{xcolor} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\@ifundefined{ExplLoaderFileDate}{% + \RequirePackage{expl3}% +}{} +\@ifl@t@r\ExplLoaderFileDate{2022-02-24}{% +}{% + \PackageError{fillwith}{Support package expl3 too old} + {% + You need to update your installation of the bundles 'l3kernel' and + 'l3packages'.\MessageBreak + Loading~fillwith~will~abort!% + }% + \endinput +} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\ExplSyntaxOn +\prop_gput:Nnn \g_msg_module_name_prop { fillwith } { fillwith } + + +\keys_define:nn { fillwith } +{ + color .meta:n = { + colour = #1, + }, + colour .code:n = { + \colorlet{fillwithcolour}{#1} + }, + dotted ~ color .meta:n = { + dotted colour = #1, + }, + dotted color .meta:n = { + dotted colour = #1, + }, + dotted ~ colour .meta:n = { + dotted colour = #1, + }, + dotted colour .code:n = { + \colorlet{fillwithdottedcolour}{#1} + }, + lliw .meta:n = { + colour = #1, + }, + colour .initial:n = gray, + dotted colour .initial:n = black, +} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\providecommand \IfFormatAtLeastTF { \@ifl@t@r \fmtversion } +\IfFormatAtLeastTF { 2022-06-01 } +{ + \ProcessKeyOptions [ fillwith ] +}{ + \RequirePackage { l3keys2e } + \ProcessKeysOptions { fillwith } +} +\IfFormatAtLeastTF { 2020-10-01 }{ +}{ + \RequirePackage { xparse } + \providecommand \ExpandArgs [1] + { \cs_if_exist_use:c { exp_args:N #1 } } +} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\box_new:N \l__fillwith_adj_rule_box +\box_new:N \l__fillwith_part_rule_box +\box_new:N \l__fillwith_tmpa_box +\box_new:N \l__fillwith_tmpb_box +\coffin_new:N \l__fillwith_line_coffin +\coffin_new:N \l__fillwith_lines_coffin +\coffin_new:N \l__fillwith_part_coffin +\coffin_new:N \l__fillwith_tmpa_coffin +\dim_new:N \l__fillwith_ht_dim +\dim_new:N \l__fillwith_dp_dim +\dim_new:N \l__fillwith_rem_dim +\dim_new:N \l__fillwith_line_ht_dim +\dim_new:N \l__fillwith_line_adj_hsize_dim +\dim_set:Nn \l__fillwith_line_ht_dim { 0.4pt } +\dim_new:N \l__fillwith_line_madj_dim +\dim_new:N \l__fillwith_line_vadj_dim +\dim_set_eq:NN \l__fillwith_line_vadj_dim \c_zero_dim +\dim_new:N \l__fillwith_goal_dim +\dim_new:N \l__fillwith_tmpa_dim +\int_new:N \g__fillwith_cnt_int +\cs_new_protected_nopar:Nn \__fillwith_style: {} +\cs_new_protected_nopar:Nn \__fillwith_coffin_tht:N +{ + \dim_eval:n { \coffin_ht:N #1 + \coffin_dp:N #1 } +} +\cs_new_protected_nopar:Npn \__fillwith_hrulefill_part: +{ + \vrule height \c_zero_dim depth \l__fillwith_line_ht_dim width 0.1pt +} +\cs_new_protected_nopar:Npn \__fillwith_hrulefill: +{ + \vrule height \c_zero_dim depth \l__fillwith_line_ht_dim width \l__fillwith_line_adj_hsize_dim +} +\cs_new_protected_nopar:Npn \__fillwith_dottedfill_part: +{ + \hbox to 0.33em {\hss .\hss} +} +\cs_new_protected_nopar:Npn \__fillwith_dottedfill: +{ + \leaders \hbox to 0.33em {\hss .\hss} \hfill \kern \c_zero_dim +} +\NewDocumentCommand\fillwithset { +m }{ + \keys_set:nn { fillwith } { #1 } +} +\keys_define:nn { fillwith } +{ + cont .bool_set:N = \l__fillwith_cont_bool, + cont .default:n = true, + cont .initial:n = false, + fillwith~ht .tl_set:N = \l__fillwith_ht_tl, + fillwith~ht .initial:n = 2, + fillwith~ht .default:n = 2, + goal ~ ht .dim_set:N = \l__fillwith_goal_dim, + line nos .bool_set:N = \l__fillwith_nos_bool, + line ~ nos .bool_set:N = \l__fillwith_nos_bool, + line ~ nos .default:n = true, + line ~ nos .initial:n = false, + no ~ font .tl_set:N = \l__fillwith_no_font_tl, + no ~ font .initial:n = { \normalfont\normalsize }, + no ~ font .default:n = { \normalfont\normalsize }, + style .choices:nn = + { + rule, dots , line , lines , rules , unknown + }{ + \if_case:w \l_keys_choice_int + \or: \cs_set_eq:NN \__fillwith_style: \__fillwith_hrulefill: + \or: \cs_set_eq:NN \__fillwith_style: \__fillwith_dottedfill: + \or: \cs_set_eq:NN \__fillwith_style: \__fillwith_hrulefill: + \or: \cs_set_eq:NN \__fillwith_style: \__fillwith_hrulefill: + \or: \cs_set_eq:NN \__fillwith_style: \__fillwith_hrulefill: + \else: \cs_set_protected_nopar:Nn \__fillwith_style: { \use:c { \l_keys_choice_tl } } + \fi: + \if_case:w \l_keys_choice_int + \or: \cs_set_eq:NN \__fillwith_style_part: \__fillwith_hrulefill_part: + \or: \cs_set_eq:NN \__fillwith_style_part: \__fillwith_dottedfill_part: + \or: \cs_set_eq:NN \__fillwith_style_part: \__fillwith_hrulefill_part: + \or: \cs_set_eq:NN \__fillwith_style_part: \__fillwith_hrulefill_part: + \or: \cs_set_eq:NN \__fillwith_style_part: \__fillwith_hrulefill_part: + \else: \cs_set_protected_nopar:Nn \__fillwith_style_part: { \use:c { \l_keys_choice_tl part } } + \fi: + }, + style .default:n = dots, + style .initial:n = dots, +} +\cs_new_protected_nopar:Nn \__fillwith_fill: +{ + \__fillwith_measures: + \dim_set:Nn \l__fillwith_line_adj_hsize_dim { \hsize - \@totalleftmargin } + \vbox_set:Nn \l__fillwith_adj_rule_box + { + \parindent=0pt + \vrule height \l__fillwith_ht_dim depth \l__fillwith_dp_dim width \c_zero_dim + \skip_horizontal:n { \@totalleftmargin } + \__fillwith_style: + } + \if_mode_horizontal: + \bool_if:NT \l__fillwith_cont_bool + { + \leaders \box_use:N \l__fillwith_part_rule_box \hfill \kern \c_zero_dim + }{ + \vrule height \l__fillwith_ht_dim depth \l__fillwith_dp_dim width \c_zero_dim + } + %^^A gweithio ond erbyn y rheolau + %^^A byddai'n achosi draferth, siwr o fod + % \tex_par:D + %^^A yn lle hynny, ceisio hyn - oes perygl hefyd? + \para_raw_end: + \else: + \unskip + \skip_vertical:n { \l__fillwith_dp_dim } + \fi: + \xleaders \box_use:N \l__fillwith_adj_rule_box \vfill + \para_end: + \normalcolor +} +\cs_new_protected_nopar:Nn \__fillwith_measures: +{ + \color{fillwithcolour} + \offinterlineskip + \hbox_set:Nn \l__fillwith_part_rule_box + { + \strut + \__fillwith_style_part: + \kern \c_zero_dim + } + \dim_set:Nn \l__fillwith_tmpa_dim { \box_ht:N \l__fillwith_part_rule_box } + \dim_set:Nn \l__fillwith_ht_dim { \l__fillwith_ht_tl \l__fillwith_tmpa_dim } + \box_set_ht:Nn \l__fillwith_part_rule_box { \l__fillwith_ht_dim } + \dim_set:Nn \l__fillwith_tmpa_dim { \box_dp:N \l__fillwith_part_rule_box } + % neu \fp_to_dim:n { \l__fillwith_ht_tl * \l__fillwith_tmpa_dim } ?? + \dim_set:Nn \l__fillwith_dp_dim { \l__fillwith_ht_tl \l__fillwith_tmpa_dim } + \box_set_dp:Nn \l__fillwith_part_rule_box { \l__fillwith_dp_dim } +} +\NewDocumentCommand \fillwith { s o } +{ + \group_begin: + \IfValueT { #2 } + { + \keys_set:nn { fillwith } { #2 } + } + \IfBooleanTF { #1 } + { + \bool_set_true:N \l__fillwith_cont_bool + }{ + \bool_set_false:N \l__fillwith_cont_bool + } + \__fillwith_fill: + \group_end: +} +\NewDocumentCommand \fillwithrules { s O { 2 } } +{ + \group_begin: + \IfBooleanTF { #1 } + { + \bool_set_true:N \l__fillwith_cont_bool + }{ + \bool_set_false:N \l__fillwith_cont_bool + } + \keys_set:nn { fillwith } { style = rules, fillwith~ht=#2 } + \__fillwith_fill: + \group_end: +} +\NewDocumentCommand \fillwithdottedlines { s O { 2 } } +{ + \group_begin: + \IfBooleanTF { #1 } + { + \bool_set_true:N \l__fillwith_cont_bool + }{ + \bool_set_false:N \l__fillwith_cont_bool + } + \colorlet{fillwithcolour}{fillwithdottedcolour} + \keys_set:nn { fillwith } { style = dots, fillwith~ht=#2 } + \__fillwith_fill: + \group_end: +} +\cs_new_protected:Nn \__fillwith_nos: % rhybudd: ARAF ! SLOW! +{ + \parindent=0pt + \__fillwith_measures: + \dim_set_eq:NN \l__fillwith_line_adj_hsize_dim \linewidth + \vcoffin_set:Nnn \l__fillwith_line_coffin { \l__fillwith_line_adj_hsize_dim } + { + \parindent=0pt + \vrule height \l__fillwith_ht_dim depth \l__fillwith_dp_dim width \c_zero_dim + \skip_horizontal:n \c_zero_skip + \__fillwith_style: + } + \coffin_set_eq:NN \l__fillwith_lines_coffin \l__fillwith_line_coffin + \if_mode_horizontal: + \bool_if:NTF \l__fillwith_cont_bool + { + \leaders \box_use:N \l__fillwith_part_rule_box \hfill \kern \c_zero_dim + \int_gincr:N \g__fillwith_cnt_int + % \vcoffin_set:Nnn \l__fillwith_tmpa_coffin { 1.5em} + % { + % \l__fillwith_no_font_tl \int_to_arabic:n { \g__fillwith_cnt_int } + % } + % \coffin_mark_handle:Nnnn \l__fillwith_tmpa_coffin {B} {l} { red } + % \coffin_mark_handle:Nnnn \l__fillwith_tmpa_coffin {b} {l} { green } + % \coffin_attach:NnnNnnnn \l__fillwith_lines_coffin {B} {r} \l__fillwith_tmpa_coffin {B} {l} {2.5pt} { \l__fillwith_ht_dim + \l__fillwith_dp_dim } + % \coffin_mark_handle:Nnnn \l__fillwith_lines_coffin {T} {r} { blue } + % \coffin_mark_handle:Nnnn \l__fillwith_lines_coffin {t} {r} { magenta } + \dim_set:Nn \l__fillwith_line_vadj_dim { \l__fillwith_dp_dim } + }{ + \vrule height \l__fillwith_ht_dim depth \l__fillwith_dp_dim width \c_zero_dim + } + \dim_set:Nn \l__fillwith_line_madj_dim { \@totalleftmargin } + \para_raw_end: + \else: + \dim_set_eq:NN \l__fillwith_line_madj_dim \c_zero_dim + \unskip + \skip_vertical:n { \l__fillwith_dp_dim } + \fi: + \int_gincr:N \g__fillwith_cnt_int + \vcoffin_set:Nnn \l__fillwith_tmpa_coffin { 1.5em} + { + \l__fillwith_no_font_tl \int_to_arabic:n { \g__fillwith_cnt_int } + } + \coffin_attach:NnnNnnnn \l__fillwith_lines_coffin {B} {r} \l__fillwith_tmpa_coffin {B} {l} {2.5pt} {\c_zero_dim} + \dim_set:Nn \l__fillwith_rem_dim + { + \l__fillwith_goal_dim -\footskip - \pagetotal + } + \dim_until_do:nNnn { \__fillwith_coffin_tht:N \l__fillwith_lines_coffin } > { \l__fillwith_rem_dim - \l__fillwith_ht_dim - \l__fillwith_dp_dim } + { + \coffin_join:NnnNnnnn \l__fillwith_lines_coffin { b } { l } \l__fillwith_line_coffin { t } { l } { \c_zero_dim } { \c_zero_dim } + \int_gincr:N \g__fillwith_cnt_int + \vcoffin_set:Nnn \l__fillwith_tmpa_coffin {1.5em} + { + \l__fillwith_no_font_tl \int_to_arabic:n { \g__fillwith_cnt_int } + } + \coffin_attach:NnnNnnnn \l__fillwith_lines_coffin {B} {r} \l__fillwith_tmpa_coffin {B} {l} {2.5pt} {\c_zero_dim} + } + \coffin_typeset:Nnnnn \l__fillwith_lines_coffin { B } { l } { \l__fillwith_line_madj_dim } { \l__fillwith_line_vadj_dim } + \para_end: + \normalcolor +} +\NewDocumentCommand \fillwithnolines { s O { } } +{ + \group_begin: + \IfBooleanTF { #1 } + { + \bool_set_true:N \l__fillwith_cont_bool + }{ + \bool_set_false:N \l__fillwith_cont_bool + } + \keys_set:nn { fillwith } { goal ~ ht = \pagegoal, #2 } + \__fillwith_nos: + \group_end: +} +\ExplSyntaxOff +\endinput +%% +%% End of file `fillwith.sty'. diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-UKenglish.def b/Master/texmf-dist/tex/latex/fmtcount/fc-UKenglish.def index f5b00b73e6c..0684f24160c 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-UKenglish.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-UKenglish.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-UKenglish.def,package') %% %% fmtcount.dtx -%% Copyright 2020 Nicola Talbot and Vincent Belache +%% Copyright 2024 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -19,9 +19,9 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache. +%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche. %% -%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. +%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-USenglish.def b/Master/texmf-dist/tex/latex/fmtcount/fc-USenglish.def index 70c269f6d33..44adcd24081 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-USenglish.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-USenglish.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-USenglish.def,package') %% %% fmtcount.dtx -%% Copyright 2020 Nicola Talbot and Vincent Belache +%% Copyright 2024 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -19,9 +19,9 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache. +%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche. %% -%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. +%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-american.def b/Master/texmf-dist/tex/latex/fmtcount/fc-american.def index 7b42aac4fe4..7110cffe419 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-american.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-american.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-american.def,package') %% %% fmtcount.dtx -%% Copyright 2020 Nicola Talbot and Vincent Belache +%% Copyright 2024 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -19,9 +19,9 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache. +%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche. %% -%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. +%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-brazilian.def b/Master/texmf-dist/tex/latex/fmtcount/fc-brazilian.def index 5f0706a0885..160168c5b82 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-brazilian.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-brazilian.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-brazilian.def,package') %% %% fmtcount.dtx -%% Copyright 2020 Nicola Talbot and Vincent Belache +%% Copyright 2024 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -19,9 +19,9 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache. +%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche. %% -%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. +%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-british.def b/Master/texmf-dist/tex/latex/fmtcount/fc-british.def index 7aaaa6afa0a..8cd55dce78a 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-british.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-british.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-british.def,package') %% %% fmtcount.dtx -%% Copyright 2020 Nicola Talbot and Vincent Belache +%% Copyright 2024 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -19,9 +19,9 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache. +%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche. %% -%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. +%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/regulatory/fc-dutch.def b/Master/texmf-dist/tex/latex/fmtcount/fc-dutch.def index ee86d49a48c..78560f50401 100644 --- a/Master/texmf-dist/tex/latex/regulatory/fc-dutch.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-dutch.def @@ -1,25 +1,57 @@ -%% fc-dutch.def -%% Copyright 2024 E. Nijenhuis -% -% This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3c -% of this license or (at your option) any later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX -% version 2005/12/01 or later. -% -% This work has the LPPL maintenance status ‘maintained’. -% -% The Current Maintainer of this work is E. Nijenhuis. -% -% This work consists of the files regulatory.tex, -% regulatory-preamble.tex, regulatory-nl.tex, regulatory-en.tex, -% example1.bib, example2.bib, -% example1-nl.tex, example2-nl.tex, -% example1-en.tex, example2-en.tex, -% md-example.tex, example.md, -% fc-dutch.def and regulatory.sty +%% +%% This is file `fc-dutch.def', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% fmtcount.dtx (with options: `fc-dutch.def,package') +%% +%% fmtcount.dtx +%% Copyright 2024 Nicola Talbot and Vincent Belaïche +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license or (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche. +%% +%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. +%% +%% \CharacterTable +%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z +%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +%%\subsection{Prefixes} +%%\label{sec:latin-prefixes} +%% +%%\begin{definition}[\DescribeMacro{\latinnumeralstring}] +%%\cs{latinnumeralstring}\marg{counter}\oarg{prefix options} +%%\end{definition} +%% +%%\begin{definition}[\DescribeMacro{\latinnumeralstringnum}] +%%\cs{latinnumeralstringnum}\marg{number}\oarg{prefix options} +%%\end{definition} +%% Local Variables: +%% coding: utf-8 +%% compile-command: "make -C ../dist fmtcount.pdf" +%% End: \ProvidesFCLanguage{dutch}[2024/01/27]% \newcommand{\@ordinalMdutch}[2]{\edef#2{\number#1\relax.}}% \global\let\@ordinalMdutch\@ordinalMdutch @@ -28,7 +60,7 @@ \newcommand*\@@unitstringdutch[1]{% \ifcase#1% nul% - \or een% + \or een% één and \'e\'en not working atm \or twee% \or drie% \or vier% @@ -117,7 +149,7 @@ \def#2{null}% \else \ifnum\@strctr=1\relax - \appto#2{een}% + \appto#2{een}% één and \'e\'en not working atm \else \@@numberunderhundreddutch{\@strctr}{#2}% \fi @@ -129,7 +161,6 @@ \let\@teenstring=\@@teenstringdutch% \let\@tenstring=\@@tenstringdutch% \def\@hundred{honderd}\def\@thousand{duizend}% - \def\@andname{en}% \@@numberstringdutch{#1}{#2}% }% \global\let\@numberstringMdutch\@numberstringMdutch @@ -145,7 +176,7 @@ \newcommand*\@@unitthstringdutch[1]{% \ifcase#1% nulde% - \or eerste% + \or eerste% éérste and \'e\'erste not working atm \or tweede% \or derde% \or vierde% @@ -269,7 +300,6 @@ \global\let\@ordinalstringNdutch=\@ordinalstringMdutch \newcommand*{\@OrdinalstringMdutch}[2]{% \@ordinalstringMdutch{#1}{\@@num@str}% - \def\@andname{en}% \def\@hundred{Honderd}\def\@thousand{Duizend}% \def\@hundredth{Honderdste}\def\@thousandth{Duizendste}% \edef#2{\noexpand\MakeUppercase\expandonce\@@num@str}% @@ -290,7 +320,11 @@ \else \ifnum\@tmpstrctr=0\relax \else - \eappto#2{\@unitstring{\@tmpstrctr}en}% + \ifnum\@tmpstrctr=2\relax\def\@andname{ën}% + \else\ifnum\@tmpstrctr=3\relax\def\@andname{ën}% + \else\def\@andname{en}% + \fi\fi% + \eappto#2{\@unitstring{\@tmpstrctr}\@andname}% \fi \@tmpstrctr=#1\relax \divide\@tmpstrctr by 10\relax @@ -310,7 +344,11 @@ \else \ifnum\@tmpstrctr=0\relax \else - \eappto#2{\@unitstring{\@tmpstrctr}-en-}% + \ifnum\@tmpstrctr=2\relax\def\@andname{ën}% + \else\ifnum\@tmpstrctr=3\relax\def\@andname{ën}% + \else\def\@andname{en}% + \fi\fi% + \eappto#2{\@unitstring{\@tmpstrctr}\@andname}% \fi \@tmpstrctr=#1\relax \divide\@tmpstrctr by 10\relax diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-english.def b/Master/texmf-dist/tex/latex/fmtcount/fc-english.def index d6bd6a80a4f..cfd2c710e83 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-english.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-english.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-english.def,package') %% %% fmtcount.dtx -%% Copyright 2020 Nicola Talbot and Vincent Belache +%% Copyright 2024 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -19,9 +19,9 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache. +%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche. %% -%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. +%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-francais.def b/Master/texmf-dist/tex/latex/fmtcount/fc-francais.def index 2e0cbb2eb8b..e7ade01d59d 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-francais.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-francais.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-francais.def,package') %% %% fmtcount.dtx -%% Copyright 2020 Nicola Talbot and Vincent Belache +%% Copyright 2024 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -19,9 +19,9 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache. +%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche. %% -%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. +%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-french.def b/Master/texmf-dist/tex/latex/fmtcount/fc-french.def index 3247cd15851..ea963b6b57a 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-french.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-french.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-french.def,package') %% %% fmtcount.dtx -%% Copyright 2020 Nicola Talbot and Vincent Belache +%% Copyright 2024 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -19,9 +19,9 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache. +%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche. %% -%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. +%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -52,7 +52,7 @@ %% coding: utf-8 %% compile-command: "make -C ../dist fmtcount.pdf" %% End: -\ProvidesFCLanguage{french}[2020/02/24]% +\ProvidesFCLanguage{french}[2017/06/15]% \ifcsundef{fc@gl@let}{\global\let\fc@gl@let\let}{\PackageError{fmtcount}{Command already defined}{Command \protect\fc@gl@let\space already defined.}} \ifcsundef{fc@gl@def}{\global\let\fc@gl@def\def}{\PackageError{fmtcount}{Command already defined}{Command diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-frenchb.def b/Master/texmf-dist/tex/latex/fmtcount/fc-frenchb.def index 3eb9c340033..7f10f3a1aac 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-frenchb.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-frenchb.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-frenchb.def,package') %% %% fmtcount.dtx -%% Copyright 2020 Nicola Talbot and Vincent Belache +%% Copyright 2024 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -19,9 +19,9 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache. +%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche. %% -%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. +%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-german.def b/Master/texmf-dist/tex/latex/fmtcount/fc-german.def index 3a44772de68..e0fa469a7df 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-german.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-german.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-german.def,package') %% %% fmtcount.dtx -%% Copyright 2020 Nicola Talbot and Vincent Belache +%% Copyright 2024 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -19,9 +19,9 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache. +%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche. %% -%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. +%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -72,7 +72,7 @@ \or zwei% \or drei% \or vier% - \or f\"unf% + \or fünf% \or sechs% \or sieben% \or acht% @@ -84,9 +84,9 @@ \ifcase#1% \or zehn% \or zwanzig% - \or drei{\ss}ig% + \or dreißig% \or vierzig% - \or f\"unfzig% + \or fünfzig% \or sechzig% \or siebzig% \or achtzig% @@ -103,10 +103,10 @@ \ifcase#1% zehn% \or elf% - \or zw\"olf% + \or zwölf% \or dreizehn% \or vierzehn% - \or f\"unfzehn% + \or fünfzehn% \or sechzehn% \or siebzehn% \or achtzehn% @@ -188,7 +188,7 @@ \or zweiter% \or dritter% \or vierter% - \or f\"unfter% + \or fünfter% \or sechster% \or siebter% \or achter% @@ -200,9 +200,9 @@ \ifcase#1% \or zehnter% \or zwanzigster% - \or drei{\ss}igster% + \or dreißigster% \or vierzigster% - \or f\"unfzigster% + \or fünfzigster% \or sechzigster% \or siebzigster% \or achtzigster% @@ -214,10 +214,10 @@ \ifcase#1% zehnter% \or elfter% - \or zw\"olfter% + \or zwölfter% \or dreizehnter% \or vierzehnter% - \or f\"unfzehnter% + \or fünfzehnter% \or sechzehnter% \or siebzehnter% \or achtzehnter% @@ -232,7 +232,7 @@ \or zweite% \or dritte% \or vierte% - \or f\"unfte% + \or fünfte% \or sechste% \or siebte% \or achte% @@ -244,9 +244,9 @@ \ifcase#1% \or zehnte% \or zwanzigste% - \or drei{\ss}igste% + \or dreißigste% \or vierzigste% - \or f\"unfzigste% + \or fünfzigste% \or sechzigste% \or siebzigste% \or achtzigste% @@ -258,10 +258,10 @@ \ifcase#1% zehnte% \or elfte% - \or zw\"olfte% + \or zwölfte% \or dreizehnte% \or vierzehnte% - \or f\"unfzehnte% + \or fünfzehnte% \or sechzehnte% \or siebzehnte% \or achtzehnte% @@ -276,7 +276,7 @@ \or zweites% \or drittes% \or viertes% - \or f\"unftes% + \or fünftes% \or sechstes% \or siebtes% \or achtes% @@ -288,9 +288,9 @@ \ifcase#1% \or zehntes% \or zwanzigstes% - \or drei{\ss}igstes% + \or dreißigstes% \or vierzigstes% - \or f\"unfzigstes% + \or fünfzigstes% \or sechzigstes% \or siebzigstes% \or achtzigstes% @@ -302,10 +302,10 @@ \ifcase#1% zehntes% \or elftes% - \or zw\"olftes% + \or zwölftes% \or dreizehntes% \or vierzehntes% - \or f\"unfzehntes% + \or fünfzehntes% \or sechzehntes% \or siebzehntes% \or achtzehntes% diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-germanb.def b/Master/texmf-dist/tex/latex/fmtcount/fc-germanb.def index 45a5602b3a1..9d3c339e61d 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-germanb.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-germanb.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-germanb.def,package') %% %% fmtcount.dtx -%% Copyright 2020 Nicola Talbot and Vincent Belache +%% Copyright 2024 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -19,9 +19,9 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache. +%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche. %% -%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. +%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-italian.def b/Master/texmf-dist/tex/latex/fmtcount/fc-italian.def index 16fe43e5eac..1b43776faf4 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-italian.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-italian.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-italian.def,package') %% %% fmtcount.dtx -%% Copyright 2020 Nicola Talbot and Vincent Belache +%% Copyright 2024 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -19,9 +19,9 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache. +%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche. %% -%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. +%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -57,42 +57,79 @@ \RequirePackage{itnumpar} \newcommand{\@numberstringMitalian}[2]{% - \edef#2{\noexpand\printnumeroinparole{#1}}% + \begingroup + \def\np@oa{o}% + \count@=#1 + \edef\@tempa{\def\noexpand#2{\@numeroinparole{\count@}}}% + \expandafter + \endgroup\@tempa } \global\let\@numberstringMitalian\@numberstringMitalian \newcommand{\@numberstringFitalian}[2]{% - \edef#2{\noexpand\printnumeroinparole{#1}}} + \begingroup + \def\np@oa{a}% + \count@=#1 + \edef\@tempa{\def\noexpand#2{\@numeroinparole{\count@}}}% + \expandafter + \endgroup\@tempa +} \global\let\@numberstringFitalian\@numberstringFitalian \newcommand{\@NumberstringMitalian}[2]{% - \edef#2{\noexpand\printNumeroinparole{#1}}% + \begingroup + \def\np@oa{o}% + \count@=#1 + \edef\@tempa{\def\noexpand#2{\@Numeroinparole{\count@}}}% + \expandafter + \endgroup\@tempa } \global\let\@NumberstringMitalian\@NumberstringMitalian \newcommand{\@NumberstringFitalian}[2]{% - \edef#2{\noexpand\printNumeroinparole{#1}}% + \begingroup + \def\np@oa{a}% + \count@=#1 + \edef\@tempa{\def\noexpand#2{\@Numeroinparole{\count@}}}% + \expandafter + \endgroup\@tempa } \global\let\@NumberstringFitalian\@NumberstringFitalian \newcommand{\@ordinalstringMitalian}[2]{% - \edef#2{\noexpand\printordinalem{#1}}% + \begingroup + \count@=#1 + \edef\@tempa{\def\noexpand#2{\@ordinalem{\count@}}}% + \expandafter + \endgroup\@tempa } \global\let\@ordinalstringMitalian\@ordinalstringMitalian \newcommand{\@ordinalstringFitalian}[2]{% - \edef#2{\noexpand\printordinalef{#1}}% + \begingroup + \count@=#1 + \edef\@tempa{\def\noexpand#2{\@ordinalef{\count@}}}% + \expandafter + \endgroup\@tempa } \global\let\@ordinalstringFitalian\@ordinalstringFitalian \newcommand{\@OrdinalstringMitalian}[2]{% - \edef#2{\noexpand\printOrdinalem{#1}}% + \begingroup + \count@=#1 + \edef\@tempa{\def\noexpand#2{\@Ordinalem{\count@}}}% + \expandafter + \endgroup\@tempa } \global\let\@OrdinalstringMitalian\@OrdinalstringMitalian \newcommand{\@OrdinalstringFitalian}[2]{% - \edef#2{\noexpand\printOrdinalef{#1}}% + \begingroup + \count@=#1 + \edef\@tempa{\def\noexpand#2{\@Ordinalef{\count@}}}% + \expandafter + \endgroup\@tempa } \global\let\@OrdinalstringFitalian\@OrdinalstringFitalian diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-ngerman.def b/Master/texmf-dist/tex/latex/fmtcount/fc-ngerman.def index 27a65543963..a25ce620709 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-ngerman.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-ngerman.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-ngerman.def,package') %% %% fmtcount.dtx -%% Copyright 2020 Nicola Talbot and Vincent Belache +%% Copyright 2024 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -19,9 +19,9 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache. +%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche. %% -%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. +%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-ngermanb.def b/Master/texmf-dist/tex/latex/fmtcount/fc-ngermanb.def index c6797d56884..dc2048c7960 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-ngermanb.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-ngermanb.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-ngermanb.def,package') %% %% fmtcount.dtx -%% Copyright 2020 Nicola Talbot and Vincent Belache +%% Copyright 2024 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -19,9 +19,9 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache. +%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche. %% -%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. +%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def b/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def index 0a5e7fa968b..ec3bc746268 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-portuges.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-portuges.def,package') %% %% fmtcount.dtx -%% Copyright 2020 Nicola Talbot and Vincent Belache +%% Copyright 2024 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -19,9 +19,9 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache. +%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche. %% -%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. +%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-portuguese.def b/Master/texmf-dist/tex/latex/fmtcount/fc-portuguese.def index 480bf186075..864bf58ad2c 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-portuguese.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-portuguese.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-portuguese.def,package') %% %% fmtcount.dtx -%% Copyright 2020 Nicola Talbot and Vincent Belache +%% Copyright 2024 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -19,9 +19,9 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache. +%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche. %% -%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. +%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def b/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def index 4ac3cf1f359..78887dd24d8 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def +++ b/Master/texmf-dist/tex/latex/fmtcount/fc-spanish.def @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fc-spanish.def,package') %% %% fmtcount.dtx -%% Copyright 2020 Nicola Talbot and Vincent Belache +%% Copyright 2024 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -19,9 +19,9 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache. +%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche. %% -%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. +%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -115,7 +115,7 @@ \or trece% \or catorce% \or quince% - \or diecis\'eis% + \or dieciséis% \or diecisiete% \or dieciocho% \or diecinueve% @@ -126,11 +126,11 @@ \ifcase#1\relax veinte% \or veintiuno% - \or veintid\'os% - \or veintitr\'es% + \or veintidós% + \or veintitrés% \or veinticuatro% \or veinticinco% - \or veintis\'eis% + \or veintiséis% \or veintisiete% \or veintiocho% \or veintinueve% @@ -141,11 +141,11 @@ \ifcase#1\relax veinte% \or veintiuna% - \or veintid\'os% - \or veintitr\'es% + \or veintidós% + \or veintitrés% \or veinticuatro% \or veinticinco% - \or veintis\'eis% + \or veintiséis% \or veintisiete% \or veintiocho% \or veintinueve% @@ -233,7 +233,7 @@ \or Trece% \or Catorce% \or Quince% - \or Diecis\'eis% + \or Dieciséis% \or Diecisiete% \or Dieciocho% \or Diecinueve% @@ -244,11 +244,11 @@ \ifcase#1\relax Veinte% \or Veintiuno% - \or Veintid\'os% - \or Veintitr\'es% + \or Veintidós% + \or Veintitrés% \or Veinticuatro% \or Veinticinco% - \or Veintis\'eis% + \or Veintiséis% \or Veintisiete% \or Veintiocho% \or Veintinueve% @@ -259,11 +259,11 @@ \ifcase#1\relax Veinte% \or Veintiuna% - \or Veintid\'os% - \or Veintitr\'es% + \or Veintidós% + \or Veintitrés% \or Veinticuatro% \or Veinticinco% - \or Veintis\'eis% + \or Veintiséis% \or Veintisiete% \or Veintiocho% \or Veintinueve% @@ -350,7 +350,7 @@ \let\@teenthstring=\@@teenthstringspanish \let\@tenthstring=\@@tenthstringspanish \let\@hundredthstring=\@@hundredthstringspanish - \def\@thousandth{mil\'esimo}% + \def\@thousandth{milésimo}% \@@ordinalstringspanish{#1}{#2}% }% \global\let\@ordinalstringMspanish\@ordinalstringMspanish @@ -360,7 +360,7 @@ \let\@teenthstring=\@@teenthstringFspanish \let\@tenthstring=\@@tenthstringFspanish \let\@hundredthstring=\@@hundredthstringFspanish - \def\@thousandth{mil\'esima}% + \def\@thousandth{milésima}% \@@ordinalstringspanish{#1}{#2}% }% \global\let\@ordinalstringFspanish\@ordinalstringFspanish @@ -371,7 +371,7 @@ \let\@teenthstring=\@@Teenthstringspanish \let\@tenthstring=\@@Tenthstringspanish \let\@hundredthstring=\@@Hundredthstringspanish - \def\@thousandth{Mil\'esimo}% + \def\@thousandth{Milésimo}% \@@ordinalstringspanish{#1}{#2}% } \global\let\@OrdinalstringMspanish\@OrdinalstringMspanish @@ -381,7 +381,7 @@ \let\@teenthstring=\@@TeenthstringFspanish \let\@tenthstring=\@@TenthstringFspanish \let\@hundredthstring=\@@HundredthstringFspanish - \def\@thousandth{Mil\'esima}% + \def\@thousandth{Milésima}% \@@ordinalstringspanish{#1}{#2}% }% \global\let\@OrdinalstringFspanish\@OrdinalstringFspanish @@ -395,7 +395,7 @@ \or cuarto% \or quinto% \or sexto% - \or s\'eptimo% + \or séptimo% \or octavo% \or noveno% \fi @@ -403,28 +403,28 @@ \global\let\@@unitthstringspanish\@@unitthstringspanish \newcommand*\@@tenthstringspanish[1]{% \ifcase#1\relax - \or d\'ecimo% - \or vig\'esimo% - \or trig\'esimo% - \or cuadrag\'esimo% - \or quincuag\'esimo% - \or sexag\'esimo% - \or septuag\'esimo% - \or octog\'esimo% - \or nonag\'esimo% + \or décimo% + \or vigésimo% + \or trigésimo% + \or cuadragésimo% + \or quincuagésimo% + \or sexagésimo% + \or septuagésimo% + \or octogésimo% + \or nonagésimo% \fi }% \global\let\@@tenthstringspanish\@@tenthstringspanish \newcommand*\@@teenthstringspanish[1]{% \ifcase#1\relax - d\'ecimo% - \or und\'ecimo% - \or duod\'ecimo% + décimo% + \or undécimo% + \or duodécimo% \or decimotercero% \or decimocuarto% \or decimoquinto% \or decimosexto% - \or decimos\'eptimo% + \or decimoséptimo% \or decimoctavo% \or decimonoveno% \fi @@ -432,15 +432,15 @@ \global\let\@@teenthstringspanish\@@teenthstringspanish \newcommand*\@@hundredthstringspanish[1]{% \ifcase#1\relax - \or cent\'esimo% - \or ducent\'esimo% - \or tricent\'esimo% - \or cuadringent\'esimo% - \or quingent\'esimo% - \or sexcent\'esimo% - \or septing\'esimo% - \or octingent\'esimo% - \or noningent\'esimo% + \or centésimo% + \or ducentésimo% + \or tricentésimo% + \or cuadringentésimo% + \or quingentésimo% + \or sexcentésimo% + \or septingésimo% + \or octingentésimo% + \or noningentésimo% \fi }% \global\let\@@hundredthstringspanish\@@hundredthstringspanish @@ -453,7 +453,7 @@ \or cuarta% \or quinta% \or sexta% - \or s\'eptima% + \or séptima% \or octava% \or novena% \fi @@ -461,28 +461,28 @@ \global\let\@@unitthstringFspanish\@@unitthstringFspanish \newcommand*\@@tenthstringFspanish[1]{% \ifcase#1\relax - \or d\'ecima% - \or vig\'esima% - \or trig\'esima% - \or cuadrag\'esima% - \or quincuag\'esima% - \or sexag\'esima% - \or septuag\'esima% - \or octog\'esima% - \or nonag\'esima% + \or décima% + \or vigésima% + \or trigésima% + \or cuadragésima% + \or quincuagésima% + \or sexagésima% + \or septuagésima% + \or octogésima% + \or nonagésima% \fi }% \global\let\@@tenthstringFspanish\@@tenthstringFspanish \newcommand*\@@teenthstringFspanish[1]{% \ifcase#1\relax - d\'ecima% - \or und\'ecima% - \or duod\'ecima% + décima% + \or undécima% + \or duodécima% \or decimotercera% \or decimocuarta% \or decimoquinta% \or decimosexta% - \or decimos\'eptima% + \or decimoséptima% \or decimoctava% \or decimonovena% \fi @@ -490,15 +490,15 @@ \global\let\@@teenthstringFspanish\@@teenthstringFspanish \newcommand*\@@hundredthstringFspanish[1]{% \ifcase#1\relax - \or cent\'esima% - \or ducent\'esima% - \or tricent\'esima% - \or cuadringent\'esima% - \or quingent\'esima% - \or sexcent\'esima% - \or septing\'esima% - \or octingent\'esima% - \or noningent\'esima% + \or centésima% + \or ducentésima% + \or tricentésima% + \or cuadringentésima% + \or quingentésima% + \or sexcentésima% + \or septingésima% + \or octingentésima% + \or noningentésima% \fi }% \global\let\@@hundredthstringFspanish\@@hundredthstringFspanish @@ -511,7 +511,7 @@ \or Cuarto% \or Quinto% \or Sexto% - \or S\'eptimo% + \or Séptimo% \or Octavo% \or Noveno% \fi @@ -519,28 +519,28 @@ \global\let\@@Unitthstringspanish\@@Unitthstringspanish \newcommand*\@@Tenthstringspanish[1]{% \ifcase#1\relax - \or D\'ecimo% - \or Vig\'esimo% - \or Trig\'esimo% - \or Cuadrag\'esimo% - \or Quincuag\'esimo% - \or Sexag\'esimo% - \or Septuag\'esimo% - \or Octog\'esimo% - \or Nonag\'esimo% + \or Décimo% + \or Vigésimo% + \or Trigésimo% + \or Cuadragésimo% + \or Quincuagésimo% + \or Sexagésimo% + \or Septuagésimo% + \or Octogésimo% + \or Nonagésimo% \fi }% \global\let\@@Tenthstringspanish\@@Tenthstringspanish \newcommand*\@@Teenthstringspanish[1]{% \ifcase#1\relax - D\'ecimo% - \or Und\'ecimo% - \or Duod\'ecimo% + Décimo% + \or Undécimo% + \or Duodécimo% \or Decimotercero% \or Decimocuarto% \or Decimoquinto% \or Decimosexto% - \or Decimos\'eptimo% + \or Decimoséptimo% \or Decimoctavo% \or Decimonoveno% \fi @@ -548,15 +548,15 @@ \global\let\@@Teenthstringspanish\@@Teenthstringspanish \newcommand*\@@Hundredthstringspanish[1]{% \ifcase#1\relax - \or Cent\'esimo% - \or Ducent\'esimo% - \or Tricent\'esimo% - \or Cuadringent\'esimo% - \or Quingent\'esimo% - \or Sexcent\'esimo% - \or Septing\'esimo% - \or Octingent\'esimo% - \or Noningent\'esimo% + \or Centésimo% + \or Ducentésimo% + \or Tricentésimo% + \or Cuadringentésimo% + \or Quingentésimo% + \or Sexcentésimo% + \or Septingésimo% + \or Octingentésimo% + \or Noningentésimo% \fi }% \global\let\@@Hundredthstringspanish\@@Hundredthstringspanish @@ -569,7 +569,7 @@ \or Cuarta% \or Quinta% \or Sexta% - \or S\'eptima% + \or Séptima% \or Octava% \or Novena% \fi @@ -577,28 +577,28 @@ \global\let\@@UnitthstringFspanish\@@UnitthstringFspanish \newcommand*\@@TenthstringFspanish[1]{% \ifcase#1\relax - \or D\'ecima% - \or Vig\'esima% - \or Trig\'esima% - \or Cuadrag\'esima% - \or Quincuag\'esima% - \or Sexag\'esima% - \or Septuag\'esima% - \or Octog\'esima% - \or Nonag\'esima% + \or Décima% + \or Vigésima% + \or Trigésima% + \or Cuadragésima% + \or Quincuagésima% + \or Sexagésima% + \or Septuagésima% + \or Octogésima% + \or Nonagésima% \fi }% \global\let\@@TenthstringFspanish\@@TenthstringFspanish \newcommand*\@@TeenthstringFspanish[1]{% \ifcase#1\relax - D\'ecima% - \or Und\'ecima% - \or Duod\'ecima% + Décima% + \or Undécima% + \or Duodécima% \or Decimotercera% \or Decimocuarta% \or Decimoquinta% \or Decimosexta% - \or Decimos\'eptima% + \or Decimoséptima% \or Decimoctava% \or Decimonovena% \fi @@ -606,15 +606,15 @@ \global\let\@@TeenthstringFspanish\@@TeenthstringFspanish \newcommand*\@@HundredthstringFspanish[1]{% \ifcase#1\relax - \or Cent\'esima% - \or Ducent\'esima% - \or Tricent\'esima% - \or Cuadringent\'esima% - \or Quingent\'esima% - \or Sexcent\'esima% - \or Septing\'esima% - \or Octingent\'esima% - \or Noningent\'esima% + \or Centésima% + \or Ducentésima% + \or Tricentésima% + \or Cuadringentésima% + \or Quingentésima% + \or Sexcentésima% + \or Septingésima% + \or Octingentésima% + \or Noningentésima% \fi }% \global\let\@@HundredthstringFspanish\@@HundredthstringFspanish diff --git a/Master/texmf-dist/tex/latex/fmtcount/fcnumparser.sty b/Master/texmf-dist/tex/latex/fmtcount/fcnumparser.sty index f18155fb4c5..654a74c1ec7 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fcnumparser.sty +++ b/Master/texmf-dist/tex/latex/fmtcount/fcnumparser.sty @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fcnumparser.sty,package') %% %% fmtcount.dtx -%% Copyright 2020 Nicola Talbot and Vincent Belache +%% Copyright 2024 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -19,9 +19,9 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache. +%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche. %% -%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. +%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/fmtcount/fcprefix.sty b/Master/texmf-dist/tex/latex/fmtcount/fcprefix.sty index 880e570cb76..1685bcfa21e 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fcprefix.sty +++ b/Master/texmf-dist/tex/latex/fmtcount/fcprefix.sty @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fcprefix.sty,package') %% %% fmtcount.dtx -%% Copyright 2020 Nicola Talbot and Vincent Belache +%% Copyright 2024 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -19,9 +19,9 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache. +%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche. %% -%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. +%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z diff --git a/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty b/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty index c60688b1004..4d43137dcae 100644 --- a/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty +++ b/Master/texmf-dist/tex/latex/fmtcount/fmtcount.sty @@ -7,7 +7,7 @@ %% fmtcount.dtx (with options: `fmtcount.sty,package') %% %% fmtcount.dtx -%% Copyright 2020 Nicola Talbot and Vincent Belache +%% Copyright 2024 Nicola Talbot and Vincent Belaïche %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -19,9 +19,9 @@ %% %% This work has the LPPL maintenance status `maintained'. %% -%% The Current Maintainer of this work is Nicola Talbot and Vincent Belache. +%% The Current Maintainer of this work is Nicola Talbot and Vincent Belaïche. %% -%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. +%% This work consists of the files fmtcount.dtx and fmtcount.ins and the derived files fc-american.def, fc-brazilian.def, fc-british.def, fc-dutch.def, fc-english.def, fc-francais.def, fc-french.def, fc-frenchb.def, fc-german.def, fc-germanb.def, fc-italian.def, fc-ngerman.def, fc-ngermanb.def, fc-portuges.def, fc-portuguese.def, fc-spanish.def, fc-UKenglish.def, fc-USenglish.def, fcnumparser.sty, fcprefix.sty, fmtcount.sty. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -54,7 +54,7 @@ %% End: \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{fmtcount}[2020/01/30 v3.07] +\ProvidesPackage{fmtcount}[2024/08/31 v3.08] \RequirePackage{ifthen} \RequirePackage{xkeyval} \RequirePackage{etoolbox} @@ -119,7 +119,8 @@ german,% germanb,% ngerman,% ngermanb,% -italian} +italian,% +dutch} \newcommand*\fc@iterate@on@languages[1]{% \ifx\fc@supported@language@list\@empty \PackageError{fmtcount}{Macro `\protect\@fc@iterate@on@languages' is empty}{You should never get here: @@ -937,7 +938,7 @@ italian} \protect\@numberstringM{#1}{\@fc@numstr}% }% }% - \MakeUppercase{\@fc@numstr}% + \protect\MakeUppercase{\@fc@numstr}% }% } \providecommand*{\binary}[1]{% diff --git a/Master/texmf-dist/tex/latex/fontscale/fontscale.sty b/Master/texmf-dist/tex/latex/fontscale/fontscale.sty index d032e49860a..81a3a828b80 100644 --- a/Master/texmf-dist/tex/latex/fontscale/fontscale.sty +++ b/Master/texmf-dist/tex/latex/fontscale/fontscale.sty @@ -1,33 +1,32 @@ -% Package : fontscale -- A user interface for setting document font sizes +% Package : fontscale -- A flexible interface for setting font sizes % Copyright : 2024 (c) Oliver Beery <beeryoliver@gmail.com> % CTAN : https://ctan.org/pkg/fontscale % Repository: https://github.com/beeryoliver/fontscale % License : The LaTeX Project Public License 1.3c -% The 2022-06-01 LaTeX kernel update added \ProcessKeyOptions. -\NeedsTeXFormat{LaTeX2e}[2022-06-01] +% LaTeX2e version 2023-11-01 added \IfExplAtLeastTF. +\NeedsTeXFormat{LaTeX2e}[2023-11-01] \ProvidesExplPackage {fontscale} - {2024-05-17} - {1.3.0} - {A user interface for setting document font sizes} + {2024-08-29} + {2.2.0} + {A flexible interface for setting font sizes} -% The 2023-10-10 l3kernel update added many 'e'-variants. -\IfExplAtLeastTF { 2023-10-10 } - { } +% l3kernel version 2023-10-10 added many 'e'-variants. +\IfExplAtLeastTF { 2023-10-10 } { } { \msg_new:nnn { fontscale } { expl3-out-of-date } { - The~ package~ could~ not~ load.~ - The~ fontscale~ package~ requires~ - L3~ programming~ layer~ version~ 2023-10-10~ or~ later. + The~ fontscale~ package~ could~ not~ load.~ + This~ package~ requires~ + L3~ programming~ layer~ version~ 2023-10-10~ or~ newer. } \msg_critical:nn { fontscale } { expl3-out-of-date } } % This package does not require any other packages! -% DECLARE FONT PARAMETER VARIABLES +% DECLARE FONT SIZE PARAMETER VARIABLES \fp_const:Nn \c_fontscale_tiny_step_fp { -4 } \fp_const:Nn \c_fontscale_scriptsize_step_fp { -3 } @@ -74,31 +73,7 @@ \skip_new:N \l_fontscale_huge_baselineskip_skip \skip_new:N \l_fontscale_Huge_baselineskip_skip -\prop_new:N \l_fontscale_tiny_prop -\prop_new:N \l_fontscale_scriptsize_prop -\prop_new:N \l_fontscale_footnotesize_prop -\prop_new:N \l_fontscale_small_prop -\prop_new:N \l_fontscale_normalsize_prop -\prop_new:N \l_fontscale_large_prop -\prop_new:N \l_fontscale_Large_prop -\prop_new:N \l_fontscale_LARGE_prop -\prop_new:N \l_fontscale_huge_prop -\prop_new:N \l_fontscale_Huge_prop - -\prop_put:Nnn \l_fontscale_tiny_prop { step } { -4 } -\prop_put:Nnn \l_fontscale_scriptsize_prop { step } { -3 } -\prop_put:Nnn \l_fontscale_footnotesize_prop { step } { -2 } -\prop_put:Nnn \l_fontscale_small_prop { step } { -1 } -\prop_put:Nnn \l_fontscale_normalsize_prop { step } { 0 } -\prop_put:Nnn \l_fontscale_large_prop { step } { 1 } -\prop_put:Nnn \l_fontscale_Large_prop { step } { 2 } -\prop_put:Nnn \l_fontscale_LARGE_prop { step } { 3 } -\prop_put:Nnn \l_fontscale_huge_prop { step } { 4 } -\prop_put:Nnn \l_fontscale_Huge_prop { step } { 5 } - -\prop_put:Nnn \l_fontscale_normalsize_prop { scale } { 1 } - -% INITIALIZE FONT PARAMETER VARIABLES +% INITIALIZE FONT SIZE PARAMETER VARIABLES \fp_set:Nn \l_fontscale_tiny_scale_fp { 0.6 } \fp_set:Nn \l_fontscale_scriptsize_scale_fp { 0.7 } @@ -132,177 +107,221 @@ \skip_set:Nn \l_fontscale_huge_baselineskip_skip { 19.2pt } \skip_set:Nn \l_fontscale_Huge_baselineskip_skip { 21.6pt } -\prop_put:Nnn \l_fontscale_tiny_prop { scale } { 0.6 } -\prop_put:Nnn \l_fontscale_scriptsize_prop { scale } { 0.7 } -\prop_put:Nnn \l_fontscale_footnotesize_prop { scale } { 0.8 } -\prop_put:Nnn \l_fontscale_small_prop { scale } { 0.9 } -\prop_put:Nnn \l_fontscale_large_prop { scale } { 1.1 } -\prop_put:Nnn \l_fontscale_Large_prop { scale } { 1.2 } -\prop_put:Nnn \l_fontscale_LARGE_prop { scale } { 1.4 } -\prop_put:Nnn \l_fontscale_huge_prop { scale } { 1.6 } -\prop_put:Nnn \l_fontscale_Huge_prop { scale } { 1.8 } - -\prop_put:Nnn \l_fontscale_tiny_prop { size } { 6pt } -\prop_put:Nnn \l_fontscale_scriptsize_prop { size } { 7pt } -\prop_put:Nnn \l_fontscale_footnotesize_prop { size } { 8pt } -\prop_put:Nnn \l_fontscale_small_prop { size } { 9pt } -\prop_put:Nnn \l_fontscale_normalsize_prop { size } { 10pt } -\prop_put:Nnn \l_fontscale_large_prop { size } { 11pt } -\prop_put:Nnn \l_fontscale_Large_prop { size } { 12pt } -\prop_put:Nnn \l_fontscale_LARGE_prop { size } { 14pt } -\prop_put:Nnn \l_fontscale_huge_prop { size } { 16pt } -\prop_put:Nnn \l_fontscale_Huge_prop { size } { 18pt } - -\prop_put:Nnn \l_fontscale_tiny_prop { baselineskip } { 7.2pt } -\prop_put:Nnn \l_fontscale_scriptsize_prop { baselineskip } { 8.4pt } -\prop_put:Nnn \l_fontscale_footnotesize_prop { baselineskip } { 9.6pt } -\prop_put:Nnn \l_fontscale_small_prop { baselineskip } { 10.8pt } -\prop_put:Nnn \l_fontscale_normalsize_prop { baselineskip } { 12 pt } -\prop_put:Nnn \l_fontscale_large_prop { baselineskip } { 13.2pt } -\prop_put:Nnn \l_fontscale_Large_prop { baselineskip } { 14.4pt } -\prop_put:Nnn \l_fontscale_LARGE_prop { baselineskip } { 16.8pt } -\prop_put:Nnn \l_fontscale_huge_prop { baselineskip } { 19.2pt } -\prop_put:Nnn \l_fontscale_Huge_prop { baselineskip } { 21.6pt } - % SOME VARIABLES -% Used for mapping. -\tl_const:Nn \c__fontscale_names_tl - { - {tiny} {scriptsize} {footnotesize} {small} {normalsize} - {large} {Large} {LARGE} {huge} {Huge} - } -\tl_const:Nn \c__fontscale_names_other_tl - { - {tiny} {scriptsize} {footnotesize} {small} - {large} {Large} {LARGE} {huge} {Huge} - } - % Used to speed up floating point calculations. \fp_new:N \l__fontscale_normalsize_size_fp \fp_set:Nn \l__fontscale_normalsize_size_fp { 10 } +\fp_new:N \l__fontscale_musical_base_fp \fp_new:N \l__fontscale_musical_notes_fp -% Temporary variables -\tl_new:N \l__fontscale_step_tl -\tl_new:N \l__fontscale_scale_tl -\dim_new:N \l__fontscale_size_dim - -% SOME HELPER FUNCTIONS - -% Sets a dimen/skip variable from a dimen/skip expression, supplying a default -% unit of pt. -\cs_new_protected:Npn \__fontscale_dim_set_with_default_pt:Nn #1#2 - { \@defaultunits #1 = \dimexpr #2 pt \relax \relax \@nnil } -\cs_generate_variant:Nn \__fontscale_dim_set_with_default_pt:Nn { c } -\cs_new_protected:Npn \__fontscale_skip_set_with_default_pt:Nn #1#2 - { \@defaultunits #1 = \glueexpr #2 pt \relax \@nnil } -\cs_generate_variant:Nn \__fontscale_skip_set_with_default_pt:Nn { c } -% Used to define \tiny to \Huge. Need \dim_use:N for compatibility with the -% microtype package. Otherwise the following would do: -% \cs_new_protected:Npn \__fontscale_fontsize:NNN { \@setfontsize } -\cs_new_protected:Npn \__fontscale_fontsize:NNN #1#2 - { \@setfontsize #1 { \dim_use:N #2 } } -% Similar to \fontsize + \selectfont, except that it takes dimen and skip -% expressions as arguments and avoids the issue where \f@size is set to the new -% font size before the second argument is expanded. +% Scratch variables +\tl_new:N \l__fontscale_tmp_tl +\str_new:N \l__fontscale_tmp_str +\dim_new:N \l__fontscale_tmp_dim +\skip_new:N \l__fontscale_tmp_skip +\fp_new:N \l__fontscale_tmp_fp + +% SOME FUNCTIONS + +% Variants of l3kernel functions +\cs_generate_variant:Nn \msg_error:nnnnn { nnVV , nnvv } +\cs_generate_variant:Nn \msg_error:nnnn { nnv , nne } +% Sets a dimen/skip variable from a dimen/skip expression, appending a default +% unit of pt. This also removes extra tokens. +\cs_new_protected:Npn \__fontscale_dim_set_default_pt:Nn #1#2 + { + \afterassignment \use_none_delimit_by_q_stop:w + #1 = \dimexpr #2 pt \relax \relax + \q_stop + } +\cs_generate_variant:Nn \__fontscale_dim_set_default_pt:Nn { c } +\cs_new_protected:Npn \__fontscale_skip_set_default_pt:Nn #1#2 + { + \afterassignment \use_none_delimit_by_q_stop:w + #1 = \glueexpr #2 pt \relax + \q_stop + } +\cs_generate_variant:Nn \__fontscale_skip_set_default_pt:Nn { c } +% Similar to \@setfontsize. Used to define \tiny to \Huge. Need \dim_use:N for +% compatibility with the microtype package. +\cs_new_protected:Npn \__fontscale_fontsize:NNN #1#2#3 + { + \mode_if_math:TF + { + \msg_warning:nne { fontscale } { math-mode-warning } + { \token_to_str:N #1 } + } + { + \cs_set_eq:NN \@currsize #1 + \fontsize { \dim_use:N #2 } #3 \selectfont + } + } +% Similar to \fontsize + \selectfont, except that it: +% (1) Takes dimen and skip expressions as arguments. +% (2) Avoids the issue where \f@size is set to the new font size before the +% second argument is expanded. +% (3) Provides error checking for the font size and font baselineskip. +\dim_new:N \l__fontscale_fontsize_dim \skip_new:N \l__fontscale_fontsize_skip \cs_new_protected:Npn \__fontscale_fontsize:nn #1#2 { - \__fontscale_skip_set_with_default_pt:Nn \l__fontscale_fontsize_skip {#2} - \fontsize { = \dimexpr #1 pt \relax \relax } \l__fontscale_fontsize_skip - \selectfont + \__fontscale_dim_set_default_pt:Nn \l__fontscale_fontsize_dim {#1} + \__fontscale_skip_set_default_pt:Nn \l__fontscale_fontsize_skip {#2} + \dim_compare:nNnTF \l__fontscale_fontsize_dim > \c_zero_dim + { + \dim_compare:nNnTF \l__fontscale_fontsize_skip < + \l__fontscale_fontsize_dim + { + \msg_error:nnVV { fontscale } { font-baselineskip-out-of-bounds } + \l__fontscale_fontsize_skip \l__fontscale_fontsize_dim + } + { + \fontsize \l__fontscale_fontsize_dim \l__fontscale_fontsize_skip + \selectfont + } + } + { + \msg_error:nnV { fontscale } { font-size-out-of-bounds } + \l__fontscale_fontsize_dim + } } % Similar to the above function, except that it sets the font baselineskip % equal to the new font size times the baselineskip-size-ratio. \cs_new_protected:Npn \__fontscale_fontsize:n #1 { - \fontsize { = \dimexpr #1 pt \relax \relax } - { \fp_to_dim:n { \f@size * \l__fontscale_baselineskip_size_ratio_fp } } - \selectfont + \__fontscale_dim_set_default_pt:Nn \l__fontscale_fontsize_dim {#1} + \dim_compare:nNnTF \l__fontscale_fontsize_dim > \c_zero_dim + { + \fontsize \l__fontscale_fontsize_dim + { + \fp_to_dim:n + { + \l__fontscale_fontsize_dim + * \l__fontscale_baselineskip_size_ratio_fp + } + } + \selectfont + } + { + \msg_error:nnV { fontscale } { font-size-out-of-bounds } + \l__fontscale_fontsize_dim + } } % MESSAGES -\msg_new:nnn { fontscale } { modular-ratio-out-of-bounds } +\msg_new:nnn { fontscale } { key-baselineskip-size-ratio-out-of-bounds } { - The~ value~ for~ the~ key~ 'modular / ratio'~ - \msg_line_context: \c_space_tl - must~ be~ greater~ than~ 1. + Invalid~ value~ '#1'~ \msg_line_context:. \\ + The~ value~ of~ the~ key~ 'baselineskip-size-ratio'~ + must~ be~ at~ least~ 1. + } +\msg_new:nnn { fontscale } { key-musical-base-out-of-bounds } + { + Invalid~ value~ '#1'~ \msg_line_context:. \\ + The~ value~ of~ the~ key~ 'musical / base'~ + must~ be~ a~ positive~ length. } -\msg_new:nnn { fontscale } { musical-ratio-out-of-bounds } +\msg_new:nnn { fontscale } { key-musical-ratio-out-of-bounds } { - The~ value~ for~ the~ key~ 'musical / ratio'~ - \msg_line_context: \c_space_tl + Invalid~ value~ '#1'~ \msg_line_context:. \\ + The~ value~ of~ the~ key~ 'musical / ratio'~ must~ be~ greater~ than~ 1. } -\msg_new:nnn { fontscale } { musical-notes-out-of-bounds } +\msg_new:nnn { fontscale } { key-musical-notes-out-of-bounds } { - The~ value~ for~ the~ key~ 'musical / notes'~ - \msg_line_context: \c_space_tl + Invalid~ value~ '#1'~ \msg_line_context:. \\ + The~ value~ of~ the~ key~ 'musical / notes'~ must~ be~ a~ positive~ integer. } -\msg_new:nnn { fontscale } { key-font-scale-ignored } +\msg_new:nnn { fontscale } { key-font-scale-out-of-bounds } { - Key~ '#1 / scale'~ - \msg_line_context: \c_space_tl - ignored.~ - Setting~ the~ scale~ and~ size~ keys~ for~ the~ same~ - font~ size~ command~ ignores~ the~ scale~ key. + Invalid~ value~ '#1'~ \msg_line_context:. \\ + The~ value~ of~ the~ key~ '#2 / scale'~ + must~ be~ positive. } -\msg_new:nnn { fontscale } { font-sizes-out-of-order } +\msg_new:nnn { fontscale } { key-font-size-out-of-bounds } + { + Invalid~ value~ '#1'~ \msg_line_context:. \\ + The~ value~ of~ the~ key~ '#2 / size'~ + must~ be~ a~ positive~ length. + } +\msg_new:nnn { fontscale } { key-font-scale-overwritten } + { + The~ font~ size~ set~ by~ the~ key~ '#1 / scale'~ + has~ been~ overwritten~ by~ the~ key~ '#1 / size'~ \msg_line_context:. + } +\msg_new:nnn { fontscale } { key-font-baselineskip-out-of-bounds } + { + Invalid~ value~ '#1'~ \msg_line_context:. \\ + The~ value~ of~ the~ key~ '#3 / baselineskip'~ + must~ be~ greater~ than~ or~ equal~ to~ + the~ font~ size~ of~ \iow_char:N \\#3~ '#2'. + } +\msg_new:nnn { fontscale } { key-font-sizes-out-of-order } { The~ font~ sizes~ - \msg_line_context: \c_space_tl - are~ not~ in~ the~ correct~ order.~ - The~ magnitude~ of~ the~ font~ sizes~ should~ be~ ordered~ from~ - '\iow_char:N \\tiny'~ to~ '\iow_char:N \\normalsize'~ to~ - '\iow_char:N \\Huge'. + are~ not~ in~ the~ correct~ order~ \msg_line_context:. \\ + The~ lengths~ of~ the~ font~ sizes~ should~ be~ ordered~ from~ + \iow_char:N \\tiny~ to~ \iow_char:N \\Huge. } -\msg_new:nnn { fontscale } { font-baselineskips-out-of-order } +\msg_new:nnn { fontscale } { key-font-baselineskips-out-of-order } { The~ font~ baselineskips~ - \msg_line_context: \c_space_tl - are~ not~ in~ the~ correct~ order.~ - The~ magnitude~ of~ the~ font~ baselineskips~ should~ be~ ordered~ from~ - '\iow_char:N \\tiny'~ to~ '\iow_char:N \\normalsize'~ to~ - '\iow_char:N \\Huge'. + are~ not~ in~ the~ correct~ order~ \msg_line_context:. \\ + The~ lengths~ of~ the~ font~ baselineskips~ should~ be~ ordered~ from~ + \iow_char:N \\tiny~ to~ \iow_char:N \\Huge. + } + +\msg_new:nnn { fontscale } { math-mode-warning } + { '#1'~ does~ nothing~ if~ used~ in~ math~ mode~ \msg_line_context:. } +\msg_new:nnn { fontscale } { math-mode-error } + { '#1'~ cannot~ be~ used~ in~ math~ mode~ \msg_line_context:. } +\msg_new:nnn { fontscale } { font-size-out-of-bounds } + { The~ font~ size~ '#1'~ must~ be~ a~ positive~ length~ \msg_line_context:. } +\msg_new:nnn { fontscale } { font-baselineskip-out-of-bounds } + { + The~ font~ baselineskip~ '#1'~ must~ be~ greater~ than~ or~ equal~ to~ + the~ font~ size~ '#2'~ \msg_line_context:. } \msg_new:nnn { fontscale } { font-step-out-of-bounds } { - The~ font~ step~ - \msg_line_context: \c_space_tl - must~ be~ an~ integer~ from~ -4~ to~ 5,~ - unless~ the~ value~ for~ the~ choice~ key~ 'typographic-scale'~ - is~ 'modular'~ or~ 'musical'. + Invalid~ font~ step~ '#1'~ \msg_line_context:. \\ + The~ font~ step~ must~ equal~ an~ integer~ from~ -4~ to~ 5,~ + unless~ the~ value~ of~ the~ key~ 'typographic-scale'~ is~ 'musical'. } \msg_new:nnn { fontscale } { current-font-step-out-of-bounds } { - '\iow_char:N \\SetFontStep*'~ - \msg_line_context: \c_space_tl - could~ not~ calculate~ the~ new~ font~ step~ because~ - the~ current~ font~ step~ is~ undefined. + '\iow_char:N \\SetFontStep*'~ could~ not~ calculate~ the~ new~ font~ step~ + because~ the~ current~ font~ step~ is~ undefined~ \msg_line_context:. } % DEFINE KEYS \str_new:N \l__fontscale_typographic_scale_str +\dim_new:N \l__fontscale_musical_base_dim -\keys_define:nn { fontscale } +\cs_new_protected:Npn \__fontscale_keys_name:n #1 { - reset .choices:nn = { initial , preamble } - { \use:c { __fontscale_keys_precompile_#1: } } - , reset .default:n = initial - - , ignore-order .bool_set:N = \l__fontscale_ignore_order_bool - , ignore-order .default:n = true + \tl_if_in:nnTF {#1} { / } + { \__fontscale_keys_name_split:ww #1 \q_stop } + { \tl_set:cn { l__fontscale_ \l_keys_key_str _size_tl } {#1} } + } +\cs_new_protected:Npn \__fontscale_keys_name_split:ww #1 / #2 \q_stop + { + \tl_set:cn { l__fontscale_ \l_keys_key_str _size_tl } {#1} + \tl_set:cn { l__fontscale_ \l_keys_key_str _baselineskip_tl } {#2} + } - , baselineskip-size-ratio .fp_set:N = +\keys_define:nn { fontscale } + { + baselineskip-size-ratio .fp_set:N = \l__fontscale_baselineskip_size_ratio_fp , baselineskip-size-ratio .value_required:n = true , typographic-scale .choices:nn = - { classic-10pt , classic-11pt , classic-12pt , modular , musical } + { classic-10pt , classic-11pt , classic-12pt , musical } { \str_set:Nn \l__fontscale_typographic_scale_str {#1} } , typographic-scale .value_required:n = true @@ -315,18 +334,16 @@ , classic-12pt .meta:n = { typographic-scale = classic-12pt } , classic-12pt .value_forbidden:n = true - , modular .meta:n = { typographic-scale = modular } - , modular .value_forbidden:n = true - , musical .meta:n = { typographic-scale = musical } , musical .value_forbidden:n = true - - , modular / ratio .fp_set:N = \l__fontscale_modular_ratio_fp - , modular / ratio .value_required:n = true } \keys_define:nn { fontscale / musical } { - ratio .fp_set:N = \l__fontscale_musical_ratio_fp + base .code:n = + \__fontscale_dim_set_default_pt:Nn \l__fontscale_musical_base_dim {#1} + , base .value_required:n = true + + , ratio .fp_set:N = \l__fontscale_musical_ratio_fp , ratio .value_required:n = true , notes .int_set:N = \l__fontscale_musical_notes_int @@ -441,58 +458,46 @@ } \keys_define:nn { fontscale } { - tiny .code:n = \__fontscale_keys_name_code:n {#1} + tiny .code:n = \__fontscale_keys_name:n {#1} , tiny .value_required:n = true - , scriptsize .code:n = \__fontscale_keys_name_code:n {#1} + , scriptsize .code:n = \__fontscale_keys_name:n {#1} , scriptsize .value_required:n = true - , footnotesize .code:n = \__fontscale_keys_name_code:n {#1} + , footnotesize .code:n = \__fontscale_keys_name:n {#1} , footnotesize .value_required:n = true - , small .code:n = \__fontscale_keys_name_code:n {#1} + , small .code:n = \__fontscale_keys_name:n {#1} , small .value_required:n = true - , normalsize .code:n = \__fontscale_keys_name_code:n {#1} + , normalsize .code:n = \__fontscale_keys_name:n {#1} , normalsize .value_required:n = true - , large .code:n = \__fontscale_keys_name_code:n {#1} + , large .code:n = \__fontscale_keys_name:n {#1} , large .value_required:n = true - , Large .code:n = \__fontscale_keys_name_code:n {#1} + , Large .code:n = \__fontscale_keys_name:n {#1} , Large .value_required:n = true - , LARGE .code:n = \__fontscale_keys_name_code:n {#1} + , LARGE .code:n = \__fontscale_keys_name:n {#1} , LARGE .value_required:n = true - , huge .code:n = \__fontscale_keys_name_code:n {#1} + , huge .code:n = \__fontscale_keys_name:n {#1} , huge .value_required:n = true - , Huge .code:n = \__fontscale_keys_name_code:n {#1} + , Huge .code:n = \__fontscale_keys_name:n {#1} , Huge .value_required:n = true } -\cs_new_protected:Npn \__fontscale_keys_name_code:n #1 - { - \str_if_in:nnTF {#1} { / } - { \__fontscale_keys_name_code_split:ww #1 \q_stop } - { \tl_set:cn { l__fontscale_ \l_keys_key_str _size_tl } {#1} } - } -\cs_new_protected:Npn \__fontscale_keys_name_code_split:ww #1 / #2 \q_stop - { - \tl_set:cn { l__fontscale_ \l_keys_key_str _size_tl } {#1} - \tl_set:cn { l__fontscale_ \l_keys_key_str _baselineskip_tl } {#2} - } -% PRE-COMPILE KEYS +% INITIALIZE AND PRE-COMPILE KEYS % Pre-compiles the keys with their initial values and then sets the keys to % their initial values. This is done by hand for speed. -\cs_new_protected:Npn \__fontscale_keys_precompile_initial: +\cs_new_protected:Npn \__fontscale_keys_set_initial: { - \bool_set_false:N \l__fontscale_ignore_order_bool \fp_set:Nn \l__fontscale_baselineskip_size_ratio_fp { 1.2 } \str_set:Nn \l__fontscale_typographic_scale_str { classic-10pt } - \fp_set:Nn \l__fontscale_modular_ratio_fp { 1.125 } + \dim_set:Nn \l__fontscale_musical_base_dim { 10pt } \fp_set:Nn \l__fontscale_musical_ratio_fp { 2 } \int_set:Nn \l__fontscale_musical_notes_int { 5 } @@ -528,98 +533,23 @@ \tl_set:Nn \l__fontscale_huge_baselineskip_tl { \q_no_value } \tl_set:Nn \l__fontscale_Huge_baselineskip_tl { \q_no_value } } -\__fontscale_keys_precompile_initial: +\__fontscale_keys_set_initial: + +% SET AND PROCESS KEYS -% Pre-compiles the keys with their values at the end of the preamble. The keys -% are pre-compiled by hand for speed. -\cs_new_eq:NN \__fontscale_keys_precompile_preamble: \prg_do_nothing: -% \AddToHook is passed only a single token for speed. -\AddToHook { begindocument / before } - { \__fontscale_keys_precompile_preamble_set: } -\cs_new_protected:Npn \__fontscale_keys_precompile_preamble_set: +\NewDocumentCommand \fontscalesetup { s m } { - \cs_set_protected:Npe \__fontscale_keys_precompile_preamble: + \mode_if_math:TF { - \bool_if:NTF \l__fontscale_ignore_order_bool - { \bool_set_true:N } { \bool_set_false:N } - \exp_not:N \l__fontscale_ignore_order_bool - \fp_set:Nn \exp_not:N \l__fontscale_baselineskip_size_ratio_fp - { \exp_not:V \l__fontscale_baselineskip_size_ratio_fp } - \str_set:Nn \exp_not:N \l__fontscale_typographic_scale_str - { \l__fontscale_typographic_scale_str } - \fp_set:Nn \exp_not:N \l__fontscale_modular_ratio_fp - { \exp_not:V \l__fontscale_modular_ratio_fp } - \fp_set:Nn \exp_not:N \l__fontscale_musical_ratio_fp - { \exp_not:V \l__fontscale_musical_ratio_fp } - \int_set:Nn \exp_not:N \l__fontscale_musical_notes_int - { \int_use:N \l__fontscale_musical_notes_int } - - \tl_set:Nn \exp_not:N \l__fontscale_tiny_scale_tl - { \exp_not:V \l__fontscale_tiny_scale_tl } - \tl_set:Nn \exp_not:N \l__fontscale_scriptsize_scale_tl - { \exp_not:V \l__fontscale_scriptsize_scale_tl } - \tl_set:Nn \exp_not:N \l__fontscale_footnotesize_scale_tl - { \exp_not:V \l__fontscale_footnotesize_scale_tl } - \tl_set:Nn \exp_not:N \l__fontscale_small_scale_tl - { \exp_not:V \l__fontscale_small_scale_tl } - \tl_set:Nn \exp_not:N \l__fontscale_large_scale_tl - { \exp_not:V \l__fontscale_large_scale_tl } - \tl_set:Nn \exp_not:N \l__fontscale_Large_scale_tl - { \exp_not:V \l__fontscale_Large_scale_tl } - \tl_set:Nn \exp_not:N \l__fontscale_LARGE_scale_tl - { \exp_not:V \l__fontscale_LARGE_scale_tl } - \tl_set:Nn \exp_not:N \l__fontscale_huge_scale_tl - { \exp_not:V \l__fontscale_huge_scale_tl } - \tl_set:Nn \exp_not:N \l__fontscale_Huge_scale_tl - { \exp_not:V \l__fontscale_Huge_scale_tl } - - \tl_set:Nn \exp_not:N \l__fontscale_tiny_size_tl - { \exp_not:V \l__fontscale_tiny_size_tl } - \tl_set:Nn \exp_not:N \l__fontscale_scriptsize_size_tl - { \exp_not:V \l__fontscale_scriptsize_size_tl } - \tl_set:Nn \exp_not:N \l__fontscale_footnotesize_size_tl - { \exp_not:V \l__fontscale_footnotesize_size_tl } - \tl_set:Nn \exp_not:N \l__fontscale_small_size_tl - { \exp_not:V \l__fontscale_small_size_tl } - \tl_set:Nn \exp_not:N \l__fontscale_normalsize_size_tl - { \exp_not:V \l__fontscale_normalsize_size_tl } - \tl_set:Nn \exp_not:N \l__fontscale_large_size_tl - { \exp_not:V \l__fontscale_large_size_tl } - \tl_set:Nn \exp_not:N \l__fontscale_Large_size_tl - { \exp_not:V \l__fontscale_Large_size_tl } - \tl_set:Nn \exp_not:N \l__fontscale_LARGE_size_tl - { \exp_not:V \l__fontscale_LARGE_size_tl } - \tl_set:Nn \exp_not:N \l__fontscale_huge_size_tl - { \exp_not:V \l__fontscale_huge_size_tl } - \tl_set:Nn \exp_not:N \l__fontscale_Huge_size_tl - { \exp_not:V \l__fontscale_Huge_size_tl } - - \tl_set:Nn \exp_not:N \l__fontscale_tiny_baselineskip_tl - { \exp_not:V \l__fontscale_tiny_baselineskip_tl } - \tl_set:Nn \exp_not:N \l__fontscale_scriptsize_baselineskip_tl - { \exp_not:V \l__fontscale_scriptsize_baselineskip_tl } - \tl_set:Nn \exp_not:N \l__fontscale_footnotesize_baselineskip_tl - { \exp_not:V \l__fontscale_footnotesize_baselineskip_tl } - \tl_set:Nn \exp_not:N \l__fontscale_small_baselineskip_tl - { \exp_not:V \l__fontscale_small_baselineskip_tl } - \tl_set:Nn \exp_not:N \l__fontscale_normalsize_baselineskip_tl - { \exp_not:V \l__fontscale_normalsize_baselineskip_tl } - \tl_set:Nn \exp_not:N \l__fontscale_large_baselineskip_tl - { \exp_not:V \l__fontscale_large_baselineskip_tl } - \tl_set:Nn \exp_not:N \l__fontscale_Large_baselineskip_tl - { \exp_not:V \l__fontscale_Large_baselineskip_tl } - \tl_set:Nn \exp_not:N \l__fontscale_LARGE_baselineskip_tl - { \exp_not:V \l__fontscale_LARGE_baselineskip_tl } - \tl_set:Nn \exp_not:N \l__fontscale_huge_baselineskip_tl - { \exp_not:V \l__fontscale_huge_baselineskip_tl } - \tl_set:Nn \exp_not:N \l__fontscale_Huge_baselineskip_tl - { \exp_not:V \l__fontscale_Huge_baselineskip_tl } + \msg_warning:nne { fontscale } { math-mode-warning } + { \token_to_str:N \fontscalesetup } + } + { + \IfBooleanTF #1 + { \__fontscale_keys_reset:n {#2} } + { \__fontscale_keys_set:n {#2} } } } - -% PROCESS KEYS - -\NewDocumentCommand \fontscalesetup { m } { \__fontscale_keys_set:n {#1} } \cs_new_protected:Npn \__fontscale_keys_set:n #1 { \keys_set:nn { fontscale } {#1} @@ -628,55 +558,69 @@ \prg_break: \prg_break_point: } +\cs_new_protected:Npn \__fontscale_keys_reset:n + { \__fontscale_keys_set_initial: \__fontscale_keys_set:n } \cs_new_protected:Npn \__fontscale_keys_process: { - \__fontscale_keys_process_check_modular_musical: + \__fontscale_keys_process_start: \__fontscale_keys_process_normalsize: \__fontscale_keys_process_other: \__fontscale_keys_process_check_order: } -% Issues an error if the key 'modular/ratio', 'musical/ratio', or -% 'musical/notes' is set to an impossible value. -\cs_new_protected:Npn \__fontscale_keys_process_check_modular_musical: +\cs_new_protected:Npn \__fontscale_keys_process_start: { - \fp_compare:nNnF \l__fontscale_modular_ratio_fp > \c_one_fp + \fp_compare:nNnT \l__fontscale_baselineskip_size_ratio_fp < \c_one_fp { - \msg_error:nn { fontscale } { modular-ratio-out-of-bounds } + \msg_error:nne { fontscale } + { key-baselineskip-size-ratio-out-of-bounds } + { \fp_use:N \l__fontscale_baselineskip_size_ratio_fp } + \prg_break: + } + \dim_compare:nNnF \l__fontscale_musical_base_dim > \c_zero_dim + { + \msg_error:nnV { fontscale } { key-musical-base-out-of-bounds } + \l__fontscale_musical_base_dim \prg_break: } \fp_compare:nNnF \l__fontscale_musical_ratio_fp > \c_one_fp { - \msg_error:nn { fontscale } { musical-ratio-out-of-bounds } + \msg_error:nne { fontscale } { key-musical-ratio-out-of-bounds } + { \fp_use:N \l__fontscale_musical_ratio_fp } \prg_break: } \int_compare:nNnF \l__fontscale_musical_notes_int > 0 { - \msg_error:nn { fontscale } { musical-notes-out-of-bounds } + \msg_error:nnV { fontscale } { key-musical-notes-out-of-bounds } + \l__fontscale_musical_notes_int \prg_break: } } -% Sets the size and baselineskip of \normalsize and updates their property list -% entries. +% Sets the font size and font baselineskip of \normalsize. \cs_new_protected:Npn \__fontscale_keys_process_normalsize: { \quark_if_no_value:NTF \l__fontscale_normalsize_size_tl { \dim_set:Nn \l_fontscale_normalsize_size_dim { - \str_case:VnF \l__fontscale_typographic_scale_str + \str_case:Vn \l__fontscale_typographic_scale_str { + { classic-10pt } { 10pt } { classic-11pt } { 11pt } { classic-12pt } { 12pt } + { musical } { \l__fontscale_musical_base_dim } } - { 10pt } } } { - \__fontscale_dim_set_with_default_pt:Nn - \l_fontscale_normalsize_size_dim { \l__fontscale_normalsize_size_tl } + \__fontscale_dim_set_default_pt:Nn \l_fontscale_normalsize_size_dim + { \l__fontscale_normalsize_size_tl } + \dim_compare:nNnF \l_fontscale_normalsize_size_dim > \c_zero_dim + { + \msg_error:nnVn { fontscale } { key-font-size-out-of-bounds } + \l_fontscale_normalsize_size_dim { normalsize } + \prg_break: + } } - \prop_put:NnV \l_fontscale_normalsize_prop { size } - \l_fontscale_normalsize_size_dim \fp_set:Nn \l__fontscale_normalsize_size_fp { \l_fontscale_normalsize_size_dim } \quark_if_no_value:NTF \l__fontscale_normalsize_baselineskip_tl @@ -691,12 +635,19 @@ } } { - \__fontscale_skip_set_with_default_pt:Nn + \__fontscale_skip_set_default_pt:Nn \l_fontscale_normalsize_baselineskip_skip { \l__fontscale_normalsize_baselineskip_tl } + \dim_compare:nNnT \l_fontscale_normalsize_baselineskip_skip < + \l_fontscale_normalsize_size_dim + { + \msg_error:nnVVn { fontscale } + { key-font-baselineskip-out-of-bounds } + \l_fontscale_normalsize_baselineskip_skip + \l_fontscale_normalsize_size_dim { normalsize } + \prg_break: + } } - \prop_put:NnV \l_fontscale_normalsize_prop { baselineskip } - \l_fontscale_normalsize_baselineskip_skip } % Auxiliary functions that expand to the font size depending on the name of the % font size command. @@ -745,57 +696,55 @@ { Huge } { 24pt } } } -\cs_new:Npn \__fontscale_keys_process_other_modular:n #1 - { - \fp_to_dim:n - { - \l__fontscale_normalsize_size_fp * \l__fontscale_modular_ratio_fp - ^ \use:c { c_fontscale_#1_step_fp } - } - } \cs_new:Npn \__fontscale_keys_process_other_musical:n #1 { \fp_to_dim:n { - \l__fontscale_normalsize_size_fp * \l__fontscale_musical_ratio_fp + \l__fontscale_musical_base_fp * \l__fontscale_musical_ratio_fp ^ ( \use:c { c_fontscale_#1_step_fp } / \l__fontscale_musical_notes_fp ) } } -% Sets the size, scale, and baselineskip of the other font size commands and -% updates their property list entries. Issues a warning if the user sets both -% the scale and size keys for the same font size command. +% Sets the font size, font scale, and font baselineskip of the other font size +% commands. \cs_new_protected:Npn \__fontscale_keys_process_other: { - \cs_set_eq:Nc \__fontscale_keys_process_other_typographic_scale:n + \str_case:Vn \l__fontscale_typographic_scale_str { - \str_case:Vn \l__fontscale_typographic_scale_str - { - { classic-10pt } { __fontscale_keys_process_other_classic_xpt:n } - { classic-11pt } { __fontscale_keys_process_other_classic_xipt:n } - { classic-12pt } { __fontscale_keys_process_other_classic_xiipt:n } - { modular } { __fontscale_keys_process_other_modular:n } - { musical } { __fontscale_keys_process_other_musical:n } - } + { classic-10pt } + { + \cs_set_eq:NN \__fontscale_keys_process_other_fn_aux:n + \__fontscale_keys_process_other_classic_xpt:n + } + { classic-11pt } + { + \cs_set_eq:NN \__fontscale_keys_process_other_fn_aux:n + \__fontscale_keys_process_other_classic_xipt:n + } + { classic-12pt } + { + \cs_set_eq:NN \__fontscale_keys_process_other_fn_aux:n + \__fontscale_keys_process_other_classic_xiipt:n + } + { musical } + { + \cs_set_eq:NN \__fontscale_keys_process_other_fn_aux:n + \__fontscale_keys_process_other_musical:n + \fp_set:Nn \l__fontscale_musical_base_fp + { \l__fontscale_musical_base_dim } + \fp_set:Nn \l__fontscale_musical_notes_fp + { \l__fontscale_musical_notes_int } + } } - \str_if_eq:VnT \l__fontscale_typographic_scale_str { musical } + \tl_map_function:nN { - \fp_set:Nn \l__fontscale_musical_notes_fp - { \l__fontscale_musical_notes_int } + {tiny} {scriptsize} {footnotesize} {small} + {large} {Large} {LARGE} {huge} {Huge} } - \tl_map_function:NN \c__fontscale_names_other_tl - \__fontscale_keys_process_other_aux:n + \__fontscale_keys_process_other_fn:n } -\cs_new_protected:Npn \__fontscale_keys_process_other_aux:n #1 +\cs_new_protected:Npn \__fontscale_keys_process_other_fn:n #1 { - \quark_if_no_value:cF { l__fontscale_#1_size_tl } - { - \__fontscale_dim_set_with_default_pt:cn { l_fontscale_#1_size_dim } - { \use:c { l__fontscale_#1_size_tl } } - \quark_if_no_value:cF { l__fontscale_#1_scale_tl } - { \msg_warning:nnn { fontscale } { key-font-scale-ignored } {#1} } - \prg_break: - } \quark_if_no_value:cF { l__fontscale_#1_scale_tl } { \dim_set:cn { l_fontscale_#1_size_dim } @@ -806,17 +755,42 @@ * ( \use:c { l__fontscale_#1_scale_tl } ) } } + \dim_compare:nNnF { \use:c { l_fontscale_#1_size_dim } } > \c_zero_dim + { + \tl_map_break:n + { + \msg_error:nnen { fontscale } { key-font-scale-out-of-bounds } + { \fp_eval:n { \use:c { l__fontscale_#1_scale_tl } } } {#1} + \prg_break: + } + } + \quark_if_no_value:cT { l__fontscale_#1_size_tl } { \prg_break: } + } + \quark_if_no_value:cF { l__fontscale_#1_size_tl } + { + \__fontscale_dim_set_default_pt:cn { l_fontscale_#1_size_dim } + { \use:c { l__fontscale_#1_size_tl } } + \dim_compare:nNnF { \use:c { l_fontscale_#1_size_dim } } > \c_zero_dim + { + \tl_map_break:n + { + \msg_error:nnvn { fontscale } { key-font-size-out-of-bounds } + { l_fontscale_#1_size_dim } {#1} + \prg_break: + } + } + \quark_if_no_value:cF { l__fontscale_#1_scale_tl } + { + \msg_warning:nnn { fontscale } { key-font-scale-overwritten } {#1} + } \prg_break: } \dim_set:cn { l_fontscale_#1_size_dim } - { \__fontscale_keys_process_other_typographic_scale:n {#1} } + { \__fontscale_keys_process_other_fn_aux:n {#1} } \prg_break: \prg_break_point: \fp_set:cn { l_fontscale_#1_scale_fp } { \use:c { l_fontscale_#1_size_dim } / \l__fontscale_normalsize_size_fp } - \prop_put:cne { l_fontscale_#1_prop } { scale } - { \fp_use:c { l_fontscale_#1_scale_fp } } - \prop_put:cnv { l_fontscale_#1_prop } { size } { l_fontscale_#1_size_dim } \quark_if_no_value:cTF { l__fontscale_#1_baselineskip_tl } { \skip_set:cn { l_fontscale_#1_baselineskip_skip } @@ -829,122 +803,115 @@ } } { - \__fontscale_skip_set_with_default_pt:cn + \__fontscale_skip_set_default_pt:cn { l_fontscale_#1_baselineskip_skip } { \use:c { l__fontscale_#1_baselineskip_tl } } + \dim_compare:nNnT { \use:c { l_fontscale_#1_baselineskip_skip } } < + { \use:c { l_fontscale_#1_size_dim } } + { + \tl_map_break:n + { + \msg_error:nnvvn { fontscale } + { key-font-baselineskip-out-of-bounds } + { l_fontscale_#1_baselineskip_skip } + { l_fontscale_#1_size_dim } {#1} + \prg_break: + } + } } - \prop_put:cnv { l_fontscale_#1_prop } { baselineskip } - { l_fontscale_#1_baselineskip_skip } } -% Issues a warning if the font sizes or font baselineskips (ignoring the -% stretch and shrink components) are not in the correct order unless the value -% for the key 'ignore-order' is 'true'. +% Issues a warning if the font sizes or font baselineskips are not in the +% correct order. \cs_new_protected:Npn \__fontscale_keys_process_check_order: { - \bool_if:NF \l__fontscale_ignore_order_bool + \dim_compare:nF { - \dim_compare:nF - { - \l_fontscale_tiny_size_dim - < \l_fontscale_scriptsize_size_dim - < \l_fontscale_footnotesize_size_dim - < \l_fontscale_small_size_dim - < \l_fontscale_normalsize_size_dim - < \l_fontscale_large_size_dim - < \l_fontscale_Large_size_dim - < \l_fontscale_LARGE_size_dim - < \l_fontscale_huge_size_dim - < \l_fontscale_Huge_size_dim - } - { \msg_warning:nn { fontscale } { font-sizes-out-of-order } } - \dim_compare:nF - { - \l_fontscale_tiny_baselineskip_skip - < \l_fontscale_scriptsize_baselineskip_skip - < \l_fontscale_footnotesize_baselineskip_skip - < \l_fontscale_small_baselineskip_skip - < \l_fontscale_normalsize_baselineskip_skip - < \l_fontscale_large_baselineskip_skip - < \l_fontscale_Large_baselineskip_skip - < \l_fontscale_LARGE_baselineskip_skip - < \l_fontscale_huge_baselineskip_skip - < \l_fontscale_Huge_baselineskip_skip - } - { \msg_warning:nn { fontscale } { font-baselineskips-out-of-order } } + \l_fontscale_tiny_size_dim + < \l_fontscale_scriptsize_size_dim + < \l_fontscale_footnotesize_size_dim + < \l_fontscale_small_size_dim + < \l_fontscale_normalsize_size_dim + < \l_fontscale_large_size_dim + < \l_fontscale_Large_size_dim + < \l_fontscale_LARGE_size_dim + < \l_fontscale_huge_size_dim + < \l_fontscale_Huge_size_dim + } + { \msg_warning:nn { fontscale } { key-font-sizes-out-of-order } } + \dim_compare:nF + { + \l_fontscale_tiny_baselineskip_skip + < \l_fontscale_scriptsize_baselineskip_skip + < \l_fontscale_footnotesize_baselineskip_skip + < \l_fontscale_small_baselineskip_skip + < \l_fontscale_normalsize_baselineskip_skip + < \l_fontscale_large_baselineskip_skip + < \l_fontscale_Large_baselineskip_skip + < \l_fontscale_LARGE_baselineskip_skip + < \l_fontscale_huge_baselineskip_skip + < \l_fontscale_Huge_baselineskip_skip } + { \msg_warning:nn { fontscale } { key-font-baselineskips-out-of-order } } } % DOCUMENT COMMANDS -% The internal functions of each font size command are not used elsewhere in -% the code for compatibility with user-defined hooks -% (e.g. \AddToHook{cmd/normalsize/after}{<user-defined-function>}). -\DeclareDocumentCommand \tiny { } { \__fontscale_tiny: } -\cs_new_protected:Npn \__fontscale_tiny: +% Defines the standard LaTeX font size commands from \tiny to \Huge and +% initializes to \normalsize. +\DeclareDocumentCommand \tiny { } { \__fontscale_fontsize:NNN \tiny \l_fontscale_tiny_size_dim \l_fontscale_tiny_baselineskip_skip } -\DeclareDocumentCommand \scriptsize { } { \__fontscale_scriptsize: } -\cs_new_protected:Npn \__fontscale_scriptsize: +\DeclareDocumentCommand \scriptsize { } { \__fontscale_fontsize:NNN \scriptsize \l_fontscale_scriptsize_size_dim \l_fontscale_scriptsize_baselineskip_skip } -\DeclareDocumentCommand \footnotesize { } { \__fontscale_footnotesize: } -\cs_new_protected:Npn \__fontscale_footnotesize: +\DeclareDocumentCommand \footnotesize { } { \__fontscale_fontsize:NNN \footnotesize \l_fontscale_footnotesize_size_dim \l_fontscale_footnotesize_baselineskip_skip } -\DeclareDocumentCommand \small { } { \__fontscale_small: } -\cs_new_protected:Npn \__fontscale_small: +\DeclareDocumentCommand \small { } { \__fontscale_fontsize:NNN \small \l_fontscale_small_size_dim \l_fontscale_small_baselineskip_skip } -\DeclareDocumentCommand \normalsize { } { \__fontscale_normalsize: } -\cs_new_protected:Npn \__fontscale_normalsize: +\DeclareDocumentCommand \normalsize { } { \__fontscale_fontsize:NNN \normalsize \l_fontscale_normalsize_size_dim \l_fontscale_normalsize_baselineskip_skip } -\DeclareDocumentCommand \large { } { \__fontscale_large: } -\cs_new_protected:Npn \__fontscale_large: +\DeclareDocumentCommand \large { } { \__fontscale_fontsize:NNN \large \l_fontscale_large_size_dim \l_fontscale_large_baselineskip_skip } -\DeclareDocumentCommand \Large { } { \__fontscale_Large: } -\cs_new_protected:Npn \__fontscale_Large: +\DeclareDocumentCommand \Large { } { \__fontscale_fontsize:NNN \Large \l_fontscale_Large_size_dim \l_fontscale_Large_baselineskip_skip } -\DeclareDocumentCommand \LARGE { } { \__fontscale_LARGE: } -\cs_new_protected:Npn \__fontscale_LARGE: +\DeclareDocumentCommand \LARGE { } { \__fontscale_fontsize:NNN \LARGE \l_fontscale_LARGE_size_dim \l_fontscale_LARGE_baselineskip_skip } -\DeclareDocumentCommand \huge { } { \__fontscale_huge: } -\cs_new_protected:Npn \__fontscale_huge: +\DeclareDocumentCommand \huge { } { \__fontscale_fontsize:NNN \huge \l_fontscale_huge_size_dim \l_fontscale_huge_baselineskip_skip } -\DeclareDocumentCommand \Huge { } { \__fontscale_Huge: } -\cs_new_protected:Npn \__fontscale_Huge: +\DeclareDocumentCommand \Huge { } { \__fontscale_fontsize:NNN \Huge \l_fontscale_Huge_size_dim \l_fontscale_Huge_baselineskip_skip } -% Initializes to \normalsize. \normalsize -\NewExpandableDocumentCommand \CurrentFontStep { } - { \__fontscale_current_font_step: } -\cs_new:Npn \__fontscale_current_font_step: +\NewExpandableDocumentCommand \CurrentFontStep { } { \__fontscale_step: } +\cs_new:Npn \__fontscale_step: { \dim_case:nnF { \f@size pt } { @@ -960,47 +927,100 @@ { \l_fontscale_Huge_size_dim } { 5 } } { - \str_case:Vn \l__fontscale_typographic_scale_str + \str_if_eq:VnT \l__fontscale_typographic_scale_str { musical } { - { modular } - { - \fp_eval:n - { - ln ( \f@size / \l__fontscale_normalsize_size_fp ) - / ln ( \l__fontscale_modular_ratio_fp ) - } - } - { musical } - { - \fp_eval:n - { - \l__fontscale_musical_notes_fp - * ln ( \f@size / \l__fontscale_normalsize_size_fp ) - / ln ( \l__fontscale_musical_ratio_fp ) - } - } + \fp_eval:n + { + \l__fontscale_musical_notes_fp + * ln ( \f@size / \l__fontscale_musical_base_fp ) + / ln ( \l__fontscale_musical_ratio_fp ) + } } } } -\NewExpandableDocumentCommand \CurrentFontScale { } - { \__fontscale_current_font_scale: } -\cs_new:Npn \__fontscale_current_font_scale: +\NewExpandableDocumentCommand \CurrentFontScale { } { \__fontscale_scale: } +\cs_new:Npn \__fontscale_scale: { \fp_eval:n { \f@size / \l__fontscale_normalsize_size_fp } } -\NewExpandableDocumentCommand \CurrentFontSize { } - { \__fontscale_current_font_size: } -\cs_new:Npn \__fontscale_current_font_size: { \f@size pt } +\NewExpandableDocumentCommand \CurrentFontSize { } { \__fontscale_size: } +\cs_new:Npn \__fontscale_size: { \f@size pt } \NewExpandableDocumentCommand \CurrentFontBaselineskip { } - { \__fontscale_current_font_baselineskip: } -\cs_new:Npn \__fontscale_current_font_baselineskip: { \f@baselineskip } + { \__fontscale_baselineskip: } +\cs_new:Npn \__fontscale_baselineskip: { \f@baselineskip } + +\NewExpandableDocumentCommand \CurrentFontSizeCommand { } + { \__fontscale_name: } +\cs_new:Npn \__fontscale_name: + { + \dim_case:nn { \f@size pt } + { + { \l_fontscale_tiny_size_dim } + { + \skip_if_eq:nnT { \l_fontscale_tiny_baselineskip_skip } + { \f@baselineskip } { tiny } + } + { \l_fontscale_scriptsize_size_dim } + { + \skip_if_eq:nnT { \l_fontscale_scriptsize_baselineskip_skip } + { \f@baselineskip } { scriptsize } + } + { \l_fontscale_footnotesize_size_dim } + { + \skip_if_eq:nnT { \l_fontscale_footnotesize_baselineskip_skip } + { \f@baselineskip } { footnotesize } + } + { \l_fontscale_small_size_dim } + { + \skip_if_eq:nnT { \l_fontscale_small_baselineskip_skip } + { \f@baselineskip } { small } + } + { \l_fontscale_normalsize_size_dim } + { + \skip_if_eq:nnT { \l_fontscale_normalsize_baselineskip_skip } + { \f@baselineskip } { normalsize } + } + { \l_fontscale_large_size_dim } + { + \skip_if_eq:nnT { \l_fontscale_large_baselineskip_skip } + { \f@baselineskip } { large } + } + { \l_fontscale_Large_size_dim } + { + \skip_if_eq:nnT { \l_fontscale_Large_baselineskip_skip } + { \f@baselineskip } { Large } + } + { \l_fontscale_LARGE_size_dim } + { + \skip_if_eq:nnT { \l_fontscale_LARGE_baselineskip_skip } + { \f@baselineskip } { LARGE } + } + { \l_fontscale_huge_size_dim } + { + \skip_if_eq:nnT { \l_fontscale_huge_baselineskip_skip } + { \f@baselineskip } { huge } + } + { \l_fontscale_Huge_size_dim } + { + \skip_if_eq:nnT { \l_fontscale_Huge_baselineskip_skip } + { \f@baselineskip } { Huge } + } + } + } \NewDocumentCommand \SetFontStep { s m } { - \IfBooleanTF #1 - { \__fontscale_add_font_step:n {#2} } - { \__fontscale_set_font_step:n {#2} } + \mode_if_math:TF + { + \msg_warning:nne { fontscale } { math-mode-warning } + { \token_to_str:N \SetFontStep } + } + { + \IfBooleanTF #1 + { \__fontscale_add_font_step:n {#2} } + { \__fontscale_set_font_step:n {#2} } + } } % Using \str_case: here is significantly faster (and easier to write) than % repeatedly testing \fp_compare:. @@ -1020,49 +1040,45 @@ { 5 } { \Huge } } { - \str_case:VnF \l__fontscale_typographic_scale_str + \str_if_eq:VnTF \l__fontscale_typographic_scale_str { musical } + { + \__fontscale_fontsize:n + { + \fp_to_dim:n + { + \l__fontscale_musical_base_fp + * \l__fontscale_musical_ratio_fp + ^ ( (#1) / \l__fontscale_musical_notes_fp ) + } + } + } { - { modular } - { - \__fontscale_fontsize:n - { - \fp_to_dim:n - { - \l__fontscale_normalsize_size_fp - * \l__fontscale_modular_ratio_fp ^ (#1) - } - } - } - { musical } - { - \__fontscale_fontsize:n - { - \fp_to_dim:n - { - \l__fontscale_normalsize_size_fp - * \l__fontscale_musical_ratio_fp - ^ ( (#1) / \l__fontscale_musical_notes_fp ) - } - } - } + \msg_error:nne { fontscale } { font-step-out-of-bounds } + { \fp_eval:n {#1} } } - { \msg_error:nn { fontscale } { font-step-out-of-bounds } } } } \cs_new_protected:Npn \__fontscale_add_font_step:n #1 { - \tl_set:Ne \l__fontscale_step_tl { \__fontscale_current_font_step: } - \tl_if_empty:NTF \l__fontscale_step_tl + \tl_set:Ne \l__fontscale_tmp_tl { \__fontscale_step: } + \tl_if_empty:NTF \l__fontscale_tmp_tl { \msg_error:nn { fontscale } { current-font-step-out-of-bounds } } - { \__fontscale_add_font_step_aux:n { (#1) + \l__fontscale_step_tl } } + { \__fontscale_add_font_step_aux:n { (#1) + \l__fontscale_tmp_tl } } } \cs_new_eq:NN \__fontscale_add_font_step_aux:n \__fontscale_set_font_step:n \NewDocumentCommand \SetFontScale { s m } { - \IfBooleanTF #1 - { \__fontscale_add_font_scale:n {#2} } - { \__fontscale_set_font_scale:n {#2} } + \mode_if_math:TF + { + \msg_warning:nne { fontscale } { math-mode-warning } + { \token_to_str:N \SetFontScale } + } + { + \IfBooleanTF #1 + { \__fontscale_add_font_scale:n {#2} } + { \__fontscale_set_font_scale:n {#2} } + } } \cs_new_protected:Npn \__fontscale_set_font_scale:n #1 { @@ -1077,70 +1093,172 @@ \NewDocumentCommand \SetFontSize { s m } { - \IfBooleanTF #1 - { \__fontscale_add_font_size:n {#2} } - { \__fontscale_set_font_size:n {#2} } + \mode_if_math:TF + { + \msg_warning:nne { fontscale } { math-mode-warning } + { \token_to_str:N \SetFontSize } + } + { + \IfBooleanTF #1 + { \__fontscale_add_font_size:n {#2} } + { \__fontscale_set_font_size:n {#2} } + } } \cs_new_eq:NN \__fontscale_set_font_size:n \__fontscale_fontsize:n \cs_new_protected:Npn \__fontscale_add_font_size:n #1 { - \__fontscale_dim_set_with_default_pt:Nn \l__fontscale_size_dim {#1} - \dim_add:Nn \l__fontscale_size_dim { \f@size pt } - \__fontscale_fontsize:n { \l__fontscale_size_dim } + \__fontscale_dim_set_default_pt:Nn \l__fontscale_tmp_dim {#1} + \__fontscale_fontsize:n { \l__fontscale_tmp_dim + \f@size pt } } \NewDocumentCommand \ScaleFont { m } - { \__fontscale_scale_font_size_baselineskip:n {#1} } -\cs_new_protected:Npn \__fontscale_scale_font_size_baselineskip:n #1 { + \mode_if_math:TF + { + \msg_warning:nne { fontscale } { math-mode-warning } + { \token_to_str:N \ScaleFont } + } + { \__fontscale_scale_font:n {#1} } + } +\cs_new_protected:Npn \__fontscale_scale_font:n #1 + { + \fp_set:Nn \l__fontscale_tmp_fp {#1} \__fontscale_fontsize:nn - { \fp_to_dim:n { \f@size * (#1) } } - { \fp_to_dim:n { \dim_to_fp:n { \f@baselineskip } * (#1) } } + { \fp_to_dim:n { \f@size * \l__fontscale_tmp_fp } } + { + \fp_to_dim:n + { \dim_to_fp:n { \f@baselineskip } * \l__fontscale_tmp_fp } + } } \NewDocumentCommand \SetFontSizeBaselineskip { m m } - { \__fontscale_set_font_size_baselineskip:nn {#1} {#2} } -\cs_new_eq:NN \__fontscale_set_font_size_baselineskip:nn - \__fontscale_fontsize:nn - -\NewDocumentCommand \PrintFontParameters { } - { \__fontscale_print_font_parameters: } -\cs_new_protected:Npn \__fontscale_print_font_parameters: { - step ~=~ \__fontscale_current_font_step: ,~ - scale ~=~ \__fontscale_current_font_scale: ,~ - size ~=~ \__fontscale_current_font_size: ,~ - baselineskip ~=~ \__fontscale_current_font_baselineskip: + \mode_if_math:TF + { + \msg_warning:nne { fontscale } { math-mode-warning } + { \token_to_str:N \SetFontSizeBaselineskip } + } + { \__fontscale_set_font_size_baselineskip:nn {#1} {#2} } } +\cs_new_eq:NN \__fontscale_set_font_size_baselineskip:nn + \__fontscale_fontsize:nn -\NewDocumentCommand \PrintAllFontParameters { } - { \__fontscale_print_all_font_parameters: } -\cs_new_protected:Npn \__fontscale_print_all_font_parameters: +\NewDocumentCommand \SetFontBaselineskip { s m } { - \tl_map_inline:Nn \c__fontscale_names_tl + \mode_if_math:TF { - \prop_get:cnN { l_fontscale_##1_prop } { step } \l__fontscale_step_tl - \prop_get:cnN { l_fontscale_##1_prop } { scale } \l__fontscale_scale_tl - \token_to_str:c {##1} \@ \c_colon_str \c_space_tl - step ~=~ \l__fontscale_step_tl ,~ - scale ~=~ \l__fontscale_scale_tl ,~ - size ~=~ \dim_use:c { l_fontscale_##1_size_dim } ,~ - baselineskip ~=~ \skip_use:c { l_fontscale_##1_baselineskip_skip } - \str_if_eq:nnF {##1} { Huge } { \newline } + \msg_warning:nne { fontscale } { math-mode-warning } + { \token_to_str:N \SetFontBaselineskip } } + { + \IfBooleanTF #1 + { \__fontscale_add_font_baselineskip:n {#2} } + { \__fontscale_set_font_baselineskip:n {#2} } + } + } +\cs_new_protected:Npn \__fontscale_set_font_baselineskip:n + { \__fontscale_fontsize:nn { \f@size pt } } +\cs_new_protected:Npn \__fontscale_add_font_baselineskip:n #1 + { + \__fontscale_skip_set_default_pt:Nn \l__fontscale_tmp_skip {#1} + \__fontscale_fontsize:nn { \f@size pt } + { \l__fontscale_tmp_skip + \f@baselineskip } } -\NewDocumentCommand \PrintSampleText - { s O - { - The~ \texttt { fontscale }~ package \c_colon_str \c_space_tl - A~ user~ interface~ for~ setting~ document~ font~ sizes - } +\NewDocumentCommand \PrintFontSizeParameters { } + { \__fontscale_print_font_size_parameters: } +\cs_new_protected:Npn \__fontscale_print_font_size_parameters: + { + step ~=~ \__fontscale_step: ,~ + scale ~=~ \__fontscale_scale: ,~ + size ~=~ \__fontscale_size: ,~ + baselineskip ~=~ \__fontscale_baselineskip: } + +\NewDocumentCommand \PrintAllFontSizeParameters { } { - \IfBooleanTF #1 - { \__fontscale_print_sample_text_descending_order:n {#2} } - { \__fontscale_print_sample_text_ascending_order:n {#2} } + \mode_if_math:TF + { + \msg_error:nne { fontscale } { math-mode-error } + { \token_to_str:N \PrintAllFontSizeParameters } + } + { \__fontscale_print_all_font_size_parameters: } + } +\cs_new_protected:Npn \__fontscale_print_all_font_size_parameters: + { + \token_to_str:N \tiny \c_colon_str \c_space_tl + step ~=~ -4 ,~ + scale ~=~ \fp_use:N \l_fontscale_tiny_scale_fp ,~ + size ~=~ \dim_use:N \l_fontscale_tiny_size_dim ,~ + baselineskip ~=~ \skip_use:N \l_fontscale_tiny_baselineskip_skip + \newline + \token_to_str:N \scriptsize \c_colon_str \c_space_tl + step ~=~ -3 ,~ + scale ~=~ \fp_use:N \l_fontscale_scriptsize_scale_fp ,~ + size ~=~ \dim_use:N \l_fontscale_scriptsize_size_dim ,~ + baselineskip ~=~ \skip_use:N \l_fontscale_scriptsize_baselineskip_skip + \newline + \token_to_str:N \footnotesize \c_colon_str \c_space_tl + step ~=~ -2 ,~ + scale ~=~ \fp_use:N \l_fontscale_footnotesize_scale_fp ,~ + size ~=~ \dim_use:N \l_fontscale_footnotesize_size_dim ,~ + baselineskip ~=~ \skip_use:N \l_fontscale_footnotesize_baselineskip_skip + \newline + \token_to_str:N \small \c_colon_str \c_space_tl + step ~=~ -1 ,~ + scale ~=~ \fp_use:N \l_fontscale_small_scale_fp ,~ + size ~=~ \dim_use:N \l_fontscale_small_size_dim ,~ + baselineskip ~=~ \skip_use:N \l_fontscale_small_baselineskip_skip + \newline + \token_to_str:N \normalsize \c_colon_str \c_space_tl + step ~=~ 0 ,~ + scale ~=~ 1 ,~ + size ~=~ \dim_use:N \l_fontscale_normalsize_size_dim ,~ + baselineskip ~=~ \skip_use:N \l_fontscale_normalsize_baselineskip_skip + \newline + \token_to_str:N \large \c_colon_str \c_space_tl + step ~=~ 1 ,~ + scale ~=~ \fp_use:N \l_fontscale_large_scale_fp ,~ + size ~=~ \dim_use:N \l_fontscale_large_size_dim ,~ + baselineskip ~=~ \skip_use:N \l_fontscale_large_baselineskip_skip + \newline + \token_to_str:N \Large \c_colon_str \c_space_tl + step ~=~ 2 ,~ + scale ~=~ \fp_use:N \l_fontscale_Large_scale_fp ,~ + size ~=~ \dim_use:N \l_fontscale_Large_size_dim ,~ + baselineskip ~=~ \skip_use:N \l_fontscale_Large_baselineskip_skip + \newline + \token_to_str:N \LARGE \@ \c_colon_str \c_space_tl + step ~=~ 3 ,~ + scale ~=~ \fp_use:N \l_fontscale_LARGE_scale_fp ,~ + size ~=~ \dim_use:N \l_fontscale_LARGE_size_dim ,~ + baselineskip ~=~ \skip_use:N \l_fontscale_LARGE_baselineskip_skip + \newline + \token_to_str:N \huge \c_colon_str \c_space_tl + step ~=~ 4 ,~ + scale ~=~ \fp_use:N \l_fontscale_huge_scale_fp ,~ + size ~=~ \dim_use:N \l_fontscale_huge_size_dim ,~ + baselineskip ~=~ \skip_use:N \l_fontscale_huge_baselineskip_skip + \newline + \token_to_str:N \Huge \c_colon_str \c_space_tl + step ~=~ 5 ,~ + scale ~=~ \fp_use:N \l_fontscale_Huge_scale_fp ,~ + size ~=~ \dim_use:N \l_fontscale_Huge_size_dim ,~ + baselineskip ~=~ \skip_use:N \l_fontscale_Huge_baselineskip_skip + } + +\NewDocumentCommand \PrintSampleText { s +m } + { + \mode_if_math:TF + { + \msg_error:nne { fontscale } { math-mode-error } + { \token_to_str:N \PrintSampleText } + } + { + \IfBooleanTF #1 + { \__fontscale_print_sample_text_descending_order:n {#2} } + { \__fontscale_print_sample_text_ascending_order:n {#2} } + } } \cs_new_protected:Npn \__fontscale_print_sample_text_ascending_order:n #1 { @@ -1169,80 +1287,26 @@ { \tiny #1 \par } } -\NewDocumentCommand \PrintFontSizeCommand { } { \__fontscale_print_name: } -\cs_new_protected:Npn \__fontscale_print_name: +\NewDocumentCommand \PrintFontSizeCommand { } { - \dim_case:nn { \f@size pt } + \mode_if_math:TF { - { \l_fontscale_tiny_size_dim } - { - \skip_if_eq:nnT { \f@baselineskip } - { \l_fontscale_tiny_baselineskip_skip } - { \token_to_str:N \tiny \prg_break: } - } - { \l_fontscale_scriptsize_size_dim } - { - \skip_if_eq:nnT { \f@baselineskip } - { \l_fontscale_scriptsize_baselineskip_skip } - { \token_to_str:N \scriptsize \prg_break: } - } - { \l_fontscale_footnotesize_size_dim } - { - \skip_if_eq:nnT { \f@baselineskip } - { \l_fontscale_footnotesize_baselineskip_skip } - { \token_to_str:N \footnotesize \prg_break: } - } - { \l_fontscale_small_size_dim } - { - \skip_if_eq:nnT { \f@baselineskip } - { \l_fontscale_small_baselineskip_skip } - { \token_to_str:N \small \prg_break: } - } - { \l_fontscale_normalsize_size_dim } - { - \skip_if_eq:nnT { \f@baselineskip } - { \l_fontscale_normalsize_baselineskip_skip } - { \token_to_str:N \normalsize \prg_break: } - } - { \l_fontscale_large_size_dim } - { - \skip_if_eq:nnT { \f@baselineskip } - { \l_fontscale_large_baselineskip_skip } - { \token_to_str:N \large \prg_break: } - } - { \l_fontscale_Large_size_dim } - { - \skip_if_eq:nnT { \f@baselineskip } - { \l_fontscale_Large_baselineskip_skip } - { \token_to_str:N \Large \prg_break: } - } - { \l_fontscale_LARGE_size_dim } - { - \skip_if_eq:nnT { \f@baselineskip } - { \l_fontscale_LARGE_baselineskip_skip } - { \token_to_str:N \LARGE \@ \prg_break: } - } - { \l_fontscale_huge_size_dim } - { - \skip_if_eq:nnT { \f@baselineskip } - { \l_fontscale_huge_baselineskip_skip } - { \token_to_str:N \huge \prg_break: } - } - { \l_fontscale_Huge_size_dim } - { - \skip_if_eq:nnT { \f@baselineskip } - { \l_fontscale_Huge_baselineskip_skip } - { \token_to_str:N \Huge \prg_break: } - } + \msg_error:nne { fontscale } { math-mode-error } + { \token_to_str:N \PrintFontSizeCommand } } - UNDEFINED \@ - \prg_break: - \prg_break_point: + { \__fontscale_print_name: } + } +\cs_new_protected:Npn \__fontscale_print_name: + { + \str_set:Ne \l__fontscale_tmp_str { \__fontscale_name: } + \str_if_empty:NTF \l__fontscale_tmp_str + { \token_to_str:N \undefined } + { \c_backslash_str \l__fontscale_tmp_str \@ } } % TEXT PURIFY -\cs_new:Npn \__fontscale_text_purify_equivalent:n #1 +\cs_new:Npn \__fontscale_remove_arg_spec_sm:n #1 { \bool_lazy_all:nT { @@ -1252,11 +1316,15 @@ } { \use_none:n } } +\text_declare_purify_equivalent:Nn \fontscalesetup + { \__fontscale_remove_arg_spec_sm:n } \text_declare_purify_equivalent:Nn \SetFontStep - { \__fontscale_text_purify_equivalent:n } + { \__fontscale_remove_arg_spec_sm:n } \text_declare_purify_equivalent:Nn \SetFontScale - { \__fontscale_text_purify_equivalent:n } + { \__fontscale_remove_arg_spec_sm:n } \text_declare_purify_equivalent:Nn \SetFontSize - { \__fontscale_text_purify_equivalent:n } + { \__fontscale_remove_arg_spec_sm:n } \text_declare_purify_equivalent:Nn \ScaleFont { \use_none:n } -\text_declare_purify_equivalent:Nn \SetFontSizeBaselineskip { \use_none:nn }
\ No newline at end of file +\text_declare_purify_equivalent:Nn \SetFontSizeBaselineskip { \use_none:nn } +\text_declare_purify_equivalent:Nn \SetFontBaselineskip + { \__fontscale_remove_arg_spec_sm:n }
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/framedsyntax/FramedSyntax.sty b/Master/texmf-dist/tex/latex/framedsyntax/FramedSyntax.sty new file mode 100644 index 00000000000..42aed89ce90 --- /dev/null +++ b/Master/texmf-dist/tex/latex/framedsyntax/FramedSyntax.sty @@ -0,0 +1,257 @@ +%% +%% This is file `FramedSyntax.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% FramedSyntax.dtx (with options: `package') +%% +%% Copyright (C) 2024 Claudio Beccari all rights reserved. +%% +%% Distributable under the LaTeX Project Public License, +%% version 1.3c or higher (your choice). The latest version of +%% this license is at: http://www.latex-project.org/lppl.txt +%% +\NeedsTeXFormat{LaTeX2e}[2019/01/01] +\ProvidesPackage{FramedSyntax}% + [2024-09-04 v.0.2.8 Typeset command syntax within a special frame] +\IfPackageLoadedF{pict2e}{\RequirePackage{pict2e}} +\IfPackageLoadedF{etoolbox}{\RequirePackage{etoolbox}} +\IfPackageLoadedF{xkeyval}{\RequirePackage{xkeyval}} +\IfPackageLoadedF{xcolor}{\RequirePackage{xcolor}} +\providecommand*\FSmeta[1]{\textnormal{$\langle$\textit{#1}$\rangle$}} +\providecommand*\FSmarg[1]% + {\textnormal{\texttt{\char123}\FSmeta{#1}\texttt{\char125}}} +\providecommand*\FSoarg[1]{\textnormal{\texttt{[}\FSmeta{#1}\texttt{]}}} +\providecommand*\FSArg[1]{\textnormal{\texttt{\{#1\}}}} +\let\FSMarg\FSArg +\providecommand*\FSOarg[1]{\textnormal{\texttt{[#1]}}} +\def\GT@splitargs#1,#2!{\def\@tempA{#1}\def\@tempB{#2}} +\providecommand\FSgarg[1]{\textnormal{\GT@splitargs#1!\% + \texttt{(}\FSmeta{\@tempA}\texttt{,}\FSmeta{\@tempB}\texttt{)}}} +\providecommand*\FScomando[1]{\textnormal{\texttt{\string#1}}} +\providecommand*{\FScs}[1]% +{\textnormal{\texttt{\char92#1}\index{#1@\texttt{\char92#1}|textsc}}} +\let\FScsindex\FScs +\providecommand*\SFSambiente[2]{% +\FScomando{\begin}\FSmarg{#1}\FSoarg{#2}\,\dots + \FScomando{\end}\FSmarg{#1}} +\providecommand*\DFSambiente[3]{% + \FScomando{\begin}\FSmarg{#1}\FSoarg{#2}\FSoarg{#3}\,\dots + \FScomando{\end}\FSmarg{#1}} +\providecommand*\BFSambiente[1]{\FScomando{\begin}\FSmarg{#1}} +\providecommand*\EFSambiente[1]{\FScomando{\end}\FSmarg{#1}} +\IfPackageLoadedF{cfr-lm}{\let\texttm\texttt \let\texttv\texttt} +\DeclareRobustCommand*\FSambstyle[1]{% + {\normalfont\textsf{\slshape#1}}} +\DeclareRobustCommand*\FSclassstyle[1]{% + {\normalfont\texttv{\itshape#1}}} +\DeclareRobustCommand*\FSfilestyle[1]{% + {\normalfont\texttm{\texttt{#1}}}} +\DeclareRobustCommand*\FSpackstyle[1]{% + {\normalfont\texttm{\ifbool{PDFTeX}{\textit}{\itshape}{#1}}}}% +\DeclareRobustCommand*\FSprogstyle[1]{{\normalfont\textsf{#1}}} +\DeclareRobustCommand*\FSprog[1]{\FSprogstyle{#1}% +\iflanguage{english}{\index{program!#1@\FSprogstyle{#1}|textsc}}% + {\index{programma!#1@\FSprogstyle{#1}|textsc}}}% +\DeclareRobustCommand*\FSpack[1]{\FSpackstyle{#1}% +\iflanguage{english}{\index{package!#1@\FSpackstyle{#1}|textsc}}% + {\index{pacchetto!#1@\FSpackstyle{#1}|textsc}}} +\DeclareRobustCommand*\FSclass[1]{\FSclassstyle{#1}% + \iflanguage{english}{\index{class!#1@\FSclassstyle{#1}|textsc}}% + {\index{classe!#1@\FSclassstyle{#1}|textsc}}}% +\DeclareRobustCommand*\file[1]{\FSfilestyle{#1}% + \index{file!#1@\FSfilestyle{#1}|textsc}}% +\DeclareRobustCommand*\FSamb[1]{\FSambstyle{#1}% + \iflanguage{english}% + {\index{environment!#1@\FSambstyle{#1}|textsc}}% + {\index{ambiente!#1@\FSambstyle{#1}|textsc}}}% +\DeclareRobustCommand*\FSopzstyle[1]{% + {\normalfont\textsf{\slshape{#1}}}}% +\DeclareRobustCommand*\FScontastyle[1]{{\normalfont\texttm{#1}}} +\DeclareRobustCommand*\FSstilestyle[1]{{\normalfont\texttm{#1}}} +\DeclareRobustCommand*\FSnumeristyle[1]{{\normalfont\texttm{#1}}} +\DeclareRobustCommand*\FSumisurastyle[1]{{\normalfont\texttm{#1}}} +\DeclareRobustCommand*\FSchiavestyle[1]{{\normalfont\texttm{#1}}} +\DeclareRobustCommand*\FSdescrittorestyle[1]{{\normalfont\texttm{#1}}} +\DeclareRobustCommand*\FSposizionestyle[1]{{\normalfont\texttm{#1}}} +\DeclareRobustCommand*\FSallineamentostyle[1]{{\normalfont\texttm{#1}}} +\DeclareRobustCommand*\FSopz[1]{\opzstyle{#1}% + \iflanguage{english}{\index{option!#1@\FSopzstyle{#1}|textsc}}% + {\index{opzione!#1@\opzstyle{#1}|textsc}}}% +\DeclareRobustCommand*\FSconta[1]{\Fcontastyle{#1}% + \iflanguage{english}{\index{counter!#1@\FScontastyle{#1}|textsc}}% + {\index{contatore!#1@\FScontastyle{#1}|textsc}}} +\DeclareRobustCommand*\FSstile[1]{\FSstilestyle{#1}% + \iflanguage{english}{\index{page style!#1@\FSstilestyle{#1}|textsc}}% + {\index{stile della pagina!#1@\FSstilestyle{#1}|textsc}}} +\DeclareRobustCommand*\FSnumeri[1]{\FSnumeristyle{#1}% + \iflanguage{english}{\index{numbering!#1@\FSnumeristyle{#1}|textsc}}% + {\index{numerazione!#1@\FSnumeristyle{#1}|textsc}}} +\DeclareRobustCommand*\FSumisura[1]{\FSumisurastyle{#1}% + \iflanguage{english}{measuring unit!#1@\FSumisurastyle{#1}|textsc}% + {\index{unità di misura!#1@\FSumisurastyle{#1}|textsc}}} +\DeclareRobustCommand*\FSchiave[1]{\FSchiavestyle{#1}% + \iflanguage{english}{\index{key!#1@\FSchiavestyle{#1}|textsc}}% + {\index{chiave!#1@\chiavestyle{#1}|textsc}}} +\DeclareRobustCommand*\FSdescrittore[1]{\FSdescrittorestyle{#1}% + \iflanguage{english}% + {\index{column descriptor!#1@\FSdescrittorestyle{#1}|textsc}}% + {\index{descrittore di colonna!#1@\FSdescrittorestyle{#1}|textsc}}} +\DeclareRobustCommand*\FSposizione[1]{\FSposizionestyle{#1}% + \iflanguage{english}% + {\index{floating object position!#1@\FSposizionestyle{#1}|textsc}}% + {\index{posizione degli oggetti flottanti!#1@\FSposizionestyle{#1}|textsc}}}% +\DeclareRobustCommand*\FSallineamento[1]{FS\allineamentostyle{#1}% + \iflanguage{english}% + {\index{allignment code!#1@\FSallineamentostyle{#1}|textsc}}% + {\index{codice di allineamento!#1@\FSallineamentostyle{#1}|textsc}}} +\newlength\SIfrthick +\newlength\SIfrgap +\newlength\SIfrwidth +\newlength\SIfrheight +\ifcsdef{insertwidth}{}{\newlength\insertwidth} +\newlength\SIXR \newlength\SIYD +\newlength\SIXL \newlength\SIYU +\newdimen\radius +\newdimen\framewidth + +\definecolor{SIbackground}{rgb}{0.95,0.95,0.95} +\definecolor{SIframe}{rgb}{0.1,0.1,0.1} +\definecolor{SItext}{rgb}{0,0,0} + +\def\SetSIbgd#1{\colorlet{SIbackground}{#1}} +\def\SetSIfrm#1{\colorlet{SIframe}{#1}} +\def\SetSItxt#1{\colorlet{SItext}{#1}} + +\DeclareOptionX<sintassi>{fboxrule}[1pt]{\fboxrule=#1} +\DeclareOptionX<sintassi>{fboxsep}[1ex]{\fboxsep=#1} +\DeclareOptionX<sintassi>{framecolor}[SIframe]{\SetSIfrm{#1}} +\DeclareOptionX<sintassi>{backgroundcolor}[SIbackground]{\SetSIbgd{#1}} +\DeclareOptionX<sintassi>{fontstyle}[\normalfont]{#1} +\DeclareOptionX<sintassi>{radius}[\fboxsep]{\radius=#1} +\DeclareOptionX<sintassi>{insertionwidth}[\linewidth]{\insertwidth=#1} + +\DeclareOptionX*{% + \packageWarning{FramedSyntax}{`\CurrentOption' ignored}% +} + +\ExecuteOptionsX<sintassi>{% + fboxrule, + fboxsep, + framecolor, + backgroundcolor, + fontstyle, + radius, + insertionwidth +} +\ProcessOptionsX*\relax + +\providecommand\setfontsize{} +\RenewDocumentCommand\setfontsize{O{1.2} m O{#1}}{% + \fontsize{#2}{\fpeval{#1*#2}}\selectfont} + +\providecommand\strippt{} +\renewcommand\strippt[1]{\csuse{strip@pt}#1} + +\providecommand\framedbox{} +\RenewDocumentCommand\framedbox{m m m O{#3} m}{% +\bgroup + \dimen2=#1\relax + \dimen0=\dimexpr#1-(#2+#3)*2\relax + \setbox0\hbox{\parbox{\dimen0}{#5}}% + \SIfrthick=#2\relax + \SIXR=\dimexpr\wd0/2\relax \SIXL=-\SIXR\relax + \SIYU=\dimexpr(\ht0+\dp0)/2\relax \SIYD=-\SIYU\relax + \dimen4=#1\relax % box total width + \dimen6=\dimexpr\ht0+\dp0+(#2+#3)*2\relax% box total height + \dimen8=#4\relax % corner arc radius + \edef\SIbase{\strippt{\dimen4}} + \edef\SIalt{\strippt{\dimen6}} + \edef\SIxoff{\strippt{\dimexpr0.5\dimen4}} + \edef\SIyoff{\strippt{\dimexpr0.5\dimen6}} + \unitlength=1pt + \begin{picture}(\SIbase,\SIalt)(-\SIxoff,-\SIyoff) + \Frame*{\dimen4}{\dimen6}{\dimen8}% + \ifdim\SIfrthick>0pt\Frame{\dimen4}{\dimen6}{\dimen8}\fi + \put(0,0){\makebox(0,0){\box0}}% + \end{picture} +\egroup +\ignorespaces} + + \providecommand\Frame{} + \RenewDocumentCommand\Frame{s m m m}{% + \bgroup + \SIXR=\dimexpr#2/2\relax \SIXL=-\SIXR% + \SIYU=\dimexpr#3/2\relax \SIYD=-\SIYU% + \IfBooleanTF{#1}{\linethickness{0pt}\color{SIbackground}}% + {\linethickness{\SIfrthick}\color{SIframe}}% + \moveto(\SIXR,\SIYD+#4)% + \circlearc{\SIXR-#4}{\SIYU-#4}{#4}{0}{90}% + \circlearc{\SIXL+#4}{\SIYU-#4}{#4}{90}{180}% + \circlearc{\SIXL+#4}{\SIYD+#4}{#4}{180}{270}% + \circlearc{\SIXR-#4}{\SIYD+#4}{#4}{270}{360}% + \closepath + \IfBooleanTF{#1}{\fillpath}{\strokepath}% + \egroup\ignorespaces} + + +\providecommand\includeframedtext{} +\RenewDocumentCommand\includeframedtext{O{\insertwidth} m O{}}% +{\bgroup + \ExecuteOptionsX<sintassi>{#3}% + \ifdimgreater{\insertwidth}{\linewidth}{\insertwidth=\linewidth}{}% + \framedbox{\insertwidth}{\fboxrule}{\fboxsep}[\radius]{#2}% +\egroup} + +\ProvideDocumentEnvironment{FramedSyntax}{}{}{} +\RenewDocumentEnvironment{FramedSyntax}{o D(){}} +{% environment opening commands +\IfValueT{#1}{\setfontsize{#1}}% font size setting +\ExecuteOptionsX<sintassi>{#2}% key = value options + \ifdimgreater{\insertwidth}{\linewidth}% width corrrection + {\insertwidth=\linewidth}{}% +\framewidth=\insertwidth +\let\meta\FSmeta \let\marg\FSmarg \let\oarg\FSoarg +\let\Arg\FSArg \let\Marg\FSMarg \let\Oarg\FSOarg +\let\garg\FSgarg \let\comando\FScomando \let\cs\FScs +\let\csindex\FScs \let\Sambiente\SFSambiente +\let\Dambiente\DFSambiente +\let\Bambiente\BFSambiente \let\Eambiente\EFSambiente +\let\amb\FSamb \let\ambstyle\FSambstyle +\let\class\FSclass \let\classstyle\FSclassstyle +\let\file\FSfile \let\filestyle\FSfilestyle +\let\pack\FSpack \let\packstyle\FSpackstyle +\let\prog\FSprog \let\progstyle\FSprogstyle +\let\opz\FSopz \let\opzstyle\FSopzstyle +\let\conta\FSconta \let\contastyle\FScontastyle +\let\stile\FSstile \let\stilestyle\FSstilestyle +\let\numeri\FSnumeri \let\numerystyle\FSnumeristyle +\let\umisura\FSumisura \let\umisurastyle\FSumisurastyle +\let\chiave\FSchiave \let\chiavestyle\FSchiavestyle +\let\descrittore\FSdescrittore +\let\descrittorestyle\FSDescrittorestyle +\let\posizione\FSposizione \let\posizionestyle\FSposizionestyle +\let\allineamento\FSallineamento + \let\allineamentostyle\FSallineamentostyle + +\begin{lrbox}{2}% open the necessary boxes +\begin{minipage}{% + \dimexpr\framewidth-2\fboxrule-2\fboxsep}\obeylines +}{% environment closing commands +\end{minipage}\end{lrbox}% close the above boxes +\begin{flushleft}% set the syntax thext flush left +\includeframedtext{\box2}[#2] +\end{flushleft}}% + +\NewDocumentEnvironment{Sintassi}{o D(){}}% + {\begin{FramedSyntax}[#1](#2)}{\end{FramedSyntax}} + +%% This Work has the status of `maintained' +%% +%% The Current Maintainer is Claudio Beccari +%% +%% This work consists of this file FramedSyntax.dtx, +%% and the derived files FramedSyntax.sty and FramedSyntax.pdf. +%% +%% End of file `FramedSyntax.sty'. diff --git a/Master/texmf-dist/tex/latex/gridset/gridset.sty b/Master/texmf-dist/tex/latex/gridset/gridset.sty index 00a11c2c83e..30ed1443293 100644 --- a/Master/texmf-dist/tex/latex/gridset/gridset.sty +++ b/Master/texmf-dist/tex/latex/gridset/gridset.sty @@ -12,7 +12,7 @@ %% without the source ot the work. See below about more informations %% about the files the work consists of. %% -%% Copyright (C) 2008-2020 Markus Kohm +%% Copyright (C) 2008-2024 Markus Kohm %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3c @@ -34,7 +34,7 @@ %% the Work (see ``Important Recommendations'' at lppl.txt). %% \ProvidesPackage{gridset} - [2020-02-12 v0.3 grid - a.k.a. in-register - setting] + [2024-08-17 v0.4 grid - a.k.a. in-register - setting] \newcommand*{\gridset@luaorpdf}[1]{% \expandafter\newcommand\csname gridset@#1\endcsname{}% \ifcsname pdf#1\endcsname @@ -137,7 +137,7 @@ \fi } \AtBeginDocument{% - \global\let\grid@unique@test\@gobble + \global\let\grid@unique@test\@gobbletwo } \newcommand*\grid@ReRunMessage{} \AtBeginDocument{% diff --git a/Master/texmf-dist/tex/latex/harmony/harmony.sty b/Master/texmf-dist/tex/latex/harmony/harmony.sty index ce528cf0853..1145113c4d9 100644 --- a/Master/texmf-dist/tex/latex/harmony/harmony.sty +++ b/Master/texmf-dist/tex/latex/harmony/harmony.sty @@ -1,29 +1,30 @@ -%% harmony.sty 2007/05/04 -%% Copyright 2005 - 2007 +%% harmony.sty 2024/08/01 +%% Copyright 2005 - 2024 %% Dagny Wegner <dagny.wegner@t-online.de> -%% Arnim Wegner <arnim.wegner@t-online.de> +%% Arnim Wegner <arnim.e.wegner@t-online.de> % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either % version 1.3 of this license or (at your option) any % later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3 or later is part of all distributions -% of LaTeX version 2005/12/01 or later. -% -% This work has the LPPL maintenance status `maintained'. -% -% The Current Maintainers of this work are -% Dagny Wegner and Arnim Wegner. % % This work consists of the files harmony.sty, % harmony.tex, harmony.pdf, and Readme. % ================================================================================== +\ProvidesPackage{harmony}[2024/08/01] \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{harmony}[2007/05/04] \RequirePackage{ifthen} \RequirePackage{amssymb} +\RequirePackage{mathtools} % contains \overbracket +% +\newcounter{notekorr} +\DeclareOption{8pt}{\setcounter{notekorr}{800}} +\DeclareOption{9pt}{\setcounter{notekorr}{900}} +\DeclareOption{10pt}{\setcounter{notekorr}{1000}} +\DeclareOption{11pt}{\setcounter{notekorr}{1100}} +\DeclareOption{12pt}{\setcounter{notekorr}{1200}} +\DeclareOption{13pt}{\setcounter{notekorr}{1300}} +\DeclareOption{14pt}{\setcounter{notekorr}{1400}} \DeclareOption{sf}{\def\FAM{\sffamily}} \DeclareOption{rm}{\def\FAM{\rmfamily}} \ExecuteOptions{sf} @@ -43,14 +44,31 @@ \newbox\nbxg \newbox\nbxh \newbox\nbxi -\newfont{\KREIS}{lcirclew10} -\newfont{\NOTEN}{musix13} -\newfont{\noten}{musix11}% 2007/05/03 +\newcounter{notescl} +\newcounter{fontscl} % -\newcommand{\Ohne}[2][0em]{% +\ifthenelse{\value{notekorr}=0}% +{\ifthenelse{\@ptsize<-2}{\setcounter{notescl}{800}}{} +\ifthenelse{\equal{\@ptsize}{-2}}{\setcounter{notescl}{800}}{} +\ifthenelse{\equal{\@ptsize}{-1}}{\setcounter{notescl}{900}}{} +\ifthenelse{\equal{\@ptsize}{0}}{\setcounter{notescl}{1000}}{} +\ifthenelse{\equal{\@ptsize}{1}}{\setcounter{notescl}{1100}}{} +\ifthenelse{\equal{\@ptsize}{2}}{\setcounter{notescl}{1200}}{} +\ifthenelse{\equal{\@ptsize}{3}}{\setcounter{notescl}{1300}}{} +\ifthenelse{\equal{\@ptsize}{4}}{\setcounter{notescl}{1400}}{} +\ifthenelse{\@ptsize>4}{\setcounter{notescl}{1400}}{}} +{\setcounter{notescl}{\value{notekorr}}} +% +\newfont{\NOTEN}{musix13 scaled \value{notescl}} +\newfont{\noten}{musix11 scaled \value{notescl}} +\setcounter{fontscl}{\value{notescl}} +\addtocounter{fontscl}{1000} +\newfont{\KREIS}{lcircle10 scaled \value{fontscl}} +% +\newcommand{\Ohne}[2][0.17em]{% \setbox\nbxi=\hbox{% \FAM% -\setbox\nbxa=\hbox{\sl\large /}% +\setbox\nbxa=\hbox{\textsl\large\raisebox{0.2ex}{/}}% #2% \kern-0.8em% \kern#1% @@ -60,8 +78,14 @@ }% \unhbox\nbxi% } +\let\Sans\Ohne % \newcommand{\Dohne}{\Ohne{D}} +\let\Dsans\Dohne +\newcommand{\DohneR}{\framebox{\Dohne}} +\let\DsansR\DohneR +\newcommand{\Dohner}{\frame{\Dohne}} +\let\Dsansr\Dohner % \newcommand{\DD}{% \setbox\nbxi=\hbox{% @@ -73,6 +97,9 @@ \unhbox\nbxi% } % +\newcommand{\DDR}{\framebox{\DD}} +\newcommand{\DDr}{\frame{\DD}} +% \newcommand{\DS}{% \setbox\nbxi=\hbox{% \FAM% @@ -96,7 +123,7 @@ \newcommand{\DDohne}{% \setbox\nbxi=\hbox{% \FAM% -\setbox\nbxa=\hbox{\sl\large /}% +\setbox\nbxa=\hbox{\textsl\large\raisebox{0.25ex}{/}}% \raise0.2ex\hbox{D}% \kern-0.5em% \lower0.2ex\hbox{D}% @@ -107,17 +134,23 @@ }% \box\nbxi% } +\let\DDsans\DDohne +% +\newcommand{\DDohneR}{\framebox{\DDohne}} +\let\DDsansR\DDohneR +\newcommand{\DDohner}{\frame{\DDohne}} +\let\DDsansr\DDohner % \newcommand{\VM}{% \setbox\nbxg=\hbox{>}% \setbox\nbxh=\hbox to \wd\nbxg{% -\raise0.24ex\hbox{{\boldmath$\scriptscriptstyle{>}$\unboldmath}\hss}}% 2005/05/10 +\raise0.24ex\hbox{{\boldmath$\scriptscriptstyle{>}$\unboldmath}\hss}}% \box\nbxh} % \newcommand{\UB}{% \setbox\nbxg=\hbox{<}% \setbox\nbxh=\hbox to \wd\nbxg{% -\raise0.24ex\hbox{\boldmath$\scriptscriptstyle{<}$\unboldmath\hss}}% 2005/05/10 +\raise0.24ex\hbox{\boldmath$\scriptscriptstyle{<}$\unboldmath\hss}}% \box\nbxh} % \newcommand{\HAa}[3]{% @@ -243,6 +276,9 @@ {\HAc{#1}{#2}{#3}{#4}{#5}}% } % +\def\HHR.#1.#2.#3.#4.#5.{\framebox{\HH.#1.#2.#3.#4.#5.}}% +\def\HHr.#1.#2.#3.#4.#5.{\frame{\HH.#1.#2.#3.#4.#5.\hspace{0.17em}}}% +% \newcommand{\FERM}[2][0.1pt]{% \setbox\nbxi=\hbox{% \FAM% @@ -287,15 +323,13 @@ \kern-\tmpdima\box\nbxb% }} % -\newcommand{\Kr}[1]{% -\ifthenelse{\equal{\@ptsize}{2}}{\@tempcnta=110}% -{\ifthenelse{\equal{\@ptsize}{1}}{\@tempcnta=109}% -{\@tempcnta=108}}% +\newcommand{\Kr}[2][102]{% +\ifthenelse{#1>110}{\@tempcnta=110}% +{\ifthenelse{#1<100}{\@tempcnta=100}{\@tempcnta=#1}} \setbox\nbxi=\hbox{% -\FAM\small% \setbox\nbxa=\hbox{#1}% \setbox\nbxb=\hbox{\KREIS\char\@tempcnta}% -\setbox\nbxc=\hbox to \wd\nbxb{\hss #1\hss}% +\setbox\nbxc=\hbox to \wd\nbxb{\hss #2\hss}% \tmpdima=0.5\ht\nbxa% \advance\tmpdima by -0.4\dp\nbxa\relax% \copy\nbxc% @@ -332,8 +366,8 @@ {\raisebox{0.58ex}[8pt][2pt]{\kern-1pt\NOTEN\symbol{82}\kern0.3em}}}% {\kern0.05em\ueber{#1}{#2}\kern0.05em% }}} -% -\newcommand{\Ganz}{{\NOTEN\kern0.05em\raisebox{0.5ex}{\symbol{9}}\kern1.35em}} +% Noten +\newcommand{\Ganz}{{\NOTEN\kern0.05em\raisebox{0.5ex}{\symbol{9}}\kern1.5em}} \newcommand{\Halb}{{\NOTEN\kern0.05em\raisebox{0.5ex}{\symbol{8}\kern0.936em% \raisebox{0.55ex}{\symbol{16}}}\kern0.2em}} \newcommand{\Vier}{{\NOTEN\kern0.05em\raisebox{0.5ex}{\symbol{7}\kern0.955em% @@ -343,7 +377,7 @@ \newcommand{\Sech}{{\NOTEN\kern0.05em\raisebox{0.5ex}{\symbol{7}\kern0.955em% \raisebox{0.55ex}{\symbol{16}}}\symbol{41}\kern0.9em}} \newcommand{\Zwdr}{{\NOTEN\kern0.05em\raisebox{0.5ex}{\symbol{7}\kern0.955em% -\raisebox{0.55ex}{\symbol{16}}}\symbol{42}\kern0.9em}} +\raisebox{0.55ex}{\symbol{16}}\raisebox{1.3ex}{\symbol{16}}}\symbol{42}\kern0.9em}} \newcommand{\GaPa}{{\NOTEN\kern0.055em\raisebox{0.25ex}{\symbol{60}}\kern0.05em}} \newcommand{\HaPa}{{\NOTEN\kern0.055em\raisebox{0.25ex}{\symbol{60}}\kern0.05em}} \newcommand{\ViPa}{{\NOTEN\kern0.05em\raisebox{-0.8ex}{\symbol{62}}\kern0.955em}} @@ -351,28 +385,76 @@ \newcommand{\SePa}{{\NOTEN\kern0.15em\raisebox{-0.4ex}{\symbol{64}}\kern1.3em}} \newcommand{\ZwPa}{{\NOTEN\kern0.25em\raisebox{-0.8ex}{\symbol{65}}\kern1.4em}} \newcommand{\Pu}{{\NOTEN\kern-0.2em\raisebox{-0.5ex}{\symbol{24}}\kern1em}} -\newcommand{\AAcht}{\Vier\kern0.1em\Vier{\NOTEN\kern-1.72em\raisebox{3.1ex}% +\newcommand{\AAcht}{{\NOTEN\Vier\kern0.3em\Vier\kern-1.72em\raisebox{3.1ex}% {\symbol{61}\kern-0.87em\symbol{61}}}} -\newcommand{\AchtBL}% 2007/05/03 -{\kern0.135em\Vier% -{\NOTEN\kern-1.82em\raisebox{3.05ex}{\symbol{61}\kern-0.87em\symbol{61}}\kern0.09em}} -\newcommand{\SechBL}% 2007/05/03 -{\kern0.135em\Vier% -{\NOTEN\kern-1.82em\raisebox{3.05ex}{\symbol{61}\kern-0.87em\symbol{61}}% +\newcommand{\AchtBL}{{\NOTEN\Vier\kern-1.82em\raisebox{3.05ex}{\symbol{61}\kern-0.87em\symbol{61}}}} +\newcommand{\AchtBR}{{\NOTEN\Vier\kern-0.1em\raisebox{3.05ex}{\symbol{61}\kern-0.87em\symbol{61}}}} +\newcommand{\SechBL}{{\NOTEN\Vier\kern-1.82em\raisebox{3.05ex}{\symbol{61}\kern-0.87em\symbol{61}}% \kern-1.63em\raisebox{2.3ex}{\symbol{61}\kern-0.87em\symbol{61}}\kern0.09em}} -\newcommand{\SechBl}% 2007/05/03 -{\kern0.135em\Vier% -{\NOTEN\kern-1.82em\raisebox{3.05ex}{\symbol{61}\kern-0.87em\symbol{61}}% +\newcommand{\SechBl}{{\NOTEN\Vier\kern-1.82em\raisebox{3.05ex}{\symbol{61}\kern-0.87em\symbol{61}}% \kern-1.63em\raisebox{2.3ex}{{\noten\kern0.9em\symbol{61}}}\kern0.09em}} -\newcommand{\AchtBR}% 2007/05/03 -{\kern0.135em\Vier% -{\NOTEN\kern-0.1em\raisebox{3.05ex}{\symbol{61}\kern-0.87em\symbol{61}}\kern-1em}} -\newcommand{\SechBR}% 2007/05/03 -{\kern0.135em\Vier% -{\NOTEN\kern-0.1em\raisebox{3.05ex}{\symbol{61}\kern-0.87em\symbol{61}}% -\kern-1.63em\raisebox{2.3ex}{\symbol{61}\kern-0.87em\symbol{61}}\kern-1.01em}} -\newcommand{\SechBr}% 2007/05/03 -{\kern0.135em\Vier% -{\NOTEN\kern-0.1em\raisebox{3.05ex}{\symbol{61}\kern-0.87em\symbol{61}}% -\kern-1.63em\raisebox{2.3ex}{{\noten\kern-0.12em\symbol{61}}}\kern-0.3em}} -% etc. ... ! Define your own commands!
\ No newline at end of file +\newcommand{\SechBR}{{\NOTEN\Vier\kern-0.1em\raisebox{3.05ex}{\symbol{61}\kern-0.87em\symbol{61}}% +\kern-1.63em\raisebox{2.3ex}{\symbol{61}\kern-0.87em\symbol{61}}}} +\newcommand{\SechBr}{{\NOTEN\Vier\kern-0.1em\raisebox{3.05ex}{\symbol{61}\kern-0.87em\symbol{61}}% +\kern-1.63em\raisebox{2.3ex}{{\noten\kern-0.12em\symbol{61}}}\kern0.87em}} +% +\newcommand{\Blkn}[2]{\raisebox{#2}{{\NOTEN\kern#1\symbol{61}}}}% +% +\newcommand{\Overset}[3][0pt]{\ensuremath{\overset{\raisebox{#1}{\scriptsize\ensuremath{#2}}}{#3}}} +% +\newcommand\achteltriole{% + \ensuremath{\NOTEN% + \Overset[-1ex]% + {\text{\itshape\tiny\kern0.7em 3}}% + {\AchtBR\kern-1.1em\Vier\kern0.4em\AchtBL}% + }% +} +% +\newcommand\vierteltrioleA{% + \ensuremath{\NOTEN% + \Overset[-1ex]% + {\text{\itshape\tiny 3}}% + {\overbracket[0.45pt]{% + \rule{0pt}{2.4ex}\Vier\kern0.5em\Vier\kern0.5em\Vier\kern0.25em}% + }% + }% +} +% +\newcommand\vierteltrioleB{% + \ensuremath{\NOTEN% + \Overset% + {\raisebox{1ex}{% + \rule{0.45pt}{1ex}% + \kern0.25em\raisebox{0.88ex}{\kern-0.3em\rule{1.15em}{0.45pt}}% + \raisebox{0.53ex}{\text{\itshape\tiny 3}}% + \raisebox{0.88ex}{\rule{1.15em}{0.45pt}}% + \kern-0.05em\rule{0.45pt}{1ex}% + }}% + {\Vier\kern0.5em\Vier\kern0.5em\Vier\kern0.3em}% + }% +} +% +\newcommand\halbetrioleA{% + \ensuremath{\NOTEN% + \Overset[-1ex]% + {\text{\itshape\tiny 3}}% + {\overbracket[0.45pt]{% + \rule{0pt}{2.4ex}\Halb\kern0.5em\Halb\kern0.5em\Halb\kern0.25em}% + }% + }% +} +% +\newcommand\halbetrioleB{% + \ensuremath{\NOTEN% + \Overset% + {\raisebox{1ex}{% + \rule{0.45pt}{1ex}% + \kern0.25em\raisebox{0.88ex}{\kern-0.3em\rule{1.15em}{0.45pt}}% + \raisebox{0.53ex}{\text{\itshape\tiny 3}}% + \raisebox{0.88ex}{\rule{1.15em}{0.45pt}}% + \kern-0.05em\rule{0.45pt}{1ex}% + }}% + {\Halb\kern0.5em\Halb\kern0.5em\Halb\kern0.3em}% + }% +} +% ==================================================================================
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/hebdomon/hebdomon.cls b/Master/texmf-dist/tex/latex/hebdomon/hebdomon.cls new file mode 100644 index 00000000000..33277f76c3a --- /dev/null +++ b/Master/texmf-dist/tex/latex/hebdomon/hebdomon.cls @@ -0,0 +1,412 @@ +% Hebdomon document class for use in report and assessment writing +% Written by D. T. McGuiness: dtm@mci4me.at + +% v0.1 - Angry Avocado [WS2024] + +\NeedsTeXFormat{LaTeX2e}[1994/06/01] +\ProvidesClass{hebdomon}[2024/08/08 v0.1 Report and Documentation standard] + +% This document is based on the excellent KOMA Script scrreprt class +% The following options are declared beforehand. + +\RequirePackage{ifthen} % require an if-else loop to +% choose depending on the field + +% Allows students to choose which package for code printing. + +\newboolean{mnt} % set bool operator for minted +\newboolean{lst} % set bool operator for lstlisting +\newboolean{drw} % set bool operator for PGF/TikZ + +%-OPTION: set option to choose minted code printing package +\DeclareOption{minted}{ + \setboolean{mnt}{true} +} + +%-OPTION: set option to choose lstlisting code printing package +\DeclareOption{lstlisting}{ + \setboolean{lst}{true} +} + +%-OPTION: set option to choose PGF/TikZ plotting packages +\DeclareOption{draw}{ + \setboolean{drw}{true} +} + +\DeclareOption*{ + \PassOptionsToClass{\CurrentOption}{scrreprt} +} +\ExecuteOptions{} +\ProcessOptions \relax + +% Load the base class to create the custom template +\LoadClass[ + bibliography = totoc, + headings = big, + captions = tableheading, + chapterprefix = true, +]{scrreprt} + +% Page Geometry ----------------------------------------------------------- +% Define the default page geometry +\RequirePackage[ + left = 3.0cm, + right = 2.0cm, + top = 2.5cm, + bottom = 2.5cm]{geometry} + +% Required Packages ------------------------------------------------------- +\RequirePackage{nicematrix} % For modern table design +\RequirePackage{booktabs} % To access \midrule \toprule \bottomrule + +% For use in referencing purposes +\RequirePackage[ + backend=bibtex]{biblatex} + +\RequirePackage{graphicx} % To enable image insertion +\RequirePackage{environ} % To allow new environments with Environ + + +\RequirePackage{lmodern} +\RequirePackage[sfdefault]{FiraSans} + +\RequirePackage{minitoc} +\RequirePackage{setspace} + +\RequirePackage{hyperref} % Allow the use of hyperlink within document + +\RequirePackage{enumitem} + +\RequirePackage{amsmath} + +\usepackage[labelfont=bf]{caption} % Set the caption style to bold + +\RequirePackage{titlesec} + +% %%%%% ----- Colour Definitions ------ %%%%% +\RequirePackage{xcolor} + +% Define the MCI colours. +\definecolor{mciRed}{HTML}{821131} +\definecolor{mciBlue}{HTML}{004983} +\definecolor{mciOrange}{HTML}{fe640b} +\definecolor{quoteColour}{HTML}{CBA6F7} +\definecolor{nord7}{HTML}{81a1c1} +\definecolor{norda}{HTML}{bf616a} +\definecolor{nord9}{HTML}{5e81ac} +\definecolor{nord13}{HTML}{ebcb8b} +\definecolor{nord14}{HTML}{a3be8c} + +% %%%%% ----- Code Presentation ----- %%%%% +% To make this class more compatible and avoid questions about pygments, +% the author has decided to use listings for code presentation, instead of +% minted. +\RequirePackage{listings} + +\lstset{ + aboveskip={1.3\baselineskip}, + basicstyle=\small\ttfamily\linespread{4}, + breaklines=false, + backgroundcolor = \color[HTML]{eff1f5}, + columns=flexible, + commentstyle=\color[HTML]{6c6f85}\ttfamily, + escapechar=@, + extendedchars=true, + identifierstyle=\color{black}, + inputencoding=latin1, + keywordstyle=\color[HTML]{fe640b}, + language=Python, + ndkeywordstyle=\color[HTML]{228B22}, + numbers=left, + numberstyle=\tiny, + prebreak = \raisebox{0ex}[0ex][0ex]{\ensuremath{\hookleftarrow}}, + showstringspaces=false, + stringstyle=\color[HTML]{40a02b}\ttfamily, + upquote=true, + emph={None}, + emphstyle={\color[HTML]{FE640B}}, + % keywordstyle=[1]{\color[HTML]{8839ef}}, + % morekeywords={(,)}, + keywordstyle=[2]\color[HTML]{D20F39}, + keywordstyle={[3]\color[HTML]{8839ef}}, + keywords=[3]{x}, +} + +% \lstset{style=mystyle} + +% New Environment Definitions --------------------------------------------- +% To create environments tcolorbox package is required to make them +% aesthetically pleasing. +\RequirePackage{tcolorbox} +\tcbuselibrary{breakable, minted, skins,theorems, hooks, most} + +% %%%%% ----- tcolorbox Templates ----- %%%%% + +% Define the excerpt environment style. +\tcbset{% + quoteTemplate/.style={% + enhanced, + breakable, + arc=0pt, + outer arc=0pt, + toprule=0pt, + rightrule=0pt, + bottomrule=0pt, + leftrule=1mm, + colback=white, + colframe=mciRed, + detach title + }% +}% + +\tcbset{% + blockTemplate/.style={% + enhanced, + breakable, + arc=0pt, + outer arc=0pt, + toprule=0pt, + rightrule=0pt, + bottomrule=0pt, + leftrule=1mm, + colback=#1!25, + colframe=#1, + coltitle=black, + detach title + }% +}% + +% %%%%% --------------------------------%%%%% + +% Environment used to insert quotations. +\NewEnviron{excerpt}[1][]{% + \begin{tcolorbox}[blockTemplate=nord7] + \BODY + \end{tcolorbox} +}% + +\NewEnviron{example}[1][]{% + \begin{tcolorbox}[blockTemplate=nord14] + \BODY + \end{tcolorbox} +}% + +\NewEnviron{highlight}[1][]{% + \begin{tcolorbox}[blockTemplate=nord13] + \BODY + \end{tcolorbox} +}% + +\NewEnviron{theory}[1][]{% + \begin{tcolorbox}[blockTemplate=black] + \BODY + \end{tcolorbox} +}% + +\NewEnviron{warning}[1][]{% + \begin{tcolorbox}[blockTemplate=norda] + \BODY + \end{tcolorbox} +}% + +\NewEnviron{hgitemize}[1][]{% + \begin{itemize}[leftmargin=!,labelindent=-29.2pt] + \BODY + \end{itemize} +}% + + + + + +% KOMA-Script Configuration ----------------------------------------------- + +\addtokomafont{chapterprefix}{\raggedleft} +\addtokomafont{chapter}{\fontsize{30}{38}\selectfont} +\addtokomafont{section}{\huge} +\addtokomafont{subsection}{\Large} +\addtokomafont{subsubsection}{\large} + +% Set the fontstyle of minitoc to that of the document +\renewcommand{\mtifont}{\large\sffamily} +\renewcommand{\mtcfont}{\small\sffamily} +\renewcommand{\mtcSfont}{\small\sffamily} +\renewcommand{\mtcSSfont}{\small\sffamily} +\renewcommand{\mtcSSSfont}{\small\sffamily} + +\newcommand{\StudentName}[1]{\author{#1}} + +% Set the depth of TOC +\setcounter{secnumdepth}{3} % number subsubsections +\setcounter{tocdepth}{3} % list subsubsections + +% Configure the document titles +\newcommand{\Chapter}[1]{\chapter{\textcolor{mciBlue}{#1}}\minitoc} +\newcommand{\Section}[1]{\section{\textcolor{mciBlue}{#1}}} +\newcommand{\Subsection}[1]{\subsection{\textcolor{mciBlue}{#1}}} +\newcommand{\Subsubsection}[1]{\subsubsection{\textcolor{mciBlue}{#1}}} + +\newcommand{\hlight}[1]{\textcolor{mciOrange}{#1}} + + +% Configure the baseline of the document +\renewcommand{\baselinestretch}{1.2} + +\renewcommand*{\chapterformat}{% + \mbox{\scalebox{1.5}{\chapappifchapterprefix{\nobreakspace}}% + \scalebox{4}{\color{mciRed}\thechapter\autodot}\enskip}} + +\newcommand{\heading}[1]{\subsubsection*{$\blacksquare$ #1}} +\newcommand{\marginsecnumber}[1]{% + \makebox[0pt][r]{#1\hspace{6pt}}% +} + +\titleformat{\section} {\normalfont\Large\bfseries} +{\marginsecnumber\thesection} {0pt} {} +\titleformat{\subsection} {\normalfont\large\bfseries} +{\marginsecnumber\thesubsection} {0pt} {} +\titleformat{\subsubsection} +{\normalfont\normalsize\bfseries} +{\marginsecnumber\thesubsubsection} +{0pt} {} +\titleformat{\paragraph}[runin] +{\normalfont\normalsize\bfseries} +{\marginsecnumber\theparagraph} +{0pt} {} +\titleformat{\subparagraph}[runin] +{\normalfont\normalsize\bfseries} +{\marginsecnumber\thesubparagraph} +{0pt} +{} + +\titlespacing*{\subsection}{0pt}{*3.25}{*1.5}% + +\setlength\parindent{0pt} % set no indent for the entire file + +\ifthenelse{\boolean{mnt}}{% + \RequirePackage{minted} + + \newcommand{\pcode}[1]{% + {% + \colorbox{gray!10}{% + \mintinline[fontsize=\small]{text}{#1}% + }% + }% + }% + + %\usemintedstyle{catppuccin-latte} + + \definecolor{catback}{HTML}{585b70} + \definecolor{catground}{HTML}{eff1f5} + + % Set box and font rules for inputminted command for paper + \newtcbinputlisting{\codeinputpaper}[4][]{% + listing file={#3}, + minted language=#2, + minted options={ + fontsize=\small, + tabsize=4, + xleftmargin=-2.25mm, + numbersep=5mm, + breaklines=true, + highlightcolor=orange!50, + %formatcom=orange!50 + },% <-- put other minted options inside the brackets + overlay unbroken and first={% + \begin{tcbclipinterior} + \fill[catback] (frame.south west) rectangle + ([xshift=1mm]frame.north west); + \fill[catback] (frame.north east) rectangle + ([xshift=-4mm, yshift=-10mm]frame.north east); + \fill[catback] + ([xshift=-4mm, yshift=-10mm]frame.north east) -- + ([xshift=0mm, yshift=-10mm]frame.north east) -- + ([xshift=0mm, yshift=-12mm]frame.north east); + \end{tcbclipinterior} + \node[rotate=-90, minimum width=1cm, anchor=north, + font=\bfseries] at ([xshift=0mm, yshift=-4mm]frame.north + east) {\tiny \textcolor{white}{#2}}; }, + sharp corners, + leftrule=1mm, + toprule=0pt, + rightrule=0pt, + bottomrule=0pt, + colback=catground, + colframe=black, + breakable, + enhanced,% <-- put other tcolorbox options here + arc=0mm, + boxrule=0pt, + frame hidden, + listing only, + minted options app={#1}} + + \RequirePackage{xpatch} + + \newenvironment{code}[1] + {% + \VerbatimEnvironment + \begin{minted}{#1}% +} +{% + \end{minted}% + } + % + \xpatchcmd{\mintinline}{\begingroup}{\begingroup\let\itshape\relax}{}{} + \xpatchcmd{\minted}{\VerbatimEnvironment}{\VerbatimEnvironment\let\itshape\relax}{}{} + \xpatchcmd{\inputminted}{\begingroup}{\begingroup\let\itshape\relax}{}{} +}{} + +\ifthenelse{\boolean{lst}}{% + \RequirePackage{listings}% + \RequirePackage{xparse} + + \NewDocumentCommand{\pcode}{v}{% + #1% + } + + \newenvironment{code}[1] + {% + \VerbatimEnvironment + \begin{lstlisting}{language=#1}% +} +{% + \end{lstlisting}% + } +}{} + + +\ifthenelse{\boolean{drw}}{% + \RequirePackage{pgfplots} % Enable to draw plots in the documents + \usepackage{tikz} % Enable Tikz and its libraries + \pgfplotsset{compat=1.18} % Set the pgf compatibility. + % + \usepgfplotslibrary{polar} % To access polarplot + % + \pgfplotsset{ + hebdomon/.style={ + minor grid style={dotted, gray!50}, + major grid style={dotted, gray!50}, + % + grid = both, + minor tick num=2, + ytick align=outside, + xtick align=outside, + axis line style={draw=none}, + axis lines = left, + % + line width=2pt, + % + legend style = { + line width=0.5pt + }, + % + every non boxed x axis/.append style={x axis line style=-}, + every non boxed y axis/.append style={y axis line style=-}, + % + }, + } +}{} + + +\endinput diff --git a/Master/texmf-dist/tex/latex/heria/heria.cls b/Master/texmf-dist/tex/latex/heria/heria.cls index 9c581bbe329..6853ae99d15 100644 --- a/Master/texmf-dist/tex/latex/heria/heria.cls +++ b/Master/texmf-dist/tex/latex/heria/heria.cls @@ -21,7 +21,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesClass{heria} -[2024-07-14 v3.4.1.0 Class for Horizon Europe (R)IA proposals] +[2024-09-03 v3.4.1.3 Class for Horizon Europe (R)IA proposals] \LoadClass[11pt,a4paper]{article} \RequirePackage[T1]{fontenc} % T1 font encoding \RequirePackage[left=15mm, @@ -137,7 +137,7 @@ & #2 & \getPnum{#3} & #3 & % \@ifundefined{@wpTotalPersonMonths\arabic{@wp#1num}}% {\textbf{??}}% - {\disptoken{@wpTotalPersonMonths\arabic{@wp#1num}}}% + {\fpeval{\disptoken{@wpTotalPersonMonths\arabic{@wp#1num}}/2}}% & #4 & #5}}% \@esphack \ifthenelse{\arabic{@wp#1num}=1}{}{\bigskip} @@ -432,7 +432,7 @@ \whiledo{\value{@secolumn}<\value{@wpcount}}{% \stepcounter{@secolumn}% \edef\serowtemp{\serowtemp&\fpeval{round(\csname % - @wpPersonMonths\arabic{@secolumn}\endcsname,0)}}% + @wpPersonMonths\arabic{@secolumn}\endcsname/2,0)}}% \@bsphack \protected@write\@auxout{}% {\string\expandafter\string\expandafter\string\expandafter% @@ -441,7 +441,7 @@ \arabic{@secolumn}},0)}}}% \@esphack } - \serowtemp & \fpeval{round(\setotalpm,0)} \\ + \serowtemp & \fpeval{round(\setotalpm/2,0)} \\ \hline \end{xltabular} \end{center} diff --git a/Master/texmf-dist/tex/latex/hypdestopt/hypdestopt.sty b/Master/texmf-dist/tex/latex/hypdestopt/hypdestopt.sty index 8218f1c7711..d789eadad43 100644 --- a/Master/texmf-dist/tex/latex/hypdestopt/hypdestopt.sty +++ b/Master/texmf-dist/tex/latex/hypdestopt/hypdestopt.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: hypdestopt -%% Version: 2020-09-02 v2.7 +%% Version: 2024-08-07 v2.8 %% %% Copyright (C) %% 2006-2008, 2011 Heiko Oberdiek -%% 2016-2020 Oberdiek Package Support Group +%% 2016-2024 Oberdiek Package Support Group %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -37,7 +37,19 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypdestopt}% - [2020-09-02 v2.7 Hyperref destination optimizer (HO)]% + [2024-08-07 v2.8 Hyperref destination optimizer (HO)]% +\IfDocumentMetadataTF + { + \PackageWarning{hypdestopt} + { + \string\DocumentMetadata detected. \MessageBreak + The package will do nothing. + }{} + }{} +\IfDocumentMetadataTF + { + \endinput + }{} \newif\ifHypDest@Verbose \DeclareOption{verbose}{\HypDest@Verbosetrue} \def\HypDest@VerboseInfo#1{% diff --git a/Master/texmf-dist/tex/latex/interlinear/interlinear.sty b/Master/texmf-dist/tex/latex/interlinear/interlinear.sty new file mode 100644 index 00000000000..dd881b83dbc --- /dev/null +++ b/Master/texmf-dist/tex/latex/interlinear/interlinear.sty @@ -0,0 +1,1176 @@ +% ^package_name="lingwrit-interlinear"_version="1.0"_container="lingwrit" +% ^markup-language="WRIML" +% ^purpose +% This package processes interlinear gloss text, providing tools for handling and formatting glosses in linguistic documents. +% It is based on the cgloss4e.sty package, but with significant modifications to avoid conflicts with other packages and to extend functionality. +% As part of the lingwrit package, lingwrit-interlinear should not be loaded alongside it. +% _purpose +% ^base-program cgloss4e.sty _base-program + +% ^rem General Information +% ^- lingwrit-interlinear is a modified version of cgloss4e.sty _- +% ^- It primarily renames commands according to a customized syntax to prevent conflicts with other similar packages. _- +% ^- Additional modifications include new commands and a new interlinear environment. _- +% ^- Code added to the original has been marked with % ^added and % _added _- +% _rem + +% ^module_name="interlinear"_container="lingwrit" +% ^desc +% This module is a modified version of the cgloss4e.sty. +% +% Modifications include: +% - Command renaming: Commands have been renamed to avoid potential conflicts with other packages using similar names. +% - Commands for processing four-lines interlinearization +% - interlinear environment with its options +% - markup commands and other functionalities +% +% Below is the list of new command names and their counterparts in cgloss: + +% ^list +% ^cat Functions _cat + +% \more ^_becomes \lw_iln_process:words_queue +% \lastword ^_becomes \lw_iln_fun_get:last_word +% \testdone ^_becomes \lw_iln_check:queue_emptyness +% \getwords ^_becomes \lw_iln_fun_get:line_words +% \donewords ^_becomes \lw_iln_fun_exit:word_extraction +% \twosent ^_becomes \lw_iln_fun_align:two_lines_words +% \threesent ^_becomes \lw_iln_fun_align:three_lines_words +% \glossglue ^_becomes \lw_iln_glue:inter_word_space +% \gll ^_becomes \lw_iln_fun_enter:two_lines_interlinearization +% \glll ^_becomes \lw_iln_fun_enter:three_lines_interlinearization +% \glt ^_becomes \lw_iln_fun_insert:free_translation +% \glend ^_becomes \lw_iln_fun_exit:interlinearization +% \gl@stop ^_becomes \lw_iln_fun_exit:words_alignment + +% ^cat Boxes variables _cat + +% \lineone ^_becomes \lw_iln_var_box:line_one +% \linetwo ^_becomes \lw_iln_var_box:line_two +% \linethree ^_becomes \lw_iln_var_box:line_three +% \linefour ^_becomes \lw_iln_var_box:line_four +% \wordone ^_becomes \lw_iln_var_box:word_one +% \wordtwo ^_becomes \lw_iln_var_box:word_two +% \wordthree ^_becomes \lw_iln_var_box:word_three +% \wordfour ^_becomes \lw_iln_var_box:word_four +% \gline ^_becomes \lw_iln_var_box:iln_text_lines + +% ^cat Setting Appearence _cat + +% \eachwordone ^_becomes \lw_iln_fun_set:line_one_words_format +% \eachwordtwo ^_becomes \lw_iln_fun_set:line_two_words_format +% \eachwordthree ^_becomes \lw_iln_fun_set:line_three_words_format +% \eachwordfour ^_becomes \lw_iln_fun_set:line_four_words_format +% _list + +% The naming of the commands follows the following schema: + +% \<container>_<package>_<type>_<subtype>:<name/description> + +% <container> code is: lw (for lingwrit) +% <package> code is: iln (for interlinear) +% <type> code includes: "var" (for variables) and "fun" (for functions) + +% Variable Subtypes +% box: for boxes + +% Function Subtypes +% enter: initialize a process +% exit: terminates a process +% get: extract information +% check: test if some condition is met +% insert: inserts some stuff (i.e. the translation) +% process: process given elements +% calc: calculates the value of some variable +% set: sets (manually) the values of some variable +% _desc + +% ^code +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{lingwrit-interlinear}[2024/08/22 v1.0 (Linguistic Writing) Interlinear gloss text processing] + +% todo Required Packages +\RequirePackage{marginnote} % ^rem for marginnotes _rem +\RequirePackage{xifthen} +\RequirePackage{xkeyval} % ^rem For key=val options +\RequirePackage{xparse,etoolbox,enumitem} + +% todo 0. Utilities + +% todo a. LW Syntax Related Commands +% Shortcut for some conditional statements +\DeclareDocumentCommand{\IfValueArgTF}{mmmm}{\ifthenelse{\equal{#1}{#2}}{#3}{#4}} +% Enabling the package syntax +\providecommand{\switchlwsyntaxon}{\makeatletter\catcode `:=11 \catcode `_=11} +\providecommand{\switchlwsyntaxoff}{\makeatother \catcode `:=12 \catcode `_=8} +% if you want to modify some internal commands, check if your code is +% surrounded by \switchlwsyntaxon and \switchlwsyntaxoff (LW Syntax enables "@", ":" and "_" to be used in csnames. So you need not using \makeatletter and \makeatother when you are using lwsyntax)) + + +% ^action_name="Enabling LingWrit Syntax" +\switchlwsyntaxon +% _action + +% todo b. Renaming of some TeX primitives +\let\enter:group\bgroup\relax +\let\exit:group\egroup\relax + +% todo c. Defining some helpers +\def\lw_fun_helper:store#1{\expandafter\let\csname call:stored_#1\endcsname\expandafter\csname #1\endcsname} +\def\lw_fun_helper:call#1{#1} +\def\lw_fun_helper:clear#1{\RenewDocumentCommand{#1}{}{\relax}}% + +% todo d. Usefull Commands That are not used +% The following commands are not used actually but may be usefull in some contexts +% Fixing bugs with setspace package +% If you encounter an error message using \singlespacing, \onehalfspacing or \doublespacing, use either of the following commands, according to your needs. + +\def\usedoublespacing{\lw_fun_helper:store{doublespacing} + \renewcommand\doublespacing{% + \call:stored_doublespacing% + \def\baselinestretch{1.69}}% +} +% +\def\useonehalfspacing{% + \lw_fun_helper:store{onehalfspacing} + \renewcommand\onehalfspacing{% + \call:stored_onehalfspacing% + \def\baselinestretch{1.24}}% + } +\def\usesinglespacing{% + \lw_fun_helper:store{singlespacing} + \renewcommand\singlespacing{% + \call:stored_singlespacing% + \def\baselinestretch{1}}% + } + +% Line Stretch Size Calculator + +% Enable LW Syntax +%\switchlwsyntaxon +%\newcounter{currentsize} +%\setcounter{currentsize}{10} +%\addtocounter{currentsize}{\@ptsize} +%\newlength{\lw_iln_length:line_stretch_size} +%\setlength{\lw_iln_length:line_stretch_size}{\dimexpr\baselinestretch pt * \thecurrentsize} +%Current size: \thecurrentsize +%Current interline size: +%\the\lw_iln_length:line_stretch_size +% Disable LW Syntax +% \switchlwsyntaxoff + +% todo enter:cgloss4e modifications * + +% todo 1. Borrowings from covington + +% Forcing and disabling single spacing +\let\@gsingle=1 +\def\lw_iln_fun_enable:force_single_spacing{\let\@gsingle=1} +\def\lw_iln_fun_disable:force_single_spacing{\let\@gsingle=0} +\@ifundefined{new@fontshape}% +{\def\@selfnt{\ifx\@currsize\normalsize\@normalsize\else\@currsize\fi}} +{\def\@selfnt{\selectfont}} + +% todo a. 2-lines global interlinearization processing commands +% ^modif_action="\begin{flushleft} removed" +% ^rem inspired by Alexis Dimitriadis cgloss.sty _rem + +\def\lw_iln_fun_enter:two_lines_interlinearization% % Introduces 2-line text-and-gloss. +{%\begin{flushleft} + \ifx\@gsingle1% conditionally force single spacing (hpk/MC) + \vskip\baselineskip\def\baselinestretch{1}% + \@selfnt\vskip-\baselineskip\fi% + \enter:group% + \lw_iln_fun_align:two_lines_words% + } +% _modif + +% todo b. 3-lines global interlinearization processing commands +% ^modif_action="\begin{flushleft} removed" +% ^rem inspired by Alexis Dimitriadis cgloss.sty _rem + \def\lw_iln_fun_enter:three_lines_interlinearization% % Introduces 3-line text-and-gloss. + {%\begin{flushleft} + \ifx\@gsingle1% conditionally force single spacing (hpk/MC) + \vskip\baselineskip\def\baselinestretch{1}% + \@selfnt\vskip-\baselineskip\fi% + \enter:group + \lw_iln_fun_align:three_lines_words + } +% _modif + +% todo c. 4-lines global interlinearization processing commands +% ^added_action="\lw_iln_fun_enter:four_lines_interlinearization defined for initiating 4-lines interlinearization" + % ^rem inspired by Alexis Dimitriadis cgloss.sty _rem + \def\lw_iln_fun_enter:four_lines_interlinearization% % Introduces 3-line text-and-gloss. + {%\begin{flushleft} + \ifx\@gsingle1% conditionally force single spacing (hpk/MC) + \vskip\baselineskip\def\baselinestretch{1}% + \@selfnt\vskip-\baselineskip\fi% + \enter:group + \lw_iln_fun_align:four_lines_words + } + % _modif + +% todo d. Translation and interlinear end +% ^modif_action="Is now obsolete" +% \def\lw_iln_fun_insert:free_translation{} ^rem obsolete _rem +% _modif +% ^modif_action="Definition modified" + % Introduces a translation + \let\trans\relax% ^rem obsolete _rem +% _modif + + \def\lw_iln_fun_exit:interlinearization{% + \lw_iln_fun_insert:interlinear_bottom_skip% + } + % Ends the gloss environment. +% _modif + +% todo 2. Adaptation of gloss.tex + + % The following TeX code is adapted, with permission, from: + % gloss.tex: Macros for vertically aligning words in consecutive sentences. + % Version: 1.0 release: 26 November 1990 + % Copyright (c) 1991 Marcel R. van der Goot (marcel@cs.caltech.edu). + % Original Midnight/gloss.tex and Midnight/gloss.doc are available from + % csvax.cs.caltech.edu [131.215.131.131] in pub/tex + % and many other anonymous ftp archives. + +% todo a. Box Variables Declaration + \newbox\lw_iln_var_box:line_one% boxes with words from first line + \newbox\lw_iln_var_box:line_two% + \newbox\lw_iln_var_box:line_three% + \newbox\lw_iln_var_box:line_four% ^rem ADDED _rem + \newbox\lw_iln_var_box:word_one% a word from the first line (hbox) + \newbox\lw_iln_var_box:word_two% + \newbox\lw_iln_var_box:word_three% + \newbox\lw_iln_var_box:word_four% ^rem ADDED _rem + \newbox\lw_iln_var_box:iln_text_lines% the constructed double line (hbox) + +% todo b. Skip Variable Declaration and setting + \newskip\lw_iln_glue:inter_word_space% extra glue between glossed pairs or triples + \lw_iln_glue:inter_word_space = 0pt plus 2pt minus 1pt % allow stretch/shrink between words + %\lw_iln_glue:inter_word_space = 5pt plus 2pt minus 1pt % allow stretch/shrink between words + \newlength{\lw_iln_length:base_line_stretch} + \setlength{\lw_iln_length:base_line_stretch}{.61ex} + + \AtBeginDocument{% + \def\lw_iln_fun_calc:line_stretch_factor{% + \ifdim\baselinestretch\p@=1\p@% + \def\lw_iln_multiplier:line_stretch_factor{.5} + \else% + \ifdim\baselinestretch\p@<1.26\p@% + \def\lw_iln_multiplier:line_stretch_factor{.5} + \else% + \ifdim\baselinestretch\p@<1.6\p@ + \def\lw_iln_multiplier:line_stretch_factor{1.6} + \else% + \ifdim\baselinestretch\p@>1.6\p@ + \def\lw_iln_multiplier:line_stretch_factor{2.23} + \else% + \ifdim\baselinestretch\p@=1.6\p@ + \def\lw_iln_multiplier:line_stretch_factor{2.23} + \else% + \fi% + \fi% + \fi% + \fi% + \fi% + } + \lw_iln_fun_calc:line_stretch_factor% + % + \newlength{\lw_iln_length:line_spread} + \setlength{\lw_iln_length:line_spread}{0ex} + \addtolength{\lw_iln_length:line_spread}{\lw_iln_multiplier:line_stretch_factor\lw_iln_length:base_line_stretch} + \addtolength{\lw_iln_length:line_spread}{.16\lw_iln_length:base_line_stretch} + } + %\addtolength{\lw_iln_length:line_spread}{\lw_iln_multiplier:line_stretch_factor\lw_iln_length:base_line_stretch} + + +% todo c. Boolean Declaration + \newif\ifnotdone + +% todo d. \rmfamily font declaraton (for backward compatibility) + % For any REALLY old distributions without \rmfamily + \@ifundefined{rmfamily}{\let\rmfamily=\rm} + +% todo e. Définition functions controlling the appearance of words in each line of the interlinearized text +% ^modified_action="Adding low level commands to format different aspects of the appearence of words" +\@ifundefined{lw_iln_fun_set:line_one_words_format}% + {\newcommand\lw_iln_fun_set:line_one_words_format{% + \lw_iln_fun_set:line_one_words_font_size% + \lw_iln_fun_set:line_one_words_font_series% + \lw_iln_fun_set:line_one_words_font_shape% + \lw_iln_fun_set:line_one_words_font_color% + } + }{\relax} + % ^added + \let\lw_iln_fun_set:line_one_words_font_size=\normalsize + \let\lw_iln_fun_set:line_one_words_font_series=\mdseries% + \let\lw_iln_fun_set:line_one_words_font_shape=\upshape% + \let\lw_iln_fun_set:line_one_words_font_color=\normalcolor% + % _added + % +\@ifundefined{lw_iln_fun_set:line_two_words_format}% + {\newcommand\lw_iln_fun_set:line_two_words_format{% + \lw_iln_fun_set:line_two_words_font_size% + \lw_iln_fun_set:line_two_words_font_series% + \lw_iln_fun_set:line_two_words_font_shape% + \lw_iln_fun_set:line_two_words_font_color} + }% + {\relax} +% + % ^added + \let\lw_iln_fun_set:line_two_words_font_size=\normalsize + \let\lw_iln_fun_set:line_two_words_font_series=\mdseries% + \let\lw_iln_fun_set:line_two_words_font_shape=\upshape% + \let\lw_iln_fun_set:line_two_words_font_color=\normalcolor% + % _added + % +\@ifundefined{lw_iln_fun_set:line_three_words_format}{% + \newcommand\lw_iln_fun_set:line_three_words_format{% + \lw_iln_fun_set:line_three_words_font_size% + \lw_iln_fun_set:line_three_words_font_series% + \lw_iln_fun_set:line_three_words_font_shape% + \lw_iln_fun_set:line_three_words_font_color} + }{\relax} + % ^added + \let\lw_iln_fun_set:line_three_words_font_size=\normalsize + \let\lw_iln_fun_set:line_three_words_font_series=\mdseries% + \let\lw_iln_fun_set:line_three_words_font_shape=\upshape% + \let\lw_iln_fun_set:line_three_words_font_color=\normalcolor% + % _added + % +% +\@ifundefined{lw_iln_fun_set:line_four_words_format}{% + \newcommand\lw_iln_fun_set:line_four_words_format{% + \lw_iln_fun_set:line_four_words_font_size% + \lw_iln_fun_set:line_four_words_font_series% + \lw_iln_fun_set:line_four_words_font_shape% + \lw_iln_fun_set:line_four_words_font_color} + }{\relax}% ^rem ADDED _rem + % ^added + \let\lw_iln_fun_set:line_four_words_font_size=\normalsize + \let\lw_iln_fun_set:line_four_words_font_series=\mdseries% + \let\lw_iln_fun_set:line_four_words_font_shape=\upshape% + \let\lw_iln_fun_set:line_four_words_font_color=\normalcolor% + % _added + % +% _modified +% todo f. General Interlinearization Functions Definition + \def\lw_iln_fun_get:last_word#1#2#3% #1 = \each, #2 = line box, #3 = word box + {\setbox#2=\vbox{\unvbox#2% + \global\setbox#3=\lastbox% + }% + \ifvoid#3\global\setbox#3=\hbox{#1\strut{} }\fi + % extra space following \strut in case #1 needs a space + } + + \def\lw_iln_check:words_queue_emptyness + {\ifdim\ht\lw_iln_var_box:line_one=0pt + \ifdim\ht\lw_iln_var_box:line_two=0pt \notdonefalse % tricky space after pt + \else\notdonetrue + \fi + \else\notdonetrue + \fi + } + + \gdef\lw_iln_fun_get:line_words(#1,#2)#3 #4\\% #1=linebox, #2=\each, #3=1st word, #4=remainder + {\setbox#1=\vbox{\hbox{#2{\strut#3} }% adds space + \unvbox#1% + }% + \def\lw_iln_process:words_queue{#4}% + \ifx\lw_iln_process:words_queue\empty\let\lw_iln_process:words_queue=\lw_iln_fun_exit:word_extraction + \else\let\lw_iln_process:words_queue=\lw_iln_fun_get:line_words + \fi + \lw_iln_process:words_queue(#1,#2)#4\\% + } + + \gdef\lw_iln_fun_exit:word_extraction(#1,#2)\\{}% + +% todo g. Processing of 2-lines interlinear texts +% ^modif_action"Rename \twosent into original twosent" + \gdef\lw_iln_fun_align:two_lines_words#1\\ #2\\{% #1 = first line, #2 = second line + \lw_iln_fun_get:line_words(\lw_iln_var_box:line_one,\lw_iln_fun_set:line_one_words_format)#1 \\% + \lw_iln_fun_get:line_words(\lw_iln_var_box:line_two,\lw_iln_fun_set:line_two_words_format)#2 \\% + \loop\lw_iln_fun_get:last_word{\lw_iln_fun_set:line_one_words_format}{\lw_iln_var_box:line_one}{\lw_iln_var_box:word_one}% + \lw_iln_fun_get:last_word{\lw_iln_fun_set:line_two_words_format}{\lw_iln_var_box:line_two}{\lw_iln_var_box:word_two}% + \global\setbox\lw_iln_var_box:iln_text_lines=\hbox{\unhbox\lw_iln_var_box:iln_text_lines + \hskip\lw_iln_glue:inter_word_space + \vtop{\box\lw_iln_var_box:word_one % vtop was vbox + \nointerlineskip + \box\lw_iln_var_box:word_two + }% + }% + \lw_iln_check:words_queue_emptyness + \ifnotdone + \repeat + \exit:group % matches \enter:group in \gloss + \lw_iln_fun_exit:words_alignment} +% _modif + + +% todo h. Processing of 3-lines interlinear texts + \gdef\lw_iln_fun_align:three_lines_words#1\\ #2\\ #3\\{% #1 = first line, #2 = second line, #3 = third + \lw_iln_fun_get:line_words(\lw_iln_var_box:line_one,\lw_iln_fun_set:line_one_words_format)#1 \\% + \lw_iln_fun_get:line_words(\lw_iln_var_box:line_two,\lw_iln_fun_set:line_two_words_format)#2 \\% + \lw_iln_fun_get:line_words(\lw_iln_var_box:line_three,\lw_iln_fun_set:line_three_words_format)#3 \\% + \loop\lw_iln_fun_get:last_word{\lw_iln_fun_set:line_one_words_format}{\lw_iln_var_box:line_one}{\lw_iln_var_box:word_one}% + \lw_iln_fun_get:last_word{\lw_iln_fun_set:line_two_words_format}{\lw_iln_var_box:line_two}{\lw_iln_var_box:word_two}% + \lw_iln_fun_get:last_word{\lw_iln_fun_set:line_three_words_format}{\lw_iln_var_box:line_three}{\lw_iln_var_box:word_three}% + \global\setbox\lw_iln_var_box:iln_text_lines=\hbox{\unhbox\lw_iln_var_box:iln_text_lines + \hskip\lw_iln_glue:inter_word_space + \vtop{\box\lw_iln_var_box:word_one % vtop was vbox + \nointerlineskip + \box\lw_iln_var_box:word_two + \nointerlineskip + \box\lw_iln_var_box:word_three + }% + }% + \lw_iln_check:words_queue_emptyness + \ifnotdone + \repeat + \exit:group % matches \enter:group in \gloss + \lw_iln_fun_exit:words_alignment} + + +% todo i. Processing of 4-lines interlinear texts +% ^added_action"Four lines interlinear processor, equivalent to an hypothetic \foursent for gloss.tex based interlinearization packages" +\gdef\lw_iln_fun_align:four_lines_words#1\\ #2\\ #3\\ #4\\{% #1 = first line, #2 = second line, #3 = third + \lw_iln_fun_get:line_words(\lw_iln_var_box:line_one,\lw_iln_fun_set:line_one_words_format)#1 \\% + \lw_iln_fun_get:line_words(\lw_iln_var_box:line_two,\lw_iln_fun_set:line_two_words_format)#2 \\% + \lw_iln_fun_get:line_words(\lw_iln_var_box:line_three,\lw_iln_fun_set:line_three_words_format)#3 \\% + \lw_iln_fun_get:line_words(\lw_iln_var_box:line_four,\lw_iln_fun_set:line_four_words_format)#4 \\% + \loop\lw_iln_fun_get:last_word{\lw_iln_fun_set:line_one_words_format}{\lw_iln_var_box:line_one}{\lw_iln_var_box:word_one}% + \lw_iln_fun_get:last_word{\lw_iln_fun_set:line_two_words_format}{\lw_iln_var_box:line_two}{\lw_iln_var_box:word_two}% + \lw_iln_fun_get:last_word{\lw_iln_fun_set:line_three_words_format}{\lw_iln_var_box:line_three}{\lw_iln_var_box:word_three}% + \lw_iln_fun_get:last_word{\lw_iln_fun_set:line_four_words_format}{\lw_iln_var_box:line_four}{\lw_iln_var_box:word_four}% + \global\setbox\lw_iln_var_box:iln_text_lines=\hbox{\unhbox\lw_iln_var_box:iln_text_lines + \hskip\lw_iln_glue:inter_word_space + \vtop{\box\lw_iln_var_box:word_one % vtop was vbox + \nointerlineskip + \box\lw_iln_var_box:word_two + \nointerlineskip + \box\lw_iln_var_box:word_three + \nointerlineskip + \box\lw_iln_var_box:word_four + }% + }% + \lw_iln_check:words_queue_emptyness + \ifnotdone + \repeat + \exit:group % matches \enter:group in \gloss + \lw_iln_fun_exit:words_alignment} + +% _added + + +% todo j. Ending interlinearization +% ^modif_action="\end{flushleft} removed" +% ^rem inspired by Alexis Dimitriadis cgloss.sty _rem + \def\lw_iln_fun_exit:words_alignment{{\hskip -\lw_iln_glue:inter_word_space}\unhbox\lw_iln_var_box:iln_text_lines} +% _modif +% todo * exit:cgloss4e modifications + +% todo 1. Other added features +% todo a. Managing line spacing after interlinearization +\def\baselinestretch{1} +\def\lw_iln_fun_insert:interlinear_bottom_skip{\vskip \lw_iln_length:line_spread}% + +% todo b. Configuring ex-parts boxes + +% ^rem Examples will now be placed within boxes, alongside glosses lines (old genericx.tex's \mb and \gl lines), and hanging bracketed language informations (like LangSci jamboxes) _rem +% todo i. Setting Lengths +% =============== +% Setting Lengths +% =============== +% + +\newlength{\lw_iln_var_dim:ex_box_width} +\newlength{\lw_iln_var_dim:ex_box_right_margin} +%\newlength{\lw_iln_var_dim:ex_box_bottom_sep} +%\newlength{\lw_iln_var_dim:ex_box_top_sep} +\newlength{\lw_iln_var_dim:iln_box_width} +\newlength{\lw_iln_var_dim:iln_box_right_margin} +%\newlength{\lw_iln_var_dim:iln_box_bottom_sep} +%\newlength{\lw_iln_var_dim:iln_box_top_sep} +\newlength{\lw_iln_var_dim:trans_box_width} +\newlength{\lw_iln_var_dim:trans_box_right_margin} +\newlength{\lw_iln_var_dim:gramjudg_len} +\newlength{\lw_iln_var_dim:gramjudg_reserved_space} +\newlength{\lw_iln_var_dim:langinfo_box_width} +\newlength{\lw_iln_var_dim:langinfo_box_left_sep} +\newlength{\lw_iln_var_dim:langinfo_box_right_sep} +\newlength{\lw_iln_var_dim:langinfo_reserved_space} +%\newlength{\lw_iln_var_dim:langinfo_left_margin} +\newlength{\lw_iln_var_dim:extranote_box_width} +\newlength{\lw_iln_var_dim:extranote_box_left_sep} +\newlength{\lw_iln_var_dim:extranote_box_right_sep} +\newlength{\lw_iln_var_dim:extranote_reserved_space} +%\newlength{\lw_iln_var_dim:extranote_left_margin} + +% Initializing lengths +\setlength{\lw_iln_var_dim:ex_box_width}{\linewidth} +\setlength{\lw_iln_var_dim:ex_box_right_margin}{0ex} +\setlength{\lw_iln_var_dim:iln_box_width}{\linewidth} +\setlength{\lw_iln_var_dim:iln_box_right_margin}{0ex} +\setlength{\lw_iln_var_dim:trans_box_width}{\linewidth} +\setlength{\lw_iln_var_dim:trans_box_right_margin}{0ex} +\addtolength{\lw_iln_var_dim:trans_box_width}{-\lw_iln_var_dim:trans_box_right_margin} +\setlength{\lw_iln_var_dim:gramjudg_len}{0ex}% ^rem default value _rem +\setlength{\lw_iln_var_dim:langinfo_box_width}{0ex}% ^rem default value _rem +\setlength{\lw_iln_var_dim:langinfo_reserved_space}{0ex} +\setlength{\lw_iln_var_dim:langinfo_box_left_sep}{3.4ex} +\setlength{\lw_iln_var_dim:langinfo_box_right_sep}{3.4ex} +\setlength{\lw_iln_var_dim:extranote_box_width}{0ex}% ^rem default value _rem +\setlength{\lw_iln_var_dim:extranote_reserved_space}{0ex} +\setlength{\lw_iln_var_dim:extranote_box_left_sep}{0pt} +\setlength{\lw_iln_var_dim:extranote_box_right_sep}{0pt} + +% =========================== +% Defining Booleans for Boxes +% Opennings +% =========================== +\newif\ifnoglosslines% +\noglosslinestrue +% todo ii. Defining Opening CS for Boxes +% ============================= +% Defining Opening CS for Boxes +% ============================= +\NewDocumentCommand{\lw_iln_fun_open:ex_box}{}{% + % ^rem example box opening code _rem + % ^rem \lw_iln_fun_open:ex_box should be called after \label{key} to avoid linebreak _rem + % ^rem no_op command _rem + } +\NewDocumentCommand{\lw_iln_fun_open:iln_box}{}{% + % ^rem interlinear text box opening code _rem + \addtolength{\lw_iln_var_dim:iln_box_width}{-1.15\lw_iln_var_dim:langinfo_reserved_space}% + \begin{itemize}[% + align=left,% + labelwidth=\lw_iln_var_dim:gramjudg_len,% + leftmargin=\lw_iln_var_dim:gramjudg_reserved_space]% + \item[\lw_iln_fun_print:gramjudg]% + \begin{minipage}[t]{\lw_iln_var_dim:iln_box_width}% +} +\NewDocumentCommand{\lw_iln_fun_open:langinfo_box}{}{% + % ^rem language info box opening code _rem + \begin{minipage}[t]{\lw_iln_var_dim:langinfo_box_width} +} +\NewDocumentCommand{\lw_iln_fun_open:trans_box}{}{% + \setlength{\lw_iln_var_dim:trans_box_width}{\linewidth} + \addtolength{\lw_iln_var_dim:trans_box_width}{-1.069\lw_iln_var_dim:extranote_reserved_space}% + \trans \begin{minipage}[b]{\lw_iln_var_dim:trans_box_width} +} +\NewDocumentCommand{\lw_iln_fun_open:extra_note_box}{}{% + \begin{minipage}[t]{\lw_iln_var_dim:extranote_box_width}% + \raggedright% + } + +% todo iii. Defining Closing CS for Boxes +% ============================= +% Defining Closing CS for Boxes +% ============================= +\def\lw_iln_fun_format:ex_text{\normalfont}% +\NewDocumentCommand{\lw_iln_fun_close:ex_box}{}{% + % ^rem example box closing code _rem + \setlength{\lw_iln_var_dim:trans_box_width}{\linewidth} + \addtolength{\lw_iln_var_dim:trans_box_width}{-\lw_iln_var_dim:gramjudg_reserved_space} + \addtolength{\lw_iln_var_dim:trans_box_width}{-1.0618\lw_iln_var_dim:extranote_reserved_space}% + \IfValueArgTF{\lw_iln_var_stored:gramjudg_text}{}{\relax}% + {\begin{minipage}[t]{\lw_iln_var_dim:gramjudg_len} + \lw_iln_fun_print:gramjudg% + \end{minipage}} + \begin{minipage}[t]{\lw_iln_var_dim:trans_box_width} + \lw_iln_fun_format:ex_text% + \lw_iln_var_stored:free_trans_text\space% + \normalfont% + \IfValueArgTF{\lw_iln_var_stored:reference_text}{}{\relax}{\lw_iln_fun_print:reference}% + \end{minipage} + \IfValueArgTF{\lw_iln_var_stored:extranote_text}{}{\relax}% + {\vskip -2.6ex + \hfill% + \begin{minipage}[t]{\lw_iln_var_dim:extranote_box_width} + (\lw_iln_var_stored:extranote_text)% + \end{minipage}}% +} +\NewDocumentCommand{\lw_iln_fun_close:iln_box}{}{% + % ^rem interlinear text box closing code _rem + \lw_iln_fun_exit:interlinearization + \end{minipage}\lw_iln_fun_print:langinfo% + \end{itemize} +} +\NewDocumentCommand{\lw_iln_fun_close:langinfo_box}{}{% + % ^rem language info box closing code _rem + \end{minipage}% +} +\NewDocumentCommand{\lw_iln_fun_close:extranote_box}{}{% + \end{minipage}% +} +\NewDocumentCommand{\lw_iln_fun_close:trans_box}{}{% + \end{minipage}\hfill% +} + +% todo iv. Defining CS for setting or inserting example parts or metadata +\def\lw_iln_var_stored:langinfo_text{} +% the * and : versions print the language name as a title. +% If \lw_iln_fun_set:langinfo if followed by an ex_box, use the * version +% If there is some text -- e.g. specifying the context for the data -- before the ex_box, use the : version +% To print the language information as a margin note, use the "bear" version +\NewDocumentCommand{\langinfo}{s t/ m }{% + \IfBooleanTF{#1}% + {{\normalfont #3}}% + {% + \IfBooleanTF{#2}% + {{\normalfont #3}\\}% + {\def\lw_iln_var_stored:langinfo_text{#3} + \settowidth{\lw_iln_var_dim:langinfo_box_width}{#3} + \setlength{\lw_iln_var_dim:langinfo_reserved_space}{\lw_iln_var_dim:langinfo_box_width} + \addtolength{\lw_iln_var_dim:langinfo_reserved_space}{\lw_iln_var_dim:langinfo_box_left_sep} + \addtolength{\lw_iln_var_dim:langinfo_reserved_space}{\lw_iln_var_dim:langinfo_box_right_sep} + }% + }% +}% + +\NewDocumentCommand{\lw_iln_fun_set:langinfo}{m}{\langinfo{#1}} +\NewDocumentCommand{\lw_iln_fun_make:langinfo_box}{}{% + \ifthenelse{\equal{\lw_iln_var_stored:langinfo_text}{}}{}{% + \marginnote{\hskip -\lw_iln_var_dim:langinfo_reserved_space\lw_iln_fun_open:langinfo_box% + {\normalfont(\lw_iln_var_stored:langinfo_text)}% + \lw_iln_fun_close:langinfo_box}[0cm]% + }% +} +\NewCommandCopy{\lw_iln_fun_print:langinfo}{\lw_iln_fun_make:langinfo_box} + +\def\lw_iln_var_stored:gramjudg_text{} +\NewDocumentCommand{\lw_iln_fun_set:gramjudg}{m}{% + \def\lw_iln_var_stored:gramjudg_text{#1}% + \settowidth{\lw_iln_var_dim:gramjudg_len}{#1}% + \setlength{\lw_iln_var_dim:gramjudg_reserved_space}{\lw_iln_var_dim:gramjudg_len}% + \addtolength{\lw_iln_var_dim:gramjudg_reserved_space}{1ex}% +} +\NewDocumentCommand{\lw_iln_fun_print:gramjudg}{}{% + \ifthenelse{\equal{\lw_iln_var_stored:gramjudg_text}{}}{}{% + {\normalfont\lw_iln_var_stored:gramjudg_text}% + }% +} +\def\lw_iln_var_stored:extranote_text{} +\def\lw_iln_var_token:extranote_left_punct{{(}}% +\def\lw_iln_fun_format:extranote{\normalfont} +\def\lw_iln_var_token:extranote_right_punct{{)}}% +\NewDocumentCommand{\lw_iln_fun_add:extranote}{m}{% + \def\lw_iln_var_stored:extranote_text{#1}% + \settowidth{\lw_iln_var_dim:extranote_box_width}{#1} + \ifdimgreater{\lw_iln_var_dim:extranote_box_width}{113.2pt}% + {\setlength{\lw_iln_var_dim:extranote_box_width}{113.2pt}}% + {\settowidth{\lw_iln_var_dim:extranote_box_width}{#1}}% + \setlength{\lw_iln_var_dim:extranote_reserved_space}{\lw_iln_var_dim:extranote_box_width}% + \addtolength{\lw_iln_var_dim:extranote_reserved_space}{\lw_iln_var_dim:extranote_box_left_sep} + \addtolength{\lw_iln_var_dim:extranote_reserved_space}{\lw_iln_var_dim:extranote_box_right_sep}% +} +\NewDocumentCommand{\lw_iln_fun_make:extranote_box}{}{% + \IfValueArgTF{\lw_iln_var_stored:extranote_text}{}% + {}% + {\lw_iln_fun_open:extra_note_box% + \lw_iln_var_token:extranote_left_punct% + \lw_iln_fun_format:extranote% + \lw_iln_var_stored:extranote_text% + \normalfont% + \lw_iln_var_token:extranote_right_punct% + \lw_iln_fun_close:extranote_box} +} + +\def\lw_iln_var_stored:free_trans_text{} +\NewDocumentCommand{\lw_iln_fun_set:free_translation}{m}{% + \def\lw_iln_var_stored:free_trans_text{#1} +} +\def\lw_iln_var_stored:literal_trans_text{} +\NewDocumentCommand{\lw_iln_fun_set:literal_trans_text}{m}{% + \def\lw_iln_var_stored:literal_trans_text{#1} +} +\def\lw_iln_var_stored:reference_text{} +\NewDocumentCommand{\lw_iln_fun_set:reference}{m}{% + \def\lw_iln_var_stored:reference_text{#1} +} +\NewDocumentCommand{\lw_iln_fun_print:free_trans}{}{% + \IfValueArgTF{\lw_iln_var_stored:free_trans_text}{}{}% + {`\lw_iln_var_stored:free_trans_text'}} +\NewDocumentCommand{\lw_iln_fun_print:literal_trans}{}{% + \IfValueArgTF{\lw_iln_var_stored:literal_trans_text}{}{}% + {(Lit.: `\lw_iln_var_stored:literal_trans_text')}} +\NewDocumentCommand{\lw_iln_fun_print:reference}{}{% + \IfValueArgTF{\lw_iln_var_stored:reference_text}{}{}% + {{[}\lw_iln_var_stored:reference_text{]}}} +% +\NewDocumentCommand{\lw_iln_fun_make:trans_box}{}{% + \IfValueArgTF{\lw_iln_var_stored:extranote_text}{}% + {\lw_iln_fun_open:trans_box% + \lw_iln_fun_print:free_trans\space % + \lw_iln_fun_print:literal_trans\space % + \lw_iln_fun_print:reference\space % + \lw_iln_fun_close:trans_box}% + {\lw_iln_fun_open:trans_box% + \raggedright + \lw_iln_fun_print:free_trans\space % + \lw_iln_fun_print:literal_trans\space % + \lw_iln_fun_print:reference\space % + \lw_iln_fun_close:trans_box} +} + +\def\lw_iln_fun_format:context_label{\normalfont} +\def\lw_iln_var_name:context{Context:} +\def\lw_iln_fun_insert:context#1{% + \IfValueArgTF{#1}{}{}% + {\lw_iln_fun_format:context_label\lw_iln_var_name:context\normalfont~#1\\[-1.3\baselineskip]} +} + +\def\lw_iln_fun_reinitialize:markers_value{% + \def\lw_iln_var_stored:extranote_text{} + \def\lw_iln_var_stored:free_trans_text{} + \def\lw_iln_var_stored:gramjudg_text{} + \def\lw_iln_var_stored:langinfo_text{} + \def\lw_iln_var_stored:literal_trans_text{} + \def\lw_iln_var_stored:reference_text{} +} + +% todo v. Defining long (internal commands) +\def\lw_iln_var_num:interlinear_lines{2} + +\def\lw_iln_tag:line_one_marker{% LEV version + \IfValueArgTF{\lw_iln_var_num:interlinear_lines}{2}% + {\lw_iln_fun_open:iln_box + \lw_iln_fun_enter:two_lines_interlinearization}{}% + \IfValueArgTF{\lw_iln_var_num:interlinear_lines}{3}% + {\lw_iln_fun_open:iln_box + \lw_iln_fun_enter:three_lines_interlinearization}{}% + \IfValueArgTF{\lw_iln_var_num:interlinear_lines}{4}% + {\lw_iln_fun_open:iln_box + \lw_iln_fun_enter:four_lines_interlinearization}{}% +}% + +\let\lw_iln_tag:Text_marker\lw_iln_tag:line_one_marker% ^rem is typeset in italics by default. The starred version introduces a two-line interlinear gloss text. ^caution Do not use it together with \lw_iln_MorphBreak_marker : they mean the same thing. So you will get error messages. _caution _rem +% +\def\lw_iln_tag:Morpheme_Break_marker% ^rem typeset in roman -- by default -- (intended to host API translations). Introduces a 2-line interlinear gloss text. _rem +{\IfValueArgTF{\lw_iln_var_num:interlinear_lines}{2}% + {\lw_iln_tag:line_one_marker}% + {\relax}% +}% + +\def\lw_iln_tag:Gloss_marker% ^rem \ge is already defined in LaTeX. \lw_iln_tag:Gloss_marker introduces a two-line interlinear gloss text. _rem +{\relax}% +% +\def\lw_iln_tag:Part_of_speech_marker{\relax} + +% LEV Syntax sensitive CS +\def\lw_iln_tag:Free_translation_marker#1\\% + {\IfValueArgTF{\lw_iln_var_num:interlinear_lines}{0} + {\lw_iln_fun_set:free_translation{#1}} + {\lw_iln_fun_close:iln_box% + \lw_iln_fun_set:free_translation{#1}}}% ^rem CAUTION: The Free Translation marker should be present even if there is actually no free translation provided. _rem +% +\def\lw_iln_tag:Literal_translation_marker#1\\% +{\lw_iln_fun_set:literal_trans_text{#1}} +\def\lw_iln_tag:Reference_marker#1\\% +{\lw_iln_fun_set:reference{#1}} +\def\lw_iln_tag:Language_information_marker#1\\% +{\lw_iln_fun_set:langinfo{#1}} +\def\lw_iln_tag:Grammaticality_Judgment_marker#1\\% +{\lw_iln_fun_set:gramjudg{#1}} +\newlength{\lw_iln_var_dim:context_voffset} +\setlength{\lw_iln_var_dim:context_voffset}{-1em} +\def\lw_iln_tag:Context_marker#1\\% +{\lw_iln_fun_insert:context{#1}\\[\lw_iln_var_dim:context_voffset]} +\def\lw_iln_tag:Extra_note_marker#1\\% + {\lw_iln_fun_add:extranote{#1}} + + +% _cs-definitions + +% todo vi. Low-level commands + +% ^section_title="User Commands and Envs to Typeset Interlinear Gloss Texts" +% DEFINE: interlinear environment +% DEFINE: Text tagging cs +% The cs are named after the standard tags used in Linguist's Field's Toolbox by SIL (see Interlinear macro in ToolboxInterlinearMacroText.docm) +% ^important Please use the short versions (in brackets). The long versions are internal commands to be use for later eventual modifications _important +% \lw_iln_tag:Text_marker (\tx) ^rem is typeset in italic either in tri-gloss or in di-gloss envs. In di-gloss env, \tx and \mb mean the same thing. _rem +%\lw_iln_tag:MorphBreak_marker (\mb) ^rem typeset in roman -- by default -- (intended to host API translations) _rem +%\lw_iln_tag:Gloss_marker (\gl) % \ge is already defined in LaTeX +%\lw_iln_tag:FreeTranslation_marker (\ft) +% \lw_iln_tag:Reference_marker (\rf) ^rem \ref is a primitive _rem +% -------------------------------- +% Markers not present in Toolbox defaults +% -------------------------------- +% \lw_iln_tag:Language_information_marker (\li) +% \lw_iln_tag:Grammaticality_Judgment_marker (\gj) +% \lw_iln_tag:Context_marker (\ct) +% +% \lw_iln_tag:Literal_translation_marker (\lt) +% \lw_iln_tag:Extra_note_marker (\nt) +% +% ^cs-definitions +%\let\tx\lw_iln_tag:Text_marker% ^rem is typeset in italic either in tri-gloss or in di-gloss envs. In di-gloss env, \tx and \mb mean the same thing. _rem +\let\mb\lw_iln_tag:Morpheme_Break_marker% ^rem typeset in roman -- by default -- (intended to host API translations) _rem +\let\gl\lw_iln_tag:Gloss_marker% ^rem \ge is already defined in LaTeX _rem +%\let\ft\lw_iln_tag:Free_translation_marker% +\let\ps\lw_iln_tag:Part_of_speech_marker +% +\NewCommandCopy{\li}% +{\lw_iln_tag:Language_information_marker}% +\NewCommandCopy{\rf}% +{\lw_iln_tag:Reference_marker}% +\NewCommandCopy{\gj}% +{\lw_iln_tag:Grammaticality_Judgment_marker} +\NewCommandCopy{\ct}% +{\lw_iln_tag:Context_marker} +\NewCommandCopy{\lt}% +{\lw_iln_tag:Literal_translation_marker}% +\NewCommandCopy{\nt}% + {\lw_iln_tag:Extra_note_marker} + +% todo c. Defining Interlinear Env. Options +% ---------------------- +% | Describing options | +% ---------------------- + +% # Options: + +% - argendchar: (not available for the moment) return, par, lineend +% return : takes the current line as argument, do not put anything else (e.g. {}, or \\) +% lineend : idem +% par : argument is ended by "\\" like e.g. in cgloss4e +% (NOTE: this option scopes over all the markers, not only interlinear text markers \tx, \mb, \gl, \ps) + +% - linesnumber: full, 2, 3 +% full : 4-lines (By default it is disabled in the main text) +% 2 : Only one gloss line is printed (\gl); \mb and \tx are then treated are incompatible to each other so +% that only of them should be used. If this option is used, you should specifiy the first-line of the +% interlinear text via first-line option +% 3 : only \ps is not printedand all the other lines \tx, \mb and \gl should be non-empty + +% * Setting markers * + +% Sets the marker used for the different parts. Actually tells lingwrit-interlinear to define the corresponding command so as to fit the definition of the +% default marker (e.g. text_marker=\ot tells lingwrit-interlinear to add the following: \let\ot\tx) +% - textmarker= +% - morphbreakmarker= +% - glossmarker= (You shouldn't set it to \ge. But if this happens, note that lingwrit-interlinear will redefine \ge to equal to \gl, define a new +% command \gteq to replace \ge and issue a warning message) +% - partofspeechmarker= +% - freetranslationmarker= +% - literaltranslationmarker= +% - grammaticalityjudgmentmarker= +% - contextmarker= +% - extranotemarker= +% - languageinfomarker= +% - referencemarker= + +% * Format specifications * + +% (May include font size, shape, series and color. If color command is used (e.g. \color{blue}), then make sure to have xcolor loaded) +% - lineoneformat={} +% - linetwoformat={} +% - linethreeformat={} +% - linefourformat={} +% - extranoteformat={} +% - contextnameformat={} + +% * Other specifications * + +% - contextname={} ^rem The displayed label for context. default value is "Context:" _rem +% - extranoteleftpunct= ^rem the punctuation preceding the extra note. Default value: ( _rem +% - extranoterightpunct= ^rem the punctuation following the extra note. Default value: ) _rem + +% todo i. Declaring Options +\NewCommandCopy{\lw_iln_var_opt:textmarker}{\lw_iln_tag:Text_marker} +\NewCommandCopy{\lw_iln_var_opt:morphbreakmarker}{\lw_iln_tag:Morpheme_Break_marker} +\NewCommandCopy{\lw_iln_var_opt:glossmarker}{\lw_iln_tag:Gloss_marker} +\NewCommandCopy{\lw_iln_var_opt:partofspeechmarker}{\lw_iln_tag:Part_of_speech_marker} +\NewCommandCopy{\lw_iln_var_opt:freetranslationmarker}{\lw_iln_tag:Free_translation_marker} +\NewCommandCopy{\lw_iln_var_opt:literaltranslationmarker}{\lw_iln_tag:Literal_translation_marker} +\NewCommandCopy{\lw_iln_var_opt:extranotemarker}{\lw_iln_tag:Extra_note_marker} +\NewCommandCopy{\lw_iln_var_opt:languageinfomarker}{\lw_iln_tag:Language_information_marker} +\NewCommandCopy{\lw_iln_var_opt:gramjudgmarker}{\lw_iln_tag:Grammaticality_Judgment_marker} +\NewCommandCopy{\lw_iln_var_opt:referencemarker}{\lw_iln_tag:Reference_marker} +\NewCommandCopy{\lw_iln_var_opt:contextmarker}{\lw_iln_tag:Context_marker} + +\NewDocumentCommand{\lw_iln_var_opt:languageinfopos}{m}{% + \IfValueArgTF{#1}{head}{\RenewDocumentCommand{\lw_iln_fun_set:langinfo}{m}{\langinfo/{##1}}}{} + \IfValueArgTF{#1}{margin}{\RenewDocumentCommand{\lw_iln_fun_set:langinfo}{m}{\langinfo{##1}}}{} +} + +\NewDocumentCommand{\lw_iln_var_opt:nointerlinear}{m}{% + \IfValueArgTF{#1}{true}% + {\def\lw_iln_var_num:interlinear_lines{0}}% + {\IfValueArgTF{#1}{false}% + {\relax}% + {\PackageWarning{interlinear}{nointerlinear option possible values: true, false}}% + } +} +\NewDocumentCommand{\lw_iln_var_opt:contextvoffset}{m}{\setlength{\lw_iln_var_dim:context_voffset}{#1}} + +% todo ii. Defining Default values + +%\def\lw_iln_var_opt:endchar{par}% possible values: par, lineend, return +\def\lw_iln_var_opt:linesnumber{2}% possible values: 2, 3, full +\def\lw_iln_var_num:interlinear_lines{\lw_iln_var_opt:linesnumber} +% Setting markers +\let\li\lw_iln_var_opt:languageinfomarker +\let\rf\lw_iln_var_opt:referencemarker +\let\gj\lw_iln_var_opt:gramjudgmarker +\let\tx\lw_iln_var_opt:textmarker +\let\mb\lw_iln_var_opt:morphbreakmarker +\let\gl\lw_iln_var_opt:glossmarker +\let\ps\lw_iln_var_opt:partofspeechmarker +\let\ft\lw_iln_var_opt:freetranslationmarker +\let\lt\lw_iln_var_opt:literaltranslationmarker +\let\nt\lw_iln_var_opt:extranotemarker +\def\lw_iln_var_opt:extranoteleftpunct#1{\def\lw_iln_var_token:extranote_left_punct{#1}} +\def\lw_iln_var_opt:extranoterightpunct#1{\def\lw_iln_var_token:extranote_right_punct{#1}} + +% Setting formats (only available for interlinear/gloss lines, context name and extra notes) +\def\lw_iln_var_opt:lineoneformat#1{\renewcommand{\lw_iln_fun_set:line_one_words_format}{#1}} +\def\lw_iln_var_opt:linetwoformat#1{\renewcommand{\lw_iln_fun_set:line_two_words_format}{#1}} +\def\lw_iln_var_opt:linethreeformat#1{\renewcommand{\lw_iln_fun_set:line_three_words_format}{#1}} +\def\lw_iln_var_opt:linefourformat#1{\renewcommand{\lw_iln_fun_set:line_four_words_format}{#1}} +\def\lw_iln_var_opt:exformat#1{\renewcommand{\lw_iln_fun_format:ex_text}{#1}} +\def\lw_iln_var_opt:extranoteformat#1{\def\lw_iln_fun_format:extranote{#1}} +\def\lw_iln_var_opt:contextnameformat#1{\def\lw_iln_fun_format:context_label{#1}} +% Context label/name +\def\lw_iln_var_opt:contextname#1{\def\lw_iln_var_name:context{#1}} + +% Defining CS for resetting default options (to be called at the begining of interlinear env)% ^rem the \setinterlinearstyle is meant to set globally the options for interlinear env. So don't use optional argument of interlinear env anymore since it will overwrite the values set up with this commands and the new values be considered the default ones. _rem +\def\lw_iln_fun_reinitialize:interlinear_options{% + %\def\lw_iln_var_opt:endchar{par}% possible values: par, lineend, return + \def\lw_iln_var_opt:linesnumber{2}% possible values: 2, 3, full + % Setting markers + \let\li\lw_iln_var_opt:languageinfomarker% + \let\rf\lw_iln_var_opt:referencemarker% + \let\gj\lw_iln_var_opt:gramjudgmarker% + \let\tx\lw_iln_var_opt:textmarker + \let\mb\lw_iln_var_opt:morphbreakmarker% + \let\gl\lw_iln_var_opt:glossmarker% + \let\ps\lw_iln_var_opt:partofspeechmarker% + \let\ft\lw_iln_var_opt:freetranslationmarker% + \let\lt\lw_iln_var_opt:literaltranslationmarker% + \let\nt\lw_iln_var_opt:extranotemarker% + % Setting formats (only available for interlinear/gloss lines, context name and extra notes) + \lw_iln_var_opt:lineoneformat{\normalfont}% + \lw_iln_var_opt:linetwoformat{\normalfont}% + \lw_iln_var_opt:linethreeformat{\normalfont}% + \lw_iln_var_opt:linefourformat{\normalfont}% + \lw_iln_var_opt:exformat{\normalfont} + \lw_iln_var_opt:extranoteformat{\normalfont}% + \lw_iln_var_opt:contextnameformat{\normalfont}% + % Context label/name + \lw_iln_var_opt:contextname{Context:}% + \lw_iln_var_opt:extranoteleftpunct{{(}}% + \lw_iln_var_opt:extranoterightpunct{{)}}% + \lw_iln_var_opt:languageinfopos{margin}% + \lw_iln_var_opt:nointerlinear{false}% + \lw_iln_var_opt:contextvoffset{-1em} +} + +% todo iii. Setting Options + +% Setting Ending Character for arguments (not yet available) +%\define@key{interlinear}{endchar}{% + % ^action_name="Setting the value" +% \def\lw_iln_var_opt:endchar{#1} + % _action + % ^action_name="Processing the option" + % + % _action +%} + +% Setting the numbers of interlinear/gloss lines +\define@key{interlinear}{linesnumber}{% + % ^action_name="Setting the value" + \def\lw_iln_var_opt:linesnumber{#1} + % _action +} +\define@key{interlinear}{nointerlinear}{% + % ^action_name="Setting the value" + \lw_iln_var_opt:nointerlinear{#1} + % _action +} + +% Setting the markers +\define@key{interlinear}{textmarker}{% + \NewCommandCopy{#1}{\lw_iln_var_opt:textmarker}} +\define@key{interlinear}{morphbreakmarker}{% + \NewCommandCopy{#1}{\lw_iln_var_opt:morphbreakmarker}} +\define@key{interlinear}{glossmarker}{% + \NewCommandCopy{#1}{\lw_iln_var_opt:glossmarker}} + +\define@key{interlinear}{partofspeechmarker}{% + \NewCommandCopy{#1}{\lw_iln_var_opt:partofspeechmarker}} + +\define@key{interlinear}{freetranslationmarker}{% + \NewCommandCopy{#1}{\lw_iln_var_opt:freetranslationmarker}} + +\define@key{interlinear}{literaltranslationmarker}{% + \NewCommandCopy{#1}{\lw_iln_var_opt:literaltranslationmarker}} + +\define@key{interlinear}{extranotemarker}{% + \NewCommandCopy{#1}{\lw_iln_var_opt:extranotemarker}} + +\define@key{interlinear}{languageinfomarker}{% + \NewCommandCopy{#1}{\lw_iln_var_opt:languageinfomarker}} + +\define@key{interlinear}{gramjudgmarker}{% + \NewCommandCopy{#1}{\lw_iln_var_opt:gramjudgmarker}} + +\define@key{interlinear}{referencemarker}{% + \NewCommandCopy{#1}{\lw_iln_var_opt:referencemarker}} + +\define@key{interlinear}{contextmarker}{% + \NewCommandCopy{#1}{\lw_iln_var_opt:contextmarker}} + + +% Setting formats +\define@key{interlinear}{lineoneformat}{% + % ^action_name="Setting the value" + \lw_iln_var_opt:lineoneformat{#1} + % _action +} +\define@key{interlinear}{linetwoformat}{% + % ^action_name="Setting the value" + \lw_iln_var_opt:linetwoformat{#1} + % _action +} +\define@key{interlinear}{linethreeformat}{% + % ^action_name="Setting the value" + \lw_iln_var_opt:linethreeformat{#1} + % _action +} +\define@key{interlinear}{linefourformat}{% + % ^action_name="Setting the value" + \lw_iln_var_opt:linefourformat{#1} + % _action +} +\define@key{interlinear}{exformat}{% + % ^action_name="Setting the value" + \lw_iln_var_opt:exformat{#1} + % _action +} +\define@key{interlinear}{extranoteformat}{% + % ^action_name="Setting the value" + \lw_iln_var_opt:extranoteformat{#1} + % _action +} +\define@key{interlinear}{contextnameformat}{% + % ^action_name="Setting the value" + \lw_iln_var_opt:contextnameformat{#1} + % _action +} + +% Other specifications +\define@key{interlinear}{contextname}{% + % ^action_name="Setting the value" + \lw_iln_var_opt:contextname{#1} + % _action +} +\define@key{interlinear}{contextvoffset}{% + % ^action_name="Setting the value" + \lw_iln_var_opt:contextvoffset{#1} + % _action +} +\define@key{interlinear}{extranoteleftpunct}{% + % ^action_name="Setting the value" + \lw_iln_var_opt:extranoteleftpunct{#1} + % _action +} +\define@key{interlinear}{extranoterightpunct}{% + % ^action_name="Setting the value" + \lw_iln_var_opt:extranoterightpunct{#1} + % _action +} +\define@key{interlinear}{languageinfopos}{% + % ^action_name="Setting the value" + \lw_iln_var_opt:languageinfopos{#1} + % _action +} + +\newcommand{\interlinearstyle}[1]{% + \setkeys{interlinear}{#1}% + \lw_fun_helper:clear{\lw_iln_fun_reinitialize:interlinear_options} +} +\def\DeclareInterlinearStyle#1#2{% + \expandafter\def\csname lw_iln_var_sty:#1\endcsname{\interlinearstyle{#2}}} +\def\UseInterlinearStyle#1{% + \expandafter\csname lw_iln_var_sty:#1\endcsname} +\DeclareInterlinearStyle{default}{% + linesnumber=2,% + lineoneformat=\upshape,% + linetwoformat=\normalfont,% + linethreeformat=\normalfont,% + linefourformat=\normalfont,% + contextnameformat=\normalfont,% + extranoteformat=\normalfont,% + contextname={Context:},% + extranoteleftpunct={(},% + extranoterightpunct={)}% +} +\DeclareInterlinearStyle{nointerlinear}{% + nointerlinear=true,% + languageinfopos=head,% + freetranslationmarker=\ot,% + contextvoffset=.5em% +} +\DeclareInterlinearStyle{gsr}{% + linesnumber=2,% + lineoneformat=\itshape,% + linetwoformat=\normalfont,% + linethreeformat=\normalfont% +} +\DeclareInterlinearStyle{gsrnointerlinear}{% + nointerlinear=true,% + exformat=\itshape,% + languageinfopos=head,% + freetranslationmarker=\ot,% + contextvoffset=.5em% +} + +\UseInterlinearStyle{gsr}% ^rem setting the default style to fit the GSR _rem + +\define@key{interlinear}{style}{% + % ^action_name="Setting the value" + \UseInterlinearStyle{#1} + % _action +} + + +% todo d. Defining Interlinear Env. +\NewDocumentCommand{\lw_iln_fun_enter:interlinear}{}{\relax}% ^rem no_op command _rem +\NewDocumentCommand{\lw_iln_fun_exit:interlinear}{}{% + \IfValueArgTF{\lw_iln_var_num:interlinear_lines}{0}% + {\lw_iln_fun_close:ex_box}% + {\lw_iln_fun_make:trans_box% + \lw_iln_fun_make:extranote_box% + \lw_iln_fun_reinitialize:markers_value}% + } + +\NewDocumentEnvironment{interlinear}{O{}}% + {% ^rem Beginning of the internlinear env _rem + \lw_iln_fun_enter:interlinear% + \lw_iln_fun_reinitialize:interlinear_options% + \setkeys{interlinear}{#1} + }% + {% ^rem End of the interlinear env _rem + \lw_iln_fun_exit:interlinear% + } + +\makeatother% + +% ^action_name="Disabling LingWrit Syntax" +\switchlwsyntaxoff +% _action +% ^action_name="Ending the code" +\endinput% +% _action + +% _code + +% ^_* + +% _package diff --git a/Master/texmf-dist/tex/latex/iran-bibtex/iran-bibtex.sty b/Master/texmf-dist/tex/latex/iran-bibtex/iran-bibtex.sty index 1cc11bf54d3..9ee5b3525d7 100644 --- a/Master/texmf-dist/tex/latex/iran-bibtex/iran-bibtex.sty +++ b/Master/texmf-dist/tex/latex/iran-bibtex/iran-bibtex.sty @@ -1,5 +1,5 @@ %% -%% This is file “iran-bibtex.sty”, v0.4.1 (2024-05-06) +%% This is file “iran-bibtex.sty”, v0.4.3 (2024-08-04) %% %% __________________________________________________ %% Copyright (c) 2023-2024 Farshad Rasuli @@ -26,10 +26,10 @@ % === Package structure: Identification \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{iran-bibtex} - [2024-05-06 v0.4.1 Iran Manual of Style (1st edn, 2016)] + [2024-08-04 v0.4.3 Iran Manual of Style (1st edn, 2016)] -\def\iranbibtex@version{0.4.1} -\def\iranbibtexdate{2024-05-06} % May 6th, 2024 +\def\iranbibtex@version{0.4.3} +\def\iranbibtexdate{2024-08-04} % August 4th, 2024 \def\iranbibtexfirstrelease{2023-12-12} % December 12th, 2023 \edef\@iranbibtex@info{% ***************************************************************% @@ -168,9 +168,9 @@ %% provide command for bibliography environment \newcommand{\enquote}[1]{``#1''} \newcommand{\faquote}[1]{«#1»} -\providecommand{\url}[1]{{\tt #1}} -\providecommand{\doi}[1]{\url{#1}} -\providecommand{\eprint}[2][]{\url{#2}} +\providecommand{\url}[1]{\@ifpackageloaded{hyperref}{\href{#1}{#1}}{\tt #1}} +\providecommand{\doi}[1]{\@ifpackageloaded{hyperref}{\href{https://doi.org/#1}{#1}}{\url{#1}}} +\providecommand{\eprint}[2][]{\@ifpackageloaded{hyperref}{\href{#2}{#2}}{\url{#2}}} diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV003.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV003.pdf Binary files differnew file mode 100644 index 00000000000..c3671853cca --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV003.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV004.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV004.pdf Binary files differnew file mode 100644 index 00000000000..426766af28e --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV004.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV009.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV009.pdf Binary files differnew file mode 100644 index 00000000000..4371233c53b --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV009.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV010.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV010.pdf Binary files differnew file mode 100644 index 00000000000..4f7c7b0c4e3 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV010.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV011.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV011.pdf Binary files differnew file mode 100644 index 00000000000..b53137946cf --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV011.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV012.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV012.pdf Binary files differnew file mode 100644 index 00000000000..ee3d79d2fe1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV012.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV013.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV013.pdf Binary files differnew file mode 100644 index 00000000000..54a7ef44db2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV013.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV027.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV027.pdf Binary files differnew file mode 100644 index 00000000000..c2c5f6e332c --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV027.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV028.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV028.pdf Binary files differnew file mode 100644 index 00000000000..005109c5c8b --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV028.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV029.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV029.pdf Binary files differnew file mode 100644 index 00000000000..070e7a2743b --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV029.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV064.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV064.pdf Binary files differnew file mode 100644 index 00000000000..9ef30ac6e6f --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV064.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV067.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV067.pdf Binary files differnew file mode 100644 index 00000000000..d0e63401149 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_CV067.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E001.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E001.pdf Binary files differnew file mode 100644 index 00000000000..abc60c2691e --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E001.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E002.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E002.pdf Binary files differnew file mode 100644 index 00000000000..fbe80ce3f86 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E002.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E003.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E003.pdf Binary files differnew file mode 100644 index 00000000000..21dfafc605d --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E003.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E004.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E004.pdf Binary files differnew file mode 100644 index 00000000000..3663147e2eb --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E004.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E007.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E007.pdf Binary files differnew file mode 100644 index 00000000000..cd21e70dc46 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E007.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E008.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E008.pdf Binary files differnew file mode 100644 index 00000000000..9d651b8d9ea --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E008.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E009.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E009.pdf new file mode 100644 index 00000000000..93822c975eb --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E009.pdf @@ -0,0 +1,69 @@ +%PDF-1.5 +% +4 0 obj +<< /Length 5 0 R + /Filter /FlateDecode +>> +stream +x}Tn1+eD +XPl}HrwHur(r8(`b~'^ϏG/.<#ᕲ=cf5{NZgP9W▼$A *;M6Q@ʪUeIp fAqr729݂JPQ%Y0,P!A˻.Ҽb0%*BCf%T#Od5Bve̲-GMdىy%zbq++ rm~|)Ĩ"ՕutegF\Όsk\}s0{1ካH0Q9uA.:[ѳWYo=$p@t*Y[f8ߴcgxHG̔8Mm[-(O'$.ɳ].㍛=!+Z}o5Oԡ\A[@ zT.zF%5eVK1?R܂uJxw17·.tޑ`Ɔ,RR:ݻ?J +endstream +endobj +5 0 obj + 550 +endobj +3 0 obj +<< + /ExtGState << + /a0 << /CA 1 /ca 1 >> + >> +>> +endobj +2 0 obj +<< /Type /Page % 1 + /Parent 1 0 R + /MediaBox [ 0 0 300 300 ] + /Contents 4 0 R + /Group << + /Type /Group + /S /Transparency + /I true + /CS /DeviceRGB + >> + /Resources 3 0 R +>> +endobj +1 0 obj +<< /Type /Pages + /Kids [ 2 0 R ] + /Count 1 +>> +endobj +6 0 obj +<< /Producer (cairo 1.16.0 (https://cairographics.org)) + /CreationDate (D:20231109180750+01'00) +>> +endobj +7 0 obj +<< /Type /Catalog + /Pages 1 0 R +>> +endobj +xref +0 8 +0000000000 65535 f +0000000954 00000 n +0000000736 00000 n +0000000664 00000 n +0000000015 00000 n +0000000642 00000 n +0000001019 00000 n +0000001135 00000 n +trailer +<< /Size 8 + /Root 7 0 R + /Info 6 0 R +>> +startxref +1187 +%%EOF diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E010.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E010.pdf Binary files differnew file mode 100644 index 00000000000..ef0b21d5886 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E010.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E011.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E011.pdf Binary files differnew file mode 100644 index 00000000000..127667563d4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E011.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E012.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E012.pdf Binary files differnew file mode 100644 index 00000000000..98cb2bd8b4d --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E012.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E013.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E013.pdf new file mode 100644 index 00000000000..0d89ed3065c --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E013.pdf @@ -0,0 +1,71 @@ +%PDF-1.5 +% +4 0 obj +<< /Length 5 0 R + /Filter /FlateDecode +>> +stream +xuT[nU1*Ll'qhh?K:VVc㗦+p{BZ *?C07*+m~ ƽR9#ߣJ-M%@lCjTJp[`N4;1%(jN0L< +RJ)FXQq:8ud^3lwD@Zdz,T0ooYcK}KTI[kAf1mf@rI4Q7}I|Zf,|ƴ{Lbbh[x<ggLǘVvh!,7х!bESxE lbvpaFUx1Y>|-{z hõjȪ0eOx4o.<V2-+7͕"(WK8̱Tg~aeF,)n9y3Dw$D0;3D{@:B%W2",\Z:9nEfp.8ֲL\c8mHB'NP=P[nZ\u$[)D(439V!L%=)Y{:^'q +QbEa +eAlVZŲUS?K
9[]LKuXRO6{,qL}kN\ꀐyR@9f0K0u-Is<yg\zjWU\|ᒿ/ +endstream +endobj +5 0 obj + 750 +endobj +3 0 obj +<< + /ExtGState << + /a0 << /CA 1 /ca 1 >> + >> +>> +endobj +2 0 obj +<< /Type /Page % 1 + /Parent 1 0 R + /MediaBox [ 0 0 300 300 ] + /Contents 4 0 R + /Group << + /Type /Group + /S /Transparency + /I true + /CS /DeviceRGB + >> + /Resources 3 0 R +>> +endobj +1 0 obj +<< /Type /Pages + /Kids [ 2 0 R ] + /Count 1 +>> +endobj +6 0 obj +<< /Producer (cairo 1.16.0 (https://cairographics.org)) + /CreationDate (D:20231109180750+01'00) +>> +endobj +7 0 obj +<< /Type /Catalog + /Pages 1 0 R +>> +endobj +xref +0 8 +0000000000 65535 f +0000001154 00000 n +0000000936 00000 n +0000000864 00000 n +0000000015 00000 n +0000000842 00000 n +0000001219 00000 n +0000001335 00000 n +trailer +<< /Size 8 + /Root 7 0 R + /Info 6 0 R +>> +startxref +1387 +%%EOF diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E014.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E014.pdf Binary files differnew file mode 100644 index 00000000000..0a9e3829031 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E014.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E015.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E015.pdf Binary files differnew file mode 100644 index 00000000000..d8e8f0e401c --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E015.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E016.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E016.pdf Binary files differnew file mode 100644 index 00000000000..06065e969e3 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E016.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E017.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E017.pdf Binary files differnew file mode 100644 index 00000000000..fc1ca1bdf0f --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E017.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E018.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E018.pdf Binary files differnew file mode 100644 index 00000000000..4b05b96f890 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E018.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E019.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E019.pdf Binary files differnew file mode 100644 index 00000000000..45fe98dcd7b --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E019.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E020.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E020.pdf Binary files differnew file mode 100644 index 00000000000..7b85394d636 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E020.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E021.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E021.pdf Binary files differnew file mode 100644 index 00000000000..187694547c1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E021.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E022.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E022.pdf Binary files differnew file mode 100644 index 00000000000..2e772aa41a8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E022.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E023.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E023.pdf Binary files differnew file mode 100644 index 00000000000..9a14e4d9012 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E023.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E024.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E024.pdf Binary files differnew file mode 100644 index 00000000000..3fefa8edfd1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E024.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E025.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E025.pdf Binary files differnew file mode 100644 index 00000000000..026668d438d --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E025.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E026.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E026.pdf Binary files differnew file mode 100644 index 00000000000..3c9979f5906 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E026.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E027.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E027.pdf Binary files differnew file mode 100644 index 00000000000..fb532c645cc --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E027.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E028.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E028.pdf Binary files differnew file mode 100644 index 00000000000..affca9c7f59 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E028.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E029.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E029.pdf Binary files differnew file mode 100644 index 00000000000..7faeee64644 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E029.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E030.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E030.pdf Binary files differnew file mode 100644 index 00000000000..cf1a93fe95c --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E030.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E031.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E031.pdf Binary files differnew file mode 100644 index 00000000000..1b8b8f3b7c5 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E031.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E032.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E032.pdf Binary files differnew file mode 100644 index 00000000000..b70eefa5059 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E032.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E033.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E033.pdf new file mode 100644 index 00000000000..a49b3fe4bff --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E033.pdf @@ -0,0 +1,69 @@ +%PDF-1.5 +% +4 0 obj +<< /Length 5 0 R + /Filter /FlateDecode +>> +stream +xmAn1E>(#GNHM/OfYX~`9U"0B,jt*l-~ ++TC%jѴr4CiXeW5dLЭOBS};HO慲8q8 wB]ɒU:z(Q]L.M3v>l-/ځG<v#RN +endstream +endobj +5 0 obj + 258 +endobj +3 0 obj +<< + /ExtGState << + /a0 << /CA 1 /ca 1 >> + >> +>> +endobj +2 0 obj +<< /Type /Page % 1 + /Parent 1 0 R + /MediaBox [ 0 0 300 300 ] + /Contents 4 0 R + /Group << + /Type /Group + /S /Transparency + /I true + /CS /DeviceRGB + >> + /Resources 3 0 R +>> +endobj +1 0 obj +<< /Type /Pages + /Kids [ 2 0 R ] + /Count 1 +>> +endobj +6 0 obj +<< /Producer (cairo 1.16.0 (https://cairographics.org)) + /CreationDate (D:20231109180753+01'00) +>> +endobj +7 0 obj +<< /Type /Catalog + /Pages 1 0 R +>> +endobj +xref +0 8 +0000000000 65535 f +0000000662 00000 n +0000000444 00000 n +0000000372 00000 n +0000000015 00000 n +0000000350 00000 n +0000000727 00000 n +0000000843 00000 n +trailer +<< /Size 8 + /Root 7 0 R + /Info 6 0 R +>> +startxref +895 +%%EOF diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E034.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E034.pdf new file mode 100644 index 00000000000..44341bd96b2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E034.pdf @@ -0,0 +1,69 @@ +%PDF-1.5 +% +4 0 obj +<< /Length 5 0 R + /Filter /FlateDecode +>> +stream +xmKn!Dc1Q,z_я.(cDH??^/!gU ,)Xdau)qT&b!3:A dS+{s4ؘ$^+(Üv79.`)vA١9 +p3k!%^$v
8Ԃ&*JvFn0T,-d*:/!D--M
tK]z +endstream +endobj +5 0 obj + 259 +endobj +3 0 obj +<< + /ExtGState << + /a0 << /CA 1 /ca 1 >> + >> +>> +endobj +2 0 obj +<< /Type /Page % 1 + /Parent 1 0 R + /MediaBox [ 0 0 300 300 ] + /Contents 4 0 R + /Group << + /Type /Group + /S /Transparency + /I true + /CS /DeviceRGB + >> + /Resources 3 0 R +>> +endobj +1 0 obj +<< /Type /Pages + /Kids [ 2 0 R ] + /Count 1 +>> +endobj +6 0 obj +<< /Producer (cairo 1.16.0 (https://cairographics.org)) + /CreationDate (D:20231109180753+01'00) +>> +endobj +7 0 obj +<< /Type /Catalog + /Pages 1 0 R +>> +endobj +xref +0 8 +0000000000 65535 f +0000000663 00000 n +0000000445 00000 n +0000000373 00000 n +0000000015 00000 n +0000000351 00000 n +0000000728 00000 n +0000000844 00000 n +trailer +<< /Size 8 + /Root 7 0 R + /Info 6 0 R +>> +startxref +896 +%%EOF diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E035.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E035.pdf Binary files differnew file mode 100644 index 00000000000..c79abaa6000 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E035.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E036.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E036.pdf Binary files differnew file mode 100644 index 00000000000..0bdad717baf --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E036.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E037.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E037.pdf Binary files differnew file mode 100644 index 00000000000..65d6a6f2f2f --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E037.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E038.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E038.pdf Binary files differnew file mode 100644 index 00000000000..a99e0485f3b --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E038.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E039.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E039.pdf Binary files differnew file mode 100644 index 00000000000..b8247de0819 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E039.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E040.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E040.pdf Binary files differnew file mode 100644 index 00000000000..f49aabdf1e0 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E040.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E041.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E041.pdf Binary files differnew file mode 100644 index 00000000000..9cfa31db6cb --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E041.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E042.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E042.pdf Binary files differnew file mode 100644 index 00000000000..917e764de5d --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E042.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E043.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E043.pdf Binary files differnew file mode 100644 index 00000000000..7b126756d46 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E043.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E044.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E044.pdf Binary files differnew file mode 100644 index 00000000000..8049c34a95f --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E044.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E045.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E045.pdf Binary files differnew file mode 100644 index 00000000000..7f57b529fe8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E045.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E046.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E046.pdf Binary files differnew file mode 100644 index 00000000000..3af4a0a9b91 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E046.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E047.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E047.pdf Binary files differnew file mode 100644 index 00000000000..823f7704fe0 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E047.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E048.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E048.pdf Binary files differnew file mode 100644 index 00000000000..2cd85b1273c --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E048.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E049.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E049.pdf Binary files differnew file mode 100644 index 00000000000..67ae74aeb9f --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E049.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E050.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E050.pdf Binary files differnew file mode 100644 index 00000000000..1c0120948d0 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E050.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E051.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E051.pdf Binary files differnew file mode 100644 index 00000000000..9ac16abe7e2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E051.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E052.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E052.pdf Binary files differnew file mode 100644 index 00000000000..057a6590adf --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E052.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E053.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E053.pdf Binary files differnew file mode 100644 index 00000000000..b050874db93 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E053.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E054.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E054.pdf Binary files differnew file mode 100644 index 00000000000..f4de9c9b1f0 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E054.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E055.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E055.pdf Binary files differnew file mode 100644 index 00000000000..a05639bfd2b --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E055.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E056.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E056.pdf Binary files differnew file mode 100644 index 00000000000..015f18e06d4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E056.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E057.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E057.pdf Binary files differnew file mode 100644 index 00000000000..c3da1ac56b0 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E057.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E058.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E058.pdf new file mode 100644 index 00000000000..fac59cd6934 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E058.pdf @@ -0,0 +1,68 @@ +%PDF-1.5 +% +4 0 obj +<< /Length 5 0 R + /Filter /FlateDecode +>> +stream +xmAn EJu=B5LEjD͢ oȥFpp˽|М}~wS']0ڨ$åEnZZLswE[۲h01mT?';s,IdAlQ}Svԓ,pY5ZRZ*"khlӂ%{ҍ٥JPTJIc$l4d0=)9:UwG[:X,s]Y1JG>x Z/l +endstream +endobj +5 0 obj + 274 +endobj +3 0 obj +<< + /ExtGState << + /a0 << /CA 1 /ca 1 >> + >> +>> +endobj +2 0 obj +<< /Type /Page % 1 + /Parent 1 0 R + /MediaBox [ 0 0 299.982663 299.999986 ] + /Contents 4 0 R + /Group << + /Type /Group + /S /Transparency + /I true + /CS /DeviceRGB + >> + /Resources 3 0 R +>> +endobj +1 0 obj +<< /Type /Pages + /Kids [ 2 0 R ] + /Count 1 +>> +endobj +6 0 obj +<< /Producer (cairo 1.16.0 (https://cairographics.org)) + /CreationDate (D:20231109180755+01'00) +>> +endobj +7 0 obj +<< /Type /Catalog + /Pages 1 0 R +>> +endobj +xref +0 8 +0000000000 65535 f +0000000692 00000 n +0000000460 00000 n +0000000388 00000 n +0000000015 00000 n +0000000366 00000 n +0000000757 00000 n +0000000873 00000 n +trailer +<< /Size 8 + /Root 7 0 R + /Info 6 0 R +>> +startxref +925 +%%EOF diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E059.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E059.pdf Binary files differnew file mode 100644 index 00000000000..45a8ae2bd20 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E059.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E060.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E060.pdf Binary files differnew file mode 100644 index 00000000000..7a0e488172e --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E060.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E061.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E061.pdf Binary files differnew file mode 100644 index 00000000000..2e3b5992b3f --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E061.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E062.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E062.pdf Binary files differnew file mode 100644 index 00000000000..69fb85f9568 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E062.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E063.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E063.pdf Binary files differnew file mode 100644 index 00000000000..5eea8873cc2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E063.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E064.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E064.pdf Binary files differnew file mode 100644 index 00000000000..ad4fdc70349 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E064.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E065.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E065.pdf Binary files differnew file mode 100644 index 00000000000..60400eaa5ec --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E065.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E067.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E067.pdf Binary files differnew file mode 100644 index 00000000000..2784052b1bb --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E067.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E068.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E068.pdf Binary files differnew file mode 100644 index 00000000000..0d74c205c88 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E068.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E069.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E069.pdf Binary files differnew file mode 100644 index 00000000000..b5e6b2c220c --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E069.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E070.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E070.pdf Binary files differnew file mode 100644 index 00000000000..7554106d64b --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_E070.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F001.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F001.pdf Binary files differnew file mode 100644 index 00000000000..349878fd5ff --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F001.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F002.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F002.pdf Binary files differnew file mode 100644 index 00000000000..2ba7a82fbc4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F002.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F003.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F003.pdf Binary files differnew file mode 100644 index 00000000000..54b6f5da2c2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F003.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F004.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F004.pdf Binary files differnew file mode 100644 index 00000000000..ed273764dbf --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F004.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F005.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F005.pdf Binary files differnew file mode 100644 index 00000000000..1e8a6103e0b --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F005.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F006.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F006.pdf Binary files differnew file mode 100644 index 00000000000..c9f1f7bccb4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F006.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F007.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F007.pdf Binary files differnew file mode 100644 index 00000000000..b0e5f32cbe3 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F007.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F008.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F008.pdf Binary files differnew file mode 100644 index 00000000000..ba9cfa7c4bd --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F008.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F009.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F009.pdf Binary files differnew file mode 100644 index 00000000000..cc4b7f52b03 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F009.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F010.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F010.pdf Binary files differnew file mode 100644 index 00000000000..785c5f9122d --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F010.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F011.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F011.pdf Binary files differnew file mode 100644 index 00000000000..12ff257deb9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F011.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F012.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F012.pdf Binary files differnew file mode 100644 index 00000000000..ddd57064190 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F012.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F013.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F013.pdf Binary files differnew file mode 100644 index 00000000000..2772821d84c --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F013.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F014.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F014.pdf Binary files differnew file mode 100644 index 00000000000..2aaf0826af5 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F014.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F015.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F015.pdf Binary files differnew file mode 100644 index 00000000000..cf3ae1c46f5 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F015.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F016.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F016.pdf Binary files differnew file mode 100644 index 00000000000..06ff3352a35 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F016.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F017.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F017.pdf Binary files differnew file mode 100644 index 00000000000..c9a67b8129c --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F017.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F018.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F018.pdf Binary files differnew file mode 100644 index 00000000000..57aa49d669a --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F018.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F019.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F019.pdf Binary files differnew file mode 100644 index 00000000000..a331b56a36d --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_F019.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M001.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M001.pdf new file mode 100644 index 00000000000..bf8ac9665da --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M001.pdf @@ -0,0 +1,69 @@ +%PDF-1.5 +% +4 0 obj +<< /Length 5 0 R + /Filter /FlateDecode +>> +stream +x]RN!=X)-|`6ыOXh6yva2G`t}ϔYLeM덞^2}L[/j^$ո;b.ʵwy)n{y':.zM iaE
+$7qE®i(,r
_P+lc'DO_tir-ʦT:li.48␂KFGʰ?b'* Cm +@D :ʛG=y,pkC0ob:rUs,kD|hjBEWج0\7< +endstream +endobj +5 0 obj + 344 +endobj +3 0 obj +<< + /ExtGState << + /a0 << /CA 1 /ca 1 >> + >> +>> +endobj +2 0 obj +<< /Type /Page % 1 + /Parent 1 0 R + /MediaBox [ 0 0 198.75 198.75 ] + /Contents 4 0 R + /Group << + /Type /Group + /S /Transparency + /I true + /CS /DeviceRGB + >> + /Resources 3 0 R +>> +endobj +1 0 obj +<< /Type /Pages + /Kids [ 2 0 R ] + /Count 1 +>> +endobj +6 0 obj +<< /Producer (cairo 1.16.0 (https://cairographics.org)) + /CreationDate (D:20231109193356+01'00) +>> +endobj +7 0 obj +<< /Type /Catalog + /Pages 1 0 R +>> +endobj +xref +0 8 +0000000000 65535 f +0000000754 00000 n +0000000530 00000 n +0000000458 00000 n +0000000015 00000 n +0000000436 00000 n +0000000819 00000 n +0000000935 00000 n +trailer +<< /Size 8 + /Root 7 0 R + /Info 6 0 R +>> +startxref +987 +%%EOF diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M002.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M002.pdf Binary files differnew file mode 100644 index 00000000000..6fe904c927b --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M002.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M003.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M003.pdf Binary files differnew file mode 100644 index 00000000000..caaddd06b5f --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M003.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M004.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M004.pdf Binary files differnew file mode 100644 index 00000000000..28795830dc4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M004.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M005.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M005.pdf Binary files differnew file mode 100644 index 00000000000..56aaa821248 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M005.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M006.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M006.pdf Binary files differnew file mode 100644 index 00000000000..5da66c41a2f --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M006.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M007.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M007.pdf Binary files differnew file mode 100644 index 00000000000..5cc9f1a019e --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M007.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M008.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M008.pdf Binary files differnew file mode 100644 index 00000000000..e8de5ffce97 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M008.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M009.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M009.pdf Binary files differnew file mode 100644 index 00000000000..c915a508c28 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M009.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M010.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M010.pdf Binary files differnew file mode 100644 index 00000000000..90334f320f6 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M010.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M011.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M011.pdf Binary files differnew file mode 100644 index 00000000000..795558d1b57 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M011.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M012.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M012.pdf new file mode 100644 index 00000000000..33f20feb1ae --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M012.pdf @@ -0,0 +1,71 @@ +%PDF-1.5 +% +4 0 obj +<< /Length 5 0 R + /Filter /FlateDecode +>> +stream +xUTA! +>1<!jiw$Re^Fr.\eK2-__OE_̆5K5U[W{~>|e^h)ڃYz݁Xo;y:#}'[H)fE}&EgRY]@";UzRʳ2{{8tgLw9_^# R +Ztg`ŀK۰mH&d)/+M{^,\2pͲ<;JiҼ,<?(ՙT-H/DV0c'*8P{K\hҲF3i^-,>\o~k)OGMnuzX)(NAn}q`JL
8<WxC
5V`Iaɟ)A<=J'Չq)6+n>ULc@a65($ݔr#uحeLH![DMª۾,v"}<C]Did4uВAH5J-ZiLB .
[ +)5ti3z
VdDl4^;hwoNM!A0@@jcCVn5FBS25!ݶ/dw_x'A!qv>{pD5rHc[2+_A'tEjAqմ(fX
DCBLKjq:݃f5n]AUcv٣tY`Wh
Ax(ƍHz)_?N +endstream +endobj +5 0 obj + 766 +endobj +3 0 obj +<< + /ExtGState << + /a0 << /CA 1 /ca 1 >> + >> +>> +endobj +2 0 obj +<< /Type /Page % 1 + /Parent 1 0 R + /MediaBox [ 0 0 198.75 198.75 ] + /Contents 4 0 R + /Group << + /Type /Group + /S /Transparency + /I true + /CS /DeviceRGB + >> + /Resources 3 0 R +>> +endobj +1 0 obj +<< /Type /Pages + /Kids [ 2 0 R ] + /Count 1 +>> +endobj +6 0 obj +<< /Producer (cairo 1.16.0 (https://cairographics.org)) + /CreationDate (D:20231109193357+01'00) +>> +endobj +7 0 obj +<< /Type /Catalog + /Pages 1 0 R +>> +endobj +xref +0 8 +0000000000 65535 f +0000001176 00000 n +0000000952 00000 n +0000000880 00000 n +0000000015 00000 n +0000000858 00000 n +0000001241 00000 n +0000001357 00000 n +trailer +<< /Size 8 + /Root 7 0 R + /Info 6 0 R +>> +startxref +1409 +%%EOF diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M013.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M013.pdf Binary files differnew file mode 100644 index 00000000000..a9133b9fbea --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M013.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M014.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M014.pdf new file mode 100644 index 00000000000..8731ca26ff0 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M014.pdf @@ -0,0 +1,72 @@ +%PDF-1.5 +% +4 0 obj +<< /Length 5 0 R + /Filter /FlateDecode +>> +stream +xeUI$7@"%J3|HCpP[Mh#Rd +e}~d8w+}OaiY6,] +lrc˅:gJPkDXVoA:9lwc7;e*e.Џo<CZer*DXC6({mմ|Aqttb:u{9;s{%2*4G3$;&t6kz۱q^Fs8W@$px=w{ĐHcJݹUG҄M$SإAL;uF@(lSB +M}iWDKaQOMBٚFdy8ʈ-tQSPj)2,X{5sF"^tTc9C +8x;x.Vl@M0lA:9lwc_S_͉Ig-^xtld&X+ 1GvD+BJm1;gt{C.`, gX!Rt,EX_kWŀhk^5dACZmEUM|RoDǎXl酗W>C#t yb%C;@m<BP@+ O)R.pXF"mڟﱔ0GUbdv^!ڏ>^l1qZW*$0c7lHmi㈳8;Xd 긯qQd7|C t]|Z%s6Gژl3W6Aub] : >KER!+skqUs7)ؐyD́}5Xa160mQUIF'_-k[WZ?vCc㡿CNӿ鐱g +endstream +endobj +5 0 obj + 921 +endobj +3 0 obj +<< + /ExtGState << + /a0 << /CA 1 /ca 1 >> + >> +>> +endobj +2 0 obj +<< /Type /Page % 1 + /Parent 1 0 R + /MediaBox [ 0 0 198.75 198.75 ] + /Contents 4 0 R + /Group << + /Type /Group + /S /Transparency + /I true + /CS /DeviceRGB + >> + /Resources 3 0 R +>> +endobj +1 0 obj +<< /Type /Pages + /Kids [ 2 0 R ] + /Count 1 +>> +endobj +6 0 obj +<< /Producer (cairo 1.16.0 (https://cairographics.org)) + /CreationDate (D:20231109193357+01'00) +>> +endobj +7 0 obj +<< /Type /Catalog + /Pages 1 0 R +>> +endobj +xref +0 8 +0000000000 65535 f +0000001331 00000 n +0000001107 00000 n +0000001035 00000 n +0000000015 00000 n +0000001013 00000 n +0000001396 00000 n +0000001512 00000 n +trailer +<< /Size 8 + /Root 7 0 R + /Info 6 0 R +>> +startxref +1564 +%%EOF diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M015.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M015.pdf Binary files differnew file mode 100644 index 00000000000..1e0e1991bac --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M015.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M016.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M016.pdf Binary files differnew file mode 100644 index 00000000000..c301799f8c0 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M016.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M017.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M017.pdf Binary files differnew file mode 100644 index 00000000000..403e4af957f --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M017.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M018.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M018.pdf Binary files differnew file mode 100644 index 00000000000..c1684c56123 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M018.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M019.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M019.pdf Binary files differnew file mode 100644 index 00000000000..899dc343f73 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M019.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M020.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M020.pdf Binary files differnew file mode 100644 index 00000000000..a05f2f9c281 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M020.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M021.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M021.pdf Binary files differnew file mode 100644 index 00000000000..e8e9b4444b1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M021.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M022.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M022.pdf Binary files differnew file mode 100644 index 00000000000..e8c5b7be318 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M022.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M023.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M023.pdf Binary files differnew file mode 100644 index 00000000000..422ada6ac3e --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M023.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M024.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M024.pdf Binary files differnew file mode 100644 index 00000000000..48cf114099d --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M024.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M025.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M025.pdf Binary files differnew file mode 100644 index 00000000000..95cacc24f2c --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M025.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M026.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M026.pdf Binary files differnew file mode 100644 index 00000000000..96d5a968206 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M026.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M027.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M027.pdf Binary files differnew file mode 100644 index 00000000000..57ff5fc421f --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M027.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M028.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M028.pdf Binary files differnew file mode 100644 index 00000000000..24fb157422b --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M028.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M029.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M029.pdf Binary files differnew file mode 100644 index 00000000000..8c0888c9983 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M029.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M030.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M030.pdf Binary files differnew file mode 100644 index 00000000000..b23dff04e07 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M030.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M031.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M031.pdf Binary files differnew file mode 100644 index 00000000000..58ecb0cda8c --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M031.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M032.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M032.pdf Binary files differnew file mode 100644 index 00000000000..7fd3c279dcb --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M032.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M033.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M033.pdf Binary files differnew file mode 100644 index 00000000000..5800fc4b444 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M033.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M034.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M034.pdf Binary files differnew file mode 100644 index 00000000000..aed2ce39674 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M034.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M035.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M035.pdf Binary files differnew file mode 100644 index 00000000000..d419f6aeeb4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M035.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M036.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M036.pdf Binary files differnew file mode 100644 index 00000000000..b3c84ef0227 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M036.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M037.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M037.pdf Binary files differnew file mode 100644 index 00000000000..a8088da27fb --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M037.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M038.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M038.pdf Binary files differnew file mode 100644 index 00000000000..32f5f03eab2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M038.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M039.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M039.pdf Binary files differnew file mode 100644 index 00000000000..bbe60d2b2c1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M039.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M040.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M040.pdf Binary files differnew file mode 100644 index 00000000000..c5be6a8394c --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M040.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M041.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M041.pdf Binary files differnew file mode 100644 index 00000000000..7f6c9cac5bc --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M041.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M042.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M042.pdf Binary files differnew file mode 100644 index 00000000000..240f54561f7 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M042.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M043.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M043.pdf Binary files differnew file mode 100644 index 00000000000..3cec333117d --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M043.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M044.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M044.pdf Binary files differnew file mode 100644 index 00000000000..c4e9b90c422 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M044.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M045.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M045.pdf Binary files differnew file mode 100644 index 00000000000..e18044d5f1c --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M045.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M046.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M046.pdf Binary files differnew file mode 100644 index 00000000000..1c7dc014f09 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M046.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M047.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M047.pdf Binary files differnew file mode 100644 index 00000000000..96c4433dcb7 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M047.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M048.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M048.pdf Binary files differnew file mode 100644 index 00000000000..a738ce3b0cd --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M048.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M049.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M049.pdf Binary files differnew file mode 100644 index 00000000000..913fe8388af --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M049.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M050.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M050.pdf Binary files differnew file mode 100644 index 00000000000..c2e3ba295e9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M050.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M051.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M051.pdf Binary files differnew file mode 100644 index 00000000000..841dcfc7998 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M051.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M052.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M052.pdf Binary files differnew file mode 100644 index 00000000000..5d9fb414b99 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M052.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M053.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M053.pdf Binary files differnew file mode 100644 index 00000000000..3124ec47c6f --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M053.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M054.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M054.pdf Binary files differnew file mode 100644 index 00000000000..e146dadce7a --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M054.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M055.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M055.pdf Binary files differnew file mode 100644 index 00000000000..b744fbd6bdf --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M055.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M056.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M056.pdf Binary files differnew file mode 100644 index 00000000000..42b1a3d4757 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M056.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M057.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M057.pdf Binary files differnew file mode 100644 index 00000000000..8a0fa9e817b --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M057.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M058.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M058.pdf Binary files differnew file mode 100644 index 00000000000..d16a09083f3 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M058.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M059.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M059.pdf Binary files differnew file mode 100644 index 00000000000..f97c260b8a8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M059.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M060.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M060.pdf Binary files differnew file mode 100644 index 00000000000..373633588c5 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_M060.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P001.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P001.pdf Binary files differnew file mode 100644 index 00000000000..4204639a366 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P001.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P002.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P002.pdf Binary files differnew file mode 100644 index 00000000000..cbff0bd974f --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P002.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P003.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P003.pdf Binary files differnew file mode 100644 index 00000000000..3d70a21875f --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P003.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P004.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P004.pdf Binary files differnew file mode 100644 index 00000000000..7557ddb6b33 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P004.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P005.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P005.pdf Binary files differnew file mode 100644 index 00000000000..47f4f065432 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P005.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P006.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P006.pdf Binary files differnew file mode 100644 index 00000000000..d81b6c5e1af --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P006.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P007.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P007.pdf Binary files differnew file mode 100644 index 00000000000..7ef93afe83b --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P007.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P008.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P008.pdf new file mode 100644 index 00000000000..16b5b94fbb9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P008.pdf @@ -0,0 +1,72 @@ +%PDF-1.5 +% +4 0 obj +<< /Length 5 0 R + /Filter /FlateDecode +>> +stream +x]VI$7:,g F9TfRݍ2\39R|_A"~8gR|#3´G<8:<[c~>~zeFM}ZS@0*#5MHCRUG5x3Y^{O3776iC;^=Lf.`eeg#$SskCtnOvѹtM8R`3%d>Rᨈxt[LP2Β2kUPްfOyb[[Ay"CpSkoA\p$ +GfaK!mSj,h
d9AcUȠ2! +Ad@Gi啤=[%h,+߉n܊Hۋ0xDrm7:+,1{;
~5NPbxK4~KKNZa#mFRX*{ xKSC3@A@Y&EON86-R^a*FFM6ZMٜ-שQ
I)|8a(}&| ^W0mOӶ,XNqq
+wmex.=8W,L$Ol<*sn9?!%lPgbA'7Ɩ FR㞚B>tk-qG1#'Eg>%VBl\9WbJ%ؼWe)N+ljՂÉYxoH_)-@Kpc8Q}ſtV%rP ++\r&P{{aF`|l}͍s\("|0;ʚr%]P~
r'C7-L'eҍi|x0/N|2$;1ܬ5:>D8_7WkϒoVwѶƸ +endstream +endobj +5 0 obj + 949 +endobj +3 0 obj +<< + /ExtGState << + /a0 << /CA 1 /ca 1 >> + >> +>> +endobj +2 0 obj +<< /Type /Page % 1 + /Parent 1 0 R + /MediaBox [ 0 0 198.75 198.75 ] + /Contents 4 0 R + /Group << + /Type /Group + /S /Transparency + /I true + /CS /DeviceRGB + >> + /Resources 3 0 R +>> +endobj +1 0 obj +<< /Type /Pages + /Kids [ 2 0 R ] + /Count 1 +>> +endobj +6 0 obj +<< /Producer (cairo 1.16.0 (https://cairographics.org)) + /CreationDate (D:20231109195038+01'00) +>> +endobj +7 0 obj +<< /Type /Catalog + /Pages 1 0 R +>> +endobj +xref +0 8 +0000000000 65535 f +0000001359 00000 n +0000001135 00000 n +0000001063 00000 n +0000000015 00000 n +0000001041 00000 n +0000001424 00000 n +0000001540 00000 n +trailer +<< /Size 8 + /Root 7 0 R + /Info 6 0 R +>> +startxref +1592 +%%EOF diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P009.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P009.pdf Binary files differnew file mode 100644 index 00000000000..8aedd6064b6 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P009.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P010.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P010.pdf Binary files differnew file mode 100644 index 00000000000..494c68d1df8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P010.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P011.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P011.pdf Binary files differnew file mode 100644 index 00000000000..42d5f63ddec --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P011.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P012.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P012.pdf Binary files differnew file mode 100644 index 00000000000..b196406cb82 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P012.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P013.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P013.pdf Binary files differnew file mode 100644 index 00000000000..6f94e89b1f6 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P013.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P014.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P014.pdf Binary files differnew file mode 100644 index 00000000000..40f30b66a38 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P014.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P015.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P015.pdf Binary files differnew file mode 100644 index 00000000000..7de907b4972 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P015.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P016.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P016.pdf Binary files differnew file mode 100644 index 00000000000..26f222085ef --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P016.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P017.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P017.pdf new file mode 100644 index 00000000000..07dc17d10e2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P017.pdf @@ -0,0 +1,73 @@ +%PDF-1.5 +% +4 0 obj +<< /Length 5 0 R + /Filter /FlateDecode +>> +stream +x]TK!s +֑8F3$R_hmɌwN$/IET`̧2K?mpl%uU⎴þf=c[Ksȿ%DH4TVPo*7YțrgKr51 F>@ީ +2֑89+Ը@\@mAPj!Z' +'I3Zp1ܕT\R<rĊ赑pD <7
l* n]GLj_Q6~Ս]>k$57=D{/UfJFX"1 +K0̳Ehp7\j(#!zՂBDAL'KIGDcϵ_ V,Kźʎ9`2arGޗih2!ԑΤ]_Ю(9Wѹb'mu8k +iƮkזtD1|VSvT6tbju6`Z7%ƶ\_0Yo44]@!D5oSބE5)FL,HQbo_\2PFZ;^mxt|/8Mo^s.~2U%2 +endstream +endobj +5 0 obj + 630 +endobj +3 0 obj +<< + /ExtGState << + /a0 << /CA 1 /ca 1 >> + >> +>> +endobj +2 0 obj +<< /Type /Page % 1 + /Parent 1 0 R + /MediaBox [ 0 0 198.75 198.75 ] + /Contents 4 0 R + /Group << + /Type /Group + /S /Transparency + /I true + /CS /DeviceRGB + >> + /Resources 3 0 R +>> +endobj +1 0 obj +<< /Type /Pages + /Kids [ 2 0 R ] + /Count 1 +>> +endobj +6 0 obj +<< /Producer (cairo 1.16.0 (https://cairographics.org)) + /CreationDate (D:20231109195039+01'00) +>> +endobj +7 0 obj +<< /Type /Catalog + /Pages 1 0 R +>> +endobj +xref +0 8 +0000000000 65535 f +0000001040 00000 n +0000000816 00000 n +0000000744 00000 n +0000000015 00000 n +0000000722 00000 n +0000001105 00000 n +0000001221 00000 n +trailer +<< /Size 8 + /Root 7 0 R + /Info 6 0 R +>> +startxref +1273 +%%EOF diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P018.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P018.pdf Binary files differnew file mode 100644 index 00000000000..1649aaaed1d --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P018.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P019.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P019.pdf Binary files differnew file mode 100644 index 00000000000..567db7aa6f0 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P019.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P020.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P020.pdf Binary files differnew file mode 100644 index 00000000000..1a93bf6a57f --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P020.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P021.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P021.pdf Binary files differnew file mode 100644 index 00000000000..52a34861985 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P021.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P022.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P022.pdf new file mode 100644 index 00000000000..b3221c84d7f --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P022.pdf @@ -0,0 +1,71 @@ +%PDF-1.5 +% +4 0 obj +<< /Length 5 0 R + /Filter /FlateDecode +>> +stream +x]TK!s +֑`0#DHyo1x/R7ݣܶ?nJ{}_V}k Z,-n մ+J{gݰ//w,9ÅQ(*JrBuTG)Mt +CٰP+ȹPP591R=KʤZODJ|w>OA;xuv骒XwS!}T?7A"i}Tcu6+(-eð"ҵ/r_,|,`*gZ.rVĒhccL_b-<<J #ՀBfEl9ljnnXxe0ҥkL2|%VNEe6{!hv\2L9b(F4Q5Pk:d5!\Q,0`k5`/Am03[MyfGaE +kӘ4%nU$FtS7^Sd>dd(?pPB!;,dѡo݂nN,B^p1p/7}e؏iuoQJ< +endstream +endobj +5 0 obj + 550 +endobj +3 0 obj +<< + /ExtGState << + /a0 << /CA 1 /ca 1 >> + >> +>> +endobj +2 0 obj +<< /Type /Page % 1 + /Parent 1 0 R + /MediaBox [ 0 0 198.75 198.75 ] + /Contents 4 0 R + /Group << + /Type /Group + /S /Transparency + /I true + /CS /DeviceRGB + >> + /Resources 3 0 R +>> +endobj +1 0 obj +<< /Type /Pages + /Kids [ 2 0 R ] + /Count 1 +>> +endobj +6 0 obj +<< /Producer (cairo 1.16.0 (https://cairographics.org)) + /CreationDate (D:20231109195039+01'00) +>> +endobj +7 0 obj +<< /Type /Catalog + /Pages 1 0 R +>> +endobj +xref +0 8 +0000000000 65535 f +0000000960 00000 n +0000000736 00000 n +0000000664 00000 n +0000000015 00000 n +0000000642 00000 n +0000001025 00000 n +0000001141 00000 n +trailer +<< /Size 8 + /Root 7 0 R + /Info 6 0 R +>> +startxref +1193 +%%EOF diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P023.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P023.pdf Binary files differnew file mode 100644 index 00000000000..bc61ff39572 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P023.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P024.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P024.pdf Binary files differnew file mode 100644 index 00000000000..cfdcc656020 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P024.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P025.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P025.pdf Binary files differnew file mode 100644 index 00000000000..0f630528299 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P025.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P026.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P026.pdf Binary files differnew file mode 100644 index 00000000000..14622fd4740 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P026.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P027.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P027.pdf new file mode 100644 index 00000000000..287fa92485a --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P027.pdf @@ -0,0 +1,74 @@ +%PDF-1.5 +% +4 0 obj +<< /Length 5 0 R + /Filter /FlateDecode +>> +stream +xuVK!s +֑B0`>"Y$2`wDѓ^wUcl_ hϧG:%?FXJFT`<s5̳b#wOkTrs[M+QdDk \j0-c!>JaEYC+gGy
zAjbۃ1QMn: Db-lF'Ҁ D d#x{el&PKHm9赭<X{
N!jJ88;ClX͋73Hr8KLKZ +QkE
ԁ;V +O[V_b w]F5R[=" +e{lA۱Lcڀ,QiňL]d*~ž?fj8QKkn9q|: +pav6~!#$[H#L!I\0dtU^!'05qml9U?8P:}/U3\BqB s!]Fb(E.ⴚۄQM茛2⺦E`E&
9M0|+1[
34¸@1qBM}J^0"n^#uBEĐ&rf:hÀ*eQnX"u9](vqCI: +E2*h*ET|rks`(7Y9";N!h.}U͍K^=\\Lu4#ApتCcj_ܑ +endstream +endobj +5 0 obj + 802 +endobj +3 0 obj +<< + /ExtGState << + /a0 << /CA 1 /ca 1 >> + >> +>> +endobj +2 0 obj +<< /Type /Page % 1 + /Parent 1 0 R + /MediaBox [ 0 0 198.75 198.75 ] + /Contents 4 0 R + /Group << + /Type /Group + /S /Transparency + /I true + /CS /DeviceRGB + >> + /Resources 3 0 R +>> +endobj +1 0 obj +<< /Type /Pages + /Kids [ 2 0 R ] + /Count 1 +>> +endobj +6 0 obj +<< /Producer (cairo 1.16.0 (https://cairographics.org)) + /CreationDate (D:20231109195039+01'00) +>> +endobj +7 0 obj +<< /Type /Catalog + /Pages 1 0 R +>> +endobj +xref +0 8 +0000000000 65535 f +0000001212 00000 n +0000000988 00000 n +0000000916 00000 n +0000000015 00000 n +0000000894 00000 n +0000001277 00000 n +0000001393 00000 n +trailer +<< /Size 8 + /Root 7 0 R + /Info 6 0 R +>> +startxref +1445 +%%EOF diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P028.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P028.pdf Binary files differnew file mode 100644 index 00000000000..fbc0e109ac4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P028.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P029.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P029.pdf new file mode 100644 index 00000000000..cb3e49f544d --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P029.pdf @@ -0,0 +1,73 @@ +%PDF-1.5 +% +4 0 obj +<< /Length 5 0 R + /Filter /FlateDecode +>> +stream +x]VI$7:0-j3 F3s>?H*3tUE2(qLkh +WxNZT+.Z3r]Qp +EA&[}He±owşBJiMrnD΅F*nviUV8ZRشmPj
TZL? $& ¹DZ2IkAWϔpI4rNĭ+.Px7|bi4C)NVy
FrMp=؛:-%[a+WS/]+Z;ј +mh3xQvp N-A݆Bwܨ[Çc/*xcPF
bghmßUct.C/1
"< +W"z/5'lj˭>},V.Ʃ/J}Gf)Hx,A
7wç&Ef!r<ʱ=[K].u*Іy;᧺ĸ5C㸬v"ySSY]|&SO!6{g{vXReg@˚jvу[۸VSpt8Cf+>D
LMN{i8#3̼Ø!}9jo=1\KG~ʕ&݂ܐ7=jIdMALj$7WvKS徛Vv:cuwxųaFC3)į͎R\нCEWvWf\H}=}/]'[y}JMθ>`Fʻ`a<8fh@rVdЄ&qBWy9=YFu'GHu=̺g2dwp#/BdL
%XYSD/Ɨcw:
ҵ@; +MhY2b}MT!w76"I^?yNc225|}#!F +endstream +endobj +5 0 obj + 972 +endobj +3 0 obj +<< + /ExtGState << + /a0 << /CA 1 /ca 1 >> + >> +>> +endobj +2 0 obj +<< /Type /Page % 1 + /Parent 1 0 R + /MediaBox [ 0 0 198.75 198.75 ] + /Contents 4 0 R + /Group << + /Type /Group + /S /Transparency + /I true + /CS /DeviceRGB + >> + /Resources 3 0 R +>> +endobj +1 0 obj +<< /Type /Pages + /Kids [ 2 0 R ] + /Count 1 +>> +endobj +6 0 obj +<< /Producer (cairo 1.16.0 (https://cairographics.org)) + /CreationDate (D:20231109195039+01'00) +>> +endobj +7 0 obj +<< /Type /Catalog + /Pages 1 0 R +>> +endobj +xref +0 8 +0000000000 65535 f +0000001382 00000 n +0000001158 00000 n +0000001086 00000 n +0000000015 00000 n +0000001064 00000 n +0000001447 00000 n +0000001563 00000 n +trailer +<< /Size 8 + /Root 7 0 R + /Info 6 0 R +>> +startxref +1615 +%%EOF diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P030.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P030.pdf Binary files differnew file mode 100644 index 00000000000..021c0b97952 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P030.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P031.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P031.pdf Binary files differnew file mode 100644 index 00000000000..421ee50f92c --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P031.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P032.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P032.pdf Binary files differnew file mode 100644 index 00000000000..584f20d8e77 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P032.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P033.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P033.pdf Binary files differnew file mode 100644 index 00000000000..f7d6e8f9445 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P033.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P034.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P034.pdf Binary files differnew file mode 100644 index 00000000000..d8ee13c5fd8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P034.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P035.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P035.pdf Binary files differnew file mode 100644 index 00000000000..d42d57242c4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P035.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P036.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P036.pdf Binary files differnew file mode 100644 index 00000000000..555a6afe24b --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P036.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P037.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P037.pdf Binary files differnew file mode 100644 index 00000000000..6a6563ca972 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P037.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P038.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P038.pdf Binary files differnew file mode 100644 index 00000000000..ddaf05f9edc --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P038.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P039.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P039.pdf Binary files differnew file mode 100644 index 00000000000..0a41c0d8b65 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P039.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P040.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P040.pdf Binary files differnew file mode 100644 index 00000000000..bfeec12e1e6 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P040.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P041.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P041.pdf Binary files differnew file mode 100644 index 00000000000..6da07255e5b --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P041.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P042.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P042.pdf Binary files differnew file mode 100644 index 00000000000..8a77221585f --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P042.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P043.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P043.pdf Binary files differnew file mode 100644 index 00000000000..a4e069ba9a0 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P043.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P044.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P044.pdf Binary files differnew file mode 100644 index 00000000000..81cf8f71892 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P044.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P045.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P045.pdf Binary files differnew file mode 100644 index 00000000000..16726e7cf2b --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P045.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P046.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P046.pdf Binary files differnew file mode 100644 index 00000000000..320c0f6c5d5 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P046.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P047.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P047.pdf Binary files differnew file mode 100644 index 00000000000..de38a973bde --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P047.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P048.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P048.pdf Binary files differnew file mode 100644 index 00000000000..30b9137f542 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P048.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P049.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P049.pdf Binary files differnew file mode 100644 index 00000000000..e7ebbd12021 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P049.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P050.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P050.pdf Binary files differnew file mode 100644 index 00000000000..c0cb30329d3 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P050.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P051.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P051.pdf Binary files differnew file mode 100644 index 00000000000..c4f90329534 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P051.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P052.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P052.pdf Binary files differnew file mode 100644 index 00000000000..1aa30711be7 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P052.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P053.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P053.pdf Binary files differnew file mode 100644 index 00000000000..5e75ac56a26 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P053.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P054.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P054.pdf Binary files differnew file mode 100644 index 00000000000..39fbd4b6af9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P054.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P055.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P055.pdf Binary files differnew file mode 100644 index 00000000000..561d15386bd --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P055.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P056.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P056.pdf Binary files differnew file mode 100644 index 00000000000..2c984d0b7e8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P056.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P057.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P057.pdf Binary files differnew file mode 100644 index 00000000000..886365621e1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P057.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P058.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P058.pdf Binary files differnew file mode 100644 index 00000000000..e82cdeceadd --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P058.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P059.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P059.pdf Binary files differnew file mode 100644 index 00000000000..46a6dc0b1cb --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P059.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P060.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P060.pdf Binary files differnew file mode 100644 index 00000000000..b152234d174 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P060.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P061.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P061.pdf Binary files differnew file mode 100644 index 00000000000..04327846dd9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P061.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P062.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P062.pdf Binary files differnew file mode 100644 index 00000000000..a3a86b12522 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P062.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P063.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P063.pdf Binary files differnew file mode 100644 index 00000000000..bc4e823a184 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P063.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P064.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P064.pdf Binary files differnew file mode 100644 index 00000000000..feaf4db700e --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P064.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P065.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P065.pdf Binary files differnew file mode 100644 index 00000000000..f0a3cf25b65 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P065.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P066.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P066.pdf Binary files differnew file mode 100644 index 00000000000..ca0ad4180a6 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P066.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P067.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P067.pdf Binary files differnew file mode 100644 index 00000000000..f8de06dbd8e --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P067.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P068.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P068.pdf Binary files differnew file mode 100644 index 00000000000..9de356ab4dc --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P068.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P069.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P069.pdf Binary files differnew file mode 100644 index 00000000000..93c6e07dd2b --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P069.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P070.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P070.pdf Binary files differnew file mode 100644 index 00000000000..34b973fa36e --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P070.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P071.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P071.pdf Binary files differnew file mode 100644 index 00000000000..882eec69821 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P071.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P072.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P072.pdf Binary files differnew file mode 100644 index 00000000000..85c8329f272 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P072.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P073.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P073.pdf Binary files differnew file mode 100644 index 00000000000..a70fc013681 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P073.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P074.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P074.pdf Binary files differnew file mode 100644 index 00000000000..b0dcdbdd31e --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P074.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P075.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P075.pdf Binary files differnew file mode 100644 index 00000000000..dbd0eece862 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_P075.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W001.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W001.pdf new file mode 100644 index 00000000000..93e4ff1096c --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W001.pdf @@ -0,0 +1,69 @@ +%PDF-1.5 +% +4 0 obj +<< /Length 5 0 R + /Filter /FlateDecode +>> +stream +xMPN1L8 h:!V<E|7_ꉎp {-Vqɭa}HtOgx~:[0zDL&5<|\wtXӬ\10dڸԂ "ay<Ej b63YT58Q3|)sm eNI/X!%l1_ ^Mcw@9
Zܱ1\mŷY +Cp&źȭ=rm +endstream +endobj +5 0 obj + 279 +endobj +3 0 obj +<< + /ExtGState << + /a0 << /CA 1 /ca 1 >> + >> +>> +endobj +2 0 obj +<< /Type /Page % 1 + /Parent 1 0 R + /MediaBox [ 0 0 450 393 ] + /Contents 4 0 R + /Group << + /Type /Group + /S /Transparency + /I true + /CS /DeviceRGB + >> + /Resources 3 0 R +>> +endobj +1 0 obj +<< /Type /Pages + /Kids [ 2 0 R ] + /Count 1 +>> +endobj +6 0 obj +<< /Producer (cairo 1.16.0 (https://cairographics.org)) + /CreationDate (D:20231109200440+01'00) +>> +endobj +7 0 obj +<< /Type /Catalog + /Pages 1 0 R +>> +endobj +xref +0 8 +0000000000 65535 f +0000000683 00000 n +0000000465 00000 n +0000000393 00000 n +0000000015 00000 n +0000000371 00000 n +0000000748 00000 n +0000000864 00000 n +trailer +<< /Size 8 + /Root 7 0 R + /Info 6 0 R +>> +startxref +916 +%%EOF diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W002.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W002.pdf Binary files differnew file mode 100644 index 00000000000..cd4e5efe716 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W002.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W003.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W003.pdf new file mode 100644 index 00000000000..e9718ec0b9e --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W003.pdf @@ -0,0 +1,69 @@ +%PDF-1.5 +% +4 0 obj +<< /Length 5 0 R + /Filter /FlateDecode +>> +stream +xmQN1Bl hZġmqPLZcg0ҲJg>Z%y@/z=1\Gw҈IB+EH>;:Ly|+ 5
t7ˤ^c%pO!.r}XUd'sv]ķY6Zc<3# +I^kluY7v뫯sF&Q_mͥaA6![
n-v&s(ɽuЯ#8n +endstream +endobj +5 0 obj + 280 +endobj +3 0 obj +<< + /ExtGState << + /a0 << /CA 1 /ca 1 >> + >> +>> +endobj +2 0 obj +<< /Type /Page % 1 + /Parent 1 0 R + /MediaBox [ 0 0 450 393 ] + /Contents 4 0 R + /Group << + /Type /Group + /S /Transparency + /I true + /CS /DeviceRGB + >> + /Resources 3 0 R +>> +endobj +1 0 obj +<< /Type /Pages + /Kids [ 2 0 R ] + /Count 1 +>> +endobj +6 0 obj +<< /Producer (cairo 1.16.0 (https://cairographics.org)) + /CreationDate (D:20231109200440+01'00) +>> +endobj +7 0 obj +<< /Type /Catalog + /Pages 1 0 R +>> +endobj +xref +0 8 +0000000000 65535 f +0000000684 00000 n +0000000466 00000 n +0000000394 00000 n +0000000015 00000 n +0000000372 00000 n +0000000749 00000 n +0000000865 00000 n +trailer +<< /Size 8 + /Root 7 0 R + /Info 6 0 R +>> +startxref +917 +%%EOF diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W004.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W004.pdf Binary files differnew file mode 100644 index 00000000000..52821d3ee2c --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W004.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W005.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W005.pdf Binary files differnew file mode 100644 index 00000000000..e0af280633e --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W005.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W006.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W006.pdf Binary files differnew file mode 100644 index 00000000000..5a8cd083401 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W006.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W007.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W007.pdf Binary files differnew file mode 100644 index 00000000000..5aee6b6eebd --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W007.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W008.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W008.pdf Binary files differnew file mode 100644 index 00000000000..2279b4802e8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W008.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W009.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W009.pdf Binary files differnew file mode 100644 index 00000000000..9dda0f4ee9b --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W009.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W010.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W010.pdf Binary files differnew file mode 100644 index 00000000000..8a70dd40fcc --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W010.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W011.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W011.pdf Binary files differnew file mode 100644 index 00000000000..5feeebec8db --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W011.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W012.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W012.pdf Binary files differnew file mode 100644 index 00000000000..fed0023c081 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W012.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W013.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W013.pdf Binary files differnew file mode 100644 index 00000000000..22e6c03d157 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W013.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W014.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W014.pdf Binary files differnew file mode 100644 index 00000000000..0ffc581a813 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W014.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W015.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W015.pdf Binary files differnew file mode 100644 index 00000000000..0a8f3c6a98a --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W015.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W016.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W016.pdf Binary files differnew file mode 100644 index 00000000000..1635032be16 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W016.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W017.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W017.pdf Binary files differnew file mode 100644 index 00000000000..e7f3eaa7e34 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W017.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W018.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W018.pdf Binary files differnew file mode 100644 index 00000000000..f56cfa12f4c --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W018.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W019.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W019.pdf Binary files differnew file mode 100644 index 00000000000..37445e7a281 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W019.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W020.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W020.pdf Binary files differnew file mode 100644 index 00000000000..1e06b95eab5 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W020.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W021.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W021.pdf Binary files differnew file mode 100644 index 00000000000..d60016dc805 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W021.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W022.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W022.pdf Binary files differnew file mode 100644 index 00000000000..bf13211210e --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W022.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W023.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W023.pdf Binary files differnew file mode 100644 index 00000000000..d7b080a243d --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W023.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W024.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W024.pdf Binary files differnew file mode 100644 index 00000000000..c1148bf3e6a --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W024.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W025.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W025.pdf Binary files differnew file mode 100644 index 00000000000..1f94d88dde6 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W025.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W026.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W026.pdf Binary files differnew file mode 100644 index 00000000000..b51f591e19d --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W026.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W027.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W027.pdf Binary files differnew file mode 100644 index 00000000000..299c473c610 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W027.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W028.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W028.pdf Binary files differnew file mode 100644 index 00000000000..06a2a1730e0 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W028.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W029.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W029.pdf Binary files differnew file mode 100644 index 00000000000..b26c8d242ec --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W029.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W030.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W030.pdf Binary files differnew file mode 100644 index 00000000000..6991d20397c --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W030.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W031.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W031.pdf Binary files differnew file mode 100644 index 00000000000..3b04fca386c --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W031.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W032.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W032.pdf Binary files differnew file mode 100644 index 00000000000..874d5d18561 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W032.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W033.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W033.pdf Binary files differnew file mode 100644 index 00000000000..954c565b074 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W033.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W034.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W034.pdf Binary files differnew file mode 100644 index 00000000000..e05340bf572 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W034.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W035.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W035.pdf Binary files differnew file mode 100644 index 00000000000..b519520de20 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W035.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W036.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W036.pdf Binary files differnew file mode 100644 index 00000000000..8b3c75efa44 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W036.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W037.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W037.pdf Binary files differnew file mode 100644 index 00000000000..82fdb9e25ae --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W037.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W038.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W038.pdf Binary files differnew file mode 100644 index 00000000000..20d7fecebf4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W038.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W039.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W039.pdf Binary files differnew file mode 100644 index 00000000000..1c99515ed9b --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W039.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W040.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W040.pdf Binary files differnew file mode 100644 index 00000000000..3941b250979 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W040.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W041.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W041.pdf Binary files differnew file mode 100644 index 00000000000..c6416f08ea2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W041.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W042.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W042.pdf Binary files differnew file mode 100644 index 00000000000..9321af66dba --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W042.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W043.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W043.pdf Binary files differnew file mode 100644 index 00000000000..55ead516204 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W043.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W044.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W044.pdf Binary files differnew file mode 100644 index 00000000000..e262f16d1d0 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W044.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W045.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W045.pdf Binary files differnew file mode 100644 index 00000000000..e6d68cba29b --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W045.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W046.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W046.pdf Binary files differnew file mode 100644 index 00000000000..d1d0f0b7812 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W046.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W047.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W047.pdf Binary files differnew file mode 100644 index 00000000000..10b71d56d72 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W047.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W048.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W048.pdf Binary files differnew file mode 100644 index 00000000000..ed0b84886fc --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W048.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W049.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W049.pdf Binary files differnew file mode 100644 index 00000000000..814955db230 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W049.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W050.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W050.pdf Binary files differnew file mode 100644 index 00000000000..c2f4bcb9b80 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W050.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W051.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W051.pdf Binary files differnew file mode 100644 index 00000000000..b0e7c09dc41 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W051.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W052.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W052.pdf Binary files differnew file mode 100644 index 00000000000..9ad59817a55 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W052.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W053.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W053.pdf Binary files differnew file mode 100644 index 00000000000..8013e0e9668 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W053.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W054.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W054.pdf Binary files differnew file mode 100644 index 00000000000..2b3f5323d9c --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W054.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W055.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W055.pdf Binary files differnew file mode 100644 index 00000000000..c61a359de67 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W055.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W056.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W056.pdf Binary files differnew file mode 100644 index 00000000000..6f3b5028814 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W056.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W057.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W057.pdf Binary files differnew file mode 100644 index 00000000000..a4e2e379cc6 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W057.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W058.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W058.pdf Binary files differnew file mode 100644 index 00000000000..a6cc2f357e3 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W058.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W059.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W059.pdf Binary files differnew file mode 100644 index 00000000000..03037b8f9d5 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W059.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W060.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W060.pdf Binary files differnew file mode 100644 index 00000000000..4947b7f5294 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W060.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W061.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W061.pdf Binary files differnew file mode 100644 index 00000000000..fa0dbad4ee8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W061.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W062.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W062.pdf Binary files differnew file mode 100644 index 00000000000..38168b8b90b --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W062.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W063.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W063.pdf Binary files differnew file mode 100644 index 00000000000..0bc81af20e8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W063.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W064.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W064.pdf Binary files differnew file mode 100644 index 00000000000..75f8625838a --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W064.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W065.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W065.pdf Binary files differnew file mode 100644 index 00000000000..f13b05c99f3 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W065.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W066.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W066.pdf Binary files differnew file mode 100644 index 00000000000..92afceab2f2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W066.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W067.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W067.pdf Binary files differnew file mode 100644 index 00000000000..d891a4bdc73 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W067.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W068.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W068.pdf Binary files differnew file mode 100644 index 00000000000..0da984a06f2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W068.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W069.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W069.pdf Binary files differnew file mode 100644 index 00000000000..494ab14531a --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W069.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W070.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W070.pdf Binary files differnew file mode 100644 index 00000000000..4cd988cba70 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W070.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W071.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W071.pdf Binary files differnew file mode 100644 index 00000000000..0e55001c941 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W071.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W072.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W072.pdf Binary files differnew file mode 100644 index 00000000000..7b8a9c08391 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W072.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W073.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W073.pdf Binary files differnew file mode 100644 index 00000000000..0f6f5fcd9b5 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W073.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W074.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W074.pdf Binary files differnew file mode 100644 index 00000000000..b6ec9d92f39 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W074.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W075.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W075.pdf Binary files differnew file mode 100644 index 00000000000..6e8b28d2767 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W075.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W076.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W076.pdf Binary files differnew file mode 100644 index 00000000000..32709b91446 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W076.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W077.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W077.pdf Binary files differnew file mode 100644 index 00000000000..db62ce47beb --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W077.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W078.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W078.pdf Binary files differnew file mode 100644 index 00000000000..867eb1b6c1d --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W078.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W079.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W079.pdf Binary files differnew file mode 100644 index 00000000000..78e325ce3d4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W079.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W080.pdf b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W080.pdf Binary files differnew file mode 100644 index 00000000000..b0b0b76b900 --- /dev/null +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety-pdfs/ISO_7010_W080.pdf diff --git a/Master/texmf-dist/tex/latex/isosafety/isosafety.sty b/Master/texmf-dist/tex/latex/isosafety/isosafety.sty index cab3cd68954..981484a6d6d 100644 --- a/Master/texmf-dist/tex/latex/isosafety/isosafety.sty +++ b/Master/texmf-dist/tex/latex/isosafety/isosafety.sty @@ -1,14 +1,4 @@ -%% -%% This is file `isosafety.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% isosafety.dtx (with options: `package') -%% -%% This is a generated file. -%% -%% Copyright (C) 2023 by BenSt099 +%% Copyright (C) 2024 by BenSt099 %% %% This file may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3 of this license @@ -22,14 +12,17 @@ %% \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{isosafety} - [2023/11/09 v1.1 ISO Safety Colors And Safety Signs] +[2024/08/29 v1.3 ISO Safety Colors And Safety Signs] \RequirePackage{graphicx} \RequirePackage{xcolor} +\RequirePackage{ifthen} +\RequirePackage{xkeyval} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\definecolor{Warning}{HTML}{F9A800} +\definecolor{Caution}{HTML}{F9A800} +\definecolor{Warning}{HTML}{D05D29} \definecolor{Prohibition}{HTML}{9B2423} \definecolor{Mandatory}{HTML}{005387} \definecolor{Rescue}{HTML}{237F52} @@ -38,11 +31,19 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\newcommand{\isosafetypath}{false} +\DeclareOptionX{fullpath}{\renewcommand{\isosafetypath}{#1}} +\ProcessOptionsX\relax + +\ifthenelse{\equal{\isosafetypath}{false}} +{\PackageError{isosafety}{Missing key-value option 'fullpath' in usepackage-statement, please see documentation.}{Please provide the full path to this package, usually /texlive/2024/texmf-dist/tex/latex/isosafety}} +{} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\newcommand{\Isosign}[1]{isosafety-pdfs/ISO_7010_#1.pdf} +\newcommand{\Isosign}[1]{\isosafetypath /isosafety-pdfs/ISO_7010_#1.pdf} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \endinput %% -%% End of file `isosafety.sty'. +%% End of file `isosafety.sty'.
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/jlreq/jlreq-complements.sty b/Master/texmf-dist/tex/latex/jlreq/jlreq-complements.sty index 80ab6206501..1dc817a1976 100644 --- a/Master/texmf-dist/tex/latex/jlreq/jlreq-complements.sty +++ b/Master/texmf-dist/tex/latex/jlreq/jlreq-complements.sty @@ -1,7 +1,6 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{jlreq-complements}[2022/11/28 jlreq-complements] -\RequirePackage{jlreq-helpers}[2022/11/28] -\RequirePackage{l3keys2e} +\ProvidesPackage{jlreq-complements}[2024/08/23 jlreq-complements] +\RequirePackage{jlreq-helpers}[2024/02/13] \ExplSyntaxOn @@ -9,7 +8,7 @@ \str_new:N \g__jlreq_complements_engine_str \tl_new:N \g__jlreq_complements_finally -\keys_define:nn { jlreq-complements } { +\DeclareKeys [jlreq-complements] { setupname .code:n = { \str_set:Nn \g__jlreq_complements_setupname_str {#1} }, @@ -20,8 +19,8 @@ lualatex .code:n = { \str_set:Nn \g__jlreq_complements_engine_str { lualatex } }, lualatex .value_forbidden:n = true, } -\keys_set:nn { jlreq-complements } { setupname = jlreqcomplementssetup } -\ProcessKeysOptions { jlreq-complements } +\SetKeys [jlreq-complements] { setupname = jlreqcomplementssetup } +\ProcessKeyOptions [jlreq-complements] \str_if_empty:NT \g__jlreq_complements_engine_str { \jlreq@helper@guessengine @@ -37,7 +36,8 @@ \str_if_eq:VnTF \g__jlreq_complements_engine_str { lualatex } { \prg_new_conditional:Nnn \__jlreq_complements_iftdir: { T, F, TF} { - \int_compare_p:n { (\ltjgetparameter{direction}-(\ltjgetparameter{direction}/8)*8) == 3 } + \int_compare:nTF { (\ltjgetparameter{direction}-(\ltjgetparameter{direction}/8)*8) == 3 } + { \prg_return_true: } { \prg_return_false: } } }{ \prg_new_conditional:Nnn \__jlreq_complements_iftdir: { T, F, TF} { \iftdir \prg_return_true: \else \prg_return_false: \fi } diff --git a/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty b/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty index ec65cabae91..1cded80d8cb 100644 --- a/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty +++ b/Master/texmf-dist/tex/latex/jlreq/jlreq-trimmarks.sty @@ -1,6 +1,5 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{jlreq-trimmarks}[2024/02/13 jlreq-trimmarks] -\RequirePackage{l3keys2e} +\ProvidesPackage{jlreq-trimmarks}[2024/08/23 jlreq-trimmarks] \RequirePackage{jlreq-helpers}[2024/02/13] \ExplSyntaxOn @@ -42,13 +41,13 @@ } % dvipdfmx=f,dvips=s,dviout = o, lualatex = l -\keys_define:nn { jlreq-trimmarks } { +\DeclareKeys [jlreq-trimmarks] { dvipdfmx .code:n = {\let\jlreq@trimmarks@driver=f}, .value_forbidden:n = true, dvips .code:n = {\let\jlreq@trimmarks@driver=s}, .value_forbidden:n = true, dviout .code:n = {\let\jlreq@trimmarks@driver=o}, .value_forbidden:n = true } \let\jlreq@trimmarks@engine=\jlreq@engine -\keys_define:nn { jlreq-trimmarks } { +\DeclareKeys [jlreq-trimmarks] { lualatex .code:n = {\let\jlreq@trimmarks@engine=l}, .value_forbidden:n = true, uplatex .code:n = {\let\jlreq@trimmarks@engine=u}, .value_forbidden:n = true, platex .code:n = {\let\jlreq@trimmarks@engine=p}, .value_forbidden:n = true @@ -156,7 +155,7 @@ } \__jlreq_trimmarks_afterpkg_addtodeletecs:N \jlreq@trimmarks@analyzepapersize -\keys_define:nn { jlreq-trimmarks } { trimmarks_paper .tl_set:N = \jlreq@trimmarks@option@papersize } +\DeclareKeys [jlreq-trimmarks] { trimmarks_paper .tl_set:N = \jlreq@trimmarks@option@papersize } \__jlreq_trimmarks_afterpkg_addtodeletecs:N \jlreq@trimmarks@option@papersize \newif\ifjlreq@trimmarks@digital \jlreq@trimmarks@digitaltrue @@ -166,7 +165,7 @@ % flag: `show` is specified or not \newif\ifjlreq@trimmarks@option@show \jlreq@trimmarks@option@showfalse -\keys_define:nn { jlreq-trimmarks } { +\DeclareKeys [jlreq-trimmarks] { show .code:n = { \jlreq@trimmarks@option@showtrue \jlreq@ifempty{#1}{ @@ -214,14 +213,14 @@ } \newif\ifjlreq@trimmarks@landscape \jlreq@trimmarks@landscapefalse -\keys_define:nn { jlreq-trimmarks } { landscape .code:n = {\jlreq@trimmarks@landscapetrue}, .value_forbidden:n = true } +\DeclareKeys [jlreq-trimmarks] { landscape .code:n = {\jlreq@trimmarks@landscapetrue}, .value_forbidden:n = true } \__jlreq_trimmarks_afterpkg_addtodeleteif:N \ifjlreq@trimmarks@landscape -\keys_set:nn { jlreq-trimmarks } { +\SetKeys [jlreq-trimmarks] { trimmarks_paper = {+2in}, bleed_margin = { top = 3mm, bottom = 3mm, gutter = 3mm, fore-edge = 3mm }, } -\ProcessKeysOptions { jlreq-trimmarks } +\ProcessKeyOptions [jlreq-trimmarks] \ifjlreq@trimmarks@option@show\else \ifx o\jlreq@trimmarks@driver diff --git a/Master/texmf-dist/tex/latex/jlreq/jlreq.cls b/Master/texmf-dist/tex/latex/jlreq/jlreq.cls index b8e5c3dbcb1..8f14372b389 100644 --- a/Master/texmf-dist/tex/latex/jlreq/jlreq.cls +++ b/Master/texmf-dist/tex/latex/jlreq/jlreq.cls @@ -5,28 +5,39 @@ %% % (based on JLReq 20200811 https://www.w3.org/TR/2020/NOTE-jlreq-20200811/) \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{jlreq}[2024/02/16 jlreq] -\RequirePackage{l3keys2e} +\ProvidesClass{jlreq}[2024/08/23 jlreq] \RequirePackage{etoolbox} \RequirePackage{jlreq-helpers}[2024/02/13] \ExplSyntaxOn +\cs_new:Nn \l_jlreq_do: {} \int_new:N \l__jlreq_tmpa_int +\int_new:N \l__jlreq_tmpb_int +\int_new:N \l__jlreq_tmpc_int \tl_new:N \l__jlreq_tmpa_tl \tl_new:N \l__jlreq_tmpb_tl \tl_new:N \l__jlreq_tmpc_tl -\cs_new:Nn \l_jlreq_do: {} \str_new:N \l__jlreq_tmpa_str \str_new:N \l__jlreq_tmpb_str \str_new:N \l__jlreq_tmpc_str -\bool_new:N \l_jlreq_tmpa_bool -\clist_new:N \l_jlreq_tmpa_clist +\bool_new:N \l__jlreq_tmpa_bool +\bool_new:N \l__jlreq_tmpb_bool +\bool_new:N \l__jlreq_tmpc_bool +\clist_new:N \l__jlreq_tmpa_clist +\clist_new:N \l__jlreq_tmpb_clist +\clist_new:N \l__jlreq_tmpc_clist \seq_new:N \l__jlreq_tmpa_seq +\seq_new:N \l__jlreq_tmpb_seq +\seq_new:N \l__jlreq_tmpc_seq \dim_new:N \l__jlreq_tmpa_dim -\skip_new:N \l_jlreq_tmpa_skip -\box_new:N \l_jlreq_tmpa_box -\box_new:N \l_jlreq_tmpb_box -\box_new:N \l_jlreq_tmpc_box +\dim_new:N \l__jlreq_tmpb_dim +\dim_new:N \l__jlreq_tmpc_dim +\skip_new:N \l__jlreq_tmpa_skip +\skip_new:N \l__jlreq_tmpb_skip +\skip_new:N \l__jlreq_tmpc_skip +\box_new:N \l__jlreq_tmpa_box +\box_new:N \l__jlreq_tmpb_box +\box_new:N \l__jlreq_tmpc_box \prop_new:N \l__jlreq_tmpa_prop \prop_new:N \l__jlreq_tmpb_prop \prop_new:N \l__jlreq_tmpc_prop @@ -91,7 +102,8 @@ % ものは\jlreq@option@<key>に格納する. % _とかは@に変換する. % エンジン類 -\keys_define:nn { jlreq } { +\DeclareKeys [jlreq] { + name.usage = load, uplatex .code:n = { \let\jlreq@engine=u }, uplatex .value_forbidden:n = true, platex .code:n = { \let\jlreq@engine=p }, platex .value_forbidden:n = true, lualatex .code:n = { \let\jlreq@engine=l }, lualatex .value_forbidden:n = true, @@ -115,13 +127,13 @@ \tl_gput_right:Nn \g__jlreq_papersizelist_tl { { ##1 } { \setlength{\paperwidth}{#3} \setlength{\paperheight}{#4} } } } \clist_map_inline:nn {#2} { - \keys_define:nn { jlreq } { + \DeclareKeys [jlreq] { ##1 .code:n = { \setlength{\paperwidth}{#3} \setlength{\paperheight}{#4} }, ##1 .value_forbidden:n = true } } } -\keys_define:nn { jlreq } { +\DeclareKeys [jlreq] { paper .code:n = { \str_case:nVF {#1} \g__jlreq_papersizelist_tl { \jlreq@helper@dividebycomma{#1}% @@ -153,7 +165,7 @@ } \clist_map_inline:nn {#2} { \cs_set:Nx \l__jlreq_do: { - \exp_not:N \keys_define:nn { jlreq } { + \exp_not:N \DeclareKeys [jlreq] { ##1 .code:n = { \exp_not:o { \l__jlreq_tmpa:n {##1} } \exp_not:n { \setlength{\paperwidth}{#3} \setlength{\paperheight}{#4} } @@ -276,7 +288,7 @@ %.. フォントサイズ,行長,1ページあたりの行数で基本版面のサイズを決める(2.4.1.a) \__jlreq_aftercls_addtodeletecs:N \jlreq@option@fontsize -\keys_define:nn { jlreq } { +\DeclareKeys [jlreq] { fontsize .tl_set:N = \jlreq@option@fontsize, 10pt .code:n = {\def\jlreq@option@fontsize{10pt}}, 10pt .value_forbidden:n = true, 11pt .code:n = {\def\jlreq@option@fontsize{11pt}}, 11pt .value_forbidden:n = true, @@ -287,69 +299,68 @@ \__jlreq_aftercls_addtodeletecs:N \jlreq@option@jafontsize \__jlreq_aftercls_addtodeletecs:N \jlreq@option@jafontscale %.. 行の長さ -\keys_define:nn { jlreq } { line_length .tl_set:N = \jlreq@option@line@length } +\DeclareKeys [jlreq] { line_length .tl_set:N = \jlreq@option@line@length } \__jlreq_aftercls_addtodeletecs:N \jlreq@option@line@length %.. 1ページあたりの行数 -\keys_define:nn { jlreq } { number_of_lines .tl_set:N = \jlreq@option@number@of@lines } +\DeclareKeys [jlreq] { number_of_lines .tl_set:N = \jlreq@option@number@of@lines } \__jlreq_aftercls_addtodeletecs:N \jlreq@option@number@of@lines % 地の空き量,のどの空き量で配置位置を決める(2.4.1.b)省略されたら中央配置. %.. 天 -\keys_define:nn { jlreq } { head_space .tl_set:N = \jlreq@option@head@space } +\DeclareKeys [jlreq] { head_space .tl_set:N = \jlreq@option@head@space } \__jlreq_aftercls_addtodeletecs:N \jlreq@option@head@space %.. 地 -\keys_define:nn { jlreq } { foot_space .tl_set:N = \jlreq@option@foot@space } +\DeclareKeys [jlreq] { foot_space .tl_set:N = \jlreq@option@foot@space } \__jlreq_aftercls_addtodeletecs:N \jlreq@option@foot@space %.. のど -\keys_define:nn { jlreq } { gutter .tl_set:N = \jlreq@option@gutter } +\DeclareKeys [jlreq] { gutter .tl_set:N = \jlreq@option@gutter } \__jlreq_aftercls_addtodeletecs:N \jlreq@option@gutter %.. 小口 \__jlreq_aftercls_addtodeletecs:N \jlreq@option@fore@edge -\keys_define:nn { jlreq } { +\DeclareKeys [jlreq] { fore_edge .tl_set:N = \jlreq@option@fore@edge, fore-edge .tl_set:N = \jlreq@option@fore@edge } %.. 柱とノンブル % 本文とヘッダ/フッタの間の空き -\keys_define:nn { jlreq } { headfoot_verticalposition .tl_set:N = \jlreq@option@headfoot@verticalpos } +\DeclareKeys [jlreq] { headfoot_verticalposition .tl_set:N = \jlreq@option@headfoot@verticalpos } \__jlreq_aftercls_addtodeletecs:N \jlreq@option@headfoot@verticalpos % 柱やノンブルの左右の空き -\keys_define:nn { jlreq } { headfoot_sidemargin .tl_set:N = \jlreq@headfoot@sidemargin } +\DeclareKeys [jlreq] { headfoot_sidemargin .tl_set:N = \jlreq@headfoot@sidemargin } %.. 段間 -\keys_define:nn { jlreq } { column_gap .tl_set:N = \jlreq@option@column@gap } +\DeclareKeys [jlreq] { column_gap .tl_set:N = \jlreq@option@column@gap } \__jlreq_aftercls_addtodeletecs:N \jlreq@option@column@gap %.. 行送り,指定無しの場合は文字サイズの1.7倍とする.(1.5から2倍が好ましい:2.4.2.d 注3) -\keys_define:nn { jlreq } { - baselineskip .tl_set:N = \jlreq@option@baselineskip, - linegap .code:n = { \def\jlreq@option@baselineskip{1zw + #1} } +\DeclareKeys [jlreq] { + baselineskip .tl_set:N = \jlreqbaselineskip, + linegap .code:n = { \def\jlreqbaselineskip{1zw + #1} } } -\__jlreq_aftercls_addtodeletecs:N \jlreq@option@baselineskip %.. 組み方系 % 行頭に括弧が来たときの配置:3.1.5 % 段落頭指定_折り返し行頭指定 で与える. -\keys_define:nn { jlreq } { open_bracket_pos .choices:nn = {zenkaku_tentsuki,zenkakunibu_nibu,nibu_tentsuki}{\def\jlreq@open@bracket@pos{#1}} } +\DeclareKeys [jlreq] { open_bracket_pos .choices:nn = {zenkaku_tentsuki,zenkakunibu_nibu,nibu_tentsuki}{\def\jlreq@open@bracket@pos{#1}} } % ぶら下げ組みをするか:3.8.2 注1 \newif\ifjlreq@burasage\jlreq@burasagefalse -\keys_define:nn { jlreq } { hanging_punctuation .code:n = {\jlreq@burasagetrue}, hanging_punctuation .value_forbidden:n = true} +\DeclareKeys [jlreq] { hanging_punctuation .code:n = {\jlreq@burasagetrue}, hanging_punctuation .value_forbidden:n = true} % jsarticleと同じkanjiskipを使う \newif\ifjlreq@narrow@kanjiskip\jlreq@narrow@kanjiskipfalse -\keys_define:nn { jlreq } { narrow_kanjiskip .code:n = {\jlreq@narrow@kanjiskiptrue}, narrow_kanjiskip .value_forbidden:n = true} +\DeclareKeys [jlreq] { narrow_kanjiskip .code:n = {\jlreq@narrow@kanjiskiptrue}, narrow_kanjiskip .value_forbidden:n = true} \__jlreq_aftercls_addtodeleteif:N \ifjlreq@narrow@kanjiskip %.. 注 % 傍注のタイプ -\keys_define:nn { jlreq } { sidenote_length .tl_set:N = \jlreq@option@sidenote@length } +\DeclareKeys [jlreq] { sidenote_length .tl_set:N = \jlreq@option@sidenote@length } \__jlreq_aftercls_addtodeletecs:N \jlreq@option@sidenote@length %.. 逆ノンブル \newif\ifjlreq@option@use@reverse@pagination \__jlreq_aftercls_addtodeleteif:N \ifjlreq@option@use@reverse@pagination \jlreq@option@use@reverse@paginationfalse -\keys_define:nn { jlreq } { use_reverse_pagination .code:n = {\jlreq@option@use@reverse@paginationtrue}, use_reverse_pagination .value_forbidden:n = true } +\DeclareKeys [jlreq] { use_reverse_pagination .code:n = {\jlreq@option@use@reverse@paginationtrue}, use_reverse_pagination .value_forbidden:n = true } %.. もろもろ \newif\if@restonecol\@restonecolfalse @@ -358,7 +369,7 @@ \newif\if@tate \@tatefalse \newif\ifjlreq@option@titlepage \jlreq@option@titlepagefalse % titlepageかnotitlepageかが指定された \__jlreq_aftercls_addtodeleteif:N \ifjlreq@option@titlepage -\keys_define:nn { jlreq } { +\DeclareKeys [jlreq] { landscape .code:n = {\@landscapetrue}, landscape .value_forbidden:n = true, tombo .code:n = {\ClassWarningNoLine{jlreq}{The~option~`tombo'~is~not~supported~by~jlreq~class.~Please~use~the~jlreq-trimmarks~package}}, tombow .code:n = {\ClassWarningNoLine{jlreq}{The~option~`tombow'~is~not~supported~by~jlreq~class.~Please~use~the~jlreq-trimmarks~package}}, @@ -368,7 +379,7 @@ \newif\ifjlreq@option@twoside\jlreq@option@twosidefalse % onesideかtwosideが指定された \__jlreq_aftercls_addtodeleteif:N \ifjlreq@option@twoside -\keys_define:nn { jlreq } { +\DeclareKeys [jlreq] { oneside .code:n = { \@twosidefalse\@mparswitchfalse\jlreq@option@twosidetrue }, oneside .value_forbidden:n = true, twoside .code:n = { \@twosidetrue\@mparswitchtrue\jlreq@option@twosidetrue }, twoside .value_forbidden:n = true, onecolumn .code:n = { \@twocolumnfalse }, onecolumn .value_forbidden:n = true, @@ -381,7 +392,7 @@ \newif\if@openright \newif\ifjlreq@option@open \jlreq@option@openfalse % openrightかopenanyが指定された \__jlreq_aftercls_addtodeleteif:N \ifjlreq@option@open -\keys_define:nn { jlreq } { +\DeclareKeys [jlreq] { openright .code:n = { \@openrighttrue\jlreq@option@opentrue }, openright .value_forbidden:n = true, openany .code:n = { \@openrightfalse\jlreq@option@opentrue }, openany .value_forbidden:n = true, leqno .code:n = { \input{leqno.clo } }, leqno .value_forbidden:n = true, @@ -389,12 +400,12 @@ } \newif\ifjlreq@option@enablejfam \jlreq@option@enablejfamtrue \__jlreq_aftercls_addtodeleteif:N \ifjlreq@option@enablejfam -\keys_define:nn { jlreq } { disablejfam .code:n = { \jlreq@option@enablejfamfalse }, disablejfam .value_forbidden:n = true} +\DeclareKeys [jlreq] { disablejfam .code:n = { \jlreq@option@enablejfamfalse }, disablejfam .value_forbidden:n = true} \def\jlreq@note#1{} -\keys_define:nn { jlreq } { jlreq_notes .code:n = { \def\jlreq@note##1{\message{^^JJLReq note: ##1^^J}}}, jlreq_notes .value_forbidden:n = true} +\DeclareKeys [jlreq] { jlreq_notes .code:n = { \def\jlreq@note##1{\message{^^JJLReq note: ##1^^J}}}, jlreq_notes .value_forbidden:n = true} -\keys_set:nn { jlreq } { +\SetKeys [jlreq] { article_type=article,paper=a4, number_of_lines={},line_length = {}, head_space={},foot_space={},gutter={},fore_edge={}, @@ -402,8 +413,9 @@ sidenote_length=0pt,column_gap={2zw}, headfoot_verticalposition = {},headfoot_sidemargin={0pt}, open_bracket_pos=zenkaku_tentsuki, - onecolumn,final } -\ProcessKeysOptions { jlreq } + onecolumn,final +} +\ProcessKeyOptions [jlreq] \legacy_if:nF { jlreq@option@titlepage } { \str_if_eq:VnTF \jlreq@article@type { article } { \@titlepagefalse } { \@titlepagetrue } @@ -1189,23 +1201,22 @@ % \baselineskipの計算 % いったん文字サイズを変更((u)platexの際にzh/zwをきちんとするため) \@setfontsize\normalsize{\jlreq@fontsize}{\jlreq@fontsize}% -\newdimen\jlreq@baselineskip +% 現在の\baselineskipを計算し#1に入れる \ifx l\jlreq@engine - \setlength{\jlreq@baselineskip}{% - \dimexpr\directlua{ + \edef\jlreqbaselineskip{ + \directlua{ local~act = string.char(92)~ - local~s = [[\jlreq@option@baselineskip]]~ + local~s = [[\jlreqbaselineskip]]~ s = s:gsub("[QH]",act .. "dimexpr 0.25mm" .. act .. "relax"):gsub("zh",act .. "zh"):gsub("zw",act .. "zw")~ - tex.print(s)~ - }\relax - }% -\else - \setlength{\jlreq@baselineskip}{\dimexpr\jlreq@option@baselineskip\relax} + tex.print(act .. "unexpanded{" .. s .. "}")~ + } + } \fi -\ifdim\jlreq@fontsize>\jlreq@baselineskip +\dim_set:Nn \l__jlreq_tmpa_dim {\jlreqbaselineskip} +\ifdim\jlreq@fontsize>\l__jlreq_tmpa_dim \ClassError{jlreq}{The~baselineskip~is~less~than~fontsize}{\@ehc}% \fi -\bool_if:nT { \dim_compare_p:n { \jlreq@baselineskip < 1.5\zw } || \dim_compare_p:n { \jlreq@baselineskip > 2\zw } } { +\bool_if:nT { \dim_compare_p:n { \l__jlreq_tmpa_dim < 1.5\zw } || \dim_compare_p:n { \l__jlreq_tmpa_dim > 2\zw } } { \jlreq@note { 行間は二分以上全角以下が望ましい (2.4.2.d~注3).} } @@ -1266,7 +1277,7 @@ \fi \renewcommand{\normalsize}{% - \@setfontsize\normalsize{\jlreq@fontsize}{\jlreq@baselineskip}% + \@setfontsize\normalsize{\jlreq@fontsize}{\dimexpr\jlreqbaselineskip\relax}% \abovedisplayskip 1.1\jlreq@fontsize \@plus .3\jlreq@fontsize \@minus .4\jlreq@fontsize \abovedisplayshortskip \z@ \@plus .3\jlreq@fontsize \belowdisplayskip .9\jlreq@fontsize \@plus.3\jlreq@fontsize \@minus.4\jlreq@fontsize @@ -1286,26 +1297,49 @@ % 2.5.2 \baselineskipは一定の方がよい? % \@listiは再定義しないようにした.(\normalsizeと共用でJLReq通りだと思う.) \newcommand{\footnotesize}{% - \@setfontsize\footnotesize{.8\jlreq@fontsize}{\dimexpr 115\jlreq@baselineskip/170\relax}% 脚注文字サイズの二分より少し小さい値を行間に: 4.2.5.e + \setlength{\jlreq@tempdima}{\dimexpr\jlreqbaselineskip\relax} + \@setfontsize\footnotesize{.8\jlreq@fontsize}{\dimexpr 115\jlreq@tempdima/170\relax}% 脚注文字サイズの二分より少し小さい値を行間に: 4.2.5.e \abovedisplayskip .6\jlreq@fontsize \@plus.2\jlreq@fontsize \@minus.4\jlreq@fontsize \abovedisplayshortskip \z@ \@plus.1\jlreq@fontsize \belowdisplayshortskip .3\jlreq@fontsize \@plus.1\jlreq@fontsize \@minus.2\jlreq@fontsize \belowdisplayskip \abovedisplayskip} -% tsize10.cloの引数を,そのまま\jlreq@fontsize/\jlreq@baselineskipでスケーリングしているだけ. +% tsize10.cloの引数を,そのまま\jlreq@fontsize/\jlreqbaselineskipでスケーリングしているだけ. \newcommand{\small}{% % jsarticleのもの - \@setfontsize\small{.9\jlreq@fontsize}{\dimexpr 13\jlreq@baselineskip/17\relax}% + \setlength{\jlreq@tempdima}{\dimexpr\jlreqbaselineskip\relax} + \@setfontsize\small{.9\jlreq@fontsize}{\dimexpr 13\jlreq@tempdima/17\relax}% \abovedisplayskip .9\jlreq@fontsize \@plus.3\jlreq@fontsize \@minus.4\jlreq@fontsize \abovedisplayshortskip \z@ \@plus.3\jlreq@fontsize \belowdisplayshortskip \abovedisplayshortskip \belowdisplayskip \abovedisplayskip} -\newcommand{\scriptsize}{\@setfontsize\scriptsize{\dimexpr 7\jlreq@fontsize/10\relax}{\dimexpr 8\jlreq@baselineskip/17\relax}} -\newcommand{\tiny}{\@setfontsize\tiny{\dimexpr 5\jlreq@fontsize/10\relax}{\dimexpr 6\jlreq@baselineskip/17\relax}} -\newcommand{\large}{\@setfontsize\large{\dimexpr12\jlreq@fontsize/10\relax}{\jlreq@baselineskip}} -\newcommand{\Large}{\@setfontsize\Large{\dimexpr14\jlreq@fontsize/10\relax}{\dimexpr 21\jlreq@baselineskip/17\relax}} -\newcommand{\LARGE}{\@setfontsize\LARGE{\dimexpr17\jlreq@fontsize/10\relax}{\dimexpr 25\jlreq@baselineskip/17\relax}} -\newcommand{\huge}{\@setfontsize\huge{2\jlreq@fontsize}{\dimexpr 28\jlreq@baselineskip/17\relax}} -\newcommand{\Huge}{\@setfontsize\Huge{\dimexpr 25\jlreq@fontsize/10\relax}{\dimexpr 33\jlreq@baselineskip/17\relax}} +\newcommand{\scriptsize}{ + \setlength{\jlreq@tempdima}{\dimexpr\jlreqbaselineskip\relax} + \@setfontsize\scriptsize{\dimexpr 7\jlreq@fontsize/10\relax}{\dimexpr 8\jlreq@tempdima/17\relax} +} +\newcommand{\tiny}{ + \setlength{\jlreq@tempdima}{\dimexpr\jlreqbaselineskip\relax} + \@setfontsize\tiny{\dimexpr 5\jlreq@fontsize/10\relax}{\dimexpr 6\jlreq@tempdima/17\relax} +} +\newcommand{\large}{ + \setlength{\jlreq@tempdima}{\dimexpr\jlreqbaselineskip\relax} + \@setfontsize\large{\dimexpr12\jlreq@fontsize/10\relax}{\jlreq@tempdima} +} +\newcommand{\Large}{ + \setlength{\jlreq@tempdima}{\dimexpr\jlreqbaselineskip\relax} + \@setfontsize\Large{\dimexpr14\jlreq@fontsize/10\relax}{\dimexpr 21\jlreq@tempdima/17\relax} +} +\newcommand{\LARGE}{ + \setlength{\jlreq@tempdima}{\dimexpr\jlreqbaselineskip\relax} + \@setfontsize\LARGE{\dimexpr17\jlreq@fontsize/10\relax}{\dimexpr 25\jlreq@tempdima/17\relax} +} +\newcommand{\huge}{ + \setlength{\jlreq@tempdima}{\dimexpr\jlreqbaselineskip\relax} + \@setfontsize\huge{2\jlreq@fontsize}{\dimexpr 28\jlreq@tempdima/17\relax} +} +\newcommand{\Huge}{ + \setlength{\jlreq@tempdima}{\dimexpr\jlreqbaselineskip\relax} + \@setfontsize\Huge{\dimexpr 25\jlreq@fontsize/10\relax}{\dimexpr 33\jlreq@tempdima/17\relax} +} %. plextから拝借 \def\jlreq@Kanji#1{\expandafter\kansuji\csname c@#1\endcsname} @@ -1833,42 +1867,32 @@ %.. 別行見出し % \jlreq@BlockHeading@start:別行見出しを出力する命令. -% \jlreq@BlockHeading@start{1 = 命令名}{2 = レベル}{3 = スペース関連}{4 = カウンタ関連}{5 = フォーマット関連}{6 = 全体フォーマット}*{見出し}[副題] +% \jlreq@BlockHeading@start{1 = 命令名}{2 = レベル}{3 = スペース関連}{4 = カウンタ関連}*[running head]{見出し}[副題] % カウンタ関連=-,*,無し:-はカウンタ関連を処理しない.*はさらに目次に追加しない(星付き命令と同様).星付きで呼び出された時は常に*同等. % スペース関連={配置:lcr(左中央右)}{字下げ(寸法)}{字上げ(寸法)}{前空き}{後空き}{行取りの行数}{空か*か,偶数ページでも改ページを許可するならば空} % 前/後空きはprefixにa:/s:/r:が入る.r:は空きがその値そのものになる.a:/s:は行取りに加えて入る.a:で指定された空きはページ行頭では入らない % 後空きの時はs:は指定できない. -% フォーマット関連: -% フォーマット関連={{ラベルのみのフォーマット}{ラベルフォーマット}{見出し文字列フォーマット}{見出し文字列フォーマット(ラベル無し)}{副題フォーマット}{副題フォーマット(ラベル無し)}}{{前フォーマットラベルあり}{前フォーマットラベルなし}{見出し全体のフォーマット}{後ろフォーマットラベルあり}{後ろフォーマットラベルなし}} +% フォーマット関連:あらかじめマクロに入れておく +% \jlreq@BlockHeading@start@eachformat: {ラベルのみのフォーマット}{ラベルフォーマット}{見出し文字列フォーマット}{見出し文字列フォーマット(ラベル無し)}{副題フォーマット}{副題フォーマット(ラベル無し)} +% \jlreq@BlockHeading@start@format: {前フォーマットラベルあり}{前フォーマットラベルなし}{見出し全体のフォーマット}{後ろフォーマットラベルあり}{後ろフォーマットラベルなし} +% \jlreq@BlockHeading@start@totalformat: 全体フォーマット % 見出しそのものは「全体フォーマット」に従い出力される.パラメータトークン#1を含み,#1=見出し本体:スペース関連と上の「見出し全体のフォーマット」に基づいて整形される. % 見出し全体のフォーマット内では#1=ラベル,#2=見出し文字列,#3=副題,それぞれ各々のフォーマットに基づき整形される. % ラベルフォーマットでは#1=カウンタ名,見出し文字列フォーマットでは#1=見出し文字列,副題フォーマットでは#1=副題 % ラベルのみのフォーマットは目次に使われる. -\long\def\jlreq@BlockHeading@start#1#2#3#4#5#6{% - \if@noskipsec\leavevmode\fi - % #5と#6は\parを含むかもしれないので引数渡しはしない(後の\@ifstarで詰まる) - \edef\jlreq@BlockHeading@start@eachformat{\exp_not:o {\@firstoftwo#5}}% - \edef\jlreq@BlockHeading@start@format{\exp_not:o {\@secondoftwo#5}}% - \edef\jlreq@BlockHeading@start@totalformat{\unexpanded{#6}}% - \jlreq@BlockHeading@start@{#1}{#2}{#3}{#4}% -} -% {1 = 命令}{2 = レベル}{3 = スペース関連} -\long\def\jlreq@BlockHeading@start@#1#2#3#4{% - \@ifstar{\@dblarg{\jlreq@BlockHeading@start@@{#1}{#2}{#3}{*}}}{\@dblarg{\jlreq@BlockHeading@start@@{#1}{#2}{#3}{#4}}}% -} % {1 = 命令}{2 = レベル}{3 = スペース関連}{4 = *}[5 = running head]{6 = 見出し} -\long\def\jlreq@BlockHeading@start@@#1#2#3#4[#5]#6{% - \@ifnextchar[{\jlreq@BlockHeading@start@@@{#1}{#2}{#3}{#4}{#5}{#6}}{\jlreq@BlockHeading@start@@@{#1}{#2}{#3}{#4}{#5}{#6}[]}% +\long\def\jlreq@BlockHeading@start#1#2#3#4[#5]#6{% + \@ifnextchar[{\jlreq@BlockHeading@start@i{#1}{#2}{#3}{#4}{#5}{#6}}{\jlreq@BlockHeading@start@i{#1}{#2}{#3}{#4}{#5}{#6}[]}% } % {1 = 命令}{2 = レベル}{3 = スペース関連}{4 = *}{5 = running head}{6 = 見出し}[7 = 副題] -\long\def\jlreq@BlockHeading@start@@@#1#2#3#4#5#6[#7]{% - \edef\jlreq@do{\unexpanded{\jlreq@BlockHeading@start@@@@{#1}{#2}{#3}}{\exp_not:o {\jlreq@BlockHeading@start@totalformat}}}% +\long\def\jlreq@BlockHeading@start@i#1#2#3#4#5#6[#7]{% + \edef\jlreq@do{\unexpanded{\jlreq@BlockHeading@start@ii{#1}{#2}{#3}}{\exp_not:o {\jlreq@BlockHeading@start@totalformat}}}% \jlreq@do{#4}{#5}{#6}{#7}% } % {1 = 命令}{2 = レベル}{3 = スペース関連}{4 = 全フォーマット}{5 = *}{6 = running head}{7 = 見出し}{8 = 副題} -\long\def\jlreq@BlockHeading@start@@@@#1#2#3#4#5#6#7#8{% +\long\def\jlreq@BlockHeading@start@ii#1#2#3#4#5#6#7#8{% \global\advance\jlreq@BlockHeading@spaces@current@count by 1 \tl_gput_right:Nn \jlreq@BlockHeading@spaces@current@sequence {_#1}% \edef\jlreq@tempa##1##2##3##4##5##6##7{% @@ -2200,18 +2224,12 @@ \jlreq@ifgluezero\jlreq@tempskipb{}{\vskip\jlreq@tempskipb}% \edef\jlreq@do{% \dim_compare:nF { \parskip=0pt } { -% \exp_not:N \cs_set:Nn \exp_not:N \g__jlreq_gyodori_hook_par: { -% \noexpand\parskip=\the\parskip\noexpand\relax -% \exp_not:n { \cs_set:Nn \g__jlreq_gyodori_hook_par: {} } -% } \exp_not:N \AddToHook { para/before } { \noexpand\parskip=\the\parskip\noexpand\relax } \noexpand\parskip=0pt } }% \expandafter}\jlreq@do } -%\cs_set:Nn \g__jlreq_gyodori_hook_par: {} -%\PushPostHook{par}{\g__jlreq_gyodori_hook_par:} % 行取り情報をゲットだぜ @@ -2498,34 +2516,46 @@ \def\jlreq@totalformat@after{}% }% \fi + % フォーマットを指定のマクロに入れる命令群 + \tl_set:Nx \l__jlreq_tmpa_tl { + \exp_not:n {\edef\jlreq@BlockHeading@start@eachformat}{\exp_not:N \unexpanded{% + {\exp_not:o {\jlreq@label@format}}{\exp_not:o {\jlreq@label@format@modified}}% + {\exp_not:o {\jlreq@heading@text@format@wlabel}}{\exp_not:o {\jlreq@heading@text@format@wolabel}}% + {\exp_not:o {\jlreq@subtitle@format@wlabel}}{\exp_not:o {\jlreq@subtitle@format@wolabel}}% + }}% + \exp_not:n {\edef\jlreq@BlockHeading@start@format}{\exp_not:N \unexpanded{% + {\exp_not:o {\jlreq@pre@format@wlabel}}{\exp_not:o {\jlreq@pre@format@wolabel}}% + {\exp_not:o {\jlreq@format}}% + {}{}% + }}% + \exp_not:n {\edef\jlreq@BlockHeading@start@totalformat}{\exp_not:N \unexpanded{% + {\exp_not:n { + \par + \addpenalty\@secpenalty + \addvspace{0pt}\relax % 改ページ関係(#54,#100),よくわかっていない + }} + {\exp_not:o {\jlreq@totalformat}}{\exp_not:o {\jlreq@totalformat@after}}% + }}% + } + % \jlreq@BlockHeading@startの第四引数 + \tl_set:Nx \l__jlreq_tmpb_tl { + {\exp_not:o {\jlreq@align}}{\exp_not:o {\jlreq@indent}}{\exp_not:o {\jlreq@end@indent}}\exp_not:o {\jlreq@spaceset}{\exp_not:o {\jlreq@allowbreak@evenpage}} + } \edef\jlreq@do{% \exp_not:o {\jlreq@do}% \noexpand\edef\exp_not:c {jlreq@headingcs@#1}{\noexpand\unexpanded{% \exp_not:N \g__jlreq_hook_beforeheading:n {#1} \exp_not:o {\jlreq@pagebreak}% \tl_if_empty:NF \l__jlreq_pagestyle_tl { \exp_not:N \thispagestyle {\exp_not:o { \l__jlreq_pagestyle_tl } } } - \unexpanded{\jlreq@BlockHeading@start{#1}{#2}}% - {{\exp_not:o {\jlreq@align}}{\exp_not:o {\jlreq@indent}}{\exp_not:o {\jlreq@end@indent}}\exp_not:o {\jlreq@spaceset}{\exp_not:o {\jlreq@allowbreak@evenpage}}}% - {\ifjlreq@number\else -\fi}% - {% - {% - {\exp_not:o {\jlreq@label@format}}{\exp_not:o {\jlreq@label@format@modified}}% - {\exp_not:o {\jlreq@heading@text@format@wlabel}}{\exp_not:o {\jlreq@heading@text@format@wolabel}}% - {\exp_not:o {\jlreq@subtitle@format@wlabel}}{\exp_not:o {\jlreq@subtitle@format@wolabel}}% - }% - {% - {\exp_not:o {\jlreq@pre@format@wlabel}}{\exp_not:o {\jlreq@pre@format@wolabel}}% - {\exp_not:o {\jlreq@format}}% - {}{}% - }% - }% - {{\exp_not:n { - \par - \addpenalty\@secpenalty - \addvspace{0pt}\relax % 改ページ関係(#54,#100),よくわかっていない - }}{\exp_not:o {\jlreq@totalformat}}{\exp_not:o {\jlreq@totalformat@after}}}% - }}% - \noexpand\def\exp_not:c {#1}{\exp_not:c {jlreq@headingcs@#1}}% + \exp_not:o \l__jlreq_tmpa_tl + \exp_not:N \@ifstar + {\exp_not:N \@dblarg{\exp_not:N \jlreq@BlockHeading@start{\exp_not:n {#1}}{\exp_not:n {#2}}{\exp_not:o {\l__jlreq_tmpb_tl}}{*}}}% + {\exp_not:N \@dblarg{\exp_not:N \jlreq@BlockHeading@start{\exp_not:n {#1}}{\exp_not:n {#2}}{\exp_not:o {\l__jlreq_tmpb_tl}}{\ifjlreq@number\else -\fi}}}% + } + }% + \noexpand\def\exp_not:c {#1}{ + \exp_not:c {jlreq@headingcs@#1} + }% }% \expandafter\endgroup \jlreq@do @@ -3027,8 +3057,8 @@ \cs_set:Nn \__jlreq_CutinHeading_start_aux:nnnnnn{% % 一行で処理したときの見出し長さを計測 \group_begin: - \hbox_set:Nn \l_jlreq_tmpa_box {#1#6} - \dim_set:Nn \l__jlreq_tmpa_dim { \box_wd:N \l_jlreq_tmpa_box} + \hbox_set:Nn \l__jlreq_tmpa_box {#1#6} + \dim_set:Nn \l__jlreq_tmpa_dim { \box_wd:N \l__jlreq_tmpa_box} % 何行必要かを\l__jlreq_cutinheading_linecount_tlに入れる \dim_compare:nTF { \l__jlreq_tmpa_dim > #5} { \tl_set:Nn \l__jlreq_cutinheading_linecount_tl {3} @@ -3038,31 +3068,31 @@ } { \tl_set:Nn \l__jlreq_cutinheading_linecount_tl {1} } } % \l__jlreq_tmpa_dimが実際の一行の長さに近い \dim_set:Nn \l__jlreq_tmpa_dim { \l__jlreq_tmpa_dim / \l__jlreq_cutinheading_linecount_tl } - % \l_jlreq_tmpb_boxに見出し部分を,\l__jlreq_cutinheading_linecount_tlに見出し自身に何行使うかを入れる + % \l__jlreq_tmpb_boxに見出し部分を,\l__jlreq_cutinheading_linecount_tlに見出し自身に何行使うかを入れる \int_compare:nTF { \l__jlreq_cutinheading_linecount_tl = 1 }{ - \vbox_set:Nn \l_jlreq_tmpb_box {\parindent=0pt\rightskip=0pt\leftskip=0pt\box_use_drop:N \l_jlreq_tmpa_box} + \vbox_set:Nn \l__jlreq_tmpb_box {\parindent=0pt\rightskip=0pt\leftskip=0pt\box_use_drop:N \l__jlreq_tmpa_box} \tl_set:Nn \l__jlreq_cutinheading_linecount_tl {2} }{ \jlreq@inlinenote@determinelength{#6}{#1}{}{\l__jlreq_cutinheading_linecount_tl}{\l__jlreq_cutinheading_linecount_tl}{\l__jlreq_tmpa_dim}{\linewidth}% - \box_set_eq:NN \l_jlreq_tmpb_box \jlreq@resultbox + \box_set_eq:NN \l__jlreq_tmpb_box \jlreq@resultbox \tl_set:Nn \l__jlreq_cutinheading_linecount_tl {3} } % 普通の一行の高さ/深さに合わせて見出しのボックスを作る - \setbox\l_jlreq_tmpa_box =\vtop to \dimexpr\numexpr\l__jlreq_cutinheading_linecount_tl - 1\relax\baselineskip + 1\jlreq@zh\relax{\skip_vertical:n {0pt~plus~1fill~minus~1fill} \box_use_drop:N \l_jlreq_tmpb_box \skip_vertical:n {0pt~plus~1fill~minus~1fill}}% + \setbox\l__jlreq_tmpa_box =\vtop to \dimexpr\numexpr\l__jlreq_cutinheading_linecount_tl - 1\relax\baselineskip + 1\jlreq@zh\relax{\skip_vertical:n {0pt~plus~1fill~minus~1fill} \box_use_drop:N \l__jlreq_tmpb_box \skip_vertical:n {0pt~plus~1fill~minus~1fill}}% % 高さを通常の一行のそれにする - \hbox_set:Nn \l_jlreq_tmpc_box {阿} - \box_set_dp:Nn \l_jlreq_tmpa_box { \box_ht:N \l_jlreq_tmpa_box + \box_dp:N \l_jlreq_tmpa_box - \box_ht:N \l_jlreq_tmpc_box } - \box_set_ht:Nn \l_jlreq_tmpa_box { \box_ht:N \l_jlreq_tmpc_box } + \hbox_set:Nn \l__jlreq_tmpc_box {阿} + \box_set_dp:Nn \l__jlreq_tmpa_box { \box_ht:N \l__jlreq_tmpa_box + \box_dp:N \l__jlreq_tmpa_box - \box_ht:N \l__jlreq_tmpc_box } + \box_set_ht:Nn \l__jlreq_tmpa_box { \box_ht:N \l__jlreq_tmpc_box } \noindent \hspace*{#2}% - \box_use:N \l_jlreq_tmpa_box + \box_use:N \l__jlreq_tmpa_box \hspace*{#3}% % でかい見出しボックスの分をキャンセルする空きを入れる - % \baselineskip - box_ht:N \l_jlreq_tmpc_boxはTeXが挿入するスキップの分 + % \baselineskip - box_ht:N \l__jlreq_tmpc_boxはTeXが挿入するスキップの分 \cs_set:Nx \l__jlreq_do:{ \exp_not:N \par - \exp_not:N \skip_vertical:n {\dim_eval:n {-\box_ht:N \l_jlreq_tmpa_box - \box_dp:N \l_jlreq_tmpa_box - \baselineskip + \box_ht:N \l_jlreq_tmpc_box}} - \exp_not:N\hangindent= \dim_eval:n {#2 + \box_wd:N \l_jlreq_tmpa_box + #3} \exp_not:N \relax + \exp_not:N \skip_vertical:n {\dim_eval:n {-\box_ht:N \l__jlreq_tmpa_box - \box_dp:N \l__jlreq_tmpa_box - \baselineskip + \box_ht:N \l__jlreq_tmpc_box}} + \exp_not:N\hangindent= \dim_eval:n {#2 + \box_wd:N \l__jlreq_tmpa_box + #3} \exp_not:N \relax \exp_not:N\hangafter=-\l__jlreq_cutinheading_linecount_tl\relax }% \exp_after:wN \group_end: @@ -3136,14 +3166,14 @@ \str_set:Nn \l__jlreq_tmpa_str {#2} \str_case_e:nn { \jlreq@HeadingType {#1} } { { BlockHeading } { - \bool_set_false:N \l_jlreq_tmpa_bool - \str_if_in:NnT \l__jlreq_tmpa_str { before_space= } { \bool_set_true:N \l_jlreq_tmpa_bool } - \str_if_in:NnT \l__jlreq_tmpa_str { before_space~= } { \bool_set_true:N \l_jlreq_tmpa_bool } - \bool_if:NT \l_jlreq_tmpa_bool {\tl_put_left:Nn \l__jlreq_tmpa_tl {before_lines={},} } - \bool_set_false:N \l_jlreq_tmpa_bool - \str_if_in:NnT \l__jlreq_tmpa_str { after_space= } { \bool_set_true:N \l_jlreq_tmpa_bool } - \str_if_in:NnT \l__jlreq_tmpa_str { after_space~= } { \bool_set_true:N \l_jlreq_tmpa_bool } - \bool_if:NT \l_jlreq_tmpa_bool {\tl_put_left:Nn \l__jlreq_tmpa_tl {after_lines={},}} + \bool_set_false:N \l__jlreq_tmpa_bool + \str_if_in:NnT \l__jlreq_tmpa_str { before_space= } { \bool_set_true:N \l__jlreq_tmpa_bool } + \str_if_in:NnT \l__jlreq_tmpa_str { before_space~= } { \bool_set_true:N \l__jlreq_tmpa_bool } + \bool_if:NT \l__jlreq_tmpa_bool {\tl_put_left:Nn \l__jlreq_tmpa_tl {before_lines={},} } + \bool_set_false:N \l__jlreq_tmpa_bool + \str_if_in:NnT \l__jlreq_tmpa_str { after_space= } { \bool_set_true:N \l__jlreq_tmpa_bool } + \str_if_in:NnT \l__jlreq_tmpa_str { after_space~= } { \bool_set_true:N \l__jlreq_tmpa_bool } + \bool_if:NT \l__jlreq_tmpa_bool {\tl_put_left:Nn \l__jlreq_tmpa_tl {after_lines={},}} } } \cs_set:Nx \l_jlreq_do: { @@ -3998,7 +4028,7 @@ % \jlreq@resultboxに整形結果を返す(垂直ボックス).見つからなかったらvoid.\globalに設定する. \long\def\jlreq@inlinenote@determinelength#1#2#3#4#5#6#7{% \begingroup - % \message{#1 の試行開始,行数 = #5, \the\dimexpr#6\relax から \the\dimexpr#7\relaxまで}% +% \message{#1 の試行開始,行数 = #5, \the\dimexpr#6\relax から \the\dimexpr#7\relax まで(長さ\the\dimexpr #7 - #6\relax )}% \@tempcnta=1\relax \def\@tempa{}% % 調整に使う行の\parshape指定を\@tempaに入れる.長さは\jlreq@tempdima. @@ -4019,12 +4049,12 @@ \parindent=0pt\leftskip=0pt\rightskip=0pt \parshape #5~#3~\@tempa 0pt~\the\maxdimen #1\par\global\@tempcntb=\prevgraf}% - % \message{\string\jlreq@tempdima = \the\jlreq@tempdima で試行,行数は\the\@tempcntb , 書式 #5 #3 \@tempa 0pt \the\maxdimen}% +% \message{\string\jlreq@tempdima = \the\jlreq@tempdima で試行,行数は\the\@tempcntb , 書式~#5~#3~\@tempa~0pt~\the\maxdimen}% \fi \jlreq@getlastbox{\@tempboxa}% \setbox\jlreq@tempboxa=\box\jlreq@resultbox \ifnum\@tempcntb<#5\relax% 行数が達していないならOK - % \message{行数 = \the\@tempcntb により確定} +% \message{行数 = \the\@tempcntb により確定} % #5行になるまで空の水平ボックスを加えていく. \global\setbox\jlreq@resultbox=\vbox{#2% \unvbox\@tempboxa\hbox{\unhbox\jlreq@tempboxa\unskip\unskip\unpenalty}% @@ -4034,7 +4064,7 @@ % そうでない場合は最後の二行の長さを比較する \jlreq@getlastbox{\@tempboxa}% \setbox\jlreq@tempboxb=\box\jlreq@resultbox - % \message{最終行の長さ \the\wd\jlreq@tempboxa, その前の長さ \the\wd\jlreq@tempboxb}% +% \message{最終行の長さ \the\wd\jlreq@tempboxa, その前の長さ \the\wd\jlreq@tempboxb}% \ifdim\wd\jlreq@tempboxa>\wd\jlreq@tempboxb \advance\jlreq@tempdima by 0.3pt\relax% 0.3ptに意味はない \else @@ -6194,17 +6224,17 @@ \ltj@setpar@global \cs_set:Nn \l_jlreq_do: {} \tl_if_empty:nF {#1} { - \skip_set:Nn \l_jlreq_tmpa_skip { #1 } + \skip_set:Nn \l__jlreq_tmpa_skip { #1 } \cs_set:Nx \l_jlreq_do: { \exp_not:o \l_jlreq_do: - \exp_not:N \cs_set:Npn \exp_not:N \jlreqkanjiskip { \skip_use:N \l_jlreq_tmpa_skip } - \exp_not:N \ltjsetkanjiskip \skip_use:N \l_jlreq_tmpa_skip + \exp_not:N \cs_set:Npn \exp_not:N \jlreqkanjiskip { \skip_use:N \l__jlreq_tmpa_skip } + \exp_not:N \ltjsetkanjiskip \skip_use:N \l__jlreq_tmpa_skip } } \tl_if_empty:nF {#2} { - \skip_set:Nn \l_jlreq_tmpa_skip { #2 } + \skip_set:Nn \l__jlreq_tmpa_skip { #2 } \cs_set:Nx \l_jlreq_do: { \exp_not:o \l_jlreq_do: - \exp_not:N \cs_set:Npn \exp_not:N \jlreqxkanjiskip { \skip_use:N \l_jlreq_tmpa_skip } - \exp_not:N \ltjsetxkanjiskip \skip_use:N \l_jlreq_tmpa_skip + \exp_not:N \cs_set:Npn \exp_not:N \jlreqxkanjiskip { \skip_use:N \l__jlreq_tmpa_skip } + \exp_not:N \ltjsetxkanjiskip \skip_use:N \l__jlreq_tmpa_skip } } \exp_after:wN \group_end: @@ -6215,17 +6245,17 @@ \group_begin: \cs_set:Nn \l_jlreq_do: {} \tl_if_empty:nF {#1} { - \skip_set:Nn \l_jlreq_tmpa_skip { #1 } + \skip_set:Nn \l__jlreq_tmpa_skip { #1 } \cs_set:Nx \l_jlreq_do: { \exp_not:o \l_jlreq_do: - \exp_not:N \cs_set:Npx \exp_not:N \jlreqkanjiskip { \skip_use:N \l_jlreq_tmpa_skip } - \exp_not:N \skip_set:Nn \exp_not:N \kanjiskip { \skip_use:N \l_jlreq_tmpa_skip } + \exp_not:N \cs_set:Npx \exp_not:N \jlreqkanjiskip { \skip_use:N \l__jlreq_tmpa_skip } + \exp_not:N \skip_set:Nn \exp_not:N \kanjiskip { \skip_use:N \l__jlreq_tmpa_skip } } } \tl_if_empty:nF {#2} { - \skip_set:Nn \l_jlreq_tmpa_skip { #2 } + \skip_set:Nn \l__jlreq_tmpa_skip { #2 } \cs_set:Nx \l_jlreq_do: { \exp_not:o \l_jlreq_do: - \exp_not:N \cs_set:Npx \exp_not:N \jlreqxkanjiskip { \skip_use:N \l_jlreq_tmpa_skip } - \exp_not:N \skip_set:Nn \exp_not:N \xkanjiskip { \skip_use:N \l_jlreq_tmpa_skip } + \exp_not:N \cs_set:Npx \exp_not:N \jlreqxkanjiskip { \skip_use:N \l__jlreq_tmpa_skip } + \exp_not:N \skip_set:Nn \exp_not:N \xkanjiskip { \skip_use:N \l__jlreq_tmpa_skip } } } \exp_after:wN \group_end: diff --git a/Master/texmf-dist/tex/latex/jsonparse/jsonparse.sty b/Master/texmf-dist/tex/latex/jsonparse/jsonparse.sty index 680e89bfcac..7905c53d790 100644 --- a/Master/texmf-dist/tex/latex/jsonparse/jsonparse.sty +++ b/Master/texmf-dist/tex/latex/jsonparse/jsonparse.sty @@ -10,15 +10,16 @@ % % This work has the LPPL maintenance status `maintained'. % -\ProvidesExplPackage {jsonparse} {2024-04-28} {0.8.3} +\ProvidesExplPackage {jsonparse} {2024-08-27} {0.9.0} {JSON Parse} \bool_new:N \l__jsonparse_debug_mode_bool -\keys_define:nn { jsonparse } { +\keys_define:nn { jsonparse / global } { debug .bool_set:N = \l__jsonparse_debug_mode_bool , debug .default:n = { true } , + debug .initial:n = { false } } -\ProcessKeyOptions [ jsonparse ] +\ProcessKeyOptions [ jsonparse / global ] \msg_new:nnn { jsonparse } { debug-info } { #1 @@ -43,7 +44,7 @@ \msg_new:nnn { jsonparse } { file-exists } { \msg_error_text:n { jsonparse } \iow_newline: - File ~ #1 ~ already ~ existing. + File ~ #1 ~ already ~ existing. } \msg_new:nnn { jsonparse } { escape-in-key } { @@ -56,6 +57,11 @@ Escape ~ character ~ #1 ~ not ~ found. } +\msg_new:nnn { jsonparse } { unknown-key } { + \msg_warning_text:n { jsonparse } \iow_newline: + Ignoring ~ unknown ~ key: ~ #1. +} + \msg_new:nnn { jsonparse } { saving-external } { \msg_info_text:n { jsonparse } \iow_newline: Saving ~ external ~ file: ~ #1. @@ -67,14 +73,21 @@ } % === - + +\str_new:N \l_jsonparse_externalize_prefix_str +\str_new:N \l_jsonparse_current_prop_str + +\tl_new:N \l__jsonparse_externalize_file_name_tl + \str_new:N \l__jsonparse_child_sep_str \str_new:N \l__jsonparse_array_sep_left_str \str_new:N \l__jsonparse_array_sep_right_str \str_new:N \l__jsonparse_true_str \str_new:N \l__jsonparse_false_str \str_new:N \l__jsonparse_null_str -\bool_new:N \l__jsonparse_array_index_zero_based_bool +\bool_new:N \l__jsonparse_zero_based_bool +\bool_new:N \l__jsonparse_rescan_bool +\bool_new:N \l__jsonparse_externalize_bool \str_new:N \l__jsonparse_backspace_str \str_new:N \l__jsonparse_formfeed_str @@ -82,6 +95,8 @@ \str_new:N \l__jsonparse_carriage_return_str \str_new:N \l__jsonparse_horizontal_tab_str +\clist_new:N \l__jsonparse_unused_keys_clist + \clist_new:N \l__jsonparse_escape_tex_chars_clist \clist_set:Nn \l__jsonparse_escape_tex_chars_clist { number_sign , @@ -98,35 +113,48 @@ \bool_new:c { l__jsonparse_escape_ #1 _bool } } -\keys_define:nn { jsonparse } { - array ~ index ~ zero-based .bool_set:N = \l__jsonparse_array_index_zero_based_bool , - array ~ index ~ zero-based .default:n = { true } , - array ~ index ~ zero-based .initial:n = { true } , - separator .code:n = { \keys_set:nn { jsonparse / separator } {#1} }, - separator / child .str_set:N = \l__jsonparse_child_sep_str , - separator / child .initial:n = { . } , - separator / array ~ left .str_set:N = \l__jsonparse_array_sep_left_str , - separator / array ~ left .initial:n = { [ } , - separator / array ~ right .str_set:N = \l__jsonparse_array_sep_right_str , - separator / array ~ right .initial:n = { ] } , - replacement .code:n = { \keys_set:nn { jsonparse / replacement } {#1} }, - replacement / true .str_set:N = \l__jsonparse_true_str , - replacement / true .initial:n = { true } , - replacement / false .str_set:N = \l__jsonparse_false_str , - replacement / false .initial:n = { false } , - replacement / null .str_set:N = \l__jsonparse_null_str , - replacement / null .initial:n = { null } , - replacement / backspace .str_set:N = \l__jsonparse_backspace_str , - replacement / backspace .initial:n = { ~ } , - replacement / formfeed .str_set:N = \l__jsonparse_formfeed_str , - replacement / formfeed .initial:n = { ~ } , - replacement / linefeed .str_set:N = \l__jsonparse_linefeed_str , - replacement / linefeed .initial:n = { ~ } , - replacement / carriage ~ return .str_set:N = \l__jsonparse_carriage_return_str , - replacement / carriage ~ return .initial:n = { ~ } , - replacement / horizontal ~ tab .str_set:N = \l__jsonparse_horizontal_tab_str , - replacement / horizontal ~ tab .initial:n = { ~ } , - escape .code:n = { +\keys_define:nn { jsonparse / parse } { + externalize .bool_set:N = \l__jsonparse_externalize_bool , + externalize .default:n = { true } , + externalize .initial:n = { false } , + externalize ~ prefix .str_set:N = \l_jsonparse_externalize_prefix_str , + externalize ~ prefix .initial:n = { } , + externalize ~ file ~ name .tl_set:N = \l__jsonparse_externalize_file_name_tl , + externalize ~ file ~ name .initial:n = { + \l_jsonparse_externalize_prefix_str \c_sys_jobname_str \c_underscore_str \l_jsonparse_current_prop_str + } , + separator .code:n = { \keys_set:nn { jsonparse / parse / separator } {#1} } , + separator / child .str_set:N = \l__jsonparse_child_sep_str , + separator / child .initial:n = { . } , + separator / array ~ left .str_set:N = \l__jsonparse_array_sep_left_str , + separator / array ~ left .initial:n = { [ } , + separator / array ~ right .str_set:N = \l__jsonparse_array_sep_right_str , + separator / array ~ right .initial:n = { ] } , + zero-based .bool_set:N = \l__jsonparse_zero_based_bool , + zero-based .default:n = { true } , + zero-based .initial:n = { true } , + replace .code:n = { \keys_set:nn { jsonparse / parse / replace } {#1} } , + replace / true .str_set:N = \l__jsonparse_true_str , + replace / true .initial:n = { true } , + replace / false .str_set:N = \l__jsonparse_false_str , + replace / false .initial:n = { false } , + replace / null .str_set:N = \l__jsonparse_null_str , + replace / null .initial:n = { null } +} + +\keys_define:nn { jsonparse / typeset } { + replace .code:n = { \keys_set:nn { jsonparse / typeset / replace } {#1} } , + replace / backspace .str_set:N = \l__jsonparse_backspace_str , + replace / backspace .initial:n = { ~ } , + replace / formfeed .str_set:N = \l__jsonparse_formfeed_str , + replace / formfeed .initial:n = { ~ } , + replace / linefeed .str_set:N = \l__jsonparse_linefeed_str , + replace / linefeed .initial:n = { ~ } , + replace / carriage ~ return .str_set:N = \l__jsonparse_carriage_return_str , + replace / carriage ~ return .initial:n = { ~ } , + replace / horizontal ~ tab .str_set:N = \l__jsonparse_horizontal_tab_str , + replace / horizontal ~ tab .initial:n = { ~ } , + escape .code:n = { \str_case:nnF {#1} { { all } { \clist_map_inline:Nn \l__jsonparse_escape_tex_chars_clist { @@ -168,11 +196,27 @@ } } } + } , + escape .groups:n = { output } , + rescan .bool_set:N = \l__jsonparse_rescan_bool , + rescan .default:n = { true } , + rescan .initial:n = { true } , + rescan .groups:n = { output } +} + +\cs_new:Npn \__jsonparse_warning_unused_keys: { + \clist_map_inline:Nn \l__jsonparse_unused_keys_clist { + \msg_warning:nne { jsonparse } { unknown-key } { + ##1 + } } } \NewDocumentCommand { \JSONParseSet } { m } { - \keys_set:nn { jsonparse } {#1} + \keys_set_known:nnN { jsonparse / global } {#1} \l__jsonparse_unused_keys_clist + \keys_set_known:noN { jsonparse / parse } { \l__jsonparse_unused_keys_clist } \l__jsonparse_unused_keys_clist + \keys_set_known:noN { jsonparse / typeset } { \l__jsonparse_unused_keys_clist } \l__jsonparse_unused_keys_clist + \__jsonparse_warning_unused_keys: } % === @@ -181,6 +225,7 @@ \cs_new:Npn \str_casefold:n { \str_foldcase:n } } +\cs_generate_variant:Nn \file_input:n { e } \cs_generate_variant:Nn \tl_gset_rescan:Nnn { Nne } \cs_generate_variant:Nn \tl_range:nnn { nne , nen } \cs_generate_variant:Nn \tl_range:Nnn { Nne , Nen } @@ -193,14 +238,20 @@ \cs_generate_variant:Nn \str_case_e:nn { en } \cs_generate_variant:Nn \str_casefold:n { o } \cs_generate_variant:Nn \str_head_ignore_spaces:n { o } +\cs_generate_variant:Nn \str_set:Nn { Ne } \cs_generate_variant:Nn \prop_gput:Nnn { Nee } \cs_generate_variant:Nn \prop_item:Nn { Ne , ce } \cs_generate_variant:Nn \prop_put:Nnn { Nen , Nee } +\cs_generate_variant:Nn \keys_set_known:nnN { noN } \cs_generate_variant:Nn \iow_now:Nn { Ne } +\cs_generate_variant:Nn \iow_open:Nn { Ne } \cs_generate_variant:Nn \msg_error:nnn { nno } \cs_generate_variant:Nn \msg_error:nnnn { nnoo } +\cs_generate_variant:Nn \msg_info:nnn { nne } \cs_generate_variant:Nn \msg_log:nnn { nne } +\cs_generate_variant:Nn \msg_warning:nnn { nne } +\prg_generate_conditional_variant:Nnn \file_if_exist:n { e } { T , TF } \prg_generate_conditional_variant:Nnn \tl_if_eq:nn { en } { T } \prg_generate_conditional_variant:Nnn \tl_if_head_eq_charcode:nN { oN } { T , TF } \prg_generate_conditional_variant:Nnn \tl_if_in:nn { nV } { F } @@ -224,7 +275,7 @@ \int_new:N \l__jsonparse_array_count_last_int \bool_new:N \l__jsonparse_prop_map_first_bool -\bool_new:N \l__jsonparse_load_external_bool +\bool_new:N \l__jsonparse_externalize_load_bool \ior_new:N \l__jsonparse_json_ior \iow_new:N \g__jsonparse_externalize_iow @@ -366,10 +417,10 @@ \bool_if:NT \l__jsonparse_debug_mode_bool { \msg_log:nnn { jsonparse } { debug-info } { (arr ~ begin) - } + } } \int_zero:N \l__jsonparse_array_index_int - \bool_if:NT \l__jsonparse_array_index_zero_based_bool { + \bool_if:NT \l__jsonparse_zero_based_bool { \int_decr:N \l__jsonparse_array_index_int } \tl_set_eq:NN \l__jsonparse_object_array_key_tl \l__jsonparse_key_tl @@ -412,7 +463,7 @@ \tl_if_head_eq_charcode:oNTF { \l__jsonparse_remainder_tl } : { \tl_remove_once:NV \l__jsonparse_remainder_tl \c_colon_str \tl_set:Ne \l__jsonparse_key_tl { \l__jsonparse_prefix_tl #1 } - } { + } { \tl_set:Nn \l__jsonparse_val_tl {#1} \prop_gput:Nee \g_jsonparse_entries_prop { \l__jsonparse_key_tl } { \l__jsonparse_val_tl } @@ -515,7 +566,7 @@ \tl_if_empty:NF \l__jsonparse_remainder_tl { \exp_args:No \jsonparse_parse:n { \l__jsonparse_remainder_tl } } -} +} \cs_new_protected:Npn \jsonparse_filter:Nn #1#2 { \prop_clear:N \l__jsonparse_temp_prop @@ -542,98 +593,118 @@ \prop_if_exist:NF #1 { \prop_new:N #1 } - \prop_gput:Nnn #1 { #2 } { #3 } + \prop_gput:Nnn #1 {#2} {#3} } \cs_new:Npn \__jsonparse_externalize:Nn #1#2 { - \file_if_exist:nTF {#2} { - \msg_error:nnn { jsonparse } { file-exists } + \file_if_exist:eTF {#2} { + \msg_error:nne { jsonparse } { file-exists } {#2} } { - \iow_open:Nn \g__jsonparse_externalize_iow {#2} + \iow_open:Ne \g__jsonparse_externalize_iow {#2} \prop_map_inline:Nn #1 { \iow_now:Nn \g__jsonparse_externalize_iow { \JSONParsePut {#1} {##1} {##2} } } \iow_close:N \g__jsonparse_externalize_iow - \msg_info:nnn { jsonparse } { saving-external } + \msg_info:nne { jsonparse } { saving-external } {#2} } } % === -\NewDocumentCommand { \JSONParse } { o m +v } { - \bool_set_false:N \l__jsonparse_load_external_bool - \tl_if_novalue:nF {#1} { - \file_if_exist:nT { #1 .jsonparse } { - \bool_set_true:N \l__jsonparse_load_external_bool - } +\cs_new:Npn \__json_nested_construct_cs:Nnn #1 #2 #3 { + \cs_set:Npn #1 #2 ##1 #3 #2 ##2 #3 { + \prop_item:ce {##1} {##2} } - \bool_if:NTF \l__jsonparse_load_external_bool { - \msg_info:nnn { jsonparse } { loading-external } - { #1 .jsonparse } - \file_input:n { #1 .jsonparse } - } { - \prop_new:N #2 - \tl_gclear:N \g__jsonparse_json_tl - \group_begin: - \cs_set:Npn \" { \exp_not:N \" } - \cs_set:Npn \/ { \exp_not:N \/ } - \cs_set:Npn \\ { \exp_not:N \\ } - \cs_set:Npn \b { \exp_not:N \b } - \cs_set:Npn \f { \exp_not:N \f } - \cs_set:Npn \n { \exp_not:N \n } - \cs_set:Npn \r { \exp_not:N \r } - \cs_set:Npn \t { \exp_not:N \t } - \cs_set:Npn \u { \exp_not:N \u } - \cs_set:Npn \x [ ##1 ] [ ##2 ] { \prop_item:ce {##1} {##2} } - \tl_gset_rescan:Nne \g__jsonparse_json_tl { \cctab_select:N \c__jsonparse_json_escape_cctab } {#3} - \exp_args:NNe \jsonparse_parse_to_prop:Nn #2 { \g__jsonparse_json_tl } - \group_end: - \tl_if_novalue:nF {#1} { - \__jsonparse_externalize:Nn #2 { #1 .jsonparse } +} +\cs_generate_variant:Nn \__json_nested_construct_cs:Nnn { Noo } + +\NewDocumentCommand { \JSONParse } { O{} m +v } { + \group_begin: + \str_set:Ne \l_jsonparse_current_prop_str { \cs_to_str:N #2 } + \keys_set_known:nnN { jsonparse / global } {#1} \l__jsonparse_unused_keys_clist + \keys_set_known:noN { jsonparse / parse } { \l__jsonparse_unused_keys_clist } \l__jsonparse_unused_keys_clist + \__jsonparse_warning_unused_keys: + \bool_set_false:N \l__jsonparse_externalize_load_bool + \bool_if:NT \l__jsonparse_externalize_bool { + \file_if_exist:eT { \l__jsonparse_externalize_file_name_tl .jsonparse } { + \bool_set_true:N \l__jsonparse_externalize_load_bool + } } - } + \bool_if:NTF \l__jsonparse_externalize_load_bool { + \msg_info:nne { jsonparse } { loading-external } + { \l__jsonparse_externalize_file_name_tl .jsonparse } + \file_input:e { \l__jsonparse_externalize_file_name_tl .jsonparse } + } { + \prop_new:N #2 + \tl_gclear:N \g__jsonparse_json_tl + \group_begin: + \cs_set:Npn \" { \exp_not:N \" } + \cs_set:Npn \/ { \exp_not:N \/ } + \cs_set:Npn \\ { \exp_not:N \\ } + \cs_set:Npn \b { \exp_not:N \b } + \cs_set:Npn \f { \exp_not:N \f } + \cs_set:Npn \n { \exp_not:N \n } + \cs_set:Npn \r { \exp_not:N \r } + \cs_set:Npn \t { \exp_not:N \t } + \cs_set:Npn \u { \exp_not:N \u } + \__json_nested_construct_cs:Noo \x \c_left_brace_str \c_right_brace_str + \tl_set:Nn \obeyedline { ~ } + \tl_gset_rescan:Nne \g__jsonparse_json_tl { \cctab_select:N \c__jsonparse_json_escape_cctab } {#3} + \exp_args:NNe \jsonparse_parse_to_prop:Nn #2 { \g__jsonparse_json_tl } + \group_end: + \bool_if:NT \l__jsonparse_externalize_bool { + \__jsonparse_externalize:Nn #2 { \l__jsonparse_externalize_file_name_tl .jsonparse } + } + } + \group_end: } -\NewDocumentCommand { \JSONParseFromFile } { o m m } { +\NewDocumentCommand { \JSONParseFromFile } { O{} m m } { \file_if_exist:nF {#3} { \msg_error:nnn { jsonparse } { file-not-found } {#3} } - \bool_set_false:N \l__jsonparse_load_external_bool - \tl_if_novalue:nF {#1} { - \file_if_exist:nT { #1 .jsonparse } { - \bool_set_true:N \l__jsonparse_load_external_bool + \group_begin: + \str_set:Ne \l_jsonparse_current_prop_str { \cs_to_str:N #2 } + \keys_set_known:nnN { jsonparse / global } {#1} \l__jsonparse_unused_keys_clist + \keys_set_known:noN { jsonparse / parse } { \l__jsonparse_unused_keys_clist } \l__jsonparse_unused_keys_clist + \__jsonparse_warning_unused_keys: + \bool_set_false:N \l__jsonparse_externalize_load_bool + \bool_if:NT \l__jsonparse_externalize_bool { + \file_if_exist:eT { \l__jsonparse_externalize_file_name_tl .jsonparse } { + \bool_set_true:N \l__jsonparse_externalize_load_bool + } } - } - \bool_if:NTF \l__jsonparse_load_external_bool { - \msg_info:nnn { jsonparse } { loading-external } - { #1 .jsonparse } - \file_input:n { #1 .jsonparse } - } { - \prop_new:N #2 - \tl_gclear:N \g__jsonparse_json_tl - \group_begin: - \cs_set:Npn \" { \exp_not:N \" } - \cs_set:Npn \/ { \exp_not:N \/ } - \cs_set:Npn \\ { \exp_not:N \\ } - \cs_set:Npn \b { \exp_not:N \b } - \cs_set:Npn \f { \exp_not:N \f } - \cs_set:Npn \n { \exp_not:N \n } - \cs_set:Npn \r { \exp_not:N \r } - \cs_set:Npn \t { \exp_not:N \t } - \cs_set:Npn \u { \exp_not:N \u } - \cs_set:Npn \x [ ##1 ] [ ##2 ] { \prop_item:ce {##1} {##2} } - \file_get:nnN {#3} { \cctab_select:N \c__jsonparse_json_escape_cctab } \g__jsonparse_json_tl - \exp_args:NNe \jsonparse_parse_to_prop:Nn #2 { \g__jsonparse_json_tl } - \group_end: - \tl_if_novalue:nF {#1} { - \__jsonparse_externalize:Nn #2 { #1 .jsonparse } + \bool_if:NTF \l__jsonparse_externalize_load_bool { + \msg_info:nne { jsonparse } { loading-external } + { \l__jsonparse_externalize_file_name_tl .jsonparse } + \file_input:e { \l__jsonparse_externalize_file_name_tl .jsonparse } + } { + \prop_new:N #2 + \tl_gclear:N \g__jsonparse_json_tl + \group_begin: + \cs_set:Npn \" { \exp_not:N \" } + \cs_set:Npn \/ { \exp_not:N \/ } + \cs_set:Npn \\ { \exp_not:N \\ } + \cs_set:Npn \b { \exp_not:N \b } + \cs_set:Npn \f { \exp_not:N \f } + \cs_set:Npn \n { \exp_not:N \n } + \cs_set:Npn \r { \exp_not:N \r } + \cs_set:Npn \t { \exp_not:N \t } + \cs_set:Npn \u { \exp_not:N \u } + \cs_set:Npn \x [ ##1 ] [ ##2 ] { \prop_item:ce {##1} {##2} } + \file_get:nnN {#3} { \cctab_select:N \c__jsonparse_json_escape_cctab } \g__jsonparse_json_tl + \exp_args:NNe \jsonparse_parse_to_prop:Nn #2 { \g__jsonparse_json_tl } + \group_end: + \bool_if:NT \l__jsonparse_externalize_bool { + \__jsonparse_externalize:Nn #2 { \l__jsonparse_externalize_file_name_tl .jsonparse } + } } - } + \group_end: } \NewExpandableDocumentCommand { \JSONParseExpandableValue } { m m } { @@ -682,12 +753,16 @@ \group_end: } -\NewDocumentCommand { \JSONParseValue } { s m m } { - \bool_if:NTF #1 { - \prop_item:Ne #2 {#3} - } { - \exp_args:Ne \__jsonparse_rescan:n { \prop_item:Ne #2 {#3} } - } +\NewDocumentCommand { \JSONParseValue } { O{} m m } { + \group_begin: + \keys_set_known:nn { jsonparse / typeset } {#1} \l__jsonparse_unused_keys_clist + \__jsonparse_warning_unused_keys: + \bool_if:NTF \l__jsonparse_rescan_bool { + \exp_args:Ne \__jsonparse_rescan:n { \prop_item:Ne #2 {#3} } + } { + \prop_item:Ne #2 {#3} + } + \group_end: } \NewDocumentCommand { \JSONParseKeys } { m m } { @@ -700,7 +775,7 @@ \tl_if_in:nVF {##1} \l__jsonparse_child_sep_str { \bool_if:NTF \l__jsonparse_prop_map_first_bool { \bool_set_false:N \l__jsonparse_prop_map_first_bool - } { + } { \tl_put_right:Nn \l__jsonparse_temp_tl { , } } \tl_put_right:Nn \l__jsonparse_temp_tl { " ##1 " } @@ -710,8 +785,10 @@ \tl_set_eq:NN #2 \l__jsonparse_temp_tl } -\NewDocumentCommand { \JSONParseArrayValues } { s m m O{} m } { +\NewDocumentCommand { \JSONParseArrayValues } { O{} m m O{} m } { \group_begin: + \keys_set_known:nn { jsonparse / typeset } {#1} \l__jsonparse_unused_keys_clist + \__jsonparse_warning_unused_keys: \tl_set:Nn \l__jsonparse_temp_tl {#2} \jsonparse_filter:Nn \l__jsonparse_temp_tl {#3} \bool_set_true:N \l__jsonparse_prop_map_first_bool @@ -721,13 +798,13 @@ } {#4} { \bool_if:NTF \l__jsonparse_prop_map_first_bool { \bool_set_false:N \l__jsonparse_prop_map_first_bool - } { + } { #5 } - \bool_if:NTF #1 { - ##2 - } { + \bool_if:NTF \l__jsonparse_rescan_bool { \__jsonparse_rescan:n {##2} + } { + ##2 } } } @@ -759,10 +836,12 @@ \tl_new:N \JSONParseArrayIndex \tl_new:N \JSONParseArrayKey -\tl_new:N \JSONParseArrayValue +\tl_new:N \JSONParseArrayValue -\NewDocumentCommand { \JSONParseArrayValuesMap } { s m m O{} m } { +\NewDocumentCommand { \JSONParseArrayValuesMap } { O{} m m O{} m } { \group_begin: + \keys_set_known:nn { jsonparse / typeset } {#1} \l__jsonparse_unused_keys_clist + \__jsonparse_warning_unused_keys: \jsonparse_filter:Nn #2 {#3} \prop_map_inline:Nn #2 { \str_if_eq:enT { @@ -771,10 +850,10 @@ \int_incr:N \l__jsonparse_array_index_int \tl_set:Ne \JSONParseArrayIndex { \__jsonparse_get_array_index:w ##1 \q_stop } \tl_set:Nn \JSONParseArrayKey {##1} - \bool_if:NTF #1 { - \tl_set:Nn \JSONParseArrayValue { \prop_item:Nn #2 {##1} } - } { + \bool_if:NTF \l__jsonparse_rescan_bool { \tl_set:Nn \JSONParseArrayValue { \exp_args:Ne \__jsonparse_rescan:n { \prop_item:Nn #2 {##1} } } + } { + \tl_set:Nn \JSONParseArrayValue { \prop_item:Nn #2 {##1} } } \use:c {#5} } diff --git a/Master/texmf-dist/tex/latex/jwjournal/jwjournal.cls b/Master/texmf-dist/tex/latex/jwjournal/jwjournal.cls index 3b968ce12e7..3e84c935ba2 100644 --- a/Master/texmf-dist/tex/latex/jwjournal/jwjournal.cls +++ b/Master/texmf-dist/tex/latex/jwjournal/jwjournal.cls @@ -1,6 +1,6 @@ %% -%% Copyright (C) 2023 by Jinwen XU -%% ------------------------------- +%% Copyright (C) 2023-2024 by Jinwen XU +%% ------------------------------------ %% %% This file may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3c of this license @@ -12,7 +12,7 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplClass {jwjournal} - {2023/12/19} {} + {2024/09/01} {} {JW's journal class} \keys_define:nn { jwjournal } @@ -33,11 +33,11 @@ \sys_if_engine_pdftex:TF { - \PassOptionsToClass { use indent = false } { minimart } + % \PassOptionsToClass { use indent = false } { minimart } \LoadClass { minimart } } { - \PassOptionsToClass { use indent = false } { einfart } + % \PassOptionsToClass { use indent = false } { einfart } \LoadClass { einfart } } @@ -554,14 +554,14 @@ } \regex_replace_once:nnN { ❄️ (.*) ❄️ } { ❄️ \1 } \l_jwjournal_tmp_tl - \regex_replace_once:nnN - { ❄️ (\ *)? (\d{4}-\d{1,2}-\d{1,2}) (\ *)? (.*) } - { \c{JWJournalEntry} {\2} {\4} } - \l_jwjournal_tmp_tl - \regex_replace_once:nnN - { ❄️ (\ *)? (\d{1,2}-\d{1,2}-\d{4}) (\ *)? (.*) } - { \c{JWJournalEntry} {\2} {\4} } - \l_jwjournal_tmp_tl + % \regex_replace_once:nnN + % { ❄️ (\ *)? (\d{4}-\d{1,2}-\d{1,2}) (\ *)? (.*) } + % { \c{JWJournalEntry} {\2} {\4} } + % \l_jwjournal_tmp_tl + % \regex_replace_once:nnN + % { ❄️ (\ *)? (\d{1,2}-\d{1,2}-\d{4}) (\ *)? (.*) } + % { \c{JWJournalEntry} {\2} {\4} } + % \l_jwjournal_tmp_tl \regex_replace_once:nnN { ❄️ (\ *)? (\d{4} \D \d{1,2} \D \d{1,2}) (\ *)? (.*) } { \c{JWJournalEntry} {\2} {\4} } diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index 95e0590b7bb..65410663d9c 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex @@ -75,7 +75,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2024-05-27}% +\def\ExplFileDate{2024-08-16}% \begingroup \def\next{\endgroup}% \expandafter\ifx\csname PackageError\endcsname\relax @@ -8385,8 +8385,8 @@ Type H <return> for immediate help}\def~{\errmessage{% \cs_new:Npn \__clist_remove_all: { \exp_after:wN \__clist_remove_all:w \__clist_tmp:w , } \cs_new:Npn \__clist_remove_all:w #1 , \s__clist_mark , #2 , { \exp_not:n {#1} } -\cs_generate_variant:Nn \clist_remove_all:Nn { c , NV , cV } -\cs_generate_variant:Nn \clist_gremove_all:Nn { c , NV , cV } +\cs_generate_variant:Nn \clist_remove_all:Nn { c , NV , cV , Ne , ce } +\cs_generate_variant:Nn \clist_gremove_all:Nn { c , NV , cV , Ne , ce } \cs_new_protected:Npn \clist_reverse:N #1 { \__kernel_tl_set:Nx #1 { \exp_args:No \clist_reverse:n {#1} } } \cs_new_protected:Npn \clist_greverse:N #1 @@ -13859,8 +13859,8 @@ Type H <return> for immediate help}\def~{\errmessage{% { \bool_if:NTF \l__keys_no_value_bool { - \exp_after:wN \__keys_define_code:w - \l__keys_property_str \s__keys_stop + \__keys_define_code:nnn + { \use:c { \c__keys_props_root_str \l__keys_property_str } {#1} } { \use:c { \c__keys_props_root_str \l__keys_property_str } } { \msg_error:nnee { keys } { property-requires-value } @@ -13869,9 +13869,27 @@ Type H <return> for immediate help}\def~{\errmessage{% } { \use:c { \c__keys_props_root_str \l__keys_property_str } {#1} } } -\exp_last_unbraced:NNNNo - \cs_new:Npn \__keys_define_code:w #1 \c_colon_str #2 \s__keys_stop - { \tl_if_empty:nTF {#2} } +\cs_new:Npe \__keys_define_code:nnn + { + \exp_not:N \exp_after:wN \exp_not:N \__keys_define_code:w + \exp_not:N \l__keys_property_str + \c_colon_str \c_colon_str + \exp_not:N \s__keys_stop + } +\use:e + { + \cs_new:Npn \exp_not:N \__keys_define_code:w + #1 \c_colon_str #2 \c_colon_str #3 \exp_not:N \s__keys_stop + } + { + \tl_if_empty:nTF {#3} + { \use_i:nnn } + { + \tl_if_empty:nTF {#2} + { \use_ii:nnn } + { \use_iii:nnn } + } + } \cs_new_protected:Npn \__keys_bool_set:Nn #1#2 { \__keys_bool_set:Nnnn #1 {#2} { true } { false } } \cs_generate_variant:Nn \__keys_bool_set:Nn { c } @@ -37377,10 +37395,10 @@ Type H <return> for immediate help}\def~{\errmessage{% { \text_uppercase:nn {#1} {#2} } \__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \text_titlecase_first:n } \cs_new:Npn \tl_mixed_case:n #1 - { \text_titlecase_first:n {#1} } + { \text_titlecase_first:n { \text_lowercase:n {#1} } } \__kernel_patch_deprecation:nnNNpn { 2020-01-03 } { \text_titlecase_first:nn } \cs_new:Npn \tl_mixed_case:nn #1#2 - { \text_titlecase_first:nn {#1} {#2} } + { \text_titlecase_first:nn {#1} { \text_lowercase:n {#2} } } \__kernel_patch_deprecation:nnNNpn { 2022-05-23 } { \token_case_meaning:Nn } \cs_new:Npn \tl_case:Nn { \token_case_meaning:Nn } \__kernel_patch_deprecation:nnNNpn { 2022-05-23 } { \token_case_meaning:NnT } diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex index 851886310a1..1e41f14175f 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2024-05-27}% +\def\ExplFileDate{2024-08-16}% \let\ExplLoaderFileDate\ExplFileDate \begingroup \catcode`\_=11 diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx index d7d58039ca2..21973d42724 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2024-05-27}% +\def\ExplFileDate{2024-08-16}% \let\ExplLoaderFileDate\ExplFileDate \begingroup \catcode`\_=11 diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty index cf17f7356be..89f821ea47d 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: expl3.dtx -\def\ExplFileDate{2024-05-27}% +\def\ExplFileDate{2024-08-16}% \let\ExplLoaderFileDate\ExplFileDate \ProvidesPackage{expl3} [% diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3debug.def b/Master/texmf-dist/tex/latex/l3kernel/l3debug.def index 6c0cdc45d0f..5f6a49a2e54 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3debug.def +++ b/Master/texmf-dist/tex/latex/l3kernel/l3debug.def @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: l3debug.dtx -\ProvidesExplFile{l3debug.def}{2024-05-27}{}{L3 Debugging support} +\ProvidesExplFile{l3debug.def}{2024-08-16}{}{L3 Debugging support} \scan_new:N \s__debug_stop \cs_new:Npn \__debug_use_i_delimit_by_s_stop:nw #1 #2 \s__debug_stop {#1} \quark_new:N \q__debug_recursion_tail diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls index 34540214876..d5cc46eb6b0 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls +++ b/Master/texmf-dist/tex/latex/l3kernel/l3doc.cls @@ -20,7 +20,7 @@ %% %% File: l3doc.dtx \RequirePackage{calc} -\ProvidesExplClass{l3doc}{2024-05-27}{} +\ProvidesExplClass{l3doc}{2024-08-16}{} {L3 Experimental documentation class} \clist_new:N \g_docinput_clist \seq_new:N \g_doc_functions_seq diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty index 23dc455743d..0b83c0dd3f7 100644 --- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty +++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty @@ -32,7 +32,7 @@ }% \endinput } -\ProvidesExplPackage{l3keys2e}{2024-05-08}{} +\ProvidesExplPackage{l3keys2e}{2024-08-16}{} {LaTeX2e option processing using LaTeX3 keys} \cs_if_exist:NT \ProcessKeysOptions { \file_input_stop: } diff --git a/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty b/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty index e63242d19ac..975f8bdd427 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xfp/xfp.sty @@ -32,7 +32,7 @@ }% \endinput } -\ProvidesExplPackage{xfp}{2024-05-08}{} +\ProvidesExplPackage{xfp}{2024-08-16}{} {L3 Floating point unit} \ProvideExpandableDocumentCommand \fpeval { m } { \fp_eval:n {#1} } \ProvideExpandableDocumentCommand \inteval { m } { \int_eval:n {#1} } diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty index e87a832432f..9a7eab1fe1a 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty @@ -60,7 +60,7 @@ } } \ExplSyntaxOff -\ProvidesExplPackage{xparse}{2024-05-08}{} +\ProvidesExplPackage{xparse}{2024-08-16}{} {L3 Experimental document command parser} \clist_new:N \l__cmd_options_clist \DeclareOption* { \clist_put_right:NV \l__cmd_options_clist \CurrentOption } @@ -239,7 +239,22 @@ { \__kernel_cmd_if_xparse:NTF #1 { - \tl_set:Ne \ArgumentSpecification { \tl_item:Nn #1 { 2 } } + \tl_set:Ne \ArgumentSpecification + { + \exp_args:No \tl_if_head_eq_meaning:nNTF {#1} \__cmd_start_optimized: + { + \prg_replicate:nn + { + \str_count:e + { + \exp_args:Nc \cs_parameter_spec:N + { \cs_to_str:N #1 \c_space_tl code } + } / 2 + } + { m } + } + { \tl_item:Nn #1 { 2 } } + } #2 } {#3} diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty index 04c80418890..31aa3d9a5ee 100644 --- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty +++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty @@ -25,7 +25,7 @@ \endinput } {% - \ProvidesExplPackage{xtemplate}{2024-05-08}{} + \ProvidesExplPackage{xtemplate}{2024-08-16}{} {L3 Experimental prototype document functions} \long\protected\def\DeclareRestrictedTemplate#1#2#3#4{% \DeclareTemplateCopy{#1}{#3}{#2}% diff --git a/Master/texmf-dist/tex/latex/litesolution/litesolution.cls b/Master/texmf-dist/tex/latex/litesolution/litesolution.cls index 0f59d89630f..2b7a3ecb345 100644 --- a/Master/texmf-dist/tex/latex/litesolution/litesolution.cls +++ b/Master/texmf-dist/tex/latex/litesolution/litesolution.cls @@ -1,5 +1,5 @@ %% *********************************************************** -%% Copyright 2024 by Mingyu Hsia <xiamyphys@hdu.edu.cn> * +%% Copyright 2024 by Mingyu XIA <xiamyphys@gmail.com> * %% * %% This work may be distributed and/or modified under * %% the conditions of the LaTeX Project Public License * @@ -11,19 +11,18 @@ %% * %% This work has the LPPL maintenance status `maintained'. * %% * -%% The Current Maintainer of this work is Mingyu Hsia. * +%% The Current Maintainer of this work is Mingyu XIA. * %% * %% This work consists of the files litesolution.cls, * %% and README.md. * -%% available at https://github.com/xiamyphys/litsolution * +%% available at https://github.com/xiamyphys/litesolution * %% *********************************************************** % !Mode:: "TeX:UTF-8" \NeedsTeXFormat{LaTeX2e} \PassOptionsToPackage{no-math}{fontspec} \PassOptionsToPackage{svgnames}{xcolor} -\ProvidesClass{litesolution}[2024/05/07 v2.2b LiteSolution document class] -\RequirePackage{kvoptions} -\RequirePackage{etoolbox} +\ProvidesClass{litesolution}[2024/08/15 v2.4a LiteSolution document class] +\RequirePackage{kvoptions,etoolbox,keyval} \SetupKeyvalOptions{family=LITE, prefix=LITE@, setkeys=\kvsetkeys} \def\ekv#1{\kvsetkeys{LITE}{#1}} @@ -39,7 +38,7 @@ \ProcessKeyvalOptions*\relax \LoadClass[letterpaper,11pt]{book} -\RequirePackage{setspace,datetime,caption,booktabs,multicol,diagbox,paracol} +\RequirePackage{setspace,datetime,tabularx,caption,subcaption,anyfontsize,booktabs,multicol,diagbox,paracol} \linespread{1.3} \ddmmyyyydate \captionsetup{labelsep=period,labelfont={bf,sf},font=small} @@ -52,18 +51,18 @@ \setlist[enumerate]{itemsep=.5ex} \setlist[itemize]{itemsep=.5ex} \RequirePackage[notelinecolor=MidnightBlue,notemargin=.75in]{notebeamer} -\geometry{margin=1in} +\geometry{margin=1in,headheight=14pt} \RequirePackage[nokeyprefix]{refstyle} \newref{eq}{refcmd=(\ref{#1}),name={\sffamily eq.~},Name={\sffamily Eq.~}} \newref{fig}{name={\sffamily fig.~},Name={\sffamily Fig.~}} \newref{tab}{name={\sffamily tab.~},Name={\sffamily Tab.~}} -\RequirePackage{graphics,graphicx,wallpaper,pagecolor} +\RequirePackage{graphicx,magicwatermark,pagecolor} \graphicspath{{./figure/}{./figures/}{./image/}{./images/}{./graphics/}{./graphic/}{./pictures/}{./picture/}} \RequirePackage{ifxetex} \ifXeTeX - \RequirePackage[quiet]{xeCJK} + \RequirePackage[quiet,CJKmath,CheckSingle,PlainEquation]{xeCJK} \RequirePackage{zhlipsum} \setlength{\parindent}{2em} \fi @@ -82,8 +81,7 @@ \RequirePackage[mono=false]{libertine} }{\relax} \let\openbox\relax\def\hmmax{0}\def\bmmax{0} -\RequirePackage{amsthm,amssymb,mathtools,physics2,bm,fixdif,derivative,cancel,extarrows,siunitx,xfrac,nicematrix} -\renewcommand\qedsymbol{$\color{gray}\blacksquare$} +\RequirePackage{amssymb,mathtools,physics2,bm,fixdif,derivative,cancel,extarrows,siunitx,xfrac,nicematrix} \usephysicsmodule{ab,braket,diagmat,doubleprod,xmat,ab.legacy,op.legacy} \RequirePackage[e]{esvect} \let\vec\vv @@ -109,6 +107,7 @@ \AddToHook{cmd/faIcon/after}{\endgroup} \RequirePackage{circuitikz,pgfplots,fadingimage} +\RequirePackage[version=4]{mhchem} \usetikzlibrary{arrows,tikzmark,patterns,calc,angles,quotes,intersections} \tikzset{>=stealth', every picture/.append style={% @@ -133,56 +132,77 @@ \def\mode#1{\textcolor{Indigo}{\textsf{#1}}} \def\cmd#1{\textcolor{MidnightBlue}{\texttt{\string#1}}} -\def\subtitle#1{\gdef\@subtitle{#1}} -\def\bioinfo#1{\gdef\@bioinfo{#1}} -\NewDocumentCommand\coverhead{ O{0} m }{ - \gdef\@coverheadrotate{#1}\gdef\@coverhead{#2} +\define@key{coverset}{title}{\gdef\@title{#1}} +\define@key{coverset}{subtitle}{\gdef\@subtitle{#1}} +\define@key{coverset}{bioinfo}{\gdef\@bioinfo{#1}} +\define@key{coverset}{covercolor}{\gdef\@covercolor{#1}} +\define@key{coverset}{coverhead}{\gdef\@coverhead{#1}} +\define@key{coverset}{coverhead.rotate}{\gdef\@coverheadrotate{#1}} +\define@key{coverset}{cover}{\gdef\@cover{#1}} +\define@key{coverset}{cover.pattern}{\gdef\@coverpattern{#1}} +\def\coverset#1{ + \setkeys{coverset}{#1} + \ifcsname @covercolor\endcsname + \relax + \else + \gdef\@covercolor{DarkSlateGray} + \fi } -\NewDocumentCommand\cover{ o m }{ - \IfValueT{#1}{\gdef\@coverpattern{#1}} - \gdef\@cover{#2}} -\RenewDocumentCommand\maketitle{O{MidnightBlue}}{ + +\renewcommand*\maketitle{ \begin{titlepage} - \newgeometry{margin=0in}\newpagecolor{#1!15} + \newgeometry{margin=0in} + \newpagecolor{\@covercolor!15} + \gdef\@covercolor{DarkSlateGray} \tikz[remember picture,overlay]{ - \ifcsname @coverhead\endcsname - \node [rotate=\@coverheadrotate] at ($(current page.center)+(0,.35*\paperheight)$) {\includegraphics[width=\paperwidth]{\@coverhead}}; - \fi \fill [white,opacity=.5] ($(current page.south west)+(.2*\paperwidth,.6*\paperheight)$) rectangle (current page.south east); \fill [white,opacity=.5] ($(current page.south west)+(.3*\paperwidth,.7*\paperheight)$) rectangle (current page.south east); - \ifcsname @cover\endcsname - \node [opacity=.5] at ($(current page.south west)+(.65*\paperwidth,.3*\paperheight)$) {\includegraphics[height=.3\paperheight]{\@cover}}; - \ifcsname @coverpattern\endcsname - \fill [pattern=\@coverpattern,pattern color=#1!15!white!25] ($(current page.south west)+(.3*\paperwidth,0)$) rectangle ++ (.7*\paperwidth,.6\paperheight); - \fi\fi \node [darkgray] at ($(current page.south west)+(.65*\paperwidth,.65*\paperheight)$) {\Huge\bfseries\@title}; \ifcsname @subtitle\endcsname \node [rotate=90,gray,opacity=.6] at ($(current page.south west)+(.25*\paperwidth,.3*\paperheight)$) {\huge\bfseries\@subtitle}; \fi \ifcsname @bioinfo\endcsname \node [gray,opacity=.4] at ($(current page.south)+(.15*\paperwidth,.075*\paperheight)$) {\large\@bioinfo}; - \fi} + \fi + \ifcsname @coverhead\endcsname + \ifcsname @coverheadrotate\endcsname + \relax + \else + \gdef\@coverheadrotate{0} + \fi + \node [rotate=\@coverheadrotate] at ($(current page.center)+(0,.35*\paperheight)$) {\includegraphics[width=\paperwidth]{\@coverhead}}; + \fi + \ifcsname @cover\endcsname + \node (@cover) at ($(current page.south west)+(.65*\paperwidth,.3*\paperheight)$) {\includegraphics[height=.3\paperheight]{\@cover}}; + \ifcsname @coverpattern\endcsname + \fill [scope fading=south,pattern=\@coverpattern,pattern color=\@covercolor!15!white!25] (@cover.south west) rectangle (@cover.north east); + \fi\fi} \end{titlepage} - \restoregeometry\restorepagecolor + \restoregeometry + \restorepagecolor \if@twoside \clearpage% - \newpagecolor{#1!15!white!50} + \newpagecolor{\@covercolor!15!white!25} \thispagestyle{empty}% \null\clearpage - \fi\restorepagecolor + \fi + \restorepagecolor } \RequirePackage{tocloft} \setlength{\cftbeforetoctitleskip}{6\p@} \setlength{\cftaftertoctitleskip}{24\p@} -\setlength{\cftbeforesecskip}{3\p@} -\def\contentsname{\sffamily\scshape\hfill Contents\hfill} +\AddToHook{cmd/tableofcontents/before}{ + \begingroup + \setstretch{1.5} +} +\AddToHook{cmd/tableofcontents/after}{\endgroup} +\renewcommand\contentsname{\sffamily\scshape Contents} \setcounter{tocdepth}{1} \let\@chapapptmp\@chapapp -\def\@chapapp{\textsc{\@chapapptmp}} +\gdef\@chapapp{\textsc{\@chapapptmp}} \def\chapterimage#1{\gdef\@chapterimage{#1}} -\def\HUGE{\@setfontsize\HUGE{30}{40}} \def\@makechapterhead#1{% \def\thesection{\arabic{chapter}.\arabic{section}} \def\theproblem{\thechapter.\arabic{problem}} @@ -194,8 +214,8 @@ \fi \ifnum \c@secnumdepth >\m@ne \if@mainmatter - \parbox{6em} - {\centering\HUGE\normalfont\bfseries\textcolor{darkgray}\thechapter\vskip4\p@\normalsize\bfseries\textcolor{darkgray}{\bfseries\sffamily\@chapapp}}% + \parbox{6em} + {\centering\@setfontsize\HUGE{30}{40}\normalfont\bfseries\textcolor{darkgray}\thechapter\vskip4\p@\normalsize\bfseries\textcolor{darkgray}{\bfseries\sffamily\@chapapp}}% \fi \fi \interlinepenalty\@M\hspace*{3ex} @@ -203,20 +223,20 @@ \vskip 36\p@ }} \def\@makeschapterhead#1{% - \def\thesection{\arabic{section}} - \def\theproblem{\arabic{problem}} - \setcounter{section}{0} - \setcounter{problem}{0} - {\centering - \ifcsname @chapterimage\endcsname - \@chapterimage - \fi\vskip-40\p@ - \parindent \z@ \normalfont - \interlinepenalty\@M - \huge \bfseries #1\par\nobreak - \vskip 28\p@}} +\def\thesection{\arabic{section}} +\def\theproblem{\arabic{problem}} +\setcounter{section}{0} +\setcounter{problem}{0} +{\centering +\ifcsname @chapterimage\endcsname + \@chapterimage +\fi\vskip-40\p@ + \parindent \z@ \normalfont + \interlinepenalty\@M + \huge \bfseries #1\par\nobreak + \vskip 28\p@}} \let\cleardoublepage=\clearpage -\renewcommand*{\cleardoublepage}{\clearpage\if@twoside \ifodd\c@page\else +\renewcommand*\cleardoublepage{\clearpage\if@twoside \ifodd\c@page\else \ifnum \thechapter=0 \vspace*{\fill} {\centering\itshape\Large This page was intentionally left blank.\par} @@ -231,27 +251,38 @@ \RequirePackage{fancyhdr} \pagestyle{fancy} - \let\oldheadrule\headrule - \renewcommand{\headrule}{{\color{gray}\oldheadrule}} - \renewcommand{\headrulewidth}{1pt} - \if@twoside\cfoot{} - \fancyhead[OL]{\color{darkgray}\nouppercase\leftmark} - \fancyhead[OR]{\color{darkgray}\sffamily\thepage} - \fancyhead[ER]{\color{darkgray}\nouppercase\rightmark} - \fancyhead[EL]{\color{darkgray}\sffamily\thepage} - \else - \fancyhead[L]{\color{darkgray}\nouppercase\leftmark} - \fancyhead[R]{\color{darkgray}\nouppercase\rightmark} - \cfoot{\color{darkgray}\sffamily\thepage} - \fi - \setlength{\headheight}{14pt} +\let\oldheadrule\headrule +\renewcommand{\headrule}{{\color{gray}\oldheadrule}} +\renewcommand{\headrulewidth}{1pt} +\fancyfoot[L]{\footnotesize\fbox{Unauthorized copying or reuse of any part of this page is illegal}} +\fancyfoot[OR]{\sffamily\bfseries GO ON TO THE NEXT PAGE} +\if@twoside\cfoot{} + \fancyhead[OL]{\color{darkgray}\nouppercase\leftmark} + \fancyhead[OR]{\color{darkgray}\sffamily\thepage} + \fancyhead[ER]{\color{darkgray}\nouppercase\rightmark} + \fancyhead[EL]{\color{darkgray}\sffamily\thepage} +\else + \fancyhead[L]{\color{darkgray}\nouppercase\leftmark} + \fancyhead[R]{\color{darkgray}\nouppercase\rightmark} + \cfoot{\color{darkgray}\sffamily\thepage} +\fi +\RequirePackage{amsthm} +\renewcommand\qedsymbol{$\color{gray}\blacksquare$} \theoremstyle{definition} \newtheorem{problem}{\color{DarkGreen}\faIcon{pen-square}~\textsc{\textsf{Problem}}}[chapter] \newtheorem*{solution}{\color{MidnightBlue}\faIcon{check-square}~\textsc{\textsf{Solution}}} \newtheorem*{scratch}{\color{MidnightBlue}\faIcon{check-square}~\textsc{\textsf{Scratch}}} \newtheorem*{note}{\color{DarkRed}\faIcon{info-circle}~\textsc{\textsf{Note}}} -\RequirePackage{comment} +\RequirePackage{comment,ulem,soul} +\ifxetex + \RequirePackage{xeCJKfntef} + \def\@emph#1{\CJKsout*[thickness=2.5ex, format=\color{\@covercolor!15}]{#1}} + \def\s@emph#1{\CJKunderwave{#1}} +\else + \def\@emph#1{\sethlcolor{\@covercolor!15}\hl{#1}} + \def\s@emph#1{\uwave{#1}} +\fi \ifdefstring{\LITE@answer}{hideanswer}{% \def\ans#1{\underline{\phantom{#1}}} \def\choiceans#1{\phantom{#1}} @@ -261,6 +292,7 @@ \excludecomment{solution}\excludecomment{note} \let\endsolution\relax\let\endnote\relax} \def\true{\addtocounter{task}{1}\thetask} + \DeclareRobustCommand\emph{\@ifstar\s@emph\s@emph} }{ \def\ans#1{\underline{~#1~}} \def\s@solute#1{\relax}\def\@solute#1{\relax} @@ -268,6 +300,7 @@ \excludecomment{scratch} \let\endscratch\relax} \def\true{\addtocounter{task}{1}\faIcon{check-circle}} + \DeclareRobustCommand\emph{\@ifstar\s@emph\@emph} } \DeclareRobustCommand\solute{\@ifstar\s@solute\@solute} %% diff --git a/Master/texmf-dist/tex/latex/lstaddons/lstautogobble.sty b/Master/texmf-dist/tex/latex/lstaddons/lstautogobble.sty index 8f065b4a5c2..26fdd51cc0f 100644 --- a/Master/texmf-dist/tex/latex/lstaddons/lstautogobble.sty +++ b/Master/texmf-dist/tex/latex/lstaddons/lstautogobble.sty @@ -1,4 +1,4 @@ -%% Copyright (C) 2011-2012 by Martin Scharrer <martin@scharrer-online.de> +%% Copyright (c) 2011-2022 by Martin Scharrer <martin.scharrer@web.de> %% ----------------------------------------------------------------------- %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 diff --git a/Master/texmf-dist/tex/latex/lstaddons/lstlinebgrd.sty b/Master/texmf-dist/tex/latex/lstaddons/lstlinebgrd.sty index 66f42ab2c96..c02b062aaff 100644 --- a/Master/texmf-dist/tex/latex/lstaddons/lstlinebgrd.sty +++ b/Master/texmf-dist/tex/latex/lstaddons/lstlinebgrd.sty @@ -1,6 +1,6 @@ -%% Copyright (C) 2011-2012 by Martin Scharrer <martin@scharrer-online.de> +%% Copyright (c) 2011-2024 by Martin Scharrer <martin.scharrer@web.de> %% ---------------------------------------------------------------------- %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -18,8 +18,8 @@ %% and the derived filebase lstlinebgrd.sty. %% \ProvidesPackage{lstlinebgrd}[% - 2012/05/03 - v0.1 + 2014/08/18 + v0.2 Provides 'listings' options to color the background of lines] \RequirePackage{listings} \RequirePackage{xcolor} @@ -27,10 +27,10 @@ \lst@Key{numbers}{none}{% \def\lst@PlaceNumber{\lst@linebgrd}% \lstKV@SwitchCases{#1}% - {none&\\% - left&\def\lst@PlaceNumber{\llap{\normalfont + {none:\\% + left:\def\lst@PlaceNumber{\llap{\normalfont \lst@numberstyle{\thelstnumber}\kern\lst@numbersep}\lst@linebgrd}\\% - right&\def\lst@PlaceNumber{\rlap{\normalfont + right:\def\lst@PlaceNumber{\rlap{\normalfont \kern\linewidth \kern\lst@numbersep \lst@numberstyle{\thelstnumber}}\lst@linebgrd}% }{\PackageError{Listings}{Numbers #1 unknown}\@ehc}} diff --git a/Master/texmf-dist/tex/latex/magicwatermark/magicwatermark.sty b/Master/texmf-dist/tex/latex/magicwatermark/magicwatermark.sty index 7a466628722..e40af7ea0b0 100644 --- a/Master/texmf-dist/tex/latex/magicwatermark/magicwatermark.sty +++ b/Master/texmf-dist/tex/latex/magicwatermark/magicwatermark.sty @@ -1,290 +1,453 @@ -%% -%% This is file `magicwatermark.sty', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% magicwatermark.dtx (with options: `package') -%% -%% IMPORTANT NOTICE: -%% -%% For the copyright see the source file. -%% -%% Any modified versions of this file must be renamed -%% with new filenames distinct from magicwatermark.sty. -%% -%% For distribution of the original source see the terms -%% for copying and modification in the file magicwatermark.dtx. -%% -%% This generated file may be distributed as long as the -%% original source files, as listed above, are part of the -%% same distribution. (The sources need not necessarily be -%% in the same archive or directory.) -\NeedsTeXFormat{LaTeX2e}[2020/10/01] -\ProvidesPackage{magicwatermark}[2021/12/22 v1.0.1 watermark for ljguo ] - - -\documentclass{ctexart} -\usepackage{magicwatermark} -\PageSetup[ - rotate = 30, % 设置旋转角度 - color = red!80, % 设置水印内容颜色 - scale = 6 % 设置比例 -]{ - 水印内容 +\ProvidesExplPackage{magicwatermark}{2024/06/11}{1.2B}{magic watermark, author} + + +\msg_new:nnn {magicwatermark}{ Unable to parse } +{ + Unable~to~parse~this~list~parameter.^^J + #1 } -\Watermark % 全文生效 -\begin{document} -... -\end{document} -\end{lstlisting} -\documentclass{ctexart} -\usepackage{magicwatermark} -\EvenPageSetup[color=cyan,showframe,scale=4]{偶数页} % 设置奇数页 -\OddPageSetup[color=purple,showframe,scale=4]{奇数页} % 设置偶数页 -\EvenWatermark % 显示水印 -\OddWatermark -\begin{document} -... -\end{document} -\end{lstlisting} -\documentclass{ctexart} -\usepackage{magicwatermark} -\PageSetup*{ - \begin{tikzpicture}[remember picture,overlay] - \node[cyan,scale = 2,shift={(-1,-1)}] at - (current page.north east){--~\thepage~--}; - \end{tikzpicture} + +\msg_new:nnn {magicwatermark}{ Enable TikZ } +{ + tikz~option~has~been~disabled,^^J + style~will~be~ignored. } -\begin{document} -... -\Watermark % 该命令之前不生效 -\end{document} -\end{lstlisting} -\documentclass{ctexart} -\usepackage{magicwatermark} -\NewWatermark{one} % 新建两个水印 -\NewWatermark{two} -\MyPageSetup[scale=5,color=blue]{one}{水印内容一} % 设置水印 -\MyPageSetup[scale=5,color=red]{two}{水印内容二} -\begin{document} -\MyWatermark{one} % 使用第一个水印 -... -\newpage -\ClearWatermark{one} % 清除第一个水印 -\MyWatermark{two} % 使用第二个水印 -... -\end{document} -\end{lstlisting} -\RequirePackage{everypage-1x,tikz,xparse,expl3} -\ExplSyntaxOn -\tl_new:N \l_mainpage_tl -\tl_new:N \l_evenpage_tl -\tl_new:N \l_oddpage_tl -\tl_new:N \g_case_tl -\tl_new:N \g_clear_all_tl -\msg_new:nnn{clear}{not~have}{I~can~not~find~the~"\clear"~watermark~!} -\NewDocumentCommand{\PageSetup}{sO{}+m} + +\msg_new:nnn {magicwatermark}{ Load TikZ } { - \IfBooleanTF{#1} + Please~load~tikz~package~before~magicwatermark. +} + +\seq_new:N \l__mw_tmpa_seq +\seq_new:N \l__mw_tmpb_seq +\seq_new:N \l__mw_tmpc_seq +\seq_new:N \l__mw_tmpd_seq + + +\int_new:N \l__mw_tmpa_int +\int_new:N \l__mw_tmpb_int +\int_new:N \l__mw_tmpc_int +\int_new:N \l__mw_tmpd_int +\int_new:N \l__mw_tmpe_int + +\clist_new:N \l__mw_list_arabic_number_clist +\clist_new:N \l__mw_list_roman_number_clist +\clist_new:N \l__mw_list_range_clist +\clist_new:N \l__mw_list_expression_clist + + + + +\clist_new:N \l__mw_tmpa_clist +\clist_new:N \l__mw_tmpb_clist +\clist_new:N \l__mw_tmpc_clist + + +\tl_new:N \l__mw_tmpa_tl +\tl_new:N \l__mw_tmpb_tl +\tl_new:N \l__mw_tmpc_tl +\tl_new:N \g__mw_list_tl + +\tl_new:N \g__mw_style_tl +\tl_new:N \g__mw_content_tl + +\bool_new:N \g__mw_is_append_bool +\bool_set_false:N \g__mw_is_append_bool +\bool_new:N \g__mw_tikz_bool +\bool_set_true:N \g__mw_tikz_bool + +\regex_const:Nn \c__mw_arabic_numbers_regex { ^\d+$ } +\regex_const:Nn \c__mw_roman_numbers_regex { ^[ivxlcdm]+$ } + + + +\int_new:N \g__mw_last_page_int + +\AtBeginDocument{ + \int_compare:nTF { \@abspage@last = \number\maxdimen } + { + \int_gset:Nn \g__mw_last_page_int { 10 } + } + { + \int_gset:Nn \g__mw_last_page_int { \@abspage@last } + } +} + +\cs_new_protected:Npn \__mw_clist_deduplicate:N #1 +{ + \group_begin: + \clist_clear:N \l_tmpa_clist + \clist_map_inline:Nn #1 + { + \clist_if_in:NnF \l_tmpa_clist { ##1 } + { \clist_put_right:Nn \l_tmpa_clist { ##1 } } + } + \clist_gset_eq:NN #1 \l_tmpa_clist + \group_end: +} + + +\cs_new:Npn \__mw_list_parser_aux:n #1 { + + \clist_clear:N \l__mw_list_arabic_number_clist + \clist_clear:N \l__mw_list_roman_number_clist + \clist_clear:N \l__mw_list_range_clist + \clist_clear:N \l__mw_list_expression_clist + + % split by commas + \group_begin: + \seq_set_split:Nnn \l__mw_tmpa_seq { , } { #1 } + \seq_map_inline:Nn \l__mw_tmpa_seq + { + \tl_if_eq:nnTF { ##1 } { odd } % odd, push 2X + 1 { - \tl_set:Nn \l_mainpage_tl{#3} + \clist_gput_right:Nn \l__mw_list_expression_clist { 2X + 1 } } { - \tl_set:Nn \l_mainpage_tl + \tl_if_eq:nnTF { ##1 } { even } % even, push 2X + { + \clist_gput_right:Nn \l__mw_list_expression_clist { 2X } + } + { + \tl_if_in:nnTF { ##1 } { X } % expression, push ##1 + { + \clist_gput_right:Nn \l__mw_list_expression_clist { ##1 } + } { - \group_begin: - \keys_set:nn{watermark}{#2} - \begin{tikzpicture}[remember~picture,overlay] - \node - [ - scale = \fp_use:N\l_scale_fp, - opacity = \fp_use:N\l_opacity_fp, - shift = \tl_use:N\l_shift_tl, - color = \tl_use:N \l_color_tl, - rotate = \fp_use:N \l_rotate_fp, - align = \tl_use:N \l_align_tl, - \bool_if:NTF \l_showframe_bool{draw}{}, - ] - at(current~page.center){#3}; - \end{tikzpicture} - \group_end: + \tl_if_in:nnTF { ##1 } { - } % range, push ##1 + { + \clist_gput_right:Nn \l__mw_list_range_clist { ##1 } + } + { + \__mw_if_arabic_number:nTF { ##1 } + { + \clist_gput_right:Nn \l__mw_list_arabic_number_clist { ##1 } + } + { + \__mw_if_roman_number:nTF { ##1 } + { + \clist_gput_right:Nn \l__mw_list_roman_number_clist { ##1 } + } + { + % error + \msg_error:nnn {magicwatermark}{ Unable to parse } + { + Error~list~parameter~``##1''. + } + } + } + } } + } } + } + \group_end: } -\NewDocumentCommand{\Watermark}{} + +\prg_new_conditional:Npnn \__mw_if_arabic_number:n #1 { p, T, F, TF } { - \AddEverypageHook{\tl_use:N \l_mainpage_tl} + \regex_match:NnTF \c__mw_arabic_numbers_regex { #1 } + { + \prg_return_true: + } + { + \prg_return_false: + } } -\NewDocumentCommand{\EvenPageSetup}{sO{}+m} + +\prg_new_conditional:Npnn \__mw_if_roman_number:n #1 { p, T, F, TF } { - \IfBooleanTF{#1} + \regex_match:NnTF \c__mw_roman_numbers_regex { #1 } + { + \prg_return_true: + } + { + \prg_return_false: + } +} + +\prg_generate_conditional_variant:Nnn \__mw_if_arabic_number:n { x } {p, T, F, TF} +\prg_generate_conditional_variant:Nnn \__mw_if_roman_number:n { x } {p, T, F, TF} + + +\cs_new:Npn \__mw_list_parser_for_arabic_number:n #1 { + % arabic number + \fp_compare:nTF { #1 <= \g__mw_last_page_int && #1 > 0 } + { + \clist_put_right:Nn \l__mw_tmpa_clist { #1 } + } + { + % error + \msg_error:nnn {magicwatermark}{ Unable to parse } { - \tl_set:Nn \l_evenpage_tl{#3} + Error~list~parameter~``#1''.^^J + Error~number~``#1''. } + } +} + + + +\cs_new:Npn \__mw_list_parser_for_roman_number:n #1 { + % roman number + \int_set:Nn \l__mw_tmpa_int { \g__mw_last_page_int - \int_from_roman:n { #1 } + 1 } + \fp_compare:nTF + { + \l__mw_tmpa_int <= \g__mw_last_page_int && \l__mw_tmpa_int > 0 + } + { + \clist_put_right:NV \l__mw_tmpa_clist \l__mw_tmpa_int + } + { + % error + \msg_error:nnn {magicwatermark}{ Unable to parse } { - \tl_set:Nn \l_evenpage_tl - { - \group_begin: - \keys_set:nn{watermark}{#2} - \begin{tikzpicture}[remember~picture,overlay] - \node - [ - scale = \fp_use:N\l_scale_fp, - opacity = \fp_use:N\l_opacity_fp, - shift = \tl_use:N\l_shift_tl, - color = \tl_use:N \l_color_tl, - rotate = \fp_use:N \l_rotate_fp, - align = \tl_use:N \l_align_tl, - \bool_if:NTF \l_showframe_bool{draw}{}, - ] - at(current~page.center){#3}; - \end{tikzpicture} - \group_end: - } + Error~list~parameter~``#1''.^^J + Error~roman~number~``#1''. } + } } -\NewDocumentCommand{\EvenWatermark}{} -{ - \AddEverypageHook + + +\cs_new:Npn \__mw_list_parser_for_range:n #1 { + % range, 1-5, 3-i + \seq_set_split:Nnn \l__mw_tmpb_seq { - } { #1 } + + \__mw_if_arabic_number:xTF { \seq_item:Nn \l__mw_tmpb_seq { 1 } } + { + \int_set:Nn \l__mw_tmpb_int { \seq_item:Nn \l__mw_tmpb_seq { 1 } } + } + { + \__mw_if_roman_number:xTF { \seq_item:Nn \l__mw_tmpb_seq { 1 } } { - \int_if_even:nT{\int_use:N \value{page}} - { - \tl_use:N \l_evenpage_tl - } + \exp_args:NNx \int_set:Nn \l__mw_tmpb_int + { + \g__mw_last_page_int - \exp_not:N \int_from_roman:n { \seq_item:Nn \l__mw_tmpb_seq { 1 } } + 1 + } } -} -\NewDocumentCommand{\OddPageSetup}{sO{}+m} -{ - \IfBooleanTF{#1} { - \tl_set:Nn \l_oddpage_tl{#3} + \int_set:Nn \l__mw_tmpb_int { -1 } + % error + \msg_error:nnn {magicwatermark}{ Unable to parse } + { + Error~list~parameter~``#1''.^^J + Error~range~left~``#1''. + } } + } + + \__mw_if_arabic_number:xTF { \seq_item:Nn \l__mw_tmpb_seq { 2 } } + { + \int_set:Nn \l__mw_tmpc_int { \seq_item:Nn \l__mw_tmpb_seq { 2 } } + } + { + \__mw_if_roman_number:xTF { \seq_item:Nn \l__mw_tmpb_seq { 2 } } { - \tl_set:Nn \l_oddpage_tl + \exp_args:NNx \int_set:Nn \l__mw_tmpc_int + { + \g__mw_last_page_int - \exp_not:N \int_from_roman:n { \seq_item:Nn \l__mw_tmpb_seq { 2 } } + 1 + } + } { - \group_begin: - \keys_set:nn{watermark}{#2} - \begin{tikzpicture}[remember~picture,overlay] - \node - [ - scale = \fp_use:N\l_scale_fp, - opacity = \fp_use:N\l_opacity_fp, - shift = \tl_use:N\l_shift_tl, - color = \tl_use:N \l_color_tl, - rotate = \fp_use:N \l_rotate_fp, - align = \tl_use:N \l_align_tl, - \bool_if:NTF \l_showframe_bool{draw}{}, - ] - at(current~page.center){#3}; - \end{tikzpicture} - \group_end: + \int_set:Nn \l__mw_tmpc_int { -1 } + % error + \msg_error:nnn {magicwatermark}{ Unable to parse } + { + Error~list~parameter~``#1''.^^J + Error~range~right~``#1''. + } } + } + + \fp_compare:nT { \l__mw_tmpb_int > 0 && \l__mw_tmpc_int > 0} + { + \int_step_inline:nnn + { \int_min:nn { \l__mw_tmpb_int } { \l__mw_tmpc_int } } + { \int_max:nn { \l__mw_tmpb_int } { \l__mw_tmpc_int } } + { + \clist_put_right:Nn \l__mw_tmpa_clist { ##1 } } + } } -\NewDocumentCommand{\OddWatermark}{} -{ - \AddEverypageHook + +\cs_new:Npn \__mw_list_parser_for_expression:n #1 { + \int_zero:N \l__mw_tmpd_int + \int_zero:N \l__mw_tmpe_int + \group_begin: + \tl_set:Nn \l__mw_tmpa_tl { #1 } + \regex_replace_all:nnN { (\d+)X } { \1*\c{l__mw_tmpe_int} } \l__mw_tmpa_tl + \tl_replace_all:Nnn \l__mw_tmpa_tl { X } { \l__mw_tmpe_int } + % \tl_show:N \l__mw_tmpa_tl + \int_while_do:nn { \l__mw_tmpd_int < \g__mw_last_page_int } { - \int_if_odd:nT{\int_use:N \value{page}} - { - \tl_use:N \l_oddpage_tl - } + \int_set:Nn \l__mw_tmpd_int + { + \fp_eval:n { \l__mw_tmpa_tl } + } + \clist_gput_right:NV \l__mw_tmpa_clist \l__mw_tmpd_int + \int_incr:N \l__mw_tmpe_int } + \group_end: } -\NewDocumentCommand{\NewWatermark}{m} -{ - \tl_new:c {l_#1_tl} - \tl_put_right:Nn \g_case_tl {{#1}{\tl_clear:c {l_#1_tl}}} - \tl_put_right:Nn \g_clear_all_tl {\tl_clear:c {l_#1_tl}} + +\cs_new_nopar:Npn \__mw_list_parser:nN #1#2 { + + % case 1 -> odd, even + % case 2 -> number, 1 + % case 3 -> roman, i + % case 4 -> range, 1-5, 3-ii + % case 5 -> expression, 3X + 1 + + \__mw_list_parser_aux:n { #1 } + + \clist_clear:N \l__mw_tmpa_clist + \clist_map_inline:Nn \l__mw_list_arabic_number_clist + { + \__mw_list_parser_for_arabic_number:n { ##1 } + } + + \clist_map_inline:Nn \l__mw_list_roman_number_clist + { + \__mw_list_parser_for_roman_number:n { ##1 } + } + + + \clist_map_inline:Nn \l__mw_list_range_clist + { + \__mw_list_parser_for_range:n { ##1 } + } + + + \clist_map_inline:Nn \l__mw_list_expression_clist + { + \__mw_list_parser_for_expression:n { ##1 } + } + + + \clist_sort:Nn \l__mw_tmpa_clist { + \int_compare:nNnTF { ##1 } > { ##2 } + { \sort_return_swapped: } + { \sort_return_same: } + } + \__mw_clist_deduplicate:N \l__mw_tmpa_clist + \clist_set_eq:NN #2 \l__mw_tmpa_clist } -\NewDocumentCommand{\MyPageSetup}{O{} m +m} -{ - \tl_set:cn {l_#2_tl} + + +\cs_new:Npn \__mw_parser:nN #1#2 { + \clist_clear:N #2 + \tl_if_eq:nnTF { #1 } { * } + { + \int_step_inline:nnn { 1 } { \g__mw_last_page_int } { - \group_begin: - \keys_set:nn{watermark}{#1} - \begin{tikzpicture}[remember~picture,overlay] - \node - [ - scale = \fp_use:N\l_scale_fp, - opacity = \fp_use:N\l_opacity_fp, - shift = \tl_use:N\l_shift_tl, - color = \tl_use:N \l_color_tl, - rotate = \fp_use:N \l_rotate_fp, - align = \tl_use:N \l_align_tl, - \bool_if:NTF \l_showframe_bool{draw}{}, - ] - at(current~page.center){#3}; - \end{tikzpicture} - \group_end: + \clist_put_right:Nn #2 { ##1 } } + } + { + \__mw_list_parser:nN { #1 } #2 + } } -\NewDocumentCommand{\MyWatermark}{m} + + + +\keys_define:nn { mw / new } { - \AddEverypageHook{\tl_use:c {l_#1_tl}} + pages .tl_set:N = \g__mw_list_tl, + style .tl_set:N = \g__mw_style_tl, + % style .code:n = \__mw_parse_style:n { #1 }, + content .tl_set:N = \g__mw_content_tl, + is~append .bool_set:N = \g__mw_is_append_bool, + tikz .bool_set:N = \g__mw_tikz_bool } -\keys_define:nn{watermark} -{ - scale.fp_set:N = \l_scale_fp, - scale.initial:n = 1.0, - scale.default:n = 1.0, - opacity.fp_set:N = \l_opacity_fp, - opacity.initial:n = 0.8, - opacity.default:n = 0.8, - shift.tl_set:N = \l_shift_tl, - shift.initial:n = {(0,0)}, - shift.default:n = {(0,0)}, - color.tl_set:N = \l_color_tl, - color.initial:n = black, - color.default:n =black, - rotate.fp_set:N =\l_rotate_fp, - rotate.initial:n = 0.0, - rotate.default:n = 0.0, - align.tl_set:N = \l_align_tl, - align.initial:n = center, - align.default:n = center, - showframe.bool_set:N = \l_showframe_bool, - showframe.initial:n = false, - showframe.default:n = true, + +\cs_new:Npn \__mw_parse_style: { + \tl_if_empty:NF \g__mw_style_tl + { + \bool_if:NTF \g__mw_tikz_bool + { + \IfPackageLoadedTF{tikz} + { + \tl_set_eq:NN \l__mw_tmpc_tl \g__mw_style_tl + } + { + \msg_error:nn {magicwatermark}{ Load TikZ } + } + } + { + \msg_warning:nn {magicwatermark}{ Enable TikZ } + } + } } -\tl_gset:Nn \g_clear_all_tl + +\keys_define:nn { mw } { - \tl_clear:N \l_mainpage_tl - \tl_clear:N \l_evenpage_tl - \tl_clear:N \l_oddpage_tl + setup .code:n = \__mw_new_watermark:n {#1} } -\tl_gset:Nn \g_case_tl{ - {all} - { - \tl_use:N\g_clear_all_tl - } - {even} - { - \tl_clear:N \l_evenpage_tl - } - {odd} - { - \tl_clear:N \l_oddpage_tl - } - {main} + + +\cs_new:Npn \__mw_new_watermark:n #1 { + \group_begin: + \keys_set:nn { mw / new }{#1} + + % parse style + \__mw_parse_style: + + % parse pages + \exp_args:NV \__mw_parser:nN \g__mw_list_tl \l__mw_tmpc_clist + + \clist_map_inline:Nn \l__mw_tmpc_clist { + + \bool_if:NTF \g__mw_tikz_bool + { + \IfPackageLoadedTF{tikz} + { + \tl_set:Ne \l__mw_tmpb_tl { - \tl_clear:N \l_mainpage_tl + \exp_not:N \tikz[remember~picture, overlay] + { + \exp_not:N \node[inner~sep = 0pt, outer~sep = 0pt, opacity = .5, align = left, \exp_not:V \g__mw_style_tl] at (current~page.center) + { + \exp_not:V \g__mw_content_tl + }; + } } + } + { + \msg_error:nn {magicwatermark}{ Load TikZ } + } + } + { + \tl_set:NV \l__mw_tmpb_tl \g__mw_content_tl + } + + \bool_if:nTF { \g__mw_is_append_bool && \tl_if_exist_p:c { g__mw_content_ \int_to_roman:n { ##1 } _tl } } + { + \tl_gput_right:cV { g__mw_content_ \int_to_roman:n { ##1 } _tl } \l__mw_tmpb_tl + } + { + \tl_gset:cV { g__mw_content_ \int_to_roman:n { ##1 } _tl } \l__mw_tmpb_tl + } + } + \group_end: } -\NewDocumentCommand{\ClearWatermark}{m} -{ -\clist_gset:Nn \g_clear_clist{#1} -\clist_map_variable:NNn \g_clear_clist \clear -{ - \exp_args:NV \str_case:nVF \clear - \g_case_tl - {\msg_warning:nn{clear}{not~have}} -} + + +\NewDocumentCommand{\MagicWatermark}{m}{ + \group_begin: + \AtBeginDocument{ + \keys_set:nn { mw } { #1 } + \AddToHook{shipout/background}{ + \put(.5\paperwidth,-.5\paperheight){ + \tl_if_exist:cT { g__mw_content_ \int_to_roman:n { \value{page} }_tl } + { + \tl_use:c { g__mw_content_ \int_to_roman:n { \value{page} } _tl } + } + } + } + } + \group_end: } -\ExplSyntaxOff -\endinput -%% -%% End of file `magicwatermark.sty'. + +\@onlypreamble\MagicWatermark
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/markdown/markdown.sty b/Master/texmf-dist/tex/latex/markdown/markdown.sty index 799e1ec279c..dda2b648907 100644 --- a/Master/texmf-dist/tex/latex/markdown/markdown.sty +++ b/Master/texmf-dist/tex/latex/markdown/markdown.sty @@ -120,11 +120,15 @@ \c { group_end: } \c { tl_set_rescan:Nnn } \c { l_tmpa_tl } { } { \1 } \c { __markdown_setup:V } \c { l_tmpa_tl } - \c { markdownReadAndConvert@markdown } { } + \c { exp_args:NV } + \c { markdownReadAndConvert@ } + \c { @currenvir } } { \group_end: - \markdownReadAndConvert@markdown { } + \exp_args:NV + \markdownReadAndConvert@ + \@currenvir } } { \markdownEnd } @@ -138,7 +142,8 @@ { #1 } \__markdown_setup:n { #1 } - \markdownReadAndConvert@markdown * + \markdownReadAndConvert@ + { markdown* } } { \markdownEnd } \msg_new:nnn @@ -148,13 +153,16 @@ The~markdown*~LaTeX~environment~has~been~deprecated~and~will~ be~removed~in~the~next~major~version~of~the~Markdown~package. } +\cs_generate_variant:Nn + \__markdown_setup:n + { V } \ExplSyntaxOff \begingroup \catcode`\|=0\catcode`\<=1\catcode`\>=2% \catcode`\\=12|catcode`|{=12|catcode`|}=12% - |gdef|markdownReadAndConvert@markdown#1<% - |markdownReadAndConvert<\end{markdown#1}>% - <|end<markdown#1>>>% + |gdef|markdownReadAndConvert@#1<% + |markdownReadAndConvert<\end{#1}>% + <|end<#1>>>% |endgroup \DeclareOption*{% \expandafter\markdownSetup\expandafter{\CurrentOption}}% diff --git a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_dot.sty b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_dot.sty index fbe93b2844b..f96ab1f5ccf 100644 --- a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_dot.sty +++ b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_dot.sty @@ -59,7 +59,8 @@ fi}}% \markdownRendererImage{Graphviz image}{#1.pdf}{#1.pdf}{##2}% }{% - \markdown@witiko@dot@oldRendererInputFencedCodePrototype{#1}{#2}{#3}% + \markdown@witiko@dot@oldRendererInputFencedCodePrototype + {#1}{#2}{#3}% }% }% \next#2 \relax}% diff --git a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_markdown_defaults.sty b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_markdown_defaults.sty index f90017e073b..d626dab3616 100644 --- a/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_markdown_defaults.sty +++ b/Master/texmf-dist/tex/latex/markdown/markdownthemewitiko_markdown_defaults.sty @@ -501,8 +501,9 @@ \advance\markdownLaTeXCitationsCounter by 1\relax \ifx\relax#4\relax \ifx\relax#5\relax - \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal\relax - \cite{#1#2#6}% Without prenotes and postnotes, just accumulate cites + \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal + \relax + \cite{#1#2#6}% No prenotes/postnotes, just accumulate cites \expandafter\expandafter\expandafter \expandafter\expandafter\expandafter\expandafter \@gobblethree @@ -512,7 +513,8 @@ \cite{#1}% \fi \cite[#5]{#6}% - \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal\relax + \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal + \relax \else \expandafter\expandafter\expandafter \expandafter\expandafter\expandafter\expandafter @@ -539,7 +541,8 @@ \space % Insert a space before the prenote in later citations \fi #4~\expandafter\cite\ifx\relax#5\relax{#6}\else[#5]{#6}\fi - \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal\relax + \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal + \relax \else \expandafter\expandafter\expandafter \expandafter\expandafter\expandafter\expandafter @@ -558,8 +561,9 @@ \advance\markdownLaTeXCitationsCounter by 1\relax \ifx\relax#3\relax \ifx\relax#4\relax - \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal\relax - \citep{#1,#5}% Without prenotes and postnotes, just accumulate cites + \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal + \relax + \citep{#1,#5}% No prenotes/postnotes, just accumulate cites \expandafter\expandafter\expandafter \expandafter\expandafter\expandafter\expandafter \@gobbletwo @@ -569,7 +573,8 @@ \citep{#1}% \fi \citep[][#4]{#5}% - \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal\relax + \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal + \relax \else \expandafter\expandafter\expandafter \expandafter\expandafter\expandafter\expandafter @@ -589,7 +594,8 @@ \citep{#1}% \fi \citep[#3][#4]{#5}% - \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal\relax + \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal + \relax \else \expandafter\expandafter\expandafter \expandafter\expandafter\expandafter\expandafter @@ -604,8 +610,9 @@ \advance\markdownLaTeXCitationsCounter by 1\relax \ifx\relax#3\relax \ifx\relax#4\relax - \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal\relax - \citet{#1,#5}% Without prenotes and postnotes, just accumulate cites + \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal + \relax + \citet{#1,#5}% No prenotes/postnotes, just accumulate cites \expandafter\expandafter\expandafter \expandafter\expandafter\expandafter\expandafter \@gobbletwo @@ -615,10 +622,13 @@ \citet{#1}% \fi , \citet[#3][#4]{#5}% - \ifnum\markdownLaTeXCitationsCounter<\markdownLaTeXCitationsTotal\relax + \ifnum\markdownLaTeXCitationsCounter<\markdownLaTeXCitationsTotal + \relax , \else - \ifnum\markdownLaTeXCitationsCounter=\markdownLaTeXCitationsTotal\relax + \ifnum + \markdownLaTeXCitationsCounter=\markdownLaTeXCitationsTotal + \relax , \fi \fi @@ -637,10 +647,13 @@ \citet{#1}% \fi , \citet[#3][#4]{#5}% - \ifnum\markdownLaTeXCitationsCounter<\markdownLaTeXCitationsTotal\relax + \ifnum\markdownLaTeXCitationsCounter<\markdownLaTeXCitationsTotal + \relax , \else - \ifnum\markdownLaTeXCitationsCounter=\markdownLaTeXCitationsTotal\relax + \ifnum + \markdownLaTeXCitationsCounter=\markdownLaTeXCitationsTotal + \relax , \fi \fi @@ -654,13 +667,15 @@ \def\markdownLaTeXBibLaTeXCitations#1#2#3#4#5{% \advance\markdownLaTeXCitationsCounter by 1\relax - \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal\relax + \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal + \relax \autocites#1[#3][#4]{#5}% \expandafter\@gobbletwo \fi\markdownLaTeXBibLaTeXCitations{#1[#3][#4]{#5}}} \def\markdownLaTeXBibLaTeXTextCitations#1#2#3#4#5{% \advance\markdownLaTeXCitationsCounter by 1\relax - \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal\relax + \ifnum\markdownLaTeXCitationsCounter>\markdownLaTeXCitationsTotal + \relax \textcites#1[#3][#4]{#5}% \expandafter\@gobbletwo \fi\markdownLaTeXBibLaTeXTextCitations{#1[#3][#4]{#5}}} @@ -737,7 +752,8 @@ { \markdownLaTeXRendererAutolink { #2 } { #3 } }{ - \markdownLaTeXRendererDirectOrIndirectLink { #1 } { #2 } { #3 } { #4 } + \markdownLaTeXRendererDirectOrIndirectLink + { #1 } { #2 } { #3 } { #4 } } } \def\markdownLaTeXRendererAutolink#1#2{% @@ -939,13 +955,13 @@ { { latex } { - \__markdown_plain_tex_default_input_raw_inline_renderer_prototype:nn + \__markdown_plain_tex_default_input_raw_inline:nn { #1 } { tex } } } { - \__markdown_plain_tex_default_input_raw_inline_renderer_prototype:nn + \__markdown_plain_tex_default_input_raw_inline:nn { #1 } { #2 } } @@ -958,13 +974,13 @@ { { latex } { - \__markdown_plain_tex_default_input_raw_block_renderer_prototype:nn + \__markdown_plain_tex_default_input_raw_block:nn { #1 } { tex } } } { - \__markdown_plain_tex_default_input_raw_block_renderer_prototype:nn + \__markdown_plain_tex_default_input_raw_block:nn { #1 } { #2 } } diff --git a/Master/texmf-dist/tex/latex/media9/media9.sty b/Master/texmf-dist/tex/latex/media9/media9.sty index c1e00febb4e..a32e4874780 100644 --- a/Master/texmf-dist/tex/latex/media9/media9.sty +++ b/Master/texmf-dist/tex/latex/media9/media9.sty @@ -39,8 +39,8 @@ % % The Current Maintainer of this work is A. Grahn. -\def\g@mix@date@tl{2022/08/04} -\def\g@mix@version@tl{1.25} +\def\g@mix@date@tl{2024/09/02} +\def\g@mix@version@tl{1.27} \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage{media9}{\g@mix@date@tl}{\g@mix@version@tl} @@ -2446,8 +2446,8 @@ % % The Current Maintainer of this work is A. Grahn. -\def\g@mix@date@tl{2022/08/04} -\def\g@mix@version@tl{1.25} +\def\g@mix@date@tl{2024/09/02} +\def\g@mix@version@tl{1.27} \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage{media9}{\g@mix@date@tl}{\g@mix@version@tl} diff --git a/Master/texmf-dist/tex/latex/media9/pdfbase.sty b/Master/texmf-dist/tex/latex/media9/pdfbase.sty index 67ff708ad51..54242a5d9cc 100644 --- a/Master/texmf-dist/tex/latex/media9/pdfbase.sty +++ b/Master/texmf-dist/tex/latex/media9/pdfbase.sty @@ -156,8 +156,8 @@ % % The Current Maintainer of this work is A. Grahn. -\def\g@pbs@date@tl{2022/08/04} -\def\g@pbs@version@tl{0.55} +\def\g@pbs@date@tl{2024/09/02} +\def\g@pbs@version@tl{0.57} \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl} @@ -220,11 +220,11 @@ {dvipdfmx}{ \bool_gset_true:N\g_pbs_dvipdfmx_bool \bool_gset_false:N\g_pbs_dvisvgm_bool - } + } {dvisvgm}{ \bool_gset_false:N\g_pbs_dvipdfmx_bool \bool_gset_true:N\g_pbs_dvisvgm_bool - } + } }{ % otherwise let the L3 backend code decide \str_case_e:nn{\c_sys_backend_str}{ {dvisvgm}{ @@ -270,6 +270,12 @@ \seq_new:N\g_pbs_bop_seq \seq_new:N\g_pbs_eop_seq +% column (boc, eoc) hooks +\cs_new_protected:Nn\pbs_boc_action:n{\seq_gput_right:Nn\g_pbs_boc_seq{#1}} +\cs_new_protected:Nn\pbs_eoc_action:n{\seq_gput_right:Nn\g_pbs_eoc_seq{#1}} +\seq_new:N\g_pbs_boc_seq +\seq_new:N\g_pbs_eoc_seq + \bool_new:N\g_pbs_lscape_bool %if we are inside landscape env \bool_new:N\g_pbs_ocgbase_loaded_bool \AtBeginDocument{ @@ -1105,8 +1111,8 @@ \mode_leave_vertical: % resources are managed automatically %rescale box to fit within the papersize while distilling \tl_gset:cx{scale_{pbs@obj\int_use:N\g_pbs_obj_int}}{\fp_eval:n{min(1.0, - \dim_ratio:nn{\paperwidth}{\box_wd:N#5}, - \dim_ratio:nn{\paperheight}{\box_ht:N#5+\box_dp:N#5} + \dim_ratio:nn{\paperwidth}{\box_wd:N#5}/\the\mag*1000, + \dim_ratio:nn{\paperheight}{\box_ht:N#5+\box_dp:N#5}/\the\mag*1000 )}} \box_scale:Nnn#5{ \tl_use:c{scale_{pbs@obj\int_use:N\g_pbs_obj_int}} @@ -1302,33 +1308,38 @@ \tl_gput_left:Nx\g_pbs_fields_tl{#1\space} } -%modify output routine for output box insertions -\bool_new:N\l_pbs_is_vertical_bool +% modify page output routine for inserting actions at begin and end \cs_set_eq:NN\pbs_outputpage_orig:\@outputpage \cs_set_protected_nopar:Npn\@outputpage{ \int_gincr:N\g_pbs_page_int - \box_if_vertical:cTF{@outputbox}{ - \bool_set_true:N\l_pbs_is_vertical_bool - }{ - \bool_set_false:N\l_pbs_is_vertical_bool - } - \hbox_set:Nn\@outputbox{ + \vbox_set:Nn\@outputbox{ %begin of page - \hbox_overlap_right:n{\seq_map_inline:Nn\g_pbs_bop_seq{##1}} + \seq_map_inline:Nn\g_pbs_bop_seq{##1} \box_use_drop:N\@outputbox %end of page - \hbox_overlap_right:n{\seq_map_inline:Nn\g_pbs_eop_seq{##1}} - } - \bool_if:NT\l_pbs_is_vertical_bool{ - \vbox_set:Nn\@outputbox{\box_use_drop:N\@outputbox} + \seq_map_inline:Nn\g_pbs_eop_seq{##1} } \pbs_outputpage_orig: } +% modify column making routine for inserting actions at begin and end +\cs_set_eq:NN\pbs_makecol_orig:\@makecol +\cs_set_protected_nopar:Npn\@makecol{ + \vbox_set:Nn\@cclv{ + %begin of column + \seq_map_inline:Nn\g_pbs_boc_seq{##1} + \vbox_unpack_drop:N\@cclv + %end of column + \seq_map_inline:Nn\g_pbs_eoc_seq{##1} + } + \pbs_makecol_orig: +} + \AddToHook{shipout/foreground}{ %insert /Properties into current page's resources \put(0,0){\pbs_insert_properties_entry:} } + \AddToHook{shipout/background}{ % workaround for curious AR bug (pdf annot or link placed on % OCG remains active although OCG is hidden) @@ -1336,8 +1347,14 @@ % somewhere on the page. \bool_if:NT\g_pbs_ocgbase_loaded_bool{ \put(1,-1){ + \tl_if_exist:NF\g_pbs_blank_xform_tl{ + \hbox_set:Nn\l_tmpa_box{\phantom{\rule{1pt}{1pt}}} + \pbs_pdfxform:nnnnn{}{1}{}{}{\l_tmpa_box} + \tl_const:Ne\g_pbs_blank_xform_tl{\pbs_pdflastxform:} + } \pbs_pdfannot:nnnn{3bp}{\c_zero_dim}{3bp}{ - /Ff~65537/FT/Btn/Subtype/Widget + /Ff~65537/FT/Btn/Subtype/Widget/F~4 + /AP~<</N~<</On~\g_pbs_blank_xform_tl>>>> /T~(pbs@ARFix@\int_use:N\g_pbs_page_int) } } @@ -1435,8 +1452,8 @@ % `fstream', then % {stream attributes as PDF key-value dictionary}{file name} % -% if #3 && #1 are both empty, an object reference will be reserved for later -% use as #1 +% if #3 && #1 are both empty, an object reference will be reserved for +% later use as #1 % % \pbs_pdflastobj: % inserts object ID of PDF object created/processed during most recent call @@ -1471,9 +1488,9 @@ % -------- % % \pbs_pdfxform:nnnnn -% #1: add pgf/tikz resources (transparency, shading)? (0|1) %dvipdfmx/xetex +% #1: add pgf/tikz resources (transparency, shading)? (0|1); dvipdfmx/xetex % #2: write immediately to PDF? (0|1); eg 1 for appearances; pdftex/luatex -% #3: additional resources %all BUT dvips +% #3: additional resources; all BUT dvips % #4: additional dictionary entries % #5: savebox number % creates PDF Form XObject from savebox content @@ -1539,8 +1556,8 @@ % % The Current Maintainer of this work is A. Grahn. -\def\g@pbs@date@tl{2022/08/04} -\def\g@pbs@version@tl{0.55} +\def\g@pbs@date@tl{2024/09/02} +\def\g@pbs@version@tl{0.57} \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesExplPackage{pdfbase}{\g@pbs@date@tl}{\g@pbs@version@tl} @@ -1603,11 +1620,11 @@ {dvipdfmx}{ \bool_gset_true:N\g_pbs_dvipdfmx_bool \bool_gset_false:N\g_pbs_dvisvgm_bool - } + } {dvisvgm}{ \bool_gset_false:N\g_pbs_dvipdfmx_bool \bool_gset_true:N\g_pbs_dvisvgm_bool - } + } }{ % otherwise let the L3 backend code decide \str_case_e:nn{\c_sys_backend_str}{ {dvisvgm}{ @@ -1653,8 +1670,16 @@ \seq_new:N\g_pbs_bop_seq \seq_new:N\g_pbs_eop_seq -\bool_new:N\g_pbs_lscape_bool %if we are inside landscape env +% column (boc, eoc) hooks +\cs_new_protected:Nn\pbs_boc_action:n{\seq_gput_right:Nn\g_pbs_boc_seq{#1}} +\cs_new_protected:Nn\pbs_eoc_action:n{\seq_gput_right:Nn\g_pbs_eoc_seq{#1}} +\seq_new:N\g_pbs_boc_seq +\seq_new:N\g_pbs_eoc_seq + \bool_new:N\g_pbs_ocgbase_loaded_bool +\AddToHook{package/ocgbase/after}{\bool_gset_true:N\g_pbs_ocgbase_loaded_bool} + +\bool_new:N\g_pbs_lscape_bool %if we are inside landscape env \AtBeginDocument{ \iow_now:Nx\@mainaux{ \token_to_str:N\providecommand\token_to_str:N\pbs@newkey[2]{} @@ -1666,7 +1691,6 @@ \tl_put_right:Nn\landscape{\bool_gset_true:N\g_pbs_lscape_bool} \tl_put_left:Nn\endlandscape{\bool_gset_false:N\g_pbs_lscape_bool} } - \@ifpackageloaded{ocgbase}{\bool_gset_true:N\g_pbs_ocgbase_loaded_bool}{} } % writing to core objects in the PDF, using the new pdfmanagement interface @@ -1851,7 +1875,9 @@ \xsb_addto_props:n{/rm@oc\int_use:N\g_pbs_oc_int\space#2} \int_gincr:N\g_pbs_oc_int }{ - \pdf_bdcobject:nx{#1}{\tl_use:c{g_pbs_objname_#2_tl}} + \tl_if_exist:cT{g_pbs_objname_#2_tl}{ + \exp_args:Nne\pdf_bdcobject:nn{#1}{\tl_use:c{g_pbs_objname_#2_tl}} + } } } @@ -1868,9 +1894,7 @@ %pgf + transparency related settings \bool_new:N\g_pbs_pgfloaded_bool \bool_gset_false:N\g_pbs_pgfloaded_bool - \AtBeginDocument{ - \@ifpackageloaded{pgf}{\bool_gset_true:N\g_pbs_pgfloaded_bool}{} - } + \AddToHook{package/pgf/after}{\bool_gset_true:N\g_pbs_pgfloaded_bool} \int_new:N\g_pbs_obj_int %object ID \bool_if:NTF\g_pbs_dvipdfmx_bool{ %dvipdfmx/XeTeX \AtBeginDocument{ @@ -2042,7 +2066,9 @@ } \cs_new_protected_nopar:Nn\pbs_pdfbdc:nn{ - \pdf_bdcobject:nx{#1}{\tl_use:c{g_pbs_objname_#2_tl}} + \tl_if_exist:cT{g_pbs_objname_#2_tl}{ + \exp_args:Nne\pdf_bdcobject:nn{#1}{\tl_use:c{g_pbs_objname_#2_tl}} + } } }{ \bool_if:NTF\g_pbs_dvisvgm_bool{ @@ -2436,8 +2462,8 @@ \mode_leave_vertical: % resources are managed automatically %rescale box to fit within the papersize while distilling \tl_gset:cx{scale_{pbs@obj\int_use:N\g_pbs_obj_int}}{\fp_eval:n{min(1.0, - \dim_ratio:nn{\paperwidth}{\box_wd:N#5}, - \dim_ratio:nn{\paperheight}{\box_ht:N#5+\box_dp:N#5} + \dim_ratio:nn{\paperwidth}{\box_wd:N#5}/\the\mag*1000, + \dim_ratio:nn{\paperheight}{\box_ht:N#5+\box_dp:N#5}/\the\mag*1000 )}} \box_scale:Nnn#5{ \tl_use:c{scale_{pbs@obj\int_use:N\g_pbs_obj_int}} @@ -2602,7 +2628,6 @@ } } } -\cs_generate_variant:Nn\pdf_bdcobject:nn{nx} \cs_new_eq:NN\pbs_pdfemc:\pdf_emc: \cs_new_nopar:Nn\pbs_pdflastobj:{\g_pbs_pdflastobj_tl} @@ -2610,29 +2635,33 @@ \cs_new_nopar:Nn\pbs_pdflastxform:{\g_pbs_pdflastxform_tl} \cs_new_nopar:Nn\pbs_pdflastximage:{\g_pbs_pdflastximage_tl} -%modify output routine for output box insertions -\bool_new:N\l_pbs_is_vertical_bool +% modify page output routine for inserting actions at begin and end \cs_set_eq:NN\pbs_outputpage_orig:\@outputpage \cs_set_protected_nopar:Npn\@outputpage{ \int_gincr:N\g_pbs_page_int - \box_if_vertical:cTF{@outputbox}{ - \bool_set_true:N\l_pbs_is_vertical_bool - }{ - \bool_set_false:N\l_pbs_is_vertical_bool - } - \hbox_set:Nn\@outputbox{ + \vbox_set:Nn\@outputbox{ %begin of page - \hbox_overlap_right:n{\seq_map_inline:Nn\g_pbs_bop_seq{##1}} + \seq_map_inline:Nn\g_pbs_bop_seq{##1} \box_use_drop:N\@outputbox %end of page - \hbox_overlap_right:n{\seq_map_inline:Nn\g_pbs_eop_seq{##1}} - } - \bool_if:NT\l_pbs_is_vertical_bool{ - \vbox_set:Nn\@outputbox{\box_use_drop:N\@outputbox} + \seq_map_inline:Nn\g_pbs_eop_seq{##1} } \pbs_outputpage_orig: } +% modify column making routine for inserting actions at begin and end +\cs_set_eq:NN\pbs_makecol_orig:\@makecol +\cs_set_protected_nopar:Npn\@makecol{ + \vbox_set:Nn\@cclv{ + %begin of column + \seq_map_inline:Nn\g_pbs_boc_seq{##1} + \vbox_unpack_drop:N\@cclv + %end of column + \seq_map_inline:Nn\g_pbs_eoc_seq{##1} + } + \pbs_makecol_orig: +} + \AddToHook{shipout/background}{ % workaround for curious AR bug (pdf annot or link placed on % OCG remains active although OCG is hidden) @@ -2640,8 +2669,14 @@ % somewhere on the page. \bool_if:NT\g_pbs_ocgbase_loaded_bool{ \put(1,-1){ + \tl_if_exist:NF\g_pbs_blank_xform_tl{ + \hbox_set:Nn\l_tmpa_box{\phantom{\rule{1pt}{1pt}}} + \pbs_pdfxform:nnnnn{}{1}{}{}{\l_tmpa_box} + \tl_const:Ne\g_pbs_blank_xform_tl{\pbs_pdflastxform:} + } \pbs_pdfannot:nnnn{3bp}{\c_zero_dim}{3bp}{ - /Ff~65537/FT/Btn/Subtype/Widget + /Ff~65537/FT/Btn/Subtype/Widget/F~4 + /AP~<</N~<</On~\g_pbs_blank_xform_tl>>>> /T~(pbs@ARFix@\int_use:N\g_pbs_page_int) } } diff --git a/Master/texmf-dist/tex/latex/mercatormap/mercatormap.sty b/Master/texmf-dist/tex/latex/mercatormap/mercatormap.sty index d2c8d61ae4c..b9f77b9715a 100644 --- a/Master/texmf-dist/tex/latex/mercatormap/mercatormap.sty +++ b/Master/texmf-dist/tex/latex/mercatormap/mercatormap.sty @@ -1,8 +1,8 @@ -%% The LaTeX package mercatormap - version 1.02 (2020/08/06) +%% The LaTeX package mercatormap - version 1.2.0 (2024/08/05) %% mercatormap.sty: geographic coordinates (Mercator projection) and map tiles for TikZ pictures %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2020-2024 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the @@ -17,24 +17,11 @@ %% %% This work consists of all files listed in README %% -\RequirePackage{expl3}[2020/02/25] -\RequirePackage{xparse} -\ProvidesExplPackage{mercatormap}{2020/08/06}{1.02} +\NeedsTeXFormat{LaTeX2e}[2023-11-01] +\ProvidesExplPackage{mercatormap}{2024/08/05}{1.2.0} {A Web Mercator projection package with map tile support} -\@ifpackagelater { expl3 } { 2020/02/25 } - { } - { - \PackageError { mercatormap } { Support~package~expl3~too~old } - { - You~need~to~update~your~installation~of~the~bundles~'l3kernel'~and~ - 'l3packages'.\MessageBreak - Loading~mercatormap~will~abort! - } - \tex_endinput:D - } -\RequirePackage{siunitx} -\RequirePackage{graphicx,tikz,pdftexcmds} +\RequirePackage{siunitx,graphicx,tikz} \ExplSyntaxOff % space character problem if within explSyntax @@ -51,8 +38,23 @@ \NewDocumentCommand\mermapsetmarker{ m } { \keys_set:nn { mermap/marker } {#1} } -%---- constants ---------------------------------------------------------------- +%---- scratch variables -------------------------------------------------------- + +\box_new:N \l__mermap_tmpa_box + +\clist_new:N \l__mermap_tmpa_clist +\dim_new:N \l__mermap_tmpa_dim +\dim_new:N \l__mermap_tmpb_dim + +\fp_new:N \l__mermap_tmpa_fp +\fp_new:N \l__mermap_tmpb_fp + +\tl_new:N \g__mermap_tmpa_tl +\tl_new:N \l__mermap_tmpa_tl +\tl_new:N \l__mermap_tmpb_tl + +%---- constants ---------------------------------------------------------------- \fp_const:Nn \c__mermap_scale_radius_fp { 6371*pi/180 } \fp_const:Nn \c__mermap_mean_radius_fp { 637100000cm } @@ -235,16 +237,16 @@ \cs_new_nopar:Npn \__mermap_longitude_to_x:n #1 { - \fp_set:Nn \l_tmpa_fp { #1-\l__mermap_mapwest_fp } - \fp_sub:Nn \l_tmpa_fp { 360*floor(\l_tmpa_fp/360) } - \fp_set:Nn \l_tmpa_fp - { \l_tmpa_fp>\l__mermap_westeast_fp - ?(\l_tmpa_fp-\l__mermap_westeast_fp>360-\l_tmpa_fp - ?\l_tmpa_fp-360 - :\l_tmpa_fp) - :\l_tmpa_fp + \fp_set:Nn \l__mermap_tmpa_fp { #1-\l__mermap_mapwest_fp } + \fp_sub:Nn \l__mermap_tmpa_fp { 360*floor(\l__mermap_tmpa_fp/360) } + \fp_set:Nn \l__mermap_tmpa_fp + { \l__mermap_tmpa_fp>\l__mermap_westeast_fp + ?(\l__mermap_tmpa_fp-\l__mermap_westeast_fp>360-\l__mermap_tmpa_fp + ?\l__mermap_tmpa_fp-360 + :\l__mermap_tmpa_fp) + :\l__mermap_tmpa_fp } - \fp_set:Nn \l__mermap_cs_x_fp { \l_tmpa_fp*\l__mermap_cs_xfactor_fp } + \fp_set:Nn \l__mermap_cs_x_fp { \l__mermap_tmpa_fp*\l__mermap_cs_xfactor_fp } } @@ -328,7 +330,7 @@ } -\prg_new_conditional:Npnn \__mermap_if_in_map:nn #1#2 { p, TF } +\prg_new_conditional:Npnn \__mermap_if_in_map:nn #1#2 { p, T, F, TF } { \fp_compare:nNnTF {#1} > \l__mermap_mapnorth_fp { @@ -340,14 +342,14 @@ \prg_return_false: } { - \fp_set:Nn \l_tmpa_fp { #2-\l__mermap_mapwest_fp } - \fp_sub:Nn \l_tmpa_fp { 360*floor(\l_tmpa_fp/360) } - \fp_compare:nNnTF \l_tmpa_fp > \l__mermap_westeast_fp + \fp_set:Nn \l__mermap_tmpa_fp { #2-\l__mermap_mapwest_fp } + \fp_sub:Nn \l__mermap_tmpa_fp { 360*floor(\l__mermap_tmpa_fp/360) } + \fp_compare:nNnTF \l__mermap_tmpa_fp > \l__mermap_westeast_fp { \prg_return_false: } { - \fp_set:Nn \l__mermap_cs_x_fp { \l_tmpa_fp*\l__mermap_cs_xfactor_fp } + \fp_set:Nn \l__mermap_cs_x_fp { \l__mermap_tmpa_fp*\l__mermap_cs_xfactor_fp } \__mermap_latitude_to_y:n {#1} \pgfnoderename{mrclastpos}{mrcpos} \pgfcoordinate{mrcpos}{ @@ -366,7 +368,7 @@ } -\prg_new_conditional:Npnn \__mermap_if_in_vicinity:nn #1#2 { p, TF } +\prg_new_conditional:Npnn \__mermap_if_in_vicinity:nn #1#2 { p, T, F, TF } { \fp_compare:nNnTF {#1} > \l__mermap_vic_north_fp { @@ -378,14 +380,14 @@ \prg_return_false: } { - \fp_set:Nn \l_tmpa_fp { #2-\l__mermap_vic_west_fp } - \fp_sub:Nn \l_tmpa_fp { 360*floor(\l_tmpa_fp/360) } - \fp_compare:nNnTF \l_tmpa_fp > \l__mermap_vic_westeast_fp + \fp_set:Nn \l__mermap_tmpa_fp { #2-\l__mermap_vic_west_fp } + \fp_sub:Nn \l__mermap_tmpa_fp { 360*floor(\l__mermap_tmpa_fp/360) } + \fp_compare:nNnTF \l__mermap_tmpa_fp > \l__mermap_vic_westeast_fp { \prg_return_false: } { - \fp_set:Nn \l__mermap_cs_x_fp { \l_tmpa_fp*\l__mermap_cs_xfactor_fp - \l__mermap_vic_dim_fp } + \fp_set:Nn \l__mermap_cs_x_fp { \l__mermap_tmpa_fp*\l__mermap_cs_xfactor_fp - \l__mermap_vic_dim_fp } \__mermap_latitude_to_y:n {#1} \pgfnoderename{mrclastpos}{mrcpos} \pgfcoordinate{mrcpos}{ @@ -443,19 +445,13 @@ \NewExpandableDocumentCommand \mrcNPlat { m } { - \cs_if_exist_use:cF{__mermap__lat__#1} - { - \msg_error:nnx{ mercatormap }{ np-undefined }{ #1 } - } + \cs_if_exist_use:cF{ __mermap__lat__#1 }{ 0 } } \NewExpandableDocumentCommand \mrcNPlon { m } { - \cs_if_exist_use:cF{__mermap__lon__#1} - { - \msg_error:nnx{ mercatormap }{ np-undefined }{ #1 } - } + \cs_if_exist_use:cF{ __mermap__lon__#1 }{ 0 } } @@ -465,15 +461,75 @@ } +\prg_new_conditional:Npnn \__mermap_if_NP_exists:n #1 { p, TF } + { + \cs_if_exist:cTF{ __mermap__lat__#1 } + { + \cs_if_exist:cTF{ __mermap__lon__#1 } + { + \prg_return_true: + } + { + \prg_return_false: + } + } + { + \prg_return_false: + } + } + + +\NewDocumentCommand{\ifmrcNPexists}{ m } + { + \__mermap_if_NP_exists:nTF{ #1 } + } + + +\prg_new_conditional:Npnn \__mermap_if_NP_in_map:n #1 { p, TF } + { + \__mermap_if_NP_exists:nTF { #1 } + { + \__mermap_if_in_map:nnTF{ \mrcNPlat{#1} }{ \mrcNPlon{#1} } + { + \prg_return_true: + } + { + \prg_return_false: + } + } + { + \prg_return_false: + } + } + + \NewDocumentCommand{\ifmrcNPinmap}{ m } { - \__mermap_if_in_map:nnTF{\mrcNPlat{#1}}{\mrcNPlon{#1}} + \__mermap_if_NP_in_map:nTF { #1 } + } + + +\prg_new_conditional:Npnn \__mermap_if_NP_in_vicinity:n #1 { p, TF } + { + \__mermap_if_NP_exists:nTF { #1 } + { + \__mermap_if_in_vicinity:nnTF{ \mrcNPlat{#1} }{ \mrcNPlon{#1} } + { + \prg_return_true: + } + { + \prg_return_false: + } + } + { + \prg_return_false: + } } \NewDocumentCommand{\ifmrcNPinvicinity}{ m } { - \__mermap_if_in_vicinity:nnTF{\mrcNPlat{#1}}{\mrcNPlon{#1}} + \__mermap_if_NP_in_vicinity:nTF{ #1 } } @@ -485,7 +541,7 @@ \char_set_catcode_other:n {`\"} \tl_const:Nn \c__mermap_supply_call_boundaries_tl - {% + { \l__mermap_python_tl\c_space_tl boundaries -u "\str_use:N\l__mermap_supply_url_str" -at "\str_use:N\l__mermap_supply_attribution_str" @@ -503,7 +559,7 @@ } \tl_const:Nn \c__mermap_supply_call_reference_tl - {% + { \l__mermap_python_tl\c_space_tl reference -u "\str_use:N\l__mermap_supply_url_str" -at "\str_use:N\l__mermap_supply_attribution_str" @@ -523,7 +579,7 @@ \tl_const:Nn \c__mermap_supply_call_areafit_tl - {% + { \l__mermap_python_tl\c_space_tl areafit -u "\str_use:N\l__mermap_supply_url_str" -at "\str_use:N\l__mermap_supply_attribution_str" @@ -604,11 +660,11 @@ \cs_new:Npn \__mermap_supply_url_with_api_key:nnn #1#2#3 { \str_set:Nn \l__mermap_supply_url_str {#1} - \prop_get:NnNF \g__mermap_apikey_prop {#2} \l_tmpa_tl + \prop_get:NnNF \g__mermap_apikey_prop {#2} \l__mermap_tmpa_tl { \msg_error:nnx{ mercatormap }{ api-key-undefined }{ #2 } } - \str_put_right:NV \l__mermap_supply_url_str \l_tmpa_tl + \str_put_right:NV \l__mermap_supply_url_str \l__mermap_tmpa_tl \str_put_right:Nn \l__mermap_supply_url_str {#3} } @@ -621,16 +677,16 @@ { \msg_error:nnx{ mercatormap }{ np-undefined }{ ##1 } } - \fp_set:Nn \l_tmpa_fp { \mrcNPlat{##1} } - \fp_compare:nNnT \l_tmpa_fp < \l__mermap_supply_south_fp - { \fp_set_eq:NN \l__mermap_supply_south_fp \l_tmpa_fp } - \fp_compare:nNnT \l_tmpa_fp > \l__mermap_supply_north_fp - { \fp_set_eq:NN \l__mermap_supply_north_fp \l_tmpa_fp } - \fp_set:Nn \l_tmpa_fp { \mrcNPlon{##1} } - \fp_compare:nNnT \l_tmpa_fp < \l__mermap_supply_west_fp - { \fp_set_eq:NN \l__mermap_supply_west_fp \l_tmpa_fp } - \fp_compare:nNnT \l_tmpa_fp > \l__mermap_supply_east_fp - { \fp_set_eq:NN \l__mermap_supply_east_fp \l_tmpa_fp } + \fp_set:Nn \l__mermap_tmpa_fp { \mrcNPlat{##1} } + \fp_compare:nNnT \l__mermap_tmpa_fp < \l__mermap_supply_south_fp + { \fp_set_eq:NN \l__mermap_supply_south_fp \l__mermap_tmpa_fp } + \fp_compare:nNnT \l__mermap_tmpa_fp > \l__mermap_supply_north_fp + { \fp_set_eq:NN \l__mermap_supply_north_fp \l__mermap_tmpa_fp } + \fp_set:Nn \l__mermap_tmpa_fp { \mrcNPlon{##1} } + \fp_compare:nNnT \l__mermap_tmpa_fp < \l__mermap_supply_west_fp + { \fp_set_eq:NN \l__mermap_supply_west_fp \l__mermap_tmpa_fp } + \fp_compare:nNnT \l__mermap_tmpa_fp > \l__mermap_supply_east_fp + { \fp_set_eq:NN \l__mermap_supply_east_fp \l__mermap_tmpa_fp } } } @@ -662,14 +718,14 @@ { \msg_error:nnn { mercatormap }{ input-area-marker }{ #1 } } - \tl_gset:Nx \g_tmpa_tl + \tl_gset:Nx \g__mermap_tmpa_tl { \exp_not:N\fp_set:Nn \exp_not:N\l__mermap_supply_west_fp { \fp_to_decimal:N\l__mermap_supply_west_fp } \exp_not:N\fp_set:Nn \exp_not:N\l__mermap_supply_east_fp { \fp_to_decimal:N\l__mermap_supply_east_fp } \exp_not:N\fp_set:Nn \exp_not:N\l__mermap_supply_south_fp { \fp_to_decimal:N\l__mermap_supply_south_fp } \exp_not:N\fp_set:Nn \exp_not:N\l__mermap_supply_north_fp { \fp_to_decimal:N\l__mermap_supply_north_fp } } - \group_insert_after:N \g_tmpa_tl + \group_insert_after:N \g__mermap_tmpa_tl \group_end: } @@ -715,18 +771,18 @@ _source .choice:, area .code:n = { - \clist_set:Nn \l_tmpa_clist { #1 } + \clist_set:Nn \l__mermap_tmpa_clist { #1 } \fp_set:Nn \l__mermap_supply_west_fp { inf } \fp_set:Nn \l__mermap_supply_east_fp { -inf } \fp_set:Nn \l__mermap_supply_south_fp { 89 } \fp_set:Nn \l__mermap_supply_north_fp { -89 } - \__mermap_supply_add_area_clist:N \l_tmpa_clist + \__mermap_supply_add_area_clist:N \l__mermap_tmpa_clist }, area .value_required:n = true, add~area .code:n = { - \clist_set:Nn \l_tmpa_clist { #1 } - \__mermap_supply_add_area_clist:N \l_tmpa_clist + \clist_set:Nn \l__mermap_tmpa_clist { #1 } + \__mermap_supply_add_area_clist:N \l__mermap_tmpa_clist }, area~from~marker~input .code:n = { @@ -756,20 +812,20 @@ flex~area~fit .code:n = { \fp_compare:nNnF \l__mermap_tile_size_dim = \l__mermap_flex_tile_size_dim { - \fp_set:Nn \l_tmpa_fp { \l__mermap_tile_size_dim/\l__mermap_flex_tile_size_dim } - \fp_set:Nn \l__mermap_supply_width_fp{\l__mermap_supply_width_fp*\l_tmpa_fp} - \fp_set:Nn \l__mermap_supply_height_fp{\l__mermap_supply_height_fp*\l_tmpa_fp} + \fp_set:Nn \l__mermap_tmpa_fp { \l__mermap_tile_size_dim/\l__mermap_flex_tile_size_dim } + \fp_set:Nn \l__mermap_supply_width_fp{\l__mermap_supply_width_fp*\l__mermap_tmpa_fp} + \fp_set:Nn \l__mermap_supply_height_fp{\l__mermap_supply_height_fp*\l__mermap_tmpa_fp} } \fp_set:Nn \l__mermap_supply_width_fp{\l__mermap_supply_width_fp-(#1)/\l__mermap_flex_tile_size_dim} \fp_set:Nn \l__mermap_supply_height_fp{\l__mermap_supply_height_fp-(#1)/\l__mermap_flex_tile_size_dim} - \fp_set:Nn \l_tmpa_fp { min ( 180*\l__mermap_supply_width_fp / (\l__mermap_supply_east_fp-\l__mermap_supply_west_fp) + \fp_set:Nn \l__mermap_tmpa_fp { min ( 180*\l__mermap_supply_width_fp / (\l__mermap_supply_east_fp-\l__mermap_supply_west_fp) , pi*\l__mermap_supply_height_fp / ln( tand(\l__mermap_supply_north_fp/2+45) / tand(\l__mermap_supply_south_fp/2+45) ) ) } - \fp_set:Nn \l_tmpb_fp { ln(\l_tmpa_fp)/ln(2) } - \fp_set:Nn \l_tmpb_fp { round(\l_tmpb_fp)/\l_tmpb_fp } - \fp_set:Nn \l_tmpb_fp { \l_tmpa_fp^(\l_tmpb_fp-1+0.0000001) } - \dim_set:Nn \l__mermap_tile_size_dim { \fp_to_dim:n { \l__mermap_flex_tile_size_dim / \l_tmpb_fp }} - \fp_set:Nn \l__mermap_supply_width_fp { \l__mermap_supply_width_fp * \l_tmpb_fp + (#1)/\l__mermap_tile_size_dim } - \fp_set:Nn \l__mermap_supply_height_fp { \l__mermap_supply_height_fp * \l_tmpb_fp + (#1)/\l__mermap_tile_size_dim } + \fp_set:Nn \l__mermap_tmpb_fp { ln(\l__mermap_tmpa_fp)/ln(2) } + \fp_set:Nn \l__mermap_tmpb_fp { round(\l__mermap_tmpb_fp)/\l__mermap_tmpb_fp } + \fp_set:Nn \l__mermap_tmpb_fp { \l__mermap_tmpa_fp^(\l__mermap_tmpb_fp-1+0.0000001) } + \dim_set:Nn \l__mermap_tile_size_dim { \fp_to_dim:n { \l__mermap_flex_tile_size_dim / \l__mermap_tmpb_fp }} + \fp_set:Nn \l__mermap_supply_width_fp { \l__mermap_supply_width_fp * \l__mermap_tmpb_fp + (#1)/\l__mermap_tile_size_dim } + \fp_set:Nn \l__mermap_supply_height_fp { \l__mermap_supply_height_fp * \l__mermap_tmpb_fp + (#1)/\l__mermap_tile_size_dim } }, flex~area~fit .default:n = 0pt, } @@ -815,16 +871,13 @@ \msg_new:nnn { mercatormap }{ python-script } - { Python~script~'maptiles.texpy'~is~created~(for~map~tile~download). } + { Python~script~'maptiles.texpy'~is~created~for~map~tile~download. } \NewDocumentCommand \mrcactivatescript {} { \msg_info:nn { mercatormap }{ python-script } - \group_begin: - \def\@latex@warning@no@line##1{}% suppress filecontents warning \file_input:n {\mrcpkgprefix mercatorpy.def} - \group_end: \bool_set_true:N \l__mermap_script_activated_bool } \@onlypreamble\mrcactivatescript @@ -838,21 +891,21 @@ \cs_new:Npn \__mermap_create_definition_id:n #1 { - \tl_set:Nx \l_tmpa_tl {#1} - \tl_trim_spaces:N \l_tmpa_tl - \str_set:Nx \l__mermap_definition_postfix_str {\tl_to_str:N \l_tmpa_tl} + \tl_set:Nx \l__mermap_tmpa_tl {#1} + \tl_trim_spaces:N \l__mermap_tmpa_tl + \str_set:Nx \l__mermap_definition_postfix_str {\tl_to_str:N \l__mermap_tmpa_tl} \str_concat:NNN \l__mermap_definition_id_str \l__mermap_definition_prefix_str \l__mermap_definition_postfix_str } \cs_new:Npn \__mermap_map:nn #1#2 { - \tl_set:Nx \l_tmpa_tl {#2} - \tl_trim_spaces:N \l_tmpa_tl - \tl_if_empty:NT \l_tmpa_tl + \tl_set:Nx \l__mermap_tmpa_tl {#2} + \tl_trim_spaces:N \l__mermap_tmpa_tl + \tl_if_empty:NT \l__mermap_tmpa_tl { \int_gincr:N \g__mermap_automap_int - \tl_set:Nx \l_tmpa_tl + \tl_set:Nx \l__mermap_tmpa_tl { automap- \int_compare:nNnTF \g__mermap_automap_int<{10} {000} @@ -865,7 +918,7 @@ \int_use:N \g__mermap_automap_int } } - \str_set:Nx \l__mermap_definition_postfix_str {\tl_to_str:N \l_tmpa_tl} + \str_set:Nx \l__mermap_definition_postfix_str {\tl_to_str:N \l__mermap_tmpa_tl} \str_concat:NNN \l__mermap_definition_id_str \l__mermap_definition_prefix_str \l__mermap_definition_postfix_str \__mermap_supplymap:n {#1} @@ -886,12 +939,12 @@ { \group_begin: \keys_set:nn { mermap/supply } { #1 } - \tl_set:Nx \l_tmpa_tl { \str_use:N\l__mermap_definition_id_str } - \prop_if_in:NVT \g__mermap_definition_prop \l_tmpa_tl + \tl_set:Nx \l__mermap_tmpa_tl { \str_use:N\l__mermap_definition_id_str } + \prop_if_in:NVT \g__mermap_definition_prop \l__mermap_tmpa_tl { - \msg_warning:nnx { mercatormap }{ definition-id-used }{ \tl_use:N \l_tmpa_tl } + \msg_warning:nnx { mercatormap }{ definition-id-used }{ \tl_use:N \l__mermap_tmpa_tl } } - \prop_gput:NVn \g__mermap_definition_prop \l_tmpa_tl {} + \prop_gput:NVn \g__mermap_definition_prop \l__mermap_tmpa_tl {} \bool_if:NT \l__mermap_script_activated_bool { \__mermap_supplymap_call: @@ -927,10 +980,10 @@ \cs_new:Npn \__mermap_supplymap_call: { - \tl_set_eq:Nc \l_tmpa_tl { + \tl_set_eq:Nc \l__mermap_tmpa_tl { c__mermap_supply_call_\l__mermap_supply_type_tl _tl } - \tl_set:Nx \l__mermap_supply_call_tl \l_tmpa_tl - \tl_set:Nx \l__mermap_mdfivesum_tl { \pdf@mdfivesum{\l__mermap_supply_call_tl} } + \tl_set:Nx \l__mermap_supply_call_tl \l__mermap_tmpa_tl + \tl_set:Nx \l__mermap_mdfivesum_tl { \str_mdfive_hash:e{\l__mermap_supply_call_tl} } \file_if_exist:nTF {\l__mermap_definition_id_str.def} { \tl_clear:N \l__mermap_last_mdfivesum_tl @@ -1031,8 +1084,8 @@ \cs_new_nopar:Npn \__mermap_set_flex_scale:nn #1#2 { - \fp_set:Nn \l_tmpa_fp { 1+ln(\c__mermap_mean_radius_fp/#1*cosd(#2)*pi/\l__mermap_flex_tile_size_dim)/ln(2) } - \keys_set:nn { mermap }{ flex~zoom=\l_tmpa_fp } + \fp_set:Nn \l__mermap_tmpa_fp { 1+ln(\c__mermap_mean_radius_fp/#1*cosd(#2)*pi/\l__mermap_flex_tile_size_dim)/ln(2) } + \keys_set:nn { mermap }{ flex~zoom=\l__mermap_tmpa_fp } } \use:x @@ -1323,19 +1376,19 @@ \cs_new_nopar:Npn \__mermap_compute_network_step:nn #1#2 { - \fp_set:Nn \l_tmpa_fp + \fp_set:Nn \l__mermap_tmpa_fp { min ( \l__mermap_network_pieces_int, round((#1)/\l__mermap_network_distance_dim) ) } - \fp_set:Nn \l_tmpb_fp { (#2)/\l_tmpa_fp } - \fp_set:Nn \l_tmpa_fp { floor(ln(\l_tmpb_fp)/ln(10)) } - \fp_compare:nNnTF {\l_tmpa_fp} < {0} + \fp_set:Nn \l__mermap_tmpb_fp { (#2)/\l__mermap_tmpa_fp } + \fp_set:Nn \l__mermap_tmpa_fp { floor(ln(\l__mermap_tmpb_fp)/ln(10)) } + \fp_compare:nNnTF {\l__mermap_tmpa_fp} < {0} { - \fp_compare:nNnTF {\l_tmpa_fp} > {-5} + \fp_compare:nNnTF {\l__mermap_tmpa_fp} > {-5} { \use:x { - \exp_not:N\keys_set:nn { mermap }{ format~angle=decimal\fp_to_int:N\l_tmpa_fp} + \exp_not:N\keys_set:nn { mermap }{ format~angle=decimal\fp_to_int:N\l__mermap_tmpa_fp} } } { @@ -1345,25 +1398,25 @@ { \keys_set:nn { mermap }{ format~angle=decimal-0 } } - \fp_set:Nn \l_tmpa_fp { 10^\l_tmpa_fp } - \fp_set:Nn \l_tmpb_fp { \l_tmpb_fp/\l_tmpa_fp } - \fp_compare:nNnTF {abs(\l_tmpb_fp-1)} < {abs(\l_tmpb_fp-2)} + \fp_set:Nn \l__mermap_tmpa_fp { 10^\l__mermap_tmpa_fp } + \fp_set:Nn \l__mermap_tmpb_fp { \l__mermap_tmpb_fp/\l__mermap_tmpa_fp } + \fp_compare:nNnTF {abs(\l__mermap_tmpb_fp-1)} < {abs(\l__mermap_tmpb_fp-2)} { - \fp_compare:nNnTF {abs(\l_tmpb_fp-1)} < {abs(\l_tmpb_fp-5)} + \fp_compare:nNnTF {abs(\l__mermap_tmpb_fp-1)} < {abs(\l__mermap_tmpb_fp-5)} { - \fp_set:Nn \l__mermap_result_fp {\l_tmpa_fp} + \fp_set:Nn \l__mermap_result_fp {\l__mermap_tmpa_fp} } { - \fp_set:Nn \l__mermap_result_fp {5*\l_tmpa_fp} + \fp_set:Nn \l__mermap_result_fp {5*\l__mermap_tmpa_fp} } } { - \fp_compare:nNnTF {abs(\l_tmpb_fp-2)} < {abs(\l_tmpb_fp-5)} + \fp_compare:nNnTF {abs(\l__mermap_tmpb_fp-2)} < {abs(\l__mermap_tmpb_fp-5)} { - \fp_set:Nn \l__mermap_result_fp {2*\l_tmpa_fp} + \fp_set:Nn \l__mermap_result_fp {2*\l__mermap_tmpa_fp} } { - \fp_set:Nn \l__mermap_result_fp {5*\l_tmpa_fp} + \fp_set:Nn \l__mermap_result_fp {5*\l__mermap_tmpa_fp} } } } @@ -1376,46 +1429,46 @@ \IfNoValueF {#1} { \keys_set:nn { mermap } {#1} } \tl_use:N \l__mermap_tikz_map_clip_tl \__mermap_compute_network_step:nn {\l__mermap_tex_height_fp}{\l__mermap_mapnorth_fp-\l__mermap_mapsouth_fp} - \fp_set:Nn \l_tmpa_fp { ceil(\l__mermap_mapsouth_fp/\l__mermap_result_fp)*\l__mermap_result_fp} - \fp_compare:nNnT {\l_tmpa_fp-\l__mermap_mapsouth_fp} < {1e-10} + \fp_set:Nn \l__mermap_tmpa_fp { ceil(\l__mermap_mapsouth_fp/\l__mermap_result_fp)*\l__mermap_result_fp} + \fp_compare:nNnT {\l__mermap_tmpa_fp-\l__mermap_mapsouth_fp} < {1e-10} { - \fp_add:Nn \l_tmpa_fp {\l__mermap_result_fp} + \fp_add:Nn \l__mermap_tmpa_fp {\l__mermap_result_fp} } - \fp_while_do:nNnn {\l_tmpa_fp} < {\l__mermap_mapnorth_fp} + \fp_while_do:nNnn {\l__mermap_tmpa_fp} < {\l__mermap_mapnorth_fp} { - \tl_set:Nn \l_tmpa_tl {\fp_use:N\l_tmpa_fp} - \draw[gray,very~thin] (mrc~cs\c_colon_str lat=\l_tmpa_tl,lon=\mrcmapwest) + \tl_set:Nn \l__mermap_tmpa_tl {\fp_use:N\l__mermap_tmpa_fp} + \draw[gray,very~thin] (mrc~cs\c_colon_str lat=\l__mermap_tmpa_tl,lon=\mrcmapwest) coordinate (mermap_temp) node[right=1mm,inner~sep=0.5pt,black!50!gray,font=\l__mermap_network_font_tl, fill=white,opacity=0.3,text~opacity=1, - ]{\mrcformlat{\l_tmpa_tl}} + ]{\mrcformlat{\l__mermap_tmpa_tl}} -- (mermap_temp -| mrcmap.east) node[left=1mm,inner~sep=0.5pt,black!50!gray,font=\l__mermap_network_font_tl, fill=white,opacity=0.3,text~opacity=1, - ]{\mrcformlat{\l_tmpa_tl}} + ]{\mrcformlat{\l__mermap_tmpa_tl}} ; - \fp_add:Nn \l_tmpa_fp {\l__mermap_result_fp} + \fp_add:Nn \l__mermap_tmpa_fp {\l__mermap_result_fp} } \__mermap_compute_network_step:nn {\l__mermap_tex_width_fp}{\l__mermap_mapeast_fp-\l__mermap_mapwest_fp} - \fp_set:Nn \l_tmpa_fp { ceil(\l__mermap_mapwest_fp/\l__mermap_result_fp)*\l__mermap_result_fp} - \fp_compare:nNnT {\l_tmpa_fp-\l__mermap_mapwest_fp} < {1e-10} + \fp_set:Nn \l__mermap_tmpa_fp { ceil(\l__mermap_mapwest_fp/\l__mermap_result_fp)*\l__mermap_result_fp} + \fp_compare:nNnT {\l__mermap_tmpa_fp-\l__mermap_mapwest_fp} < {1e-10} { - \fp_add:Nn \l_tmpa_fp {\l__mermap_result_fp} + \fp_add:Nn \l__mermap_tmpa_fp {\l__mermap_result_fp} } - \fp_while_do:nNnn {\l_tmpa_fp} < {\l__mermap_mapeast_fp} + \fp_while_do:nNnn {\l__mermap_tmpa_fp} < {\l__mermap_mapeast_fp} { - \tl_set:Nn \l_tmpa_tl {\fp_use:N\l_tmpa_fp} - \draw[gray,very~thin] (mrc~cs\c_colon_str lon=\l_tmpa_tl,lat=\mrcmapsouth) + \tl_set:Nn \l__mermap_tmpa_tl {\fp_use:N\l__mermap_tmpa_fp} + \draw[gray,very~thin] (mrc~cs\c_colon_str lon=\l__mermap_tmpa_tl,lat=\mrcmapsouth) coordinate (mermap_temp) node[above=1mm,inner~sep=0.5pt,black!50!gray,font=\l__mermap_network_font_tl, fill=white,opacity=0.3,text~opacity=1, - ]{\mrcformlon{\l_tmpa_tl}} + ]{\mrcformlon{\l__mermap_tmpa_tl}} -- (mermap_temp |- mrcmap.north) node[below=1mm,inner~sep=0.5pt,black!50!gray,font=\l__mermap_network_font_tl, fill=white,opacity=0.3,text~opacity=1, - ]{\mrcformlon{\l_tmpa_tl}} + ]{\mrcformlon{\l__mermap_tmpa_tl}} ; - \fp_add:Nn \l_tmpa_fp {\l__mermap_result_fp} + \fp_add:Nn \l__mermap_tmpa_fp {\l__mermap_result_fp} } \end{scope} } @@ -1488,26 +1541,26 @@ \cs_new_nopar:Npn \__mermap_pretty_distance:n #1 { - \fp_set:Nn \l_tmpa_fp { #1 } - \fp_compare:nNnTF \l_tmpa_fp < 5 + \fp_set:Nn \l__mermap_tmpa_fp { #1 } + \fp_compare:nNnTF \l__mermap_tmpa_fp < 5 { - \SI[round-mode=figures,round-precision=3,detect-all]{\fp_to_decimal:n{1000*\l_tmpa_fp}}{\meter} + \SI[round-mode=figures,round-precision=3,detect-all]{\fp_to_decimal:n{1000*\l__mermap_tmpa_fp}}{\meter} } { - \SI[round-mode=figures,round-precision=3,detect-all]{\fp_to_decimal:N \l_tmpa_fp}{\kilo\meter} + \SI[round-mode=figures,round-precision=3,detect-all]{\fp_to_decimal:N \l__mermap_tmpa_fp}{\kilo\meter} } } \cs_new_nopar:Npn \__mermap_pretty_length:n #1 { - \fp_set:Nn \l_tmpa_fp { (#1)*\l__mermap_scale_fp } - \fp_compare:nNnTF \l_tmpa_fp < 5 + \fp_set:Nn \l__mermap_tmpa_fp { (#1)*\l__mermap_scale_fp } + \fp_compare:nNnTF \l__mermap_tmpa_fp < 5 { - \SI[round-mode=figures,round-precision=3,detect-all]{\fp_to_decimal:n{1000*\l_tmpa_fp}}{\meter} + \SI[round-mode=figures,round-precision=3,detect-all]{\fp_to_decimal:n{1000*\l__mermap_tmpa_fp}}{\meter} } { - \SI[round-mode=figures,round-precision=3,detect-all]{\fp_to_decimal:N \l_tmpa_fp}{\kilo\meter} + \SI[round-mode=figures,round-precision=3,detect-all]{\fp_to_decimal:N \l__mermap_tmpa_fp}{\kilo\meter} } } @@ -1535,25 +1588,25 @@ \cs_new_nopar:Npn \__mermap_format_angle_minute:n #1 { - \fp_set:Nn \l_tmpa_fp {floor(#1)} - \fp_set:Nn \l_tmpb_fp {round((#1-\l_tmpa_fp)*60)} + \fp_set:Nn \l__mermap_tmpa_fp {floor(#1)} + \fp_set:Nn \l__mermap_tmpb_fp {round((#1-\l__mermap_tmpa_fp)*60)} \ang[add-arc-degree-zero,add-arc-minute-zero] { - \fp_to_int:N \l_tmpa_fp ; - \fp_to_int:N \l_tmpb_fp ; + \fp_to_int:N \l__mermap_tmpa_fp ; + \fp_to_int:N \l__mermap_tmpb_fp ; } } \cs_new_nopar:Npn \__mermap_format_angle_second:n #1 { - \fp_set:Nn \l_tmpa_fp {floor(#1)} - \fp_set:Nn \l_tmpb_fp {floor((#1-\l_tmpa_fp)*60)} + \fp_set:Nn \l__mermap_tmpa_fp {floor(#1)} + \fp_set:Nn \l__mermap_tmpb_fp {floor((#1-\l__mermap_tmpa_fp)*60)} \ang[add-arc-degree-zero,add-arc-minute-zero] { - \fp_to_int:N \l_tmpa_fp ; - \fp_to_int:N \l_tmpb_fp ; - \fp_to_int:n {round(((#1-\l_tmpa_fp)*60-\l_tmpb_fp)*60)} + \fp_to_int:N \l__mermap_tmpa_fp ; + \fp_to_int:N \l__mermap_tmpb_fp ; + \fp_to_int:n {round(((#1-\l__mermap_tmpa_fp)*60-\l__mermap_tmpb_fp)*60)} } } @@ -1562,14 +1615,14 @@ \group_begin: \IfNoValueF {#1} { \keys_set:nn { mermap } {#1} } - \fp_set:Nn \l_tmpa_fp {#2} - \fp_compare:nNnTF \l_tmpa_fp < 0 + \fp_set:Nn \l__mermap_tmpa_fp {#2} + \fp_compare:nNnTF \l__mermap_tmpa_fp < 0 { - \tl_set:Nx \l__mermap_temp_tl {\fp_to_decimal:n{-\l_tmpa_fp}} + \tl_set:Nx \l__mermap_temp_tl {\fp_to_decimal:n{-\l__mermap_tmpa_fp}} \__mermap_format_south:n {\__mermap_format_angle:n{\l__mermap_temp_tl}} } { - \tl_set:Nx \l__mermap_temp_tl {\fp_to_decimal:N \l_tmpa_fp} + \tl_set:Nx \l__mermap_temp_tl {\fp_to_decimal:N \l__mermap_tmpa_fp} \__mermap_format_north:n {\__mermap_format_angle:n{\l__mermap_temp_tl}} } \group_end: @@ -1580,14 +1633,14 @@ \group_begin: \IfNoValueF {#1} { \keys_set:nn { mermap } {#1} } - \fp_set:Nn \l_tmpa_fp {#2-360*floor((#2+180)/360)} - \fp_compare:nNnTF \l_tmpa_fp < 0 + \fp_set:Nn \l__mermap_tmpa_fp {#2-360*floor((#2+180)/360)} + \fp_compare:nNnTF \l__mermap_tmpa_fp < 0 { - \tl_set:Nx \l__mermap_temp_tl {\fp_to_decimal:n{-\l_tmpa_fp}} + \tl_set:Nx \l__mermap_temp_tl {\fp_to_decimal:n{-\l__mermap_tmpa_fp}} \__mermap_format_west:n{\__mermap_format_angle:n{\l__mermap_temp_tl}} } { - \tl_set:Nx \l__mermap_temp_tl {\fp_to_decimal:N \l_tmpa_fp} + \tl_set:Nx \l__mermap_temp_tl {\fp_to_decimal:N \l__mermap_tmpa_fp} \__mermap_format_east:n {\__mermap_format_angle:n{\l__mermap_temp_tl}} } \group_end: @@ -1608,22 +1661,22 @@ { \tl_if_empty:nTF {#5} { - \fp_set:Nn \l_tmpa_fp {0} - \fp_set:Nn \l_tmpb_fp {0} + \fp_set:Nn \l__mermap_tmpa_fp {0} + \fp_set:Nn \l__mermap_tmpb_fp {0} } { - \fp_set:Nn \l_tmpa_fp {#3*(#5)} + \fp_set:Nn \l__mermap_tmpa_fp {#3*(#5)} \tl_if_empty:nTF {#6} { - \fp_set:Nn \l_tmpb_fp {#4*(#5)} + \fp_set:Nn \l__mermap_tmpb_fp {#4*(#5)} } { - \fp_set:Nn \l_tmpb_fp {#4*(#6)} + \fp_set:Nn \l__mermap_tmpb_fp {#4*(#6)} } } \tl_set:Nx \l__mermap_scalebar_at_tl { - {([xshift=\fp_to_dim:N\l_tmpa_fp,yshift=\fp_to_dim:N\l_tmpb_fp]mrcmap.#1)} + {([xshift=\fp_to_dim:N\l__mermap_tmpa_fp,yshift=\fp_to_dim:N\l__mermap_tmpb_fp]mrcmap.#1)} } \tl_set:Nn \l__mermap_scalebar_placement_tl {#2} } @@ -1691,60 +1744,56 @@ \begin{scope}[shift=(mrcscalebar.south~west)] \__mermap_tikz_path_begin:n { fill=black, mrcscalebarmajor } \pgfseteorule - \fp_set:Nn \l_tmpa_fp {\l__mermap_scalebar_width_fp/\l__mermap_scale_fp} % Breite + \fp_set:Nn \l__mermap_tmpa_fp {\l__mermap_scalebar_width_fp/\l__mermap_scale_fp} % Breite \pgfpathrectangle{\pgfpoint{0pt}{0pt}} - {\pgfpoint{\fp_to_dim:N\l_tmpa_fp}{\l__mermap_scalebar_height_dim}} + {\pgfpoint{\fp_to_dim:N\l__mermap_tmpa_fp}{\l__mermap_scalebar_height_dim}} \bool_if:NF \l__mermap_scalebar_transparent_bool { \__mermap_tikz_path_end: \__mermap_tikz_path_begin:n { fill=white, mrcscalebarminor } - \fp_set:Nn \l_tmpa_fp {\l__mermap_scalebar_width_fp/\l__mermap_scale_fp} + \fp_set:Nn \l__mermap_tmpa_fp {\l__mermap_scalebar_width_fp/\l__mermap_scale_fp} } - \fp_set:Nn \l_tmpb_fp {\l_tmpa_fp/\l__mermap_scalebar_partitions_int} + \fp_set:Nn \l__mermap_tmpb_fp {\l__mermap_tmpa_fp/\l__mermap_scalebar_partitions_int} \bool_if:NTF \l__mermap_scalebar_double_bool { - \int_set:Nn \l_tmpa_int {1} - \dim_set:Nn \l_tmpb_dim {\l__mermap_scalebar_height_dim/2} - \dim_set:Nn \l_tmpa_dim {0.2pt-\l_tmpb_dim} + \dim_set:Nn \l__mermap_tmpb_dim {\l__mermap_scalebar_height_dim/2} + \dim_set:Nn \l__mermap_tmpa_dim {0.2pt-\l__mermap_tmpb_dim} \int_compare:nNnTF \l__mermap_scalebar_partitions_int = 1 { - \pgfpathrectangle{\pgfpoint{0.2pt}{\l_tmpb_dim}} - {\pgfpoint{\fp_to_dim:n{\l_tmpb_fp-0.4pt}}{\l_tmpa_dim}} + \pgfpathrectangle{\pgfpoint{0.2pt}{\l__mermap_tmpb_dim}} + {\pgfpoint{\fp_to_dim:n{\l__mermap_tmpb_fp-0.4pt}}{\l__mermap_tmpa_dim}} } { - \pgfpathrectangle{\pgfpoint{0.2pt}{\l_tmpb_dim}} - {\pgfpoint{\fp_to_dim:n{\l_tmpb_fp-0.2pt}}{\l_tmpa_dim}} + \pgfpathrectangle{\pgfpoint{0.2pt}{\l__mermap_tmpb_dim}} + {\pgfpoint{\fp_to_dim:n{\l__mermap_tmpb_fp-0.2pt}}{\l__mermap_tmpa_dim}} } - \int_while_do:nNnn \l_tmpa_int < \l__mermap_scalebar_partitions_int + \int_step_inline:nn { \l__mermap_scalebar_partitions_int-1 } { - \dim_set:Nn \l_tmpa_dim {-\l_tmpa_dim} - \int_compare:nNnTF {\l_tmpa_int+1} = \l__mermap_scalebar_partitions_int + \dim_set:Nn \l__mermap_tmpa_dim {-\l__mermap_tmpa_dim} + \int_compare:nNnTF {##1+1} = \l__mermap_scalebar_partitions_int { - \pgfpathrectangle{\pgfpoint{\fp_to_dim:n{\l_tmpa_int*\l_tmpb_fp}}{\l_tmpb_dim}} - {\pgfpoint{\fp_to_dim:n{\l_tmpb_fp-0.2pt}}{\l_tmpa_dim}} + \pgfpathrectangle{\pgfpoint{\fp_to_dim:n{##1*\l__mermap_tmpb_fp}}{\l__mermap_tmpb_dim}} + {\pgfpoint{\fp_to_dim:n{\l__mermap_tmpb_fp-0.2pt}}{\l__mermap_tmpa_dim}} } { - \pgfpathrectangle{\pgfpoint{\fp_to_dim:n{\l_tmpa_int*\l_tmpb_fp}}{\l_tmpb_dim}} - {\pgfpoint{\fp_to_dim:N\l_tmpb_fp}{\l_tmpa_dim}} + \pgfpathrectangle{\pgfpoint{\fp_to_dim:n{##1*\l__mermap_tmpb_fp}}{\l__mermap_tmpb_dim}} + {\pgfpoint{\fp_to_dim:N\l__mermap_tmpb_fp}{\l__mermap_tmpa_dim}} } - \int_incr:N \l_tmpa_int } } { - \int_set:Nn \l_tmpa_int {1} - \dim_set:Nn \l_tmpa_dim {\l__mermap_scalebar_height_dim-0.4pt} - \int_while_do:nNnn \l_tmpa_int < \l__mermap_scalebar_partitions_int + \dim_set:Nn \l__mermap_tmpa_dim {\l__mermap_scalebar_height_dim-0.4pt} + \int_step_inline:nnnn { 1 }{ 2 }{ \l__mermap_scalebar_partitions_int-1 } { - \int_compare:nNnTF {\l_tmpa_int+1} = \l__mermap_scalebar_partitions_int + \int_compare:nNnTF {##1+1} = \l__mermap_scalebar_partitions_int { - \pgfpathrectangle{\pgfpoint{\fp_to_dim:n{\l_tmpa_int*\l_tmpb_fp}}{0.2pt}} - {\pgfpoint{\fp_to_dim:n{\l_tmpb_fp-0.2pt}}{\l_tmpa_dim}} + \pgfpathrectangle{\pgfpoint{\fp_to_dim:n{##1*\l__mermap_tmpb_fp}}{0.2pt}} + {\pgfpoint{\fp_to_dim:n{\l__mermap_tmpb_fp-0.2pt}}{\l__mermap_tmpa_dim}} } { - \pgfpathrectangle{\pgfpoint{\fp_to_dim:n{\l_tmpa_int*\l_tmpb_fp}}{0.2pt}} - {\pgfpoint{\fp_to_dim:N\l_tmpb_fp}{\l_tmpa_dim}} + \pgfpathrectangle{\pgfpoint{\fp_to_dim:n{##1*\l__mermap_tmpb_fp}}{0.2pt}} + {\pgfpoint{\fp_to_dim:N\l__mermap_tmpb_fp}{\l__mermap_tmpa_dim}} } - \int_add:Nn \l_tmpa_int {2} } } \__mermap_tikz_path_end: @@ -2032,53 +2081,53 @@ \__mermap_new_marker_type:nn {pin} { - \tl_set:Nx \l_tmpa_tl {\fp_to_dim:N \l__mermap_marker_distance_fp} + \tl_set:Nx \l__mermap_tmpa_tl {\fp_to_dim:N \l__mermap_marker_distance_fp} \path[fill=mrcmarkerfill,draw=none,fill~opacity=0.7] - (0,0) -- (0.1,\l_tmpa_tl) -- (-0.1,\l_tmpa_tl) -- cycle; + (0,0) -- (0.1,\l__mermap_tmpa_tl) -- (-0.1,\l__mermap_tmpa_tl) -- cycle; \node[fill=white,draw=none,text=mrcmarkertext, above,font=\mrcmarkerfont,inner~sep=0.5mm,align=center, line~width=0mm,xshift=\mrcmarkershift, fill~opacity=0.7,text~opacity=1,xshift=0mm,mrcnodestyle,mrchyperpath] - (pin_node) at (0,\l_tmpa_tl) {\mrcmarkercontents}; + (pin_node) at (0,\l__mermap_tmpa_tl) {\mrcmarkercontents}; \path[draw=mrcmarkerdraw,fill=none,line~join=round,mrcpathstyle] - (0,0) -- (0.1,\l_tmpa_tl) -- (pin_node.south~east) -- (pin_node.north~east) + (0,0) -- (0.1,\l__mermap_tmpa_tl) -- (pin_node.south~east) -- (pin_node.north~east) -- (pin_node.north~west) -- (pin_node.south~west) - -- (-0.1,\l_tmpa_tl) [line~join=bevel] -- cycle; + -- (-0.1,\l__mermap_tmpa_tl) [line~join=bevel] -- cycle; } \__mermap_new_marker_type:nn {pinflip} { - \tl_set:Nx \l_tmpa_tl {\fp_to_dim:N \l__mermap_marker_distance_fp} + \tl_set:Nx \l__mermap_tmpa_tl {\fp_to_dim:N \l__mermap_marker_distance_fp} \path[fill=mrcmarkerfill,draw=none,fill~opacity=0.7] - (0,0) -- (-0.1,-\l_tmpa_tl) -- (0.1,-\l_tmpa_tl) -- cycle; + (0,0) -- (-0.1,-\l__mermap_tmpa_tl) -- (0.1,-\l__mermap_tmpa_tl) -- cycle; \node[fill=white,draw=none,text=mrcmarkertext, below,font=\mrcmarkerfont,inner~sep=0.5mm,align=center, line~width=0mm,xshift=\mrcmarkershift, fill~opacity=0.7,text~opacity=1,xshift=0mm,mrcnodestyle,mrchyperpath] - (pin_node) at (0,-\l_tmpa_tl) {\mrcmarkercontents}; + (pin_node) at (0,-\l__mermap_tmpa_tl) {\mrcmarkercontents}; \path[draw=mrcmarkerdraw,fill=none,line~join=round,mrcpathstyle] - (0,0) -- (-0.1,-\l_tmpa_tl) -- (pin_node.north~west) -- (pin_node.south~west) + (0,0) -- (-0.1,-\l__mermap_tmpa_tl) -- (pin_node.north~west) -- (pin_node.south~west) -- (pin_node.south~east) -- (pin_node.north~east) - -- (0.1,-\l_tmpa_tl) [line~join=bevel] -- cycle; + -- (0.1,-\l__mermap_tmpa_tl) [line~join=bevel] -- cycle; } \cs_new_nopar:Npn \__mermap_tikz_drop_path:n #1 { - \tl_set:Nn \l_tmpa_tl {\fp_to_dim:N\l__mermap_marker_radius_fp} - \tl_set:Nn \l_tmpb_tl {\fp_to_dim:n{\l__mermap_marker_radius_fp*0.552}} + \tl_set:Nn \l__mermap_tmpa_tl {\fp_to_dim:N\l__mermap_marker_radius_fp} + \tl_set:Nn \l__mermap_tmpb_tl {\fp_to_dim:n{\l__mermap_marker_radius_fp*0.552}} \__mermap_tikz_path_begin:n { line~join=bevel,draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle,mrchyperpath } \pgfpathmoveto{\pgfpoint{0pt}{\fp_to_dim:n{-2*\l__mermap_marker_radius_fp-\l__mermap_marker_shift_fp}}} - \pgfpathcurveto{\pgfpoint{\l_tmpb_tl}{-\l_tmpa_tl}}{\pgfpoint{\l_tmpa_tl}{-\l_tmpb_tl}} - {\pgfpoint{\l_tmpa_tl}{0pt}} - \pgfpathcurveto{\pgfpoint{\l_tmpa_tl}{\l_tmpb_tl}}{\pgfpoint{\l_tmpb_tl}{\l_tmpa_tl}} - {\pgfpoint{0pt}{\l_tmpa_tl}} - \pgfpathcurveto{\pgfpoint{-\l_tmpb_tl}{\l_tmpa_tl}}{\pgfpoint{-\l_tmpa_tl}{\l_tmpb_tl}} - {\pgfpoint{-\l_tmpa_tl}{0pt}} - \pgfpathcurveto{\pgfpoint{-\l_tmpa_tl}{-\l_tmpb_tl}}{\pgfpoint{-\l_tmpb_tl}{-\l_tmpa_tl}} + \pgfpathcurveto{\pgfpoint{\l__mermap_tmpb_tl}{-\l__mermap_tmpa_tl}}{\pgfpoint{\l__mermap_tmpa_tl}{-\l__mermap_tmpb_tl}} + {\pgfpoint{\l__mermap_tmpa_tl}{0pt}} + \pgfpathcurveto{\pgfpoint{\l__mermap_tmpa_tl}{\l__mermap_tmpb_tl}}{\pgfpoint{\l__mermap_tmpb_tl}{\l__mermap_tmpa_tl}} + {\pgfpoint{0pt}{\l__mermap_tmpa_tl}} + \pgfpathcurveto{\pgfpoint{-\l__mermap_tmpb_tl}{\l__mermap_tmpa_tl}}{\pgfpoint{-\l__mermap_tmpa_tl}{\l__mermap_tmpb_tl}} + {\pgfpoint{-\l__mermap_tmpa_tl}{0pt}} + \pgfpathcurveto{\pgfpoint{-\l__mermap_tmpa_tl}{-\l__mermap_tmpb_tl}}{\pgfpoint{-\l__mermap_tmpb_tl}{-\l__mermap_tmpa_tl}} {\pgfpoint{0pt}{\fp_to_dim:n{-2*\l__mermap_marker_radius_fp-\l__mermap_marker_shift_fp}}} \pgfpathclose #1 @@ -2089,14 +2138,14 @@ { \node[circle,inner~sep=0pt,font=\mrcmarkerfont,text=mrcmarkertext,mrcnodestyle] { - \hbox_set:Nn \l_tmpa_box {\mrcmarkercontents} - \fp_compare:nNnT {\box_wd:N \l_tmpa_box} > {1.5*\l__mermap_marker_radius_fp} + \hbox_set:Nn \l__mermap_tmpa_box {\mrcmarkercontents} + \fp_compare:nNnT {\box_wd:N \l__mermap_tmpa_box} > {1.5*\l__mermap_marker_radius_fp} { - \box_resize_to_wd_and_ht:Nnn \l_tmpa_box + \box_resize_to_wd_and_ht:Nnn \l__mermap_tmpa_box {\fp_to_dim:n {1.5*\l__mermap_marker_radius_fp}} - {\box_ht:N \l_tmpa_box} + {\box_ht:N \l__mermap_tmpa_box} } - \box_use_drop:N \l_tmpa_box + \box_use_drop:N \l__mermap_tmpa_box }; } @@ -2153,22 +2202,22 @@ \__mermap_new_marker_type:nn {ringx} { - \tl_set:Nn \l_tmpa_tl {\fp_to_dim:N\l__mermap_marker_radius_fp} + \tl_set:Nn \l__mermap_tmpa_tl {\fp_to_dim:N\l__mermap_marker_radius_fp} \path[draw=mrcmarkerdraw,very~thin] - (45 \c_colon_str \l_tmpa_tl)--(225\c_colon_str \l_tmpa_tl) - (135\c_colon_str \l_tmpa_tl)--(315\c_colon_str \l_tmpa_tl); + (45 \c_colon_str \l__mermap_tmpa_tl)--(225\c_colon_str \l__mermap_tmpa_tl) + (135\c_colon_str \l__mermap_tmpa_tl)--(315\c_colon_str \l__mermap_tmpa_tl); \path[draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle,mrchyperpath,even~odd~rule] - circle (\l_tmpa_tl) circle (\fp_to_dim:N\l__mermap_marker_inner_radius_fp); + circle (\l__mermap_tmpa_tl) circle (\fp_to_dim:N\l__mermap_marker_inner_radius_fp); } \__mermap_new_marker_type:nn {markx} { - \tl_set:Nn \l_tmpa_tl {\fp_to_dim:N\l__mermap_marker_radius_fp} + \tl_set:Nn \l__mermap_tmpa_tl {\fp_to_dim:N\l__mermap_marker_radius_fp} \path[line~join=bevel,draw=mrcmarkerdraw,fill=mrcmarkerfill,mrcpathstyle,mrchyperpath] - (0,0) -- (35 \c_colon_str \l_tmpa_tl) -- (55 \c_colon_str \l_tmpa_tl) -- cycle - (0,0) -- (125 \c_colon_str \l_tmpa_tl) -- (145 \c_colon_str \l_tmpa_tl) -- cycle - (0,0) -- (215 \c_colon_str \l_tmpa_tl) -- (235 \c_colon_str \l_tmpa_tl) -- cycle - (0,0) -- (305 \c_colon_str \l_tmpa_tl) -- (325 \c_colon_str \l_tmpa_tl) -- cycle; + (0,0) -- (35 \c_colon_str \l__mermap_tmpa_tl) -- (55 \c_colon_str \l__mermap_tmpa_tl) -- cycle + (0,0) -- (125 \c_colon_str \l__mermap_tmpa_tl) -- (145 \c_colon_str \l__mermap_tmpa_tl) -- cycle + (0,0) -- (215 \c_colon_str \l__mermap_tmpa_tl) -- (235 \c_colon_str \l__mermap_tmpa_tl) -- cycle + (0,0) -- (305 \c_colon_str \l__mermap_tmpa_tl) -- (325 \c_colon_str \l__mermap_tmpa_tl) -- cycle; } @@ -2269,12 +2318,21 @@ \fp_new:N \l__mermap_b_x_fp \fp_new:N \l__mermap_b_y_fp \fp_new:N \l__mermap_b_z_fp +\fp_new:N \l__mermap_alpha_fp \fp_new:N \l__mermap_delta_lambda_fp \fp_new:N \l__mermap_delta_phi_fp +\fp_new:N \l__mermap_n_x_fp +\fp_new:N \l__mermap_n_y_fp +\fp_new:N \l__mermap_n_z_fp \fp_new:N \l__mermap_psi_fp +\fp_new:N \l__mermap_sin_psi_fp +\fp_new:N \l__mermap_t_fp +\fp_new:N \l__mermap_t_psi_fp \fp_new:N \l__mermap_t_x_fp \fp_new:N \l__mermap_t_y_fp \fp_new:N \l__mermap_t_z_fp +\fp_const:Nn \c__mermap_linearization_threshold_fp { 10e-9 } +\bool_new:N \l__mermap_linearization_bool \int_new:N \l__mermap_samples_int @@ -2309,41 +2367,86 @@ } -\cs_new:Npn \__mermap_draw_orthodrome:nnnnn #1#2#3#4#5 +\cs_new_protected:Npn \__mermap_draw_orthodrome:nnnnn #1#2#3#4#5 { \__mermap_tikz_path_begin:n { draw,mermap_every_route,#1 } - \fp_set:Nn \l__mermap_a_x_fp { cosd(#3)*cosd(#2) } - \fp_set:Nn \l__mermap_a_y_fp { sind(#3)*cosd(#2) } - \fp_set:Nn \l__mermap_a_z_fp { sind(#2) } - \fp_set:Nn \l__mermap_b_x_fp { cosd(#5)*cosd(#4) } - \fp_set:Nn \l__mermap_b_y_fp { sind(#5)*cosd(#4) } - \fp_set:Nn \l__mermap_b_z_fp { sind(#4) } - - \fp_set:Nn \l_tmpa_fp { sind(#2)*sind(#4) + cosd(#2)*cosd(#4)*cosd(#5-(#3)) } - \fp_set:Nn \l__mermap_psi_fp { acosd(\l_tmpa_fp) } - \fp_set:Nn \l_tmpb_fp { sind(\l__mermap_psi_fp) } - - \fp_set:Nn \l__mermap_b_x_fp { (\l__mermap_b_x_fp - \l_tmpa_fp*\l__mermap_a_x_fp)/\l_tmpb_fp } - \fp_set:Nn \l__mermap_b_y_fp { (\l__mermap_b_y_fp - \l_tmpa_fp*\l__mermap_a_y_fp)/\l_tmpb_fp } - \fp_set:Nn \l__mermap_b_z_fp { (\l__mermap_b_z_fp - \l_tmpa_fp*\l__mermap_a_z_fp)/\l_tmpb_fp } - - \__mermap_pgf_moveto_point:nn {#2}{#3} - \int_set:Nn \l_tmpa_int {1} - \int_until_do:nNnn \l_tmpa_int > \l__mermap_samples_int - { - \fp_set:Nn \l_tmpa_fp { \l__mermap_psi_fp*\l_tmpa_int/\l__mermap_samples_int } - \fp_set:Nn \l_tmpb_fp { sind(\l_tmpa_fp) } - \fp_set:Nn \l_tmpa_fp { cosd(\l_tmpa_fp) } - \fp_set:Nn \l__mermap_t_x_fp { \l_tmpa_fp*\l__mermap_a_x_fp + \l_tmpb_fp*\l__mermap_b_x_fp } - \fp_set:Nn \l__mermap_t_y_fp { \l_tmpa_fp*\l__mermap_a_y_fp + \l_tmpb_fp*\l__mermap_b_y_fp } - \fp_set:Nn \l__mermap_t_z_fp { \l_tmpa_fp*\l__mermap_a_z_fp + \l_tmpb_fp*\l__mermap_b_z_fp } - \pgfpathlineto{\__mermap_unit_sphere_point:nnn {\l__mermap_t_x_fp}{\l__mermap_t_y_fp}{\l__mermap_t_z_fp}} - \int_incr:N \l_tmpa_int + \__mermap_setup_orthodrome:nnnn { #2 }{ #3 }{ #4 }{ #5 } + \__mermap_pgf_moveto_point:nn { #2 }{ #3 } + \int_step_inline:nn { \l__mermap_samples_int } + { + \__mermap_point_on_orthodrome:n { ##1/\l__mermap_samples_int } + \__mermap_pgf_lineto_point:nn{ \l__mermap_cs_lat_fp }{ \l__mermap_cs_lon_fp } } \__mermap_tikz_path_end: } +\cs_new_protected:Npn \__mermap_setup_orthodrome:nnnn #1#2#3#4 + { + \fp_set:Nn \l__mermap_a_x_fp { cosd(#2)*cosd(#1) } + \fp_set:Nn \l__mermap_a_y_fp { sind(#2)*cosd(#1) } + \fp_set:Nn \l__mermap_a_z_fp { sind(#1) } + + \fp_set:Nn \l__mermap_b_x_fp { cosd(#4)*cosd(#3) } + \fp_set:Nn \l__mermap_b_y_fp { sind(#4)*cosd(#3) } + \fp_set:Nn \l__mermap_b_z_fp { sind(#3) } + + \fp_set:Nn \l__mermap_psi_fp { acosd( sind(#1)*sind(#3) + cosd(#1)*cosd(#3)*cosd(#4-(#2)) ) } + \fp_set:Nn \l__mermap_sin_psi_fp { sind(\l__mermap_psi_fp) } + + \bool_set:Nn \l__mermap_linearization_bool { \fp_compare_p:nNn \l__mermap_psi_fp < \c__mermap_linearization_threshold_fp } + } + + +\cs_new_protected:Npn \__mermap_point_on_orthodrome:n #1 + { + \fp_set:Nn \l__mermap_t_fp { #1 } + + \bool_if:NTF \l__mermap_linearization_bool + { + \fp_set:Nn \l__mermap_tmpa_fp { 1 - \l__mermap_t_fp } + \fp_set_eq:NN \l__mermap_tmpb_fp \l__mermap_t_fp + } + { + \fp_set:Nn \l__mermap_t_psi_fp { \l__mermap_t_fp * \l__mermap_psi_fp } + \fp_set:Nn \l__mermap_tmpa_fp { sind( \l__mermap_psi_fp - \l__mermap_t_psi_fp ) / \l__mermap_sin_psi_fp } + \fp_set:Nn \l__mermap_tmpb_fp { sind( \l__mermap_t_psi_fp ) / \l__mermap_sin_psi_fp } + } + + \fp_set:Nn \l__mermap_t_x_fp { \l__mermap_tmpa_fp*\l__mermap_a_x_fp + \l__mermap_tmpb_fp*\l__mermap_b_x_fp } + \fp_set:Nn \l__mermap_t_y_fp { \l__mermap_tmpa_fp*\l__mermap_a_y_fp + \l__mermap_tmpb_fp*\l__mermap_b_y_fp } + \fp_set:Nn \l__mermap_t_z_fp { \l__mermap_tmpa_fp*\l__mermap_a_z_fp + \l__mermap_tmpb_fp*\l__mermap_b_z_fp } + + \fp_set:Nn \l__mermap_cs_lat_fp { asind(\l__mermap_t_z_fp) } + \fp_set:Nn \l__mermap_cs_lon_fp { sign(\l__mermap_t_y_fp)*acosd(\l__mermap_t_x_fp/sqrt(\l__mermap_t_x_fp^2+\l__mermap_t_y_fp^2)) } + } + + +\cs_new_protected:Npn \__mermap_angle_at_orthodrome: + { + \bool_if:NTF \l__mermap_linearization_bool + { + \fp_set:Nn \l__mermap_alpha_fp { 90 } + } + { + \fp_set:Nn \l__mermap_tmpa_fp { cosd( \l__mermap_psi_fp - \l__mermap_t_psi_fp ) } + \fp_set:Nn \l__mermap_tmpb_fp { cosd( \l__mermap_t_psi_fp ) } + \fp_set:Nn \l__mermap_n_x_fp { \l__mermap_tmpb_fp*\l__mermap_b_x_fp - \l__mermap_tmpa_fp*\l__mermap_a_x_fp } + \fp_set:Nn \l__mermap_n_y_fp { \l__mermap_tmpb_fp*\l__mermap_b_y_fp - \l__mermap_tmpa_fp*\l__mermap_a_y_fp } + \fp_set:Nn \l__mermap_n_z_fp { \l__mermap_tmpb_fp*\l__mermap_b_z_fp - \l__mermap_tmpa_fp*\l__mermap_a_z_fp } + \fp_set:Nn \l__mermap_tmpa_fp { sqrt( \l__mermap_n_x_fp^2 + \l__mermap_n_y_fp^2 + \l__mermap_n_z_fp^2 ) } + \fp_set:Nn \l__mermap_n_x_fp { \l__mermap_n_x_fp / \l__mermap_tmpa_fp } + \fp_set:Nn \l__mermap_n_y_fp { \l__mermap_n_y_fp / \l__mermap_tmpa_fp } + \fp_set:Nn \l__mermap_n_z_fp { \l__mermap_n_z_fp / \l__mermap_tmpa_fp } + \fp_set:Nn \l__mermap_alpha_fp { acosd( \l__mermap_n_y_fp*cosd(\l__mermap_cs_lon_fp) - \l__mermap_n_x_fp*sind(\l__mermap_cs_lon_fp) ) } + \fp_compare:nNnT \l__mermap_n_z_fp < 0 + { + \fp_set:Nn \l__mermap_alpha_fp { 360 - \l__mermap_alpha_fp } + } + } + } + + \NewDocumentCommand \mrcdraworthodrome { O{} mmmm } { \__mermap_draw_orthodrome:nnnnn {#1}{#2}{#3}{#4}{#5} @@ -2392,11 +2495,11 @@ \fp_set:Nn \l__mermap_delta_lambda_fp {(#4-(#2))/180*pi} \fp_compare:nNnTF {abs(\l__mermap_delta_phi_fp)} < {1e-5} { - \fp_set:Nn \l_tmpa_fp { tand(#1) } - \fp_set:Nn \l_tmpb_fp { \l__mermap_delta_lambda_fp*cosd(#1) - /( 1 + (\l_tmpa_fp + (1+2*\l_tmpa_fp*\l_tmpa_fp)*\l__mermap_delta_phi_fp/3)*\l__mermap_delta_phi_fp/2 ) } + \fp_set:Nn \l__mermap_tmpa_fp { tand(#1) } + \fp_set:Nn \l__mermap_tmpb_fp { \l__mermap_delta_lambda_fp*cosd(#1) + /( 1 + (\l__mermap_tmpa_fp + (1+2*\l__mermap_tmpa_fp*\l__mermap_tmpa_fp)*\l__mermap_delta_phi_fp/3)*\l__mermap_delta_phi_fp/2 ) } \fp_set:Nn \l__mermap_result_fp { - sqrt( \l__mermap_delta_phi_fp*\l__mermap_delta_phi_fp + \l_tmpb_fp*\l_tmpb_fp ) } + sqrt( \l__mermap_delta_phi_fp*\l__mermap_delta_phi_fp + \l__mermap_tmpb_fp*\l__mermap_tmpb_fp ) } } { \fp_set:Nn \l__mermap_result_fp { abs(\l__mermap_delta_phi_fp) @@ -2422,11 +2525,314 @@ \NewDocumentCommand \mrcNPprettyloxodistance { mm } { - \__mermap_loxo_distance:nnnn {\mrcNPlat{#1}}{\mrcNPlon{#1}}{\mrcNPlat{#2}}{\mrcNPlon{#2}} + \__mermap_loxo_distance:nnnn { \mrcNPlat{#1} }{ \mrcNPlon{#1} }{ \mrcNPlat{#2} }{ \mrcNPlon{#2} } \__mermap_pretty_distance:n { \l__mermap_result_fp } } +\cs_new_protected:Npn \__mermap_orthodrome_point:nnn #1#2#3 + { + \__mermap_point_on_orthodrome:n { #3 } + \__mermap_set_named_position { #1 }{ \l__mermap_cs_lat_fp }{ \l__mermap_cs_lon_fp } + \IfNoValueF { #2 } + { + \__mermap_angle_at_orthodrome: + \cs_set:Npe #2 { \fp_to_decimal:N \l__mermap_alpha_fp } + } + } + +\NewDocumentCommand \mrcNPfromOrthoFraction { mo mm mm m } + { + \__mermap_setup_orthodrome:nnnn { #3 }{ #4 }{ #5 }{ #6 } + \__mermap_orthodrome_point:nnn { #1 }{ #2 }{ #7 } + } + +\NewDocumentCommand \mrcNPfromOrthoFractionNamed { mo m m m } + { + \__mermap_setup_orthodrome:nnnn { \mrcNPlat{#3} }{ \mrcNPlon{#3} }{ \mrcNPlat{#4} }{ \mrcNPlon{#4} } + \__mermap_orthodrome_point:nnn { #1 }{ #2 }{ #5 } + } + +\NewDocumentCommand \mrcNPfromOrthoDistance { mo mm mm m } + { + \__mermap_ortho_distance:nnnn { #3 }{ #4 }{ #5 }{ #6 } + \fp_compare:nNnTF \l__mermap_result_fp > { 0.001 } + { + \__mermap_setup_orthodrome:nnnn { #3 }{ #4 }{ #5 }{ #6 } + \__mermap_orthodrome_point:nnn { #1 }{ #2 }{ #7 / \l__mermap_result_fp } + } + { + \__mermap_set_named_position { #1 }{ #3 }{ #4 } + \IfNoValueF { #2 } + { + \cs_set:Npn #2 { 90 } + } + } + } + +\NewDocumentCommand \mrcNPfromOrthoDistanceNamed { mo m m m } + { + \__mermap_ortho_distance:nnnn { \mrcNPlat{#3} }{ \mrcNPlon{#3} }{ \mrcNPlat{#4} }{ \mrcNPlon{#4} } + \fp_compare:nNnTF \l__mermap_result_fp > { 0.001 } + { + \__mermap_setup_orthodrome:nnnn { \mrcNPlat{#3} }{ \mrcNPlon{#3} }{ \mrcNPlat{#4} }{ \mrcNPlon{#4} } + \__mermap_orthodrome_point:nnn { #1 }{ #2 }{ #5 / \l__mermap_result_fp } + } + { + \__mermap_set_named_position { #1 }{ \mrcNPlat{#3} }{ \mrcNPlon{#3} } + \IfNoValueF { #2 } + { + \cs_set:Npn #2 { 90 } + } + } + } + + +%---- animations --------------------------------------------------------------- + +\bool_new:N \l__mermap_anim_drop_first_frame_bool +\bool_new:N \l__mermap_anim_drop_last_frame_bool + +\fp_new:N \l__mermap_anim_a_lat_fp +\fp_new:N \l__mermap_anim_a_lon_fp +\fp_new:N \l__mermap_anim_a_scaledenom_fp +\fp_new:N \l__mermap_anim_a_time_fp +\fp_new:N \l__mermap_anim_b_lat_fp +\fp_new:N \l__mermap_anim_b_lon_fp +\fp_new:N \l__mermap_anim_b_scaledenom_fp +\fp_new:N \l__mermap_anim_b_time_fp +\fp_new:N \l_mermap_anim_angle_fp +\fp_new:N \l_mermap_anim_lat_fp +\fp_new:N \l_mermap_anim_lon_fp +\fp_new:N \l_mermap_anim_scaledenom_fp +\fp_new:N \l_mermap_anim_time_fp + +\int_new:N \l__mermap_anim_final_frame_int +\int_new:N \l__mermap_anim_frames_int +\int_new:N \l__mermap_anim_start_frame_int +\int_new:N \l_mermap_anim_frame_int + +\seq_new:N \l__mermap_anim_scaledenom_seq + +\tl_new:N \l__mermap_anim_timescale_tl +\tl_new:N \l__mermap_anim_timewarp_tl + + +\NewExpandableDocumentCommand \mrcTimewarpIdentity { m } + { + #1 + } + +\NewExpandableDocumentCommand \mrcTimewarpSlowStart { m m } + { + (#2)^(#1) + } + +\NewExpandableDocumentCommand \mrcTimewarpSlowFinal { m m } + { + 1 - (1-#2)^(#1) + } + +\NewExpandableDocumentCommand \mrcTimewarpSlowStartFinal { m m } + { + %1 - (1-#2)^(#1) + #2 <= 0.5 + ? (2*(#2))^(#1) / 2 + : 1 - (2-2*(#2))^(#1) / 2 + } + + +\NewDocumentEnvironment { mrcAnimation }{ m +b } + { + \keys_set:nn { mermap/anim }{ #1 } + + \__mermap_anim_autocorrect_scaledenom_seq: + \int_compare:nNnT \l__mermap_anim_frames_int < 2 + { + \int_set:Nn \l__mermap_anim_frames_int { 2 } + } + \bool_if:NTF \l__mermap_anim_drop_first_frame_bool + { + \int_set:Nn \l__mermap_anim_start_frame_int { 2 } + } + { + \int_set:Nn \l__mermap_anim_start_frame_int { 1 } + } + \bool_if:NTF \l__mermap_anim_drop_last_frame_bool + { + \int_set:Nn \l__mermap_anim_final_frame_int { \l__mermap_anim_frames_int-1 } + } + { + \int_set:Nn \l__mermap_anim_final_frame_int { \l__mermap_anim_frames_int } + } + + \__mermap_setup_orthodrome:nnnn { \l__mermap_anim_a_lat_fp }{ \l__mermap_anim_a_lon_fp } + { \l__mermap_anim_b_lat_fp }{ \l__mermap_anim_b_lon_fp } + + \__mermap_anim_pop_time_scale:NN \l__mermap_anim_a_time_fp \l__mermap_anim_a_scaledenom_fp + \__mermap_anim_pop_time_scale:NN \l__mermap_anim_b_time_fp \l__mermap_anim_b_scaledenom_fp + + \int_step_variable:nnNn { \l__mermap_anim_start_frame_int }{ \l__mermap_anim_final_frame_int } \l_mermap_anim_frame_int + { + \fp_set:Nn \l_mermap_anim_time_fp { (\l_mermap_anim_frame_int-1)/(\l__mermap_anim_frames_int-1) } + \fp_set:Nn \l_mermap_anim_time_fp { \l__mermap_anim_timewarp_tl { \l_mermap_anim_time_fp } } + + \__mermap_point_on_orthodrome:n { \l_mermap_anim_time_fp } + \fp_set_eq:NN \l_mermap_anim_lat_fp \l__mermap_cs_lat_fp + \fp_set_eq:NN \l_mermap_anim_lon_fp \l__mermap_cs_lon_fp + \__mermap_set_named_position{ AnimNP }{ \l_mermap_anim_lat_fp }{ \l_mermap_anim_lon_fp } + + \__mermap_angle_at_orthodrome: + \fp_set_eq:NN \l_mermap_anim_angle_fp \l__mermap_alpha_fp + + \fp_while_do:nNnn \l_mermap_anim_time_fp > \l__mermap_anim_b_time_fp + { + \fp_set_eq:NN \l__mermap_anim_a_time_fp \l__mermap_anim_b_time_fp + \fp_set_eq:NN \l__mermap_anim_a_scaledenom_fp \l__mermap_anim_b_scaledenom_fp + \__mermap_anim_pop_time_scale:NN \l__mermap_anim_b_time_fp \l__mermap_anim_b_scaledenom_fp + } + \fp_set:Nn \l_mermap_anim_scaledenom_fp + { + round ( exp ( + ln(\l__mermap_anim_a_scaledenom_fp) + + ( ln(\l__mermap_anim_b_scaledenom_fp)-ln(\l__mermap_anim_a_scaledenom_fp) ) * + ( \l_mermap_anim_time_fp-\l__mermap_anim_a_time_fp ) / ( \l__mermap_anim_b_time_fp-\l__mermap_anim_a_time_fp ) + ) ) + } + + #2 + } + }{} + + +\cs_new_protected:Npn \__mermap_anim_autocorrect_scaledenom_seq: + { + \seq_get_left:NN \l__mermap_anim_scaledenom_seq \l__mermap_anim_timescale_tl + \bool_lazy_any:nTF + { + { \seq_if_empty_p:N \l__mermap_anim_scaledenom_seq } + { \tl_if_empty_p:N \l__mermap_anim_timescale_tl } + { \quark_if_no_value_p:N \l__mermap_anim_timescale_tl } + } + { + \seq_set_split:Nnn \l__mermap_anim_scaledenom_seq { - }{ 0/25000 - 1/25000 }, + } + { + \fp_compare:nNnF { \__mermap_anim_use_time:o \l__mermap_anim_timescale_tl } = 0 + { + \seq_put_left:Ne \l__mermap_anim_scaledenom_seq { 0 / \__mermap_anim_use_scale:o \l__mermap_anim_timescale_tl } + } + } + \seq_get_right:NNF \l__mermap_anim_scaledenom_seq \l__mermap_anim_timescale_tl + { + \msg_error:nn{ mercatormap }{ anim-scaledenom-invalid } + } + \fp_compare:nNnF { \__mermap_anim_use_time:o \l__mermap_anim_timescale_tl } = 1 + { + \seq_put_right:Ne \l__mermap_anim_scaledenom_seq { 1 / \__mermap_anim_use_scale:o \l__mermap_anim_timescale_tl } + } + \fp_set:Nn \l__mermap_anim_a_time_fp { -1 } + \seq_map_inline:Nn \l__mermap_anim_scaledenom_seq + { + \fp_set:Nn \l__mermap_anim_b_time_fp { \__mermap_anim_use_time:n { ##1 } } + \fp_compare:nNnTF \l__mermap_anim_a_time_fp < \l__mermap_anim_b_time_fp + { + \fp_set_eq:NN \l__mermap_anim_a_time_fp \l__mermap_anim_b_time_fp + } + { + \msg_error:nn{ mercatormap }{ anim-scaledenom-invalid } + } + } + } + +\cs_new_protected:Npn \__mermap_anim_pop_time_scale:NN #1#2 + { + \seq_pop_left:NN \l__mermap_anim_scaledenom_seq \l__mermap_anim_timescale_tl + \fp_set:Nn #1 { \__mermap_anim_use_time:o \l__mermap_anim_timescale_tl } + \fp_set:Nn #2 { \__mermap_anim_use_scale:o \l__mermap_anim_timescale_tl } + } + +\msg_new:nnnn{ mercatormap }{ anim-scaledenom-invalid } + { The~animation~scale~denominator~sequence~is~invalid. } + { + Check~\seq_use:Nn \l__mermap_anim_scaledenom_seq { ~-~ }~with~the~documentation.~ + Time~values~are~not~strictly~monotonically~increasing. + } + +\cs_new_protected_nopar:Npn \__mermap_anim_set_position:w #1 #2 / #3 \q_stop + { + \fp_set:cn { l__mermap_anim_#1_lat_fp }{ #2 } + \fp_set:cn { l__mermap_anim_#1_lon_fp }{ #3 } + } + +\cs_new_nopar:Npn \__mermap_anim_use_time:w #1 / #2 \q_stop + { + #1 + } +\cs_new_nopar:Npn \__mermap_anim_use_time:n #1 + { + \__mermap_anim_use_time:w #1 \q_stop + } +\cs_generate_variant:Nn \__mermap_anim_use_time:n { o } + +\cs_new_nopar:Npn \__mermap_anim_use_scale:w #1 / #2 \q_stop + { + #2 + } +\cs_new_nopar:Npn \__mermap_anim_use_scale:n #1 + { + \__mermap_anim_use_scale:w #1 \q_stop + } +\cs_generate_variant:Nn \__mermap_anim_use_scale:n { o } + +\keys_define:nn { mermap/anim } + { + start-position .code:n = \__mermap_anim_set_position:w { a } #1 \q_stop, + final-position .code:n = \__mermap_anim_set_position:w { b } #1 \q_stop, + position .meta:n = { start-position = #1, final-position = #1 }, + named-start-position .code:n = + { + \fp_set:Nn \l__mermap_anim_a_lat_fp { \mrcNPlat{ #1 } } + \fp_set:Nn \l__mermap_anim_a_lon_fp { \mrcNPlon{ #1 } } + }, + named-final-position .code:n = + { + \fp_set:Nn \l__mermap_anim_b_lat_fp { \mrcNPlat{ #1 } } + \fp_set:Nn \l__mermap_anim_b_lon_fp { \mrcNPlon{ #1 } } + }, + named-position .meta:n = { named-start-position = #1, named-final-position = #1 }, + frames .int_set:N = \l__mermap_anim_frames_int, + drop-first-frame .bool_set:N = \l__mermap_anim_drop_first_frame_bool, + drop-last-frame .bool_set:N = \l__mermap_anim_drop_last_frame_bool, + drop-no-frame .meta:n = { drop-first-frame=false, drop-last-frame=false }, + scale-denominators .code:n = \seq_set_split:Nnn \l__mermap_anim_scaledenom_seq { - }{ #1 }, + common-scale-denominator .meta:n = { scale-denominators = 0/#1 - 1/#1 }, + timewarp .tl_set:N = \l__mermap_anim_timewarp_tl, + timewarp-identity .meta:n = { timewarp = \mrcTimewarpIdentity }, + timewarp-slow-start .meta:n = { timewarp = \mrcTimewarpSlowStart{#1} }, + timewarp-slow-start .default:n = 2, + timewarp-slow-final .meta:n = { timewarp = \mrcTimewarpSlowFinal{#1} }, + timewarp-slow-final .default:n = 2, + timewarp-slow-start-final .meta:n = { timewarp = \mrcTimewarpSlowStartFinal{#1} }, + timewarp-slow-start-final .default:n = 2, + } + +\keys_set:nn { mermap/anim } + { + position = 51.4779 / 0, + frames = 20, + drop-no-frame, + common-scale-denominator = 25000, + timewarp-identity, + } + +\NewExpandableDocumentCommand\mrcAnimFrame{}{\int_to_arabic:n \l_mermap_anim_frame_int} +\NewExpandableDocumentCommand\mrcAnimTime{}{\fp_to_decimal:N \l_mermap_anim_time_fp} +\NewExpandableDocumentCommand\mrcAnimScaleDenom{}{\fp_to_decimal:N \l_mermap_anim_scaledenom_fp} +\NewExpandableDocumentCommand\mrcAnimLatitude{}{\fp_to_decimal:N \l_mermap_anim_lat_fp} +\NewExpandableDocumentCommand\mrcAnimLongitude{}{\fp_to_decimal:N \l_mermap_anim_lon_fp} +\NewExpandableDocumentCommand\mrcAnimAngle{}{\fp_to_decimal:N \l_mermap_anim_angle_fp} + %---- supplier ----------------------------------------------------------------- diff --git a/Master/texmf-dist/tex/latex/mercatormap/mercatorpy.def b/Master/texmf-dist/tex/latex/mercatormap/mercatorpy.def index 670d8fca3bd..0df48609bf9 100644 --- a/Master/texmf-dist/tex/latex/mercatormap/mercatorpy.def +++ b/Master/texmf-dist/tex/latex/mercatormap/mercatorpy.def @@ -1,19 +1,19 @@ -\begin{filecontents*}[overwrite]{maptiles.texpy} +\begin{filecontents}[force,noheader,nowarn]{maptiles.texpy} """ -The LaTeX package mercatormap - version 1.02 (2020/08/06) +The LaTeX package mercatormap - version 1.2.0 (2024/08/05) maptiles.texpy: Python script for map tile download ------------------------------------------------------------------------------------------- -Copyright (c) 2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +Copyright (c) 2020-2024 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> ------------------------------------------------------------------------------------------- This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 of this license or (at your option) any later version. The latest version of this license is in - http://www.latex-project.org/lppl.txt -and version 1.3 or later is part of all distributions of LaTeX -version 2005/12/01 or later. + https://www.latex-project.org/lppl.txt +and version 1.3c or later is part of all distributions of LaTeX +version 2008-05-04 or later. This work has the LPPL maintenance status `author-maintained'. @@ -28,7 +28,7 @@ from pathlib import Path from PIL import Image -packageversion = '1.02 (2020/08/06)' +packageversion = '1.2.0 (2024/08/05)' def gd(x): @@ -531,5 +531,5 @@ if __name__ == '__main__': print('No url for download given') mapdef.save_map(args.definition, tiles_success, merge_success, wms_success) -\end{filecontents*} +\end{filecontents} diff --git a/Master/texmf-dist/tex/latex/mercatormap/mercatorsupplier.def b/Master/texmf-dist/tex/latex/mercatormap/mercatorsupplier.def index 1bf7866b7aa..a8063f8135a 100644 --- a/Master/texmf-dist/tex/latex/mercatormap/mercatorsupplier.def +++ b/Master/texmf-dist/tex/latex/mercatormap/mercatorsupplier.def @@ -1,15 +1,15 @@ -%% The LaTeX package mercatormap - version 1.02 (2020/08/06) +%% The LaTeX package mercatormap - version 1.2.0 (2024/08/05) %% mercatorsupplier.def: predefined map supplier list %% %% ------------------------------------------------------------------------------------------- -%% Copyright (c) 2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> +%% Copyright (c) 2020-2024 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de> %% ------------------------------------------------------------------------------------------- %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 %% of this license or (at your option) any later version. %% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt +%% https://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. %% @@ -46,7 +46,7 @@ attribution = { Kartendaten:~\textcopyright\nobreakspace\href{https://openstreetmap.org/copyright}{OpenStreetMap} \ Mitwirkende,~SRTM\nobreakspace\textbar\nobreakspace - Kartendarstellung:~\textcopyright\nobreakspace\href{http://opentopomap.org/}{OpenTopoMap} + Kartendarstellung:~\textcopyright\nobreakspace\href{https://opentopomap.org/}{OpenTopoMap} \ (\href{https://creativecommons.org/licenses/by-sa/3.0/}{CC-BY-SA}) }, attribution~print = { @@ -61,12 +61,12 @@ { __attribution_topplusopen .meta:nn = {mermap/supply} { attribution = { - \textcopyright\nobreakspace\href{http://www.bkg.bund.de}{Bundesamt~f\mrcumlaut{u}r~Kartographie~und~Geod\mrcumlaut{a}sie}\nobreakspace\the\year, - \ \href{http://sg.geodatenzentrum.de/web_public/Datenquellen_TopPlus_Open.pdf}{Datenquellen} + Kartendarstellung:\nobreakspace\textcopyright\nobreakspace\href{https://www.bkg.bund.de}{BKG\nobreakspace(\the\year)}, + \ \href{https://sgx.geodatenzentrum.de/web_public/Datenquellen_TopPlus_Open.pdf}{Datenquellen} }, attribution~print = { - \textcopyright\nobreakspace Bundesamt~f\mrcumlaut{u}r~Kartographie~und~Geod\mrcumlaut{a}sie\nobreakspace\the\year, - \ Datenquellen:~\detokenize{http://sg.geodatenzentrum.de/web_public/Datenquellen_TopPlus_Open.pdf} + \textcopyright\nobreakspace BKG\nobreakspace(\the\year), + \ Datenquellen:~\detokenize{https://sgx.geodatenzentrum.de/web_public/Datenquellen_TopPlus_Open.pdf} } } } @@ -85,29 +85,121 @@ basename = tiles/tpo_web_grau, } -\cs_new:Npn \__mermap_new_supply_source_topplusopen:n #1 +\__mermap_new_supply_source:nn { topplusopen~web~light } + { + url = {https://sgx.geodatenzentrum.de/wmts_topplus_open/tile/1.0.0/web_light/default/WEBMERCATOR/{z}/{y}/{x}.png}, + __attribution_topplusopen, + basename = tiles/tpo_web_light, + } + +\__mermap_new_supply_source:nn { topplusopen~web~light~grau } + { + url = {https://sgx.geodatenzentrum.de/wmts_topplus_open/tile/1.0.0/web_light_grau/default/WEBMERCATOR/{z}/{y}/{x}.png}, + __attribution_topplusopen, + basename = tiles/tpo_web_light_grau, + } + + +\cs_new:Npn \__mermap_new_supply_source_topplusopen:nn #1#2 { \keys_define:nn { mermap/supply/_source } { topplusopen~#1 .meta:nn = {mermap/supply}{ - url = {https://sgx.geodatenzentrum.de/wms_topplus_open?service=wms&version=1.3.0&request=GetMap&Layers=#1&STYLES=default&CRS=EPSG:3857&bbox={xmin},{ymin},{xmax},{ymax}&width={width}&height={height}&Format=image/png}, + url = {https://sgx.geodatenzentrum.de/wms_topplus_open_#2?service=wms&version=1.3.0&request=GetMap&Layers=#1&STYLES=default&CRS=EPSG:3857&bbox={xmin},{ymin},{xmax},{ymax}&width={width}&height={height}&Format=image/png}, __attribution_topplusopen, basename = tiles/tpo, }, topplusopen~#1~grau .meta:nn = {mermap/supply}{ - url = {https://sgx.geodatenzentrum.de/wms_topplus_open?service=wms&version=1.3.0&request=GetMap&Layers=#1_grau&STYLES=default&CRS=EPSG:3857&bbox={xmin},{ymin},{xmax},{ymax}&width={width}&height={height}&Format=image/png}, + url = {https://sgx.geodatenzentrum.de/wms_topplus_open_#2?service=wms&version=1.3.0&request=GetMap&Layers=#1&STYLES=grau&CRS=EPSG:3857&bbox={xmin},{ymin},{xmax},{ymax}&width={width}&height={height}&Format=image/png}, __attribution_topplusopen, basename = tiles/tpo, }, } } -\__mermap_new_supply_source_topplusopen:n { p5 } -\__mermap_new_supply_source_topplusopen:n { p10 } -\__mermap_new_supply_source_topplusopen:n { p17.5 } -\__mermap_new_supply_source_topplusopen:n { p25 } -\__mermap_new_supply_source_topplusopen:n { p50 } -\__mermap_new_supply_source_topplusopen:n { p100 } -\__mermap_new_supply_source_topplusopen:n { p250 } +\__mermap_new_supply_source_topplusopen:nn { p5 }{ p5 } +\__mermap_new_supply_source_topplusopen:nn { p10 }{ p10 } +\__mermap_new_supply_source_topplusopen:nn { p17.5 }{ p17 } +\__mermap_new_supply_source_topplusopen:nn { p25 }{ p25 } +\__mermap_new_supply_source_topplusopen:nn { p50 }{ p50 } +\__mermap_new_supply_source_topplusopen:nn { p100 }{ p100 } +\__mermap_new_supply_source_topplusopen:nn { p250 }{ p250 } + + +\keys_define:nn { mermap/supply } + { + __attribution_thunderforest .meta:nn = {mermap/supply} { + attribution = { + Maps~\textcopyright\nobreakspace\href{https://www.thunderforest.com/}{Thunderforest}, + \ Data~\textcopyright\nobreakspace\href{https://openstreetmap.org/copyright}{OpenStreetMap~contributors} + }, + attribution~print = { + Maps~\textcopyright\nobreakspace www.thunderforest.com, + \ Data~\textcopyright\nobreakspace www.osm.org/copyright + } + } + } +\__mermap_new_supply_source:nn { thunderforest~opencyclemap } + { + url~with~api~key = {https://tile.thunderforest.com/cycle/{z}/{x}/{y}.png?apikey=}{thunderforest}{}, + __attribution_thunderforest, + basename = tiles/opencyclemap, + } +\__mermap_new_supply_source:nn { thunderforest~transport } + { + url~with~api~key = {https://tile.thunderforest.com/transport/{z}/{x}/{y}.png?apikey=}{thunderforest}{}, + __attribution_thunderforest, + basename = tiles/transport, + } +\__mermap_new_supply_source:nn { thunderforest~landscape } + { + url~with~api~key = {https://tile.thunderforest.com/landscape/{z}/{x}/{y}.png?apikey=}{thunderforest}{}, + __attribution_thunderforest, + basename = tiles/landscape, + } +\__mermap_new_supply_source:nn { thunderforest~outdoors } + { + url~with~api~key = {https://tile.thunderforest.com/outdoors/{z}/{x}/{y}.png?apikey=}{thunderforest}{}, + __attribution_thunderforest, + basename = tiles/outdoors, + } +\__mermap_new_supply_source:nn { thunderforest~atlas } + { + url~with~api~key = {https://tile.thunderforest.com/atlas/{z}/{x}/{y}.png?apikey=}{thunderforest}{}, + __attribution_thunderforest, + basename = tiles/atlas, + } +\__mermap_new_supply_source:nn { thunderforest~transport-dark } + { + url~with~api~key = {https://tile.thunderforest.com/transport-dark/{z}/{x}/{y}.png?apikey=}{thunderforest}{}, + __attribution_thunderforest, + basename = tiles/transport-dark, + } +\__mermap_new_supply_source:nn { thunderforest~spinal-map } + { + url~with~api~key = {https://tile.thunderforest.com/spinal-map/{z}/{x}/{y}.png?apikey=}{thunderforest}{}, + __attribution_thunderforest, + basename = tiles/spinal-map, + } +\__mermap_new_supply_source:nn { thunderforest~pioneer } + { + url~with~api~key = {https://tile.thunderforest.com/pioneer/{z}/{x}/{y}.png?apikey=}{thunderforest}{}, + __attribution_thunderforest, + basename = tiles/pioneer, + } +\__mermap_new_supply_source:nn { thunderforest~mobile-atlas } + { + url~with~api~key = {https://tile.thunderforest.com/mobile-atlas/{z}/{x}/{y}.png?apikey=}{thunderforest}{}, + __attribution_thunderforest, + basename = tiles/mobile-atlas, + } +\__mermap_new_supply_source:nn { thunderforest~neighbourhood } + { + url~with~api~key = {https://tile.thunderforest.com/neighbourhood/{z}/{x}/{y}.png?apikey=}{thunderforest}{}, + __attribution_thunderforest, + basename = tiles/neighbourhood, + } + + %% openrouteservice mapsurfer is DISCONTINUED after June 2020 %% Therefore, the following source is DEPRECATED and will be removed in future @@ -127,7 +219,7 @@ basename = tiles/mapsurfer, } -\keys_define:nn { mermap/supply } +\keys_define:nn { mermap/supply }% DISCONTINUED after July 2023 and DEPRECATED { __attribution_stamen .meta:nn = {mermap/supply} { attribution = { @@ -144,67 +236,67 @@ } } } -\__mermap_new_supply_source:nn { stamen~terrain } +\__mermap_new_supply_source:nn { stamen~terrain }% DISCONTINUED after July 2023 and DEPRECATED { url = {https://stamen-tiles-a.a.ssl.fastly.net/terrain/{z}/{x}/{y}.png}, __attribution_stamen, basename = tiles/terrain, } -\__mermap_new_supply_source:nn { stamen~terrain-background } +\__mermap_new_supply_source:nn { stamen~terrain-background }% DISCONTINUED after July 2023 and DEPRECATED { url = {https://stamen-tiles-a.a.ssl.fastly.net/terrain-background/{z}/{x}/{y}.png}, __attribution_stamen, basename = tiles/terrain-background, } -\__mermap_new_supply_source:nn { stamen~terrain-labels } +\__mermap_new_supply_source:nn { stamen~terrain-labels }% DISCONTINUED after July 2023 and DEPRECATED { url = {https://stamen-tiles-a.a.ssl.fastly.net/terrain-labels/{z}/{x}/{y}.png}, __attribution_stamen, basename = tiles/terrain-labels, } -\__mermap_new_supply_source:nn { stamen~terrain-lines } +\__mermap_new_supply_source:nn { stamen~terrain-lines }% DISCONTINUED after July 2023 and DEPRECATED { url = {https://stamen-tiles-a.a.ssl.fastly.net/terrain-lines/{z}/{x}/{y}.png}, __attribution_stamen, basename = tiles/terrain-lines, } -\__mermap_new_supply_source:nn { stamen~toner } +\__mermap_new_supply_source:nn { stamen~toner }% DISCONTINUED after July 2023 and DEPRECATED { url = {https://stamen-tiles-a.a.ssl.fastly.net/toner/{z}/{x}/{y}.png}, __attribution_stamen, basename = tiles/toner, } -\__mermap_new_supply_source:nn { stamen~toner-lite } +\__mermap_new_supply_source:nn { stamen~toner-lite }% DISCONTINUED after July 2023 and DEPRECATED { url = {https://stamen-tiles-a.a.ssl.fastly.net/toner-lite/{z}/{x}/{y}.png}, __attribution_stamen, basename = tiles/toner-lite, } -\__mermap_new_supply_source:nn { stamen~toner-hybrid } +\__mermap_new_supply_source:nn { stamen~toner-hybrid }% DISCONTINUED after July 2023 and DEPRECATED { url = {https://stamen-tiles-a.a.ssl.fastly.net/toner-hybrid/{z}/{x}/{y}.png}, __attribution_stamen, basename = tiles/toner-hybrid, } -\__mermap_new_supply_source:nn { stamen~toner-background } +\__mermap_new_supply_source:nn { stamen~toner-background }% DISCONTINUED after July 2023 and DEPRECATED { url = {https://stamen-tiles-a.a.ssl.fastly.net/toner-background/{z}/{x}/{y}.png}, __attribution_stamen, basename = tiles/toner-background, } -\__mermap_new_supply_source:nn { stamen~toner-labels } +\__mermap_new_supply_source:nn { stamen~toner-labels }% DISCONTINUED after July 2023 and DEPRECATED { url = {https://stamen-tiles-a.a.ssl.fastly.net/toner-labels/{z}/{x}/{y}.png}, __attribution_stamen, basename = tiles/toner-labels, } -\__mermap_new_supply_source:nn { stamen~toner-lines } +\__mermap_new_supply_source:nn { stamen~toner-lines }% DISCONTINUED after July 2023 and DEPRECATED { url = {https://stamen-tiles-a.a.ssl.fastly.net/toner-lines/{z}/{x}/{y}.png}, __attribution_stamen, basename = tiles/toner-lines, } -\__mermap_new_supply_source:nn { stamen~watercolor } +\__mermap_new_supply_source:nn { stamen~watercolor }% DISCONTINUED after July 2023 and DEPRECATED { url = {https://stamen-tiles-a.a.ssl.fastly.net/watercolor/{z}/{x}/{y}.png}, attribution = { @@ -221,72 +313,3 @@ }, basename = tiles/watercolor, } - -\keys_define:nn { mermap/supply } - { - __attribution_thunderforest .meta:nn = {mermap/supply} { - attribution = { - Maps~\textcopyright\nobreakspace\href{https://www.thunderforest.com/}{Thunderforest}, - \ Data~\textcopyright\nobreakspace\href{https://openstreetmap.org/copyright}{OpenStreetMap~contributors} - }, - attribution~print = { - Maps~\textcopyright\nobreakspace www.thunderforest.com, - \ Data~\textcopyright\nobreakspace www.osm.org/copyright - } - } - } -\__mermap_new_supply_source:nn { thunderforest~opencyclemap } - { - url~with~api~key = {https://tile.thunderforest.com/cycle/{z}/{x}/{y}.png?apikey=}{thunderforest}{}, - __attribution_thunderforest, - basename = tiles/opencyclemap, - } -\__mermap_new_supply_source:nn { thunderforest~transport } - { - url~with~api~key = {https://tile.thunderforest.com/transport/{z}/{x}/{y}.png?apikey=}{thunderforest}{}, - __attribution_thunderforest, - basename = tiles/transport, - } -\__mermap_new_supply_source:nn { thunderforest~landscape } - { - url~with~api~key = {https://tile.thunderforest.com/landscape/{z}/{x}/{y}.png?apikey=}{thunderforest}{}, - __attribution_thunderforest, - basename = tiles/landscape, - } -\__mermap_new_supply_source:nn { thunderforest~outdoors } - { - url~with~api~key = {https://tile.thunderforest.com/outdoors/{z}/{x}/{y}.png?apikey=}{thunderforest}{}, - __attribution_thunderforest, - basename = tiles/outdoors, - } -\__mermap_new_supply_source:nn { thunderforest~transport-dark } - { - url~with~api~key = {https://tile.thunderforest.com/transport-dark/{z}/{x}/{y}.png?apikey=}{thunderforest}{}, - __attribution_thunderforest, - basename = tiles/transport-dark, - } -\__mermap_new_supply_source:nn { thunderforest~spinal-map } - { - url~with~api~key = {https://tile.thunderforest.com/spinal-map/{z}/{x}/{y}.png?apikey=}{thunderforest}{}, - __attribution_thunderforest, - basename = tiles/spinal-map, - } -\__mermap_new_supply_source:nn { thunderforest~pioneer } - { - url~with~api~key = {https://tile.thunderforest.com/pioneer/{z}/{x}/{y}.png?apikey=}{thunderforest}{}, - __attribution_thunderforest, - basename = tiles/pioneer, - } -\__mermap_new_supply_source:nn { thunderforest~mobile-atlas } - { - url~with~api~key = {https://tile.thunderforest.com/mobile-atlas/{z}/{x}/{y}.png?apikey=}{thunderforest}{}, - __attribution_thunderforest, - basename = tiles/mobile-atlas, - } -\__mermap_new_supply_source:nn { thunderforest~neighbourhood } - { - url~with~api~key = {https://tile.thunderforest.com/neighbourhood/{z}/{x}/{y}.png?apikey=}{thunderforest}{}, - __attribution_thunderforest, - basename = tiles/neighbourhood, - } - diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Dnom.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Dnom.fd new file mode 100644 index 00000000000..9c0cbcf3f51 --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Dnom.fd @@ -0,0 +1,67 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{LY1MFBOldstyle-Dnom.fd} + [2024/08/05 (autoinst) Font definitions for LY1/MFBOldstyle-Dnom.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{MFBOldstyle-Dnom}{} + + +% ---- b = bold ---- + +\DeclareFontShape{LY1}{MFBOldstyle-Dnom}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-dnom-ly1 +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-Dnom}{bold}{n}{ + <-> alias * MFBOldstyle-Dnom/b/n +}{} + + +% ---- m = regular ---- + +\DeclareFontShape{LY1}{MFBOldstyle-Dnom}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-dnom-ly1 +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-Dnom}{regular}{it}{ + <-> alias * MFBOldstyle-Dnom/m/it +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-Dnom}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-dnom-ly1 +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-Dnom}{regular}{n}{ + <-> alias * MFBOldstyle-Dnom/m/n +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-Dnom}{m}{sl}{ + <-> ssub * MFBOldstyle-Dnom/m/it +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-Dnom}{regular}{sl}{ + <-> ssub * MFBOldstyle-Dnom/regular/it +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{LY1}{MFBOldstyle-Dnom}{bx}{n}{ + <-> ssub * MFBOldstyle-Dnom/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Inf.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Inf.fd new file mode 100644 index 00000000000..19bae30bde1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Inf.fd @@ -0,0 +1,67 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{LY1MFBOldstyle-Inf.fd} + [2024/08/05 (autoinst) Font definitions for LY1/MFBOldstyle-Inf.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{MFBOldstyle-Inf}{} + + +% ---- b = bold ---- + +\DeclareFontShape{LY1}{MFBOldstyle-Inf}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-inf-ly1 +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-Inf}{bold}{n}{ + <-> alias * MFBOldstyle-Inf/b/n +}{} + + +% ---- m = regular ---- + +\DeclareFontShape{LY1}{MFBOldstyle-Inf}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-inf-ly1 +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-Inf}{regular}{it}{ + <-> alias * MFBOldstyle-Inf/m/it +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-Inf}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-inf-ly1 +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-Inf}{regular}{n}{ + <-> alias * MFBOldstyle-Inf/m/n +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-Inf}{m}{sl}{ + <-> ssub * MFBOldstyle-Inf/m/it +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-Inf}{regular}{sl}{ + <-> ssub * MFBOldstyle-Inf/regular/it +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{LY1}{MFBOldstyle-Inf}{bx}{n}{ + <-> ssub * MFBOldstyle-Inf/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-LF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-LF.fd new file mode 100644 index 00000000000..80eb1fae4fa --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-LF.fd @@ -0,0 +1,75 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{LY1MFBOldstyle-LF.fd} + [2024/08/05 (autoinst) Font definitions for LY1/MFBOldstyle-LF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{MFBOldstyle-LF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{LY1}{MFBOldstyle-LF}{m}{sc}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-lf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-LF}{regular}{sc}{ + <-> alias * MFBOldstyle-LF/m/sc +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-LF}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-lf-ly1 +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-LF}{regular}{n}{ + <-> alias * MFBOldstyle-LF/m/n +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-LF}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-lf-ly1 +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-LF}{regular}{it}{ + <-> alias * MFBOldstyle-LF/m/it +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-LF}{m}{sl}{ + <-> ssub * MFBOldstyle-LF/m/it +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-LF}{regular}{sl}{ + <-> ssub * MFBOldstyle-LF/regular/it +}{} + + +% ---- b = bold ---- + +\DeclareFontShape{LY1}{MFBOldstyle-LF}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-lf-ly1 +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-LF}{bold}{n}{ + <-> alias * MFBOldstyle-LF/b/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{LY1}{MFBOldstyle-LF}{bx}{n}{ + <-> ssub * MFBOldstyle-LF/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Numr.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Numr.fd new file mode 100644 index 00000000000..acc9b87ad1d --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Numr.fd @@ -0,0 +1,67 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{LY1MFBOldstyle-Numr.fd} + [2024/08/05 (autoinst) Font definitions for LY1/MFBOldstyle-Numr.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{MFBOldstyle-Numr}{} + + +% ---- b = bold ---- + +\DeclareFontShape{LY1}{MFBOldstyle-Numr}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-numr-ly1 +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-Numr}{bold}{n}{ + <-> alias * MFBOldstyle-Numr/b/n +}{} + + +% ---- m = regular ---- + +\DeclareFontShape{LY1}{MFBOldstyle-Numr}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-numr-ly1 +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-Numr}{regular}{n}{ + <-> alias * MFBOldstyle-Numr/m/n +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-Numr}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-numr-ly1 +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-Numr}{regular}{it}{ + <-> alias * MFBOldstyle-Numr/m/it +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-Numr}{m}{sl}{ + <-> ssub * MFBOldstyle-Numr/m/it +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-Numr}{regular}{sl}{ + <-> ssub * MFBOldstyle-Numr/regular/it +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{LY1}{MFBOldstyle-Numr}{bx}{n}{ + <-> ssub * MFBOldstyle-Numr/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-OsF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-OsF.fd new file mode 100644 index 00000000000..d3047c51edb --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-OsF.fd @@ -0,0 +1,44 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{LY1MFBOldstyle-OsF.fd} + [2024/08/05 (autoinst) Font definitions for LY1/MFBOldstyle-OsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{MFBOldstyle-OsF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{LY1}{MFBOldstyle-OsF}{m}{sc}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-osf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-OsF}{regular}{sc}{ + <-> alias * MFBOldstyle-OsF/m/sc +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-OsF}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-osf-ly1 +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-OsF}{regular}{n}{ + <-> alias * MFBOldstyle-OsF/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Sup.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Sup.fd new file mode 100644 index 00000000000..b2d73b05161 --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-Sup.fd @@ -0,0 +1,67 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{LY1MFBOldstyle-Sup.fd} + [2024/08/05 (autoinst) Font definitions for LY1/MFBOldstyle-Sup.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{MFBOldstyle-Sup}{} + + +% ---- m = regular ---- + +\DeclareFontShape{LY1}{MFBOldstyle-Sup}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-sup-ly1 +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-Sup}{regular}{it}{ + <-> alias * MFBOldstyle-Sup/m/it +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-Sup}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-sup-ly1 +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-Sup}{regular}{n}{ + <-> alias * MFBOldstyle-Sup/m/n +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-Sup}{m}{sl}{ + <-> ssub * MFBOldstyle-Sup/m/it +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-Sup}{regular}{sl}{ + <-> ssub * MFBOldstyle-Sup/regular/it +}{} + + +% ---- b = bold ---- + +\DeclareFontShape{LY1}{MFBOldstyle-Sup}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-sup-ly1 +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-Sup}{bold}{n}{ + <-> alias * MFBOldstyle-Sup/b/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{LY1}{MFBOldstyle-Sup}{bx}{n}{ + <-> ssub * MFBOldstyle-Sup/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-TLF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-TLF.fd new file mode 100644 index 00000000000..adfe1fd0d86 --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-TLF.fd @@ -0,0 +1,75 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{LY1MFBOldstyle-TLF.fd} + [2024/08/05 (autoinst) Font definitions for LY1/MFBOldstyle-TLF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{MFBOldstyle-TLF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{LY1}{MFBOldstyle-TLF}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-TLF}{regular}{it}{ + <-> alias * MFBOldstyle-TLF/m/it +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-TLF}{m}{sc}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tlf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-TLF}{regular}{sc}{ + <-> alias * MFBOldstyle-TLF/m/sc +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-TLF}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-TLF}{regular}{n}{ + <-> alias * MFBOldstyle-TLF/m/n +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-TLF}{m}{sl}{ + <-> ssub * MFBOldstyle-TLF/m/it +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-TLF}{regular}{sl}{ + <-> ssub * MFBOldstyle-TLF/regular/it +}{} + + +% ---- b = bold ---- + +\DeclareFontShape{LY1}{MFBOldstyle-TLF}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-TLF}{bold}{n}{ + <-> alias * MFBOldstyle-TLF/b/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{LY1}{MFBOldstyle-TLF}{bx}{n}{ + <-> ssub * MFBOldstyle-TLF/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-TOsF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-TOsF.fd new file mode 100644 index 00000000000..317443d5afd --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/LY1MFBOldstyle-TOsF.fd @@ -0,0 +1,44 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{LY1MFBOldstyle-TOsF.fd} + [2024/08/05 (autoinst) Font definitions for LY1/MFBOldstyle-TOsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{MFBOldstyle-TOsF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{LY1}{MFBOldstyle-TOsF}{m}{sc}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tosf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-TOsF}{regular}{sc}{ + <-> alias * MFBOldstyle-TOsF/m/sc +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-TOsF}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{MFBOldstyle-TOsF}{regular}{n}{ + <-> alias * MFBOldstyle-TOsF/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Dnom.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Dnom.fd new file mode 100644 index 00000000000..05863d4d529 --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Dnom.fd @@ -0,0 +1,67 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{OT1MFBOldstyle-Dnom.fd} + [2024/08/05 (autoinst) Font definitions for OT1/MFBOldstyle-Dnom.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{MFBOldstyle-Dnom}{} + + +% ---- m = regular ---- + +\DeclareFontShape{OT1}{MFBOldstyle-Dnom}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-dnom-ot1 +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-Dnom}{regular}{it}{ + <-> alias * MFBOldstyle-Dnom/m/it +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-Dnom}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-dnom-ot1 +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-Dnom}{regular}{n}{ + <-> alias * MFBOldstyle-Dnom/m/n +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-Dnom}{m}{sl}{ + <-> ssub * MFBOldstyle-Dnom/m/it +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-Dnom}{regular}{sl}{ + <-> ssub * MFBOldstyle-Dnom/regular/it +}{} + + +% ---- b = bold ---- + +\DeclareFontShape{OT1}{MFBOldstyle-Dnom}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-dnom-ot1 +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-Dnom}{bold}{n}{ + <-> alias * MFBOldstyle-Dnom/b/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{OT1}{MFBOldstyle-Dnom}{bx}{n}{ + <-> ssub * MFBOldstyle-Dnom/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Inf.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Inf.fd new file mode 100644 index 00000000000..664a74048be --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Inf.fd @@ -0,0 +1,67 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{OT1MFBOldstyle-Inf.fd} + [2024/08/05 (autoinst) Font definitions for OT1/MFBOldstyle-Inf.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{MFBOldstyle-Inf}{} + + +% ---- m = regular ---- + +\DeclareFontShape{OT1}{MFBOldstyle-Inf}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-inf-ot1 +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-Inf}{regular}{n}{ + <-> alias * MFBOldstyle-Inf/m/n +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-Inf}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-inf-ot1 +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-Inf}{regular}{it}{ + <-> alias * MFBOldstyle-Inf/m/it +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-Inf}{m}{sl}{ + <-> ssub * MFBOldstyle-Inf/m/it +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-Inf}{regular}{sl}{ + <-> ssub * MFBOldstyle-Inf/regular/it +}{} + + +% ---- b = bold ---- + +\DeclareFontShape{OT1}{MFBOldstyle-Inf}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-inf-ot1 +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-Inf}{bold}{n}{ + <-> alias * MFBOldstyle-Inf/b/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{OT1}{MFBOldstyle-Inf}{bx}{n}{ + <-> ssub * MFBOldstyle-Inf/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-LF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-LF.fd new file mode 100644 index 00000000000..2c468d897c7 --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-LF.fd @@ -0,0 +1,75 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{OT1MFBOldstyle-LF.fd} + [2024/08/05 (autoinst) Font definitions for OT1/MFBOldstyle-LF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{MFBOldstyle-LF}{} + + +% ---- b = bold ---- + +\DeclareFontShape{OT1}{MFBOldstyle-LF}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-lf-ot1 +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-LF}{bold}{n}{ + <-> alias * MFBOldstyle-LF/b/n +}{} + + +% ---- m = regular ---- + +\DeclareFontShape{OT1}{MFBOldstyle-LF}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-lf-ot1 +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-LF}{regular}{it}{ + <-> alias * MFBOldstyle-LF/m/it +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-LF}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-lf-ot1 +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-LF}{regular}{n}{ + <-> alias * MFBOldstyle-LF/m/n +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-LF}{m}{sc}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-lf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-LF}{regular}{sc}{ + <-> alias * MFBOldstyle-LF/m/sc +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-LF}{m}{sl}{ + <-> ssub * MFBOldstyle-LF/m/it +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-LF}{regular}{sl}{ + <-> ssub * MFBOldstyle-LF/regular/it +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{OT1}{MFBOldstyle-LF}{bx}{n}{ + <-> ssub * MFBOldstyle-LF/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Numr.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Numr.fd new file mode 100644 index 00000000000..c5df54304a2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Numr.fd @@ -0,0 +1,67 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{OT1MFBOldstyle-Numr.fd} + [2024/08/05 (autoinst) Font definitions for OT1/MFBOldstyle-Numr.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{MFBOldstyle-Numr}{} + + +% ---- m = regular ---- + +\DeclareFontShape{OT1}{MFBOldstyle-Numr}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-numr-ot1 +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-Numr}{regular}{it}{ + <-> alias * MFBOldstyle-Numr/m/it +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-Numr}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-numr-ot1 +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-Numr}{regular}{n}{ + <-> alias * MFBOldstyle-Numr/m/n +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-Numr}{m}{sl}{ + <-> ssub * MFBOldstyle-Numr/m/it +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-Numr}{regular}{sl}{ + <-> ssub * MFBOldstyle-Numr/regular/it +}{} + + +% ---- b = bold ---- + +\DeclareFontShape{OT1}{MFBOldstyle-Numr}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-numr-ot1 +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-Numr}{bold}{n}{ + <-> alias * MFBOldstyle-Numr/b/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{OT1}{MFBOldstyle-Numr}{bx}{n}{ + <-> ssub * MFBOldstyle-Numr/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-OsF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-OsF.fd new file mode 100644 index 00000000000..be09da5dfe6 --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-OsF.fd @@ -0,0 +1,44 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{OT1MFBOldstyle-OsF.fd} + [2024/08/05 (autoinst) Font definitions for OT1/MFBOldstyle-OsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{MFBOldstyle-OsF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{OT1}{MFBOldstyle-OsF}{m}{sc}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-osf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-OsF}{regular}{sc}{ + <-> alias * MFBOldstyle-OsF/m/sc +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-OsF}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-osf-ot1 +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-OsF}{regular}{n}{ + <-> alias * MFBOldstyle-OsF/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Sup.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Sup.fd new file mode 100644 index 00000000000..2351fc9901c --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-Sup.fd @@ -0,0 +1,67 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{OT1MFBOldstyle-Sup.fd} + [2024/08/05 (autoinst) Font definitions for OT1/MFBOldstyle-Sup.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{MFBOldstyle-Sup}{} + + +% ---- b = bold ---- + +\DeclareFontShape{OT1}{MFBOldstyle-Sup}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-sup-ot1 +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-Sup}{bold}{n}{ + <-> alias * MFBOldstyle-Sup/b/n +}{} + + +% ---- m = regular ---- + +\DeclareFontShape{OT1}{MFBOldstyle-Sup}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-sup-ot1 +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-Sup}{regular}{it}{ + <-> alias * MFBOldstyle-Sup/m/it +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-Sup}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-sup-ot1 +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-Sup}{regular}{n}{ + <-> alias * MFBOldstyle-Sup/m/n +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-Sup}{m}{sl}{ + <-> ssub * MFBOldstyle-Sup/m/it +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-Sup}{regular}{sl}{ + <-> ssub * MFBOldstyle-Sup/regular/it +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{OT1}{MFBOldstyle-Sup}{bx}{n}{ + <-> ssub * MFBOldstyle-Sup/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-TLF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-TLF.fd new file mode 100644 index 00000000000..7eb5636a123 --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-TLF.fd @@ -0,0 +1,75 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{OT1MFBOldstyle-TLF.fd} + [2024/08/05 (autoinst) Font definitions for OT1/MFBOldstyle-TLF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{MFBOldstyle-TLF}{} + + +% ---- b = bold ---- + +\DeclareFontShape{OT1}{MFBOldstyle-TLF}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-TLF}{bold}{n}{ + <-> alias * MFBOldstyle-TLF/b/n +}{} + + +% ---- m = regular ---- + +\DeclareFontShape{OT1}{MFBOldstyle-TLF}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-TLF}{regular}{it}{ + <-> alias * MFBOldstyle-TLF/m/it +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-TLF}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-TLF}{regular}{n}{ + <-> alias * MFBOldstyle-TLF/m/n +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-TLF}{m}{sc}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tlf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-TLF}{regular}{sc}{ + <-> alias * MFBOldstyle-TLF/m/sc +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-TLF}{m}{sl}{ + <-> ssub * MFBOldstyle-TLF/m/it +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-TLF}{regular}{sl}{ + <-> ssub * MFBOldstyle-TLF/regular/it +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{OT1}{MFBOldstyle-TLF}{bx}{n}{ + <-> ssub * MFBOldstyle-TLF/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-TOsF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-TOsF.fd new file mode 100644 index 00000000000..4d0db0317ac --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/OT1MFBOldstyle-TOsF.fd @@ -0,0 +1,44 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{OT1MFBOldstyle-TOsF.fd} + [2024/08/05 (autoinst) Font definitions for OT1/MFBOldstyle-TOsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{MFBOldstyle-TOsF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{OT1}{MFBOldstyle-TOsF}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tosf-ot1 +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-TOsF}{regular}{n}{ + <-> alias * MFBOldstyle-TOsF/m/n +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-TOsF}{m}{sc}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tosf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{MFBOldstyle-TOsF}{regular}{sc}{ + <-> alias * MFBOldstyle-TOsF/m/sc +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Dnom.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Dnom.fd new file mode 100644 index 00000000000..2c61008de9c --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Dnom.fd @@ -0,0 +1,67 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{T1MFBOldstyle-Dnom.fd} + [2024/08/05 (autoinst) Font definitions for T1/MFBOldstyle-Dnom.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{MFBOldstyle-Dnom}{} + + +% ---- m = regular ---- + +\DeclareFontShape{T1}{MFBOldstyle-Dnom}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-dnom-t1 +}{} + +\DeclareFontShape{T1}{MFBOldstyle-Dnom}{regular}{n}{ + <-> alias * MFBOldstyle-Dnom/m/n +}{} + +\DeclareFontShape{T1}{MFBOldstyle-Dnom}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-dnom-t1 +}{} + +\DeclareFontShape{T1}{MFBOldstyle-Dnom}{regular}{it}{ + <-> alias * MFBOldstyle-Dnom/m/it +}{} + +\DeclareFontShape{T1}{MFBOldstyle-Dnom}{m}{sl}{ + <-> ssub * MFBOldstyle-Dnom/m/it +}{} + +\DeclareFontShape{T1}{MFBOldstyle-Dnom}{regular}{sl}{ + <-> ssub * MFBOldstyle-Dnom/regular/it +}{} + + +% ---- b = bold ---- + +\DeclareFontShape{T1}{MFBOldstyle-Dnom}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-dnom-t1 +}{} + +\DeclareFontShape{T1}{MFBOldstyle-Dnom}{bold}{n}{ + <-> alias * MFBOldstyle-Dnom/b/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{T1}{MFBOldstyle-Dnom}{bx}{n}{ + <-> ssub * MFBOldstyle-Dnom/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Inf.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Inf.fd new file mode 100644 index 00000000000..6f58c047b5b --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Inf.fd @@ -0,0 +1,67 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{T1MFBOldstyle-Inf.fd} + [2024/08/05 (autoinst) Font definitions for T1/MFBOldstyle-Inf.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{MFBOldstyle-Inf}{} + + +% ---- b = bold ---- + +\DeclareFontShape{T1}{MFBOldstyle-Inf}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-inf-t1 +}{} + +\DeclareFontShape{T1}{MFBOldstyle-Inf}{bold}{n}{ + <-> alias * MFBOldstyle-Inf/b/n +}{} + + +% ---- m = regular ---- + +\DeclareFontShape{T1}{MFBOldstyle-Inf}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-inf-t1 +}{} + +\DeclareFontShape{T1}{MFBOldstyle-Inf}{regular}{n}{ + <-> alias * MFBOldstyle-Inf/m/n +}{} + +\DeclareFontShape{T1}{MFBOldstyle-Inf}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-inf-t1 +}{} + +\DeclareFontShape{T1}{MFBOldstyle-Inf}{regular}{it}{ + <-> alias * MFBOldstyle-Inf/m/it +}{} + +\DeclareFontShape{T1}{MFBOldstyle-Inf}{m}{sl}{ + <-> ssub * MFBOldstyle-Inf/m/it +}{} + +\DeclareFontShape{T1}{MFBOldstyle-Inf}{regular}{sl}{ + <-> ssub * MFBOldstyle-Inf/regular/it +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{T1}{MFBOldstyle-Inf}{bx}{n}{ + <-> ssub * MFBOldstyle-Inf/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-LF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-LF.fd new file mode 100644 index 00000000000..8e904607902 --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-LF.fd @@ -0,0 +1,75 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{T1MFBOldstyle-LF.fd} + [2024/08/05 (autoinst) Font definitions for T1/MFBOldstyle-LF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{MFBOldstyle-LF}{} + + +% ---- b = bold ---- + +\DeclareFontShape{T1}{MFBOldstyle-LF}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-lf-t1 +}{} + +\DeclareFontShape{T1}{MFBOldstyle-LF}{bold}{n}{ + <-> alias * MFBOldstyle-LF/b/n +}{} + + +% ---- m = regular ---- + +\DeclareFontShape{T1}{MFBOldstyle-LF}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-lf-t1 +}{} + +\DeclareFontShape{T1}{MFBOldstyle-LF}{regular}{n}{ + <-> alias * MFBOldstyle-LF/m/n +}{} + +\DeclareFontShape{T1}{MFBOldstyle-LF}{m}{sc}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-lf-sc-t1 +}{} + +\DeclareFontShape{T1}{MFBOldstyle-LF}{regular}{sc}{ + <-> alias * MFBOldstyle-LF/m/sc +}{} + +\DeclareFontShape{T1}{MFBOldstyle-LF}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-lf-t1 +}{} + +\DeclareFontShape{T1}{MFBOldstyle-LF}{regular}{it}{ + <-> alias * MFBOldstyle-LF/m/it +}{} + +\DeclareFontShape{T1}{MFBOldstyle-LF}{m}{sl}{ + <-> ssub * MFBOldstyle-LF/m/it +}{} + +\DeclareFontShape{T1}{MFBOldstyle-LF}{regular}{sl}{ + <-> ssub * MFBOldstyle-LF/regular/it +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{T1}{MFBOldstyle-LF}{bx}{n}{ + <-> ssub * MFBOldstyle-LF/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Numr.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Numr.fd new file mode 100644 index 00000000000..a8da7242611 --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Numr.fd @@ -0,0 +1,67 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{T1MFBOldstyle-Numr.fd} + [2024/08/05 (autoinst) Font definitions for T1/MFBOldstyle-Numr.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{MFBOldstyle-Numr}{} + + +% ---- m = regular ---- + +\DeclareFontShape{T1}{MFBOldstyle-Numr}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-numr-t1 +}{} + +\DeclareFontShape{T1}{MFBOldstyle-Numr}{regular}{it}{ + <-> alias * MFBOldstyle-Numr/m/it +}{} + +\DeclareFontShape{T1}{MFBOldstyle-Numr}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-numr-t1 +}{} + +\DeclareFontShape{T1}{MFBOldstyle-Numr}{regular}{n}{ + <-> alias * MFBOldstyle-Numr/m/n +}{} + +\DeclareFontShape{T1}{MFBOldstyle-Numr}{m}{sl}{ + <-> ssub * MFBOldstyle-Numr/m/it +}{} + +\DeclareFontShape{T1}{MFBOldstyle-Numr}{regular}{sl}{ + <-> ssub * MFBOldstyle-Numr/regular/it +}{} + + +% ---- b = bold ---- + +\DeclareFontShape{T1}{MFBOldstyle-Numr}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-numr-t1 +}{} + +\DeclareFontShape{T1}{MFBOldstyle-Numr}{bold}{n}{ + <-> alias * MFBOldstyle-Numr/b/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{T1}{MFBOldstyle-Numr}{bx}{n}{ + <-> ssub * MFBOldstyle-Numr/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-OsF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-OsF.fd new file mode 100644 index 00000000000..2332b388489 --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-OsF.fd @@ -0,0 +1,44 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{T1MFBOldstyle-OsF.fd} + [2024/08/05 (autoinst) Font definitions for T1/MFBOldstyle-OsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{MFBOldstyle-OsF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{T1}{MFBOldstyle-OsF}{m}{sc}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-osf-sc-t1 +}{} + +\DeclareFontShape{T1}{MFBOldstyle-OsF}{regular}{sc}{ + <-> alias * MFBOldstyle-OsF/m/sc +}{} + +\DeclareFontShape{T1}{MFBOldstyle-OsF}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-osf-t1 +}{} + +\DeclareFontShape{T1}{MFBOldstyle-OsF}{regular}{n}{ + <-> alias * MFBOldstyle-OsF/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Sup.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Sup.fd new file mode 100644 index 00000000000..fd14ac5df23 --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-Sup.fd @@ -0,0 +1,67 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{T1MFBOldstyle-Sup.fd} + [2024/08/05 (autoinst) Font definitions for T1/MFBOldstyle-Sup.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{MFBOldstyle-Sup}{} + + +% ---- m = regular ---- + +\DeclareFontShape{T1}{MFBOldstyle-Sup}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-sup-t1 +}{} + +\DeclareFontShape{T1}{MFBOldstyle-Sup}{regular}{n}{ + <-> alias * MFBOldstyle-Sup/m/n +}{} + +\DeclareFontShape{T1}{MFBOldstyle-Sup}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-sup-t1 +}{} + +\DeclareFontShape{T1}{MFBOldstyle-Sup}{regular}{it}{ + <-> alias * MFBOldstyle-Sup/m/it +}{} + +\DeclareFontShape{T1}{MFBOldstyle-Sup}{m}{sl}{ + <-> ssub * MFBOldstyle-Sup/m/it +}{} + +\DeclareFontShape{T1}{MFBOldstyle-Sup}{regular}{sl}{ + <-> ssub * MFBOldstyle-Sup/regular/it +}{} + + +% ---- b = bold ---- + +\DeclareFontShape{T1}{MFBOldstyle-Sup}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-sup-t1 +}{} + +\DeclareFontShape{T1}{MFBOldstyle-Sup}{bold}{n}{ + <-> alias * MFBOldstyle-Sup/b/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{T1}{MFBOldstyle-Sup}{bx}{n}{ + <-> ssub * MFBOldstyle-Sup/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-TLF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-TLF.fd new file mode 100644 index 00000000000..d7c80e2171b --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-TLF.fd @@ -0,0 +1,75 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{T1MFBOldstyle-TLF.fd} + [2024/08/05 (autoinst) Font definitions for T1/MFBOldstyle-TLF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{MFBOldstyle-TLF}{} + + +% ---- b = bold ---- + +\DeclareFontShape{T1}{MFBOldstyle-TLF}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-tlf-t1 +}{} + +\DeclareFontShape{T1}{MFBOldstyle-TLF}{bold}{n}{ + <-> alias * MFBOldstyle-TLF/b/n +}{} + + +% ---- m = regular ---- + +\DeclareFontShape{T1}{MFBOldstyle-TLF}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-tlf-t1 +}{} + +\DeclareFontShape{T1}{MFBOldstyle-TLF}{regular}{it}{ + <-> alias * MFBOldstyle-TLF/m/it +}{} + +\DeclareFontShape{T1}{MFBOldstyle-TLF}{m}{sc}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tlf-sc-t1 +}{} + +\DeclareFontShape{T1}{MFBOldstyle-TLF}{regular}{sc}{ + <-> alias * MFBOldstyle-TLF/m/sc +}{} + +\DeclareFontShape{T1}{MFBOldstyle-TLF}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tlf-t1 +}{} + +\DeclareFontShape{T1}{MFBOldstyle-TLF}{regular}{n}{ + <-> alias * MFBOldstyle-TLF/m/n +}{} + +\DeclareFontShape{T1}{MFBOldstyle-TLF}{m}{sl}{ + <-> ssub * MFBOldstyle-TLF/m/it +}{} + +\DeclareFontShape{T1}{MFBOldstyle-TLF}{regular}{sl}{ + <-> ssub * MFBOldstyle-TLF/regular/it +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{T1}{MFBOldstyle-TLF}{bx}{n}{ + <-> ssub * MFBOldstyle-TLF/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-TOsF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-TOsF.fd new file mode 100644 index 00000000000..6f696037590 --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T1MFBOldstyle-TOsF.fd @@ -0,0 +1,44 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{T1MFBOldstyle-TOsF.fd} + [2024/08/05 (autoinst) Font definitions for T1/MFBOldstyle-TOsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{MFBOldstyle-TOsF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{T1}{MFBOldstyle-TOsF}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tosf-t1 +}{} + +\DeclareFontShape{T1}{MFBOldstyle-TOsF}{regular}{n}{ + <-> alias * MFBOldstyle-TOsF/m/n +}{} + +\DeclareFontShape{T1}{MFBOldstyle-TOsF}{m}{sc}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tosf-sc-t1 +}{} + +\DeclareFontShape{T1}{MFBOldstyle-TOsF}{regular}{sc}{ + <-> alias * MFBOldstyle-TOsF/m/sc +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Dnom.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Dnom.fd new file mode 100644 index 00000000000..dd93afa56be --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Dnom.fd @@ -0,0 +1,67 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{T5MFBOldstyle-Dnom.fd} + [2024/08/05 (autoinst) Font definitions for T5/MFBOldstyle-Dnom.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{T5}{MFBOldstyle-Dnom}{} + + +% ---- b = bold ---- + +\DeclareFontShape{T5}{MFBOldstyle-Dnom}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-dnom-t5 +}{} + +\DeclareFontShape{T5}{MFBOldstyle-Dnom}{bold}{n}{ + <-> alias * MFBOldstyle-Dnom/b/n +}{} + + +% ---- m = regular ---- + +\DeclareFontShape{T5}{MFBOldstyle-Dnom}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-dnom-t5 +}{} + +\DeclareFontShape{T5}{MFBOldstyle-Dnom}{regular}{it}{ + <-> alias * MFBOldstyle-Dnom/m/it +}{} + +\DeclareFontShape{T5}{MFBOldstyle-Dnom}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-dnom-t5 +}{} + +\DeclareFontShape{T5}{MFBOldstyle-Dnom}{regular}{n}{ + <-> alias * MFBOldstyle-Dnom/m/n +}{} + +\DeclareFontShape{T5}{MFBOldstyle-Dnom}{m}{sl}{ + <-> ssub * MFBOldstyle-Dnom/m/it +}{} + +\DeclareFontShape{T5}{MFBOldstyle-Dnom}{regular}{sl}{ + <-> ssub * MFBOldstyle-Dnom/regular/it +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{T5}{MFBOldstyle-Dnom}{bx}{n}{ + <-> ssub * MFBOldstyle-Dnom/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Inf.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Inf.fd new file mode 100644 index 00000000000..4aff4a0bf02 --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Inf.fd @@ -0,0 +1,67 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{T5MFBOldstyle-Inf.fd} + [2024/08/05 (autoinst) Font definitions for T5/MFBOldstyle-Inf.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{T5}{MFBOldstyle-Inf}{} + + +% ---- m = regular ---- + +\DeclareFontShape{T5}{MFBOldstyle-Inf}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-inf-t5 +}{} + +\DeclareFontShape{T5}{MFBOldstyle-Inf}{regular}{n}{ + <-> alias * MFBOldstyle-Inf/m/n +}{} + +\DeclareFontShape{T5}{MFBOldstyle-Inf}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-inf-t5 +}{} + +\DeclareFontShape{T5}{MFBOldstyle-Inf}{regular}{it}{ + <-> alias * MFBOldstyle-Inf/m/it +}{} + +\DeclareFontShape{T5}{MFBOldstyle-Inf}{m}{sl}{ + <-> ssub * MFBOldstyle-Inf/m/it +}{} + +\DeclareFontShape{T5}{MFBOldstyle-Inf}{regular}{sl}{ + <-> ssub * MFBOldstyle-Inf/regular/it +}{} + + +% ---- b = bold ---- + +\DeclareFontShape{T5}{MFBOldstyle-Inf}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-inf-t5 +}{} + +\DeclareFontShape{T5}{MFBOldstyle-Inf}{bold}{n}{ + <-> alias * MFBOldstyle-Inf/b/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{T5}{MFBOldstyle-Inf}{bx}{n}{ + <-> ssub * MFBOldstyle-Inf/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-LF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-LF.fd new file mode 100644 index 00000000000..20b7b6cc8a8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-LF.fd @@ -0,0 +1,75 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{T5MFBOldstyle-LF.fd} + [2024/08/05 (autoinst) Font definitions for T5/MFBOldstyle-LF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{T5}{MFBOldstyle-LF}{} + + +% ---- b = bold ---- + +\DeclareFontShape{T5}{MFBOldstyle-LF}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-lf-t5 +}{} + +\DeclareFontShape{T5}{MFBOldstyle-LF}{bold}{n}{ + <-> alias * MFBOldstyle-LF/b/n +}{} + + +% ---- m = regular ---- + +\DeclareFontShape{T5}{MFBOldstyle-LF}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-lf-t5 +}{} + +\DeclareFontShape{T5}{MFBOldstyle-LF}{regular}{it}{ + <-> alias * MFBOldstyle-LF/m/it +}{} + +\DeclareFontShape{T5}{MFBOldstyle-LF}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-lf-t5 +}{} + +\DeclareFontShape{T5}{MFBOldstyle-LF}{regular}{n}{ + <-> alias * MFBOldstyle-LF/m/n +}{} + +\DeclareFontShape{T5}{MFBOldstyle-LF}{m}{sc}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-lf-sc-t5 +}{} + +\DeclareFontShape{T5}{MFBOldstyle-LF}{regular}{sc}{ + <-> alias * MFBOldstyle-LF/m/sc +}{} + +\DeclareFontShape{T5}{MFBOldstyle-LF}{m}{sl}{ + <-> ssub * MFBOldstyle-LF/m/it +}{} + +\DeclareFontShape{T5}{MFBOldstyle-LF}{regular}{sl}{ + <-> ssub * MFBOldstyle-LF/regular/it +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{T5}{MFBOldstyle-LF}{bx}{n}{ + <-> ssub * MFBOldstyle-LF/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Numr.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Numr.fd new file mode 100644 index 00000000000..c5e53dd36e9 --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Numr.fd @@ -0,0 +1,67 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{T5MFBOldstyle-Numr.fd} + [2024/08/05 (autoinst) Font definitions for T5/MFBOldstyle-Numr.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{T5}{MFBOldstyle-Numr}{} + + +% ---- m = regular ---- + +\DeclareFontShape{T5}{MFBOldstyle-Numr}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-numr-t5 +}{} + +\DeclareFontShape{T5}{MFBOldstyle-Numr}{regular}{n}{ + <-> alias * MFBOldstyle-Numr/m/n +}{} + +\DeclareFontShape{T5}{MFBOldstyle-Numr}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-numr-t5 +}{} + +\DeclareFontShape{T5}{MFBOldstyle-Numr}{regular}{it}{ + <-> alias * MFBOldstyle-Numr/m/it +}{} + +\DeclareFontShape{T5}{MFBOldstyle-Numr}{m}{sl}{ + <-> ssub * MFBOldstyle-Numr/m/it +}{} + +\DeclareFontShape{T5}{MFBOldstyle-Numr}{regular}{sl}{ + <-> ssub * MFBOldstyle-Numr/regular/it +}{} + + +% ---- b = bold ---- + +\DeclareFontShape{T5}{MFBOldstyle-Numr}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-numr-t5 +}{} + +\DeclareFontShape{T5}{MFBOldstyle-Numr}{bold}{n}{ + <-> alias * MFBOldstyle-Numr/b/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{T5}{MFBOldstyle-Numr}{bx}{n}{ + <-> ssub * MFBOldstyle-Numr/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-OsF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-OsF.fd new file mode 100644 index 00000000000..4b4bfd27399 --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-OsF.fd @@ -0,0 +1,44 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{T5MFBOldstyle-OsF.fd} + [2024/08/05 (autoinst) Font definitions for T5/MFBOldstyle-OsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{T5}{MFBOldstyle-OsF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{T5}{MFBOldstyle-OsF}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-osf-t5 +}{} + +\DeclareFontShape{T5}{MFBOldstyle-OsF}{regular}{n}{ + <-> alias * MFBOldstyle-OsF/m/n +}{} + +\DeclareFontShape{T5}{MFBOldstyle-OsF}{m}{sc}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-osf-sc-t5 +}{} + +\DeclareFontShape{T5}{MFBOldstyle-OsF}{regular}{sc}{ + <-> alias * MFBOldstyle-OsF/m/sc +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Sup.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Sup.fd new file mode 100644 index 00000000000..c58149a46ef --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-Sup.fd @@ -0,0 +1,67 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{T5MFBOldstyle-Sup.fd} + [2024/08/05 (autoinst) Font definitions for T5/MFBOldstyle-Sup.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{T5}{MFBOldstyle-Sup}{} + + +% ---- m = regular ---- + +\DeclareFontShape{T5}{MFBOldstyle-Sup}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-sup-t5 +}{} + +\DeclareFontShape{T5}{MFBOldstyle-Sup}{regular}{it}{ + <-> alias * MFBOldstyle-Sup/m/it +}{} + +\DeclareFontShape{T5}{MFBOldstyle-Sup}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-sup-t5 +}{} + +\DeclareFontShape{T5}{MFBOldstyle-Sup}{regular}{n}{ + <-> alias * MFBOldstyle-Sup/m/n +}{} + +\DeclareFontShape{T5}{MFBOldstyle-Sup}{m}{sl}{ + <-> ssub * MFBOldstyle-Sup/m/it +}{} + +\DeclareFontShape{T5}{MFBOldstyle-Sup}{regular}{sl}{ + <-> ssub * MFBOldstyle-Sup/regular/it +}{} + + +% ---- b = bold ---- + +\DeclareFontShape{T5}{MFBOldstyle-Sup}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-sup-t5 +}{} + +\DeclareFontShape{T5}{MFBOldstyle-Sup}{bold}{n}{ + <-> alias * MFBOldstyle-Sup/b/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{T5}{MFBOldstyle-Sup}{bx}{n}{ + <-> ssub * MFBOldstyle-Sup/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-TLF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-TLF.fd new file mode 100644 index 00000000000..5d4e067775c --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-TLF.fd @@ -0,0 +1,75 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{T5MFBOldstyle-TLF.fd} + [2024/08/05 (autoinst) Font definitions for T5/MFBOldstyle-TLF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{T5}{MFBOldstyle-TLF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{T5}{MFBOldstyle-TLF}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-tlf-t5 +}{} + +\DeclareFontShape{T5}{MFBOldstyle-TLF}{regular}{it}{ + <-> alias * MFBOldstyle-TLF/m/it +}{} + +\DeclareFontShape{T5}{MFBOldstyle-TLF}{m}{sc}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tlf-sc-t5 +}{} + +\DeclareFontShape{T5}{MFBOldstyle-TLF}{regular}{sc}{ + <-> alias * MFBOldstyle-TLF/m/sc +}{} + +\DeclareFontShape{T5}{MFBOldstyle-TLF}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tlf-t5 +}{} + +\DeclareFontShape{T5}{MFBOldstyle-TLF}{regular}{n}{ + <-> alias * MFBOldstyle-TLF/m/n +}{} + +\DeclareFontShape{T5}{MFBOldstyle-TLF}{m}{sl}{ + <-> ssub * MFBOldstyle-TLF/m/it +}{} + +\DeclareFontShape{T5}{MFBOldstyle-TLF}{regular}{sl}{ + <-> ssub * MFBOldstyle-TLF/regular/it +}{} + + +% ---- b = bold ---- + +\DeclareFontShape{T5}{MFBOldstyle-TLF}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-tlf-t5 +}{} + +\DeclareFontShape{T5}{MFBOldstyle-TLF}{bold}{n}{ + <-> alias * MFBOldstyle-TLF/b/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{T5}{MFBOldstyle-TLF}{bx}{n}{ + <-> ssub * MFBOldstyle-TLF/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-TOsF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-TOsF.fd new file mode 100644 index 00000000000..e377aa052ee --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/T5MFBOldstyle-TOsF.fd @@ -0,0 +1,44 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{T5MFBOldstyle-TOsF.fd} + [2024/08/05 (autoinst) Font definitions for T5/MFBOldstyle-TOsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{T5}{MFBOldstyle-TOsF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{T5}{MFBOldstyle-TOsF}{m}{sc}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tosf-sc-t5 +}{} + +\DeclareFontShape{T5}{MFBOldstyle-TOsF}{regular}{sc}{ + <-> alias * MFBOldstyle-TOsF/m/sc +}{} + +\DeclareFontShape{T5}{MFBOldstyle-TOsF}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tosf-t5 +}{} + +\DeclareFontShape{T5}{MFBOldstyle-TOsF}{regular}{n}{ + <-> alias * MFBOldstyle-TOsF/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-LF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-LF.fd new file mode 100644 index 00000000000..8a6b0384cc0 --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-LF.fd @@ -0,0 +1,67 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{TS1MFBOldstyle-LF.fd} + [2024/08/05 (autoinst) Font definitions for TS1/MFBOldstyle-LF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{TS1}{MFBOldstyle-LF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{TS1}{MFBOldstyle-LF}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-lf-ts1 +}{} + +\DeclareFontShape{TS1}{MFBOldstyle-LF}{regular}{n}{ + <-> alias * MFBOldstyle-LF/m/n +}{} + +\DeclareFontShape{TS1}{MFBOldstyle-LF}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-lf-ts1 +}{} + +\DeclareFontShape{TS1}{MFBOldstyle-LF}{regular}{it}{ + <-> alias * MFBOldstyle-LF/m/it +}{} + +\DeclareFontShape{TS1}{MFBOldstyle-LF}{m}{sl}{ + <-> ssub * MFBOldstyle-LF/m/it +}{} + +\DeclareFontShape{TS1}{MFBOldstyle-LF}{regular}{sl}{ + <-> ssub * MFBOldstyle-LF/regular/it +}{} + + +% ---- b = bold ---- + +\DeclareFontShape{TS1}{MFBOldstyle-LF}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-lf-ts1 +}{} + +\DeclareFontShape{TS1}{MFBOldstyle-LF}{bold}{n}{ + <-> alias * MFBOldstyle-LF/b/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{TS1}{MFBOldstyle-LF}{bx}{n}{ + <-> ssub * MFBOldstyle-LF/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-OsF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-OsF.fd new file mode 100644 index 00000000000..e3f0e59f786 --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-OsF.fd @@ -0,0 +1,36 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{TS1MFBOldstyle-OsF.fd} + [2024/08/05 (autoinst) Font definitions for TS1/MFBOldstyle-OsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{TS1}{MFBOldstyle-OsF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{TS1}{MFBOldstyle-OsF}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-osf-ts1 +}{} + +\DeclareFontShape{TS1}{MFBOldstyle-OsF}{regular}{n}{ + <-> alias * MFBOldstyle-OsF/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-TLF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-TLF.fd new file mode 100644 index 00000000000..f25231bec92 --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-TLF.fd @@ -0,0 +1,67 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{TS1MFBOldstyle-TLF.fd} + [2024/08/05 (autoinst) Font definitions for TS1/MFBOldstyle-TLF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{TS1}{MFBOldstyle-TLF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{TS1}{MFBOldstyle-TLF}{m}{it}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Italic-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{MFBOldstyle-TLF}{regular}{it}{ + <-> alias * MFBOldstyle-TLF/m/it +}{} + +\DeclareFontShape{TS1}{MFBOldstyle-TLF}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{MFBOldstyle-TLF}{regular}{n}{ + <-> alias * MFBOldstyle-TLF/m/n +}{} + +\DeclareFontShape{TS1}{MFBOldstyle-TLF}{m}{sl}{ + <-> ssub * MFBOldstyle-TLF/m/it +}{} + +\DeclareFontShape{TS1}{MFBOldstyle-TLF}{regular}{sl}{ + <-> ssub * MFBOldstyle-TLF/regular/it +}{} + + +% ---- b = bold ---- + +\DeclareFontShape{TS1}{MFBOldstyle-TLF}{b}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Bold-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{MFBOldstyle-TLF}{bold}{n}{ + <-> alias * MFBOldstyle-TLF/b/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\DeclareFontShape{TS1}{MFBOldstyle-TLF}{bx}{n}{ + <-> ssub * MFBOldstyle-TLF/b/n +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-TOsF.fd b/Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-TOsF.fd new file mode 100644 index 00000000000..b53f26148ef --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/TS1MFBOldstyle-TOsF.fd @@ -0,0 +1,36 @@ +%% Generated by autoinst on 2024/08/05 +%% +\ProvidesFile{TS1MFBOldstyle-TOsF.fd} + [2024/08/05 (autoinst) Font definitions for TS1/MFBOldstyle-TOsF.] + +\ifcsname s@fct@alias\endcsname\else +\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} +\gdef\@font@aliasinfo#1{% + \@font@info{Font\space shape\space `\curr@fontshape'\space will + \space be\space aliased\MessageBreak to\space `\mandatory@arg'}% +} +\fi + +\expandafter\ifx\csname MFBOldstyle@scale\endcsname\relax + \let\MFBOldstyle@@scale\@empty +\else + \edef\MFBOldstyle@@scale{s*[\csname MFBOldstyle@scale\endcsname]}% +\fi + +\DeclareFontFamily{TS1}{MFBOldstyle-TOsF}{} + + +% ---- m = regular ---- + +\DeclareFontShape{TS1}{MFBOldstyle-TOsF}{m}{n}{ + <-> \MFBOldstyle@@scale MFBOldstyle-Regular-tosf-ts1 +}{} + +\DeclareFontShape{TS1}{MFBOldstyle-TOsF}{regular}{n}{ + <-> alias * MFBOldstyle-TOsF/m/n +}{} + + +% ---- Extra 'ssub' rules to map 'bx' to 'b' ---- + +\endinput diff --git a/Master/texmf-dist/tex/latex/mfb-oldstyle/mfb-oldstyle.sty b/Master/texmf-dist/tex/latex/mfb-oldstyle/mfb-oldstyle.sty new file mode 100644 index 00000000000..4bfbde6a576 --- /dev/null +++ b/Master/texmf-dist/tex/latex/mfb-oldstyle/mfb-oldstyle.sty @@ -0,0 +1,93 @@ +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{mfb-oldstyle} + [2024/08/05 (autoinst) Style file for MFBOldstyle fonts.] + +\RequirePackage{xkeyval} +\newcommand*{\MFBOldstyle@scale}{1} +\DeclareOptionX{scale}{\renewcommand*{\MFBOldstyle@scale}{#1}} +\DeclareOptionX{scaled}{\renewcommand*{\MFBOldstyle@scale}{#1}} + +\DeclareOptionX{lining}{\edef\MFBOldstyle@figurestyle{LF}} +\DeclareOptionX{oldstyle}{\edef\MFBOldstyle@figurestyle{OsF}} +\DeclareOptionX{tabular}{\edef\MFBOldstyle@figurealign{T}} +\DeclareOptionX{proportional}{\edef\MFBOldstyle@figurealign{}} +\edef\MFBOldstyle@figurestyle{LF} +\edef\MFBOldstyle@figurealign{} + +\DeclareOptionX{mainfont}{ + \renewcommand{\familydefault}{\rmdefault} +} +\DeclareOptionX{bold}{\edef\bfseries@rm{bold}} +\DeclareOptionX{regular}{\edef\mdseries@rm{regular}} + +\ProcessOptionsX\relax + +\RequirePackage[LY1,T1,T5]{fontenc} +\RequirePackage{textcomp} +\RequirePackage{ifthen} +\RequirePackage{mweights} + +\IfFileExists{fontaxes.sty}{ + \RequirePackage{fontaxes} + \fa@naming@exception{figures}{{superior}{proportional}}{Sup} + \fa@naming@exception{figures}{{superior}{tabular}}{Sup} + \def\supfigures{\@nomath\supfigures + \fontfigurestyle{superior}\selectfont} + \let\sufigures\supfigures + \DeclareTextFontCommand{\textsup}{\supfigures} + \let\textsu\textsup + \let\textsuperior\textsup + \let\@oldtextsuperscript\textsuperscript + \def\textsuperscript{\@ifstar\@oldtextsuperscript\textsup} + \def\@makefnmark{% + \mbox{\footnotemarkfont\textsuperscript{\@thefnmark}}} + \@ifundefined{ftntm@font}% + {\let\footnotemarkfont\normalfont}% + {\let\footnotemarkfont\ftntm@font} + + \fa@naming@exception{figures}{{inferior}{proportional}}{Inf} + \fa@naming@exception{figures}{{inferior}{tabular}}{Inf} + \def\inffigures{\@nomath\inffigures + \fontfigurestyle{inferior}\selectfont} + \let\infigures\inffigures + \DeclareTextFontCommand{\textinf}{\inffigures} + \let\textin\textinf + \let\textinferior\textinf + \let\@oldtextsubscript\textsubscript + \def\textsubscript{\@ifstar\@oldtextsubscript\textinf} + + \fa@naming@exception{figures}{{numerators}{proportional}}{Numr} + \fa@naming@exception{figures}{{numerator}{proportional}}{Numr} + \fa@naming@exception{figures}{{numerators}{tabular}}{Numr} + \fa@naming@exception{figures}{{numerator}{tabular}}{Numr} + + \fa@naming@exception{figures}{{denominators}{proportional}}{Dnom} + \fa@naming@exception{figures}{{denominator}{proportional}}{Dnom} + \fa@naming@exception{figures}{{denominators}{tabular}}{Dnom} + \fa@naming@exception{figures}{{denominator}{tabular}}{Dnom} + +}{} + +% Here we implement the scale=MatchLowercase option. +% If this is given, we must compute the correct value of +% the "\MFBOldstyle@scale" parameter before loading the .fd files; +% but to determine that value we of course need the font's x-height. +% To avoid triggering the loading of .fd files, +% we use plain TeX's \font primitive to load the testfont. +% We then compute the ratio of the current x-height to our font's x-height; +% this is the "\MFBOldstyle@scale" we will pass to the .fd files. +\ifthenelse{\equal{\MFBOldstyle@scale}{MatchLowercase}} + { \newlength{\MFBOldstyle@currentx} + \settoheight{\MFBOldstyle@currentx}{x} + \newlength{\MFBOldstyle@xheight} + \settoheight{\MFBOldstyle@xheight} + {{\font\testfont=MFBOldstyle-Regular-osf-ot1 at \f@size pt\testfont x}} + \renewcommand*{\MFBOldstyle@scale} + {\strip@pt\dimexpr\number\numexpr\number\dimexpr\MFBOldstyle@currentx\relax*65536/\number\dimexpr\MFBOldstyle@xheight\relax\relax sp\relax}} + {} + +\renewcommand* + {\rmdefault} + {MFBOldstyle-\MFBOldstyle@figurealign\MFBOldstyle@figurestyle} + +\endinput diff --git a/Master/texmf-dist/tex/latex/mitthesis/mitthesis.cls b/Master/texmf-dist/tex/latex/mitthesis/mitthesis.cls index 0a3a44310c5..0a142d30aed 100644 --- a/Master/texmf-dist/tex/latex/mitthesis/mitthesis.cls +++ b/Master/texmf-dist/tex/latex/mitthesis/mitthesis.cls @@ -7,8 +7,8 @@ %% MIT Libraries' requirements as of 2024. %% %% This file's version and date: - \def\versionno{1.14} - \def\versiondate{2024/07/19\space} + \def\versionno{1.15} + \def\versiondate{2024/08/31\space} %% %% Author: John H. Lienhard, V %% Department of Mechanical Engineering @@ -89,6 +89,7 @@ \IfPackageLoadedTF{graphicx}{\define@key{Gin}{alt}{}}{\relax} } } +% Most compatibility commands will be dropped as time goes by ... %%%%%%%%%%%%%% Options for the class %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -157,22 +158,28 @@ % pdf bookmarks. This is not automatic for \chapter*, which is the format of toc, lof, and lot. \RequirePackage{etoolbox}% provides \patchcmd + \patchcmd{\tableofcontents}{\contentsname}{\pdfbookmark[0]{Table of Contents}{toc}\contentsname}{}{} % placement matters. -\patchcmd{\listoffigures}{\chapter*{\listfigurename}}{\chapter*{\phantomsection\listfigurename}\addcontentsline{toc}{frontmatter}{\listfigurename}}{}{} -\patchcmd{\listoftables}{\chapter*{\listtablename}}{\chapter*{\phantomsection\listtablename}\addcontentsline{toc}{frontmatter}{\listtablename}}{}{} + +%% Temporary accommodation of latex tagging. Rework once tagging structures have been finalized by LaTeX3 team. +%% No guarantee that this hack is hierarchically correct. +%% Current latex-lab places tags around \@schapter, which is harder to deal with here. +\providecommand*\MakeLinkTarget{\@gobbletwo} + +\patchcmd{\listoffigures}{\chapter*{\listfigurename}}{\chapter*{\phantomsection\listfigurename}\MakeLinkTarget[chapter]{}\addcontentsline{toc}{frontmatter}{\listfigurename}}{}{} +\patchcmd{\listoftables}{\chapter*{\listtablename}}{\chapter*{\phantomsection\listtablename}\MakeLinkTarget[chapter]{}\addcontentsline{toc}{frontmatter}{\listtablename}}{}{} \NewCommandCopy\l@frontmatter\l@chapter \NewCommandCopy\l@backmatter\l@chapter \providecommand*{\toclevel@frontmatter}{0}% prevent warning, see hyperref manual Sec. 13.3 \providecommand*{\toclevel@backmatter}{0} -%% if you want different formatting for front/back matter, change here (cf. report.cls). This approach preserves tagging hooks. -\AtBeginDocument{ - \patchcmd{\l@frontmatter}{\bfseries}{\itshape}{}{} - \patchcmd{\l@frontmatter}{\nobreak\hfil}{\upshape\nobreak\hfil}{}{} - \patchcmd{\l@frontmatter}{1.0em}{3pt}{}{} - \patchcmd{\l@backmatter}{\bfseries}{\itshape}{}{} - \patchcmd{\l@backmatter}{\nobreak\hfil}{\upshape\nobreak\hfil}{}{} -} + +%% if you want different formatting for front/back matter, change here (cf. report.cls). +\patchcmd{\l@frontmatter}{\bfseries}{\itshape}{}{} +\patchcmd{\l@frontmatter}{\nobreak\hfil}{\upshape\nobreak\hfil}{}{} +\patchcmd{\l@frontmatter}{1.0em}{3pt}{}{} +\patchcmd{\l@backmatter}{\bfseries}{\itshape}{}{} +\patchcmd{\l@backmatter}{\nobreak\hfil}{\upshape\nobreak\hfil}{}{} %%%%%%%%%%%%% Geometry, mathtools, graphics, design, fonts, hyperrefs, bookmarks, footnotes %%%%%%%%%%%%%%%%%%% @@ -294,8 +301,10 @@ %%%%%%%%%%%% PDF bookmark strings %%%%%%%%%%%%%%%% -%%% Since \bm may be useful in headings, use this fix to reduce frequency with which alternate -%%% bookmark strings must be given with commands such as \section{ \texorpdfstring{texstring}{pdfstring} } +%%% By early 2024, \pdfstring removes all robust commands from bookmarks, so that such commands +%%% don't cause errors; the following pdfstringdisables serve to suppress warnings. + +%% \bm may be useful in headings, but let's disable in the associated bookmarks \pdfstringdefDisableCommands{% \def\bm#1#{\relax}% } @@ -323,7 +332,7 @@ } %%% Here's a more cumbersome removal of the warning for $ (math shift) in pdfbookmarks. -%%% Not implementing this by default, since novice authors may benefit from the warning. +%%% Not implementing this by default, since novice authors may benefit from the warning. :-) %%% https://tex.stackexchange.com/a/620360/119566 %\let\oldHyPsd@CatcodeWarning\HyPsd@CatcodeWarning %\renewcommand{\HyPsd@CatcodeWarning}[1]{% @@ -349,6 +358,10 @@ %%%%%%%%%%%% MACROS FOR HANDLING TITLE AND ABSTRACT PAGES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\AtBeginDocument{ + \providecommand{\textls}[2][]{#2}% in case microtype is not loaded +} + %%%%%%%%%% Degree Date Module %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \tl_new:N \g__dd_month_tl @@ -441,11 +454,11 @@ \int_incr:N \l__author_autcrcnt_int \int_while_do:nNnn { \l__author_autcrcnt_int } < { \g_author_authorcnt_int } { - \tl_gput_right:Nx \g__author_ca_tl {,\ \seq_item:cn { g_author_name_seq } { \l__author_autcrcnt_int } } + \tl_gput_right:Nx \g__author_ca_tl {,~\seq_item:cn { g_author_name_seq } { \l__author_autcrcnt_int } } \int_incr:N \l__author_autcrcnt_int } \int_compare:nNnT { \l__author_autcrcnt_int } = { \g_author_authorcnt_int } { - \tl_gput_right:Nx \g__author_ca_tl {\ and\ \seq_item:cn { g_author_name_seq } { \l__author_autcrcnt_int } } + \tl_gput_right:Nx \g__author_ca_tl {~and~\seq_item:cn { g_author_name_seq } { \l__author_autcrcnt_int } } } \tl_set:Nn \l_tmpa_tl {\tl_item:Nn \g__author_ca_tl {-1} }% get last token \str_case_e:nnT @@ -453,6 +466,7 @@ { {.}{} } { \__copyright_remove_period:N { \g__author_ca_tl } }% remove last token if it is a period \__author_pdfcopyrightauthor: + \cs_gset:Npe \@author { \tl_use:N \g__author_ca_tl }% 2024/08/06 } \cs_new:Nn \__copyright_remove_period:N { @@ -465,11 +479,11 @@ \int_until_do:nNnn { \l_tmpa_int } = { \g_author_authorcnt_int } { \int_incr:N \l_tmpa_int - \tl_gput_right:Nx \g__author_pdfca_tl {,\ { \seq_item:cn { g_author_name_seq } { \l_tmpa_int } } } - } + \tl_gput_right:Nx \g__author_pdfca_tl {;\ { \seq_item:cn { g_author_name_seq } { \l_tmpa_int } } } + % changed comma to semicolon for consistency with Dublin Core metadata format, 2024/08/30 + } } - \tl_new:N \g__author_namesize_tl \tl_gset:Nn \g__author_namesize_tl { \large } \cs_new:Nn \__author_block: { @@ -722,10 +736,10 @@ \ of} \par \int_until_do:nNnn { \l__degree_degreeno_int } = { \g_degree_degreecnt_int } { - \text_uppercase:n {\seq_item:cn { g_degree_name_seq } { \l__degree_degreeno_int }}\par and\par + \textls[60]{\text_uppercase:n {\seq_item:cn { g_degree_name_seq } { \l__degree_degreeno_int }}}\par and\par \int_incr:N \l__degree_degreeno_int } - \text_uppercase:n {\seq_item:cn { g_degree_name_seq } { \l__degree_degreeno_int }}\par + \textls[60]{\text_uppercase:n {\seq_item:cn { g_degree_name_seq } { \l__degree_degreeno_int }}}\par } \msg_new:nnnn { \ClassName } { no_degree } { Missing\ degree!\ You\ must\ issue\ the\ \Degree{name}{department}\ command. }{ @@ -750,10 +764,10 @@ \ of} \par\medskip \int_until_do:nNnn { \l__degree_degreeno_int } = { \g_degree_degreecnt_int } { - \text_uppercase:n {\seq_item:cn { g_degree_name_seq } { \l__degree_degreeno_int }}\par and\par + \textls[60]{\text_uppercase:n {\seq_item:cn { g_degree_name_seq } { \l__degree_degreeno_int }}}\par and\par \int_incr:N \l__degree_degreeno_int } - \text_uppercase:n {\seq_item:cn { g_degree_name_seq } { \l__degree_degreeno_int }}\par\medskip + \textls[60]{\text_uppercase:n {\seq_item:cn { g_degree_name_seq } { \l__degree_degreeno_int }}}\par\medskip } %%%%%%%%%% End Degree Module %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -890,6 +904,7 @@ \RenewDocumentCommand{\title}{m} { \__mitthesis_title:n { #1 } + \cs_gset:Npe \@title { \tl_use:N \g_mitthesis_title_tl } % 2024/08/06 \hypersetup{ pdftitle={\g_mitthesis_title_tl}, } @@ -967,12 +982,12 @@ {\Large\textbf{\g_mitthesis_title_tl} %\phantomsection\addcontentsline{toc}{chapter}{Title\ page} \par} - \__titlepage_blockskip:nn {12}{1.5}% new idea + \__titlepage_blockskip:nn {12}{1.5} \__author_block: \__titlepage_blockskip:nn {12}{1.5} \__degree_block: - at\ the\par - \text_uppercase:n { \g_titlepage_institution_name_tl }\par + at~the\par + \textls[60]{\text_uppercase:n { \g_titlepage_institution_name_tl }}\par \DegreeMonth\ \DegreeYear\par \__titlepage_blockskip:nn {12}{2} \copyright\space\DegreeYear\space\CopyrightAuthor\@.\c_space_token \g_copyright_copyrightlicencse_tl % \@. in case name ends with III, IV, V,... diff --git a/Master/texmf-dist/tex/latex/moremath/moremath.sty b/Master/texmf-dist/tex/latex/moremath/moremath.sty index 43c704f51d5..cc63871489b 100644 --- a/Master/texmf-dist/tex/latex/moremath/moremath.sty +++ b/Master/texmf-dist/tex/latex/moremath/moremath.sty @@ -29,8 +29,9 @@ %% \NeedsTeXFormat{LaTeX2e}[2022-11-01] +\DeclareCurrentRelease{v0}{2024-07-15} \ProvidesExplPackage{moremath} - {2024-07-15}{v0.4.0}{More Math Macros} + {2024-08-20}{v0.5.0}{More Math Macros} \msg_new:nnn { moremath } {load / bm} { Option~'bm'~given.\\ @@ -185,18 +186,44 @@ \RequirePackage{amssymb} } \RequirePackage{mathtools}[2004/06/05] +\cs_new_protected:Nn \__moremath_tex_vcenter:n +{ + \tex_vcenter:D {#1} +} +\cs_new_protected:Nn \__moremath_tex_mathpalette:Nn +{ + \mathpalette #1 {#2} +} +\cs_new_protected_nopar:Nn \__moremath_tex_mathsurround:n +{ + \tex_mathsurround:D = #1 +} +\cs_new_protected_nopar:Nn \__moremath_tex_mathop:n +{ + \tex_mathop:D {#1} +} +\cs_new_nopar:Nn \__moremath_matrix_star_begin:nn +{ + \begin{ #1 matrix* } [ #2 ] +} +\cs_generate_variant:Nn \__moremath_matrix_star_begin:nn { nV, Vn, VV } +\cs_new_nopar:Nn \__moremath_matrix_star_end:n +{ + \end{ #1 matrix* } +} +\cs_generate_variant:Nn \__moremath_matrix_star_end:n {V} \cs_new_protected_nopar:Nn \moremath_vcenter:n { - \mathpalette \__moremath_vcenter:Nn {#1} + \__moremath_tex_mathpalette:Nn \__moremath_vcenter:Nn {#1} } \cs_new_protected_nopar:Nn \__moremath_vcenter:Nn { - \vcenter + \__moremath_tex_vcenter:n { \hbox:n { $ - \mathsurround=0pt + \__moremath_tex_mathsurround:n {0pt} #1 {#2} $ } @@ -384,7 +411,7 @@ { \tl_if_empty:NTF \l__moremath_grad_op_tl { - \mathop + \__moremath_tex_mathop:n { \bool_if:NTF \l__moremath_nabla_arrow_bool { @@ -411,7 +438,7 @@ \l__moremath_nabla_tl } } - }% \mathop + }% \__moremath_tex_mathop:n \nolimits }{ \l__moremath_grad_op_tl @@ -421,7 +448,7 @@ { \tl_if_empty:NTF \l__moremath_laplacian_tl { - \mathop + \__moremath_tex_mathop:n { \bool_if:NTF \l__moremath_laplacian_delta_bool { @@ -463,10 +490,10 @@ } \cs_new_protected:Nn \__moremath_dalembert_operator_get: { - \mathop + \__moremath_tex_mathop:n { \l__moremath_dalembert_symb_tl - }% \mathop + }% \__moremath_tex_mathop:n \nolimits } \cs_new_protected_nopar:Nn \moremath_gradient_operator:n @@ -694,20 +721,21 @@ \seq_clear:N \l__moremath_vector_entries_seq \seq_set_from_clist:Nn \l__moremath_vector_entries_seq {#2} - \exp_args:NnNV \begin{#1 matrix*} [ \l__moremath_matrix_align_tl ] + \__moremath_matrix_star_begin:nV {#1} \l__moremath_matrix_align_tl \__moremath_seq_to_column_vector:N \l__moremath_vector_entries_seq - \end{#1 matrix*} + \__moremath_matrix_star_end:n {#1} } - \cs_new_protected_nopar:Nn \moremath_row_vector:nn { \seq_clear:N \l__moremath_vector_entries_seq \seq_set_from_clist:Nn \l__moremath_vector_entries_seq {#2} - \exp_args:NnNV \begin{#1matrix*} [ \l__moremath_matrix_align_tl ] + \__moremath_matrix_star_begin:nV {#1} \l__moremath_matrix_align_tl \__moremath_seq_to_row_vector:N \l__moremath_vector_entries_seq - \end{#1matrix*} + \__moremath_matrix_star_end:n {#1} } +\cs_generate_variant:Nn \moremath_column_vector:nn { Vn } +\cs_generate_variant:Nn \moremath_row_vector:nn { Vn } \cs_new_protected_nopar:Nn \moremath_column_smallvector:nn { \moremath_column_vector:nn {#1 small} {#2} @@ -717,6 +745,8 @@ { \moremath_row_vector:nn {#1 small} {#2} } +\cs_generate_variant:Nn \moremath_column_smallvector:nn { Vn } +\cs_generate_variant:Nn \moremath_row_smallvector:nn { Vn } \seq_clear_new:N \l__moremath_mat_diag_entries_seq \seq_clear_new:N \l__moremath_mat_row_entries_seq \cs_new_protected:Nn \__moremath_constr_diagmat_row:n @@ -759,19 +789,18 @@ \cs_new_protected:Nn \moremath_diagonal_matrix:nn { \seq_set_from_clist:Nn \l__moremath_mat_diag_entries_seq { #2 } - \exp_args:NnNV \begin{#1 matrix*} [ \l__moremath_matrix_align_tl ] + \__moremath_matrix_star_begin:nV { #1 } \l__moremath_matrix_align_tl \int_step_function:nN { \seq_count:N \l__moremath_mat_diag_entries_seq } \__moremath_constr_diagmat_row:n - \end{#1 matrix*} + \__moremath_matrix_star_end:n { #1 } } - \cs_new_protected:Nn \moremath_antidiagonal_matrix:nn { \seq_set_from_clist:Nn \l__moremath_mat_diag_entries_seq { #2 } - \exp_args:NnNV \begin{ #1 matrix* } [ \l__moremath_matrix_align_tl ] + \__moremath_matrix_star_begin:nV { #1 } \l__moremath_matrix_align_tl \int_step_function:nN { \seq_count:N \l__moremath_mat_diag_entries_seq } \__moremath_constr_antidiagmat_row:n - \end{ #1 matrix* } + \__moremath_matrix_star_end:n { #1 } } \cs_new_protected:Nn \moremath_diagonal_smallmatrix:nn @@ -783,18 +812,10 @@ { \moremath_antidiagonal_matrix:nn {#1 small} {#2} } -\cs_generate_variant:Nn \moremath_diagonal_matrix:nn { n V } -\cs_generate_variant:Nn \moremath_diagonal_matrix:nn { V n } -\cs_generate_variant:Nn \moremath_diagonal_matrix:nn { V V } -\cs_generate_variant:Nn \moremath_antidiagonal_matrix:nn { n V } -\cs_generate_variant:Nn \moremath_antidiagonal_matrix:nn { V n } -\cs_generate_variant:Nn \moremath_antidiagonal_matrix:nn { V V } -\cs_generate_variant:Nn \moremath_diagonal_smallmatrix:nn { n V } -\cs_generate_variant:Nn \moremath_diagonal_smallmatrix:nn { V n } -\cs_generate_variant:Nn \moremath_diagonal_smallmatrix:nn { V V } -\cs_generate_variant:Nn \moremath_antidiagonal_smallmatrix:nn { n V } -\cs_generate_variant:Nn \moremath_antidiagonal_smallmatrix:nn { V n } -\cs_generate_variant:Nn \moremath_antidiagonal_smallmatrix:nn { V V } +\cs_generate_variant:Nn \moremath_diagonal_matrix:nn { nV, Vn, VV } +\cs_generate_variant:Nn \moremath_antidiagonal_matrix:nn { nV, Vn, VV } +\cs_generate_variant:Nn \moremath_diagonal_smallmatrix:nn { nV, Vn, VV} +\cs_generate_variant:Nn \moremath_antidiagonal_smallmatrix:nn { nV, Vn, VV } \cs_new_protected_nopar:Nn \__moremath_generate_one_filled_clist:Nn { \seq_clear:N \l_tmpa_seq @@ -842,7 +863,7 @@ { \keys_set:nn { moremath / matrix } {#1} } - \moremath_column_vector:nn {\l__moremath_matrix_delim_tl} {#2} + \moremath_column_vector:Vn \l__moremath_matrix_delim_tl {#2} \group_end: } }{ @@ -861,7 +882,7 @@ { \keys_set:nn { moremath / matrix } {#1} } - \moremath_row_vector:nn {\l__moremath_matrix_delim_tl} {#2} + \moremath_row_vector:Vn \l__moremath_matrix_delim_tl {#2} \group_end: } }{ @@ -880,7 +901,7 @@ { \keys_set:nn {moremath / matrix} {#1} } - \moremath_column_smallvector:nn {\l__moremath_matrix_delim_tl} {#2} + \moremath_column_smallvector:Vn \l__moremath_matrix_delim_tl {#2} \group_end: } }{ @@ -900,7 +921,7 @@ { \keys_set:nn { moremath / matrix } {#1} } - \moremath_row_smallvector:nn {\l__moremath_matrix_delim_tl} {#2} + \moremath_row_smallvector:Vn \l__moremath_matrix_delim_tl {#2} \group_end: } }{ @@ -923,7 +944,7 @@ { \keys_set:nn {moremath / matrix } {##1} } - #2 {\l__moremath_matrix_delim_tl} {##2} + #2 \l__moremath_matrix_delim_tl {##2} \group_end: } }{ @@ -934,31 +955,31 @@ } } } -\__moremath_new_vector_shorth_doc_cmd:NNn \pcvector \moremath_column_vector:nn {p} -\__moremath_new_vector_shorth_doc_cmd:NNn \bcvector \moremath_column_vector:nn {b} -\__moremath_new_vector_shorth_doc_cmd:NNn \Bcvector \moremath_column_vector:nn {B} -\__moremath_new_vector_shorth_doc_cmd:NNn \vcvector \moremath_column_vector:nn {v} -\__moremath_new_vector_shorth_doc_cmd:NNn \Vcvector \moremath_column_vector:nn {V} -\__moremath_new_vector_shorth_doc_cmd:NNn \prvector \moremath_row_vector:nn {p} -\__moremath_new_vector_shorth_doc_cmd:NNn \brvector \moremath_row_vector:nn {b} -\__moremath_new_vector_shorth_doc_cmd:NNn \Brvector \moremath_row_vector:nn {B} -\__moremath_new_vector_shorth_doc_cmd:NNn \vrvector \moremath_row_vector:nn {v} -\__moremath_new_vector_shorth_doc_cmd:NNn \Vrvector \moremath_row_vector:nn {V} -\__moremath_new_vector_shorth_doc_cmd:NNn \psmallcvector \moremath_column_smallvector:nn +\__moremath_new_vector_shorth_doc_cmd:NNn \pcvector \moremath_column_vector:Vn {p} +\__moremath_new_vector_shorth_doc_cmd:NNn \bcvector \moremath_column_vector:Vn {b} +\__moremath_new_vector_shorth_doc_cmd:NNn \Bcvector \moremath_column_vector:Vn {B} +\__moremath_new_vector_shorth_doc_cmd:NNn \vcvector \moremath_column_vector:Vn {v} +\__moremath_new_vector_shorth_doc_cmd:NNn \Vcvector \moremath_column_vector:Vn {V} +\__moremath_new_vector_shorth_doc_cmd:NNn \prvector \moremath_row_vector:Vn {p} +\__moremath_new_vector_shorth_doc_cmd:NNn \brvector \moremath_row_vector:Vn {b} +\__moremath_new_vector_shorth_doc_cmd:NNn \Brvector \moremath_row_vector:Vn {B} +\__moremath_new_vector_shorth_doc_cmd:NNn \vrvector \moremath_row_vector:Vn {v} +\__moremath_new_vector_shorth_doc_cmd:NNn \Vrvector \moremath_row_vector:Vn {V} +\__moremath_new_vector_shorth_doc_cmd:NNn \psmallcvector \moremath_column_smallvector:Vn {p} -\__moremath_new_vector_shorth_doc_cmd:NNn \bsmallcvector \moremath_column_smallvector:nn +\__moremath_new_vector_shorth_doc_cmd:NNn \bsmallcvector \moremath_column_smallvector:Vn {b} -\__moremath_new_vector_shorth_doc_cmd:NNn \Bsmallcvector \moremath_column_smallvector:nn +\__moremath_new_vector_shorth_doc_cmd:NNn \Bsmallcvector \moremath_column_smallvector:Vn {B} -\__moremath_new_vector_shorth_doc_cmd:NNn \vsmallcvector \moremath_column_smallvector:nn +\__moremath_new_vector_shorth_doc_cmd:NNn \vsmallcvector \moremath_column_smallvector:Vn {v} -\__moremath_new_vector_shorth_doc_cmd:NNn \Vsmallcvector \moremath_column_smallvector:nn +\__moremath_new_vector_shorth_doc_cmd:NNn \Vsmallcvector \moremath_column_smallvector:Vn {V} -\__moremath_new_vector_shorth_doc_cmd:NNn \psmallrvector \moremath_row_smallvector:nn {p} -\__moremath_new_vector_shorth_doc_cmd:NNn \bsmallrvector \moremath_row_smallvector:nn {b} -\__moremath_new_vector_shorth_doc_cmd:NNn \Bsmallrvector \moremath_row_smallvector:nn {B} -\__moremath_new_vector_shorth_doc_cmd:NNn \vsmallrvector \moremath_row_smallvector:nn {v} -\__moremath_new_vector_shorth_doc_cmd:NNn \Vsmallrvector \moremath_row_smallvector:nn {V} +\__moremath_new_vector_shorth_doc_cmd:NNn \psmallrvector \moremath_row_smallvector:Vn {p} +\__moremath_new_vector_shorth_doc_cmd:NNn \bsmallrvector \moremath_row_smallvector:Vn {b} +\__moremath_new_vector_shorth_doc_cmd:NNn \Bsmallrvector \moremath_row_smallvector:Vn {B} +\__moremath_new_vector_shorth_doc_cmd:NNn \vsmallrvector \moremath_row_smallvector:Vn {v} +\__moremath_new_vector_shorth_doc_cmd:NNn \Vsmallrvector \moremath_row_smallvector:Vn {V} }{ % \bool_if:nTF \l__moremath_predef_crvector_bool FALSE PATH \msg_info:nnnn {moremath} {load / disabling} {no-crvector} diff --git a/Master/texmf-dist/tex/latex/naive-ebnf/naive-ebnf.sty b/Master/texmf-dist/tex/latex/naive-ebnf/naive-ebnf.sty index 5fd527fbf3a..b89baa7f1fb 100644 --- a/Master/texmf-dist/tex/latex/naive-ebnf/naive-ebnf.sty +++ b/Master/texmf-dist/tex/latex/naive-ebnf/naive-ebnf.sty @@ -31,7 +31,8 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{naive-ebnf} -[2023-08-11 0.0.15 EBNF in Plain Text] +[2024/09/06 0.0.16 EBNF in Plain Text] + @@ -138,6 +139,8 @@ { >([^\s]) } {\\textgreater{}\1} \ebnf_tmp% \regex_replace_all:nnN { ([^\s])'([^\s]) } {\1\\textquotesingle{}\2} \ebnf_tmp% + \regex_replace_all:nnN { \|\|\| }% + {\c{makebox}[#1][r]{ }} \ebnf_tmp% \regex_replace_all:nnN { ([^\s])\|([^\s]) } {\1\\textbar{}\2} \ebnf_tmp% % diff --git a/Master/texmf-dist/tex/latex/newtx/newtx.sty b/Master/texmf-dist/tex/latex/newtx/newtx.sty index 3c31a91788b..8d86b9aeaf4 100644 --- a/Master/texmf-dist/tex/latex/newtx/newtx.sty +++ b/Master/texmf-dist/tex/latex/newtx/newtx.sty @@ -1,6 +1,5 @@ \NeedsTeXFormat{LaTeX2e} - %Package to simplify loading of newtxmath with a text font family such as newtxtext for all latex engines, or for newtxtext and an otf math package. \def\fileversion{1.751} \def\filedate{2024/06/22} @@ -298,6 +297,7 @@ propmathfigs,curlybraces,cochrho,cochf,alty,alth,liby,nochvw} \or \def\tx@mathtotextfactor{.92} % 16, gel \fi +\def\tx@divide#1#2{\ntx@dima=\dimexpr 1pt * (\dimexpr #1 pt\relax) / \dimexpr #2pt\relax\relax} %\show\ntx@Mopt %\show\ntx@Topt %\traceon diff --git a/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty b/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty index f08f221f1d0..153a9e97135 100644 --- a/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty +++ b/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty @@ -18,8 +18,8 @@ %% and version 1.3 or later is part of all distributions of %% LaTeX version 2005/12/01 or later. %% -\def\myfileversion{6.28b} -\def\myfiledate{2024/06/29} +\def\myfileversion{6.28c} +\def\myfiledate{2024/08/22} \RequirePackage{pgfcore} \usepgfmodule{shapes} \RequirePackage{l3keys2e} @@ -811,7 +811,7 @@ \tl_new:N \l__nicematrix_xdots_color_tl \tl_new:N \l__nicematrix_delimiters_color_tl \bool_new:N \l__nicematrix_delimiters_max_width_bool -\keys_define:nn { NiceMatrix / xdots } +\keys_define:nn { nicematrix / xdots } { shorten-start .code:n = \hook_gput_code:nnn { begindocument } { . } @@ -855,7 +855,7 @@ draw-first .code:n = \prg_do_nothing: , unknown .code:n = \__nicematrix_error:n { Unknown~key~for~xdots } } -\keys_define:nn { NiceMatrix / rules } +\keys_define:nn { nicematrix / rules } { color .tl_set:N = \l__nicematrix_rules_color_tl , color .value_required:n = true , @@ -863,7 +863,7 @@ width .value_required:n = true , unknown .code:n = \__nicematrix_error:n { Unknown~key~for~rules } } -\keys_define:nn { NiceMatrix / Global } +\keys_define:nn { nicematrix / Global } { ampersand-in-blocks .bool_set:N = \l__nicematrix_amp_in_blocks_bool , ampersand-in-blocks .default:n = true , @@ -875,7 +875,7 @@ rounded-corners .dim_set:N = \l__nicematrix_tab_rounded_corners_dim , rounded-corners .default:n = 4 pt , custom-line .code:n = \__nicematrix_custom_line:n { #1 } , - rules .code:n = \keys_set:nn { NiceMatrix / rules } { #1 } , + rules .code:n = \keys_set:nn { nicematrix / rules } { #1 } , rules .value_required:n = true , standard-cline .bool_set:N = \l__nicematrix_standard_cline_bool , standard-cline .default:n = true , @@ -889,7 +889,7 @@ cell-space-bottom-limit = #1 , } , cell-space-limits .value_required:n = true , - xdots .code:n = \keys_set:nn { NiceMatrix / xdots } { #1 } , + xdots .code:n = \keys_set:nn { nicematrix / xdots } { #1 } , light-syntax .code:n = \bool_set_true:N \l__nicematrix_light_syntax_bool \bool_set_false:N \l__nicematrix_light_syntax_expanded_bool , @@ -965,7 +965,7 @@ pgf-node-code .tl_set:N = \l__nicematrix_pgf_node_code_tl , pgf-node-code .value_required:n = true } -\keys_define:nn { NiceMatrix / Env } +\keys_define:nn { nicematrix / environments } { corners .clist_set:N = \l__nicematrix_corners_clist , corners .default:n = { NW , SW , NE , SE } , @@ -1006,7 +1006,7 @@ color-inside .value_forbidden:n = true , colortbl-like .meta:n = color-inside } -\keys_define:nn { NiceMatrix / notes } +\keys_define:nn { nicematrix / notes } { para .bool_set:N = \l__nicematrix_notes_para_bool , para .default:n = true , @@ -1046,62 +1046,62 @@ detect-duplicates .default:n = true , unknown .code:n = \__nicematrix_error:n { Unknown~key~for~notes } } -\keys_define:nn { NiceMatrix / delimiters } +\keys_define:nn { nicematrix / delimiters } { max-width .bool_set:N = \l__nicematrix_delimiters_max_width_bool , max-width .default:n = true , color .tl_set:N = \l__nicematrix_delimiters_color_tl , color .value_required:n = true , } -\keys_define:nn { NiceMatrix } +\keys_define:nn { nicematrix } { NiceMatrixOptions .inherit:n = - { NiceMatrix / Global } , - NiceMatrixOptions / xdots .inherit:n = NiceMatrix / xdots , - NiceMatrixOptions / rules .inherit:n = NiceMatrix / rules , - NiceMatrixOptions / notes .inherit:n = NiceMatrix / notes , - NiceMatrixOptions / sub-matrix .inherit:n = NiceMatrix / sub-matrix , - SubMatrix / rules .inherit:n = NiceMatrix / rules , - CodeAfter / xdots .inherit:n = NiceMatrix / xdots , - CodeBefore / sub-matrix .inherit:n = NiceMatrix / sub-matrix , - CodeAfter / sub-matrix .inherit:n = NiceMatrix / sub-matrix , + { nicematrix / Global } , + NiceMatrixOptions / xdots .inherit:n = nicematrix / xdots , + NiceMatrixOptions / rules .inherit:n = nicematrix / rules , + NiceMatrixOptions / notes .inherit:n = nicematrix / notes , + NiceMatrixOptions / sub-matrix .inherit:n = nicematrix / sub-matrix , + SubMatrix / rules .inherit:n = nicematrix / rules , + CodeAfter / xdots .inherit:n = nicematrix / xdots , + CodeBefore / sub-matrix .inherit:n = nicematrix / sub-matrix , + CodeAfter / sub-matrix .inherit:n = nicematrix / sub-matrix , NiceMatrix .inherit:n = { - NiceMatrix / Global , - NiceMatrix / Env , + nicematrix / Global , + nicematrix / environments , } , - NiceMatrix / xdots .inherit:n = NiceMatrix / xdots , - NiceMatrix / rules .inherit:n = NiceMatrix / rules , + NiceMatrix / xdots .inherit:n = nicematrix / xdots , + NiceMatrix / rules .inherit:n = nicematrix / rules , NiceTabular .inherit:n = { - NiceMatrix / Global , - NiceMatrix / Env + nicematrix / Global , + nicematrix / environments } , - NiceTabular / xdots .inherit:n = NiceMatrix / xdots , - NiceTabular / rules .inherit:n = NiceMatrix / rules , - NiceTabular / notes .inherit:n = NiceMatrix / notes , + NiceTabular / xdots .inherit:n = nicematrix / xdots , + NiceTabular / rules .inherit:n = nicematrix / rules , + NiceTabular / notes .inherit:n = nicematrix / notes , NiceArray .inherit:n = { - NiceMatrix / Global , - NiceMatrix / Env , + nicematrix / Global , + nicematrix / environments , } , - NiceArray / xdots .inherit:n = NiceMatrix / xdots , - NiceArray / rules .inherit:n = NiceMatrix / rules , + NiceArray / xdots .inherit:n = nicematrix / xdots , + NiceArray / rules .inherit:n = nicematrix / rules , pNiceArray .inherit:n = { - NiceMatrix / Global , - NiceMatrix / Env , + nicematrix / Global , + nicematrix / environments , } , - pNiceArray / xdots .inherit:n = NiceMatrix / xdots , - pNiceArray / rules .inherit:n = NiceMatrix / rules , + pNiceArray / xdots .inherit:n = nicematrix / xdots , + pNiceArray / rules .inherit:n = nicematrix / rules , } -\keys_define:nn { NiceMatrix / NiceMatrixOptions } +\keys_define:nn { nicematrix / NiceMatrixOptions } { delimiters / color .tl_set:N = \l__nicematrix_delimiters_color_tl , delimiters / color .value_required:n = true , delimiters / max-width .bool_set:N = \l__nicematrix_delimiters_max_width_bool , delimiters / max-width .default:n = true , - delimiters .code:n = \keys_set:nn { NiceMatrix / delimiters } { #1 } , + delimiters .code:n = \keys_set:nn { nicematrix / delimiters } { #1 } , delimiters .value_required:n = true , width .dim_set:N = \l__nicematrix_width_dim , width .value_required:n = true , @@ -1121,9 +1121,9 @@ allow-duplicate-names .code:n = \__nicematrix_msg_redirect_name:nn { Duplicate~name } { none } , allow-duplicate-names .value_forbidden:n = true , - notes .code:n = \keys_set:nn { NiceMatrix / notes } { #1 } , + notes .code:n = \keys_set:nn { nicematrix / notes } { #1 } , notes .value_required:n = true , - sub-matrix .code:n = \keys_set:nn { NiceMatrix / sub-matrix } { #1 } , + sub-matrix .code:n = \keys_set:nn { nicematrix / sub-matrix } { #1 } , sub-matrix .value_required:n = true , matrix / columns-type .tl_set:N = \l__nicematrix_columns_type_tl , matrix / columns-type .value_required:n = true , @@ -1132,8 +1132,8 @@ unknown .code:n = \__nicematrix_error:n { Unknown~key~for~NiceMatrixOptions } } \NewDocumentCommand \NiceMatrixOptions { m } - { \keys_set:nn { NiceMatrix / NiceMatrixOptions } { #1 } } -\keys_define:nn { NiceMatrix / NiceMatrix } + { \keys_set:nn { nicematrix / NiceMatrixOptions } { #1 } } +\keys_define:nn { nicematrix / NiceMatrix } { last-col .code:n = \tl_if_empty:nTF { #1 } { @@ -1149,13 +1149,13 @@ delimiters / color .value_required:n = true , delimiters / max-width .bool_set:N = \l__nicematrix_delimiters_max_width_bool , delimiters / max-width .default:n = true , - delimiters .code:n = \keys_set:nn { NiceMatrix / delimiters } { #1 } , + delimiters .code:n = \keys_set:nn { nicematrix / delimiters } { #1 } , delimiters .value_required:n = true , small .bool_set:N = \l__nicematrix_small_bool , small .value_forbidden:n = true , unknown .code:n = \__nicematrix_error:n { Unknown~key~for~NiceMatrix } } -\keys_define:nn { NiceMatrix / NiceArray } +\keys_define:nn { nicematrix / NiceArray } { small .bool_set:N = \l__nicematrix_small_bool , small .value_forbidden:n = true , @@ -1166,7 +1166,7 @@ l .code:n = \__nicematrix_error:n { r~or~l~with~preamble } , unknown .code:n = \__nicematrix_error:n { Unknown~key~for~NiceArray } } -\keys_define:nn { NiceMatrix / pNiceArray } +\keys_define:nn { nicematrix / pNiceArray } { first-col .code:n = \int_zero:N \l__nicematrix_first_col_int , last-col .code:n = \tl_if_empty:nF {#1} @@ -1177,7 +1177,7 @@ delimiters / color .value_required:n = true , delimiters / max-width .bool_set:N = \l__nicematrix_delimiters_max_width_bool , delimiters / max-width .default:n = true , - delimiters .code:n = \keys_set:nn { NiceMatrix / delimiters } { #1 } , + delimiters .code:n = \keys_set:nn { nicematrix / delimiters } { #1 } , delimiters .value_required:n = true , small .bool_set:N = \l__nicematrix_small_bool , small .value_forbidden:n = true , @@ -1185,12 +1185,12 @@ l .code:n = \__nicematrix_error:n { r~or~l~with~preamble } , unknown .code:n = \__nicematrix_error:n { Unknown~key~for~NiceMatrix } } -\keys_define:nn { NiceMatrix / NiceTabular } +\keys_define:nn { nicematrix / NiceTabular } { width .code:n = \dim_set:Nn \l__nicematrix_width_dim { #1 } \bool_set_true:N \l__nicematrix_width_used_bool , width .value_required:n = true , - notes .code:n = \keys_set:nn { NiceMatrix / notes } { #1 } , + notes .code:n = \keys_set:nn { nicematrix / notes } { #1 } , tabularnote .tl_gset:N = \g__nicematrix_tabularnote_tl , tabularnote .value_required:n = true , caption .tl_set:N = \l__nicematrix_caption_tl , @@ -1206,14 +1206,14 @@ l .code:n = \__nicematrix_error:n { r~or~l~with~preamble } , unknown .code:n = \__nicematrix_error:n { Unknown~key~for~NiceTabular } } -\keys_define:nn { NiceMatrix / CodeAfter } +\keys_define:nn { nicematrix / CodeAfter } { delimiters / color .tl_set:N = \l__nicematrix_delimiters_color_tl , delimiters / color .value_required:n = true , - rules .code:n = \keys_set:nn { NiceMatrix / rules } { #1 } , + rules .code:n = \keys_set:nn { nicematrix / rules } { #1 } , rules .value_required:n = true , - xdots .code:n = \keys_set:nn { NiceMatrix / xdots } { #1 } , - sub-matrix .code:n = \keys_set:nn { NiceMatrix / sub-matrix } { #1 } , + xdots .code:n = \keys_set:nn { nicematrix / xdots } { #1 } , + sub-matrix .code:n = \keys_set:nn { nicematrix / sub-matrix } { #1 } , sub-matrix .value_required:n = true , unknown .code:n = \__nicematrix_error:n { Unknown~key~for~CodeAfter } } @@ -1839,11 +1839,11 @@ \bool_if:NT \g__nicematrix_recreate_cell_nodes_bool { \tl_put_left:Nn \__nicematrix_node_for_cell: \__nicematrix_patch_node_for_cell: } } -\keys_define:nn { NiceMatrix / CodeBefore } +\keys_define:nn { nicematrix / CodeBefore } { create-cell-nodes .bool_gset:N = \g__nicematrix_recreate_cell_nodes_bool , create-cell-nodes .default:n = true , - sub-matrix .code:n = \keys_set:nn { NiceMatrix / sub-matrix } { #1 } , + sub-matrix .code:n = \keys_set:nn { nicematrix / sub-matrix } { #1 } , sub-matrix .value_required:n = true , delimiters / color .tl_set:N = \l__nicematrix_delimiters_color_tl , delimiters / color .value_required:n = true , @@ -1851,7 +1851,7 @@ } \NewDocumentCommand \__nicematrix_CodeBefore_keys: { O { } } { - \keys_set:nn { NiceMatrix / CodeBefore } { #1 } + \keys_set:nn { nicematrix / CodeBefore } { #1 } \__nicematrix_CodeBefore:w } \cs_new_protected:Npn \__nicematrix_CodeBefore:w #1 \q_stop @@ -1999,8 +1999,8 @@ \tl_if_empty:NF \g__nicematrix_pre_code_before_tl { \bool_set_true:N \l__nicematrix_code_before_bool } \bool_if:NTF \g__nicematrix_delims_bool - { \keys_set:nn { NiceMatrix / pNiceArray } } - { \keys_set:nn { NiceMatrix / NiceArray } } + { \keys_set:nn { nicematrix / pNiceArray } } + { \keys_set:nn { nicematrix / NiceArray } } { #3 , #5 } \__nicematrix_set_CT@arc@:o \l__nicematrix_rules_color_tl \bool_if:nTF { #6 } \__nicematrix_CodeBefore_Body:w \__nicematrix_pre_array: @@ -2013,7 +2013,7 @@ \skip_horizontal:N \l__nicematrix_right_margin_dim \skip_horizontal:N \l__nicematrix_extra_right_margin_dim - % % awful workaround + % awful workaround \int_compare:nNnT \g__nicematrix_col_total_int = \c_one_int { \dim_compare:nNnT \l__nicematrix_columns_width_dim > \c_zero_dim @@ -2910,6 +2910,18 @@ { } % for the name of the block } } + \RenewDocumentCommand \cellcolor { O { } m } + { + \__nicematrix_test_color_inside: + \tl_gput_right:Nx \g__nicematrix_pre_code_before_tl + { + \__nicematrix_rectanglecolor [ ##1 ] + { \exp_not:n { ##2 } } + { \int_use:N \c@iRow - \int_use:N \c@jCol } + { \int_use:N \c@iRow - \int_eval:n { \c@jCol + #1 } } + } + \ignorespaces + } \cs_set_nopar:Npn \@sharp { #3 } \@arstrut \@preamble @@ -3734,7 +3746,7 @@ \bool_set_true:N \l__nicematrix_last_col_without_value_bool \int_set:Nn \l__nicematrix_last_col_int { -1 } } - \keys_set:nn { NiceMatrix / NiceMatrix } { ##1 } + \keys_set:nn { nicematrix / NiceMatrix } { ##1 } \__nicematrix_begin_of_NiceMatrix:nV { #1 } \l__nicematrix_columns_type_tl } { \use:c { end #1 NiceArray } } @@ -3747,7 +3759,7 @@ \bool_set_true:N \l__nicematrix_last_col_without_value_bool \int_set:Nn \l__nicematrix_last_col_int { -1 } } - \keys_set:nn { NiceMatrix / NiceMatrix } { #1 } + \keys_set:nn { nicematrix / NiceMatrix } { #1 } \bool_lazy_or:nnT { \clist_if_empty_p:N \l__nicematrix_vlines_clist } { \l__nicematrix_except_borders_bool } @@ -3762,7 +3774,7 @@ \dim_compare:nNnT \l__nicematrix_width_dim = \c_zero_dim { \dim_set_eq:NN \l__nicematrix_width_dim \linewidth } \str_gset:Nn \g__nicematrix_name_env_str { NiceTabular } - \keys_set:nn { NiceMatrix / NiceTabular } { #1 , #3 } + \keys_set:nn { nicematrix / NiceTabular } { #1 , #3 } \tl_if_empty:NF \l__nicematrix_short_caption_tl { \tl_if_empty:NT \l__nicematrix_caption_tl @@ -3807,7 +3819,7 @@ \str_gset:Nn \g__nicematrix_name_env_str { NiceTabularX } \dim_zero_new:N \l__nicematrix_width_dim \dim_set:Nn \l__nicematrix_width_dim { #1 } - \keys_set:nn { NiceMatrix / NiceTabular } { #2 , #4 } + \keys_set:nn { nicematrix / NiceTabular } { #2 , #4 } \__nicematrix_settings_for_tabular: \NiceArray { #3 } } @@ -3820,7 +3832,7 @@ { \str_gset:Nn \g__nicematrix_name_env_str { NiceTabular* } \dim_set:Nn \l__nicematrix_tabular_width_dim { #1 } - \keys_set:nn { NiceMatrix / NiceTabular } { #2 , #4 } + \keys_set:nn { nicematrix / NiceTabular } { #2 , #4 } \__nicematrix_settings_for_tabular: \NiceArray { #3 } } @@ -4006,7 +4018,7 @@ \cs_gset_eq:NN \CT@arc@ \__nicematrix_old_CT@arc@ } \NewDocumentCommand \__nicematrix_CodeAfter_keys: { O { } } - { \keys_set:nn { NiceMatrix / CodeAfter } { #1 } } + { \keys_set:nn { nicematrix / CodeAfter } { #1 } } \cs_new_protected:Npn \__nicematrix_adjust_pos_of_blocks_seq: { \seq_gset_map_x:NNn \g__nicematrix_pos_of_blocks_seq \g__nicematrix_pos_of_blocks_seq @@ -4393,7 +4405,7 @@ \int_compare:nNnT { #1 } = \l__nicematrix_last_row_int { \color { nicematrix-last-row } } } - \keys_set:nn { NiceMatrix / xdots } { #3 } + \keys_set:nn { nicematrix / xdots } { #3 } \tl_if_empty:oF \l__nicematrix_xdots_color_tl { \color { \l__nicematrix_xdots_color_tl } } \__nicematrix_actually_draw_Ldots: \group_end: @@ -4445,7 +4457,7 @@ \int_compare:nNnT { #1 } = \l__nicematrix_last_row_int { \color { nicematrix-last-row } } } - \keys_set:nn { NiceMatrix / xdots } { #3 } + \keys_set:nn { nicematrix / xdots } { #3 } \tl_if_empty:oF \l__nicematrix_xdots_color_tl { \color { \l__nicematrix_xdots_color_tl } } \__nicematrix_actually_draw_Cdots: \group_end: @@ -4541,7 +4553,7 @@ \int_compare:nNnT { #2 } = \l__nicematrix_last_col_int { \color { nicematrix-last-col } } } - \keys_set:nn { NiceMatrix / xdots } { #3 } + \keys_set:nn { nicematrix / xdots } { #3 } \tl_if_empty:oF \l__nicematrix_xdots_color_tl { \color { \l__nicematrix_xdots_color_tl } } \__nicematrix_actually_draw_Vdots: @@ -4627,7 +4639,7 @@ \__nicematrix_find_extremities_of_line:nnnn { #1 } { #2 } 1 1 \group_begin: \__nicematrix_open_shorten: - \keys_set:nn { NiceMatrix / xdots } { #3 } + \keys_set:nn { nicematrix / xdots } { #3 } \tl_if_empty:oF \l__nicematrix_xdots_color_tl { \color { \l__nicematrix_xdots_color_tl } } \__nicematrix_actually_draw_Ddots: \group_end: @@ -4658,11 +4670,14 @@ { \l__nicematrix_y_final_dim - \l__nicematrix_y_initial_dim } } { - \dim_set:Nn \l__nicematrix_y_final_dim + \dim_compare:nNnF \g__nicematrix_delta_x_one_dim = \c_zero_dim { - \l__nicematrix_y_initial_dim + - ( \l__nicematrix_x_final_dim - \l__nicematrix_x_initial_dim ) * - \dim_ratio:nn \g__nicematrix_delta_y_one_dim \g__nicematrix_delta_x_one_dim + \dim_set:Nn \l__nicematrix_y_final_dim + { + \l__nicematrix_y_initial_dim + + ( \l__nicematrix_x_final_dim - \l__nicematrix_x_initial_dim ) * + \dim_ratio:nn \g__nicematrix_delta_y_one_dim \g__nicematrix_delta_x_one_dim + } } } } @@ -4676,7 +4691,7 @@ \__nicematrix_find_extremities_of_line:nnnn { #1 } { #2 } 1 { -1 } \group_begin: \__nicematrix_open_shorten: - \keys_set:nn { NiceMatrix / xdots } { #3 } + \keys_set:nn { nicematrix / xdots } { #3 } \tl_if_empty:oF \l__nicematrix_xdots_color_tl { \color { \l__nicematrix_xdots_color_tl } } \__nicematrix_actually_draw_Iddots: \group_end: @@ -4707,11 +4722,14 @@ { \l__nicematrix_y_final_dim - \l__nicematrix_y_initial_dim } } { - \dim_set:Nn \l__nicematrix_y_final_dim + \dim_compare:nNnF \g__nicematrix_delta_x_two_dim = \c_zero_dim { - \l__nicematrix_y_initial_dim + - ( \l__nicematrix_x_final_dim - \l__nicematrix_x_initial_dim ) * - \dim_ratio:nn \g__nicematrix_delta_y_two_dim \g__nicematrix_delta_x_two_dim + \dim_set:Nn \l__nicematrix_y_final_dim + { + \l__nicematrix_y_initial_dim + + ( \l__nicematrix_x_final_dim - \l__nicematrix_x_initial_dim ) * + \dim_ratio:nn \g__nicematrix_delta_y_two_dim \g__nicematrix_delta_x_two_dim + } } } } @@ -5064,7 +5082,7 @@ \l__nicematrix_last_col_int { \__nicematrix_error:nn { in~last~col } \Ddots } } { - \keys_set_known:nn { NiceMatrix / Ddots } { #1 } + \keys_set_known:nn { nicematrix / Ddots } { #1 } \__nicematrix_instruction_of_type:nnn \l__nicematrix_draw_first_bool { Ddots } { #1 , down = #2 , up = #3 , middle = #4 } } @@ -5090,7 +5108,7 @@ \l__nicematrix_last_col_int { \__nicematrix_error:nn { in~last~col } \Iddots } } { - \keys_set_known:nn { NiceMatrix / Ddots } { #1 } + \keys_set_known:nn { nicematrix / Ddots } { #1 } \__nicematrix_instruction_of_type:nnn \l__nicematrix_draw_first_bool { Iddots } { #1 , down = #2 , up = #3 , middle = #4 } } @@ -5100,7 +5118,7 @@ \bool_gset_true:N \g__nicematrix_empty_cell_bool } } -\keys_define:nn { NiceMatrix / Ddots } +\keys_define:nn { nicematrix / Ddots } { draw-first .bool_set:N = \l__nicematrix_draw_first_bool , draw-first .default:n = true , @@ -5210,7 +5228,7 @@ { \color { nicematrix-last-row } } } - \keys_set:nn { NiceMatrix / xdots } { #4 } + \keys_set:nn { nicematrix / xdots } { #4 } \tl_if_empty:oF \l__nicematrix_xdots_color_tl { \color { \l__nicematrix_xdots_color_tl } } \__nicematrix_actually_draw_Ldots: \group_end: @@ -5291,7 +5309,7 @@ \int_compare:nNnT { #2 } = \g__nicematrix_col_total_int { \color { nicematrix-last-col } } } - \keys_set:nn { NiceMatrix / xdots } { #4 } + \keys_set:nn { nicematrix / xdots } { #4 } \tl_if_empty:oF \l__nicematrix_xdots_color_tl { \color { \l__nicematrix_xdots_color_tl } } \__nicematrix_actually_draw_Vdots: \group_end: @@ -5303,10 +5321,10 @@ \peek_remove_spaces:n { \bool_gset_true:N \g__nicematrix_rotate_bool - \keys_set:nn { NiceMatrix / rotate } { #1 } + \keys_set:nn { nicematrix / rotate } { #1 } } } -\keys_define:nn { NiceMatrix / rotate } +\keys_define:nn { nicematrix / rotate } { c .code:n = \bool_gset_true:N \g__nicematrix_rotate_c_bool , c .value_forbidden:n = true , @@ -5328,7 +5346,7 @@ \exp_args:NNo \NewDocumentCommand \__nicematrix_line \l__nicematrix_argspec_tl { \group_begin: - \keys_set:nn { NiceMatrix / xdots } { #1 , #4 , down = #5 , up = #6 } + \keys_set:nn { nicematrix / xdots } { #1 , #4 , down = #5 , up = #6 } \tl_if_empty:oF \l__nicematrix_xdots_color_tl { \color { \l__nicematrix_xdots_color_tl } } \use:e { @@ -5382,7 +5400,7 @@ } } \cs_generate_variant:Nn \__nicematrix_put_in_row_style:n { e } -\keys_define:nn { NiceMatrix / RowStyle } +\keys_define:nn { nicematrix / RowStyle } { cell-space-top-limit .dim_set:N = \l_tmpa_dim , cell-space-top-limit .value_required:n = true , @@ -5414,7 +5432,7 @@ \int_set_eq:NN \l__nicematrix_key_nb_rows_int \c_one_int \dim_zero:N \l_tmpa_dim \dim_zero:N \l_tmpb_dim - \keys_set:nn { NiceMatrix / RowStyle } { #1 } + \keys_set:nn { nicematrix / RowStyle } { #1 } \tl_if_empty:NF \l_tmpa_tl { \tl_gput_right:Nx \g__nicematrix_pre_code_before_tl @@ -5669,7 +5687,7 @@ { 1 - 1 } { \int_use:N \c@iRow - \int_use:N \c@jCol } } -\keys_define:nn { NiceMatrix / rowcolors } +\keys_define:nn { nicematrix / rowcolors } { respect-blocks .bool_set:N = \l__nicematrix_respect_blocks_bool , respect-blocks .default:n = true , @@ -5685,7 +5703,7 @@ \seq_set_split:Nnn \l__nicematrix_colors_seq { , } { #3 } \tl_clear_new:N \l__nicematrix_cols_tl \cs_set_nopar:Npn \l__nicematrix_cols_tl { - } - \keys_set:nn { NiceMatrix / rowcolors } { #4 } + \keys_set:nn { nicematrix / rowcolors } { #4 } \int_zero_new:N \l__nicematrix_color_int \int_set_eq:NN \l__nicematrix_color_int \c_one_int \bool_if:NT \l__nicematrix_respect_blocks_bool @@ -6043,7 +6061,7 @@ } } } -\keys_define:nn { NiceMatrix / Rules } +\keys_define:nn { nicematrix / Rules } { position .int_set:N = \l__nicematrix_position_int , position .value_required:n = true , @@ -6055,7 +6073,7 @@ { \int_set_eq:NN \l__nicematrix_end_int \c@jCol } { \int_set:Nn \l__nicematrix_end_int { #1 } } } -\keys_define:nn { NiceMatrix / RulesBis } +\keys_define:nn { nicematrix / RulesBis } { multiplicity .int_set:N = \l__nicematrix_multiplicity_int , multiplicity .initial:n = 1 , @@ -6082,7 +6100,7 @@ { \group_begin: \int_set_eq:NN \l__nicematrix_end_int \c@iRow - \keys_set_known:nnN { NiceMatrix / Rules } { #1 } \l__nicematrix_other_keys_tl + \keys_set_known:nnN { nicematrix / Rules } { #1 } \l__nicematrix_other_keys_tl \int_compare:nNnT \l__nicematrix_position_int < { \c@jCol + 2 } \__nicematrix_vline_i: \group_end: @@ -6149,7 +6167,7 @@ \cs_new_protected:Npn \__nicematrix_vline_ii: { \tl_clear:N \l__nicematrix_tikz_rule_tl - \keys_set:nV { NiceMatrix / RulesBis } \l__nicematrix_other_keys_tl + \keys_set:nV { nicematrix / RulesBis } \l__nicematrix_other_keys_tl \bool_if:NTF \l__nicematrix_dotted_bool \__nicematrix_vline_iv: { @@ -6269,7 +6287,7 @@ \group_begin: \int_zero_new:N \l__nicematrix_end_int \int_set_eq:NN \l__nicematrix_end_int \c@jCol - \keys_set_known:nnN { NiceMatrix / Rules } { #1 } \l__nicematrix_other_keys_tl + \keys_set_known:nnN { nicematrix / Rules } { #1 } \l__nicematrix_other_keys_tl \__nicematrix_hline_i: \group_end: } @@ -6337,7 +6355,7 @@ \cs_new_protected:Npn \__nicematrix_hline_ii: { \tl_clear:N \l__nicematrix_tikz_rule_tl - \keys_set:nV { NiceMatrix / RulesBis } \l__nicematrix_other_keys_tl + \keys_set:nV { nicematrix / RulesBis } \l__nicematrix_other_keys_tl \bool_if:NTF \l__nicematrix_dotted_bool \__nicematrix_hline_iv: { @@ -6501,7 +6519,7 @@ \str_clear_new:N \l__nicematrix_ccommand_str \str_clear_new:N \l__nicematrix_letter_str \tl_clear_new:N \l__nicematrix_other_keys_tl - \keys_set_known:nnN { NiceMatrix / custom-line } { #1 } \l__nicematrix_other_keys_tl + \keys_set_known:nnN { nicematrix / custom-line } { #1 } \l__nicematrix_other_keys_tl \bool_lazy_all:nTF { { \str_if_empty_p:N \l__nicematrix_letter_str } @@ -6511,7 +6529,7 @@ { \__nicematrix_error:n { No~letter~and~no~command } } { \exp_args:No \__nicematrix_custom_line_i:n \l__nicematrix_other_keys_tl } } -\keys_define:nn { NiceMatrix / custom-line } +\keys_define:nn { nicematrix / custom-line } { letter .str_set:N = \l__nicematrix_letter_str , letter .value_required:n = true , @@ -6525,7 +6543,7 @@ \bool_set_false:N \l__nicematrix_tikz_rule_bool \bool_set_false:N \l__nicematrix_dotted_rule_bool \bool_set_false:N \l__nicematrix_color_bool - \keys_set:nn { NiceMatrix / custom-line-bis } { #1 } + \keys_set:nn { nicematrix / custom-line-bis } { #1 } \bool_if:NT \l__nicematrix_tikz_rule_bool { \IfPackageLoadedTF { tikz } @@ -6558,7 +6576,7 @@ } \tl_const:Nn \c__nicematrix_forbidden_letters_tl { lcrpmbVX|()[]!@<> } \str_const:Nn \c__nicematrix_forbidden_letters_str { lcrpmbVX|()[]!@<> } -\keys_define:nn { NiceMatrix / custom-line-bis } +\keys_define:nn { nicematrix / custom-line-bis } { multiplicity .int_set:N = \l__nicematrix_multiplicity_int , multiplicity .initial:n = 1 , @@ -6580,7 +6598,7 @@ \bool_new:N \l__nicematrix_dotted_rule_bool \bool_new:N \l__nicematrix_tikz_rule_bool \bool_new:N \l__nicematrix_color_bool -\keys_define:nn { NiceMatrix / custom-line-width } +\keys_define:nn { nicematrix / custom-line-width } { multiplicity .int_set:N = \l__nicematrix_multiplicity_int , multiplicity .initial:n = 1 , @@ -6636,7 +6654,7 @@ \bool_set_false:N \l__nicematrix_tikz_rule_bool \bool_set_false:N \l__nicematrix_total_width_bool \bool_set_false:N \l__nicematrix_dotted_rule_bool - \keys_set_known:nn { NiceMatrix / custom-line-width } { #1 } + \keys_set_known:nn { nicematrix / custom-line-width } { #1 } \bool_if:NF \l__nicematrix_total_width_bool { \bool_if:NTF \l__nicematrix_dotted_rule_bool @@ -6842,7 +6860,7 @@ } } \bool_new:N \l__nicematrix_block_auto_columns_width_bool -\keys_define:nn { NiceMatrix / NiceMatrixBlock } +\keys_define:nn { nicematrix / NiceMatrixBlock } { auto-columns-width .code:n = { @@ -6855,7 +6873,7 @@ { \int_gincr:N \g__nicematrix_NiceMatrixBlock_int \dim_zero:N \l__nicematrix_columns_width_dim - \keys_set:nn { NiceMatrix / NiceMatrixBlock } { #1 } + \keys_set:nn { nicematrix / NiceMatrixBlock } { #1 } \bool_if:NT \l__nicematrix_block_auto_columns_width_bool { \cs_if_exist:cT @@ -7082,7 +7100,7 @@ { \int_use:N \g__nicematrix_env_int - \__nicematrix_i: - \__nicematrix_j: \l__nicematrix_suffix_tl} } } -\keys_define:nn { NiceMatrix / Block / FirstPass } +\keys_define:nn { nicematrix / Block / FirstPass } { j .code:n = \str_set:Nn \l__nicematrix_hpos_block_str j \bool_set_true:N \l__nicematrix_p_block_bool , @@ -7162,7 +7180,7 @@ { \str_set:NV \l__nicematrix_hpos_block_str \l__nicematrix_hpos_cell_tl } } { \str_set_eq:NN \l__nicematrix_hpos_block_str \c__nicematrix_c_str } - \keys_set_known:nn { NiceMatrix / Block / FirstPass } { #3 } + \keys_set_known:nn { nicematrix / Block / FirstPass } { #3 } \tl_set:Nx \l_tmpa_tl { { \int_use:N \c@iRow } @@ -7180,11 +7198,11 @@ \l__nicematrix_X_bool { \exp_args:Nee \__nicematrix_Block_v:nnnnn } { \tl_if_empty_p:n { #5 } } { \exp_args:Nee \__nicematrix_Block_v:nnnnn } { \int_compare_p:nNn \l_tmpa_int = \c_one_int } - { \exp_args:Nee \__nicematrix_Block_iv:nnnnn } + { \exp_args:Nee \__nicematrix_Block_iv:nnnnn } { \int_compare_p:nNn \l_tmpb_int = \c_one_int } - { \exp_args:Nee \__nicematrix_Block_iv:nnnnn } - } - { \exp_args:Nee \__nicematrix_Block_v:nnnnn } + { \exp_args:Nee \__nicematrix_Block_iv:nnnnn } + } + { \exp_args:Nee \__nicematrix_Block_v:nnnnn } { \l_tmpa_int } { \l_tmpb_int } { #3 } { #4 } { #5 } } \cs_new_protected:Npn \__nicematrix_Block_iv:nnnnn #1 #2 #3 #4 #5 @@ -7214,10 +7232,16 @@ \int_compare:nNnT { #1 } = \c_one_int { \int_if_zero:nTF \c@iRow - \l__nicematrix_code_for_first_row_tl + { + \cs_set_eq:NN \Block \__nicematrix_NullBlock: + \l__nicematrix_code_for_first_row_tl + } { \int_compare:nNnT \c@iRow = \l__nicematrix_last_row_int - \l__nicematrix_code_for_last_row_tl + { + \cs_set_eq:NN \Block \__nicematrix_NullBlock: + \l__nicematrix_code_for_last_row_tl + } } \g__nicematrix_row_style_tl } @@ -7442,7 +7466,7 @@ { \exp_not:n { #4 #5 } } } } -\keys_define:nn { NiceMatrix / Block / SecondPass } +\keys_define:nn { nicematrix / Block / SecondPass } { ampersand-in-blocks .bool_set:N = \l__nicematrix_amp_in_blocks_bool , ampersand-in-blocks .default:n = true , @@ -7566,7 +7590,7 @@ \group_begin: \int_compare:nNnT { #1 } = { #3 } { \str_set:Nn \l__nicematrix_vpos_block_str { t } } - \keys_set:nn { NiceMatrix / Block / SecondPass } { #5 } + \keys_set:nn { nicematrix / Block / SecondPass } { #5 } \tl_if_in:nnT { #6 } { & } { \bool_set_true:N \l__nicematrix_ampersand_bool } \bool_lazy_and:nnT \l__nicematrix_vlines_block_bool @@ -8000,7 +8024,7 @@ \group_begin: \tl_clear:N \l__nicematrix_draw_tl \dim_set_eq:NN \l__nicematrix_line_width_dim \arrayrulewidth - \keys_set_known:nn { NiceMatrix / BlockStroke } { #1 } + \keys_set_known:nn { nicematrix / BlockStroke } { #1 } \pgfpicture \pgfrememberpicturepositiononpagetrue \pgf@relevantforpicturesizefalse @@ -8046,7 +8070,7 @@ \endpgfpicture \group_end: } -\keys_define:nn { NiceMatrix / BlockStroke } +\keys_define:nn { nicematrix / BlockStroke } { color .tl_set:N = \l__nicematrix_draw_tl , draw .code:n = @@ -8059,7 +8083,7 @@ \cs_new_protected:Npn \__nicematrix_vlines_block:nnn #1 #2 #3 { \dim_set_eq:NN \l__nicematrix_line_width_dim \arrayrulewidth - \keys_set_known:nn { NiceMatrix / BlockBorders } { #1 } + \keys_set_known:nn { nicematrix / BlockBorders } { #1 } \__nicematrix_cut_on_hyphen:w #2 \q_stop \tl_set_eq:NN \l__nicematrix_tmpc_tl \l_tmpa_tl \tl_set_eq:NN \l__nicematrix_tmpd_tl \l_tmpb_tl @@ -8083,7 +8107,7 @@ \cs_new_protected:Npn \__nicematrix_hlines_block:nnn #1 #2 #3 { \dim_set_eq:NN \l__nicematrix_line_width_dim \arrayrulewidth - \keys_set_known:nn { NiceMatrix / BlockBorders } { #1 } + \keys_set_known:nn { nicematrix / BlockBorders } { #1 } \__nicematrix_cut_on_hyphen:w #2 \q_stop \tl_set_eq:NN \l__nicematrix_tmpc_tl \l_tmpa_tl \tl_set_eq:NN \l__nicematrix_tmpd_tl \l_tmpb_tl @@ -8107,13 +8131,13 @@ \cs_new_protected:Npn \__nicematrix_stroke_borders_block:nnn #1 #2 #3 { \dim_set_eq:NN \l__nicematrix_line_width_dim \arrayrulewidth - \keys_set_known:nn { NiceMatrix / BlockBorders } { #1 } + \keys_set_known:nn { nicematrix / BlockBorders } { #1 } \dim_compare:nNnTF \l__nicematrix_rounded_corners_dim > \c_zero_dim { \__nicematrix_error:n { borders~forbidden } } { \tl_clear_new:N \l__nicematrix_borders_tikz_tl \keys_set:nV - { NiceMatrix / OnlyForTikzInBorders } + { nicematrix / OnlyForTikzInBorders } \l__nicematrix_borders_clist \__nicematrix_cut_on_hyphen:w #2 \q_stop \tl_set_eq:NN \l__nicematrix_tmpc_tl \l_tmpa_tl @@ -8148,7 +8172,7 @@ \clist_if_in:NnT \l__nicematrix_borders_clist { top } { \__nicematrix_stroke_horizontal:n \l__nicematrix_tmpc_tl } } -\keys_define:nn { NiceMatrix / OnlyForTikzInBorders } +\keys_define:nn { nicematrix / OnlyForTikzInBorders } { tikz .code:n = \cs_if_exist:NTF \tikzpicture @@ -8199,7 +8223,7 @@ ( \l_tmpa_dim , \pgf@y ) -- ( \l_tmpb_dim , \pgf@y ) ; } } -\keys_define:nn { NiceMatrix / BlockBorders } +\keys_define:nn { nicematrix / BlockBorders } { borders .clist_set:N = \l__nicematrix_borders_clist , rounded-corners .dim_set:N = \l__nicematrix_rounded_corners_dim , @@ -8212,7 +8236,7 @@ \__nicematrix_clip_with_rounded_corners: \clist_map_inline:nn { #5 } { - \keys_set_known:nnN { NiceMatrix / SpecialOffset } { ##1 } \l_tmpa_tl + \keys_set_known:nnN { nicematrix / SpecialOffset } { ##1 } \l_tmpa_tl \use:e { \exp_not:N \path [ \l_tmpa_tl ] } ( [ @@ -8233,8 +8257,12 @@ \end { tikzpicture } } \cs_generate_variant:Nn \__nicematrix_block_tikz:nnnnn { n n n n V } -\keys_define:nn { NiceMatrix / SpecialOffset } +\keys_define:nn { nicematrix / SpecialOffset } { offset .dim_set:N = \l__nicematrix_offset_dim } +\cs_new_protected:Npn \__nicematrix_NullBlock: + { \__nicematrix_collect_options:n { \__nicematrix_NullBlock_i: } } +\NewExpandableDocumentCommand \__nicematrix_NullBlock_i: { m m D < > { } +m } + { } \cs_set_protected:Npn \__nicematrix_renew_matrix: { \RenewDocumentEnvironment { pmatrix } { } @@ -8253,7 +8281,7 @@ { \BNiceMatrix } { \endBNiceMatrix } } -\keys_define:nn { NiceMatrix / Auto } +\keys_define:nn { nicematrix / Auto } { columns-type .tl_set:N = \l__nicematrix_columns_type_tl , columns-type .value_required:n = true , @@ -8264,7 +8292,7 @@ delimiters / color .value_required:n = true , delimiters / max-width .bool_set:N = \l__nicematrix_delimiters_max_width_bool , delimiters / max-width .default:n = true , - delimiters .code:n = \keys_set:nn { NiceMatrix / delimiters } { #1 } , + delimiters .code:n = \keys_set:nn { nicematrix / delimiters } { #1 } , delimiters .value_required:n = true , rounded-corners .dim_set:N = \l__nicematrix_tab_rounded_corners_dim , rounded-corners .default:n = 4 pt @@ -8275,7 +8303,7 @@ \cs_new_protected:Npn \__nicematrix_auto_nice_matrix:nnnnnn #1 #2 #3 #4 #5 #6 { \group_begin: - \keys_set_known:nnN { NiceMatrix / Auto } { #6 } \l_tmpa_tl + \keys_set_known:nnN { nicematrix / Auto } { #6 } \l_tmpa_tl \use:e { \exp_not:N \begin { NiceArrayWithDelims } { #1 } { #2 } @@ -8468,7 +8496,7 @@ { } \endpgfpicture } -\keys_define:nn { NiceMatrix / sub-matrix } +\keys_define:nn { nicematrix / sub-matrix } { extra-height .dim_set:N = \l__nicematrix_submatrix_extra_height_dim , extra-height .value_required:n = true , @@ -8489,14 +8517,14 @@ hvlines .meta:n = { hlines, vlines } , hvlines .value_forbidden:n = true } -\keys_define:nn { NiceMatrix } +\keys_define:nn { nicematrix } { - SubMatrix .inherit:n = NiceMatrix / sub-matrix , - NiceArray / sub-matrix .inherit:n = NiceMatrix / sub-matrix , - pNiceArray / sub-matrix .inherit:n = NiceMatrix / sub-matrix , - NiceMatrixOptions / sub-matrix .inherit:n = NiceMatrix / sub-matrix , + SubMatrix .inherit:n = nicematrix / sub-matrix , + NiceArray / sub-matrix .inherit:n = nicematrix / sub-matrix , + pNiceArray / sub-matrix .inherit:n = nicematrix / sub-matrix , + NiceMatrixOptions / sub-matrix .inherit:n = nicematrix / sub-matrix , } -\keys_define:nn { NiceMatrix / SubMatrix } +\keys_define:nn { nicematrix / SubMatrix } { delimiters / color .tl_set:N = \l__nicematrix_delimiters_color_tl , delimiters / color .value_required:n = true , @@ -8522,7 +8550,7 @@ { \__nicematrix_error:n { Invalid~name } } } , name .value_required:n = true , - rules .code:n = \keys_set:nn { NiceMatrix / rules } { #1 } , + rules .code:n = \keys_set:nn { nicematrix / rules } { #1 } , rules .value_required:n = true , code .tl_set:N = \l__nicematrix_code_tl , code .value_required:n = true , @@ -8605,7 +8633,7 @@ { \__nicematrix_error:nn { Construct~too~large } { \SubMatrix } } { \str_clear_new:N \l__nicematrix_submatrix_name_str - \keys_set:nn { NiceMatrix / SubMatrix } { #5 } + \keys_set:nn { nicematrix / SubMatrix } { #5 } \pgfpicture \pgfrememberpicturepositiononpagetrue \pgf@relevantforpicturesizefalse @@ -8884,7 +8912,7 @@ \peek_remove_spaces:n { \__nicematrix_brace:nnnnn { #2 } { #3 } { #4 } { #1 , #5 } { over } } } -\keys_define:nn { NiceMatrix / Brace } +\keys_define:nn { nicematrix / Brace } { left-shorten .bool_set:N = \l__nicematrix_brace_left_shorten_bool , left-shorten .default:n = true , @@ -8915,7 +8943,7 @@ } { \tl_clear:N \l_tmpa_tl - \keys_set:nn { NiceMatrix / Brace } { #4 } + \keys_set:nn { nicematrix / Brace } { #4 } \tl_if_empty:NF \l_tmpa_tl { \color { \l_tmpa_tl } } \pgfpicture \pgfrememberpicturepositiononpagetrue @@ -9049,7 +9077,7 @@ \bool_new:N \l__nicematrix_not_empty_bool \bool_new:N \l__nicematrix_empty_bool -\keys_define:nn { NiceMatrix / TikzEveryCell } +\keys_define:nn { nicematrix / TikzEveryCell } { not-empty .code:n = \bool_lazy_or:nnTF @@ -9073,7 +9101,7 @@ \IfPackageLoadedTF { tikz } { \group_begin: - \keys_set:nn { NiceMatrix / TikzEveryCell } { #1 } + \keys_set:nn { nicematrix / TikzEveryCell } { #1 } \tl_set:Nn \l_tmpa_tl { { #2 } } \seq_map_inline:Nn \g__nicematrix_pos_of_blocks_seq { \__nicematrix_for_a_block:nnnnn ##1 } @@ -9314,7 +9342,7 @@ renew-dots,~and~ renew-matrix. } -\keys_define:nn { NiceMatrix / Package } +\keys_define:nn { nicematrix / Package } { renew-dots .bool_set:N = \l__nicematrix_renew_dots_bool , renew-dots .value_forbidden:n = true , @@ -9327,7 +9355,7 @@ no-test-for-array .default:n = true , unknown .code:n = \__nicematrix_error:n { Unknown~key~for~package } } -\ProcessKeysOptions { NiceMatrix / Package } +\ProcessKeysOptions { nicematrix / Package } \__nicematrix_msg_new:nn { footnote~with~footnotehyper~package } { You~can't~use~the~option~'footnote'~because~the~package~ diff --git a/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty b/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty index bf4edf432b7..690bd593ce6 100644 --- a/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty +++ b/Master/texmf-dist/tex/latex/ocgx2/ocgbase.sty @@ -100,8 +100,8 @@ % % The Current Maintainer of this work is A. Grahn. -\def\g@ocgbase@date@tl{2022/08/04} -\def\g@ocgbase@version@tl{0.22} +\def\g@ocgbase@date@tl{2024/08/28} +\def\g@ocgbase@version@tl{0.23} \ProvidesExplPackage{ocgbase}{\g@ocgbase@date@tl}{\g@ocgbase@version@tl} {support package for ocgx2.sty} @@ -167,10 +167,8 @@ %global Order list \tl_new:N\l_ocgbase_ocgorderentry_tl \tl_new:N\l_ocgbase_ocgorder_tl - \tl_if_exist:cT{g_ocgbase_nd_0_chld_tl}{ - \ocgbase_build_order:Nn\l_ocgbase_ocgorder_tl{ - \tl_use:c{g_ocgbase_nd_0_chld_tl} - } + \seq_if_empty:NF\g_ocgbase_order_root_seq{ + \ocgbase_build_order:Nn\l_ocgbase_ocgorder_tl{root} } \tl_if_empty:NF\l_ocgbase_ocgorder_tl{ \pbs_pdfobj:nnn{}{array}{\l_ocgbase_ocgorder_tl} @@ -228,98 +226,45 @@ \cs_new_nopar:Nn\ocgbase_last_ocg:{\g_ocgbase_last_ocg_tl} -\int_new:N\g_ocgbase_nd_int %node id -\seq_new:N\g_ocgbase_tree_nd_stack_seq %stack with open ocg node id -\seq_new:N\g_ocgbase_tree_ocg_stack_seq %stack with open ocg obj number -\seq_gpush:Nn\g_ocgbase_tree_nd_stack_seq{0} %push root node -\seq_gpush:Nn\g_ocgbase_tree_ocg_stack_seq{null} %push root node +\seq_new:N\g_ocgbase_open_ocg_seq %stack with open ocg ref +\seq_new:N\g_ocgbase_order_root_seq %seq taking ocg ref /Order root -%macro for starting OCG object (and nested children) insertion into Order +%macro for starting OCG object (and nested children) insertion into order %hierarchy (shown as tree structure in the viewers `Layers' tab \cs_new_protected_nopar:Nn\ocgbase_tree_node_begin:n{ % #1: OCG obj - %get the parent node from stack - \seq_get:NN\g_ocgbase_tree_nd_stack_seq\l__ocgbase_prnt_tl - \tl_if_exist:cTF{g_ocgbase_nd_\l__ocgbase_prnt_tl _chld_tl}{ - %parent has >=1 children (i. e. my older siblings), traverse them - \tl_set:Nv\l__ocgbase_prev_sbl_tl{g_ocgbase_nd_\l__ocgbase_prnt_tl _chld_tl} - \tl_set:Nx\l__ocgbase_cur_ocg_tl{#1} - \ocgbase_traverse_siblings:NN\l__ocgbase_prev_sbl_tl\l__ocgbase_cur_ocg_tl - \str_if_empty:NTF\l__ocgbase_cur_ocg_tl{ - %I am the first child of my parent to refer to OCG #1 - \int_gincr:N\g_ocgbase_nd_int - \tl_set:Nx\l__ocgbase_cur_nd_tl{\int_use:N\g_ocgbase_nd_int} - %set myself as my next-older sibling's `next sibling' - \tl_gset:cV{ - g_ocgbase_nd_\l__ocgbase_prev_sbl_tl _sbl_tl}\l__ocgbase_cur_nd_tl - }{ - %there is already a sibling referring to OCG #1; no new node needs be - %created - \tl_set:NV\l__ocgbase_cur_nd_tl\l__ocgbase_prev_sbl_tl - } - }{ - %I am the very first child of my parent - \int_gincr:N\g_ocgbase_nd_int - \tl_set:Nx\l__ocgbase_cur_nd_tl{\int_use:N\g_ocgbase_nd_int} - %set myself as my parent's first child - \tl_gset:cV{g_ocgbase_nd_\l__ocgbase_prnt_tl _chld_tl}\l__ocgbase_cur_nd_tl + % get parent (either currently open ocg or root) + \seq_get:NNF\g_ocgbase_open_ocg_seq\l__ocgbase_prnt_tl{ + \tl_set:Nn\l__ocgbase_prnt_tl{root} } - %set the OCG I am referring to - \tl_gset:cx{g_ocgbase_nd_\l__ocgbase_cur_nd_tl _ocg_tl}{#1} - %push current node and its associated OCG obj on the stacks - \seq_gpush:NV\g_ocgbase_tree_nd_stack_seq\l__ocgbase_cur_nd_tl - \seq_gpush:Nx\g_ocgbase_tree_ocg_stack_seq{#1} -} - -%macro that ends insertion of OCG and sub-OCGs into Order tree -\cs_new_protected:Nn\ocgbase_tree_node_end:{ - \seq_get:NN\g_ocgbase_tree_nd_stack_seq\l_tempa_tl - \seq_get:NN\g_ocgbase_tree_ocg_stack_seq\l_tempb_tl - \str_if_eq:eeT{ - \cs_if_exist_use:c{g_ocgbase_nd_\l_tempa_tl _ocg_tl} - }{ - \l_tempb_tl - }{ - \seq_gpop:NN\g_ocgbase_tree_nd_stack_seq\g_trash_tl - \seq_gpop:NN\g_ocgbase_tree_ocg_stack_seq\g_trash_tl + %push current ocg ref on stack with open ocgs + \seq_gpush:Nx\g_ocgbase_open_ocg_seq{#1} + %create seq for current ocg if not yet existing and + %append ocg ref to its parent seq + \seq_if_exist:cF{g_ocgbase_order_#1_seq}{ + \seq_new:c{g_ocgbase_order_#1_seq} + \seq_gput_right:cx{g_ocgbase_order_ \l__ocgbase_prnt_tl _seq}{#1} } } -% helper macro (recursive); traverses siblings to find either -% the node which refers to the same OCG (arg #2 remains un-modified), or -% the last sibling inserted (arg #2 is cleared); -% the node id of the sibling found is returned in arg #1 -\cs_new_protected:Nn\ocgbase_traverse_siblings:NN{ - % #1: current node (in/out), #2: OCG obj (in/out) - \str_if_eq:eeF{#2}{\tl_use:c{g_ocgbase_nd_#1_ocg_tl}}{ - \tl_if_exist:cTF{g_ocgbase_nd_#1_sbl_tl}{ - \tl_set:Nv#1{g_ocgbase_nd_#1_sbl_tl} - \ocgbase_traverse_siblings:NN#1#2 - }{ - \tl_clear:N#2 - } - } +%macro that ends insertion of current OCG into order tree +\cs_new_protected:Nn\ocgbase_tree_node_end:{ + %pop top ocg ref from stack with open ocgs + \seq_gpop:NN\g_ocgbase_open_ocg_seq\g_trash_tl } +%macro that builds global ocg order from hierarchy and saves it into tl var \cs_new_protected_nopar:Nn\ocgbase_build_order:Nn{ % (recursive macro) % #1: tl var to which the OCG order is written (output) - % #2: starting node id (input; usually `1') - \tl_set:Nx\l__ocgbase_cur_nd_tl{#2} - % first, append the OCG obj the current node is referring to - \tl_put_right:Nx#1{~\tl_use:c{g_ocgbase_nd_\l__ocgbase_cur_nd_tl _ocg_tl}} - % second, traverse the tree starting with the first child node - \tl_if_exist:cT{g_ocgbase_nd_\l__ocgbase_cur_nd_tl _chld_tl}{ - \seq_gpush:NV\g_ocgbase_tree_nd_stack_seq\l__ocgbase_cur_nd_tl - \tl_put_right:Nn#1{~[} - \ocgbase_build_order:Nn#1{ - \tl_use:c{g_ocgbase_nd_\l__ocgbase_cur_nd_tl _chld_tl}} - \tl_put_right:Nn#1{~]} - \seq_gpop:NN\g_ocgbase_tree_nd_stack_seq\l__ocgbase_cur_nd_tl - } - % third, traverse the tree starting with the next sibling node - \tl_if_exist:cT{g_ocgbase_nd_\l__ocgbase_cur_nd_tl _sbl_tl}{ - \ocgbase_build_order:Nn#1{ - \tl_use:c{g_ocgbase_nd_\l__ocgbase_cur_nd_tl _sbl_tl}} + % #2: starting node (input; usually `root') + \seq_map_inline:cn{g_ocgbase_order_#2_seq}{ + % first, append ocg ref to result tl var + \tl_put_right:Nx#1{~##1} + \seq_if_empty:cF{g_ocgbase_order_##1_seq}{ + \tl_put_right:Nn#1{~[} + \ocgbase_build_order:Nn#1{##1} + \tl_put_right:Nn#1{~]} + } } } @@ -433,7 +378,7 @@ % \ocgbase@tree@node@end % #1: OCG PDF object % macro pair (begin and end) for inserting OCG object and its children -% into Order hierarchy (shown as tree structure in the viewers `Layers' tab +% into order hierarchy (shown as tree structure in the viewers `Layers' tab % % -------- % @@ -479,8 +424,8 @@ % % The Current Maintainer of this work is A. Grahn. -\def\g@ocgbase@date@tl{2022/08/04} -\def\g@ocgbase@version@tl{0.22} +\def\g@ocgbase@date@tl{2024/08/28} +\def\g@ocgbase@version@tl{0.23} \ProvidesExplPackage{ocgbase}{\g@ocgbase@date@tl}{\g@ocgbase@version@tl} {support package for ocgx2.sty} @@ -535,25 +480,23 @@ \AddToHook{shipout/lastpage}{ \tl_if_empty:NF\g_ocgbase_ocgs_tl{ %global OCG array - \pbs_pdfobj:nnn{}{array}{\g_ocgbase_ocgs_tl} - \tl_set:Nx\l_ocgbase_ocgarray_tl{\pbs_pdflastobj:} - \tl_new:N\l_ocgbase_offocgentry_tl + \pdf_object_unnamed_write:ne{array}{\g_ocgbase_ocgs_tl} + \tl_set:Nx\l_ocgbase_ocgarray_tl{\pdf_object_ref_last:} %global OFF list + \tl_new:N\l_ocgbase_offocgentry_tl \seq_if_empty:NF\g_ocgbase_offocgs_seq{ - \pbs_pdfobj:nnn{}{array}{\seq_use:Nn\g_ocgbase_offocgs_seq{~}} - \tl_set:Nx\l_ocgbase_offocgentry_tl{/OFF~\pbs_pdflastobj:} + \pdf_object_unnamed_write:ne{array}{\seq_use:Nn\g_ocgbase_offocgs_seq{~}} + \tl_set:Nx\l_ocgbase_offocgentry_tl{/OFF~\pdf_object_ref_last:} } %global Order list \tl_new:N\l_ocgbase_ocgorderentry_tl \tl_new:N\l_ocgbase_ocgorder_tl - \tl_if_exist:cT{g_ocgbase_nd_0_chld_tl}{ - \ocgbase_build_order:Nn\l_ocgbase_ocgorder_tl{ - \tl_use:c{g_ocgbase_nd_0_chld_tl} - } + \seq_if_empty:NF\g_ocgbase_order_root_seq{ + \ocgbase_build_order:Nn\l_ocgbase_ocgorder_tl{root} } \tl_if_empty:NF\l_ocgbase_ocgorder_tl{ - \pbs_pdfobj:nnn{}{array}{\l_ocgbase_ocgorder_tl} - \tl_set:Nx\l_ocgbase_ocgorderentry_tl{/Order~\pbs_pdflastobj:} + \pdf_object_unnamed_write:ne{array}{\l_ocgbase_ocgorder_tl} + \tl_set:Nx\l_ocgbase_ocgorderentry_tl{/Order~\pdf_object_ref_last:} } %generate RBGroups entry (radio button groups) \tl_new:N\l_ocgbase_rbtn_groups_tl @@ -566,8 +509,8 @@ } \tl_new:N\l_ocgbase_rbgroupsentry_tl \tl_if_empty:NF\l_ocgbase_rbtn_groups_tl{ - \pbs_pdfobj:nnn{}{array}{\l_ocgbase_rbtn_groups_tl} - \tl_set:Nx\l_ocgbase_rbgroupsentry_tl{/RBGroups~\pbs_pdflastobj:} + \pdf_object_unnamed_write:ne{array}{\l_ocgbase_rbtn_groups_tl} + \tl_set:Nx\l_ocgbase_rbgroupsentry_tl{/RBGroups~\pdf_object_ref_last:} } \pdfmanagement_add:nnx{Catalog/OCProperties}{OCGs}{\g_ocgbase_ocgs_tl} \pdfmanagement_add:nnx{Catalog/OCProperties}{D}{<< @@ -586,12 +529,10 @@ } %macro for inserting new OCG object -\cs_generate_variant:Nn\pdf_object_new:nn{xn} -\cs_generate_variant:Nn\pdf_object_write:nn{xx} \int_new:N\g_ocgbase_int \cs_new_protected_nopar:Nn\ocgbase_new_ocg:nnn{ - \pdf_object_new:xn{g_object_\int_use:N\g_ocgbase_int _pdf}{dict} - \pdf_object_write:xx{g_object_\int_use:N\g_ocgbase_int _pdf}{ + \exp_args:Ne\pdf_object_new:n{g_object_\int_use:N\g_ocgbase_int _pdf} + \exp_args:Neee\pdf_object_write:nnn{g_object_ \int_use:N\g_ocgbase_int _pdf}{dict}{ /Type/OCG/Name~(#1)~\str_if_eq:eeF{#2}{}{/Usage<<#2>>} } \tl_gput_right:Nx\g_ocgbase_ocgs_tl{~\pdf_object_ref_last:} @@ -612,98 +553,45 @@ \cs_new_nopar:Nn\ocgbase_last_ocg:{\g_ocgbase_last_ocg_tl} -\int_new:N\g_ocgbase_nd_int %node id -\seq_new:N\g_ocgbase_tree_nd_stack_seq %stack with open ocg node id -\seq_new:N\g_ocgbase_tree_ocg_stack_seq %stack with open ocg obj number -\seq_gpush:Nn\g_ocgbase_tree_nd_stack_seq{0} %push root node -\seq_gpush:Nn\g_ocgbase_tree_ocg_stack_seq{null} %push root node +\seq_new:N\g_ocgbase_open_ocg_seq %stack with open ocg ref +\seq_new:N\g_ocgbase_order_root_seq %seq taking ocg ref /Order root -%macro for starting OCG object (and nested children) insertion into Order +%macro for starting OCG object (and nested children) insertion into order %hierarchy (shown as tree structure in the viewers `Layers' tab \cs_new_protected_nopar:Nn\ocgbase_tree_node_begin:n{ % #1: OCG obj - %get the parent node from stack - \seq_get:NN\g_ocgbase_tree_nd_stack_seq\l__ocgbase_prnt_tl - \tl_if_exist:cTF{g_ocgbase_nd_\l__ocgbase_prnt_tl _chld_tl}{ - %parent has >=1 children (i. e. my older siblings), traverse them - \tl_set:Nv\l__ocgbase_prev_sbl_tl{g_ocgbase_nd_\l__ocgbase_prnt_tl _chld_tl} - \tl_set:Nx\l__ocgbase_cur_ocg_tl{#1} - \ocgbase_traverse_siblings:NN\l__ocgbase_prev_sbl_tl\l__ocgbase_cur_ocg_tl - \str_if_empty:NTF\l__ocgbase_cur_ocg_tl{ - %I am the first child of my parent to refer to OCG #1 - \int_gincr:N\g_ocgbase_nd_int - \tl_set:Nx\l__ocgbase_cur_nd_tl{\int_use:N\g_ocgbase_nd_int} - %set myself as my next-older sibling's `next sibling' - \tl_gset:cV{ - g_ocgbase_nd_\l__ocgbase_prev_sbl_tl _sbl_tl}\l__ocgbase_cur_nd_tl - }{ - %there is already a sibling referring to OCG #1; no new node needs be - %created - \tl_set:NV\l__ocgbase_cur_nd_tl\l__ocgbase_prev_sbl_tl - } - }{ - %I am the very first child of my parent - \int_gincr:N\g_ocgbase_nd_int - \tl_set:Nx\l__ocgbase_cur_nd_tl{\int_use:N\g_ocgbase_nd_int} - %set myself as my parent's first child - \tl_gset:cV{g_ocgbase_nd_\l__ocgbase_prnt_tl _chld_tl}\l__ocgbase_cur_nd_tl + % get parent (either currently open ocg or root) + \seq_get:NNF\g_ocgbase_open_ocg_seq\l__ocgbase_prnt_tl{ + \tl_set:Nn\l__ocgbase_prnt_tl{root} } - %set the OCG I am referring to - \tl_gset:cx{g_ocgbase_nd_\l__ocgbase_cur_nd_tl _ocg_tl}{#1} - %push current node and its associated OCG obj on the stacks - \seq_gpush:NV\g_ocgbase_tree_nd_stack_seq\l__ocgbase_cur_nd_tl - \seq_gpush:Nx\g_ocgbase_tree_ocg_stack_seq{#1} -} - -%macro that ends insertion of OCG and sub-OCGs into Order tree -\cs_new_protected:Nn\ocgbase_tree_node_end:{ - \seq_get:NN\g_ocgbase_tree_nd_stack_seq\l_tempa_tl - \seq_get:NN\g_ocgbase_tree_ocg_stack_seq\l_tempb_tl - \str_if_eq:eeT{ - \cs_if_exist_use:c{g_ocgbase_nd_\l_tempa_tl _ocg_tl} - }{ - \l_tempb_tl - }{ - \seq_gpop:NN\g_ocgbase_tree_nd_stack_seq\g_trash_tl - \seq_gpop:NN\g_ocgbase_tree_ocg_stack_seq\g_trash_tl + %push current ocg ref on stack with open ocgs + \seq_gpush:Nx\g_ocgbase_open_ocg_seq{#1} + %create seq for current ocg if not yet existing and + %append ocg ref to its parent seq + \seq_if_exist:cF{g_ocgbase_order_#1_seq}{ + \seq_new:c{g_ocgbase_order_#1_seq} + \seq_gput_right:cx{g_ocgbase_order_ \l__ocgbase_prnt_tl _seq}{#1} } } -% helper macro (recursive); traverses siblings to find either -% the node which refers to the same OCG (arg #2 remains un-modified), or -% the last sibling inserted (arg #2 is cleared); -% the node id of the sibling found is returned in arg #1 -\cs_new_protected:Nn\ocgbase_traverse_siblings:NN{ - % #1: current node (in/out), #2: OCG obj (in/out) - \str_if_eq:eeF{#2}{\tl_use:c{g_ocgbase_nd_#1_ocg_tl}}{ - \tl_if_exist:cTF{g_ocgbase_nd_#1_sbl_tl}{ - \tl_set:Nv#1{g_ocgbase_nd_#1_sbl_tl} - \ocgbase_traverse_siblings:NN#1#2 - }{ - \tl_clear:N#2 - } - } +%macro that ends insertion of current OCG into order tree +\cs_new_protected:Nn\ocgbase_tree_node_end:{ + %pop top ocg ref from stack with open ocgs + \seq_gpop:NN\g_ocgbase_open_ocg_seq\g_trash_tl } +%macro that builds global ocg order from hierarchy and saves it into tl var \cs_new_protected_nopar:Nn\ocgbase_build_order:Nn{ % (recursive macro) % #1: tl var to which the OCG order is written (output) - % #2: starting node id (input; usually `1') - \tl_set:Nx\l__ocgbase_cur_nd_tl{#2} - % first, append the OCG obj the current node is referring to - \tl_put_right:Nx#1{~\tl_use:c{g_ocgbase_nd_\l__ocgbase_cur_nd_tl _ocg_tl}} - % second, traverse the tree starting with the first child node - \tl_if_exist:cT{g_ocgbase_nd_\l__ocgbase_cur_nd_tl _chld_tl}{ - \seq_gpush:NV\g_ocgbase_tree_nd_stack_seq\l__ocgbase_cur_nd_tl - \tl_put_right:Nn#1{~[} - \ocgbase_build_order:Nn#1{ - \tl_use:c{g_ocgbase_nd_\l__ocgbase_cur_nd_tl _chld_tl}} - \tl_put_right:Nn#1{~]} - \seq_gpop:NN\g_ocgbase_tree_nd_stack_seq\l__ocgbase_cur_nd_tl - } - % third, traverse the tree starting with the next sibling node - \tl_if_exist:cT{g_ocgbase_nd_\l__ocgbase_cur_nd_tl _sbl_tl}{ - \ocgbase_build_order:Nn#1{ - \tl_use:c{g_ocgbase_nd_\l__ocgbase_cur_nd_tl _sbl_tl}} + % #2: starting node (input; usually `root') + \seq_map_inline:cn{g_ocgbase_order_#2_seq}{ + % first, append ocg ref to result tl var + \tl_put_right:Nx#1{~##1} + \seq_if_empty:cF{g_ocgbase_order_##1_seq}{ + \tl_put_right:Nn#1{~[} + \ocgbase_build_order:Nn#1{##1} + \tl_put_right:Nn#1{~]} + } } } @@ -740,7 +628,7 @@ % OC-marked content \cs_new_protected_nopar:Nn\ocgbase_oc_bdc:n{\pbs_pdfbdc:nn{OC}{#1}} -\cs_new_protected_nopar:Nn\ocgbase_oc_emc:{\pbs_pdfemc:} +\cs_new_eq:NN\ocgbase_oc_emc:\pbs_pdfemc: %stack of PDF obj references of currently open OCGs \seq_new:N\g_ocgbase_open_stack_seq diff --git a/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty b/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty index a1081f88ac5..8a45995b8c8 100644 --- a/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty +++ b/Master/texmf-dist/tex/latex/ocgx2/ocgx2.sty @@ -43,8 +43,8 @@ % % The Current Maintainer of this work is A. Grahn. - \def\g@ocgxii@date@tl{2024/03/18} - \def\g@ocgxii@version@tl{0.57} + \def\g@ocgxii@date@tl{2024/08/28} + \def\g@ocgxii@version@tl{0.58} \ProvidesExplPackage{ocgx2}{\g@ocgxii@date@tl}{\g@ocgxii@version@tl} {ports `ocgx' functionality to dvips+ps2pdf, xelatex and dvipdfmx} @@ -1579,8 +1579,8 @@ % % The Current Maintainer of this work is A. Grahn. -\def\g@ocgxii@date@tl{2024/03/18} -\def\g@ocgxii@version@tl{0.57} +\def\g@ocgxii@date@tl{2024/08/28} +\def\g@ocgxii@version@tl{0.58} \ProvidesExplPackage{ocgx2}{\g@ocgxii@date@tl}{\g@ocgxii@version@tl} {ports `ocgx' functionality to dvips+ps2pdf, xelatex and dvipdfmx} @@ -1810,8 +1810,8 @@ \cs_set_eq:NN\And \ocgxii_protected_dummy_cs:n \cs_set_eq:NN\Or \ocgxii_protected_dummy_cs:n \ocgxii_ocmd_read_visbility:xN{#2}\l_ocgxii_ocmd_visibility_tl - \pdf_object_new:xn{g_object_\int_use:N\g_ocgbase_int _pdf}{dict} - \pdf_object_write:xx{g_object_\int_use:N\g_ocgbase_int _pdf}{ + \exp_args:Ne\pdf_object_new:n{g_object_\int_use:N\g_ocgbase_int _pdf} + \exp_args:Neee\pdf_object_write:nnn{g_object_\int_use:N\g_ocgbase_int _pdf}{dict}{ /Type/OCMD\l_ocgxii_ocmd_visibility_tl } \tl_gset:cx{g_pbs_objname_\pdf_object_ref_last: _tl}{ diff --git a/Master/texmf-dist/tex/latex/outilsgeomtikz/OutilsGeomTikz.sty b/Master/texmf-dist/tex/latex/outilsgeomtikz/OutilsGeomTikz.sty index bb79723d21a..5f6cd304105 100644 --- a/Master/texmf-dist/tex/latex/outilsgeomtikz/OutilsGeomTikz.sty +++ b/Master/texmf-dist/tex/latex/outilsgeomtikz/OutilsGeomTikz.sty @@ -2,7 +2,8 @@ % licence........: Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{OutilsGeomTikz}[2023/12/13 v0.1.5 Outils geometriques en TikZ] +\ProvidesPackage{OutilsGeomTikz}[2024/08/29 v0.1.6 Outils geometriques en TikZ] +% 0.1.6 Correction de bugs avec pdflatex + amélioration de la gestion des rotations/échelles des labels (tks Cyril I. ^^) % 0.1.5 Modification de la graduation intérieure pour les rapporteurs 180° % 0.1.4 Possibilité de positionner les outils avec deux points (angle calculé automatiquement) % 0.1.3 Ajout du pourcenteur @@ -60,7 +61,8 @@ Origine=\xdef\REGLposOrigin{#1},% Rotation=\def\REGLangle{#1},% Opacite=\def\REGLopac{#1},% - PosVal=\def\REGLposval{#1} + PosVal=\def\REGLposval{#1},% + EchelleValeurs=\def\REGLechlabel{#1} } \setKVdefault[RegleGeom]{% @@ -74,7 +76,8 @@ AfficheValeurs=true,% Fond=false,% Opacite=0.5,% - PosVal=m + PosVal=m,% + EchelleValeurs=0.8 } \NewDocumentCommand{\tkzRegle}{ O{} }{% @@ -88,7 +91,7 @@ }{}% \xdef\REGLlongueur{\fpeval{max(3,\REGLlongueur)}}%valeurs mini \xdef\REGLlargeur{\fpeval{max(1.5,\REGLlargeur)}} - \begin{scope}[shift={(\REGLposOrigin)},rotate=\REGLangle,scale=\REGLechelle] + \begin{scope}[shift={(\REGLposOrigin)},rotate=\REGLangle,scale=\REGLechelle,transform shape] \ifboolKV[RegleGeom]{Fond} {% \begin{scope} @@ -104,13 +107,13 @@ \ifboolKV[RegleGeom]{AfficheValeurs}% {% \IfSubStr{\REGLposval}{h} - {\foreach \i in {0,1,...,\REGLlongueur} \draw[\REGLcouleur] (\i,{-0.5}) node[inner sep=1pt,outer sep=1pt,rotate=\REGLangle,scale={0.8*\REGLechelle},font=\small,below] {$\i$} ;} + {\foreach \i in {0,1,...,\REGLlongueur} {\draw[\REGLcouleur] (\i,{-0.5}) node[inner sep=1pt,outer sep=1pt,scale={\REGLechlabel},font=\small,below] {$\i$} ;}} {} \IfSubStr{\REGLposval}{m} - {\foreach \i in {0,1,...,\REGLlongueur} \draw[\REGLcouleur] (\i,{-0.5*\REGLlargeur}) node[inner sep=1pt,outer sep=1pt,rotate=\REGLangle,scale={0.8*\REGLechelle},font=\small] {$\i$} ;} + {\foreach \i in {0,1,...,\REGLlongueur} {\draw[\REGLcouleur] (\i,{-0.5*\REGLlargeur}) node[inner sep=1pt,outer sep=1pt,scale={\REGLechlabel},font=\small] {$\i$} ;}} {} \IfSubStr{\REGLposval}{b} - {\foreach \i in {0,1,...,\REGLlongueur} \draw[\REGLcouleur] (\i,{-\REGLlargeur+0.5}) node[inner sep=1pt,outer sep=1pt,rotate=\REGLangle,scale={0.8*\REGLechelle},font=\small,above] {\rotatebox{180}{$\fpeval{trunc(\REGLlongueur)-\i}$}} ;} + {\foreach \i in {0,1,...,\REGLlongueur} {\draw[\REGLcouleur] (\i,{-\REGLlargeur+0.5}) node[inner sep=1pt,outer sep=1pt,scale={\REGLechlabel},font=\small,above] {\rotatebox{180}{$\fpeval{trunc(\REGLlongueur)-\i}$}} ;}} {} }% {}% @@ -126,7 +129,8 @@ CouleurFond=\def\REGLREPcouleurfond{#1},% Origine=\def\REGLREPposOrigin{#1},% Rotation=\def\REGLREPangle{#1},% - Opacite=\def\REGLREPopac{#1} + Opacite=\def\REGLREPopac{#1},% + EchelleValeurs=\def\REGLREPechlabel{#1} } \setKVdefault[RegleRepereGeom]{% @@ -140,7 +144,8 @@ AfficheValeurs=true,% Fond=false,% Opacite=0.5,% - Retourne=false + Retourne=false,% + EchelleValeurs=0.8 } \NewDocumentCommand{\tkzRegleRepere}{ O{} }{% @@ -154,7 +159,7 @@ \pgfmathanglebetweenpoints{\pgfpointanchor{\REGLREPposOrigin}{center}}{\pgfpointanchor{\tmppointdeux}{center}}% \edef\REGLREPangle{\pgfmathresult}% }{}% - \begin{scope}[shift={(\REGLREPposOrigin)},rotate=\REGLREPangle,scale=\REGLREPechelle] + \begin{scope}[shift={(\REGLREPposOrigin)},rotate=\REGLREPangle,scale=\REGLREPechelle,transform shape] %bases de la règle-repère \ifboolKV[RegleRepereGeom]{Fond}% {\draw[draw=none,fill=\REGLREPcouleurfond!10!white,fill opacity=\REGLREPopac,rounded corners] (-0.5,0) rectangle++ ({\REGLREPlongueur+1},{-\REGLREPlargeur}) ;}% @@ -175,12 +180,12 @@ {% \ifboolKV[RegleRepereGeom]{Retourne}% {% - {\foreach \i in {0,1,...,\REGLREPlongueur} \draw[\REGLREPcouleur] (\i,{-0.5}) node[inner sep=1pt,outer sep=1pt,rotate=\REGLREPangle,scale={0.8*\REGLREPechelle},font=\small,below] {$\fpeval{-trunc(0.5*\REGLREPlongueur)+\i}$} ;} - {\foreach \i in {0,1,...,\REGLREPlongueur} \draw[\REGLREPcouleur] (\i,{-\REGLREPlargeur+0.5}) node[inner sep=1pt,outer sep=1pt,rotate=\REGLREPangle,scale={0.8*\REGLREPechelle},font=\small,above] {\rotatebox{180}{$\inteval{\REGLREPlongueur-\i}$}} ;} + {\foreach \i in {0,1,...,\REGLREPlongueur} {\draw[\REGLREPcouleur] (\i,{-0.5}) node[inner sep=1pt,outer sep=1pt,scale={\REGLREPechlabel},font=\small,below] {$\fpeval{-trunc(0.5*\REGLREPlongueur)+\i}$} ;}} + {\foreach \i in {0,1,...,\REGLREPlongueur} {\draw[\REGLREPcouleur] (\i,{-\REGLREPlargeur+0.5}) node[inner sep=1pt,outer sep=1pt,scale={\REGLREPechlabel},font=\small,above] {\rotatebox{180}{$\inteval{\REGLREPlongueur-\i}$}} ;}} }% {% - {\foreach \i in {0,1,...,\REGLREPlongueur} \draw[\REGLREPcouleur] (\i,{-0.5}) node[inner sep=1pt,outer sep=1pt,rotate=\REGLREPangle,scale={0.8*\REGLREPechelle},font=\small,below] {$\i$} ;} - {\foreach \i in {0,1,...,\REGLREPlongueur} \draw[\REGLREPcouleur] (\i,{-\REGLREPlargeur+0.5}) node[inner sep=1pt,outer sep=1pt,rotate=\REGLREPangle,scale={0.8*\REGLREPechelle},font=\small,above] {\rotatebox{180}{$\fpeval{trunc(0.5*\REGLREPlongueur)-\i}$}} ;} + {\foreach \i in {0,1,...,\REGLREPlongueur} {\draw[\REGLREPcouleur] (\i,{-0.5}) node[inner sep=1pt,outer sep=1pt,scale={\REGLREPechlabel},font=\small,below] {$\i$} ;}} + {\foreach \i in {0,1,...,\REGLREPlongueur} {\draw[\REGLREPcouleur] (\i,{-\REGLREPlargeur+0.5}) node[inner sep=1pt,outer sep=1pt,scale={\REGLREPechlabel},font=\small,above] {\rotatebox{180}{$\fpeval{trunc(0.5*\REGLREPlongueur)-\i}$}} ;}} }% } {}% @@ -196,7 +201,8 @@ CouleurFond=\def\REQcouleurfond{#1},% Origine=\def\REQposOrigin{#1},% Rotation=\def\REQangle{#1},% - Opacite=\def\REQopac{#1} + Opacite=\def\REQopac{#1},% + EchelleValeurs=\def\REQechlabel{#1} } \setKVdefault[RequerreGeom]{% @@ -209,7 +215,8 @@ Rotation=0,% AfficheValeurs=true,% Fond=false,% - Opacite=0.5 + Opacite=0.5,% + EchelleValeurs=0.8 } \NewDocumentCommand{\tkzRequerre}{ O{} }{% @@ -223,7 +230,7 @@ \pgfmathanglebetweenpoints{\pgfpointanchor{\REQposOrigin}{center}}{\pgfpointanchor{\tmppointdeux}{center}}% \edef\REQangle{\pgfmathresult}% }{}% - \begin{scope}[shift={(\REQposOrigin)},rotate=\REQangle,scale=\REQechelle] + \begin{scope}[shift={(\REQposOrigin)},rotate=\REQangle,scale=\REQechelle,transform shape] \ifboolKV[RequerreGeom]{Fond} { \fill[draw=none,rounded corners,fill=\REQcouleurfond!10!white,fill opacity=\REQopac] ({-\REQlongueur*0.5},0) rectangle ({\REQlongueur*0.5},{-\REQlargeur}) ; @@ -243,10 +250,10 @@ \end{scope} \ifboolKV[RequerreGeom]{AfficheValeurs}% {% - \draw[\REQcouleur] (0,-0.5) node[inner sep=1pt,outer sep=1pt,rotate=\REQangle,scale={0.8*\REQechelle},font=\small,below] {$0$} ; + \draw[\REQcouleur] (0,-0.5) node[inner sep=1pt,outer sep=1pt,scale={\REQechlabel},font=\small,below] {$0$} ; \foreach \i in {1,2,...,\fpeval{0.5*\REQlongueur-0.5}}{% - \draw[\REQcouleur] (\i,-0.5) node[inner sep=1pt,outer sep=1pt,rotate=\REQangle,scale={0.8*\REQechelle},font=\small,below] {$\i$} ; - \draw[\REQcouleur] (-\i,-0.5) node[inner sep=1pt,outer sep=1pt,rotate=\REQangle,scale={0.8*\REQechelle},font=\small,below] {$-\i$} ;} + \draw[\REQcouleur] (\i,-0.5) node[inner sep=1pt,outer sep=1pt,scale={\REQechlabel},font=\small,below] {$\i$} ; + \draw[\REQcouleur] (-\i,-0.5) node[inner sep=1pt,outer sep=1pt,scale={\REQechlabel},font=\small,below] {$-\i$} ;} }% {}% \end{scope} @@ -260,7 +267,8 @@ CouleurFond=\def\EQcouleurfond{#1},% Origine=\def\EQposOrigin{#1},% Rotation=\def\EQangle{#1},% - Opacite=\def\EQopac{#1} + Opacite=\def\EQopac{#1},% + EchelleValeurs=\def\EQechlabel{#1} } \setKVdefault[EquerreGeom]{% @@ -273,7 +281,8 @@ AfficheValeurs=true,% Fond=false,% Opacite=0.5,% - PetitCote=false + PetitCote=false,% + EchelleValeurs=0.8 } \NewDocumentCommand{\tkzEquerre}{ O{} }{% @@ -293,7 +302,7 @@ \edef\EQangle{\fpeval{\pgfmathresult-90}}% }% }{}% - \begin{scope}[shift={(\EQposOrigin)},rotate=\EQangle,scale=\EQechelle] + \begin{scope}[shift={(\EQposOrigin)},rotate=\EQangle,scale=\EQechelle,transform shape] \ifboolKV[EquerreGeom]{Fond} {% \begin{scope} %diff extérieur-intérieur @@ -318,10 +327,12 @@ \foreach \y in {0,1,...,\fpeval{0.925*\EQlongueur}} {\draw[\EQcouleur] (0,\y)--(0.4,\y) ;} \ifboolKV[EquerreGeom]{AfficheValeurs}% {% - \foreach \i in {1,2,...,\fpeval{0.9*\EQlongueur-1}} - \draw[\EQcouleur] (0.4,\i) node[inner sep=1pt,outer sep=1pt,rotate=\EQangle,scale={0.8*\EQechelle},font=\small,right] {\rotatebox{90}{$\i$}} ; - \foreach \i in {1,2,...,\fpeval{0.9*\EQlargeur-0.5}} - \draw[\EQcouleur] (\i,0.4) node[inner sep=1pt,outer sep=1pt,rotate=\EQangle,scale={0.8*\EQechelle},font=\small,above] {\rotatebox{180}{$\i$}} ; + \foreach \i in {1,2,...,\fpeval{0.9*\EQlongueur-1}}{% + \draw[\EQcouleur] (0.4,\i) node[inner sep=1pt,outer sep=1pt,scale={\EQechlabel},font=\small,right] {\rotatebox{90}{$\i$}} ; + }% + \foreach \i in {1,2,...,\fpeval{0.9*\EQlargeur-0.5}}{% + \draw[\EQcouleur] (\i,0.4) node[inner sep=1pt,outer sep=1pt,scale={\EQechlabel},font=\small,above] {\rotatebox{180}{$\i$}} ; + }% }% {}% \end{scope} @@ -336,7 +347,8 @@ CouleurFond=\def\RAPPcouleurfond{#1},% Origine=\def\RAPPposOrigin{#1},% Rotation=\def\RAPPangle{#1},% - Opacite=\def\RAPPopac{#1} + Opacite=\def\RAPPopac{#1},% + EchelleValeurs=\def\RAPPechlabel{#1} } \setKVdefault[RapporteurGeom]{% @@ -350,13 +362,14 @@ Fond=false,% Opacite=0.5,% Complet=false,% - GraduationsInt=false + GraduationsInt=false,% + EchelleValeurs=0.8 } \NewDocumentCommand{\tkzRapporteur}{ O{} }{% \useKVdefault[RapporteurGeom]% \setKV[RapporteurGeom]{#1}% - \begin{scope}[shift={(\RAPPposOrigin)},rotate=\RAPPangle,scale=\RAPPechelle,every node/.style={rotate=\RAPPangle}] + \begin{scope}[shift={(\RAPPposOrigin)},rotate=\RAPPangle,scale=\RAPPechelle,transform shape] \ifboolKV[RapporteurGeom]{Complet} { %fond @@ -382,27 +395,27 @@ %valeurs si booléen \ifboolKV[RapporteurGeom]{AfficheAngles} {% - \draw[\RAPPcouleur] (0:2.75) node[rotate=90,scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$0$} ; - \draw[\RAPPcouleur] (180:3.25) node[rotate=90,scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\pm 180$} ; - \draw[\RAPPcouleur] (180:2.75) node[rotate=90,scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\pm \pi$} ; + \draw[\RAPPcouleur] (0:2.75) node[rotate=90,scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$0$} ; + \draw[\RAPPcouleur] (180:3.25) node[rotate=90,scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\pm 180$} ; + \draw[\RAPPcouleur] (180:2.75) node[rotate=90,scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\pm \pi$} ; \foreach \i in {0,10,...,170} - {\draw[\RAPPcouleur] (\i:3.25) node[rotate={\i-90},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\i$} ;} - \draw[\RAPPcouleur] (30:2.75) node[rotate={30-90},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{\pi}{6}$} ; - \draw[\RAPPcouleur] (45:2.75) node[rotate={45-90},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{\pi}{4}$} ; - \draw[\RAPPcouleur] (60:2.75) node[rotate={60-90},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{\pi}{3}$} ; - \draw[\RAPPcouleur] (90:2.75) node[rotate={90-90},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{\pi}{2}$} ; - \draw[\RAPPcouleur] (120:2.75) node[rotate={120-90},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{2\pi}{3}$} ; - \draw[\RAPPcouleur] (135:2.75) node[rotate={135-90},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{3\pi}{4}$} ; - \draw[\RAPPcouleur] (150:2.75) node[rotate={150-90},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{5\pi}{6}$} ; + {\draw[\RAPPcouleur] (\i:3.25) node[rotate={\i-90},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\i$} ;} + \draw[\RAPPcouleur] (30:2.75) node[rotate={30-90},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{\pi}{6}$} ; + \draw[\RAPPcouleur] (45:2.75) node[rotate={45-90},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{\pi}{4}$} ; + \draw[\RAPPcouleur] (60:2.75) node[rotate={60-90},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{\pi}{3}$} ; + \draw[\RAPPcouleur] (90:2.75) node[rotate={90-90},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{\pi}{2}$} ; + \draw[\RAPPcouleur] (120:2.75) node[rotate={120-90},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{2\pi}{3}$} ; + \draw[\RAPPcouleur] (135:2.75) node[rotate={135-90},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{3\pi}{4}$} ; + \draw[\RAPPcouleur] (150:2.75) node[rotate={150-90},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{5\pi}{6}$} ; \foreach \i in {10,20,...,170} - {\draw[\RAPPcouleur] ({-\i}:3.25) node[rotate={270-\i},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$-\i$} ;} - \draw[\RAPPcouleur] (-30:2.75) node[rotate={270-30},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{-\pi}{6}$} ; - \draw[\RAPPcouleur] (-45:2.75) node[rotate={270-45},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{-\pi}{4}$} ; - \draw[\RAPPcouleur] (-60:2.75) node[rotate={270-60},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{-\pi}{3}$} ; - \draw[\RAPPcouleur] (-90:2.75) node[rotate={270-90},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{-\pi}{2}$} ; - \draw[\RAPPcouleur] (-120:2.75) node[rotate={270-120},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{-2\pi}{3}$} ; - \draw[\RAPPcouleur] (-135:2.75) node[rotate={270-135},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{-3\pi}{4}$} ; - \draw[\RAPPcouleur] (-150:2.75) node[rotate={270-150},scale=\fpeval{0.8*\RAPPechelle*\RAPPechangle},font=\tiny] {$\nicefrac{-5\pi}{6}$} ; + {\draw[\RAPPcouleur] ({-\i}:3.25) node[rotate={270-\i},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$-\i$} ;} + \draw[\RAPPcouleur] (-30:2.75) node[rotate={270-30},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{-\pi}{6}$} ; + \draw[\RAPPcouleur] (-45:2.75) node[rotate={270-45},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{-\pi}{4}$} ; + \draw[\RAPPcouleur] (-60:2.75) node[rotate={270-60},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{-\pi}{3}$} ; + \draw[\RAPPcouleur] (-90:2.75) node[rotate={270-90},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{-\pi}{2}$} ; + \draw[\RAPPcouleur] (-120:2.75) node[rotate={270-120},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{-2\pi}{3}$} ; + \draw[\RAPPcouleur] (-135:2.75) node[rotate={270-135},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{-3\pi}{4}$} ; + \draw[\RAPPcouleur] (-150:2.75) node[rotate={270-150},scale=\fpeval{\RAPPechlabel*\RAPPechangle},font=\tiny] {$\nicefrac{-5\pi}{6}$} ; }{} } { @@ -440,9 +453,9 @@ \ifboolKV[RapporteurGeom]{AfficheAngles} {% \foreach \i in {0,10,...,180} - {\draw[\RAPPcouleur] (\i:3.2) node[rotate={\i-90},scale=\fpeval{\RAPPechelle*\RAPPechangle},font=\tiny] {\i} ;} + {\draw[\RAPPcouleur] (\i:3.2) node[rotate={\i-90},scale=\fpeval{\RAPPechangle},font=\tiny] {\i} ;} \foreach \i in {0,10,...,180} - {\draw[\RAPPcouleur] (\i:2.7) node[rotate={\i-90},scale=\fpeval{\RAPPechelle*\RAPPechangle},font=\tiny] {\inteval{180-\i}} ;} + {\draw[\RAPPcouleur] (\i:2.7) node[rotate={\i-90},scale=\fpeval{\RAPPechangle},font=\tiny] {\inteval{180-\i}} ;} }{} } \end{scope} @@ -455,7 +468,8 @@ CouleurFond=\def\POURCcouleurfond{#1},% Origine=\def\POURCposOrigin{#1},% Rotation=\def\POURCangle{#1},% - Opacite=\def\POURCopac{#1} + Opacite=\def\POURCopac{#1},% + EchelleValeurs=\def\POURCechlabel{#1} } \setKVdefault[Pourcenteur]{% @@ -468,13 +482,14 @@ AfficheValeurs=true,% Fond=false,% Opacite=0.5,% - Decoration=true + Decoration=true,% + EchelleValeurs=0.8 } \NewDocumentCommand{\tkzPourcenteur}{ O{} }{% \useKVdefault[Pourcenteur]% \setKV[Pourcenteur]{#1}% - \begin{scope}[shift={(\POURCposOrigin)},rotate=\POURCangle,scale=\POURCechelle,every node/.style={rotate=\POURCangle}] + \begin{scope}[shift={(\POURCposOrigin)},rotate=\POURCangle,scale=\POURCechelle,transform shape] \ifboolKV[Pourcenteur]{Fond} {% \fill[draw=none,fill=\POURCcouleurfond!10!white,fill opacity=\POURCopac] (0,0) circle[radius=3] ; @@ -483,7 +498,7 @@ \draw[\POURCcouleur,semithick] (0,0) circle[radius=3] ; \draw[\POURCcouleur,semithick] ({-0.15*3},0)--({0.15*3},0) (0,{-0.15*3})--(0,{0.15*3}) ; \foreach \pct in {0,1,...,199} - {\draw[\POURCcouleur,thin] ({0.5*\pct*3.6}:{3})--({0.5*\pct*3.6}:{3-0.2}) ;} + {\draw[\POURCcouleur,thin] ({0.5*\pct*3.6}:{3})--({0.5*\pct*3.6}:{3-0.2}) ;} \foreach \pct in {0,10,...,90}{% \draw[\POURCcouleur,thin] ({(\pct+1)*3.6}:{3})--({(\pct+1)*3.6}:{3-0.35}) ; \filldraw[\POURCcouleur] ({(\pct+1)*3.6}:{3-0.35}) circle[fill=\POURCcouleur,radius=0.75pt] ; @@ -505,14 +520,14 @@ \foreach \pct in {5,10,15,20,30,35,40,45,55,60,65,70,80,85,90,95}{% \draw[\POURCcouleur,semithick] ({\pct*3.6}:{3})--({\pct*3.6}:{3-0.5}) ; \ifboolKV[Pourcenteur]{AfficheValeurs} - {\draw ({-\pct*3.6+90}:{3-0.6}) node[\POURCcouleur,rotate={-3.6*\pct},scale=\fpeval{0.8*\POURCechelle*\POURCechangle},font=\tiny] {\pct\,\%} ;}{} + {\draw ({-\pct*3.6+90}:{3-0.6}) node[\POURCcouleur,rotate={-3.6*\pct},scale=\fpeval{\POURCechlabel*\POURCechangle},font=\tiny] {\pct\,\%} ;}{} } \foreach \pct in {0,25,50,75}{% \draw[\POURCcouleur,semithick] ({\pct*3.6}:{3})--({\pct*3.6}:{3-0.5}) ; \ifboolKV[Pourcenteur]{AfficheValeurs} {% - \draw ({-\pct*3.6+90}:{3-0.61}) node[\POURCcouleur,rotate={-3.6*\pct},scale=\fpeval{0.8*\POURCechelle*\POURCechangle},font=\scriptsize\bfseries] {\pct\,\%} ; - \draw ({-\pct*3.6+90}:{2+0.15}) node[\POURCcouleur,rotate={-3.6*\pct},scale=\fpeval{0.8*\POURCechelle*\POURCechangle},font=\tiny\bfseries] {\pct\,\%} ; + \draw ({-\pct*3.6+90}:{3-0.61}) node[\POURCcouleur,rotate={-3.6*\pct},scale=\fpeval{\POURCechlabel*\POURCechangle},font=\scriptsize\bfseries] {\pct\,\%} ; + \draw ({-\pct*3.6+90}:{2+0.15}) node[\POURCcouleur,rotate={-3.6*\pct},scale=\fpeval{\POURCechlabel*\POURCechangle},font=\tiny\bfseries] {\pct\,\%} ; }{}% } \draw[\POURCcouleur,semithick] (0,1)--(0,2) (1.6,0)--(2,0) (0,-1.6)--(0,-2) (-1.6,0)--(-2,0) ; @@ -533,7 +548,7 @@ CouleurFond=\def\RAPPEQcouleurfond{#1},% Origine=\def\RAPPEQposOrigin{#1},% Rotation=\def\RAPPEQangle{#1},% - Opacite=\def\RAPPEQopac{#1} + Opacite=\def\RAPPEQopac{#1},% } \setKVdefault[RapporteurEquerreGeom]{% @@ -561,7 +576,7 @@ \pgfmathanglebetweenpoints{\pgfpointanchor{\RAPPEQposOrigin}{center}}{\pgfpointanchor{\tmppointdeux}{center}}% \edef\RAPPEQangle{\pgfmathresult}% }{}% - \begin{scope}[shift={(\RAPPEQposOrigin)},rotate=\RAPPEQangle,scale=\RAPPEQechelle,every node/.style={rotate=\RAPPEQangle}] + \begin{scope}[shift={(\RAPPEQposOrigin)},rotate=\RAPPEQangle,scale=\RAPPEQechelle,transform shape] %fond \ifboolKV[RapporteurEquerreGeom]{Fond} {% @@ -591,16 +606,16 @@ \ifboolKV[RapporteurEquerreGeom]{AfficheAngles} {% \foreach \i in {10,20,...,170} - {\draw[\RAPPEQcouleur] ({-\i}:{0.6125*\RAPPEQlargeur}) node[rotate={90-\i},scale=\fpeval{\RAPPEQlargeur/8*\RAPPEQechelle*\RAPPEQechangle},font=\tiny] {\i} ;} + {\draw[\RAPPEQcouleur] ({-\i}:{0.6125*\RAPPEQlargeur}) node[rotate={90-\i},scale=\fpeval{\RAPPEQlargeur/8*\RAPPEQechangle},font=\tiny] {\i} ;} %angles "extérieurs" \foreach \i in {10,20,...,170} - {\draw[\RAPPEQcouleur] ({-\i}:{0.6375*\RAPPEQlargeur}) node[rotate={90-\i},scale=\fpeval{\RAPPEQlargeur/8*\RAPPEQechelle*\RAPPEQechangle},font=\tiny] {\inteval{180-\i}} ;} + {\draw[\RAPPEQcouleur] ({-\i}:{0.6375*\RAPPEQlargeur}) node[rotate={90-\i},scale=\fpeval{\RAPPEQlargeur/8*\RAPPEQechangle},font=\tiny] {\inteval{180-\i}} ;} }% {}% \ifboolKV[RapporteurEquerreGeom]{AfficheValeurs} {% \foreach \i in {-1,0,1} - {\draw[\RAPPEQcouleur] ({\i},-0.375) node[scale=\fpeval{\RAPPEQechelle*\RAPPEQechangle},font=\tiny] {$\i$} ;} + {\draw[\RAPPEQcouleur] ({\i},-0.375) node[scale=\fpeval{\RAPPEQechangle},font=\tiny] {$\i$} ;} }% {}% %tracés intérieurs diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty index 08170653e8d..856c960262e 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/color-ltx.sty @@ -24,7 +24,7 @@ %% This file has the LPPL maintenance status "maintained". %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{color-ltx}[2024-05-23 v0.96i +\ProvidesPackage{color-ltx}[2024-09-02 v0.96k Standard LaTeX Color (patched for l3color, part of pdfmanagement-testphase, original version 2022/01/06 v1.3d) (DPC)] \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty index 95a0b0a6120..a735e6b8f92 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty @@ -19,8 +19,9 @@ % % for those people who are interested. \NeedsTeXFormat{LaTeX2e}[2020/10/01] -\ProvidesExplPackage{colorspace-patches-tmp-ltx}{2024-05-23}{0.96i} - {temporay patches to for the colorspace package to test pdfresource management ... UF} +\ProvidesExplPackage{colorspace-patches-tmp-ltx}{2024-09-02}{0.96k} + {temporary patches for the colorspace package to test pdfresource management ... UF} + % colorspace can define more models, that l3color can't yet handle. \cs_set_protected:Npn \expl@color@set@@nnn #1#2#3 diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def index 5f4fd80f487..6e140387604 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: hyperref-generic.dtx -\ProvidesFile{hgeneric-testphase.def}[2024-05-23 v0.96i % +\ProvidesFile{hgeneric-testphase.def}[2024-09-02 v0.96k % generic Hyperref driver for the LaTeX PDF management testphase bundle] \RequirePackage{etoolbox} %why? @@ -437,20 +437,27 @@ { \define@key{BKM}{color} { - \__hyp_color_set:ne {__hyp/tmpa}{#1} - \color_export:nVN - {__hyp/tmpa} - \g__hyp_bordercolormodel_str - \BKM@color + \tl_if_blank:nTF {#1} + { \cs_set_eq:NN\BKM@color\@empty } + { + \__hyp_color_set:ne {__hyp/tmpa}{#1} + \color_export:nVN + {__hyp/tmpa} + \g__hyp_bordercolormodel_str + \BKM@color + } } } -\legacy_if:nT { Hy@bookmarks } +\legacy_if:nTF { Hy@bookmarks } { \AddToHook{begindocument/before}[hyperref/bookmark] { \RequirePackage{bookmark} } } + { + \AddToHook{begindocument/before}[hyperref/bookmark]{} + } \legacy_if:nT {Hy@draft} { \PassOptionsToPackage{draft}{bookmark} diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def index 90eab781036..4ce335c9bad 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def @@ -20,7 +20,7 @@ %% %% File: l3backend-testphase.dtx \ProvidesExplFile - {l3backend-testphase-dvipdfmx.def}{2024-05-23}{} + {l3backend-testphase-dvipdfmx.def}{2024-09-02}{} {LaTeX~PDF~management~testphase~bundle~backend~support: dvipdfmx} \cs_generate_variant:Nn \__kernel_backend_literal:n { e } \cs_generate_variant:Nn \__pdf_backend:n { e } diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def index 3d6b1557ff4..221bea40993 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def @@ -20,7 +20,7 @@ %% %% File: l3backend-testphase.dtx \ProvidesExplFile - {l3backend-testphase-dvips.def}{2024-05-23}{} + {l3backend-testphase-dvips.def}{2024-09-02}{} {LaTeX~PDF~management~testphase~bundle~backend~support: dvips} \cs_generate_variant:Nn \__kernel_backend_postscript:n { e } \cs_generate_variant:Nn \__pdf_backend_pdfmark:n { e } diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def index b7a6718fc4e..bc25aa4f8f9 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def @@ -20,7 +20,7 @@ %% %% File: l3backend-testphase.dtx \ProvidesExplFile - {l3backend-testphase-dvisvgm.def}{2024-05-23}{} + {l3backend-testphase-dvisvgm.def}{2024-09-02}{} {LaTeX~PDF~management~testphase~bundle~backend~support: dvisvgm} \bool_if:NT \l__pdfmanagement_delayed_shipout_bool { diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def index e6a50bbf1f4..4795f4635c8 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def @@ -20,7 +20,7 @@ %% %% File: l3backend-testphase.dtx \ProvidesExplFile - {l3backend-testphase-luatex.def}{2024-05-23}{} + {l3backend-testphase-luatex.def}{2024-09-02}{} {LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (LuaTeX)} \cs_generate_variant:Nn \__kernel_backend_literal_page:n { e } \bool_if:NT \l__pdfmanagement_delayed_shipout_bool diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def index 0ba773707fd..394957e3e51 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def @@ -20,7 +20,7 @@ %% %% File: l3backend-testphase.dtx \ProvidesExplFile - {l3backend-testphase-pdftex.def}{2024-05-23}{} + {l3backend-testphase-pdftex.def}{2024-09-02}{} {LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (pdfTeX)} \cs_generate_variant:Nn \__kernel_backend_literal_page:n { e } \bool_if:NT \l__pdfmanagement_delayed_shipout_bool diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def index dd1bdb8cc0d..8b3f0c046c1 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def @@ -20,7 +20,7 @@ %% %% File: l3backend-testphase.dtx \ProvidesExplFile - {l3backend-testphase-xetex.def}{2024-05-23}{} + {l3backend-testphase-xetex.def}{2024-09-02}{} {LaTeX~PDF~management~testphase~bundle~backend~support: XeTeX} \cs_generate_variant:Nn \__kernel_backend_literal:n { e } \cs_generate_variant:Nn \__pdf_backend:n { e } diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty index 8309f4c507d..f3f4ea45e89 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty @@ -27,7 +27,7 @@ %% File: l3pdffield.dtx \NeedsTeXFormat{LaTeX2e} -\ProvidesExplPackage{l3pdffield-testphase}{2024-05-23}{0.96i}% +\ProvidesExplPackage{l3pdffield-testphase}{2024-09-02}{0.96k}% {form fields} \csname HyField@NeedAppearancesfalse\endcsname % suppress NeedAppearances \str_new:N \l__pdffield_tmpa_str diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty index 30be81ed8ec..73585ec66c8 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: pdfmanagement-firstaid.dtx -\ProvidesExplPackage{pdfmanagement-firstaid}{2024-05-23}{0.96i} +\ProvidesExplPackage{pdfmanagement-firstaid}{2024-09-02}{0.96k} {LaTeX PDF management testphase bundle / firstaid-patches} \clist_map_inline:nn diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx index 8f56ce40317..f250abee084 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx @@ -27,7 +27,7 @@ %% and all files in that bundle must be distributed together. %% %% File: pdfmanagement-testphase.dtx -\ProvidesExplFile{pdfmanagement-testphase.ltx}{2024-05-23}{0.96i} +\ProvidesExplFile{pdfmanagement-testphase.ltx}{2024-09-02}{0.96k} {PDF~management~code~(testphase)} \bool_new:N\l__pdfmanagement_delayed_shipout_bool \msg_new:nnn {pdfmanagement}{delayed-shipout} @@ -419,7 +419,7 @@ \pdfdict_if_exist:nTF { g__pdf_Core/#1 } { \cs_if_exist:cTF - { __pdfmanagement_handler/#1/?_gput:nn } %general, name independant handler + { __pdfmanagement_handler/#1/?_gput:nn } %general, name independent handler { \use:c {__pdfmanagement_handler/#1/?_gput:nn} {#2} {#3} } { \cs_if_exist:cTF @@ -455,7 +455,7 @@ \pdfdict_if_exist:nTF { g__pdf_Core/#1 } { \cs_if_exist:cTF - { __pdfmanagement_handler/#1/?_gremove:n } %general, name independant handler + { __pdfmanagement_handler/#1/?_gremove:n } %general, name independent handler { \use:c {__pdfmanagement_handler/#1/?_gremove:n} {#2} } { \cs_if_exist:cTF @@ -491,7 +491,7 @@ \cs_new_protected:Npn \__pdfmanagement_show:Nn #1#2 { \cs_if_exist:cTF - { __pdfmanagement_handler/#2/?_show: } %general, name independant handler + { __pdfmanagement_handler/#2/?_show: } %general, name independent handler { \use:c {__pdfmanagement_handler/#2/?_show:} } { \prop_if_exist:cTF { \__kernel_pdfdict_name:n { g__pdf_Core/#2 } } @@ -1414,6 +1414,8 @@ { \__pdf_backend_omit_info:n {1} } \pdfmeta_standard_verify:nF { no_CharSet } { \__pdf_backend_omit_charset:n {1} } + \pdfmeta_standard_verify:nF { omit_CID } + { \__pdf_backend_omit_cidset:n {1} } \pdfmeta_standard_verify:nnF { min_pdf_version } { \pdf_version: } { \msg_warning:nneee {pdf}{wrong-pdfversion} @@ -1461,7 +1463,10 @@ % %=============== % Rule 6.1.13-1 CosDocument, isOptionalContentPresent == false - ,Catalog_no_OCProperties = + ,Catalog_no_OCProperties = + % Rule 6.9-4 The AS key shall not appear in any optional content configuration dictionary. + % actually only starting with A-2 but doesn't harm here either + ,Catalog_OCProperties_no_AS= %=============== % Rule 6.6.1-1: PDAction, S == "GoTo" || S == "GoToR" || S == "Thread" % || S == "URI" || S == "Named" || S == "SubmitForm" @@ -1508,6 +1513,13 @@ { embed_content} \prop_gput:cnn { g__pdfmeta_standard_pdf/A-2B_prop }{max_pdf_version}{1.7} +\prop_gput:cnn + { g__pdfmeta_standard_pdf/A-2B_prop }{omit_CID}{} +\prop_gremove:cn + { g__pdfmeta_standard_pdf/A-2B_prop } + { Catalog_no_OCProperties } + + %A-2u ============== \prop_new:c { g__pdfmeta_standard_pdf/A-2U_prop } \prop_gset_eq:cc { g__pdfmeta_standard_pdf/A-2U_prop } @@ -1585,7 +1597,8 @@ { g__pdfmeta_standard_pdf/A-4_prop }{conformance} \prop_gremove:cn { g__pdfmeta_standard_pdf/A-4_prop }{max_pdf_version} - +\prop_gremove:cn + { g__pdfmeta_standard_pdf/A-4_prop }{Catalog_OCProperties_no_AS} \prop_new:c { g__pdfmeta_standard_pdf/A-4F_prop } \prop_gset_eq:cc { g__pdfmeta_standard_pdf/A-4F_prop } @@ -1808,6 +1821,15 @@ _pdfstandard / UA-1 .code:n = { \AddToDocumentProperties [document]{pdfstandard-UA}{{1}{}} + \AddToHook{begindocument/before} + { + \pdf_version_compare:NnF < {2.0} + { + \msg_warning:nneee + {pdf}{wrong-pdfversion} + {\pdf_version:}{high}{UA-1} + } + } }, _pdfstandard / UA-2 .code:n = { @@ -1818,6 +1840,12 @@ { \__pdfmeta_xmp_wtpdf_accessibility_declaration: \__pdfmeta_xmp_wtpdf_reuse_declaration: + \pdf_version_compare:NnT < {2.0} + { + \msg_warning:nneee + {pdf}{wrong-pdfversion} + {\pdf_version:}{low}{UA-2} + } } }, xmp .choice:, @@ -1945,7 +1973,7 @@ \tl_new:N \l__pdfmeta_xmp_currentdate_tl \seq_new:N \l__pdfmeta_xmp_currentdate_seq \cs_new_protected:Npn \__pdfmeta_xmp_date_get:nNN #1 #2 #3 - %#1 property, #2 tl var with PDF date, #3 seq for splitted date + %#1 property, #2 tl var with PDF date, #3 seq for split date { \tl_set:Ne #2 { \GetDocumentProperties{#1} } \tl_if_blank:VTF #2 @@ -2275,6 +2303,12 @@ {Integer} {internal} {Year~of~standard} +\__pdfmeta_xmp_property_new:nnnnn + {pdfaid} + {rev} + {Integer} + {internal} + {Revision~year~of~standard} \__pdfmeta_xmp_schema_new:nnn {PDF/UA~Universal~Accessibility~Schema} {pdfuaid} diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty index 5eb909751ee..dface342822 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: pdfmanagement-testphase.dtx -\ProvidesExplPackage{pdfmanagement-testphase}{2024-05-23}{0.96i} +\ProvidesExplPackage{pdfmanagement-testphase}{2024-09-02}{0.96k} {LaTeX PDF management testphase bundle} \providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} \IfFormatAtLeastTF{2020-10-01}{}{ diff --git a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty index cc220aa313e..49059834a1d 100644 --- a/Master/texmf-dist/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty +++ b/Master/texmf-dist/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty @@ -1,6 +1,6 @@ %% LaTeX2e file `xcolor-patches-tmp-ltx.sty' %% -\ProvidesPackage{xcolor-patches-tmp-ltx}[2024-05-23 v0.96i patch xcolor for l3color] +\ProvidesPackage{xcolor-patches-tmp-ltx}[2024-09-02 v0.96k patch xcolor for l3color] \@ifundefined{color_set:nn}{\RequirePackage{l3color}}{} \ExplSyntaxOn diff --git a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty index 62890e82891..2c9076f90db 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty +++ b/Master/texmf-dist/tex/latex/pdfpages/pdfpages.sty @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.6a} +\def\AM@fileversion{v0.6b} \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END} \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}} \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}} -\AM@Git@Date@process$Date: 2024-05-29 13:40:24 +0200 $ -\AM@Git@SHA@process$SHA-1: 8248eea896cba74c6d712bddc3e4ae8d4c403081 $ +\AM@Git@Date@process$Date: 2024-08-20 15:16:01 +0200 $ +\AM@Git@SHA@process$SHA-1: 8cc873330fc0863d9d32e017e64c98d9f04f579d $ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{pdfpages} [\AM@Git@Date\space\AM@fileversion\space diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def index 6f36c0a652b..49bc11c8c41 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvipdfmx.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.6a} +\def\AM@fileversion{v0.6b} \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END} \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}} \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}} -\AM@Git@Date@process$Date: 2024-05-29 13:40:24 +0200 $ -\AM@Git@SHA@process$SHA-1: 8248eea896cba74c6d712bddc3e4ae8d4c403081 $ +\AM@Git@Date@process$Date: 2024-08-20 15:16:01 +0200 $ +\AM@Git@SHA@process$SHA-1: 8cc873330fc0863d9d32e017e64c98d9f04f579d $ \ProvidesFile{ppdvipdfmx.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for dvipdfmx (AM)] diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def index b44308c0fe7..32569a0ef4d 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppdvips.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.6a} +\def\AM@fileversion{v0.6b} \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END} \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}} \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}} -\AM@Git@Date@process$Date: 2024-05-29 13:40:24 +0200 $ -\AM@Git@SHA@process$SHA-1: 8248eea896cba74c6d712bddc3e4ae8d4c403081 $ +\AM@Git@Date@process$Date: 2024-08-20 15:16:01 +0200 $ +\AM@Git@SHA@process$SHA-1: 8cc873330fc0863d9d32e017e64c98d9f04f579d $ \ProvidesFile{ppdvips.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for dvips (AM)] diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def index d885101ed45..5047ce749f2 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppluatex.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.6a} +\def\AM@fileversion{v0.6b} \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END} \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}} \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}} -\AM@Git@Date@process$Date: 2024-05-29 13:40:24 +0200 $ -\AM@Git@SHA@process$SHA-1: 8248eea896cba74c6d712bddc3e4ae8d4c403081 $ +\AM@Git@Date@process$Date: 2024-08-20 15:16:01 +0200 $ +\AM@Git@SHA@process$SHA-1: 8cc873330fc0863d9d32e017e64c98d9f04f579d $ \ProvidesFile{ppluatex.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for LuaTeX (AM)] diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def index 153a63b3a87..fd4175617f2 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppnull.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppnull.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.6a} +\def\AM@fileversion{v0.6b} \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END} \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}} \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}} -\AM@Git@Date@process$Date: 2024-05-29 13:40:24 +0200 $ -\AM@Git@SHA@process$SHA-1: 8248eea896cba74c6d712bddc3e4ae8d4c403081 $ +\AM@Git@Date@process$Date: 2024-08-20 15:16:01 +0200 $ +\AM@Git@SHA@process$SHA-1: 8cc873330fc0863d9d32e017e64c98d9f04f579d $ \ProvidesFile{ppnull.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages dummy driver (AM)] diff --git a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def index 442aae7e70e..67d1af500b6 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/pppdftex.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.6a} +\def\AM@fileversion{v0.6b} \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END} \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}} \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}} -\AM@Git@Date@process$Date: 2024-05-29 13:40:24 +0200 $ -\AM@Git@SHA@process$SHA-1: 8248eea896cba74c6d712bddc3e4ae8d4c403081 $ +\AM@Git@Date@process$Date: 2024-08-20 15:16:01 +0200 $ +\AM@Git@SHA@process$SHA-1: 8cc873330fc0863d9d32e017e64c98d9f04f579d $ \ProvidesFile{pppdftex.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for pdfTeX (AM)] diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def index d5a2a88c130..a1a0fb7e56a 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppvtex.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.6a} +\def\AM@fileversion{v0.6b} \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END} \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}} \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}} -\AM@Git@Date@process$Date: 2024-05-29 13:40:24 +0200 $ -\AM@Git@SHA@process$SHA-1: 8248eea896cba74c6d712bddc3e4ae8d4c403081 $ +\AM@Git@Date@process$Date: 2024-08-20 15:16:01 +0200 $ +\AM@Git@SHA@process$SHA-1: 8cc873330fc0863d9d32e017e64c98d9f04f579d $ \ProvidesFile{ppvtex.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for VTeX (AM)] diff --git a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def index b1bd4a1f989..90f8a7831c7 100644 --- a/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def +++ b/Master/texmf-dist/tex/latex/pdfpages/ppxetex.def @@ -24,12 +24,12 @@ %% Please send error reports and suggestions for improvements to %% Andreas MATTHIAS <andreas.matthias@gmail.com>. %% -\def\AM@fileversion{v0.6a} +\def\AM@fileversion{v0.6b} \def\AM@Git@Date@process$#1: #2 #3${\AM@Git@Date@process@i#2\END} \def\AM@Git@Date@process@i#1-#2-#3\END{\def\AM@Git@Date{#1/#2/#3}} \def\AM@Git@SHA@process$#1: #2${\def\AM@Git@SHA{#2}} -\AM@Git@Date@process$Date: 2024-05-29 13:40:24 +0200 $ -\AM@Git@SHA@process$SHA-1: 8248eea896cba74c6d712bddc3e4ae8d4c403081 $ +\AM@Git@Date@process$Date: 2024-08-20 15:16:01 +0200 $ +\AM@Git@SHA@process$SHA-1: 8cc873330fc0863d9d32e017e64c98d9f04f579d $ \ProvidesFile{ppxetex.def} [\AM@Git@Date\space\AM@fileversion\space Pdfpages driver for XeTeX (AM)] @@ -47,10 +47,10 @@ } \def\AM@getpagecount{% \expandafter\filename@parse\expandafter{\AM@currentdocname}% - \edef\type@ext{% - \noexpand\lowercase{% - \noexpand\def\noexpand\type@ext{.\filename@ext}}}% - \type@ext + \begingroup\edef\x{% + \lowercase{\endgroup + \def\noexpand\type@ext{\expandafter\scantokens\expandafter{\filename@ext\noexpand}}}}% + \x \ifx\type@ext\AM@pdf@ext \ifdefined\subfix \let\AM@import@path\@empty @@ -68,7 +68,7 @@ \def\AM@pagecount{1}% \fi } -\def\AM@pdf@ext{.pdf} +\def\AM@pdf@ext{pdf} \begingroup \def\gobble@nil#1\@nil{} \ifnum\XeTeXversion=0 diff --git a/Master/texmf-dist/tex/latex/pgf-periodictable/pgf-PeriodicTable.sty b/Master/texmf-dist/tex/latex/pgf-periodictable/pgf-PeriodicTable.sty index d3e8d4cbe17..69f65ee6027 100644 --- a/Master/texmf-dist/tex/latex/pgf-periodictable/pgf-PeriodicTable.sty +++ b/Master/texmf-dist/tex/latex/pgf-periodictable/pgf-PeriodicTable.sty @@ -1,4 +1,6 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% Hugo Gomes @ 07/08/2024 v2.1.3 +% Hugo Gomes @ 01/08/2024 v2.1.2 % Hugo Gomes @ 07/07/2024 v2.1.1 % Hugo Gomes @ 03/04/2024 v2.1.0a % Hugo Gomes @ 14/02/2024 v2.1.0 @@ -8,7 +10,7 @@ % Hugo Gomes @ 10/10/2022 v1.0.0 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e}% -\ProvidesPackage{pgf-PeriodicTable}[07/07/2024 pgf-PeriodicTable v2.1.1]%% +\ProvidesPackage{pgf-PeriodicTable}[07/08/2024 pgf-PeriodicTable v2.1.3]%% \RequirePackage{tikz}% \usetikzlibrary{fadings}% \tikzfading[name=aumentax, left color=transparent!80, right color=transparent!1]% @@ -17,11 +19,19 @@ \tikzfading[name=diminuiy, bottom color=transparent!80, top color=transparent!1]% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % check the engine and load font packages -\ifx\pdfliteral\undefined\relax% XeLaTeX or LuaLaTeX -\RequirePackage{fontspec}[2020/02/03]\edef\pgfPT@fontspec{1}% -\else% pdfLaTeX -\RequirePackage[T1]{fontenc}\edef\pgfPT@fontspec{0}% -\fi% +% changed in v2.1.3 +% pdfLaTeX -------------------------------------------------- +\ifx\pdftexversion\undefined\else% +\RequirePackage[T1]{fontenc}\edef\pgfPT@fontspec{0}\edef\pgfPT@engine{0}% +\fi% ----------------------------------------------------------- +% LuaLaTeX -------------------------------------------------- +\ifx\directlua\undefined\else% +\RequirePackage{fontspec}[2020/02/03]\edef\pgfPT@fontspec{1}\edef\pgfPT@engine{1}% +\fi% ----------------------------------------------------------- +% XeLaTeX --------------------------------------------------- +\ifx\XeTeXrevision\undefined\else% +\RequirePackage{fontspec}[2020/02/03]\edef\pgfPT@fontspec{1}\edef\pgfPT@engine{2}% +\fi% ----------------------------------------------------------- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % ifs to user language and list of user translations available \newif\ifpgfPT@user@lang\pgfPT@user@langfalse% @@ -3007,7 +3017,9 @@ rectangle \fi% \pgfPT@element@count=118 \fi\fi% min=1 & max 118 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\@pgfPT@resetlayers% Restoring pgf layers to those used in the document +% corrected in v2.1.2: \@pgfPT@resetlayers -> \pgfsetlayers{\@pgfPT@resetlayers} +% ... Warning: Missing character: There is no m (U+006D) in font nullfont! ... +\pgfsetlayers{\@pgfPT@resetlayers}% Restoring pgf layers to those used in the document \fontseries{\seriesdefault}\fontshape{\shapedefault}\fontfamily{\familydefault}\selectfont% Restoring the font settings to normal mode in the document }% end tikz }% @@ -3082,15 +3094,14 @@ rectangle % renders text via pdfliteral: ------------- % #1 outline width width #2 txt #3 #4 #5 rgb stroke color #6 #7 #8 rgb fill color ----------- % #9 txt render mode (0 - fill 1 - stroke 2 - fill then stroke --------- -\ifx\pdfliteral\undefined\relax% -\ifx\pdfextension\undefined\relax% XeLaTeX -\def\pgfPT@lt[#1](#2)(#3,#4,#5)(#6,#7,#8)(#9){\special{pdf:literal direct #1 w #3 #4 #5 RG #6 #7 #8 rg #9 Tr}#2\special{pdf:literal direct 0 0 0 rg 1 w 0 Tr}}% -\else% LuaLaTeX -\protected\def\pdfliteral{\pdfextension literal} +% changed in v2.1.3 +\ifcase\pgfPT@engine\relax% pdfLaTeX \def\pgfPT@lt[#1](#2)(#3,#4,#5)(#6,#7,#8)(#9){\pdfliteral direct {#1 w #3 #4 #5 RG #6 #7 #8 rg #9 Tr}{#2}\pdfliteral direct {0 0 0 rg 1 w 0 Tr}}% -\fi% -\else% pdfLaTeX +\or% LuaLaTeX +\protected\def\pdfliteral{\pdfextension literal}% \def\pgfPT@lt[#1](#2)(#3,#4,#5)(#6,#7,#8)(#9){\pdfliteral direct {#1 w #3 #4 #5 RG #6 #7 #8 rg #9 Tr}{#2}\pdfliteral direct {0 0 0 rg 1 w 0 Tr}}% +\or% XeLaTeX +\def\pgfPT@lt[#1](#2)(#3,#4,#5)(#6,#7,#8)(#9){\special{pdf:literal direct #1 w #3 #4 #5 RG #6 #7 #8 rg #9 Tr}#2\special{pdf:literal direct 0 0 0 rg 1 w 0 Tr}}% \fi% % END !! \pgfPT@lt -------------------------------------------------------------------------------- % @@ -3101,9 +3112,10 @@ rectangle % auxiliary macros to set the rgb components of one color --------------------------------------- % with use of \extractcolorspecs from xcolor package --------------------------------------------- % each component is stored in \pgfPT@r, g or b & s or f ------------------------------------- -\def\pgfPT@extract@rgb@stroke#1{\extractcolorspecs{#1}{\pgfPTcolmodel}{\pgfPTcolinfo}\expandafter\pgfPT@set@rgb@stroke\pgfPTcolinfo\relax}% +% v3.1.3: added conversion of the color to rgb :: \colorlet{#1}[rgb]{#1} +\def\pgfPT@extract@rgb@stroke#1{\colorlet{#1}[rgb]{#1}\extractcolorspecs{#1}{\pgfPTcolmodel}{\pgfPTcolinfo}\expandafter\pgfPT@set@rgb@stroke\pgfPTcolinfo\relax}% \def\pgfPT@set@rgb@stroke#1,#2,#3\relax{\def\pgfPT@rs{#1}\def\pgfPT@gs{#2}\def\pgfPT@bs{#3}}% -\def\pgfPT@extract@rgb@fill#1{\extractcolorspecs{#1}{\pgfPTcolmodel}{\pgfPTcolinfo}\expandafter\pgfPT@set@rgb@fill\pgfPTcolinfo\relax}% +\def\pgfPT@extract@rgb@fill#1{\colorlet{#1}[rgb]{#1}\extractcolorspecs{#1}{\pgfPTcolmodel}{\pgfPTcolinfo}\expandafter\pgfPT@set@rgb@fill\pgfPTcolinfo\relax}% \def\pgfPT@set@rgb@fill#1,#2,#3\relax{\def\pgfPT@rf{#1}\def\pgfPT@gf{#2}\def\pgfPT@bf{#3}}% % END !! \pgfPT@color macros ------------------------------------------------------------------ % diff --git a/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.drawing.keys.tex b/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.drawing.keys.tex index 8406d1a9a7d..140577bcce1 100644 --- a/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.drawing.keys.tex +++ b/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.drawing.keys.tex @@ -376,7 +376,7 @@ name color/.store in=\pgfPTnamecolor,% name color/.default=black,% name font/.get=\pgfPTnamefont,% name font/.store in=\pgfPTnamefont,% -name font/.default=\fontseries{l}\selectfont\tiny,% +name font/.default=\tiny,% \fontseries{l}\selectfont (removed @ v2.1.2) name align/.get=\pgfPTnamealign,% new v1.0.0 name align/.store in=\pgfPTnamealign,% left|center|right name align/.default=center% diff --git a/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.names.tex b/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.names.tex index 2c321dcd349..d4135f61b98 100644 --- a/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.names.tex +++ b/Master/texmf-dist/tex/latex/pgf-periodictable/pgfPT.names.tex @@ -27,7 +27,7 @@ \def\pgfPT@nomes@iii{l\'{i}tio/pt,lithium/en,lithium/fr,Lithium/de,litio/it,litio/es,l\'{i}tio/br,\pgfPT@user@CSname@Li/user}% \def\pgfPT@nomes@iv{ber\'{i}lio/pt,beryllium/en,b\'{e}ryllium/fr,Beryllium/de,berillio/it,berilio/es,ber\'{i}lio/br,\pgfPT@user@CSname@Be/user}% \def\pgfPT@nomes@v{boro/pt,boron/en,bore/fr,Bor/de,boro/it,boro/es,boro/br,\pgfPT@user@CSname@B/user}% -\def\pgfPT@nomes@vi{carbono/pt,carbon/en,carbone/fr,Kohlenstoff/de,carbonio/it,carb\'{o}n/es,carbono/br,\pgfPT@user@CSname@C/user}% +\def\pgfPT@nomes@vi{carbono/pt,carbon/en,carbone/fr,Kohlenstoff/de,carbonio/it,carbono/es,carbono/br,\pgfPT@user@CSname@C/user}% \def\pgfPT@nomes@vii{azoto/pt,nitrogen/en,azote/fr,Stickstoff/de,azoto/it,nitr\'{o}geno/es,nitrog\^{e}nio/br,\pgfPT@user@CSname@N/user}% \def\pgfPT@nomes@viii{oxig\'{e}nio/pt,oxygen/en,oxyg\`{e}ne/fr,Sauerstoff/de,ossigeno/it,ox\'{i}geno/es,oxig\^{e}nio/br,\pgfPT@user@CSname@O/user}% \def\pgfPT@nomes@ix{fl\'{u}or/pt,fluorine/en,fluor/fr,Fluor/de,fluoro/it,fl\'{u}or/es,fl\'{u}or/br,\pgfPT@user@CSname@F/user}% @@ -47,7 +47,7 @@ \def\pgfPT@nomes@xxiii{van\'{a}dio/pt,vanadium/en,vanadium/fr,Vanadium/de,vanadio/it,vanadio/es,van\'{a}dio/br,\pgfPT@user@CSname@V/user}% \def\pgfPT@nomes@xxiv{cr\'{o}mio/pt,chromium/en,chrome/fr,Chrom/de,cromo/it,cromo/es,cr\^{o}mio/br,\pgfPT@user@CSname@Cr/user}% \def\pgfPT@nomes@xxv{mangan\'{e}sio/pt,manganese/en,mangan\`{e}se/fr,Mangan/de,manganese/it,manganeso/es,mangan\^{e}s/br,\pgfPT@user@CSname@Mn/user}% -\def\pgfPT@nomes@xxvi{ferro/pt,iron/en,fer/fr,Eisen/de,ferro/it,planchar/es,ferro/br,\pgfPT@user@CSname@Fe/user}% +\def\pgfPT@nomes@xxvi{ferro/pt,iron/en,fer/fr,Eisen/de,ferro/it,hierro/es,ferro/br,\pgfPT@user@CSname@Fe/user}% \def\pgfPT@nomes@xxvii{cobalto/pt,cobalt/en,cobalt/fr,Kobalt/de,cobalto/it,cobalto/es,cobalto/br,\pgfPT@user@CSname@Co/user}% \def\pgfPT@nomes@xxviii{n\'{i}quel/pt,nickel/en,nickel/fr,Nickel/de,nichel/it,n\'{i}quel/es,n\'{i}quel/br,\pgfPT@user@CSname@Ni/user}% \def\pgfPT@nomes@xxix{cobre/pt,copper/en,cuivre/fr,Kupfer/de,rame/it,cobre/es,cobre/br,\pgfPT@user@CSname@Cu/user}% @@ -82,7 +82,7 @@ \def\pgfPT@nomes@lviii{c\'{e}rio/pt,cerium/en,c\'{e}rium/fr,Cer/de,cerio/it,cerio/es,c\'{e}rio/br,\pgfPT@user@CSname@Ce/user}% \def\pgfPT@nomes@lix{praseod\'{i}mio/pt,praseodymium/en,pras\'{e}odyme/fr,Praseodym/de,praseodimio/it,praseodimio/es,praseod\'{i}mio/br,\pgfPT@user@CSname@Pr/user}% \def\pgfPT@nomes@lx{neod\'{i}mio/pt,neodymium/en,n\'{e}odyme/fr,Neodym/de,neodimio/it,neodimio/es,neod\'{i}mio/br,\pgfPT@user@CSname@Nd/user}% -\def\pgfPT@nomes@lxi{prom\'{e}cio/pt,promethium/en,prom\'{e}thium/fr,Promethium/de,prometeo/it,prometeo/es,prom\'{e}cio/br,\pgfPT@user@CSname@Pm/user}% +\def\pgfPT@nomes@lxi{prom\'{e}cio/pt,promethium/en,prom\'{e}thium/fr,Promethium/de,prometeo/it,prometio/es,prom\'{e}cio/br,\pgfPT@user@CSname@Pm/user}% \def\pgfPT@nomes@lxii{sam\'{a}rio/pt,samarium/en,samarium/fr,Samarium/de,samario/it,samario/es,sam\'{a}rio/br,\pgfPT@user@CSname@Sm/user}% \def\pgfPT@nomes@lxiii{eur\'{o}pio/pt,europium/en,europium/fr,Europium/de,europium/it,europio/es,eur\'{o}pio/br,\pgfPT@user@CSname@Eu/user}% \def\pgfPT@nomes@lxiv{gadol\'{i}nio/pt,gadolinium/en,gadolinium/fr,Gadolinium/de,gadolinio/it,gadolinio/es,gadol\'{i}nio/br,\pgfPT@user@CSname@Gd/user}% @@ -124,20 +124,20 @@ \def\pgfPT@nomes@c{f\'{e}rmio/pt,fermium/en,fermium/fr,Rermium/de,fermium/it,fermio/es,f\'{e}rmio/br,\pgfPT@user@CSname@Fm/user}% \def\pgfPT@nomes@ci{mendel\'{e}vio/pt,mendelevium/en,mendelevium/fr,Mendelevium/de,mendelevio/it,mendelevio/es,mendel\'{e}vio/br,\pgfPT@user@CSname@Md/user}% \def\pgfPT@nomes@cii{nob\'{e}lio/pt,nobelium/en,nobelium/fr,Nobelium/de,nobelium/it,nobelio/es,nob\'{e}lio/br,\pgfPT@user@CSname@No/user}% -\def\pgfPT@nomes@ciii{laur\^{e}ncio/pt,lawrencium/en,lawrencium/fr,Lawrencium/de,laurenzio/it,lawrencium/es,laur\^{e}ncio/br,\pgfPT@user@CSname@Lr/user}% +\def\pgfPT@nomes@ciii{laur\^{e}ncio/pt,lawrencium/en,lawrencium/fr,Lawrencium/de,laurenzio/it,lawrencio/es,laur\^{e}ncio/br,\pgfPT@user@CSname@Lr/user}% \def\pgfPT@nomes@civ{rutherf\'{o}rdio/pt,rutherfordium/en,rutherfordium/fr,Rutherfordium/de,rutherfordium/it,rutherfordio/es,rutherf\'{o}rdio/br,\pgfPT@user@CSname@Rf/user}% -\def\pgfPT@nomes@cv{d\'{u}bnio/pt,dubnium/en,dubnium/fr,Dubnium/de,dubnio/it,dubnium/es,d\'{u}bnio/br,\pgfPT@user@CSname@Db/user}% +\def\pgfPT@nomes@cv{d\'{u}bnio/pt,dubnium/en,dubnium/fr,Dubnium/de,dubnio/it,dubnio/es,d\'{u}bnio/br,\pgfPT@user@CSname@Db/user}% \def\pgfPT@nomes@cvi{seab\'{o}rgio/pt,seaborgium/en,seaborgium/fr,Seaborgium/de,seaborgio/it,seaborgio/es,seab\'{o}rgio/br,\pgfPT@user@CSname@Sg/user}% -\def\pgfPT@nomes@cvii{b\'{o}rio/pt,bohrium/en,bohrium/fr,Bohrium/de,bohrio/it,bohrium/es,b\'{o}hrio/br,\pgfPT@user@CSname@Bh/user}% -\def\pgfPT@nomes@cviii{h\'{a}ssio/pt,hassium/en,hassium/fr,Hassium/de,hassio/it,hassium/es,h\'{a}ssio/br,\pgfPT@user@CSname@Hs/user}% +\def\pgfPT@nomes@cvii{b\'{o}rio/pt,bohrium/en,bohrium/fr,Bohrium/de,bohrio/it,bohrio/es,b\'{o}hrio/br,\pgfPT@user@CSname@Bh/user}% +\def\pgfPT@nomes@cviii{h\'{a}ssio/pt,hassium/en,hassium/fr,Hassium/de,hassio/it,hasio/es,h\'{a}ssio/br,\pgfPT@user@CSname@Hs/user}% \def\pgfPT@nomes@cix{meitn\'{e}rio/pt,meitnerium/en,meitnerium/fr,Meitnerium/de,meitnerio/it,meitnerio/es,meitn\'{e}rio/br,\pgfPT@user@CSname@Mt/user}% -\def\pgfPT@nomes@cx{darmst\'{a}dio/pt,darmstadtium/en,darmstadtium/fr,Darmstadtium/de,darmstadtium/it,darmstadtium/es,darmst\'{a}dtio/br,\pgfPT@user@CSname@Ds/user}% +\def\pgfPT@nomes@cx{darmst\'{a}dio/pt,darmstadtium/en,darmstadtium/fr,Darmstadtium/de,darmstadtium/it,darmstatio/es,darmst\'{a}dtio/br,\pgfPT@user@CSname@Ds/user}% \def\pgfPT@nomes@cxi{roentg\'{e}nio/pt,roentgenium/en,roentgenium/fr,R\"{o}ntgenium/de,roentgenio/it,roentgenio/es,roentg\^{e}nio/br,\pgfPT@user@CSname@Rg/user}% \def\pgfPT@nomes@cxii{copern\'{i}cio/pt,copernicium/en,copernicium/fr,Copernicium/de,copernicium/it,copernicio/es,copern\'{i}cio/br,\pgfPT@user@CSname@Cn/user}% \def\pgfPT@nomes@cxiii{nip\'{o}nio/pt,nihonium/en,nihonium/fr,Nihonium/de,nihonium/it,nihonio/es,nip\^{o}nio/br,\pgfPT@user@CSname@Nh/user}% \def\pgfPT@nomes@cxiv{fler\'{o}vio/pt,flerovium/en,flerovium/fr,Flerovium/de,flerovio/it,flerovio/es,fler\'{o}vio/br,\pgfPT@user@CSname@Fl/user}% \def\pgfPT@nomes@cxv{mosc\'{o}vio/pt,moscovium/en,moscovium/fr,Moscovium/de,moscovium/it,moscovio/es,mosc\'{o}vio/br,\pgfPT@user@CSname@Mc/user}% -\def\pgfPT@nomes@cxvi{liverm\'{o}rio/pt,livermorium/en,livermorium/fr,Livermorium/de,livermorio/it,livermorium/es,liverm\'{o}rio/br,\pgfPT@user@CSname@Lv/user}% +\def\pgfPT@nomes@cxvi{liverm\'{o}rio/pt,livermorium/en,livermorium/fr,Livermorium/de,livermorio/it,livermorio/es,liverm\'{o}rio/br,\pgfPT@user@CSname@Lv/user}% \def\pgfPT@nomes@cxvii{tenesso/pt,tennessine/en,tennessine/fr,Tenness/de,tennessine/it,teneso/es,tenesso/br,\pgfPT@user@CSname@Ts/user}% \def\pgfPT@nomes@cxviii{ogan\'{e}sson/pt,oganesson/en,oganesson/fr,Oganesson/de,oganesson/it,oganes\'{o}n/es,oganess\^{o}nio/br,\pgfPT@user@CSname@Og/user}% \endinput% diff --git a/Master/texmf-dist/tex/latex/pgfornament/pgfornament.sty b/Master/texmf-dist/tex/latex/pgfornament/pgfornament.sty index 27406e8bbf1..fad27cbb742 100644 --- a/Master/texmf-dist/tex/latex/pgfornament/pgfornament.sty +++ b/Master/texmf-dist/tex/latex/pgfornament/pgfornament.sty @@ -17,7 +17,7 @@ % Inspired from psvectorian P Fradin H Voss \NeedsTeXFormat{LaTeX2e} \RequirePackage{tikz,pgfopts} -\ProvidesPackage{pgfornament}[2020/05/26 v1.2 vector ornaments] +\ProvidesPackage{pgfornament}[2024/08/14 v1.3 vector ornaments] \gdef\pgfOrnamentsObject{pgflibraryvectorian.code.tex} \gdef\OrnamentsFamily{vectorian} \pgfkeys{% @@ -138,7 +138,7 @@ baseline={([yshift=\pgfornamentydelta]current bounding box.\pgfornamentanchor)}, \pgftransformscale{\pgfornamentscale}% \pgf@@ornament{#2}% \end{tikzpicture}% -\tikzset{pgfornamentstyle/.style={cm={1,0,0,1,(0,0)}}} +\tikzset{pgfornamentstyle/.style={cm={1,0,0,1,(0,0)}}}% }% end pgfornament \gdef\ornamenttopos{.5} @@ -180,8 +180,8 @@ baseline={([yshift=\pgfornamentydelta]current bounding box.\pgfornamentanchor)}, \pgfextractx{\pgf@x}{\pgfpointanchor{#2}{#3 west}} \pgf@xb=\pgf@x \advance\pgf@xb by -\pgf@xa -\node[inner sep=0pt] at ($(#1.#3 east)!.5!(#2.#3 west)$) {\pgfornament[width=\pgf@xb]{#4}} ; -} +\node[inner sep=0pt] at ($(#1.#3 east)!.5!(#2.#3 west)$) {\pgfornament[width=\pgf@xb]{#4}}; +}% \def\pgfornamentvline#1#2#3#4{% \pgfextracty{\pgf@y}{\pgfpointanchor{#1}{south #3}} \pgf@ya=\pgf@y @@ -203,7 +203,7 @@ baseline={([yshift=\pgfornamentydelta]current bounding box.\pgfornamentanchor)}, \pgfmathsetmacro{#1}{atan2(\pgf@x,\pgf@y)}% }% \makeatother -\newcommand{\resetpgfornamentstyle}{\tikzset{pgfornamentstyle/.style={}}} +\newcommand{\resetpgfornamentstyle}{\tikzset{pgfornamentstyle/.style={}}}% % 2020 Changing vector objects \def\newpgfornamentfamily#1{% @@ -219,11 +219,10 @@ baseline={([yshift=\pgfornamentydelta]current bounding box.\pgfornamentanchor)}, /ornamentline/.search also={/tikz}} \def\pgfornamentline{\pgfutil@ifnextchar[{\pgf@ornamentline}{\pgf@ornamentline[]}}% \def\pgf@ornamentline[#1]#2#3#4#5{% - \pgfqkeys{/ornamentline}{#1}% \pgfmathsetmacro\nbo{#4} \path (#2) -- (#3) foreach \i in {0,...,\nbo} {coordinate[pos=\i/\nbo] (p\i)} [color=\ornamentcolor] foreach \i [count=\j] in {0,...,\number\numexpr\nbo-1} { (p\i) to [ornament=#5] (p\j)}; -} +}% \makeatother \endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/pgfplotsthemebeamer/pgfplotsthemebeamer.sty b/Master/texmf-dist/tex/latex/pgfplotsthemebeamer/pgfplotsthemebeamer.sty index a47e1f5e97e..23006e89c57 100644 --- a/Master/texmf-dist/tex/latex/pgfplotsthemebeamer/pgfplotsthemebeamer.sty +++ b/Master/texmf-dist/tex/latex/pgfplotsthemebeamer/pgfplotsthemebeamer.sty @@ -12,22 +12,13 @@ % See http://www.latex-project.org/lppl.txt % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesPackage{pgfplotsthemebeamer}[2024/07/25 version v0.1 PGFplots colours based the colours of the current beamer theme] +\ProvidesPackage{pgfplotsthemebeamer}[2024/08/02 version v0.2 PGFplots colours based the colours of the current beamer theme] % error if used with a class other than beamer \IfClassLoadedF{beamer}{% \PackageError{pgfplotsthemebeamer}{This pgfplots theme needs to be used in conjunction with the beamer class}{} } -% process package options -\RequirePackage{pgfopts} -\newif\ifpgfplotsthemebeamer@all -\pgfkeys{ - pgfplotsthemebeamer/.cd , - all/.code = \pgfplotsthemebeamer@alltrue, -} -\ProcessPgfOptions{/pgfplotsthemebeamer} - % setting up colours \RequirePackage{pgfplots} \pgfplotsset{ @@ -40,6 +31,7 @@ } % making beamercolors default if package is loaded with `all` option -\ifpgfplotsthemebeamer@all +\DeclareOption{all}{ \pgfplotsset{beamercolors} -\fi +} +\ProcessOptions\relax diff --git a/Master/texmf-dist/tex/latex/polyomino/polyomino.sty b/Master/texmf-dist/tex/latex/polyomino/polyomino.sty new file mode 100644 index 00000000000..7a855901188 --- /dev/null +++ b/Master/texmf-dist/tex/latex/polyomino/polyomino.sty @@ -0,0 +1,286 @@ +%% polyomino.sty +%% Copyright 2024 Matthias Floré +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3c +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is Matthias Floré. +% +% This work consists of the files polyomino.pdf, polyomino.sty, +% polyomino.tex and README.md. +\NeedsTeXFormat{LaTeX2e} +\RequirePackage{tikz} +\ProvidesExplPackage{polyomino}{2024/08/01}{1.0}{Polyominoes using TikZ and LaTeX3} + +%%> \subsection{Variables and variants} + +\bool_new:N \l__polyomino_grid_bool +\bool_new:N \l__polyomino_pic_bool + +\int_new:N \l__polyomino_col_int +\int_new:N \l__polyomino_dir_int +\int_new:N \l__polyomino_max_int +\int_new:N \l__polyomino_row_int +\int_new:N \l__polyomino_x_int +\int_new:N \l__polyomino_y_int + +\seq_new:N \l__polyomino_add_seq +\seq_new:N \l__polyomino_cols_seq + +\tl_new:N \l__polyomino_path_tl +\tl_new:N \l__polyomino_pic_tl + +\cs_generate_variant:Nn \tl_map_inline:nn { en } + +%%> \subsection{Pgfkeys} + +\pgfkeys + { + / polyomino /. is~family , + / polyomino /. search~also = / polyomino / p_2 , + / polyomino , + at /. initial = { ( 0 , 0 ) } , + empty~cell /. initial = . , + grid /. code = \bool_set:Nn \l__polyomino_grid_bool { \cs:w c_#1_bool \cs_end: } , + grid /. default = true , + grid = false , + grid~style /. style = { grid_style /. style = {#1} } , + grid_style /. style = {} , + row~sep /. initial = { , } , + } + +\pgfkeys + {%a separate key family so that the second argument of the key p only accepts keys which apply to a separate polyomino + / polyomino / p_2 /. is~family , + / polyomino / p_2 , + connected /. code = \bool_set_false:N \l__polyomino_pic_bool , + connected /. value~forbidden , + discrete /. code = \bool_set_true:N \l__polyomino_pic_bool , + discrete /. value~forbidden , + p /. style~2~args = { #1__style /. style = {#2} } ,%2 underscores to avoid the same name as for example the key style_style + pic /. code = + { + \bool_set_true:N \l__polyomino_pic_bool + \tl_set:Nn \l__polyomino_pic_tl {#1} + } , + style /. style = { style_style /. style = {#1} } , + style_style /. style = {} , + } + +%%> \subsection{The command \textbackslash polyomino} + +\NewDocumentCommand \polyomino { O {} m } + { + {%note the double braces {{...}} so that the contents is in a group and in particular, \pgfkeys is applied locally + \pgfkeys { / polyomino , #1 } + \int_zero:N \l__polyomino_col_int + \int_set:Nn \l__polyomino_row_int { 1 } + \seq_clear:N \l__polyomino_cols_seq + \tl_map_inline:en {#2} + %it is convenient that this ignores spaces in #2 + %e argument specifier for the case that #2 is given by a command or contains a command + { + \tl_if_eq:neTF {##1} { \pgfkeysvalueof { / polyomino / row~sep } } + { + \seq_put_right:NV \l__polyomino_cols_seq \l__polyomino_col_int + \int_incr:N \l__polyomino_row_int + \int_zero:N \l__polyomino_col_int + } + { + \int_incr:N \l__polyomino_col_int + \tl_clear_new:c { l__polyomino_\int_use:N \l__polyomino_row_int _\int_use:N \l__polyomino_col_int _tl } + \tl_if_eq:neF {##1} { \pgfkeysvalueof { / polyomino / empty~cell } } + { \tl_set:cn { l__polyomino_\int_use:N \l__polyomino_row_int _\int_use:N \l__polyomino_col_int _tl } {##1} } + \tl_gclear_new:c { g__polyomino_\int_use:N \l__polyomino_row_int _\int_use:N \l__polyomino_col_int _tl } + } + } + \seq_put_right:NV \l__polyomino_cols_seq \l__polyomino_col_int + \int_set:Nn \l__polyomino_max_int { \fp_eval:n { max ( \seq_use:Nn \l__polyomino_cols_seq { , } ) } } + \seq_map_indexed_inline:Nn \l__polyomino_cols_seq + { + \tl_clear_new:c { l__polyomino_##1_0_tl } + \int_step_inline:nnn { ##2 + 1 } { \l__polyomino_max_int + 1 } + { \tl_clear_new:c { l__polyomino_##1_####1_tl } } + } + \int_step_inline:nnn { 0 } { \l__polyomino_max_int + 1 } + { + \tl_clear_new:c { l__polyomino_0_##1_tl } + \tl_clear_new:c { l__polyomino_\int_eval:n { \l__polyomino_row_int + 1 }_##1_tl } + } + \pgfkeys + { + / tikz , + shift /. expanded = { \pgfkeysvalueof { / polyomino / at } } , + shift = { ( 0 , \seq_count:N \l__polyomino_cols_seq ) } + } + \seq_map_indexed_inline:Nn \l__polyomino_cols_seq + { + \int_step_inline:nn {##2} + { + \tl_if_empty:cF { l__polyomino_##1_####1_tl } + { + {%note the double braces {{...}} so that \pgfkeys is applied locally + \pgfkeys { / polyomino / p_2 , \cs:w l__polyomino_##1_####1_tl \cs_end: __style } + \bool_if:NTF \l__polyomino_pic_bool + { \pic [ / polyomino / p_2 / style_style ] at ( ####1 - 0.5 , 0.5 - ##1 ) { code = { \l__polyomino_pic_tl } } ; } + { + \seq_clear:N \l__polyomino_add_seq + \tl_if_eq:ccF { l__polyomino_##1_####1_tl } { l__polyomino_##1_\int_eval:n { ####1 - 1 }_tl } + { + \tl_if_empty:cT { g__polyomino_##1_####1_tl } + { + \int_set:Nn \l__polyomino_dir_int { 1 } + \int_set:Nn \l__polyomino_col_int {####1} + \int_set:Nn \l__polyomino_row_int {##1} + \int_set:Nn \l__polyomino_x_int {####1} + \int_set:Nn \l__polyomino_y_int { 1 - ##1 } + \tl_build_begin:N \l__polyomino_path_tl + \fp_do_until:nn { ####1 - 1 = \l__polyomino_x_int && 1 - ##1 = \l__polyomino_y_int } + { + %concerning \tl_build_put_right:Ne \l__polyomino_path_tl, + %for example (0,0)--(0,1)--(0,2) results in a larger file size than (0,0)--(0,2) + \tl_if_eq:ccTF + { l__polyomino_##1_####1_tl } + { + l__polyomino + _\int_eval:n + { \l__polyomino_row_int + \clist_item:nn { 0 , 1 , 0 , -1 } { \l__polyomino_dir_int } } + _\int_eval:n + { \l__polyomino_col_int + \clist_item:nn { 1 , 0 , -1 , 0 } { \l__polyomino_dir_int } } + _tl + } + { + \tl_if_eq:ccTF + { l__polyomino_##1_####1_tl } + { + l__polyomino + _\int_eval:n + { \l__polyomino_row_int + \clist_item:nn { -1 , 1 , 1 , -1 } { \l__polyomino_dir_int } } + _\int_eval:n + { \l__polyomino_col_int + \clist_item:nn { 1 , 1 , -1 , -1 } { \l__polyomino_dir_int } } + _tl + } + { + \tl_build_put_right:Ne \l__polyomino_path_tl + { -- ( \int_use:N \l__polyomino_x_int , \int_use:N \l__polyomino_y_int ) } + \int_add:Nn \l__polyomino_row_int + { \clist_item:nn { -1 , 1 , 1 , -1 } { \l__polyomino_dir_int } } + \int_add:Nn \l__polyomino_col_int + { \clist_item:nn { 1 , 1 , -1 , -1 } { \l__polyomino_dir_int } } + \int_compare:nNnTF { \l__polyomino_dir_int } = { 1 } + { \int_set:Nn \l__polyomino_dir_int { 4 } } + { \int_decr:N \l__polyomino_dir_int } + } + { + \int_add:Nn \l__polyomino_row_int + { \clist_item:nn { 0 , 1 , 0 , -1 } { \l__polyomino_dir_int } } + \int_add:Nn \l__polyomino_col_int + { \clist_item:nn { 1 , 0 , -1 , 0 } { \l__polyomino_dir_int } } + } + \tl_if_empty:cTF + { g__polyomino_\int_use:N \l__polyomino_row_int _\int_use:N \l__polyomino_col_int _tl } + { + \seq_put_right:Ne \l__polyomino_add_seq + { \int_use:N \l__polyomino_row_int _\int_use:N \l__polyomino_col_int } + } + { + \bool_set_true:N \l__polyomino_pic_bool + \int_set:Nn \l__polyomino_x_int { ####1 - 1 } + \int_set:Nn \l__polyomino_y_int { 1 - ##1 } + } + } + { + \tl_build_put_right:Ne \l__polyomino_path_tl + { -- ( \int_use:N \l__polyomino_x_int , \int_use:N \l__polyomino_y_int ) } + \int_compare:nNnTF { \l__polyomino_dir_int } = { 4 } + { \int_set:Nn \l__polyomino_dir_int { 1 } } + { \int_incr:N \l__polyomino_dir_int } + } + \bool_if:NF \l__polyomino_pic_bool + { + \int_add:Nn \l__polyomino_x_int { \clist_item:nn { 1 , 0 , -1 , 0 } { \l__polyomino_dir_int } } + \int_add:Nn \l__polyomino_y_int { \clist_item:nn { 0 , -1 , 0 , 1 } { \l__polyomino_dir_int } } + } + } + \tl_build_end:N \l__polyomino_path_tl + \bool_if:NF \l__polyomino_pic_bool + { \fill [ / polyomino / p_2 / style_style ] ( ####1 - 1 , 1 - ##1 ) \l__polyomino_path_tl -- cycle ; } + } + } + \tl_gset:cn { g__polyomino_##1_####1_tl } { c } + \seq_map_inline:Nn \l__polyomino_add_seq + { \tl_gset:cn { g__polyomino_########1_tl } { c } } + } + } + } + } + } + \bool_if:NT \l__polyomino_grid_bool + { + \int_step_inline:nn { \seq_count:N \l__polyomino_cols_seq - 1 } + { + \int_zero:N \l__polyomino_col_int + \int_zero:N \l__polyomino_x_int + \int_set:Nn \l__polyomino_y_int + { \int_min:nn { \seq_item:Nn \l__polyomino_cols_seq {##1} } { \seq_item:Nn \l__polyomino_cols_seq { ##1 + 1 } } } + \int_while_do:nNnn { \l__polyomino_x_int } < { \l__polyomino_y_int } + { + \bool_do_while:nn + { + \tl_if_eq_p:cc + { l__polyomino_##1_\int_use:N \l__polyomino_x_int _tl } + { l__polyomino_\int_eval:n { ##1 + 1 }_\int_use:N \l__polyomino_x_int _tl } + && + ! \tl_if_empty_p:c { g__polyomino_##1_\int_use:N \l__polyomino_x_int _tl } + && + \int_compare_p:nNn { \l__polyomino_x_int } < { \l__polyomino_y_int + 1 } + } + { \int_incr:N \l__polyomino_x_int } + \int_compare:nNnT { \l__polyomino_x_int } > { \l__polyomino_col_int + 1 } + { + \draw [ / polyomino / grid_style ] + ( \int_use:N \l__polyomino_col_int , -##1 ) -- ( \int_use:N \l__polyomino_x_int - 1 , -##1 ) ; + } + \int_set_eq:NN \l__polyomino_col_int \l__polyomino_x_int + } + } + \int_set:Nn \l__polyomino_x_int { \seq_count:N \l__polyomino_cols_seq } + \int_step_inline:nn { \l__polyomino_max_int - 1 } + { + \int_zero:N \l__polyomino_row_int + \int_zero:N \l__polyomino_y_int + \int_while_do:nNnn { \l__polyomino_y_int } < { \l__polyomino_x_int } + { + \bool_do_while:nn + { + \tl_if_eq_p:cc + { l__polyomino_\int_use:N \l__polyomino_y_int _##1_tl } + { l__polyomino_\int_use:N \l__polyomino_y_int _\int_eval:n { ##1 + 1 }_tl } + && + ! \tl_if_empty_p:c { g__polyomino_\int_use:N \l__polyomino_y_int _##1_tl } + && + \int_compare_p:nNn { \l__polyomino_y_int } < { \l__polyomino_x_int + 1 } + && + \int_compare_p:nNn {##1} < { \seq_item:Nn \l__polyomino_cols_seq { \l__polyomino_y_int } + 0 } + } + { \int_incr:N \l__polyomino_y_int } + \int_compare:nNnT { \l__polyomino_y_int } > { \l__polyomino_row_int + 1 } + { + \draw [ / polyomino / grid_style ] + ( ##1 , -\int_use:N \l__polyomino_row_int ) -- ( ##1 , 1 - \int_use:N \l__polyomino_y_int ) ; + } + \int_set_eq:NN \l__polyomino_row_int \l__polyomino_y_int + } + } + } + } + } + +\endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCAllumettes.tex b/Master/texmf-dist/tex/latex/profcollege/PfCAllumettes.tex index f603c71f965..dea7c68cb9d 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCAllumettes.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCAllumettes.tex @@ -1,6 +1,10 @@ %%% % Allumettes %%% +\def\filedateAllu{2024/08/04}% +\def\fileversionAllu{0.1}% +\message{-- \filedateAllu\space v\fileversionAllu} +% \setKVdefault[Allumettes]{Impression=false,Echelles=false}% \defKV[Allumettes]{Echelle=\setKV[Allumettes]{Echelles}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCArbreCalcul.tex b/Master/texmf-dist/tex/latex/profcollege/PfCArbreCalcul.tex index 4113ae9a278..347c56f6401 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCArbreCalcul.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCArbreCalcul.tex @@ -1,6 +1,9 @@ %%% % Arbre de calculs %%% +\def\filedateArbreC{2024/08/04}% +\def\fileversionArbreC{0.1}% +\message{-- \filedateArbreC\space v\fileversionArbreC}% \newtoks\toklistearbre% \newtoks\toklistearbrefractions% \newtoks\toklistearbreexpressions% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCArbreChiffre.tex b/Master/texmf-dist/tex/latex/profcollege/PfCArbreChiffre.tex index f724c16fda8..26d5cb021af 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCArbreChiffre.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCArbreChiffre.tex @@ -2,6 +2,9 @@ % ArbreChiffre %%% % https://tex.stackexchange.com/questions/112975/how-to-print-the-permutation-of-s-u-v-a-t-with-latex +\def\filedateArbreCh{2024/08/04}% +\def\fileversionArbreCh{0.1}% +\message{-- \filedateArbreCh\space v\fileversionArbreCh}% \def\recurse#1#2#3#4\endmarker{% \dopermute{#1#3}#2#4\endmarker diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCAssemblagesSolides.tex b/Master/texmf-dist/tex/latex/profcollege/PfCAssemblagesSolides.tex index 5521dbb4193..7f04a083238 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCAssemblagesSolides.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCAssemblagesSolides.tex @@ -1,6 +1,10 @@ %%% % Assemblages solides %%% +\def\filedateAssemblageS{2024/08/04}% +\def\fileversionAssemblageS{0.1}% +\message{-- \filedateAssemblageS\space v\fileversionAssemblageS}% +% \setKVdefault[Assemblage]{Phi=30,Theta=20,Distance=50,Anglez=0,Anglex=0,Largeur=1.5,Profondeur=0.75,Hauteur=1,RayonBoule=1,RayonCone=1,RayonCylindre=1,HauteurPrisme=1,HauteurPyramideA=1,HauteurPyramideB=1,HauteurConeA=1,HauteurConeB=1,HauteurCylindre=1,Cotes=3,Trace=false,Type=Pyramides}% \defKV[Assemblage]{Traces=\setKV[Assemblage]{Trace}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCAutomatismes.tex b/Master/texmf-dist/tex/latex/profcollege/PfCAutomatismes.tex index fbf80943d41..bb000dee6a5 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCAutomatismes.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCAutomatismes.tex @@ -1,6 +1,10 @@ %%% % Automatismes %%% +\def\filedateAutomatismes{2024/08/04}% +\def\fileversionAutomatismes{0.1}% +\message{-- \filedateAutomatismes\space v\fileversionAutomatismes}% +% \NewDocumentCommand\ChoixAleaMixold{mmmm}{% \ChoixAlea{1}{2}{\Autograine}% \ifnum\Autograine=1\relax% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCAutonomie.tex b/Master/texmf-dist/tex/latex/profcollege/PfCAutonomie.tex index b75161ffcc9..3e72a725755 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCAutonomie.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCAutonomie.tex @@ -1,4 +1,10 @@ -%%% Autonomie %%% +%%% +%Autonomie +%%% +\def\filedateAutonomie{2024/08/04}% +\def\fileversionAutonomie{0.1}% +\message{-- \filedateAutonomie\space v\fileversionAutonomie}% +% \setKVdefault[Autonomie]{AfficheMarge=false,TitreEnigme=Enigme,TitreAtoi=\`A toi,Enigme=false,TexteCorrection=\bfseries Correction,ARemplir=false,Deux=false,Landscape=false}% \newcommand\Autonomie[3][]{% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCBarreNiveaux.tex b/Master/texmf-dist/tex/latex/profcollege/PfCBarreNiveaux.tex index 8ee730bbfb3..d56f096d7eb 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCBarreNiveaux.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCBarreNiveaux.tex @@ -1,6 +1,10 @@ %%% % Barres de niveaux %%% +\def\filedateBarreNiveaux{2024/08/04}% +\def\fileversionBarreNiveaux{0.1}% +\message{-- \filedateBarreNiveaux\space v\fileversionBarreNiveaux}% +% \setKVdefault[ClesBarre]{Niveau=false,LimiteI=25,LimiteF=50,LimiteS=75,TexteOrigine=0,TexteReference=100,CouleurGraduation=white,CouleurFond=gray!50,CouleurBarre=black,Graduation=false,Nom=D\'efaut,Pas=10,CouleurI=red,CouleurF=orange,CouleurS=yellow,CouleurM=green} \newlength{\barrewidth} diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCBarresCalculs.tex b/Master/texmf-dist/tex/latex/profcollege/PfCBarresCalculs.tex index 12b50770251..47537abe92f 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCBarresCalculs.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCBarresCalculs.tex @@ -1,6 +1,9 @@ %%% % Barres de calculs %%% +\def\filedateBarresCalculs{2024/08/04}% +\def\fileversionBarresCalculs{0.1}% +\message{-- \filedateBarresCalculs\space v\fileversionBarresCalculs}% \setKVdefault[SuiteBarre]{Litteral=false,Perso=false,Decimaux=false} \NewDocumentCommand\BarresCalculs{o m m}{% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCBillard.tex b/Master/texmf-dist/tex/latex/profcollege/PfCBillard.tex index 6faf8038038..dc0082cef84 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCBillard.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCBillard.tex @@ -1,6 +1,10 @@ %%% % Billard %%% +\def\filedateBillard{2024/08/28}% +\def\fileversionBillard{0.1a}% +\message{-- \filedateBillard\space v\fileversionBillard}% +% \newtoks\tokPfCMotBillard{}% \def\UpdateTokBillard#1\nil{\addtotok\tokPfCMotBillard{"#1"}}% @@ -227,11 +231,9 @@ }% \def\MPBillardSolution#1#2#3{% - % \mplibcodeinherit{enable}% \mplibforcehmode \xdef\PfCNomBillard{\useKV[ClesBillard]{Nom}} \begin{mplibcode}[\PfCNomBillard] -% Figure(0,0,\useKV[ClesBillard]{Longueur}+2cm,\useKV[ClesBillard]{Largeur}+3cm); trace rec; % Tracés drawarrow Pt[1]--(Pt[1]+1.5cm*unitvector(Pt[2]-Pt[1])) withpen pencircle scaled 1.25; @@ -253,14 +255,16 @@ else: dotlabel.bot(TEX(substring(0,1) of #1),Pt[1]); fi; + path segmenttest; for k=2 upto BLong: - if (demidroite(1/1000[Pt[k-1],Pt[k]],Pt[k]) intersectiontimes cote[1])<>(-1,-1): + segmenttest:=(9/10)[Pt[k-1],Pt[k]]--(11/10)[Pt[k-1],Pt[k]]; + if segmenttest intersectiontimes cote[1]<>(-1,-1): dotlabel.bot(TEX(substring(k-1,k) of #1),Pt[k]); - elseif (demidroite(1/1000[Pt[k-1],Pt[k]],Pt[k]) intersectiontimes cote[2])<>(-1,-1): + elseif segmenttest intersectiontimes cote[2]<>(-1,-1): dotlabel.rt(TEX(substring(k-1,k) of #1),Pt[k]); - elseif (demidroite(1/1000[Pt[k-1],Pt[k]],Pt[k]) intersectiontimes cote[3])<>(-1,-1): + elseif segmenttest intersectiontimes cote[3]<>(-1,-1): dotlabel.top(TEX(substring(k-1,k) of #1),Pt[k]); - elseif (demidroite(1/1000[Pt[k-1],Pt[k]],Pt[k]) intersectiontimes cote[4])<>(-1,-1): + elseif segmenttest intersectiontimes cote[4]<>(-1,-1): dotlabel.lft(TEX(substring(k-1,k) of #1),Pt[k]); fi; endfor; @@ -270,5 +274,4 @@ label.top(TEX(substring(k-1,k) of #1),((xpart(Co),5mm)-center Reponse)+(k-1)*(7mm,0)+(2.5mm,0)); endfor; \end{mplibcode}% -% \mplibcodeinherit{disable}% }%
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCBonSortie.tex b/Master/texmf-dist/tex/latex/profcollege/PfCBonSortie.tex index 25408ad5fed..c783f90d8e3 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCBonSortie.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCBonSortie.tex @@ -1,6 +1,10 @@ %%% % Bon de sortie %%% +\def\filedateBonSortie{2024/08/04}% +\def\fileversionBonSortie{0.1}% +\message{-- \filedateBonSortie\space v\fileversionBonSortie}% +% \newcommand\BonSortieBandeau{% Nom : \hfill Date : \hspace*{3cm} } diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCBonbon.tex b/Master/texmf-dist/tex/latex/profcollege/PfCBonbon.tex index 08be71cd4f0..8c897fa4deb 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCBonbon.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCBonbon.tex @@ -1,9 +1,13 @@ %%% % Bonbon %%% +\def\filedateBonbon{2024/08/04}% +\def\fileversionBonbon{0.1}% +\message{-- \filedateBonbon\space v\fileversionBonbon}% +% \setKVdefault[Bonbon]{CouleurUn=red,Bicolore=false,Echelle=1}% \defKV[Bonbon]{CouleurDeux=\setKV[Bonbon]{Bicolore}}% - +% \NewDocumentCommand\Bonbon{o}{% \useKVdefault[Bonbon]% \setKV[Bonbon]{#1}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCAN.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCAN.tex index f77aea497a2..cb8dd56fd27 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCCAN.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCCAN.tex @@ -1,3 +1,10 @@ +%%% +% CAN +% +\def\filedateCAN{2024/08/04}% +\def\fileversionCAN{0.1}% +\message{-- \filedateCAN\space v\fileversionCAN}% +% % Gestion de l'aléatoire (pour la CAN) \newcommand\ChoixAlea[4][]{% \ifx\bla#1\bla% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCalculatrice.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCalculatrice.tex index d2a189e29b5..c97b32472fd 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCCalculatrice.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCCalculatrice.tex @@ -1,6 +1,9 @@ %%% % Calculatrice %%% +\def\filedateCalculatrice{2024/08/04}% +\def\fileversionCalculatrice{0.1}% +\message{-- \filedateCalculatrice\space v\fileversionCalculatrice}% %https://tex.stackexchange.com/questions/290321/mimicking-a-calculator-inputs-and-screen \definecolor{lightorange}{rgb}{0.9,0.4,0}% \definecolor{lightestorange}{rgb}{1,0.8,0.5}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCalculsCroises.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCalculsCroises.tex index d17a6c9f556..eb9b8b739d1 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCCalculsCroises.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCCalculsCroises.tex @@ -1,6 +1,10 @@ %%% % Calculs Croises %%% +\def\filedateCalculsCroises{2024/08/04}% +\def\fileversionCalculsCroises{0.1}% +\message{-- \filedateCalculsCroises\space v\fileversionCalculsCroises}% +% \setKVdefault[CalculsCroises]{Largeur=20pt,Solution=false,Inverse=false,Creation=false,Graines=false,Vide=false,Couleur=LightGray,Negatifs=false,Aide=false,CouleurS=blue} \defKV[CalculsCroises]{Graine=\setKV[CalculsCroises]{Graines}}% \defKV[CalculsCroises]{ListeNombres=\setKV[CalculsCroises]{Aide}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCalculsDetailles.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCalculsDetailles.tex new file mode 100644 index 00000000000..df321d523a2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/profcollege/PfCCalculsDetailles.tex @@ -0,0 +1,147 @@ +%%% +% Calculs détaillés +%%% +\def\filedateCDetailles{2024/08/24}% +\def\fileversionCDetailles{0.1}% +\message{-- \filedateCDetailles\space v\fileversionCDetailles} +% +\setKVdefault[CalculAuto]{Under=false,OverB=false,OverC=false,UnderB=false,UnderC=false,Cadre=false,Fluo=false,Evidence=false,Lettres={A,B,C,D,E},Couleur=Purple} + +\newcounter{PfCNbCalculs} +\newcounter{PfCNbSousCalculs} +\newcounter{PfCNbMarque} + +\NewDocumentCommand\PfCMarquePriorite{m}{% + \ifboolKV[CalculAuto]{OverB}{% + \Overbrace{#1}% + }{% + \ifboolKV[CalculAuto]{OverC}{% + \Overcrochet{#1}% + }{% + \ifboolKV[CalculAuto]{UnderC}{% + \Undercrochet{#1}% + }{% + \ifboolKV[CalculAuto]{UnderB}{% + \Underbrace{#1}% + }{% + \ifboolKV[CalculAuto]{Cadre}{% + \PfCFbox{CCalculAuto}{#1} + }{% + \ifboolKV[CalculAuto]{Fluo}{% + \Surligner[CCalculAuto]{#1} + }{% + \ifboolKV[CalculAuto]{Under}{% + \mathunderline{CCalculAuto}{#1}% + }{% + \ifboolKV[CalculAuto]{Evidence}{% + \mathcolor{CCalculAuto}{#1}% + }{% + #1% + }% + }% + }% + }% + }% + }% + }% + }% +}% + +\NewDocumentCommand\CalculDetaille{om}{% + \useKVdefault[CalculAuto]% + \setKV[CalculAuto]{#1}% + \colorlet{CCalculAuto}{\useKV[CalculAuto]{Couleur}}% + \setcounter{PfCNbCalculs}{0}% + \setsepchar{§}\ignoreemptyitems% + \readlist*\ListeNombresCalculs{#2}% + \reademptyitems% + \xdef\PfCFooListeLettres{\useKV[CalculAuto]{Lettres}}% + \setsepchar{,}\ignoreemptyitems% + \readlist*\ListeLettres{\PfCFooListeLettres}% + \reademptyitems% + \xdef\PfCNbMaxLignesCalculs{0}% + \foreachitem\compteur\in\ListeNombresCalculs{% + \stepcounter{PfCNbCalculs}% + \itemtomacro\ListeNombresCalculs[\compteurcnt]\Titi% + \setsepchar{,}\ignoreemptyitems% + \readlist*\ListeNombresCalculsDetails{\Titi}% + \reademptyitems% + \expandafter\xdef\csname NbLignesCalculs\Alph{PfCNbCalculs}\endcsname{\ListeNombresCalculsDetailslen}% + \xdef\PfCNbMaxLignesCalculs{\fpeval{max(\PfCNbMaxLignesCalculs,\ListeNombresCalculsDetailslen)}}% + \setcounter{PfCNbSousCalculs}{0}% + \foreachitem\compteura\in\ListeNombresCalculsDetails{% + \stepcounter{PfCNbSousCalculs}% + \StrSubstitute{\compteura}{*}{\times}[\PfCCalculAutoUn]% + \StrSubstitute{\PfCCalculAutoUn}{:}{\div}[\PfCCalculAutoDeux]% + \StrCount{\PfCCalculAutoDeux}{<}[\NbInf]% + \ifnum\fpeval{\NbInf}=0\relax% + \expandafter\xdef\csname NbMarqueLigneCalcul\Alph{PfCNbCalculs}\Alph{PfCNbSousCalculs}\endcsname{1}% + \expandafter\xdef\csname LigneCalcul\Alph{PfCNbCalculs}\Alph{PfCNbSousCalculs}A\endcsname{\PfCCalculAutoDeux}% + \else% + \xdef\PfCExpressionDepart{\PfCCalculAutoDeux}% + \setcounter{PfCNbMarque}{0}% + \foreach\xx in{1,...,\NbInf}{% + \StrBefore{\PfCExpressionDepart}{<}[\PfCDevant]% + \StrBetween{\PfCExpressionDepart}{<}{>}[\PfCAEncadrer]% + \stepcounter{PfCNbMarque}% + \expandafter\xdef\csname LigneCalcul\Alph{PfCNbCalculs}\Alph{PfCNbSousCalculs}\Alph{PfCNbMarque}\endcsname{\PfCDevant}% + \stepcounter{PfCNbMarque}% + \expandafter\xdef\csname LigneCalcul\Alph{PfCNbCalculs}\Alph{PfCNbSousCalculs}\Alph{PfCNbMarque}\endcsname{<\PfCAEncadrer}% + \StrBehind{\PfCExpressionDepart}{>}[\PfCExpressionDepartA]% + \xdef\PfCExpressionDepart{\PfCExpressionDepartA}% + }% + \stepcounter{PfCNbMarque}% + \expandafter\xdef\csname LigneCalcul\Alph{PfCNbCalculs}\Alph{PfCNbSousCalculs}\Alph{PfCNbMarque}\endcsname{\PfCExpressionDepart}% + \expandafter\xdef\csname NbMarqueLigneCalcul\Alph{PfCNbCalculs}\Alph{PfCNbSousCalculs}\endcsname{\thePfCNbMarque}% + \fi + }% + }% + %%%%%%%%% + \setcounter{PfCNbSousCalculs}{0}% + \[% + \begin{aligned} + \xintFor* ##2 in{\xintSeq{1}{\PfCNbMaxLignesCalculs}}\do{% + \stepcounter{PfCNbSousCalculs}% + \setcounter{PfCNbCalculs}{0}% + \xintFor* ##1 in{\xintSeq{1}{\ListeNombresCalculslen}}\do{% + \stepcounter{PfCNbCalculs}% + \ifnum##2>\fpeval{\csname NbLignesCalculs\Alph{PfCNbCalculs}\endcsname}\relax% + \uppercase{&} + \else + \ListeLettres[\thePfCNbCalculs]\uppercase{&}=\xdef\Tata{\csname NbMarqueLigneCalcul\Alph{PfCNbCalculs}\Alph{PfCNbSousCalculs}\endcsname}\setcounter{PfCNbMarque}{0}\xintFor*##3 in{\xintSeq{1}{\Tata}}\do{% + \stepcounter{PfCNbMarque} + \xdef\Toto{\csname LigneCalcul\Alph{PfCNbCalculs}\Alph{PfCNbSousCalculs}\Alph{PfCNbMarque}\endcsname}\StrChar{\Toto}{1}[\PfCATester] + \IfStrEq{\PfCATester}{<}{\StrBehind{\Toto}{<}[\PfCAEncadrer]\PfCMarquePriorite{\PfCAEncadrer}}{\Toto} + } + \fi\xintifForLast{&}{} + }\\ + } + \end{aligned} + \] +}% + +\def\Underbrace#1{% + \ifx#1\bla\bla\else\color{CCalculAuto}\underbrace{{\color{black}#1}}\color{black}\fi% +}% +\def\Undercrochet#1{% + \ifx#1\bla\bla\else\color{CCalculAuto}\underbracket{{\color{black}#1}}\color{black}\fi% +}% +\def\Overbrace#1{% + \ifx#1\bla\bla\else\color{CCalculAuto}\overbrace{{\color{black}#1}}\color{black}\fi% +}% +\def\Overcrochet#1{% + \ifx#1\bla\bla\else\color{CCalculAuto}\overbracket{{\color{black}#1}}\color{black}\fi% +}% +\def\PfCFbox#1#2{% + \ifx#2\bla\bla\else\setlength{\fboxrule}{1pt}\fcolorbox{#1}{white}{$\displaystyle#2$}\fi% +}% + +\NewDocumentCommand{\Surligner}{O{yellow}m}{% + \ifx#2\bla\bla\else + \ifmmode% + \colorbox{#1}{$\displaystyle#2$}% + \else% + \colorbox{#1}{#2}% + \fi% + \fi +}%
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCalculsFractions.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCalculsFractions.tex index e3660cff1e1..cc19c93e548 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCCalculsFractions.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCCalculsFractions.tex @@ -1,3 +1,10 @@ +%%% +% Calculs fractions +% +\def\filedateCalculsFractions{2024/08/04}% +\def\fileversionCalculsFractions{0.1}% +\message{-- \filedateCalculsFractions\space v\fileversionCalculsFractions}% +% \setKVdefault[CalculsFractions]{Couleurs=false,Negatif=false,Seul=false}% \defKV[CalculsFractions]{Couleur=\setKV[CalculsFractions]{Couleurs}\setKV[ClesSimplification]{Couleur=#1}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCalisson.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCalisson.tex index 929b1fb28e9..dd2fe56db37 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCCalisson.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCCalisson.tex @@ -1,6 +1,10 @@ %%% % Calisson %%% +\def\filedateCalisson{2024/08/04}% +\def\fileversionCalisson{0.1}% +\message{-- \filedateCalisson\space v\fileversionCalisson}% +% \setKVdefault[Calisson]{Taille=3,Solution=false,Rayon=5cm,Couleur=red,CouleurTrace=black}% \def\UpdatetoksCalissong#1\nil{\addtotok\tokcalissonlistetracesg{,"#1"}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCartesJeux.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCartesJeux.tex index 1e2075d91af..98bb4b8b3cf 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCCartesJeux.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCCartesJeux.tex @@ -1,6 +1,10 @@ %%% % Cards %%% +\def\filedateCartesJeux{2024/08/04}% +\def\fileversionCartesJeux{0.1}% +\message{-- \filedateCartesJeux\space v\fileversionCartesJeux}% +% \setKVdefault[Cards]{Formats=false,Largeur=165,Hauteur=250,HauteurTheme=40,Marge=12,Landscape=false,Couleur=Cornsilk,CouleurAr=Cornsilk,Theme=Th\'eor\`eme\\de Pythagore,ThemeSol=Solution,AfficheTheme=false,Trame=false,Jointes=false,TrameVisible=false,RayonArc=5pt,Titre=false,NomTitre=Jeu 1,Loop,JaiQuia=false,Eleve=false,BackgroundAv=false,BackgroundAr=false,%ImageAv=4813762.jpg,ImageAr=4813762.jpg, AffichageSolution=true,SolutionSeule=false,% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCartesMentales.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCartesMentales.tex index ea9b30af037..90812c7e9ea 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCCartesMentales.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCCartesMentales.tex @@ -1,6 +1,10 @@ %%% % Cartes Mentales %%% +\def\filedateCarteMentale{2024/08/04}% +\def\fileversionCarteMentale{0.1}% +\message{-- \filedateCarteMentale\space v\fileversionCarteMentale}% +% \setKVdefault[ClesMentales]{Nom={Bulle}, Largeur=5cm, Ancre={0,0},Pointilles=false,CTrace=black,CFond=white,Epaisseur=1pt,Rayon=1}% \newenvironment{Mind}{\begin{tikzpicture}}{\end{tikzpicture}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCartographie.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCartographie.tex index e23001bbcca..4396dc6f87b 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCCartographie.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCCartographie.tex @@ -1,7 +1,11 @@ %%% % Cartographie %%% -\setKVdefault[Cartographie]{Echelle=1,Carte=false,All=false,Europe=false,Asie=false,Amsud=false,Amnord=false,Amcentre=false,Caraibes=false,Afrique=false,AfficheEchelle=false,PaysSeul=false,VillesSup=false,VillesSupI=false,Capitales=false,Impression=false,Fleuves=false,CouleurFond=ciel,Largeur=12,Hauteur=12,Arborescence="/usr/local/texlive/2023/texmf-dist/metapost/profcollege/",Projection=false,TypeProjection="mercator",CouleurPays=Cornsilk,Pasl=2,PasL=2,Codes=false,Epaisseur=2,ModeleCouleur=5,Boussole=false,Allegee=1,Maillage=false} +\def\filedateCartographie{2024/08/04}% +\def\fileversionCartographie{0.1}% +\message{-- \filedateCartographie\space v\fileversionCartographie}% +% +\setKVdefault[Cartographie]{Echelle=1,Carte=false,All=false,Europe=false,Asie=false,Amsud=false,Amnord=false,Amcentre=false,Caraibes=false,Afrique=false,AfficheEchelle=false,PaysSeul=false,VillesSup=false,VillesSupI=false,Capitales=false,Impression=false,Fleuves=false,CouleurFond=ciel,Largeur=12,Hauteur=12,Arborescence="/usr/local/texlive/2024/texmf-dist/metapost/profcollege/",Projection=false,TypeProjection="mercator",CouleurPays=Cornsilk,Pasl=2,PasL=2,Codes=false,Epaisseur=2,ModeleCouleur=5,Boussole=false,Allegee=1,Maillage=false} \defKV[Cartographie]{EchelleCarte=\setKV[Cartographie]{Carte}} \defKV[Cartographie]{Pays=\setKV[Cartographie]{PaysSeul}} \defKV[Cartographie]{Villes=\setKV[Cartographie]{VillesSup}} diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCheque.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCheque.tex new file mode 100644 index 00000000000..531af4efc12 --- /dev/null +++ b/Master/texmf-dist/tex/latex/profcollege/PfCCheque.tex @@ -0,0 +1,125 @@ +%%% +% PfCCheque +%%% +\def\filedateCheque{2024/09/03}% +\def\fileversionCheque{0.1}% +\message{-- \filedateCheque\space v\fileversionCheque}% +\newlength{\oldbaseline} +\newlength{\PfCTailleCursive} + +\setKVdefault[Cheque]{Sigle=CMF,Banque=Crédit Mathématique de France,Date=\today,Lieu={},Lire=false,Destinataire=Institut Curie,Solution=false,Longueur=15,Taille=\normalsize,Ajust=0pt} + +%https://tex.stackexchange.com/questions/406015/defining-macro-gsetlength-as-global-setlength-reliable +\makeatletter +\gdef\gsetlength#1#2{% + \begingroup + \setlength\skip@{#2}% Local assignment to a scratch register. + \global#1=\skip@ % Global assignement to #1; + % \relax is not necessary because of the following \endgroup. + \endgroup % \skip@ is restored by end of group. +} +\makeatother + +\NewDocumentCommand{\Cheque}{om}{% + \useKVdefault[Cheque]% + \setKV[Cheque]{#1}% + \setbox1=\hbox{\useKV[Cheque]{Taille}\myfontCursive abcdefghijklmnopqrstuvwxyz}% + {\useKV[Cheque]{Taille}\myfontCursive\gsetlength{\oldbaseline}{\baselineskip}\normalsize}% + \setlength{\PfCTailleCursive}{0.5\ht1+\useKV[Cheque]{Ajust}}% + \BuildCheque{#2}% +}% + +\NewDocumentCommand{\BuildCheque}{m}{% + \ifluatex + \mplibforcehmode + \begin{mplibcode} + boolean Solution,Lire; + Solution=\useKV[Cheque]{Solution}; + Lire=\useKV[Cheque]{Lire}; + Longueur=\useKV[Cheque]{Longueur}; + baselinecp=\fpeval{\oldbaseline}; + % + pair A,B,C,D,M[],N[]; + A=(0,0); + B-A=u*(Longueur,0); + C-B=u*(0,5); + D-C=A-B; + % + M1=1/3[D,A]; + % + picture Payez; + Payez=image( + label.rt(TEX("Payez contre ce chèque"),M1); + ); + % + M20=(xpart(M1),ypart(llcorner Payez)); + M2-M20=(0,-baselinecp); + M3-M2=u*(0,-0.5); + M4-M3=M2-M1; + M5-M4=u*(0.4*Longueur,-0.25); + M6-M4=u*(0,-0.25)+u*(0.5,0); + M7-M6=u*(2,0); + % + A:=(xpart(M4),ypart(M6)-1u); + B:=A+C-D; + % + N1=1/2[M1,M2]+0.8*(B-A); + N2-N1=M2-M1; + N3-N2=0.18*(B-A); + N4-N3=N1-N2; + drawoptions(withcolor NavyBlue); + picture BaseLettre; + %%%%%%%%%%%%%%%% + fill polygone(A,B,C,D) withcolor 0.8[LightSteelBlue,white]; + trace polygone(A,B,C,D); + draw Payez; + label.rt(TEX("{\sffamily \Huge \useKV[Cheque]{Sigle}}"),D+u*(0,-0.5)); + label.rt(TEX("{\sffamily \useKV[Cheque]{Banque}}"),D+u*(0,-1)); + trace (lrcorner Payez)--(0.75[(xpart(M1),ypart(lrcorner Payez)),(xpart(M1+B-A),ypart(lrcorner Payez))]); + label.rt(TEX("\tiny non endossable sauf au profit d'une banque ou d'un établissement assimilé."),M1+u*(0,-0.300)); + trace 1/90[M2,M2+B-A]--(0.75[M2,M2+B-A]); + label.rt(TEX("À \useKV[Cheque]{Destinataire}"),M3); + trace 1/45[M3+u*(0,-0.2),M3+u*(0,-0.2)+B-A]--(0.75[M3+u*(0,-0.2),M3+u*(0,-0.2)+B-A]); + fill polygone(N1,N2,N3,N4) withcolor white; + trace polygone(N1,N2,N3,N4) withpen pencircle scaled 1.2 withcolor NavyBlue; + if Lire=false: + label.rt(TEX("\si{\EuRo}~#1"),iso(N1,N2)); + else: + if Solution: + label.rt(TEX("\si{\EuRo}~\num{#1}"),iso(N1,N2)); + fi; + fi; + label.rt(TEX("À~\hbox to"&decimal(Longueur/5)&"cm{\hrulefill}\quad Le~\hbox to"&decimal(Longueur/5)&"cm{\hrulefill}"),M5); + label.top(TEX("\Huge \si{\EuRo}uro"),iso(N4,N1)+u*(0,1)); + label(TEX("\tiny « à régler exclusivement en euros »"),iso(N4,N1)+u*(-0.5,1)); + label(TEX("\ChoixAlea{100000}{999999}{\numcheque}\numcheque"),iso(M6,M7)); + trace cotationmil(M6,M7,2.5mm,25,TEX("\scriptsize chèque \no")); + %% +% drawoptions(withcolor red); +% draw (llcorner Payez)--(llcorner Payez+B-A); +% draw M2--(M2+B-A); +% drawoptions(); + picture Sous; + Sous=image(% + label(TEX("\begin{minipage}{\fpeval{0.75*"&decimal(Longueur)&"}cm} + \hspace{"&decimal(abs(lrcorner Payez-llcorner Payez))&"pt}\myfontCursive\useKV[Cheque]{Taille}\Ecriture{#1}~euros + \end{minipage}"),(0,0)); + ); + pair PointBase,PointTest,Decalage; + PointBase=1/2[M20,M2+(u*0.75Longueur,0)]; + PointTest=(0,0);% + if abs(llcorner Sous-ulcorner Sous)>baselinecp: + Decalage=(8pt,\fpeval{\PfCTailleCursive}); + else: + Decalage=(8pt,2*\fpeval{\PfCTailleCursive}); + fi; + if Lire: + draw Sous shifted (PointBase-PointTest+Decalage); + else: + if Solution: + draw Sous shifted (PointBase-PointTest+Decalage); + fi; + fi; + \end{mplibcode} + \fi% +}%
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCible.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCible.tex index d29fdccf9de..91e8f28e042 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCCible.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCCible.tex @@ -1,6 +1,10 @@ %%% % Cibles %%% +\def\filedateCible{2024/08/04}% +\def\fileversionCible{0.1}% +\message{-- \filedateCible\space v\fileversionCible}% +% \newtoks\toklisteciblea% \def\UpdatetoksCibleA#1\nil{\addtotok\toklisteciblea{"#1",}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCibleQOp.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCibleQOp.tex index 336b10651d0..c33f5242b37 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCCibleQOp.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCCibleQOp.tex @@ -1,3 +1,10 @@ +%%% +% Cible 4 opérations +%%% +\def\filedateCibleQOp{2024/08/04}% +\def\fileversionCibleQOp{0.1}% +\message{-- \filedateCibleQOp\space v\fileversionCibleQOp}% + \newcount\anpcqo\newcount\bnpcqo\newcount\cnpcqo% \NewDocumentCommand\PfCCQODiviseurs{m}{%#1 : le nombre entier \`a tester diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCColorilude.tex b/Master/texmf-dist/tex/latex/profcollege/PfCColorilude.tex index 33a1ef2446e..9c446f6b435 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCColorilude.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCColorilude.tex @@ -1,4 +1,10 @@ -%%% Colorilude %%% +%%% +% Colorilude +%%% +\def\filedateColorilude{2024/08/04}% +\def\fileversionColorilude{0.1}% +\message{-- \filedateColorilude\space v\fileversionColorilude}% +% \setKVdefault[Colorilude]{Largeur=10,Lignes=10,Legende=false,Coef=0.6,Solution=false,CartonReponse=false,Resultats=false} \newcommand\dispogpfc[3][]{% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCompteBon.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCompteBon.tex index 1d5339b114c..bbf219e431a 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCCompteBon.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCCompteBon.tex @@ -1,6 +1,10 @@ %%% % Le compte est bon %%% +\def\filedateCompteBon{2024/08/04}% +\def\fileversionCompteBon{0.1}% +\message{-- \filedateCompteBon\space v\fileversionCompteBon}% +% \setKVdefault[CompteBon]{NombreCalculs=5,NombrePlaques=4,Solution=false,Relatifs=false,Original=false,Graines=false,Plaques=6,CDot=false} \defKV[CompteBon]{Graine=\setKV[CompteBon]{Graines}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCConversion.tex b/Master/texmf-dist/tex/latex/profcollege/PfCConversion.tex index e6ed80f0125..86da03a0784 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCConversion.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCConversion.tex @@ -1,3 +1,10 @@ +%%% +% Conversion +%%% +\def\filedateConversion{2024/08/04}% +\def\fileversionConversion{0.1}% +\message{-- \filedateConversion\space v\fileversionConversion}% + \setKVdefault[ClesConversion]{Longueur,Aire=false,Vol=false,Masses=false,Capas=false,Sans=false,Completes=false}% \defKV[ClesConversion]{Complete=\setKV[ClesConversion]{Completes}}% \defKV[ClesConversion]{Masse=\setKV[ClesConversion]{Longueur=false}\setKV[ClesConversion]{Masses}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCritere.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCritere.tex index 34c96a9b069..4818b941c78 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCCritere.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCCritere.tex @@ -1,6 +1,10 @@ %%% % Criteres de divisibilite %%% +\def\filedateCritere{2024/08/04}% +\def\fileversionCritere{0.1}% +\message{-- \filedateCritere\space v\fileversionCritere}% +% \setKVdefault[Critere]{Div=2,Remarque=false,All=false,RemarqueAll=false} \NewDocumentCommand\Critere{om}{% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCCryptarithme.tex b/Master/texmf-dist/tex/latex/profcollege/PfCCryptarithme.tex index bfa2e8c76af..1494c2adc6c 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCCryptarithme.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCCryptarithme.tex @@ -1,6 +1,10 @@ %%% % Cryptarithmes %%% +\def\filedateCrypta{2024/08/04}% +\def\fileversionCrypta{0.1}% +\message{-- \filedateCrypta\space v\fileversionCrypta}% +% \setKVdefault[Crypta]{Solution=false,ListeLettres={A,B,C,D,E,F,G,H,I,J},Tableau=false}% \defKV[Crypta]{Indices=\setKV[Crypta]{Tableau}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDecDeci.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDecDeci.tex index b2db7fd38b0..861821ce823 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCDecDeci.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCDecDeci.tex @@ -1,6 +1,10 @@ %%% % Décomposition décimale %% +\def\filedateDecDeci{2024/08/04}% +\def\fileversionDecDeci{0.1}% +\message{-- \filedateDecDeci\space v\fileversionDecDeci}% +% \setKVdefault[DecompDeci]{Parentheses,Colore=false,CouleurU=Blue,CouleurD=Red,CouleurC=Green,Fleches=false,Details=false,ResultatSeul=false,SansMul=false} \newcounter{PfCNbDecDeci} diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDecompFracDeci.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDecompFracDeci.tex index b045c64f63b..1e627c2e3f7 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCDecompFracDeci.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCDecompFracDeci.tex @@ -1,7 +1,12 @@ %%% % D\'ecomposition de fractions d\'ecimales %%% -\setKVdefault[ClesFracDeci]{Complete=false,SansZero=false,Remediation=false,Longueur=1cm} +\def\filedateDecompFracDeci{2024/08/13}% +\def\fileversionDecompFracDeci{0.1a}% +\message{-- \filedateDecompFracDeci\space v\fileversionDecompFracDeci}% +% +\setKVdefault[ClesFracDeci]{Complete=false,SansZero=false,Remediation=false,Longueur=1cm,Vides=false}% +\defKV[ClesFracDeci]{Vide=\setKV[ClesFracDeci]{Remediation}\setKV[ClesFracDeci]{Vides}}% \newlength{\PfCLongueurP}% \newcommand\FractionDecimale[2][]{% @@ -26,7 +31,7 @@ \xintifboolexpr{\PartieEntiereFractionDeci == 0}{}{\ifboolKV[ClesFracDeci]{Remediation}{\pointilles[\PfCLongueurP]}{\num{\PartieEntiereFractionDeci}}+}% \xintFor* ##1 in {\xintSeq{1}{\LongueurPartieDecimale}}\do{% \StrMid{\PartieDecimaleFractionDeci}{##1}{##1}[\ChiffrePartieDecimale]% - \xintifForFirst{}{\xintifboolexpr{\ChiffrePartieDecimale == 0}{}{+}}\xintifboolexpr{\ChiffrePartieDecimale == 0}{}{\frac{\ifboolKV[ClesFracDeci]{Remediation}{\pointilles[\PfCLongueurP]}{\num{\ChiffrePartieDecimale}}}{\num{\fpeval{10**(\LongueurFracDeciDeno-1-\LongueurPartieDecimale+##1)}}}}% + \xintifForFirst{}{\xintifboolexpr{\ChiffrePartieDecimale == 0}{}{+}}\xintifboolexpr{\ChiffrePartieDecimale == 0}{}{\frac{\ifboolKV[ClesFracDeci]{Remediation}{\pointilles[\PfCLongueurP]}{\num{\ChiffrePartieDecimale}}}{\ifboolKV[ClesFracDeci]{Vides}{\pointilles[\PfCLongueurP]}{\num{\fpeval{10**(\LongueurFracDeciDeno-1-\LongueurPartieDecimale+##1)}}}}}% }% }% }{% @@ -38,20 +43,20 @@ \StrGobbleLeft{\FractionDeciNum}{\fpeval{\LongueurPartieEntiere}}[\DecompositionFracDeciComplete]% % on affiche la partie décimale. \xintFor* ##1 in {\xintSeq{1}{\fpeval{\LongueurFracDeciNum-\LongueurPartieEntiere}}}\do{% - \xintifForFirst{}{+}\StrMid{\DecompositionFracDeciComplete}{##1}{##1}[\ChiffrePartieDecimale]\frac{\ifboolKV[ClesFracDeci]{Remediation}{\pointilles[\PfCLongueurP]}{\num{\ChiffrePartieDecimale}}}{\num{\fpeval{10**##1}}}% + \xintifForFirst{}{+}\StrMid{\DecompositionFracDeciComplete}{##1}{##1}[\ChiffrePartieDecimale]\frac{\ifboolKV[ClesFracDeci]{Remediation}{\pointilles[\PfCLongueurP]}{\num{\ChiffrePartieDecimale}}}{\ifboolKV[ClesFracDeci]{Vides}{\pointilles[\PfCLongueurP]}{\num{\fpeval{10**##1}}}}% }% }% }{% \ensuremath{% \xintFor* ##1 in {\xintSeq{1}{\LongueurPartieDecimale}}\do{% \StrMid{\PartieDecimaleFractionDeci}{##1}{##1}[\ChiffrePartieDecimale]% - \xintifForFirst{}{+}\frac{\ifboolKV[ClesFracDeci]{Remediation}{\pointilles[\PfCLongueurP]}{\num{\ChiffrePartieDecimale}}}{\num{\fpeval{10**(\LongueurFracDeciDeno-1-\LongueurPartieDecimale+##1)}}}% + \xintifForFirst{}{+}\frac{\ifboolKV[ClesFracDeci]{Remediation}{\pointilles[\PfCLongueurP]}{\num{\ChiffrePartieDecimale}}}{\ifboolKV[ClesFracDeci]{Vides}{\pointilles[\PfCLongueurP]}{\num{\fpeval{10**(\LongueurFracDeciDeno-1-\LongueurPartieDecimale+##1)}}}}% }% }% }% }{% \ensuremath{% - \xintifboolexpr{\PartieEntiereFractionDeci == 0}{}{\ifboolKV[ClesFracDeci]{Remediation}{\pointilles[\PfCLongueurP]}{\num{\PartieEntiereFractionDeci}}+}\frac{\ifboolKV[ClesFracDeci]{Remediation}{\pointilles[\PfCLongueurP]}{\num{\PartieDecimaleFractionDeci}}}{\num{\FractionDeciDeno}}% + \xintifboolexpr{\PartieEntiereFractionDeci == 0}{}{\ifboolKV[ClesFracDeci]{Remediation}{\pointilles[\PfCLongueurP]}{\num{\PartieEntiereFractionDeci}}+}\frac{\ifboolKV[ClesFracDeci]{Remediation}{\pointilles[\PfCLongueurP]}{\num{\PartieDecimaleFractionDeci}}}{\ifboolKV[ClesFracDeci]{Vides}{\pointilles[\PfCLongueurP]}{\num{\FractionDeciDeno}}}% }% }% }% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDecomposerNombrePremier.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDecomposerNombrePremier.tex index bf1a28e3334..a741919482c 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCDecomposerNombrePremier.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCDecomposerNombrePremier.tex @@ -1,10 +1,19 @@ %%% % Nombre Premier %%% -\setKVdefault[ClesNombrePremier]{Tableau=false,TableauVide=false,TableauVertical=false,TableauVerticalVide=false,Exposant=false,Longue=false,All=false,Arbre=false,ArbreVide=false,ArbreComplet=false,ArbreDessine=false,ArbreDessineVide=false,Entoure=false,Entourefin=false,Diviseurs=false,DiviseursT=false,Dot=\dotfill,Impose=false,ImposeAll=false,Potence=false,Decalage=10,Vide=false,CouleurFeuillage=ForestGreen,CouleurTronc=BurlyWood,CouleurFruits=Red,CouleurTexte=white}% +\def\filedateDecompNbPremier{2024/09/01}% +\def\fileversionDecompNbPremier{0.1a}% +\message{-- \filedateDecompNbPremier\space v\fileversionDecompNbPremier}% +% +\setKVdefault[ClesNombrePremier]{Tableau=false,TableauVide=false,TableauVertical=false,TableauVerticalVide=false,Exposant=false,Longue=false,All=false,Arbre=false,ArbreVide=false,ArbreComplet=false,ArbreDessine=false,ArbreDessineVide=false,Entoure=false,Entourefin=false,Diviseurs=false,DiviseursT=false,Dot=\dotfill,Impose=false,ImposeAll=false,Potence=false,Decalage=10,Vide=false,CouleurFeuillage=ForestGreen,CouleurTronc=BurlyWood,CouleurFruits=Red,CouleurTexte=white,Poisson=false,Echelle=1cm,AngleArete=45,CouleurPoisson=white,Visible=false,Solution=false}% \defKV[ClesNombrePremier]{Nombre=\ifboolKV[ClesNombrePremier]{ArbreDessine}{}{\ifboolKV[ClesNombrePremier]{ArbreDessineVide}{}{\setKV[ClesNombrePremier]{Impose}}}}% \defKV[ClesNombrePremier]{AllNombre=\setKV[ClesNombrePremier]{ImposeAll}}% -\defKV[ClesNombrePremier]{Impression=\setKV[ClesNombrePremier]{CouleurFeuillage=white,CouleurTronc=white,CouleurFruits=gris,CouleurTexte=black}} +\defKV[ClesNombrePremier]{Impression=\setKV[ClesNombrePremier]{CouleurFeuillage=white,CouleurTronc=white,CouleurFruits=gris,CouleurTexte=black}}% +\defKV[ClesNombrePremier]{ElementsVisibles=\setKV[ClesNombrePremier]{Visible}\setKV[ClesNombrePremier]{Vide}}% +\defKV[ClesNombrePremier]{CouleurSolution=\setKV[ClesNombrePremier]{Solution}}% + +\newtoks\tokNPElementsVisibles% +\def\UpdatetoksElementAfficher#1\nil{\addtotok\tokNPElementsVisibles{#1,}}% \newcommand\Decomposition[2][]{% \useKVdefault[ClesNombrePremier]% @@ -26,6 +35,136 @@ \ifboolKV[ClesNombrePremier]{ArbreDessineVide}{\setKV[ClesNombrePremier]{Vide=true}\MPArbreDessine{#2}{\useKV[ClesNombrePremier]{Nombre}}}{}% \ifboolKV[ClesNombrePremier]{Diviseurs}{\ListeDiviseur{#2}}{}% \ifboolKV[ClesNombrePremier]{DiviseursT}{\ListeDiviseurT{#2}}{}% + \ifboolKV[ClesNombrePremier]{Poisson}{% + \tokNPElementsVisibles{}% + \PfCTousLesDiviseurs{#2}% + \ifboolKV[ClesNombrePremier]{Visible}{% + \xdef\foo{\useKV[ClesNombrePremier]{ElementsVisibles}}% + \readlist*\ListeElementsAAfficher{\foo}% + }{% + \xdef\foo{-1}\readlist*\ListeElementsAAfficher{\foo}% + }% + \foreachitem\compteur\in\ListeElementsAAfficher{\expandafter\UpdatetoksElementAfficher\compteur\nil}% + \MPFish{\PfCPileDiviseurs}{#2}{\the\tokNPElementsVisibles}% + }{}% +}% + +\newcommand\PfCTousLesDiviseurs[1]{% + %#1 : le nombre entier \`a tester + \xdef\anpl{#1}%\relax% + \xdef\bnpl{2}%\relax% + \xdef\pilebl{2}%\relax% + \xdef\PfCPileDiviseurs{1}% + \loop + \ifnum\fpeval{\bnpl}<\fpeval{\anpl}\relax + \modulo{\fpeval{\anpl}}{\fpeval{\bnpl}} + \ifnum\remainder=0\relax + \xdef\PfCPileDiviseurs{\PfCPileDiviseurs,\fpeval{\bnpl}}% + \fi + \xdef\bnpl{\fpeval{\bnpl+1}}% + \repeat + \xdef\PfCPileDiviseurs{\PfCPileDiviseurs,#1}% +}%% + +\def\MPFish#1#2#3{ + \ifluatex + \mplibforcehmode% + \mplibnumbersystem{double}% + \begin{mplibcode} + Echelle=\useKV[ClesNombrePremier]{Echelle}; + AngleArete=\useKV[ClesNombrePremier]{AngleArete}; + + boolean Vide,Visible,Solution; + Vide=\useKV[ClesNombrePremier]{Vide}; + Visible=\useKV[ClesNombrePremier]{Visible}; + Solution=\useKV[ClesNombrePremier]{Solution}; + + color CoulTete,CoulSol; + CoulTete=\useKV[ClesNombrePremier]{CouleurPoisson}; + if Solution: + CoulSol=\useKV[ClesNombrePremier]{CouleurSolution}; + fi; + + numeric Diviseurs[]; + vardef LectureDiviseurs(text t)= + n:=0; + for p_=t: + n:=n+1; + Diviseurs[n]=p_; + endfor; + enddef; + + LectureDiviseurs(#1); + TotalDiviseurs:=n; + + boolean RETOUR; + RETOUR=false; + + vardef TestVisible(expr nrt)= + RETOUR:=false; + for p_=#3: + if p_=nrt: + RETOUR:=true; + fi; + endfor; + enddef; + + + pair Ah[],Ab[],O[],Ac; + O0=(0,0); + O[-1]=O0+Echelle*(0,1); + O[-2]=O0+Echelle*(0,-1); + fill (arccercle(O[-1],O[-2],O0)--cycle) withcolor CoulTete; + trace arccercle(O[-1],O[-2],O0)--cycle; + label.lft(TEX("\num{"&decimal(#2)&"}"),O0); + % + for k=1 upto (TotalDiviseurs div 2): + if k=1:Echelle:=Echelle/2;fi; + O[k]-O[k-1]=Echelle*(1,0); + if k=1:Echelle:=Echelle*2;fi; + Ah[k]-O[k]=Echelle*(cosd(AngleArete),sind(AngleArete)); + Ab[k]-O[k]=Echelle*(cosd(AngleArete),-sind(AngleArete)); + draw O[k-1]--O[k]; + draw Ah[k]--O[k]--Ab[k]; + if Vide=false: + label.top(TEX("\num{"&decimal(Diviseurs[k])&"}"),Ah[k]); + label.bot(TEX("\num{"&decimal(Diviseurs[TotalDiviseurs+1-k])&"}"),Ab[k]); + else: + if Visible: + TestVisible(Diviseurs[k]); + if RETOUR: + label.top(TEX("\num{"&decimal(Diviseurs[k])&"}"),Ah[k]); + else: + if Solution: + drawoptions(withcolor CoulSol); + label.top(TEX("\num{"&decimal(Diviseurs[k])&"}"),Ah[k]); + drawoptions(); + fi; + fi; + TestVisible(Diviseurs[TotalDiviseurs+1-k]); + if RETOUR: + label.bot(TEX("\num{"&decimal(Diviseurs[TotalDiviseurs+1-k])&"}"),Ab[k]); + else: + if Solution: + drawoptions(withcolor CoulSol); + label.bot(TEX("\num{"&decimal(Diviseurs[TotalDiviseurs+1-k])&"}"),Ab[k]); + drawoptions(); + fi; + fi; + fi; + fi; + endfor; + if (TotalDiviseurs mod 2)<>0: + Ac-O[TotalDiviseurs div 2]=Echelle*(1,0); + draw Ac--O[TotalDiviseurs div 2]; + if Vide=false: + label.rt(TEX("\num{"&decimal(Diviseurs[(TotalDiviseurs+1) div 2])&"}"),Ac); + fi; + fi; + \end{mplibcode} + \else + % + \fi }% \def\MPArbre#1{% @@ -824,13 +963,13 @@ \begin{tabular}{c|c}% 1&\num{#1}\\ \xintFor* ##1 in {\xintSeq {1}{\fpeval{(\cnpT+1)/2}}}\do{% - \DiviseurNumero{#1}{##1}\num{\fpeval{\dnpT}}\uppercase{&}\DiviseurNumero{#1}{##1}\xintifboolexpr{\dnpT=\fpeval{#1/\dnpT}}{}{\num{\fpeval{#1/\dnpT}}}\\ + \DiviseurNumero{#1}{##1}\num{\fpeval{\dnpT}}\uppercase{&}\DiviseurNumero{#1}{##1}\xintifboolexpr{\dnpT==\fpeval{#1/\dnpT}}{\num{\fpeval{\dnpT}}}{\num{\fpeval{#1/\dnpT}}}\\ } \end{tabular}% \else% \begin{tabular}{c|c} 1&\num{#1} - \ifnum\cnpT>2\relax\\ + \ifnum\cnpT>1\relax\\ \xintFor* ##1 in {\xintSeq {1}{\fpeval{\cnpT/2}}}\do{% \DiviseurNumero{#1}{##1}\num{\fpeval{\dnpT}}\uppercase{&}\DiviseurNumero{#1}{##1}\num{\fpeval{#1/\dnpT}}\\ } diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDefiCalc.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDefiCalc.tex index 6d850f80126..089b51658ab 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCDefiCalc.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCDefiCalc.tex @@ -1,6 +1,10 @@ %%% % Defi Calculatrice %%% +\def\filedateDefiCalc{2024/08/04}% +\def\fileversionDefiCalc{0.1}% +\message{-- \filedateDefiCalc\space v\fileversionDefiCalc}% +% \setKVdefault[DefiCalculatrice]{NbCasesNoires=6,ListeTouches={!},Impression=false}% \newtoks\toktexteecran{} diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDefiTables.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDefiTables.tex index 340d598e2f8..79ad1064ebd 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCDefiTables.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCDefiTables.tex @@ -1,7 +1,10 @@ %%% % Defi Table %%% - +\def\filedateDefiTables{2024/08/04}% +\def\fileversionDefiTables{0.1}% +\message{-- \filedateDefiTables\space v\fileversionDefiTables}% +% \setKVdefault[DefiTable]{Solution=false,Math=false,LargeurT=5mm,Graines=false,Creation=false,ValeurMin=1,ValeurMax=10,Restreint=false} \defKV[DefiTable]{Graine=\setKV[DefiTable]{Graines}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDessinAlgo.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDessinAlgo.tex index 85274cac81c..092aa5e8257 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCDessinAlgo.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCDessinAlgo.tex @@ -1,6 +1,10 @@ %%% % Dessin Algo %%% +\def\filedateDessinAlgo{2024/08/04}% +\def\fileversionDessinAlgo{0.1}% +\message{-- \filedateDessinAlgo\space v\fileversionDessinAlgo}% +% \newtoks\tokDessinAlgo% \def\UpdatetoksDA#1\nil{\addtotok\tokDessinAlgo{#1,}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDessinGradue.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDessinGradue.tex index 3bfacac68c2..bd83bb62404 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCDessinGradue.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCDessinGradue.tex @@ -1,6 +1,10 @@ %%% % Dessin Gradue %%% +\def\filedateDessinGradue{2024/08/04}% +\def\fileversionDessinGradue{0.1}% +\message{-- \filedateDessinGradue\space v\fileversionDessinGradue}% +% \setKVdefault[DessinGradue]{Lignes=10,Debut=-5,Fin=5,Pas=10,Solution=false,EcartVertical=1.5,LignesIdentiques,Longueur=10,Echelle=1,Droites=false,DemiDroites=false,OrigineVariable=false,Code=false} \defKV[DessinGradue]{Traces=\setKV[DessinGradue]{Code}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDessinerRatio.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDessinerRatio.tex index 27922bdd038..bbb24cb99cd 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCDessinerRatio.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCDessinerRatio.tex @@ -1,6 +1,10 @@ %%% % Lien : ratio %%% +\def\filedateDessinRatio{2024/08/04}% +\def\fileversionDessinRatio{0.1}% +\message{-- \filedateDessinRatio\space v\fileversionDessinRatio}% +% \setKVdefault[ClesRatio]{FigureCours=false,Figure=false,Longueur=5cm,TexteTotal=quantit\'e,TextePart=part,Tableau=false,GrandeurA=Grandeur A,GrandeurB=Part(s),Largeur=1cm,Stretch=1,Nom=false,CouleurUn=gris,CouleurDeux=0.5gris+0.5blanc,CouleurTrois=white,CouleurTab=gray!15,ModeleCouleur=5} \newcommand\MPTest[9][]{% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDiagrammeRadar.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDiagrammeRadar.tex index cbed30414d5..70180f2a315 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCDiagrammeRadar.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCDiagrammeRadar.tex @@ -1,6 +1,10 @@ %%% % Radar %%% +\def\filedateRadar{2024/08/04}% +\def\fileversionRadar{0.1}% +\message{-- \filedateRadar\space v\fileversionRadar}% +% \setKVdefault[ClesRadar]{Rayon=3cm,Reference=20,MoyenneClasse=false,Disciplines=false,Pas=5} \newtoks\toklisteradara%pour la moyenne de l'\'el\`eve diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDistributivite.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDistributivite.tex index ad0dd8885d8..b8a9dc57fc5 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCDistributivite.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCDistributivite.tex @@ -1,6 +1,9 @@ %%% % Distributivit\'e %%% +\def\filedateDistributivite{2024/08/04}% +\def\fileversionDistributivite{0.1}% +\message{-- \filedateDistributivite\space v\fileversionDistributivite}% % https://tex.stackexchange.com/questions/168972/draw-arrows-to-show-multiplication-pattern-distributive-property/169278?noredirect=1 \newcommand\Tikzmark[1]{% \tikz[remember picture,baseline,inner sep=0pt]{% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDobble.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDobble.tex index 2767a20c500..c00592b393f 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCDobble.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCDobble.tex @@ -1,8 +1,10 @@ %%% % dobble %%% +\def\filedateDobble{2024/08/04}% +\def\fileversionDobble{0.1}% +\message{-- \filedateDobble\space v\fileversionDobble}% % by Maxime Chupin - \NewDocumentCommand\dobble{m}{% \directlua{ require('PfCdobble.lua') diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDomino.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDomino.tex index 49cf667c163..338dc07bb7b 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCDomino.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCDomino.tex @@ -1,6 +1,10 @@ %%% % Domino %%% +\def\filedateDomino{2024/08/04}% +\def\fileversionDomino{0.1}% +\message{-- \filedateDomino\space v\fileversionDomino}% +% \newtcolorbox{MyDominoMini}[1][]{% enhanced, nobeforeafter, diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCDontCountDots.tex b/Master/texmf-dist/tex/latex/profcollege/PfCDontCountDots.tex index e395500a3c3..ea6761035e2 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCDontCountDots.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCDontCountDots.tex @@ -1,3 +1,9 @@ +%%% +% Ne compte pas +%%% +\def\filedateDontCount{2024/08/04}% +\def\fileversionDontCount{0.1}% +\message{-- \filedateDontCount\space v\fileversionDontCount}% % D'après twitter : https://twitter.com/DavidKButlerUoA/status/1700612346258002030/photo/1 \setKVdefault[NCPP]{Largeur=5,Longueur=7,Unite=5mm,Rayon=1mm,Multiple=3,Couleur=black,Solution=false,Graines=false}% \defKV[NCPP]{Graine=\setKV[NCPP]{Graines}\PfCGraineAlea{#1}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCEcrireunQCM.tex b/Master/texmf-dist/tex/latex/profcollege/PfCEcrireunQCM.tex index f39b93ea469..372efa97842 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCEcrireunQCM.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCEcrireunQCM.tex @@ -1,7 +1,11 @@ %%% % QCM %%% -\setKVdefault[ClesQCM]{Reponses=3,Solution=false,Stretch=1,Largeur=60pt,Couleur=gray!15,Titre=false,Nom=R\'eponse,NomV=Vrai,NomF=Faux,Alph=false,AlphT=false,VF=false,Depart=1,Alterne=false,Noms={A/B/C},Multiple=false,Parties={Yeux,Nez,Bouche},CouleurAlt=gray!15,Seul=false,ACompleter=false}% +\def\filedateQCM{2024/08/04}% +\def\fileversionQCM{0.1}% +\message{-- \filedateQCM\space v\fileversionQCM}% +% +\setKVdefault[ClesQCM]{Reponses=3,Solution=false,Stretch=1,Largeur=60pt,Couleur=gray!15,Titre=false,Nom=R\'eponse,NomV=Vrai,NomF=Faux,Alph=false,AlphT=false,VF=false,Depart=1,Alterne=false,Noms={A/B/C},Multiple=false,Parties={Yeux,Nez,Bouche},CouleurAlt=gray!15,Seul=false,ACompleter=false,AllSeul=false}% \newlength{\LargeurQCM}% \newlength{\PfCLargeurQCM}% \newcounter{QuestionQCM}% @@ -34,6 +38,23 @@ \fi% }% +\NewDocumentCommand\PfCQCMSMultiChoixLabelSol{mm}{% + \xdef\PfCFooChoixLabel{\ListeQCM[#1,\fpeval{\NumeroReponse}]}% + \setsepchar{-}% + \readlist*\PfCSolListeReponses{\PfCFooChoixLabel}% + \xdef\RetiensSiSol{0}% + \xintFor* ##3 in{\xintSeq{1}{\PfCSolListeReponseslen}}\do{% + \ifnum#2=\PfCSolListeReponses[##3]\relax% + \xdef\RetiensSiSol{\fpeval{\RetiensSiSol+1}}% + \fi% + }% + \ifnum\RetiensSiSol>0\relax% + $\blacksquare$% + \else% + $\square$% + \fi% +}% + \NewDocumentCommand\QCMSeul{om}{% \useKVdefault[QCMSeul]% \setKV[QCMSeul]{#1}% @@ -173,6 +194,36 @@ \newcommand\QCM[2][]{% \useKVdefault[ClesQCM]% \setKV[ClesQCM]{#1}% + \ifboolKV[ClesQCM]{AllSeul}{% + \setKV[QCMSeul]{#1} + \setsepchar[*]{,*&}\ignoreemptyitems% + \readlist*\ListeQCM{#2}% + \reademptyitems% + \setcounter{QuestionQCM}{\fpeval{\useKV[ClesQCM]{Depart}-1}}% + \xdef\NumeroReponse{\fpeval{\useKV[ClesQCM]{Reponses}+2}}% + \begin{enumerate} + \xintFor* ##1 in {\xintSeq {1}{\ListeQCMlen}}\do{% + \item\ListeQCM[##1,1]% + \ifboolKV[QCMSeul]{EnColonne}{\begin{multicols}{\useKV[QCMSeul]{Colonnes}}}{}% + \ifboolKV[QCMSeul]{LabelLettre}{ + \begin{enumerate}[label=\Alph{*}/] + }{% + \begin{enumerate}[label=$\square$] + }% + \xintFor* ##2 in{\xintSeq{1}{\fpeval{\NumeroReponse-2}}}\do{% + \xdef\Titi{##2} + \ifboolKV[QCMSeul]{Solution}{% + \item[\PfCQCMSMultiChoixLabelSol{##1}{##2}]% + }{% + \item% + }% + \ListeQCM[##1,\fpeval{##2+1}] + }% + \end{enumerate} + \ifboolKV[QCMSeul]{EnColonne}{\end{multicols}}{}% + }% + \end{enumerate} + }{% \ifboolKV[ClesQCM]{Seul}{% \QCMSeul[#1]{#2}% }{% @@ -248,6 +299,7 @@ }% }% }% +}% \NewDocumentCommand\PfCSolCellColor{mm}{% \xdef\PfCFooSolColor{\ListeQCM[#1,\NumeroReponse]}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCEcritureLettres.tex b/Master/texmf-dist/tex/latex/profcollege/PfCEcritureLettres.tex index 11ae58b5b71..f80bc938669 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCEcritureLettres.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCEcritureLettres.tex @@ -1,6 +1,10 @@ %%% % Ecriture des nombres en lettres %%% +\def\filedateEcrireLettres{2024/08/04}% +\def\fileversionEcrireLettres{0.1}% +\message{-- \filedateEcrireLettres\space v\fileversionEcrireLettres}% +% \setKVdefault[ClesEcriture]{Math=false,Majuscule=false,E=false,Tradition=false,Zero=false}% \newcommand\EcriturePluriel[1]{% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCEcritureUnites.tex b/Master/texmf-dist/tex/latex/profcollege/PfCEcritureUnites.tex index c4503954b3b..05e593623cd 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCEcritureUnites.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCEcritureUnites.tex @@ -1,6 +1,10 @@ %%% % Ecritures d'unit\'es %%% +\def\filedateEcrireUnites{2024/08/04}% +\def\fileversionEcrireUnites{0.1}% +\message{-- \filedateEcrireUnites\space v\fileversionEcrireUnites}% +% \setKVdefault[Unites]{m=false,km=false,hm=false,ha=false,dam=false,a=false,dm=false,cm=true,mm=false,um=false,nm=false,g=true,t=false,q=false,kg=false,hg=false,dag=false,dg=false,cg=false,mg=false,ug=false,ng=false,mmin=false,kmh=true,kms=false,ms=false,mh=false,kgm=false,gcm=true,L=true,kL=false,hL=false,daL=false,dL=false,cL=false,mL=false,l=true,kl=false,hl=false,dal=false,dl=false,cl=false,ml=false,Go=true,Mo=false,ko=false,To=false,o=false,kWh=true,C=true,K=false,F=false,Nombre,US=false,UK=false,CFA=false,CFP=false,CHF=false,Euro=false,Precision=2}% \defKV[Unites]{Dots=\setKV[Unites]{Nombre=false}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCEngrenagesBase.tex b/Master/texmf-dist/tex/latex/profcollege/PfCEngrenagesBase.tex index fc1674d37ff..58553f57f8b 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCEngrenagesBase.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCEngrenagesBase.tex @@ -1,11 +1,14 @@ %%% % Engrenages %%% +\def\filedateEngrenages{2024/08/04}% +\def\fileversionEngrenages{0.1}% +\message{-- \filedateEngrenages\space v\fileversionEngrenages}% +% \newtoks\tokPfCEngrenages% \def\UpdatetoksEngrenages#1/#2\nil{\addtotok\tokPfCEngrenages{#1,#2,}}% \setKVdefault[Engrenages]{Couleur=LightSteelBlue,Unite=3mm,ListeCouleurs={?}}% -%\defKV[Engrenages]{Couleur=\setKV[Engrenages]{ListeCouleurs=#1}}% \NewDocumentCommand\Engrenages{o m}{% \newtoks\toklistecouleur% @@ -24,7 +27,6 @@ \xdef\ListeAvantCouleurs{\useKV[Engrenages]{ListeCouleurs}}% \readlist*\ListeCouleur{\ListeAvantCouleurs}% \foreachitem\couleur\in\ListeCouleur{\expandafter\UpdateCoul\couleur\nil}% - %\setKV[Engrenages]{Couleurs=\ListeCouleur[1]}% \BuildEngrenages{\PfCFooEngrenages}{\the\toklistecouleur}% }% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCEnigmeAire.tex b/Master/texmf-dist/tex/latex/profcollege/PfCEnigmeAire.tex index 345f7416560..1840d8b0e39 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCEnigmeAire.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCEnigmeAire.tex @@ -1,6 +1,10 @@ %%% % Enigme Aire %%% +\def\filedateEnigmeAire{2024/08/04}% +\def\fileversionEnigmeAire{0.1}% +\message{-- \filedateEnigmeAire\space v\fileversionEnigmeAire}% +% \setKVdefault[EnigmeAire]{Modele=A,Couleur=LightSteelBlue,Echelle=7mm,Etape=1,Solution=false,Graines=false} \defKV[EnigmeAire]{Graine=\setKV[EnigmeAire]{Graines}} diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCEnquete.tex b/Master/texmf-dist/tex/latex/profcollege/PfCEnquete.tex index 678b268c57d..5dfc36587cb 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCEnquete.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCEnquete.tex @@ -1,6 +1,10 @@ %%% % Enquête %%% +\def\filedateEnquete{2024/08/04}% +\def\fileversionEnquete{0.1}% +\message{-- \filedateEnquete\space v\fileversionEnquete}% +% \setKVdefault[ClesEnquete]{Perso=Qui ?,Objet=Quoi ?,Lieu=Où ?,Largeur=4.5cm} \newcommand\Enquete[1][]{% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCEratosthene.tex b/Master/texmf-dist/tex/latex/profcollege/PfCEratosthene.tex index 192e470e66b..5374c485d2a 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCEratosthene.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCEratosthene.tex @@ -1,3 +1,10 @@ +%%% +% Crible Eratostene +%%% +\def\filedateEratos{2024/08/04}% +\def\fileversionEratos{0.1}% +\message{-- \filedateEratos\space v\fileversionEratos}% +% \setKVdefault[ClesEra]{Premier=false,Nombre=1,CouleurP=Cornsilk!50,CouleurNP=Crimson!15,Colonnes=10,Lignes=10,Hauteur=24pt}% \NewDocumentCommand\TestPremier{m}{% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCFactorisation.tex b/Master/texmf-dist/tex/latex/profcollege/PfCFactorisation.tex index 823f2036237..bdcea30d9db 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCFactorisation.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCFactorisation.tex @@ -1,3 +1,10 @@ +%%% +% Factorisation +%%% +\def\filedateFactorisation{2024/08/04}% +\def\fileversionFactorisation{0.1}% +\message{-- \filedateFactorisation\space v\fileversionFactorisation}% +% \setKVdefault[Facto]{Aide=false,AideMul=false,Couleur=Crimson,NomExpression=A,Lettre=x,Details,Formel=false,VariableSup=false,ParenthesesFin=false,Finale=false,Type=0} \defKV[Facto]{Litteral=\setKV[Facto]{Details=false}} \defKV[Facto]{AutreVariable=\setKV[Facto]{VariableSup}} diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCFicheMemo.tex b/Master/texmf-dist/tex/latex/profcollege/PfCFicheMemo.tex index 511e47da2f1..e2dfc25f137 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCFicheMemo.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCFicheMemo.tex @@ -1,6 +1,10 @@ %%% % Fiche m\'emorisation active %%% +\def\filedateFicheMemo{2024/08/04}% +\def\fileversionFicheMemo{0.1}% +\message{-- \filedateFicheMemo\space v\fileversionFicheMemo}% +% \setKVdefault[ClesFicheMemo]{TexteReponses=Réponses,TexteQuestions=Questions,Solution=false,Largeur=\linewidth} \newcommand\FicheMemo[3][]{% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCFonctionAffine.tex b/Master/texmf-dist/tex/latex/profcollege/PfCFonctionAffine.tex index 5b95ddb02ec..26777eaac0e 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCFonctionAffine.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCFonctionAffine.tex @@ -1,6 +1,10 @@ %%% % Fonction Affine %%% +\def\filedateAffine{2024/08/04}% +\def\fileversionAffine{0.1}% +\message{-- \filedateAffine\space v\fileversionAffine}% +% \setKVdefault[ClesAffine]{Nom=f,Variable=x,CoefDir=a,OrdoOrig=b,Ligne=false,Image=false,Antecedent=false,Graphique=false,Retrouve=false,ProgCalcul=false,Unitex=1,Unitey=1,VoirCoef=false,ACoef=0,Redaction=false,Ecriture=false,Definition=false,Centre=false}%ACoefficient=false%: inutile ? \newcommand\FonctionAffine[5][]{% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCFractionAireCarre.tex b/Master/texmf-dist/tex/latex/profcollege/PfCFractionAireCarre.tex index dbfe8109d21..8fe19930167 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCFractionAireCarre.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCFractionAireCarre.tex @@ -1,6 +1,10 @@ %%% % Fraction d'aire d'un carré %%% +\def\filedateFractionCarre{2024/08/04}% +\def\fileversionFractionCarre{0.1}% +\message{-- \filedateFractionCarre\space v\fileversionFractionCarre}% +% \setKVdefault[JeuAireCarre]{Couleur=LightSteelBlue,CouleurFond=Cornsilk,Perso=false,Graines=false,Parts=3,Longueur=4,NbPoints=2,Angle=0}% \defKV[JeuAireCarre]{Graine=\setKV[JeuAireCarre]{Graines}\PfCGraineAlea{#1}}% \defKV[JeuAireCarre]{ListeParts=\setKV[JeuAireCarre]{Perso}\xdef\PfCFooJeuAireCarre{#1}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCFractionNombre.tex b/Master/texmf-dist/tex/latex/profcollege/PfCFractionNombre.tex index 52512fb83ef..20d1d1e93ac 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCFractionNombre.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCFractionNombre.tex @@ -1,6 +1,10 @@ %%% % Fraction Nombre %%% +\def\filedateFractionNombre{2024/08/04}% +\def\fileversionFractionNombre{0.1}% +\message{-- \filedateFractionNombre\space v\fileversionFractionNombre}% +% \newtoks\tokFractionNombrePerso% \def\UpdatetoksFN#1\nil{\addtotok\tokFractionNombrePerso{"#1",}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCFrise.tex b/Master/texmf-dist/tex/latex/profcollege/PfCFrise.tex index a07d2a931bd..c56b2c6f4f6 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCFrise.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCFrise.tex @@ -1,6 +1,10 @@ %%% % Frise temporelle %%% +\def\filedateFrise{2024/08/04}% +\def\fileversionFrise{0.1}% +\message{-- \filedateFrise\space v\fileversionFrise}% +% \setKVdefault[ClesFrise]{Longueur=8cm,Fleches=false,Ecart=5mm,Sup=false}% \newtoks\toklistefrise% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCFubuki.tex b/Master/texmf-dist/tex/latex/profcollege/PfCFubuki.tex index 0ce7af2ffa4..fd1f973bfd1 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCFubuki.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCFubuki.tex @@ -1,3 +1,10 @@ +%%% +% Fubuki +%%% +\def\filedateFubuki{2024/08/04}% +\def\fileversionFubuki{0.1}% +\message{-- \filedateFubuki\space v\fileversionFubuki}% +% \setKVdefault[Fubuki]{Largeur=20pt,Solution=false,Indice=false,Sommes=false,Couleur=LightSteelBlue,Perso=false,Vierge=false}% \defKV[Fubuki]{Graine=\PfCGraineAlea{#1}}% \defKV[Fubuki]{Indices=\setKV[Fubuki]{Indice}\xdef\PfCFooListeIndices{#1}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCFutoshiki.tex b/Master/texmf-dist/tex/latex/profcollege/PfCFutoshiki.tex index 4603265e0e5..300bdd43d0c 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCFutoshiki.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCFutoshiki.tex @@ -1,6 +1,10 @@ %%% % Futoshiki %%% +\def\filedateFutoshiki{2024/08/04}% +\def\fileversionFutoshiki{0.1}% +\message{-- \filedateFutoshiki\space v\fileversionFutoshiki}% +% \setKVdefault[Futo]{Largeur=15pt,Solution=false,CouleurSolution=Black,CouleurCase=Cornsilk,StyleTexte={}} \newlength\PfCFutoHeight diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCGaram.tex b/Master/texmf-dist/tex/latex/profcollege/PfCGaram.tex index 7e04378a93b..fd5a97439cf 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCGaram.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCGaram.tex @@ -1,17 +1,21 @@ %%% % Garam %%% -\setKVdefault[Garam]{Taille=7,Largeur=15pt,Solution=false,CouleurSolution=Black} +\def\filedateGaram{2024/08/04}% +\def\fileversionGaram{0.1}% +\message{-- \filedateGaram\space v\fileversionGaram}% +% +\setKVdefault[Garam]{Taille=7,Largeur=15pt,Solution=false}% +\defKV[Garam]{CouleurSolution=\setKV[Garam]{Solution}\colorlet{PfCGaramCoulSol}{#1}}% \newlength\PfCGaramHeight \NewDocumentCommand\Garam{o m}{% - \useKVdefault[Garam] + \useKVdefault[Garam]% \setKV[Garam]{#1}% \setlength{\PfCGaramHeight}{\useKV[Garam]{Largeur}+\tabcolsep}% \reademptyitems% \setsepchar[*]{§*,*/}% \readlist*\PfCListeGaram{#2}% - \colorlet{PfCGaramCoulSol}{\useKV[Garam]{CouleurSolution}}% \begin{NiceTabular}{*{\useKV[Garam]{Taille}}{m{\useKV[Garam]{Largeur}}}} \CodeBefore \xintFor* ##1 in{\xintSeq{2}{\fpeval{\useKV[Garam]{Taille}}}}\do{% @@ -26,7 +30,7 @@ \rule{0pt}{\PfCGaramHeight}\xintFor* ##2 in {\xintSeq{1}{\useKV[Garam]{Taille}}}\do{% \xintifForFirst{}{&}\StrChar{\PfCListeGaram[##1,##2,1]}{1}[\PfCCaracGaram]% \IfStrEq{\PfCCaracGaram}{*}{\Block[draw,fill=black]{1-1}{}}{% - \IfStrEq{\PfCCaracGaram}{!}{\Block{}{\ifboolKV[Garam]{Solution}{\StrGobbleLeft{\PfCListeGaram[##1,##2,1]}{1}}{}}}{\Block{}{\color{PfCGaramCoulSol}\PfCListeGaram[##1,##2,1]}}% + \IfStrEq{\PfCCaracGaram}{!}{\Block{}{\ifboolKV[Garam]{Solution}{\color{PfCGaramCoulSol}\StrGobbleLeft{\PfCListeGaram[##1,##2,1]}{1}}{}}}{\Block{}{\PfCListeGaram[##1,##2,1]}}% }% }\\ }% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCGeometrie.tex b/Master/texmf-dist/tex/latex/profcollege/PfCGeometrie.tex index ad7e495f044..9bb83ad50d6 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCGeometrie.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCGeometrie.tex @@ -1,6 +1,10 @@ %%% % Geometrie %%% +\def\filedateGeometrie{2024/08/04}% +\def\fileversionGeometrie{0.1}% +\message{-- \filedateGeometrie\space v\fileversionGeometrie}% +% \setKVdefault[Geometrie]{CoinBG={(0,0)},CoinHD={(10u,10u)},TypeTrace="Instruments",Clip,Cadres=false,Epaisseur=1,Pointilles=false,Ombre=false,Couleur=black,Ecart=2,ModeleCouleur=5}% \defKV[Geometrie]{Cadre=\setKV[Geometrie]{Cadres}\setKV[Geometrie]{Clip=false}}% @@ -42,6 +46,9 @@ elseif \useKV[Geometrie]{TypeTrace}="Espace": typetrace:="3D"; typerepre:="persp"; + elseif \useKV[Geometrie]{TypeTrace}="Schema": + input PfCSketch; + sketchypaths; fi; xa:=xpart(Coinbg); xb:=xpart(Coinhd); @@ -120,6 +127,9 @@ elseif \useKV[Geometrie]{TypeTrace}="Espace": typetrace:="3D"; typerepre:="persp"; + elseif \useKV[Geometrie]{TypeTrace}="Schema": + input PfCSketch; + sketchypaths; fi;} ]% xa:=xpart(Coinbg); diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCGrades.tex b/Master/texmf-dist/tex/latex/profcollege/PfCGrades.tex index 6155c43ca1d..d86c6e4e420 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCGrades.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCGrades.tex @@ -1,8 +1,12 @@ %%% % Grades %%% -\setKVdefault[Grades]{Solution=false,Longueur=9,Largeur=9,Echelle=8mm,Graines=false} -\defKV[Grades]{Graine=\setKV[Grades]{Graines}} +\def\filedateGrades{2024/08/04}% +\def\fileversionGrades{0.1}% +\message{-- \filedateGrades\space v\fileversionGrades}% +% +\setKVdefault[Grades]{Solution=false,Longueur=9,Largeur=9,Echelle=8mm,Graines=false}% +\defKV[Grades]{Graine=\setKV[Grades]{Graines}}% \NewDocumentCommand\Grades{o}{% \useKVdefault[Grades]% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCGrimuku.tex b/Master/texmf-dist/tex/latex/profcollege/PfCGrimuku.tex index 81e667533a3..9185b768929 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCGrimuku.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCGrimuku.tex @@ -1,6 +1,10 @@ %%% % Grimuku %%% +\def\filedateGrimuku{2024/08/04}% +\def\fileversionGrimuku{0.1}% +\message{-- \filedateGrimuku\space v\fileversionGrimuku}% +% \setKVdefault[Grimuku]{TLargeur=7,Solution=false,Largeur=30pt,CouleurCase=0.7white}% \defKV[Grimuku]{CouleurSolution=\setKV[Grimuku]{Solution}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCHiddenMessage.tex b/Master/texmf-dist/tex/latex/profcollege/PfCHiddenMessage.tex index f472e078443..65948f59498 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCHiddenMessage.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCHiddenMessage.tex @@ -1,6 +1,10 @@ %%% % Message caché %%% +\def\filedateHidden{2024/08/04}% +\def\fileversionHidden{0.1}% +\message{-- \filedateHidden\space v\fileversionHidden}% +% \setKVdefault[Hidden]{TLargeur=5,THauteur=3,Solution=false,Hauteur=70pt,Largeur=120pt,Jeu=false,Solution} \defKV[Hidden]{Plateau=\setKV[Hidden]{Jeu}\setKV[Hidden]{Solution=false}} diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCHorloge.tex b/Master/texmf-dist/tex/latex/profcollege/PfCHorloge.tex index 1133714ecdc..01af381977a 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCHorloge.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCHorloge.tex @@ -1,7 +1,11 @@ %%% % Horloges %%% -\setKVdefault[ClesHorloge]{Aiguilles,Numerique=false,Secondes,Cadre,Rayon=1,Impression=false} +\def\filedateHorloge{2024/08/12}% +\def\fileversionHorloge{0.1a}% +\message{-- \filedateHorloge\space v\fileversionHorloge}% +% +\setKVdefault[ClesHorloge]{Aiguilles,Numerique=false,Secondes,Cadre,Rayon=1,Impression=false,Sombre=false} \NewDocumentCommand\Horloge{ }{%On désactive les : \begingroup @@ -62,13 +66,19 @@ \ifluatex \mplibforcehmode \begin{mplibcode} - boolean Secondes,Impression; + boolean Secondes,Impression,Sombre; Secondes=\useKV[ClesHorloge]{Secondes}; Impression=\useKV[ClesHorloge]{Impression}; + Sombre=\useKV[ClesHorloge]{Sombre}; if Impression: + if Sombre: + LightSteelBlue:=0.8*white; + Crimson:=black; + else: LightSteelBlue:=0.9*white; Crimson:=0.5*white; fi; + fi; u:=0.5u; draw Afficheur(#1 div10,0); draw Afficheur(#1 mod10,0) shifted(u*(1,0)); @@ -80,9 +90,21 @@ draw Afficheur(#3 div10,0) shifted(u*(6,0)); draw Afficheur(#3 mod10,0) shifted(u*(7,0)); fi; + if Sombre: + draw bbox currentpicture; + fi; \end{mplibcode} \else - \begin{mpost}[mpsettings={boolean Secondes;Secondes=\useKV[ClesHorloge]{Secondes};}] + \begin{mpost}[mpsettings={boolean Secondes,Impression,Sombre;Secondes=\useKV[ClesHorloge]{Secondes};Impression=\useKV[ClesHorloge]{Impression};Sombre=\useKV[ClesHorloge]{Sombre};}] + if Impression: + if Sombre: + LightSteelBlue:=0.8*white; + Crimson:=black; + else: + LightSteelBlue:=0.9*white; + Crimson:=0.5*white; + fi; + fi; u:=0.5u; draw Afficheur(#1 div10,0); draw Afficheur(#1 mod10,0) shifted(u*(1,0)); @@ -94,6 +116,9 @@ draw Afficheur(#3 div10,0) shifted(u*(6,0)); draw Afficheur(#3 mod10,0) shifted(u*(7,0)); fi; + if Sombre: + draw bbox currentpicture; + fi; \end{mpost} \fi } diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCJeton.tex b/Master/texmf-dist/tex/latex/profcollege/PfCJeton.tex index e3012070f27..68523efce53 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCJeton.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCJeton.tex @@ -1,6 +1,10 @@ %%% % Jeton %%% +\def\filedateJeton{2024/08/04}% +\def\fileversionJeton{0.1}% +\message{-- \filedateJeton\space v\fileversionJeton}% +% \setKVdefault[Jeton]{Diametre=5mm,Impression=false}% \NewDocumentCommand\Jeton{om}{% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCJeuRangement.tex b/Master/texmf-dist/tex/latex/profcollege/PfCJeuRangement.tex index 6508e6cd1a9..df2f709271b 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCJeuRangement.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCJeuRangement.tex @@ -1,3 +1,10 @@ +%%% +% Jeu Rangement +%%% +\def\filedateJeuRangement{2024/08/04}% +\def\fileversionJeuRangement{0.1}% +\message{-- \filedateJeuRangement\space v\fileversionJeuRangement}% +% \setKVdefault[JeuRgt]{Creation=false,Deno=12,Graines=false,Largeur=15pt,Hauteur=20pt,Negatif=false,Decimaux=false,Solution=false,ValeurMin=2,ValeurMax=50,Exposants=false} \defKV[JeuRgt]{Graine=\setKV[JeuRgt]{Graines}}% \defKV[JeuRgt]{Exposant=\setKV[JeuRgt]{Exposants}\setKV[JeuRgt]{Deno=1}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCKakurasu.tex b/Master/texmf-dist/tex/latex/profcollege/PfCKakurasu.tex index 944d295e8fe..d608320b3e5 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCKakurasu.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCKakurasu.tex @@ -1,6 +1,10 @@ %%% % Kakurasu %%% +\def\filedateKakurasu{2024/08/04}% +\def\fileversionKakurasu{0.1}% +\message{-- \filedateKakurasu\space v\fileversionKakurasu}% +% \setKVdefault[Kakurasu]{Solution=false,Longueur=6,Largeur=6,Echelle=8mm,Graines=false,Trace=false} \defKV[Kakurasu]{Graine=\setKV[Kakurasu]{Graines}} \defKV[Kakurasu]{Traces=\setKV[Kakurasu]{Trace}} diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCKakuro.tex b/Master/texmf-dist/tex/latex/profcollege/PfCKakuro.tex index adf0aba7d21..b480f442757 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCKakuro.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCKakuro.tex @@ -1,6 +1,10 @@ %%% % Kakuro %%% +\def\filedateKakuro{2024/08/04}% +\def\fileversionKakuro{0.1}% +\message{-- \filedateKakuro\space v\fileversionKakuro}% +% \setKVdefault[Kakuro]{CouleurCase=LightGray,TLargeur=5,THauteur=5,Solution=false,Largeur=2em,Aide=false,CouleurSolution=Black,Tailles=false}%,Taille=5 \defKV[Kakuro]{ListeNombres=\setKV[Kakuro]{Aide}}% \defKV[Kakuro]{Taille=\setKV[Kakuro]{Tailles}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCKenKen.tex b/Master/texmf-dist/tex/latex/profcollege/PfCKenKen.tex index e28efc379f5..21a16dbc783 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCKenKen.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCKenKen.tex @@ -1,6 +1,10 @@ %%% % KenKen %%% +\def\filedateKenken{2024/08/04}% +\def\fileversionKenken{0.1}% +\message{-- \filedateKenken\space v\fileversionKenken}% +% \setKVdefault[ClesKK]{Solution=false,Taille=3,Largeur=2em,Aide=false}% \defKV[ClesKK]{Nombre=\setKV[ClesKK]{Aide}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCLabyrintheJeu.tex b/Master/texmf-dist/tex/latex/profcollege/PfCLabyrintheJeu.tex index 5922748104b..f60cbce35ec 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCLabyrintheJeu.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCLabyrintheJeu.tex @@ -1,8 +1,12 @@ %%% % Labyrinthe %%% -\setKVdefault[Labyrinthe]{Lignes=6,Colonnes=3,Longueur=4,Hauteur=2,Passages=false,EcartH=1,EcartV=1,CouleurF=gray!50,Texte=\color{black},SensImpose=false,Slop} - +\def\filedateLabyJeu{2024/08/04}% +\def\fileversionLabyJeu{0.1}% +\message{-- \filedateLabyJeu\space v\fileversionLabyJeu}% +% +\setKVdefault[Labyrinthe]{Lignes=6,Colonnes=3,Longueur=4,Hauteur=2,Passages=false,EcartH=1,EcartV=1,CouleurF=gray!50,Texte=\color{black},SensImpose=false,Slop}% +% \tikzset{FDirect/.style={-stealth}} \tikzset{FIndirect/.style={stealth-}} \tikzset{FBidirect/.style={stealth-stealth}} diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCLabyrintheNombre.tex b/Master/texmf-dist/tex/latex/profcollege/PfCLabyrintheNombre.tex index b610849ea51..769617eb902 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCLabyrintheNombre.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCLabyrintheNombre.tex @@ -1,6 +1,10 @@ %%% % Labyrinthe Nombre %%% +\def\filedateLabyNombre{2024/08/04}% +\def\fileversionLabyNombre{0.1}% +\message{-- \filedateLabyNombre\space v\fileversionLabyNombre}% +% \setKVdefault[ClesLabyNb]{Multiple=5,XDepart=0,YDepart=0,Longueur=7,Largeur=4,Solution=false,Echelle=1,Angle=0,Couleur=red,Murs=false,Nom=Ex1,CouleurChemin=LightSteelBlue,DoubleOperation=false,Multiplication=false,Chemin=false,EntreeSortie=false,Entree="Nord",Sortie="Sud",SortieUnique=true,Graines=false,XArrivees=false,YArrivees=false,ArriveeX=5,ArriveeY=5} \defKV[ClesLabyNb]{Graine=\setKV[ClesLabyNb]{Graines}} \defKV[ClesLabyNb]{XArrivee=\setKV[ClesLabyNb]{XArrivees}\setKV[ClesLabyNb]{ArriveeX=#1}} diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCLego.tex b/Master/texmf-dist/tex/latex/profcollege/PfCLego.tex index 901eb0a54bb..80bc5ddc1a4 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCLego.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCLego.tex @@ -1,6 +1,10 @@ %%% % Lego %%% +\def\filedateLego{2024/09/01}% +\def\fileversionLego{0.1a}% +\message{-- \filedateLego\space v\fileversionLego}% +% \setKVdefault[Lego]{Echelle=1,Couleur=LightSteelBlue,Unite=8,Diviseur=2,Perso=false,Plaque=false,Largeura=2,Largeurb=2,Unique=false}% \defKV[Lego]{ListePerso=\setKV[Lego]{Perso}\xdef\PfCFooLegoListePerso{#1}}% @@ -27,10 +31,14 @@ }{% \xdef\PfCNbCouleurs{\fpeval{floor(\useKV[Lego]{Unite}/\useKV[Lego]{Diviseur})}}% }% - \ChoixCouleur{\PfCNbCouleurs}% \ifboolKV[Lego]{Perso}{% + \setsepchar{,}\ignoreemptyitems% + \readlist*\ListeAvantChoixCouleurs{\PfCFooLegoListePerso}% + \ChoixCouleur{\ListeAvantChoixCouleurslen}% + \reademptyitems% \BuildBarreLego{\FooCouleur}{\PfCFooLegoListePerso}% }{% + \ChoixCouleur{\PfCNbCouleurs}% \BuildBarreLego{\FooCouleur}{}% }% }% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCMentalo.tex b/Master/texmf-dist/tex/latex/profcollege/PfCMentalo.tex index 84176c0d1ff..0c024facd2a 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCMentalo.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCMentalo.tex @@ -1,6 +1,10 @@ %%% % Mentalo %%% +\def\filedateMentalo{2024/08/04}% +\def\fileversionMentalo{0.1}% +\message{-- \filedateMentalo\space v\fileversionMentalo}% +% \NewDocumentCommand\PfCNumold{m}{% \xintifboolexpr{#1<0}{(\num{#1})}{\num{#1}}% }% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCMidpoint.tex b/Master/texmf-dist/tex/latex/profcollege/PfCMidpoint.tex index 0813f66c446..4fea05dcbb7 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCMidpoint.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCMidpoint.tex @@ -1,6 +1,10 @@ %%% % Midpoint %%% +\def\filedateMidpoint{2024/08/04}% +\def\fileversionMidpoint{0.1}% +\message{-- \filedateMidpoint\space v\fileversionMidpoint}% +% \setKVdefault[MidPoint]{Solution=false,Graines=false,Hard=false} \defKV[MidPoint]{Graine=\setKV[MidPoint]{Graines}} diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCModeleBarre.tex b/Master/texmf-dist/tex/latex/profcollege/PfCModeleBarre.tex index a05ae0075b6..e894a9ebc6f 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCModeleBarre.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCModeleBarre.tex @@ -1,6 +1,10 @@ %%% % Modele en barre %%% +\def\filedateModeleBarre{2024/08/04}% +\def\fileversionModeleBarre{0.1}% +\message{-- \filedateModeleBarre\space v\fileversionModeleBarre}% +% \setKVdefault[ClesModeleBarre]{Hauteur=0.5cm,Largeur=1cm,Separation={0},Homogene=false,Multiplicatif=false,MultiplicatifH=false,MultiplicatifB=false}%Separation pour conserver le lien avec les équations. \defKV[ClesModeleBarre]{Longueur=\setKV[ClesModeleBarre]{Homogene}}% \defKV[ClesModeleBarre]{AccoladesH=\setKV[ClesModeleBarre]{MultiplicatifH}\setKV[ClesModeleBarre]{Multiplicatif}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCMosaique.tex b/Master/texmf-dist/tex/latex/profcollege/PfCMosaique.tex index 91936d597b1..af964995ef7 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCMosaique.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCMosaique.tex @@ -1,6 +1,10 @@ %%% % Mosaique %%% +\def\filedateMosaique{2024/08/04}% +\def\fileversionMosaique{0.1}% +\message{-- \filedateMosaique\space v\fileversionMosaique}% +% \setKVdefault[ClesMosaique]{Largeur=2,Hauteur=2,Solution=false,Type=1,Label,Echelle=1cm} \newcommand\DessineMosaique[2][]{% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCMotsCodes.tex b/Master/texmf-dist/tex/latex/profcollege/PfCMotsCodes.tex index 0929b761971..088f417c35d 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCMotsCodes.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCMotsCodes.tex @@ -1,6 +1,10 @@ %%% % Mots Cod\'es %%% +\def\filedateMotsCodes{2024/08/04}% +\def\fileversionMotsCodes{0.1}% +\message{-- \filedateMotsCodes\space v\fileversionMotsCodes}% +% \setKVdefault[MotsCodes]{LargeurT=1cm,Colonnes=5,Largeur=3cm,Solution=false,Math=false}% \newcommand\MotsCodes[2][]{% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCMotsCroises.tex b/Master/texmf-dist/tex/latex/profcollege/PfCMotsCroises.tex index 4e6734dd7b4..5310516799b 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCMotsCroises.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCMotsCroises.tex @@ -1,6 +1,10 @@ %%% % Mots croisés %%% +\def\filedateMotsCroises{2024/08/04}% +\def\fileversionMotsCroises{0.1}% +\message{-- \filedateMotsCroises\space v\fileversionMotsCroises}% +% \setKVdefault[ClesCroises]{Lignes=6,Colonnes=8,Solution=false,Croises=false,Couleur=gray,Largeur=1em} \newcounter{PfCLettreHorizontal} diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCMotsEmpiles.tex b/Master/texmf-dist/tex/latex/profcollege/PfCMotsEmpiles.tex index 1c42d433a6a..c8ec37bc5d8 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCMotsEmpiles.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCMotsEmpiles.tex @@ -1,6 +1,10 @@ %%% % Mots empilés %%% +\def\filedateMotsEmpiles{2024/08/04}% +\def\fileversionMotsEmpiles{0.1}% +\message{-- \filedateMotsEmpiles\space v\fileversionMotsEmpiles}% +% \setKVdefault[ClesMotEmpile]{Colonne=4,Solution=false,Couleur=black} \newcounter{CompteurMotEmpile} diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCMulArt.tex b/Master/texmf-dist/tex/latex/profcollege/PfCMulArt.tex index 27156c00b7f..99425418732 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCMulArt.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCMulArt.tex @@ -1,6 +1,10 @@ %%% % Mulart %%% +\def\filedateMulArt{2024/08/04}% +\def\fileversionMulArt{0.1}% +\message{-- \filedateMulArt\space v\fileversionMulArt}% +% \setKVdefault[TabMul]{Multiple=2,Cibles=false,Largeur=20pt,Couleurs=false,Graines=false,Operations=false,Enonce=false,SchemaEnonce=false} \defKV[TabMul]{Couleur=\setKV[TabMul]{Couleurs}} \defKV[TabMul]{Graine=\setKV[TabMul]{Graines}\PfCGraineAlea{#1}} diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCMulJal.tex b/Master/texmf-dist/tex/latex/profcollege/PfCMulJal.tex index befce7a1106..3f9ba37758d 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCMulJal.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCMulJal.tex @@ -1,6 +1,10 @@ %%% % Multiplication par jalousie %%% +\def\filedateMulJal{2024/08/04}% +\def\fileversionMulJal{0.1}% +\message{-- \filedateMulJal\space v\fileversionMulJal}% +% \setKVdefault[MulJal]{Solution=false,CouleurTab=gray!15}% \defKV[MulJal]{CouleurSolution=\setKV[MulJal]{Solution}}% % diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCMulJap.tex b/Master/texmf-dist/tex/latex/profcollege/PfCMulJap.tex index bdb59526f0c..8fdf37c5b30 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCMulJap.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCMulJap.tex @@ -1,6 +1,10 @@ %%% % Multiplication Japonaise %%% +\def\filedateMulJap{2024/08/04}% +\def\fileversionMulJap{0.1}% +\message{-- \filedateMulJap\space v\fileversionMulJap}% +% \setKVdefault[MulJap]{Couleur=Orange,Bloc=false,DessinSeul=false} \defKV[MulJap]{CouleurBloc=\setKV[MulJap]{Bloc}} diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCMulPiecesPuzzle.tex b/Master/texmf-dist/tex/latex/profcollege/PfCMulPiecesPuzzle.tex index 7851f36ba79..aaf98ffe6ac 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCMulPiecesPuzzle.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCMulPiecesPuzzle.tex @@ -1,6 +1,10 @@ %%% % Pièces de puzzle pour multiplication %%% +\def\filedateMulPiecesPuzzle{2024/08/04}% +\def\fileversionMulPiecesPuzzle{0.1}% +\message{-- \filedateMulPiecesPuzzle\space v\fileversionMulPiecesPuzzle}% +% %https://mirror.gutenberg-asso.fr/tex.loria.fr/prod-graph/metafun.pdf \newtoks\toklistepuzzlea% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCNombreAstral.tex b/Master/texmf-dist/tex/latex/profcollege/PfCNombreAstral.tex index 428cd8d37c7..df1903bc0ea 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCNombreAstral.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCNombreAstral.tex @@ -1,6 +1,10 @@ %%% % Nombre Astral %%% +\def\filedateNombreAstral{2024/08/04}% +\def\fileversionNombreAstral{0.1}% +\message{-- \filedateNombreAstral\space v\fileversionNombreAstral}% +% \setKVdefault[NombreAstral]{Solution=false,Graines=false,Echelle=1,Couleur=LightSteelBlue,Horizontal=false} \defKV[NombreAstral]{Graine=\setKV[NombreAstral]{Graines}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCNonogramme.tex b/Master/texmf-dist/tex/latex/profcollege/PfCNonogramme.tex index 8adfbd5654e..d63fd9c70f1 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCNonogramme.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCNonogramme.tex @@ -1,3 +1,10 @@ +%%% +% Nonogramme +%%% +\def\filedateNonogramme{2024/08/04}% +\def\fileversionNonogramme{0.1}% +\message{-- \filedateNonogramme\space v\fileversionNonogramme}% +% \setKVdefault[Nono]{Largeur=10pt,Taille=5,Unite=1cm,Solution=false,Enonce=true} \newtoks\toklistenonoa% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCNotionFonction.tex b/Master/texmf-dist/tex/latex/profcollege/PfCNotionFonction.tex index 4fe05bc4d04..265beb92f9b 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCNotionFonction.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCNotionFonction.tex @@ -1,6 +1,10 @@ %%% % Fonction %%% +\def\filedateFonction{2024/08/04}% +\def\fileversionFonction{0.1}% +\message{-- \filedateFonction\space v\fileversionFonction}% +% \setKVdefault[ClesFonction]{Nom=f,Variable=x,Calcul=x,Tableau=false,Largeur=5mm,Ecriture=false,Definition=false,Points=false,Tangentes=false,PasX=1,PasY=1,UniteX=1,UniteY=1,Prolonge=false,Trace=false,Catmull=false,Splines=false,Lagrange=false,Epaisseur=1,Couleur=black,CouleurTrace=black,PointsCourbe=true,Codes=false,Origine={(0,0)},Vide=false} \defKV[ClesFonction]{Traces=\setKV[ClesFonction]{Codes}}% @@ -1249,6 +1253,17 @@ vardef Lagrange(expr valeur)(text t)= % RetiensCouleur(\useKV[TraceG]{CouleurTrace}); % + numeric styletrace[]; + vardef RetiensStyle(text t)= + n:=0; + for p_=t: + n:=n+1; + styletrace[n]=p_; + endfor; + enddef; + % + RetiensStyle(\useKV[TraceG]{StyleTrace}); + % pair Origine,DecalageOrigine; Origine=(xmin,ymin)+\useKV[TraceG]{Origine}; DecalageOrigine=\useKV[TraceG]{Origine}; @@ -1305,6 +1320,19 @@ vardef Lagrange(expr valeur)(text t)= n:=0; for p_=texto: n:=n+1; + if unknown styletrace[n]: + drawoptions(); + else: + if styletrace[n]=1: + drawoptions(dashed evenly); + elseif styletrace[n]=2: + drawoptions(dashed withdots); + elseif styletrace[n]=3: + drawoptions(dashed dashpattern(on6 off3 on1.5 off3)); + else: + drawoptions(); + fi; + fi; draw courbe[n](borneinf[n],bornesup[n],100)(scantokens p_) withpen (pencircle scaled Epaisseur) withcolor if unknown colortrace[n]:black else: colortrace[n] fi; endfor; enddef; @@ -1419,6 +1447,9 @@ vardef Lagrange(expr valeur)(text t)= trace u*(xmin-grillex,k)--u*(xmax+grillex,k); endfor; drawoptions(); + else: + grillex:=0; + grilley:=0; fi; if Graduations: for k=gradx step gradx until (((xmax-xmin)-xpart(DecalageOrigine))*pasx): @@ -1470,11 +1501,12 @@ vardef Lagrange(expr valeur)(text t)= else: DessineCourbes(#1); NommeCourbes(#2); - if Grille: clip currentpicture to polygone(u*(xmin-grillex,ymin-grilley),u*(xmax+grillex,ymin-grilley),u*(xmax+grillex,ymax+grilley),u*(xmin-grillex,ymax+grilley)); + if Grille: + %clip currentpicture to polygone(u*(xmin-grillex,ymin-grilley),u*(xmax+grillex,ymin-grilley),u*(xmax+grillex,ymax+grilley),u*(xmin-grillex,ymax+grilley)); draw polygone(u*(xmin-grillex,ymin-grilley),u*(xmax+grillex,ymin-grilley),u*(xmax+grillex,ymax+grilley),u*(xmin-grillex,ymax+grilley)) withcolor 0.75white; else: - clip currentpicture to polygone(u*(xmin,ymin),u*(xmax,ymin),u*(xmax,ymax),u*(xmin,ymax)); + %clip currentpicture to polygone(u*(xmin,ymin),u*(xmax,ymin),u*(xmax,ymax),u*(xmin,ymax)); fi; % if Code: diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCNumberHive.tex b/Master/texmf-dist/tex/latex/profcollege/PfCNumberHive.tex index ee37a5b2f18..96019b3d831 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCNumberHive.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCNumberHive.tex @@ -1,6 +1,10 @@ %%% % Number Hive %%% +\def\filedateNumberHive{2024/08/04}% +\def\fileversionNumberHive{0.1}% +\message{-- \filedateNumberHive\space v\fileversionNumberHive}% +% \setKVdefault[NumberHive]{Negatif=false,Produit=false,Niveau=8,Double=false,ListeCouleurs={Cornsilk,LightSteelBlue},CouleurCase=false,Jeton=false,Graines=false,Aide=false,UniteHexa=6mm}% \defKV[NumberHive]{Cases=\setKV[NumberHive]{CouleurCase}}% \defKV[NumberHive]{Jetons=\setKV[NumberHive]{Jeton}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCNumerationsAnciennes.tex b/Master/texmf-dist/tex/latex/profcollege/PfCNumerationsAnciennes.tex index a864165fba1..b9560bb504b 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCNumerationsAnciennes.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCNumerationsAnciennes.tex @@ -1,3 +1,10 @@ +%%% +% Numerations anciennes +%%% +\def\filedateNumAnciennes{2024/08/04}% +\def\fileversionNumAnciennes{0.1}% +\message{-- \filedateNumAnciennes\space v\fileversionNumAnciennes}% +% \setKVdefault[NumerationAncienne]{Couleur=black}% \NewDocumentCommand\Chinoise{om}{% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCOperationsTrou.tex b/Master/texmf-dist/tex/latex/profcollege/PfCOperationsTrou.tex index 347ca499bcf..ca9f72976e9 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCOperationsTrou.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCOperationsTrou.tex @@ -1,11 +1,11 @@ %%% % Op\'erations pos\'es à trou %%% -%% D'après https://tex.stackexchange.com/questions/277246/drawing-a-circle-around-the-numbers-in-xlop-package - -%\begin{document}% +\def\filedateOpTrou{2024/08/04}% +\def\fileversionOpTrou{0.1}% +\message{-- \filedateOpTrou\space v\fileversionOpTrou}% % -%\end{document} +%% D'après https://tex.stackexchange.com/questions/277246/drawing-a-circle-around-the-numbers-in-xlop-package \newcommand\PfCchiffre[2]{\tikz[remember picture] \node[inner sep=0pt](#1){#2};} diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPapiers.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPapiers.tex index 0bb41363ec6..3929600a6e6 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCPapiers.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCPapiers.tex @@ -1,6 +1,10 @@ %%% % Papiers %%% +\def\filedatePapiers{2024/08/04}% +\def\fileversionPapiers{0.1}% +\message{-- \filedatePapiers\space v\fileversionPapiers}% +% \setKVdefault[Papiers]{Cinq=true,Seyes=false,Echelle=8,Isometrique=false,IsometriquePointe=false,Millimetre=false,Triangle=false,Largeur=5,Hauteur=4,Couleur=black,Grille=-1,GrillePointe=-1,PageEntiere=false,ZoneTexte=false,Baseline=false,CodeAfter=false}% \defKV[Papiers]{Traces=\setKV[Papiers]{CodeAfter}} diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPatronPaves.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPatronPaves.tex index 6628d3d505a..904f272411a 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCPatronPaves.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCPatronPaves.tex @@ -1,6 +1,10 @@ %%% % Patrons de pavés droits et cubes %%% +\def\filedatePatronspaves{2024/08/04}% +\def\fileversionPatronspaves{0.1}% +\message{-- \filedatePatronspaves\space v\fileversionPatronspaves}% +% \setKVdefault[ClesPatron]{Cube,Arete=1cm,ListeCouleurs={white},Pave=false,Largeur=2cm,Hauteur=1.5cm,Profondeur=1cm,Codes=false,AColorier=false}% %EcartColorier est en nombre de parts pour le cube, en mm pour le pavé. \defKV[ClesPatron]{EcartColorier=\setKV[ClesPatron]{AColorier}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPattern.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPattern.tex index 29fa45c08fe..fb6f0bf9f3a 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCPattern.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCPattern.tex @@ -1,6 +1,10 @@ %%% % Visual Pattern %%% +\def\filedatePattern{2024/08/04}% +\def\fileversionPattern{0.1}% +\message{-- \filedatePattern\space v\fileversionPattern}% +% \setKVdefault[Pattern]{Type=1,Etape=3} \NewDocumentCommand\VisualPattern{o}{% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPavage.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPavage.tex index 2d25df1b990..4dabb044116 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCPavage.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCPavage.tex @@ -1,6 +1,10 @@ %%% % Pavage %%% +\def\filedatePavage{2024/08/04}% +\def\fileversionPavage{0.1}% +\message{-- \filedatePavage\space v\fileversionPavage}% +% \setKVdefault[Pavage]{% Before=false, Niveau=3, diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPixelArt.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPixelArt.tex index df380d48ee4..503e2e1182d 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCPixelArt.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCPixelArt.tex @@ -1,11 +1,16 @@ %%% % PixelArt %%% +\def\filedatePixelArt{2024/08/04}% +\def\fileversionPixelArt{0.1}% +\message{-- \filedatePixelArt\space v\fileversionPixelArt}% +% \newtoks\toklistePANombre% \def\UpdatetoksPANombre#1\nil{\addtotok\toklistePANombre{"#1",}}% -\setKVdefault[ClesPixelArt]{Largeur=29,Hauteur=29,Solution=false,Lettres=ABCDEFGHIJK,Nombres=false,ListeCouleurs={Orange,Red,LightGray,Maroon,Purple,black,black,Plum,Orange,White,White},Unite=5mm,Geant=false,HauteurD=1,LargeurD=1,Complet=false,Numero=1,Separations=false}% +\setKVdefault[ClesPixelArt]{Largeur=29,Hauteur=29,Solution=false,Lettres=ABCDEFGHIJK,Nombres=false,ListeCouleurs={Orange,Red,LightGray,Maroon,Purple,black,black,Plum,Orange,White,White},Unite=5mm,Geant=false,HauteurD=1,LargeurD=1,Complet=false,Numero=1,Separations=false,Deforme=false,Coefx=0.25,Coefy=0.25,Borne=false,Graines=false}% \defKV[ClesPixelArt]{ListeNombres=\setKV[ClesPixelArt]{Nombres}}% +\defKV[ClesPixelArt]{Graine=\setKV[ClesPixelArt]{Graines}}% \NewDocumentCommand\PixelArt{o m}{% \toklistePANombre{}% @@ -34,11 +39,15 @@ \BuildPixelArtGeant{#2}{\useKV[ClesPixelArt]{Lettres}}{\ListeAvantCouleurs}{\the\toklistePANombre}{\the\intquotient}{\the\remainder}% }% }{% - \BuildPixelArt{#2}{\useKV[ClesPixelArt]{Lettres}}{\ListeAvantCouleurs}{\the\toklistePANombre}% + \ifboolKV[ClesPixelArt]{Deforme}{% + \BuildPixelArtDeforme{#2}{\useKV[ClesPixelArt]{Lettres}}{\ListeAvantCouleurs}{\the\toklistePANombre}% + }{% + \BuildPixelArt{#2}{\useKV[ClesPixelArt]{Lettres}}{\ListeAvantCouleurs}{\the\toklistePANombre}% + }% }% }% -\NewDocumentCommand\BuildPixelArt{m m m m}{% +\NewDocumentCommand\BuildPixelArtDeforme{m m m m}{% \ifluatex \mplibforcehmode \begin{mplibcode} @@ -48,6 +57,39 @@ hauteurd:=\useKV[ClesPixelArt]{HauteurD}; Unite:=\useKV[ClesPixelArt]{Unite}; + %Deformation + Coefx=\useKV[ClesPixelArt]{Coefx}; + Coefy=\useKV[ClesPixelArt]{Coefy}; + boolean Borne,Graines; + Borne=\useKV[ClesPixelArt]{Borne}; + Graines=\useKV[ClesPixelArt]{Graines}; + if Graines: + randomseed:=\useKV[ClesPixelArt]{Graine}; + fi; + % + pair M[][]; + for l=1 upto hauteur+1: + for c=1 upto largeur+1: + if Borne: + if (l=1) or (l=hauteur+1): + M[l][c]=Unite*(c,l)+Unite*(-Coefx+uniformdeviate(2*Coefx),0); + if (c=1) or (c=largeur+1): + M[l][c]:=Unite*(c,l); + fi; + else: + if (c=1) or (c=largeur+1): + M[l][c]=Unite*(c,l-1)+Unite*(0,uniformdeviate(Coefy)); + else: + M[l][c]=Unite*(c,l)+Unite*(-Coefx+uniformdeviate(2*Coefx),-Coefy+uniformdeviate(2*Coefy)); + fi; + fi; + else: + M[l][c]=Unite*(c,l)+Unite*(-Coefx+uniformdeviate(2*Coefx),-Coefy+uniformdeviate(2*Coefy)); + fi; + %dotlabel("",M[l][c]); + endfor; + endfor; + boolean Solution,Nombres,Separations; Solution:=\useKV[ClesPixelArt]{Solution}; Nombres:=\useKV[ClesPixelArt]{Nombres}; @@ -56,7 +98,7 @@ string BaseLettres; BaseLettres=str #2; numeric EchelleScale; - EchelleScale=Unite/5mm; + EchelleScale=Unite/10mm; color ColorEntier[],ColFond; n:=0; @@ -86,11 +128,107 @@ if Nombres: for m=0 upto (length BaseLettres-1): if (substring(p,p+1) of p_)=substring(m,m+1) of BaseLettres: - label(TEX(RetiensNombres[m+1]) scaled EchelleScale,((l-1)*Unite,(h-1)*Unite)); + label(TEX(RetiensNombres[m+1]) scaled EchelleScale,iso(M[h+1][l],M[h][l],M[h][l+1],M[h+1][l+1])); fi; endfor; else: - label(TEX(substring(p,p+1) of p_) scaled EchelleScale,((l-1)*Unite,(h-1)*Unite)); + label(TEX(substring(p,p+1) of p_) scaled EchelleScale,iso(M[h+1][l],M[h][l],M[h][l+1],M[h+1][l+1])); + fi; + if Solution: + for m=0 upto (length BaseLettres-1): + if (substring(p,p+1) of p_)=substring(m,m+1) of BaseLettres: + ColFond:=ColorEntier[m+1]; + fi; + endfor; + if unknown ColFond: else: fill polygone(M[h+1][l],M[h][l],M[h][l+1],M[h+1][l+1]) withcolor ColFond fi; + fi; + trace polygone(M[h+1][l],M[h][l],M[h][l+1],M[h+1][l+1]); + fi; + endfor; + endfor; + closefrom nomfichier; + enddef; + + Lecturecsv("#1"); +% if Separations: +% drawoptions(withcolor Purple); +% for k=hauteur step -hauteurd until 0: +% draw (Unite*(-1,k-0.5)--Unite*(largeur,k-0.5)) withpen pencircle scaled 1.25; +% endfor; +% for k=0 step largeurd until largeur: +% draw (Unite*(k-0.5,hauteur+0.125)--Unite*(k-0.5,-0.875)) withpen pencircle scaled 1.25; +% endfor; +% drawoptions(); +% fi; + \end{mplibcode} +\fi +}% + +\NewDocumentCommand\BuildPixelArt{m m m m}{% + \ifluatex + \mplibforcehmode + \begin{mplibcode} + largeur:=\useKV[ClesPixelArt]{Largeur}; + hauteur:=\useKV[ClesPixelArt]{Hauteur}; + largeurd:=\useKV[ClesPixelArt]{LargeurD}; + hauteurd:=\useKV[ClesPixelArt]{HauteurD}; + Unite:=\useKV[ClesPixelArt]{Unite}; + + boolean Solution,Nombres,Separations; + Solution:=\useKV[ClesPixelArt]{Solution}; + Nombres:=\useKV[ClesPixelArt]{Nombres}; + Separations:=\useKV[ClesPixelArt]{Separations}; + + string BaseLettres; + BaseLettres=str #2; + numeric EchelleScale; + EchelleScale=Unite/5mm; + + color ColorEntier[],ColFond; + n:=0; + for p_=#3: + n:=n+1; + ColorEntier[n]:=p_; + endfor; + + string RetiensNombres[]; + if Nombres: + k:=0; + for p_=#4: + k:=k+1; + RetiensNombres[k]=p_; + endfor; + else: + m:=0; + for p_=0 upto n-1: + m:=m+1; + RetiensNombres[m]=substring(p_,p_+1) of BaseLettres; + endfor; + fi; + + picture Etiquette[]; + for k=1 upto n: + Etiquette[k]=image( + label(TEX(RetiensNombres[k]) scaled EchelleScale,(0,0)); + ); + endfor; + + vardef Lecturecsv(expr nomfichier)= + for h=hauteur downto 1: + string p_; + p_=readfrom nomfichier; + l:=0; + for p=0 step 2 until 2*largeur-2: + l:=l+1; + if Solution=false: + if (substring(p,p+1) of p_)="-": + else: + for m=0 upto (length BaseLettres-1): + if (substring(p,p+1) of p_)=substring(m,m+1) of BaseLettres: + draw Etiquette[m+1] shifted((l-1)*Unite,(h-1)*Unite); + fi; + endfor; + fi; fi; if Solution: for m=0 upto (length BaseLettres-1): @@ -101,7 +239,6 @@ if unknown ColFond: else: fill (unitsquare scaled Unite) shifted ((l-1)*Unite-0.5*Unite,(h-1)*Unite-0.5*Unite) withcolor ColFond fi; fi; trace (unitsquare scaled Unite) shifted ((l-1)*Unite-0.5*Unite,(h-1)*Unite-0.5*Unite); - fi; endfor; endfor; closefrom nomfichier; @@ -120,10 +257,12 @@ fi; \end{mplibcode} \else - \begin{mpost}[mpsettings={largeur:=\useKV[ClesPixelArt]{Largeur}; hauteur:=\useKV[ClesPixelArt]{Hauteur}; Unite:=\useKV[ClesPixelArt]{Unite}; boolean Solution,Nombres; Solution:=\useKV[ClesPixelArt]{Solution}; Nombres:=\useKV[ClesPixelArt]{Nombres};}] + \begin{mpost}[mpsettings={largeur:=\useKV[ClesPixelArt]{Largeur}; hauteur:=\useKV[ClesPixelArt]{Hauteur}; Unite:=\useKV[ClesPixelArt]{Unite}; boolean Solution,Nombres,Separations; Solution:=\useKV[ClesPixelArt]{Solution}; Nombres:=\useKV[ClesPixelArt]{Nombres}; Separations:=\useKV[ClesPixelArt]{Separations};}] string BaseLettres; BaseLettres=str #2; - + numeric EchelleScale; + EchelleScale=Unite/5mm; + color ColorEntier[],ColFond; n:=0; for p_=#3: @@ -133,13 +272,26 @@ string RetiensNombres[]; if Nombres: - n:=0; + k:=0; for p_=#4: - n:=n+1; - RetiensNombres[n]=p_; + k:=k+1; + RetiensNombres[k]=p_; + endfor; + else: + m:=0; + for p_=0 upto n-1: + m:=m+1; + RetiensNombres[m]=substring(p_,p_+1) of BaseLettres; endfor; fi; - + + picture Etiquette[]; + for k=1 upto n: + Etiquette[k]=image( + label(LATEX(RetiensNombres[k]) scaled EchelleScale,(0,0)); + ); + endfor; + vardef Lecturecsv(expr nomfichier)= for h=hauteur downto 1: string p_; @@ -147,16 +299,15 @@ l:=0; for p=0 step 2 until 2*largeur-2: l:=l+1; + if Solution=false: if (substring(p,p+1) of p_)="-": else: - if Nombres: for m=0 upto (length BaseLettres-1): if (substring(p,p+1) of p_)=substring(m,m+1) of BaseLettres: - label(LATEX(RetiensNombres[m+1]),((l-1)*Unite,(h-1)*Unite)); + draw Etiquette[m+1] shifted((l-1)*Unite,(h-1)*Unite); fi; endfor; - else: - label(LATEX(substring(p,p+1) of p_),((l-1)*Unite,(h-1)*Unite)); + fi; fi; if Solution: for m=0 upto (length BaseLettres-1): @@ -167,21 +318,30 @@ if unknown ColFond: else: fill (unitsquare scaled Unite) shifted ((l-1)*Unite-0.5*Unite,(h-1)*Unite-0.5*Unite) withcolor ColFond fi; fi; trace (unitsquare scaled Unite) shifted ((l-1)*Unite-0.5*Unite,(h-1)*Unite-0.5*Unite); - fi; endfor; endfor; closefrom nomfichier; enddef; Lecturecsv("#1"); + if Separations: + drawoptions(withcolor Purple); + for k=hauteur step -hauteurd until 0: + draw (Unite*(-1,k-0.5)--Unite*(largeur,k-0.5)) withpen pencircle scaled 1.25; + endfor; + for k=0 step largeurd until largeur: + draw (Unite*(k-0.5,hauteur+0.125)--Unite*(k-0.5,-0.875)) withpen pencircle scaled 1.25; + endfor; + drawoptions(); + fi; \end{mpost} \fi -} +}% \NewDocumentCommand\BuildPixelArtGeant{m m m m m m}{% - \ifluatex - \mplibforcehmode - \begin{mplibcode} + \ifluatex% + \mplibforcehmode% + \begin{mplibcode}% largeur:=\useKV[ClesPixelArt]{Largeur}; hauteur:=\useKV[ClesPixelArt]{Hauteur}; largeurd:=\useKV[ClesPixelArt]{LargeurD}; @@ -253,5 +413,5 @@ Lecturecsv("#1"); \end{mplibcode} - \fi -}
\ No newline at end of file + \fi% +}%
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPourcentage.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPourcentage.tex index 1f6f18b19b3..03177d14dc8 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCPourcentage.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCPourcentage.tex @@ -1,6 +1,10 @@ %%% % Application : pourcentage %%% +\def\filedatePourcentage{2024/08/04}% +\def\fileversionPourcentage{0.1}% +\message{-- \filedatePourcentage\space v\fileversionPourcentage}% +% \setKVdefault[ClesPourcentage]{Appliquer,Calculer=false,Augmenter=false,Reduire=false,Fractionnaire=false,Decimal,Formule=false,Concret=false,GrandeurA=Grandeur A,GrandeurB=Total,Largeur=1cm,MotReduction=diminution,AideTableau=false,ColorFill=white,CouleurTab=gray!15} \defKV[ClesPourcentage]{Unite=\setKV[ClesPourcentage]{Concret}} \newcommand\Pourcentage[3][]{% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCProbaFrequence.tex b/Master/texmf-dist/tex/latex/profcollege/PfCProbaFrequence.tex index dc6a39b7a57..e3a5f04b628 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCProbaFrequence.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCProbaFrequence.tex @@ -1,6 +1,10 @@ %%% % Probabilité et fréquence %%% +\def\filedateProbaFrequence{2024/08/04}% +\def\fileversionProbaFrequence{0.1}% +\message{-- \filedateProbaFrequence\space v\fileversionProbaFrequence}% +% \setKVdefault[PfCFrequence]{Couleur=false,Lancers=1,Legende=false}% \defKV[PfCFrequence]{ListeCouleurs=\setKV[PfCFrequence]{Couleur}}% \defKV[PfCFrequence]{Legendes=\setKV[PfCFrequence]{Legende}\setsepchar{,}\reademptyitems\readlist*\PfMListeLegendes{#1}\reademptyitems}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCProbabilites.tex b/Master/texmf-dist/tex/latex/profcollege/PfCProbabilites.tex index 7ed834a61ea..73bafa9ba27 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCProbabilites.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCProbabilites.tex @@ -1,7 +1,11 @@ %%% % Proba %%% -\setKVdefault[ClesProba]{Echelle=false,Arbre=false,Branche=2,Angle=60,Rayon=0.25,LongueurEchelle=5,Affichage=0,Grille=1,Incline} +\def\filedateProba{2024/08/15}% +\def\fileversionProba{0.1a}% +\message{-- \filedateProba\space v\fileversionProba}% +% +\setKVdefault[ClesProba]{Echelle=false,Arbre=false,Branche=2,Angle=60,Rayon=0.25,LongueurEchelle=5,Affichage=0,Grille=1,Incline,SansProba=false} \def\Updatetoksproba#1/#2\nil{\addtotok\toklistepointproba{"#1","\footnotesize #2",}} \def\Updatetoksprobapdf#1/#2\nil{\addtotok\toklistepointproba{"#1","\noexpand\footnotesize #2",}} @@ -35,6 +39,8 @@ \ifluatex \mplibforcehmode \begin{mplibcode} + boolean SansProba; + SansProba=\useKV[ClesProba]{SansProba}; pair A,B,C[],D[];%les noeuds de l'arbre %Figure(-10u,-10u,10u,10u); A=u*(1,1); @@ -58,8 +64,10 @@ fi; marque_s:=marque_s*2; labeloffset:=labeloffset*3; + if SansProba=false: label.bot(btex 0 etex,A); label.bot(btex 1 etex,B); + fi; labeloffset:=labeloffset/3; n:=1;%compter les informations k:=1;% compter les informations noeud pour les placer @@ -93,7 +101,7 @@ toto(#2); \end{mplibcode} \else - \begin{mpost}[mpsettings={input PfCGeometrie;}] + \begin{mpost}[mpsettings={input PfCGeometrie;boolean SansProba;SansProba=\useKV[ClesProba]{SansProba};}] pair A,B,C[],D[];%les noeuds de l'arbre Figure(-10u,-10u,10u,10u); A=u*(1,1); @@ -117,8 +125,10 @@ fi; marque_s:=marque_s*2; labeloffset:=labeloffset*3; + if SansProba=false: label.bot(btex 0 etex,A); label.bot(btex 1 etex,B); + fi; labeloffset:=labeloffset/3; n:=1;%compter les informations k:=1;% compter les informations noeud pour les placer diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCProgrammeCalcul.tex b/Master/texmf-dist/tex/latex/profcollege/PfCProgrammeCalcul.tex index f1bdc0307fe..871f80d6508 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCProgrammeCalcul.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCProgrammeCalcul.tex @@ -1,6 +1,10 @@ %%%% % Prog de calculs "simples" %%%% +\def\filedateProgCalcul{2024/08/04}% +\def\fileversionProgCalcul{0.1}% +\message{-- \filedateProgCalcul\space v\fileversionProgCalcul}% +% \setKVdefault[ClesProg]{% Ecart=2em,% Direct,% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPropor.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPropor.tex index 1e6526f41b0..1c8aba3324b 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCPropor.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCPropor.tex @@ -1,6 +1,10 @@ %%% % Proportionnalit\'e %%% +\def\filedatePropor{2024/09/04}% +\def\fileversionPropor{0.1a}% +\message{-- \filedatePropor\space v\fileversionPropor}% +% \setKVdefault[ClesPropor]{GrandeurA=Grandeur A,GrandeurB=Grandeur B,Largeur=1cm,Math=false,Stretch=1,ColorFill=white,CouleurTab=gray!15,Vertical=false,Simple=false,Condense=false}% \tikzstyle{FlechePropor}=[-stealth] @@ -201,49 +205,51 @@ \NewDocumentCommand\FlechePCG{mm}{% \begin{tikzpicture}[remember picture,overlay,node distance=\getstrut\ht]% - \node[inner sep=0pt] (MilieuH-#1) at ($(ProporG-#1)!0.25!(ProporD-#1)$) {};% - \node[inner sep=0pt] (MilieuH-#2) at ($(ProporG-#2)!0.25!(ProporD-#2)$) {};% - \node[inner sep=0pt] (MilieuB-#1) at ($(ProporG-#1)!0.75!(ProporD-#1)$) {};% - \node[inner sep=0pt] (MilieuB-#2) at ($(ProporG-#2)!0.75!(ProporD-#2)$) {};% + \node[inner sep=0pt] (MilieuH-#1) at ($(ProporH-#1)!\PfCCoeffH!(ProporB-#1)$) {};% + \node[inner sep=0pt] (MilieuH-#2) at ($(ProporH-#2)!\PfCCoeffH!(ProporB-#2)$) {};% + \node[inner sep=0pt] (MilieuB-#1) at ($(ProporH-#1)!\PfCCoeffB!(ProporB-#1)$) {};% + \node[inner sep=0pt] (MilieuB-#2) at ($(ProporH-#2)!\PfCCoeffB!(ProporB-#2)$) {};% \xintifboolexpr{#1<#2}{% \coordinate[right of=MilieuH-#1] (aux1);% - \coordinate[right of=MilieuH-#2] (aux2);% - \coordinate[left of=MilieuB-#1] (aux3);% + \coordinate[left of=MilieuH-#2] (aux2);% + \coordinate[right of=MilieuB-#1] (aux3);% \coordinate[left of=MilieuB-#2] (aux4);% - \draw[out=30,in=-30,gray] (aux3) to (aux4); + \draw[FlechePropor,gray] (aux4) -- (aux1); + \draw[out=-30,in=30,gray] (aux2) to (aux4); }{% - \coordinate[right of=MilieuH-#1] (aux1);% + \coordinate[left of=MilieuH-#1] (aux1);% \coordinate[right of=MilieuH-#2] (aux2);% \coordinate[left of=MilieuB-#1] (aux3);% - \coordinate[left of=MilieuB-#2] (aux4);% - \draw[out=-30,in=30,gray] (aux3) to (aux4); + \coordinate[right of=MilieuB-#2] (aux4);% + \draw[FlechePropor,gray] (aux1) -- (aux4); + \draw[out=30,in=-30,gray] (aux3) to (aux1); }% \draw[gray] (aux2) -- (aux3); - \draw[FlechePropor,gray] (aux4) -- (aux1); \end{tikzpicture}% }% \NewDocumentCommand\FlechePCD{mm}{% \begin{tikzpicture}[remember picture,overlay,node distance=\getstrut\ht]% - \node[inner sep=0pt] (MilieuH-#1) at ($(ProporG-#1)!0.25!(ProporD-#1)$) {};% - \node[inner sep=0pt] (MilieuH-#2) at ($(ProporG-#2)!0.25!(ProporD-#2)$) {};% - \node[inner sep=0pt] (MilieuB-#1) at ($(ProporG-#1)!0.75!(ProporD-#1)$) {};% - \node[inner sep=0pt] (MilieuB-#2) at ($(ProporG-#2)!0.75!(ProporD-#2)$) {};% + \node[inner sep=0pt] (MilieuH-#1) at ($(ProporH-#1)!\PfCCoeffH!(ProporB-#1)$) {};% + \node[inner sep=0pt] (MilieuH-#2) at ($(ProporH-#2)!\PfCCoeffH!(ProporB-#2)$) {};% + \node[inner sep=0pt] (MilieuB-#1) at ($(ProporH-#1)!\PfCCoeffB!(ProporB-#1)$) {};% + \node[inner sep=0pt] (MilieuB-#2) at ($(ProporH-#2)!\PfCCoeffB!(ProporB-#2)$) {};% \xintifboolexpr{#1<#2}{% \coordinate[right of=MilieuH-#1] (aux1);% - \coordinate[right of=MilieuH-#2] (aux2);% - \coordinate[left of=MilieuB-#1] (aux3);% + \coordinate[left of=MilieuH-#2] (aux2);% + \coordinate[right of=MilieuB-#1] (aux3);% \coordinate[left of=MilieuB-#2] (aux4);% - \draw[out=150,in=-150,gray] (aux1) to (aux2); + \draw[FlechePropor,gray] (aux3) -- (aux2); + \draw[out=-150,in=150,gray] (aux1) to (aux3); }{% - \coordinate[right of=MilieuH-#1] (aux1);% + \coordinate[left of=MilieuH-#1] (aux1);% \coordinate[right of=MilieuH-#2] (aux2);% \coordinate[left of=MilieuB-#1] (aux3);% - \coordinate[left of=MilieuB-#2] (aux4);% - \draw[out=-150,in=150,gray] (aux1) to (aux2); + \coordinate[right of=MilieuB-#2] (aux4);% + \draw[FlechePropor,gray] (aux2) -- (aux3); + \draw[out=-150,in=150,gray] (aux2) to (aux4); }% \draw[gray] (aux4) -- (aux1); - \draw[FlechePropor,gray] (aux2) -- (aux3); \end{tikzpicture}% }% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCProprietesDroites.tex b/Master/texmf-dist/tex/latex/profcollege/PfCProprietesDroites.tex index ad9f1b0edbe..fc74fea9c5a 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCProprietesDroites.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCProprietesDroites.tex @@ -1,6 +1,10 @@ %%% % Ppt\'es des droites (6eme) %%% +\def\filedatePptesDroites{2024/08/04}% +\def\fileversionPptesDroites{0.1}% +\message{-- \filedatePptesDroites\space v\fileversionPptesDroites}% +% \setKVdefault[ClesDroites]{Brouillon=false,CitePropriete=false,Num=1,Figure=false,Remediation=false,FigureSeule=false} \newcommand\Redaction[4][]{% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPuissanceQuatre.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPuissanceQuatre.tex index 1d8a9299390..d51387cd78f 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCPuissanceQuatre.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCPuissanceQuatre.tex @@ -1,30 +1,40 @@ %%% % Puissances 4 %%% -\setKVdefault[ClesPQuatre]{Couleur=Gray,Largeur=2cm,LargeurUn=2cm,Multiplication,Entier,Nombre,Exposant=false,Libre=false,Texte=false,Echelle=2}% +\def\filedatePquatre{2024/08/04}% +\def\fileversionPquatre{0.1}% +\message{-- \filedatePquatre\space v\fileversionPquatre}% +% +\setKVdefault[ClesPQuatre]{Couleur=Gray,Largeur=2cm,LargeurUn=2cm,Multiplication,Entier,Nombre,Exposant=false,Libre=false,Texte=false,Echelle=2,Correction=false}% \defKV[ClesPQuatre]{Addition=\setKV[ClesPQuatre]{Multiplication=false}}% \defKV[ClesPQuatre]{Relatif=\setKV[ClesPQuatre]{Entier=false}}% \defKV[ClesPQuatre]{Puissance=\setKV[ClesPQuatre]{Exposant}}% \defKV[ClesPQuatre]{Autre=\setKV[ClesPQuatre]{Nombre=false}\setKV[ClesPQuatre]{Libre}}% \defKV[ClesPQuatre]{Consignes=\setKV[ClesPQuatre]{Texte}}% +\defKV[ClesPQuatre]{Solution=\setKV[ClesPQuatre]{Correction}\setsepchar{,}\ignoreemptyitems\readlist*\PQuatreListeS{#1}\reademptyitems}% +\defKV[ClesPQuatre]{Graine=\PfCGraineAlea{#1}}% \newtoks\toklistePQuatreh% \newtoks\toklistePQuatrev% +\newtoks\toklistePQuatres% \def\UpdatetoksPQuatreh#1\nil{\addtotok\toklistePQuatreh{"#1",}}% \def\UpdatetoksPQuatrev#1\nil{\addtotok\toklistePQuatrev{"#1",}}% +\def\UpdatetoksPQuatres#1\nil{\addtotok\toklistePQuatres{"#1",}}% \NewDocumentCommand\PQuatre{o +m}{% \useKVdefault[ClesPQuatre]% \toklistePQuatreh{}% \toklistePQuatrev{}% + \toklistePQuatres{}% \setKV[ClesPQuatre]{#1}% \ifboolKV[ClesPQuatre]{Nombre}{% \ifboolKV[ClesPQuatre]{Exposant}{% - \def\PQuatreListe{$10^{-10}$,$10^{-9}$,$10^{-8}$,$10^{-7}$,$10^{-6}$,$10^{-5}$,$10^{-4}$,$10^{-3}$,$10^{-2}$,$10^{2}$,$10^{3}$,$10^{4}$,$10^{5}$,$10^{6}$,$10^{7}$,$10^{8}$,$10^{9}$,$10^{10}$}% + \def\PQuatreListe{-10,-9,-8,-7,-6,-5,-4,-3,-2,2,3,4,5,6,7,8,9,10}% \MelangeListe{\PQuatreListe}{7}% - \readlist*\PQuatreListeH{\faa}% + \ignoreemptyitems\readlist*\PQuatreListeH{\faa}% \MelangeListe{\PQuatreListe}{7}% - \readlist*\PQuatreListeV{\faa}% + \ignoreemptyitems\readlist*\PQuatreListeV{\faa}% + \reademptyitems \foreachitem\compteur\in\PQuatreListeH{\expandafter\UpdatetoksPQuatreh\compteur\nil}% \foreachitem\compteur\in\PQuatreListeV{\expandafter\UpdatetoksPQuatrev\compteur\nil}% }{% @@ -39,7 +49,7 @@ \foreachitem\compteur\in\PQuatreListeV{\expandafter\UpdatetoksPQuatrev\compteur\nil}% }{% % On choisit aléatoirement les listes de nombres de -10 à -2 union 2 à 10 en faisant deux listes : horizontale et verticale - \def\PQuatreListe{$-10$,$-9$,$-8$,$-7$,$-6$,$-5$,$-4$,$-3$,$-2$,2,3,4,5,6,7,8,9,10}% + \def\PQuatreListe{-10,-9,-8,-7,-6,-5,-4,-3,-2,2,3,4,5,6,7,8,9,10}% \MelangeListe{\PQuatreListe}{7}% \readlist*\PQuatreListeH{\faa}% \MelangeListe{\PQuatreListe}{7}% @@ -55,6 +65,10 @@ \setsepchar{,}% \foreachitem\compteur\in\PQuatreListes[1]{\expandafter\UpdatetoksPQuatrev\compteur\nil}% \foreachitem\compteur\in\PQuatreListes[2]{\expandafter\UpdatetoksPQuatreh\compteur\nil}% + % On crée éventuellement la liste des solutions + \ifboolKV[ClesPQuatre]{Correction}{% + \foreachitem\compteur\in\PQuatreListeS{\expandafter\UpdatetoksPQuatres\compteur\nil}% + }{}% }% % Une fois les listes construites, on dessine et on place les listes. \PQuatreGrille{\the\toklistePQuatrev}{\the\toklistePQuatreh}% @@ -69,10 +83,12 @@ PQEchelle=\useKV[ClesPQuatre]{Echelle}; color PQfond; PQfond=\useKV[ClesPQuatre]{Couleur}; - boolean PQLibre,PQMultiplication,PQTexte; + boolean PQLibre,PQMultiplication,PQTexte,Correction,Exposant; PQLibre:=\useKV[ClesPQuatre]{Libre}; PQMultiplication=\useKV[ClesPQuatre]{Multiplication}; PQTexte:=\useKV[ClesPQuatre]{Texte}; + Correction=\useKV[ClesPQuatre]{Correction}; + Exposant=\useKV[ClesPQuatre]{Exposant}; if PQTexte: string PQConsignes; @@ -111,6 +127,12 @@ if PQLibre: if PQTexte: label.llft(TEX("\begin{minipage}{"&decimal(PQLargeurUn)&"pt}"&PQConsignes&"\end{minipage}") scaled PQEchelle,A); + else: + if PQMultiplication: + label.llft(TEX("$\times$") scaled PQEchelle,A); + else: + label.llft(TEX("$+$") scaled PQEchelle,A); + fi; fi; else: if PQMultiplication: @@ -119,24 +141,72 @@ label.llft(TEX("$+$") scaled PQEchelle,A); fi; fi; + % + string Textev[]; + string Texteh[]; labeloffset:=labeloffset/2; vardef Vertical(text t)= n:=0; for p_=t: + if PQLibre: label.lft(TEX(p_) scaled PQEchelle,A+(0,n*PQLargeur+PQLargeur/2)); + else: + if Exposant: + label.lft(TEX("$10^{"&p_&"}$") scaled PQEchelle,A+(0,n*PQLargeur+PQLargeur/2)); + else: + label.lft(TEX("\num{"&p_&"}") scaled PQEchelle,A+(0,n*PQLargeur+PQLargeur/2)); + fi; + Textev[n]=p_; + fi; n:=n+1; endfor; enddef; vardef Horizontal(text t)= n:=0; for p_=t: + if PQLibre: label.bot(TEX(p_) scaled PQEchelle,A+(n*PQLargeur+PQLargeur/2,0)); + else: + if Exposant: + label.bot(TEX("$10^{"&p_&"}$") scaled PQEchelle,A+(n*PQLargeur+PQLargeur/2,0)); + else: + label.bot(TEX("\num{"&p_&"}") scaled PQEchelle,A+(n*PQLargeur+PQLargeur/2,0)); + fi; + Texteh[n]=p_; + fi; n:=n+1; endfor; enddef; labeloffset:=labeloffset*4; Vertical(#1); Horizontal(#2); + % on affiche la solution + vardef AfficheSolution(text t)= + n:=0; + for p_=t: + label(TEX(p_),M[n mod nclargeur][n div nchauteur]); + n:=n+1; + endfor; + enddef; + if Correction: + if PQLibre=false: + for k=0 upto (nclargeur-1): + for l=0 upto (nchauteur-1): + if Exposant: + label(TEX("\Large$10^{\fpeval{"&Texteh[k]&"+"&Textev[l]&"}}$"),M[k][l]); + else: + if PQMultiplication: + label(TEX("\Huge\num{\fpeval{"&Texteh[k]&"*"&Textev[l]&"}}"),M[k][l]); + else: + label(TEX("\Huge\num{\fpeval{"&Texteh[k]&"+"&Textev[l]&"}}"),M[k][l]); + fi; + fi; + endfor; + endfor; + else: + AfficheSolution(\the\toklistePQuatres); + fi; + fi; \end{mplibcode} \else% \begin{mpost}[mpsettings={Largeur=\useKV[ClesPQuatre]{Largeur};Largeur=\useKV[ClesPQuatre]{Largeur};LargeurUn=\useKV[ClesPQuatre]{LargeurUn};Echelle=\useKV[ClesPQuatre]{Echelle};color fond;fond=\useKV[ClesPQuatre]{Couleur};boolean Libre,Multiplication,Texte;Libre:=\useKV[ClesPQuatre]{Libre};Multiplication=\useKV[ClesPQuatre]{Multiplication};Texte:=\useKV[ClesPQuatre]{Texte};if Texte:string Consignes;Consignes=\useKV[ClesPQuatre]{Consignes};fi;}] diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPuzzleSommePyramide.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPuzzleSommePyramide.tex index 7f00ac287e1..865982ee356 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCPuzzleSommePyramide.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCPuzzleSommePyramide.tex @@ -1,6 +1,10 @@ %%% % Puzzle Somme Pyramide %%% +\def\filedatePuzzleSommePyramide{2024/08/04}% +\def\fileversionPuzzleSommePyramide{0.1}% +\message{-- \filedatePuzzleSommePyramide\space v\fileversionPuzzleSommePyramide}% +% \setKVdefault[ClesPuzzleP]{Largeur=40pt,Etages=4,Graines=false,Solutions=false,Jeu,EnonceQuestion=false,NbLignes=7} \defKV[ClesPuzzleP]{Graine=\setKV[ClesPuzzleP]{Graines}}% \defKV[ClesPuzzleP]{Solution=\setKV[ClesPuzzleP]{Solutions}\setKV[ClesPuzzleP]{Jeu=false}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPyraVoca.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPyraVoca.tex index bfda6963006..983a8b1eb95 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCPyraVoca.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCPyraVoca.tex @@ -1,6 +1,10 @@ %%% % PyraVoca %%% +\def\filedatePyraVoca{2024/08/04}% +\def\fileversionPyraVoca{0.1}% +\message{-- \filedatePyraVoca\space v\fileversionPyraVoca}% +% \newlength{\PfCPyraVocaHauteur} \setKVdefault[PyraVoca]{Solution=false,Largeur=15pt} diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPyramideCalculs.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPyramideCalculs.tex index fdd5c7b6852..0b00e0e4acc 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCPyramideCalculs.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCPyramideCalculs.tex @@ -1,6 +1,10 @@ %%% % Pyramide de calculs %%% +\def\filedatePyraCalc{2024/08/04}% +\def\fileversionPyraCalc{0.1}% +\message{-- \filedatePyraCalc\space v\fileversionPyraCalc}% +% \newcommand\DessinePyramideNombreMul[1]{% \ifluatex \mplibforcehmode @@ -241,7 +245,7 @@ \fi }% -\setKVdefault[ClesPyramide]{Etages=5,Largeur=2cm,Hauteur=1cm,Vide=false,Inverse=false,Double=false,Couleur=Crimson,Multiplication=false,CouleurNombre=blue,Produit=false,Solution=false,Aide=false,Cote=4cm}% +\setKVdefault[ClesPyramide]{ToutesOperations=false,Etages=5,Largeur=2cm,Hauteur=1cm,Vide=false,Inverse=false,Double=false,Couleur=Crimson,Multiplication=false,CouleurNombre=blue,Produit=false,Solution=false,Aide=false,Cote=4cm}% \newtoks\toklistecaseP% \def\UpdatetoksPyramide#1\nil{\addtotok\toklistecaseP{"#1",}}% @@ -250,6 +254,9 @@ \NewDocumentCommand\PyramideNombre{o m}{% \useKVdefault[ClesPyramide]% \setKV[ClesPyramide]{#1}% + \ifboolKV[ClesPyramide]{ToutesOperations}{% + \PyramideOp[#1]{#2}% + }{% \ifboolKV[ClesPyramide]{Multiplication}{% \ifx\bla#2\bla% \setKV[ClesPyramide]{Vide=true}% @@ -278,4 +285,302 @@ }{Le nombre d'éléments dans la liste des propositions n'est pas compatible avec le nombre d'étages choisi.}% \fi% }% +}% +}% + +\setKVdefault[PyramideOp]{Rayon=5mm,Graines=false,Etages=5,Solution=false,Relatifs=false,Case=-1} +\defKV[PyramideOp]{Graine=\setKV[PyramideOp]{Graines}} +\defKV[PyramideOp]{CouleurSolution=\setKV[PyramideOp]{Solution}} + +\NewDocumentCommand\PyramideOp{om}{% + \useKVdefault[PyramideOp]% + \setKV[PyramideOp]{#1}% + \ifboolKV[PyramideOp]{Relatifs}{% + \BuildPyramideOpRelatifs{#2}% + }{% + \BuildPyramideOp{#2}% + }% +}% + +\NewDocumentCommand\BuildPyramideOp{m}{% + \ifluatex + \mplibforcehmode + \mplibnumbersystem{double} + \begin{mplibcode} + Etages=\useKV[PyramideOp]{Etages}; + Rayon=\useKV[PyramideOp]{Rayon}; + Case=\useKV[PyramideOp]{Case}; + + boolean Graines,Solution,Allume[][]; + + Graines=\useKV[PyramideOp]{Graines}; + if Graines: + randomseed:=\useKV[PyramideOp]{Graine}; + fi; + + Solution=\useKV[PyramideOp]{Solution}; + if Solution: + color CouleurSolution; + CouleurSolution=\useKV[PyramideOp]{CouleurSolution}; + fi; + + vardef ChoixOperation(expr Nba,Nbb)= + if (Nba<Nbb) or (Nba=Nbb): + if Nba*Nbb>200: + ChoixOp:=ceiling(uniformdeviate(1)); + else: + ChoixOp:=ceiling(uniformdeviate(2)); + fi; + else: + if (Nba mod Nbb)<>0: + if Nba*Nbb>200: + ChoixAlea:=uniformdeviate(1); + if ChoixAlea<0.5: + ChoixOp:=1; + else: + ChoixOp:=3; + fi; + else: + ChoixOp:=ceiling(uniformdeviate(3)); + fi; + else: + if Nba*Nbb>200: + ChoixAlea:=uniformdeviate(1); + if ChoixAlea<0.5: + ChoixOp:=1; + else: + ChoixOp:=ceiling(2+uniformdeviate(2)); + fi; + else: + ChoixOp:=ceiling(uniformdeviate(4)); + fi; + fi; + fi; + enddef; + + numeric Nb[][],ChoixOp[][]; + + pair M[][],N[][]; + + for k=0 upto Etages-1: + for l=0 upto Etages-1-k: + M[k][l]=Rayon*(1,1)+2*Rayon*(l,k)+k*2*Rayon*(0.5,-1+cosd(30)); + Allume[k][l]=false; + endfor; + endfor; + for k=0 upto Etages-2: + for l=0 upto Etages-2-k: + N[k][l]=Rayon*(1,1)+(Rayon,0)+2*Rayon*(l,k)+k*2*Rayon*(0.5,-1+cosd(30)); + endfor; + endfor; + + n:=0; + + for p_=#1: + Nb[0][n]=p_; + if n=Case: + if n<Etages-1: + Allume[1][n]:=true; + else: + Allume[1][n-1]:=true; + fi; + else: + Allume[0][n]:=true; + fi; + n:=n+1; + endfor; + + string Op[][]; + + % Détermination des opérations et des valeurs à indiquer. + for k=0 upto Etages-1: + for l=0 upto Etages-2-k: + ChoixOperation(Nb[k][l],Nb[k][l+1]); + if ChoixOp=1: + Op[k][l]="$+$"; + Nb[k+1][l]=Nb[k][l]+Nb[k][l+1]; + elseif ChoixOp=2: + Op[k][l]="$\times$"; + Nb[k+1][l]=Nb[k][l]*Nb[k][l+1]; + elseif ChoixOp=3: + Op[k][l]="$\_$"; + Nb[k+1][l]=Nb[k][l]-Nb[k][l+1]; + elseif ChoixOp=4: + Op[k][l]="$\div$"; + Nb[k+1][l]=Nb[k][l]/Nb[k][l+1]; + fi; + endfor; + endfor; + %Affichage + for k=0 upto Etages-1: + for l=0 upto Etages-1-k: + if Allume[k][l]=false: + if Solution: + fill cercles(M[k][l],Rayon) withcolor CouleurSolution; + label(decimal(Nb[k][l]),M[k][l]); + fi; + else: + label(decimal(Nb[k][l]),M[k][l]); + fi; + trace cercles(M[k][l],Rayon); + endfor; + endfor; + for k=0 upto Etages-2: + for l=0 upto Etages-2-k: + fill cercles(N[k][l],2mm) withcolor 0.8white; + trace cercles(N[k][l],2mm); + label(TEX(Op[k][l]),N[k][l]); + endfor; + endfor; + \end{mplibcode} + \mplibnumbersystem{scaled} + \fi +} + +\NewDocumentCommand\BuildPyramideOpRelatifs{m}{% + \ifluatex + \mplibforcehmode + \mplibnumbersystem{double} + \begin{mplibcode} + Etages=\useKV[PyramideOp]{Etages}; + Rayon=\useKV[PyramideOp]{Rayon}; + Case=\useKV[PyramideOp]{Case}; + + boolean Graines,Solution,Allume[][]; + + Graines=\useKV[PyramideOp]{Graines}; + if Graines: + randomseed:=\useKV[PyramideOp]{Graine}; + fi; + + Solution=\useKV[PyramideOp]{Solution}; + if Solution: + color CouleurSolution; + CouleurSolution=\useKV[PyramideOp]{CouleurSolution}; + fi; + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + vardef ChoixOperation(expr Nba,Nbb)= + if (Nba=Nbb): + if Nba*Nbb>200: + ChoixOp:=ceiling(uniformdeviate(1)); + else: + ChoixOp:=ceiling(uniformdeviate(2)); + fi; + elseif (Nba+Nbb=0): + if abs(Nba*Nbb)>200: + ChoixOp:=3; + else: + ChoixAlea:=uniformdeviate(1); + if ChoixAlea<0.5: + ChoixOp:=2; + else: + ChoixOp:=3; + fi; + fi; + else: + if (abs(Nba) mod abs(Nbb))<>0: + if abs(Nba*Nbb)>200: + ChoixAlea:=uniformdeviate(1); + if ChoixAlea<0.5: + ChoixOp:=1; + else: + ChoixOp:=3; + fi; + else: + ChoixOp:=ceiling(uniformdeviate(3)); + fi; + else: + if abs(Nba*Nbb)>200: + ChoixAlea:=uniformdeviate(1); + if ChoixAlea<0.5: + ChoixOp:=1; + else: + ChoixOp:=ceiling(2+uniformdeviate(2)); + fi; + else: + ChoixOp:=ceiling(uniformdeviate(4)); + fi; + fi; + fi; + enddef; + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + numeric Nb[][],ChoixOp[][]; + + pair M[][],N[][]; + + for k=0 upto Etages-1: + for l=0 upto Etages-1-k: + M[k][l]=Rayon*(1,1)+2*Rayon*(l,k)+k*2*Rayon*(0.5,-1+cosd(30)); + Allume[k][l]=false; + endfor; + endfor; + for k=0 upto Etages-2: + for l=0 upto Etages-2-k: + N[k][l]=Rayon*(1,1)+(Rayon,0)+2*Rayon*(l,k)+k*2*Rayon*(0.5,-1+cosd(30)); + endfor; + endfor; + + n:=0; + + for p_=#1: + Nb[0][n]=p_; + if n=Case: + if n<Etages-1: + Allume[1][n]:=true; + else: + Allume[1][n-1]:=true; + fi; + else: + Allume[0][n]:=true; + fi; + n:=n+1; + endfor; + + string Op[][]; + + % Détermination des opérations et des valeurs à indiquer. + for k=0 upto Etages-1: + for l=0 upto Etages-2-k: + ChoixOperation(Nb[k][l],Nb[k][l+1]); + if ChoixOp=1: + Op[k][l]="$+$"; + Nb[k+1][l]=Nb[k][l]+Nb[k][l+1]; + elseif ChoixOp=2: + Op[k][l]="$\times$"; + Nb[k+1][l]=Nb[k][l]*Nb[k][l+1]; + elseif ChoixOp=3: + Op[k][l]="$\_$"; + Nb[k+1][l]=Nb[k][l]-Nb[k][l+1]; + elseif ChoixOp=4: + Op[k][l]="$\div$"; + Nb[k+1][l]=Nb[k][l]/Nb[k][l+1]; + fi; + endfor; + endfor; + %Affichage + for k=0 upto Etages-1: + for l=0 upto Etages-1-k: + if Allume[k][l]=false: + if Solution: + fill cercles(M[k][l],Rayon) withcolor CouleurSolution; + label(TEX("\num{"&decimal(Nb[k][l])&"}"),M[k][l]); + fi; + else: + label(TEX("\num{"&decimal(Nb[k][l])&"}"),M[k][l]); + fi; + trace cercles(M[k][l],Rayon); + endfor; + endfor; + for k=0 upto Etages-2: + for l=0 upto Etages-2-k: + fill cercles(N[k][l],2mm) withcolor 0.8white; + trace cercles(N[k][l],2mm); + label(TEX(Op[k][l]),N[k][l]); + endfor; + endfor; + \end{mplibcode} + \mplibnumbersystem{scaled} + \fi }%
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCPythagore.tex b/Master/texmf-dist/tex/latex/profcollege/PfCPythagore.tex index 5c922d98b04..f5c95d91e42 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCPythagore.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCPythagore.tex @@ -1,6 +1,10 @@ %%% % Le th\'eor\`eme de Pythagore %%% +\def\filedatePythagore{2024/08/04}% +\def\fileversionPythagore{0.1}% +\message{-- \filedatePythagore\space v\fileversionPythagore}% +% \setKVdefault[ClesPythagore]{Exact=false,AvantRacine=false,Racine=false,Entier=false,Egalite=false,Precision=2,Soustraction=false,Figure=false,FigureSeule=false,Angle=0,Echelle=1cm,Reciproque=false,ReciColonnes=false,Faible=false,Unite=cm,EnchaineA=false,EnchaineB=false,EnchaineC=false,Perso=false,AllPerso=false,SansMots=false,Decalage=5mm,ModeleCouleur=5}% \defKV[ClesPythagore]{ValeurA=\setKV[ClesPythagore]{EnchaineA}}% \defKV[ClesPythagore]{ValeurB=\setKV[ClesPythagore]{EnchaineB}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCQuestionsFlash.tex b/Master/texmf-dist/tex/latex/profcollege/PfCQuestionsFlash.tex index 8edee39f164..5bcf626ddcf 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCQuestionsFlash.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCQuestionsFlash.tex @@ -1,6 +1,10 @@ %%% % Questions Flash %%% +\def\filedateQFlash{2024/08/04}% +\def\fileversionQFlash{0.1}% +\message{-- \filedateQFlash\space v\fileversionQFlash}% +% \tcbset{Expression/.style={colback=white,valign=center,left=0mm,right=0mm,top=1mm,bottom=1mm,colframe=white}}% \tcbset{ExpressionSerie1/.style={colback=\useKV[ClesFlash]{Couleur1},left=0mm,right=0mm,top=1mm,bottom=1mm}}% \tcbset{ExpressionSerie2/.style={colback=\useKV[ClesFlash]{Couleur2},left=0mm,right=0mm,top=1mm,bottom=1mm}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCQuestionsRelier.tex b/Master/texmf-dist/tex/latex/profcollege/PfCQuestionsRelier.tex index aaf9a67f20b..8aee438e624 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCQuestionsRelier.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCQuestionsRelier.tex @@ -1,6 +1,10 @@ %%% % R\'eponses \`a relier %%% +\def\filedateQRelier{2024/08/04}% +\def\fileversionQRelier{0.1}% +\message{-- \filedateQRelier\space v\fileversionQRelier}% +% \setKVdefault[ClesRelie]{Solution=false,LargeurG=5cm,LargeurD=2cm,Stretch=1.5,Ecart=2cm,Couleur=black}% \defKV[ClesRelie]{Graine=\PfCGraineAlea{#1}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCQuiSuisJe.tex b/Master/texmf-dist/tex/latex/profcollege/PfCQuiSuisJe.tex index aa896d11856..119b5d0944c 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCQuiSuisJe.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCQuiSuisJe.tex @@ -1,6 +1,10 @@ %%% % Qui suis-je %%% +\def\filedateQsuisuisje{2024/08/04}% +\def\fileversionQsuisuisje{0.1}% +\message{-- \filedateQsuisuisje\space v\fileversionQsuisuisje}% +% \setKVdefault[Quisuisje]{Solution=false,Largeur=5mm,Colonnes=5,CodePerso=false,TexteA=Lettre,TexteB=R\'esultat du calcul}% \newcommand\QuisuisjeEnonce{% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCRLE.tex b/Master/texmf-dist/tex/latex/profcollege/PfCRLE.tex index a8f035a577c..8fabde9116c 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCRLE.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCRLE.tex @@ -1,6 +1,10 @@ %%% % Codage RLE %%% +\def\filedateRLE{2024/08/04}% +\def\fileversionRLE{0.1}% +\message{-- \filedateRLE\space v\fileversionRLE}% +% \setKVdefault[RLE]{Largeur=10pt,Taille=5,Unite=1cm,Solution=false,Enonce=true} \newtoks\toklisterle diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCRangementNombres.tex b/Master/texmf-dist/tex/latex/profcollege/PfCRangementNombres.tex index 1c48ab8efcc..ca58c321fdb 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCRangementNombres.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCRangementNombres.tex @@ -1,6 +1,10 @@ %%% % Rangement des nombres %%% +\def\filedateRgtNb{2024/08/04}% +\def\fileversionRgtNb{0.1}% +\message{-- \filedateRgtNb\space v\fileversionRgtNb}% +% \setKVdefault[ClesRgt]{Croissant,Decroissant=false,Strict,Fraction=false,Details=false,Seul=false}% \dtlexpandnewvalue% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCRapido.tex b/Master/texmf-dist/tex/latex/profcollege/PfCRapido.tex index fa3a16bf7e7..cb24c2b4043 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCRapido.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCRapido.tex @@ -1,6 +1,10 @@ %%% % Rapido %%% +\def\filedateRapido{2024/08/04}% +\def\fileversionRapido{0.1}% +\message{-- \filedateRapido\space v\fileversionRapido}% +% %% D'après https://www.facebook.com/groups/994675223903586/user/100017057226847 %% et une programmation de Laurent Lassale-Carrere \newcounter{PfCnexo} diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCRappelsFormules.tex b/Master/texmf-dist/tex/latex/profcollege/PfCRappelsFormules.tex index c2a4d959541..1d204baf909 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCRappelsFormules.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCRappelsFormules.tex @@ -1,6 +1,10 @@ %%% % Formules %%% +\def\filedateRapFormules{2024/08/04}% +\def\fileversionRapFormules{0.1}% +\message{-- \filedateRapFormules\space v\fileversionRapFormules}% +% \setKVdefault[ClesFormule]{Perimetre=false,Aire=false,Volume=false,Surface=carr\'e,Solide=pav\'e,Angle=0,Ancre={(0,0)},Largeur=5cm,Couleur=white,EchelleEspace=70,Echelle=1cm} \def\MPFigureCarreCode{% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCRecyclage.tex b/Master/texmf-dist/tex/latex/profcollege/PfCRecyclage.tex index 371688f120c..f99ced507ff 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCRecyclage.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCRecyclage.tex @@ -1,6 +1,10 @@ %%% % Logos Recyclage %%% +\def\filedateRecyclage{2024/08/04}% +\def\fileversionRecyclage{0.1}% +\message{-- \filedateRecyclage\space v\fileversionRecyclage}% +% \setKVdefault[Recyclage]{Ticket,Papier=false,Verre=false,Bouteille=false,Carton=false,Couleurs}% \defKV[Recyclage]{Couleur=\setKV[Recyclage]{Couleurs=false}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCReperage.tex b/Master/texmf-dist/tex/latex/profcollege/PfCReperage.tex index 23e7bd2775b..d2dec508171 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCReperage.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCReperage.tex @@ -1,6 +1,10 @@ %%% % Reperage %%% +\def\filedateReperage{2024/08/04}% +\def\fileversionReperage{0.1}% +\message{-- \filedateReperage\space v\fileversionReperage}% +% \setKVdefault[ClesReperage]{Unitex=1,Pasx=1,Unitey=1,Pasy=1,Unitez=1,Pasz=1,DemiDroite=false,Droite=false,Plan=false,Trace=false,ListeSegment={},Espace=false,Sphere=false,AnglePhi=30,CouleurLa=white,CouleurLon=Tomato,AffichageUnites=true,MarquePrimaire=true,AffichageNom=false,AffichageGrad=false,AffichageAbs=0,AffichageCoord=false,LectureCoord=false,ValeurUnitex=1,ValeurUnitey=1,ValeurOrigine=0,NomOrigine=O,EchelleEspace=50,CouleurCoord=black,Thermometre=false,Mercure=false,CouleurMercure=black,Celsius,Kelvin=false,Farenheit=false,ValeurMin=-4000,ValeurMax=4000,ValeurMiny=-4000,ValeurMaxy=4000,Etages=4,Code=false,Globe=false,Rho=1500,Phi=22,Theta=10,CouleurE=orange,CouleurG=green,Axes=false,TypeProj="persp",Niveaux=false,Decale=false,Tiret=false,Cadre=false,ModeleCouleur=5,EchelleCroix=1,CouleurCroix=black} \defKV[ClesReperage]{Traces=\setKV[ClesReperage]{Code}}% \defKV[ClesReperage]{Niveau=\setKV[ClesReperage]{Etages=#1}\setKV[ClesReperage]{Niveaux}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCRepresentationGraphique.tex b/Master/texmf-dist/tex/latex/profcollege/PfCRepresentationGraphique.tex index 390c1a9caac..47ed10c3761 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCRepresentationGraphique.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCRepresentationGraphique.tex @@ -1,7 +1,11 @@ %%% % Diff\'erentes représentations graphiques %%% -\setKVdefault[TraceG]{Millimetre=false,Grille=false,Graduations=false,PasGradX=1,PasGradY=1,PasGrilleX=1,PasGrilleY=1,Xmin=-5.5,Xmax=5.5,Xstep=1,Ymin=-5.5,Ymax=5.5,Ystep=1,Bornea=-5.5,Borneb=5.5,LabelX={},LabelY={},LegendeX=false,LegendeY=false,LabelC=0.5,NomCourbe={},Origine={(5.5,5.5)},Fonction=false,Points=false,Invisible=false,CouleurPoint=red,CouleurTrace=black,Epaisseur=1,Relie=false,RelieSegment=false,Marque=dot,Code=false,Vide=false,NbPointsCourbe=100,Tiret=false}% +\def\filedateRepGraph{2024/08/20}% +\def\fileversionRepGraph{0.1a}% +\message{-- \filedateRepGraph\space v\fileversionRepGraph}% +% +\setKVdefault[TraceG]{Millimetre=false,Grille=false,Graduations=false,PasGradX=1,PasGradY=1,PasGrilleX=1,PasGrilleY=1,Xmin=-5.5,Xmax=5.5,Xstep=1,Ymin=-5.5,Ymax=5.5,Ystep=1,Bornea=-5.5,Borneb=5.5,LabelX={},LabelY={},LegendeX=false,LegendeY=false,LabelC=0.5,NomCourbe={},Origine={(5.5,5.5)},Fonction=false,Points=false,Invisible=false,CouleurPoint=red,CouleurTrace=black,Epaisseur=1,Relie=false,RelieSegment=false,Marque=dot,Code=false,Vide=false,NbPointsCourbe=100,Tiret=false,StyleTrace=0,Date=false}% \defKV[TraceG]{Traces=\setKV[TraceG]{Code}}% \defKV[TraceG]{LabelX=\setKV[TraceG]{LegendeX}}% \defKV[TraceG]{LabelY=\setKV[TraceG]{LegendeY}}% @@ -35,6 +39,8 @@ y.u=1cm/\useKV[TraceG]{Ystep}; grillex=\useKV[TraceG]{PasGrilleX}; grilley=\useKV[TraceG]{PasGrilleY}; + pasgradx=\useKV[TraceG]{PasGradX}; + pasgrady=\useKV[TraceG]{PasGradY}; pos=\useKV[TraceG]{LabelC}; marque_p:=str \useKV[TraceG]{Marque}; @@ -49,6 +55,9 @@ LegendeX:=\useKV[TraceG]{LegendeX}; LegendeY:=\useKV[TraceG]{LegendeY}; + boolean Date; + Date=\useKV[TraceG]{Date}; + boolean Relie; Relie=\useKV[TraceG]{Relie}; @@ -73,12 +82,16 @@ fi; if Graduations: - for k=0 step grillex until (xmax-xmin): + for k=0 step pasgradx until (xmax-xmin): trace ((0,-0.5mm)--(0,0.5mm)) shifted ((k*x.u,0) shifted Origine) withpen pencircle scaled1.25; + if Date: + label.bot(TEX(decimal(xmin+k)),(k*x.u,0) shifted Origine); + else: label.bot(TEX("\num{"&decimal(xmin+k)&"}"),(k*x.u,0) shifted Origine); + fi; endfor; label.ulft(TEX("\num{"&decimal(ymin)&"}"),(0,0) shifted Origine); - for k=grilley step grilley until (ymax-ymin): + for k=pasgrady step pasgrady until (ymax-ymin): trace ((-0.5mm,0)--(0.5mm,0)) shifted ((0,k*y.u) shifted Origine) withpen pencircle scaled1.25; label.lft(TEX("\num{"&decimal(ymin+k)&"}"),(0,k*y.u) shifted Origine); endfor; diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCRepresenterEntier.tex b/Master/texmf-dist/tex/latex/profcollege/PfCRepresenterEntier.tex index 9ab7b24341f..15f69191319 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCRepresenterEntier.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCRepresenterEntier.tex @@ -1,6 +1,10 @@ %%% % Représenter un entier dans une base %%% +\def\filedateRepEntier{2024/08/04}% +\def\fileversionRepEntier{0.1}% +\message{-- \filedateRepEntier\space v\fileversionRepEntier}% +% \setKVdefault[ClesRBase]{Base=10,Echelle=1,Unite=false,Compact=false,Impression=false,ListeCouleurs={Tomato,LightSteelBlue,LightGreen,Cornsilk}}% \newcommand\RepresenterEntier[2][]{% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCRepresenterFraction.tex b/Master/texmf-dist/tex/latex/profcollege/PfCRepresenterFraction.tex index 6660693348a..2beb3ee5ed3 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCRepresenterFraction.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCRepresenterFraction.tex @@ -1,7 +1,11 @@ %%% % Fractions %%% -\setKVdefault[ClesFraction]{Rayon=2cm,Disque,Regulier=false,Segment=false,Rectangle=false,Longueur=5cm,Largeur=2cm,Cotes=5,Triangle=false,Parts=3,Eprouvette=false,Couleur=green,Reponse=false,Multiple=1,Hachures=false,Epaisseur=1} +\def\filedateRepFrac{2024/08/30}% +\def\fileversionRepFrac{0.1a}% +\message{-- \filedateRepFrac\space v\fileversionRepFrac}% +% +\setKVdefault[ClesFraction]{Rayon=2cm,Disque,Regulier=false,Segment=false,Rectangle=false,Longueur=5cm,Largeur=2cm,Cotes=5,Triangle=false,Parts=3,Eprouvette=false,Couleur=green,Reponse=false,Multiple=1,Hachures=false,Epaisseur=1,Aleatoire=false} \def\MPFractionEprouvetteCode{% Hauteur=\useKV[ClesFraction]{Longueur}; @@ -80,6 +84,7 @@ \ifluatex \mplibforcehmode \begin{mplibcode} + % Pas d'aléa ici : l'eau ne peut pas être en lévitation :) \MPFractionEprouvetteCode trace eprouvette(#2,#1); \end{mplibcode} @@ -90,6 +95,107 @@ \fi } +\def\MPFractionRegulierCodeAlea{% + Rayon=\useKV[ClesFraction]{Rayon}; + Cotes=\useKV[ClesFraction]{Cotes}; + color ColPolyReg; + ColPolyReg=\useKV[ClesFraction]{Couleur}; + boolean Hachures,Reponse; + Reponse=\useKV[ClesFraction]{Reponse}; + Hachures=\useKV[ClesFraction]{Hachures}; + Epaisseur=\useKV[ClesFraction]{Epaisseur}; + pair O,A[],B[]; + O=u*(0,0); + path cc,cd; + cc=cercles(O,Rayon); + for k=0 upto Cotes: + A[k]=pointarc(cc,k*(360/Cotes)); + endfor; + cd=polygone(A0 for k=1 upto Cotes-1:,A[k] endfor); + path part[]; + vardef FractionPolyReg(expr nume,deno)= + for k=0 upto deno: + B[k]=point(k*(Cotes/deno)) of cd; + dotlabel("",B[k]); + endfor; + for k=0 upto deno-1: + part[k]=O--B[k] for l=1 upto Cotes-1:if (B[k]--B[k+1]) intersectiontimes (O--A[l])<>(-1,-1):--A[l] fi endfor --B[k+1]--cycle;%O--arccercle(B[k],B[k+1],O)--cycle; + endfor; + m=(nume div deno); + if (nume mod deno)=0:m:=m-1; fi; + picture RetourFraction; + RetourFraction=image(% + Reste=((nume div deno)+1)*deno; + RetiensPart=0; + if Reponse: + if m>0: + for l=0 upto (m-1): + for k=0 upto deno-1: + if RetiensPart<nume: + if Reste>(nume-RetiensPart): + test:=uniformdeviate(1); + if test>0.5: + RetiensPart:=RetiensPart+1; + if Hachures: + drawoptions(withpen pencircle scaled Epaisseur); + draw hachurage(part[k] shifted(l*(2*Rayon+0.5cm,0)),1.5*360/deno,0.25,0) withcolor ColPolyReg; + else: + fill part[k] shifted(l*(2*Rayon+0.5cm,0)) withcolor ColPolyReg; + fi; + fi; + else: + RetiensPart:=RetiensPart+1; + if Hachures: + drawoptions(withpen pencircle scaled Epaisseur); + draw hachurage(part[k] shifted(l*(2*Rayon+0.5cm,0)),1.5*360/deno,0.25,0) withcolor ColPolyReg; + else: + fill part[k] shifted(l*(2*Rayon+0.5cm,0)) withcolor ColPolyReg; + fi; + fi; + fi; + Reste:=Reste-1; + endfor; + endfor; + fi; + for k=0 upto deno-1: + if RetiensPart<nume: + if Reste>(nume-RetiensPart): + test:=uniformdeviate(1); + if test>0.5: + RetiensPart:=RetiensPart+1; + if Hachures: + drawoptions(withpen pencircle scaled Epaisseur); + draw hachurage(part[k] shifted(m*(2*Rayon+0.5cm,0)),1.5*360/deno,0.25,0) withcolor ColPolyReg; + else: + fill part[k] shifted(m*(2*Rayon+0.5cm,0)) withcolor ColPolyReg; + fi; + fi; + else: + RetiensPart:=RetiensPart+1; + if Hachures: + drawoptions(withpen pencircle scaled Epaisseur); + draw hachurage(part[k] shifted(m*(2*Rayon+0.5cm,0)),1.5*360/deno,0.25,0) withcolor ColPolyReg; + else: + fill part[k] shifted(m*(2*Rayon+0.5cm,0)) withcolor ColPolyReg; + fi; + fi; + fi; + Reste:=Reste-1; + endfor; + fi; + drawoptions(withpen pencircle scaled Epaisseur); + for l=0 upto m: + draw cd shifted(l*(2*Rayon+0.5cm,0)); + for k=0 upto (deno-1): + draw segment(O,B[k]) shifted(l*(2*Rayon+0.5cm,0)); + endfor; + endfor; + drawoptions(); + ); + RetourFraction + enddef; +}% + \def\MPFractionRegulierCode{% Rayon=\useKV[ClesFraction]{Rayon}; Cotes=\useKV[ClesFraction]{Cotes}; @@ -168,7 +274,13 @@ \ifluatex \mplibforcehmode \begin{mplibcode} + boolean Alea; + Alea=\useKV[ClesFraction]{Aleatoire}; + if Alea: + \MPFractionRegulierCodeAlea; + else: \MPFractionRegulierCode + fi; trace FractionPolyReg(#1,#2); \end{mplibcode} \else @@ -178,6 +290,122 @@ \fi }% +\def\MPFractionTriangleCodeAlea{% + Longueur:=\useKV[ClesFraction]{Longueur}; + nbparts:=\useKV[ClesFraction]{Parts}; + color ColTriangle; + ColTriangle=\useKV[ClesFraction]{Couleur}; + boolean Hachures,Reponse; + Reponse=\useKV[ClesFraction]{Reponse}; + Hachures=\useKV[ClesFraction]{Hachures}; + Epaisseur=\useKV[ClesFraction]{Epaisseur}; + nbtriangle=0; + % + vardef Ligne(expr longueur)= + for k=0 upto 2*(longueur-1): + nbtriangle:=nbtriangle+1; + if (k mod 2)=0: + M[nbtriangle]=(Tria shifted(0.5*k*(1/nbparts)*(B-A))) shifted((nbparts-longueur)*(1/nbparts)*(C-A)); + else: + M[nbtriangle]=(Trir shifted(0.5*(k-1)*(1/nbparts)*(B-A))) shifted((nbparts-longueur)*(1/nbparts)*(C-A)); + fi; + endfor; + enddef; + % + pair A,B,C; + A=u*(0.5,0.5); + B-A=(Longueur,0); + C=rotation(B,A,60); + % + path Tria,Trir,M[]; + Tria=polygone(A,(1/nbparts)[A,B],(1/nbparts)[A,C]); + Trir=symetrie(Tria,(1/nbparts)[A,B],(1/nbparts)[A,C]); + % + for k=nbparts downto 1: + Ligne(k); + endfor; + % + picture FondTriangle; + FondTriangle=image( + for k=1 upto nbtriangle: + trace M[k]; + endfor; + ); + % + vardef FractionTriangle(expr nume,deno)= + m:=nume div deno; + if (nume mod deno)=0: + m:=m-1; + fi; + picture RetourFraction; + RetourFraction=image( + Reste=((nume div deno)+1)*deno; + RetiensPart=0; + if Reponse: + if m>0: + for l=0 upto (m-1): + for k=1 upto nbtriangle: + if RetiensPart<nume: + if Reste>(nume-RetiensPart): + test:=uniformdeviate(1); + if test>0.5: + RetiensPart:=RetiensPart+1; + if Hachures: + drawoptions(withpen pencircle scaled Epaisseur); + draw hachurage(M[k] shifted(l*(Longueur+1cm,0)),90,0.2,0) withcolor ColTriangle; + else: + fill M[k] shifted(l*(Longueur+1cm,0)) withcolor ColTriangle; + fi; + fi; + else: + RetiensPart:=RetiensPart+1; + if Hachures: + drawoptions(withpen pencircle scaled Epaisseur); + draw hachurage(M[k] shifted(l*(Longueur+1cm,0)),90,0.2,0) withcolor ColTriangle; + else: + fill M[k] shifted(l*(Longueur+1cm,0)) withcolor ColTriangle; + fi; + fi; + fi; + Reste:=Reste-1; + endfor; + endfor; + fi; + for k=1 upto nbtriangle: + if RetiensPart<nume: + if Reste>(nume-RetiensPart): + test:=uniformdeviate(1); + if test>0.5: + RetiensPart:=RetiensPart+1; + if Hachures: + drawoptions(withpen pencircle scaled Epaisseur); + draw hachurage(M[k] shifted(m*(Longueur+1cm,0)),90,0.2,0) withcolor ColTriangle; + else: + fill M[k] shifted(m*(Longueur+1cm,0)) withcolor ColTriangle; + fi; + fi; + else: + RetiensPart:=RetiensPart+1; + if Hachures: + drawoptions(withpen pencircle scaled Epaisseur); + draw hachurage(M[k] shifted(m*(Longueur+1cm,0)),90,0.2,0) withcolor ColTriangle; + else: + fill M[k] shifted(m*(Longueur+1cm,0)) withcolor ColTriangle; + fi; + fi; + fi; + Reste:=Reste-1; + endfor; + fi; + drawoptions(withpen pencircle scaled Epaisseur); + for l=0 upto m: + trace FondTriangle shifted(l*(Longueur+1cm,0)); + endfor; + ); + RetourFraction +enddef; +}% + \def\MPFractionTriangleCode{% Longueur:=\useKV[ClesFraction]{Longueur}; nbparts:=\useKV[ClesFraction]{Parts}; @@ -241,7 +469,7 @@ trace hachurage(polygone(A,B,C) shifted(l*(Longueur+1cm,0)),90,0.2,0) withcolor ColTriangle; drawoptions(withpen pencircle scaled Epaisseur); else: - remplis polygone(A,B,C) withcolor ColRectangle; + remplis polygone(A,B,C) withcolor ColTriangle; fi; fi; for k=1 upto nbparts: @@ -260,7 +488,13 @@ \ifluatex \mplibforcehmode \begin{mplibcode} - \MPFractionTriangleCode + boolean Alea; + Alea=\useKV[ClesFraction]{Aleatoire}; + if Alea: + \MPFractionTriangleCodeAlea; + else: + \MPFractionTriangleCode; + fi; draw FractionTriangle(#1,#2); \end{mplibcode} \else @@ -270,6 +504,117 @@ \fi }% +\def\MPFractionRectangleCodeAlea{% + Longueur=\useKV[ClesFraction]{Longueur}; + Largeur=\useKV[ClesFraction]{Largeur}; + color ColRectangle; + ColRectangle=\useKV[ClesFraction]{Couleur}; + boolean Hachures,Reponse; + Reponse=\useKV[ClesFraction]{Reponse}; + Hachures=\useKV[ClesFraction]{Hachures}; + Epaisseur=\useKV[ClesFraction]{Epaisseur}; + Multiple=\useKV[ClesFraction]{Multiple}; + % + pair A,B,C,D,M[],N[],R[],S[]; + A=(0,0); + B-A=(Longueur,0); + C-B=(0,Largeur); + D-C=A-B; + vardef FractionRectangle(expr nume,deno)= + m=nume div deno; + if (nume mod deno)=0: + m:=m-1; + fi; + numeric parts; + parts=(deno div Multiple); + for k=0 upto parts: + M[k]=(k/parts)[A,B]; + N[k]=(k/parts)[D,C]; + endfor; + if Multiple>1: + for k=0 upto Multiple: + R[k]=(k/Multiple)[A,D]; + S[k]=(k/Multiple)[B,C]; + endfor; + fi; + picture FondRectangle; + FondRectangle=image(% + path case[]; + for k=0 upto Multiple-1: + for l=0 step Multiple until (deno-1): + case[k*(deno div Multiple)+(l div Multiple)]=(unitsquare xscaled (Multiple*abs(A-B)/deno) yscaled (abs(D-A)/Multiple)) shifted (((l/deno)[A,B]-A)+((k/Multiple)[A,D]-A)); + trace case[k*(deno div Multiple)+(l div Multiple)]; + endfor; + endfor; + ); + picture RetourRectangle; + RetourRectangle=image( + Reste=((nume div deno)+1)*deno; + RetiensPart=0; + if Reponse: + if m>0: + for l=0 upto (m-1): + for k=0 upto deno-1: + if RetiensPart<nume: + if Reste>(nume-RetiensPart): + test:=uniformdeviate(1); + if test>0.5: + RetiensPart:=RetiensPart+1; + if Hachures: + drawoptions(withpen pencircle scaled Epaisseur); + draw hachurage(case[k] shifted(l*(Longueur+1cm,0)),45,0.25,0) withcolor ColRectangle; + else: + fill case[k] shifted(l*(Longueur+1cm,0)) withcolor ColRectangle; + fi; + fi; + else: + RetiensPart:=RetiensPart+1; + if Hachures: + drawoptions(withpen pencircle scaled Epaisseur); + draw hachurage(case[k] shifted(l*(Longueur+1cm,0)),45,0.25,0) withcolor ColRectangle; + else: + fill case[k] shifted(l*(Longueur+1cm,0)) withcolor ColRectangle; + fi; + fi; + fi; + Reste:=Reste-1; + endfor; + endfor; + fi; + for k=0 upto deno-1: + if RetiensPart<nume: + if Reste>(nume-RetiensPart): + test:=uniformdeviate(1); + if test>0.5: + RetiensPart:=RetiensPart+1; + if Hachures: + drawoptions(withpen pencircle scaled Epaisseur); + draw hachurage(case[k] shifted(m*(Longueur+1cm,0)),45,0.25,0) withcolor ColRectangle; + else: + fill case[k] shifted(m*(Longueur+1cm,0)) withcolor ColRectangle; + fi; + fi; + else: + RetiensPart:=RetiensPart+1; + if Hachures: + drawoptions(withpen pencircle scaled Epaisseur); + draw hachurage(case[k] shifted(m*(Longueur+1cm,0)),45,0.25,0) withcolor ColRectangle; + else: + fill case[k] shifted(m*(Longueur+1cm,0)) withcolor ColRectangle; + fi; + fi; + fi; + Reste:=Reste-1; + endfor; + fi; + for l=0 upto m: + trace FondRectangle shifted(l*(Longueur+1cm,0)); + endfor; + ); + RetourRectangle + enddef; +}% + \def\MPFractionRectangleCode{% Longueur=\useKV[ClesFraction]{Longueur}; Largeur=\useKV[ClesFraction]{Largeur}; @@ -378,7 +723,13 @@ \ifluatex% \mplibforcehmode% \begin{mplibcode} - \MPFractionRectangleCode + boolean Alea; + Alea=\useKV[ClesFraction]{Aleatoire}; + if Alea: + \MPFractionRectangleCodeAlea; + else: + \MPFractionRectangleCode; + fi; trace FractionRectangle(#1,#2); \end{mplibcode} \else% @@ -388,6 +739,101 @@ \fi% }% +\def\MPFractionDisqueCodeAlea{% + Rayon=\useKV[ClesFraction]{Rayon}; + Epaisseur=\useKV[ClesFraction]{Epaisseur}; + color ColDisque; + ColDisque=\useKV[ClesFraction]{Couleur}; + boolean Hachures,Reponse; + Hachures=\useKV[ClesFraction]{Hachures}; + Reponse:=\useKV[ClesFraction]{Reponse}; + % + pair A,B[]; + A=(0,0); + path cc,part[]; + cc=cercles(A,Rayon); + vardef FractionDisque(expr nume,deno)= + for k=0 upto deno+1: + B[k]=pointarc(cc,(360/deno)*k); + endfor; + for k=0 upto deno-1: + part[k]=A--arccercle(B[k],B[k+1],A)--cycle; + endfor; + m=(nume div deno); + if (nume mod deno)=0:m:=m-1; fi; + picture RetourFraction; + RetourFraction=image(% + Reste=((nume div deno)+1)*deno; + RetiensPart=0; + if Reponse: + if m>0: + for l=0 upto (m-1): + for k=0 upto deno-1: + if RetiensPart<nume: + if Reste>(nume-RetiensPart): + test:=uniformdeviate(1); + if test>0.5: + RetiensPart:=RetiensPart+1; + if Hachures: + drawoptions(withpen pencircle scaled Epaisseur); + draw hachurage(part[k] shifted(l*(2*Rayon+1cm,0)),1.5*360/deno,0.25,0) withcolor ColDisque; + else: + fill part[k] shifted(l*(2*Rayon+1cm,0)) withcolor ColDisque; + fi; + fi; + else: + RetiensPart:=RetiensPart+1; + if Hachures: + drawoptions(withpen pencircle scaled Epaisseur); + draw hachurage(part[k] shifted(l*(2*Rayon+1cm,0)),1.5*360/deno,0.25,0) withcolor ColDisque; + else: + fill part[k] shifted(l*(2*Rayon+1cm,0)) withcolor ColDisque; + fi; + fi; + fi; + Reste:=Reste-1; + endfor; + endfor; + fi; + for k=0 upto deno-1: + if RetiensPart<nume: + if Reste>(nume-RetiensPart): + test:=uniformdeviate(1); + if test>0.5: + RetiensPart:=RetiensPart+1; + if Hachures: + drawoptions(withpen pencircle scaled Epaisseur); + draw hachurage(part[k] shifted(m*(2*Rayon+1cm,0)),1.5*360/deno,0.25,0) withcolor ColDisque; + else: + fill part[k] shifted(m*(2*Rayon+1cm,0)) withcolor ColDisque; + fi; + fi; + else: + RetiensPart:=RetiensPart+1; + if Hachures: + drawoptions(withpen pencircle scaled Epaisseur); + draw hachurage(part[k] shifted(m*(2*Rayon+1cm,0)),1.5*360/deno,0.25,0) withcolor ColDisque; + else: + fill part[k] shifted(m*(2*Rayon+1cm,0)) withcolor ColDisque; + fi; + fi; + fi; + Reste:=Reste-1; + endfor; + fi; + drawoptions(withpen pencircle scaled Epaisseur); + for l=0 upto m: + draw cc shifted(l*(2*Rayon+1cm,0)); + for k=0 upto (deno-1): + draw segment(A,B[k]) shifted(l*(2*Rayon+1cm,0)); + endfor; + endfor; + drawoptions(); + ); + RetourFraction + enddef; +}% + \def\MPFractionDisqueCode{% Rayon=\useKV[ClesFraction]{Rayon}; Epaisseur=\useKV[ClesFraction]{Epaisseur}; @@ -444,7 +890,13 @@ \ifluatex \mplibforcehmode \begin{mplibcode} + boolean Alea; + Alea=\useKV[ClesFraction]{Aleatoire}; + if Alea: + \MPFractionDisqueCodeAlea; + else: \MPFractionDisqueCode + fi; trace FractionDisque(#1,#2); \end{mplibcode} \else @@ -454,6 +906,115 @@ \fi } +\def\MPFractionSegmentCodeAlea{% + Longueur=\useKV[ClesFraction]{Longueur}; + color ColSegment; + ColSegment=\useKV[ClesFraction]{Couleur}; + boolean Hachures,Reponse; + Reponse=\useKV[ClesFraction]{Reponse}; + Hachures=\useKV[ClesFraction]{Hachures}; + Epaisseur=\useKV[ClesFraction]{Epaisseur}; + % + pair A,C,B[]; + A=(0,0); + C-A=(Longueur,0); + % + path part[]; + % + vardef FractionSegment(expr nume,deno)= + for k=0 upto deno: + B[k]=(k/deno)[A,C]; + endfor; + for k=0 upto deno-1: + part[k]=polygone(B[k]+u*(0,-0.15),B[k+1]+u*(0,-0.15),B[k+1]+u*(0,0.15),B[k]+u*(0,0.15)); + endfor; + m=nume div deno; + picture RetourFraction; + RetourFraction=image( + Reste=((nume div deno)+1)*deno; + RetiensPart=0; + % Reponse + if Reponse: + if m>0: + for l=0 upto (m-1): + for k=0 upto deno-1: + if RetiensPart<nume: + if Reste>(nume-RetiensPart): + test:=uniformdeviate(1); + if test>0.5: + RetiensPart:=RetiensPart+1; + if Hachures: + drawoptions(withpen pencircle scaled Epaisseur); + draw hachurage(part[k] shifted(l*(Longueur+1cm,0)),120,0.2,0) withcolor ColSegment; + drawoptions(); + else: + draw (segment(B[k],B[k+1]) shifted(l*(Longueur+1cm,0))) withpen pencircle scaled 2 withcolor ColSegment; + fi; + fi; + else: + RetiensPart:=RetiensPart+1; + if Hachures: + drawoptions(withpen pencircle scaled Epaisseur); + draw hachurage(part[k] shifted(l*(Longueur+1cm,0)),120,0.2,0) withcolor ColSegment; + drawoptions(); + else: + draw (segment(B[k],B[k+1]) shifted(l*(Longueur+1cm,0))) withpen pencircle scaled 2 withcolor ColSegment; + fi; + fi; + fi; + Reste:=Reste-1; + endfor; + endfor; + fi; + for k=0 upto deno-1: + if RetiensPart<nume: + if Reste>(nume-RetiensPart): + test:=uniformdeviate(1); + if test>0.5: + RetiensPart:=RetiensPart+1; + if Hachures: + drawoptions(withpen pencircle scaled Epaisseur); + draw hachurage(part[k] shifted(m*(Longueur+1cm,0)),120,0.2,0) withcolor ColSegment; + drawoptions(); + else: + draw (segment(B[k],B[k+1]) shifted(m*(Longueur+1cm,0))) withpen pencircle scaled 2 withcolor ColSegment; + fi; + fi; + else: + RetiensPart:=RetiensPart+1; + if Hachures: + drawoptions(withpen pencircle scaled Epaisseur); + draw hachurage(part[k] shifted(m*(Longueur+1cm,0)),120,0.2,0) withcolor ColSegment; + else: + draw (segment(B[k],B[k+1]) shifted(m*(Longueur+1cm,0))) withpen pencircle scaled 2 withcolor ColSegment; + fi; + fi; + fi; + Reste:=Reste-1; + endfor; + fi; + %fin Reponse + if Hachures:drawoptions(withpen pencircle scaled Epaisseur);fi; + % draw (segment(B[0],B[nume mod deno]) shifted(m*(Longueur+1cm,0))); + for l=0 upto m: + draw segment(A,C) shifted(l*(Longueur+1cm,0)); + endfor; + marque_p:="tiretv"; + for l=0 upto m-1: + for k=0 upto deno: + pointe(B[k] shifted(l*(Longueur+1cm,0))); + endfor; + endfor; + if (nume mod deno)<>0: + for k=0 upto deno: + pointe(B[k] shifted(m*(Longueur+1cm,0))); + endfor; + fi; + ); + RetourFraction + enddef; +} + \def\MPFractionSegmentCode{% Longueur=\useKV[ClesFraction]{Longueur}; color ColSegment; @@ -525,7 +1086,13 @@ \ifluatex \mplibforcehmode \begin{mplibcode} + boolean Alea; + Alea=\useKV[ClesFraction]{Aleatoire}; + if Alea: + \MPFractionSegmentCodeAlea; + else: \MPFractionSegmentCode + fi; trace FractionSegment(#1,#2); \end{mplibcode} \else diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCRepresenterTableur.tex b/Master/texmf-dist/tex/latex/profcollege/PfCRepresenterTableur.tex index 0e6162aa765..9b1bcaa8b1b 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCRepresenterTableur.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCRepresenterTableur.tex @@ -1,9 +1,15 @@ %%% % Tableur %%% -\setKVdefault[Tableur]{Colonnes=4,Largeur=30pt,LargeurUn=30pt,Bandeau=true,Formule={},Cellule=A1,Ligne=0,Colonne=0,PasL=1,PasC=1,Selection=false,DebutColonnes=0,DebutLignes=0,LargeurNombre=10pt}% +\def\filedateRepTab{2024/08/21}% +\def\fileversionRepTab{0.1a}% +\message{-- \filedateRepTab\space v\fileversionRepTab}% +% +\setKVdefault[Tableur]{Colonnes=4,Largeur=30pt,LargeurUn=30pt,Bandeau=true,Formule={},Cellule=A1,Ligne=0,Colonne=0,PasL=1,PasC=1,Selection=false,DebutColonnes=0,DebutLignes=0,LargeurNombre=10pt,Apres=false,ApresBandeau=false}% %Idee de P. Nuns \defKV[Tableur]{Couleur=\setKV[Tableur]{Selection}}% +\defKV[Tableur]{CodeAfter=\setKV[Tableur]{Apres}}% +\defKV[Tableur]{CodeAfterBandeau=\setKV[Tableur]{ApresBandeau}}% % %Bas\'e sur un code de Christian T\'ell\'ech\'ea. @@ -20,6 +26,9 @@ \ifremain@lines#2\\\@nil{\addtot@b&\subst@eol#2\@nil}{\addtot@b{#2\CodeAfter\xintifboolexpr{\useKV[Tableur]{Ligne}==0 || \useKV[Tableur]{Colonne}==0}{}{% \tikz\node at (row-\fpeval{\useKV[Tableur]{Ligne}+1+\useKV[Tableur]{PasL}}-|col-\fpeval{\useKV[Tableur]{Colonne}+1+\useKV[Tableur]{PasC}}) {\tiny$\blacksquare$};% }% + \ifboolKV[Tableur]{Apres}{% + \useKV[Tableur]{CodeAfter}% + }{}% \end{NiceTabular}}}}% \long\def\collectcp@body#1\end{\subst@eol#1\@nil\end}% @@ -103,6 +112,10 @@ \ifboolKV[Tableur]{Bandeau}{% \begin{NiceTabular}{p{\PfCTableurLargeur}p{10pt}p{50pt}p{\PfCLongInter}}% \Block[draw,l]{}{\useKV[Tableur]{Cellule}}&\Block[draw]{}{\scriptsize$\blacktriangledown$}&\Block{}{$f_x$\hfill$\sum$~\scriptsize$\blacktriangledown$\hfill$=$}&\Block[draw]{}{\useKV[Tableur]{Formule}\hfill\scriptsize$\blacktriangledown$}\\ + \CodeAfter + \ifboolKV[Tableur]{ApresBandeau}{% + \useKV[Tableur]{CodeAfterBandeau}% + }{}% \end{NiceTabular}% \nopagebreak% \\% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCReseauxSociaux.tex b/Master/texmf-dist/tex/latex/profcollege/PfCReseauxSociaux.tex index 996e33c0265..2ccc0748f66 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCReseauxSociaux.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCReseauxSociaux.tex @@ -1,6 +1,10 @@ %%% % Twitter %%% +\def\filedateReseaux{2024/08/04}% +\def\fileversionReseaux{0.1}% +\message{-- \filedateReseaux\space v\fileversionReseaux}% +% \setKVdefault[Twitter]{Largeur=0.95\linewidth,Auteur=Christophe,Date=\today,Url=ViveLaTeX,EchelleLogo=0.035,Logo=DrStrange,Publie=false}% \NewDocumentEnvironment{Twitter}{o+b}{% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCResoudreEquation.tex b/Master/texmf-dist/tex/latex/profcollege/PfCResoudreEquation.tex index a5ce8ebf635..795a79e833e 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCResoudreEquation.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCResoudreEquation.tex @@ -1,6 +1,10 @@ %%% % Equations %%% +\def\filedateEquation{2024/08/04}% +\def\fileversionEquation{0.1}% +\message{-- \filedateEquation\space v\fileversionEquation}% +% \setKVdefault[ClesEquation]{Ecart=0.5,Fleches=false,FlecheDiv=false,Laurent=false,Decomposition=false,Terme=false,Composition=false,Symbole=false,ModeleBarre=false,Decimal=false,Entier=false,Lettre=x,Solution=false,LettreSol=true,Bloc=false,Simplification=false,CouleurTerme=black,CouleurCompo=black,CouleurSous=red,CouleurSymbole=orange,Verification=false,Nombre=0,Egalite=false,Produit=false,Facteurs=false,Carre=false,Exact=false,Pose=false,Equivalence=false} \newcommand\rightcomment[4]{% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCRondeInfernale.tex b/Master/texmf-dist/tex/latex/profcollege/PfCRondeInfernale.tex index 9fc7f3446d6..26a78fcc2f6 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCRondeInfernale.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCRondeInfernale.tex @@ -1,6 +1,10 @@ %%% % Ronde infernale %%% +\def\filedateRondeI{2024/08/04}% +\def\fileversionRondeI{0.1}% +\message{-- \filedateRondeI\space v\fileversionRondeI}% +% \newcommand\TestNombrePremier[1]{% % #1 le nombre \`a tester \newcount\anp\newcount\bnp\newcount\cnp% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCRose.tex b/Master/texmf-dist/tex/latex/profcollege/PfCRose.tex index d6059cdd7ec..3798a26f748 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCRose.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCRose.tex @@ -1,6 +1,10 @@ %%% % Rose %%% +\def\filedateRose{2024/08/04}% +\def\fileversionRose{0.1}% +\message{-- \filedateRose\space v\fileversionRose}% +% \setKVdefault[ClesRose]{Vide=false,Couleur=white,Produits=false,Solution=false,Rayon=2cm,Petales=7,Aide=false,FacteurMin=2,FacteurMax=10,ProduitVide=false,CaseVide=false,Polygone=false,Nom=Rose1,Creation=false,Addition=false,Melange=false,CDot=false}% \defKV[ClesRose]{LesNombres=\setKV[ClesRose]{Creation}}% \defKV[ClesRose]{LesProduits=\setKV[ClesRose]{Creation}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCScratch.tex b/Master/texmf-dist/tex/latex/profcollege/PfCScratch.tex index 0315d8d3a87..778ee151749 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCScratch.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCScratch.tex @@ -1,6 +1,10 @@ %%%% % Scratch %%%% +\def\filedateScratch{2024/08/04}% +\def\fileversionScratch{0.1}% +\message{-- \filedateScratch\space v\fileversionScratch}% +% \newlength{\longbarreheight} \setlength{\longbarreheight}{2.1ex+3pt} diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCSerpent.tex b/Master/texmf-dist/tex/latex/profcollege/PfCSerpent.tex index cd38bd90a25..e4352613d7e 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCSerpent.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCSerpent.tex @@ -1,10 +1,14 @@ %%% % Serpent %%% +\def\filedateSerpent{2024/08/04}% +\def\fileversionSerpent{0.1}% +\message{-- \filedateSerpent\space v\fileversionSerpent}% +% \newtoks\tokListeSerpentPerso{}% \def\UpdatetoksSerpent#1\nil{\addtotok\tokListeSerpentPerso{"#1"}}% -\setKVdefault[Serpent]{Cases=9,Case=1,Solution=false,PasQuad=7mm,ValeurMin=2,ValeurMax=10,Creation=false,Graines=false} +\setKVdefault[Serpent]{Cases=9,Case=1,Solution=false,PasQuad=7mm,ValeurMin=2,ValeurMax=10,Creation=false,Graines=false,Direct=false,Disque=false,Spirale=false} \defKV[Serpent]{CouleurSolution=\setKV[Serpent]{Solution}}% \defKV[Serpent]{Perso=\setKV[Serpent]{Creation}\xdef\PfCFooCheminSerpent{#1}}%+Liste des déplacements \defKV[Serpent]{Graine=\setKV[Serpent]{Graines}}% @@ -19,7 +23,14 @@ \BuildSerpent{\the\tokListeSerpentPerso}% \reademptyitems% }{% - \BuildSerpent{}% + \ifboolKV[Serpent]{Direct}{% + \BuildSerpentDirect{}% + }{\ifboolKV[Serpent]{Spirale}{% + %\BuildSerpentSpirale{}% + }{% + \BuildSerpent{}% + }% + }% }% }% @@ -29,10 +40,11 @@ \mplibnumbersystem{double}% \begin{mplibcode} % - boolean Solution,Perso,Graines; + boolean Solution,Perso,Graines,Disque; Solution=\useKV[Serpent]{Solution}; Perso=\useKV[Serpent]{Creation}; Graines=\useKV[Serpent]{Graines}; + Disque=\useKV[Serpent]{Disque}; % if Graines: randomseed:=\useKV[Serpent]{Graine}; @@ -210,7 +222,11 @@ fi; fi; for k=1 upto LongueurChemin: + if Disque: + trace (fullcircle scaled (2*PasQuad)) shifted (N[k]+PasQuad*(1,1)); + else: trace (unitsquare scaled (2*PasQuad)) shifted N[k]; + fi; endfor; for k=1 upto LongueurChemin-1: drawarrow (center (unitsquare scaled (2*PasQuad)) shifted N[k])--(center (unitsquare scaled (2*PasQuad)) shifted N[k+1]) cutbefore ((unitsquare scaled (2*PasQuad)) shifted N[k]) cutafter ((unitsquare scaled (2*PasQuad)) shifted N[k+1]); @@ -363,4 +379,193 @@ \end{mplibcode} \mplibnumbersystem{scaled}% \fi +}% + +\NewDocumentCommand\BuildSerpentDirect{m}{% + \ifluatex% + \mplibforcehmode% + \mplibnumbersystem{double}% + \begin{mplibcode} + % + boolean Solution,Graines,Disque; + Solution=\useKV[Serpent]{Solution}; + Graines=\useKV[Serpent]{Graines}; + Disque=\useKV[Serpent]{Disque}; + % + if Graines: + randomseed:=\useKV[Serpent]{Graine}; + fi; + % + color CoulSolution; + if Solution: + CoulSolution=\useKV[Serpent]{CouleurSolution}; + fi; + % + numeric LongueurChemin,Depart; + LongueurChemin=\useKV[Serpent]{Cases}; + ValeurMin=\useKV[Serpent]{ValeurMin}; + ValeurMax=\useKV[Serpent]{ValeurMax}; + CaseDepart=\useKV[Serpent]{Case}; + Depart=ValeurMin+floor(uniformdeviate(ValeurMax-ValeurMin+1)); + % + PasQuad=5mm;%\useKV[Serpent]{PasQuad}; + % + pair N[]; + N[1]:=4*PasQuad*(0,0); + for k=2 upto LongueurChemin: + N[k]=N[k-1]+4*PasQuad*(1,0); + endfor; + % Tracage + if CaseDepart=1: + label(TEX("\Large"&decimal(Depart)),N[1] shifted(PasQuad*(1,1))); + else: + if Solution: + label(TEX("\Large"&decimal(Depart)),N[1] shifted(PasQuad*(1,1))) withcolor CoulSolution; + fi; + fi; + for k=1 upto LongueurChemin: + if Disque: + trace (fullcircle scaled (2*PasQuad)) shifted (N[k]+PasQuad*(1,1)); + else: + trace (unitsquare scaled (2*PasQuad)) shifted N[k]; + fi; + endfor; + % + path cheminfleche[]; + path CheminFlecheBase; + CheminFlecheBase=(0,2*PasQuad){dir45}..(4*PasQuad,2*PasQuad); + for k=1 upto LongueurChemin-1: + cheminfleche[k]=CheminFlecheBase shifted (N[k]+(PasQuad,0)); + %cheminfleche[k]=(center (unitsquare scaled (2*PasQuad)) shifted N[k]){dir45}..(center (unitsquare scaled (2*PasQuad)) shifted N[k+1]) cutbefore ((unitsquare scaled (2*PasQuad)) shifted N[k]) cutafter ((unitsquare scaled (2*PasQuad)) shifted N[k+1]); + drawarrow cheminfleche[k]; + endfor; + %%drawoptions(); + boolean PremierChiffre; + PremierChiffre=true; + %% Test Premier + vardef TestPremier(expr nombre)= + nbdiviseur:=0; + nbdiv:=0; + for k=2 upto nombre: + if (nombre mod k)=0: + nbdiviseur:=nbdiviseur+1; + if k<11: + nbdiv:=nbdiv+1; + Diviseur[nbdiv]:=k; + fi; + fi; + endfor; + if nbdiviseur>1: + PremierChiffre:=false; + else: + PremierChiffre:=true; + fi; + enddef; + % Les opérations + numeric Chiffre[]; + pair St[]; + Chiffre[1]=Depart; + % + vardef EcrireSomme(expr tt)= + Somme:=5+ceiling(uniformdeviate(10)); + Chiffre[tt]=Chiffre[tt-1]+Somme; + St[tt]=point(0.5*length cheminfleche[tt-1]) of cheminfleche[tt-1]; + label.top(TEX("$+"&decimal(Somme)&"$"),St[tt]); + enddef; + % + vardef EcrireProduit(expr tt)= + Multiple:=1+ceiling(uniformdeviate(8)); + Chiffre[tt]=Chiffre[tt-1]*Multiple; + St[tt]=point(0.5*length cheminfleche[tt-1]) of cheminfleche[tt-1]; + label.top(TEX("$\PfCSymbolTimes"&decimal(Multiple)&"$"),St[tt]); + enddef; + % + vardef EcrireDifferenceCent(expr tt)= + Difference:=ceiling(Chiffre[tt-1]-15+uniformdeviate(10)); + Chiffre[tt]=Chiffre[tt-1]-Difference; + St[tt]=point(0.5*length cheminfleche[tt-1]) of cheminfleche[tt-1]; + label.top(TEX("$-"&decimal(Difference)&"$"),St[tt]); + enddef; + % + vardef EcrireDifference(expr tt)= + Difference:=if Chiffre[tt-1]<20:1+floor(uniformdeviate(Chiffre[tt-1]-1)) else: 5+ceiling(uniformdeviate(10)) fi; + Chiffre[tt]=Chiffre[tt-1]-Difference; + St[tt]=point(0.5*length cheminfleche[tt-1]) of cheminfleche[tt-1]; + label.top(TEX("$-"&decimal(Difference)&"$"),St[tt]); + enddef; + % + vardef EcrireQuotient(expr tt)= + choixdiv:=ceiling(nbdiv); + Quotient:=Diviseur[choixdiv]; + Chiffre[tt]=Chiffre[tt-1] div Quotient; + St[tt]=point(0.5*length cheminfleche[tt-1]) of cheminfleche[tt-1]; + label.top(TEX("$\PfCSymbolDiv"&decimal(Quotient)&"$"),St[tt]); + enddef; + % + for k=2 upto LongueurChemin: + if (Chiffre[k-1]=1) or (Chiffre[k-1]=0): + % On additionne ou on multiplie si c'est un + if Chiffre[k-1]=1: + alea:=ceiling(uniformdeviate(2)); + if alea=1: + EcrireSomme(k); + else: + EcrireProduit(k); + fi; + else: + EcrireSomme(k); + fi; + else: + TestPremier(Chiffre[k-1]); + if PremierChiffre: + if Chiffre[k-1]>100: + EcrireDifferenceCent(k); + else: + alea:=ceiling(uniformdeviate(3)); + if alea=1: + EcrireSomme(k); + elseif alea=2: + EcrireDifference(k); + elseif alea=3: + EcrireProduit(k); + fi; + fi; + if k=CaseDepart: + label(TEX("\Large"&decimal(Chiffre[k])),N[k] shifted(PasQuad*(1,1))); + elseif Solution: + label(TEX("\Large"&decimal(Chiffre[k])),N[k] shifted(PasQuad*(1,1))) withcolor CoulSolution; + fi; + else: + if Chiffre[k-1]>100: + alea:=ceiling(uniformdeviate(2)); + if alea=1: + EcrireDifferenceCent(k); + else: + EcrireQuotient(k); + fi; + else: + alea:=ceiling(uniformdeviate(4)); + if alea=1: + EcrireSomme(k); + elseif alea=2: + EcrireDifference(k); + elseif alea=3: + EcrireProduit(k); + elseif alea=4: + EcrireQuotient(k); + fi; + fi; + fi; + fi; + if k=CaseDepart: + label(TEX("\Large"&decimal(Chiffre[k])),N[k] shifted(PasQuad*(1,1))); + else: + if Solution: + label(TEX("\Large"&decimal(Chiffre[k])),N[k] shifted(PasQuad*(1,1))) withcolor CoulSolution; + fi; + fi; + endfor; + \end{mplibcode} + \mplibnumbersystem{scaled}% + \fi }%
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCShikaku.tex b/Master/texmf-dist/tex/latex/profcollege/PfCShikaku.tex index 04084cadcae..8f6616ff3e0 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCShikaku.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCShikaku.tex @@ -1,6 +1,10 @@ %%% % Shikaku %%% +\def\filedateShikaku{2024/08/04}% +\def\fileversionShikaku{0.1}% +\message{-- \filedateShikaku\space v\fileversionShikaku}% +% \newcounter{PfCShikakuNom} \setcounter{PfCShikakuNom}{0} diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCSimplifierFraction.tex b/Master/texmf-dist/tex/latex/profcollege/PfCSimplifierFraction.tex index 94429def365..9fb16f325df 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCSimplifierFraction.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCSimplifierFraction.tex @@ -1,6 +1,10 @@ %%% % Simplification %%% +\def\filedateSimpFraction{2024/08/13}% +\def\fileversionSimpFraction{0.1a}% +\message{-- \filedateSimpFraction\space v\fileversionSimpFraction}% +% \makeatletter%by christian Tellechea % Calcul du PGCD de #1 et #2 \newcount\cnt@a\newcount\cnt@b\newcount\pgcd @@ -160,7 +164,7 @@ \ifboolKV[ClesSimplification]{Debut}{% \ensuremath{% \whiledo{\PfCDivCom>1}{% - \frac{\mathcolor{PfCSimpliCol}{\num{\the\PfCDivCom}}\times\num{\fpeval{\PfCNumerateurDiv/\the\PfCDivCom}}}{\mathcolor{PfCSimpliCol}{\num{\the\PfCDivCom}}\times\num{\fpeval{\PfCDenominateurDiv/\the\PfCDivCom}}}=\frac{\num{\fpeval{\PfCNumerateurDiv/\PfCDivCom}}}{\num{\fpeval{\PfCDenominateurDiv/\PfCDivCom}}}% + \frac{\mathcolor{PfCSimpliCol}{\num{\the\PfCDivCom}}\times\ifboolKV[ClesSimplification]{ACompleter}{\pointilles[20pt]}{\num{\fpeval{\PfCNumerateurDiv/\the\PfCDivCom}}}}{\mathcolor{PfCSimpliCol}{\num{\the\PfCDivCom}}\times\ifboolKV[ClesSimplification]{ACompleter}{\pointilles[20pt]}{\num{\fpeval{\PfCDenominateurDiv/\the\PfCDivCom}}}}=\frac{\ifboolKV[ClesSimplification]{ACompleter}{\pointilles[20pt]}{\num{\fpeval{\PfCNumerateurDiv/\PfCDivCom}}}}{\ifboolKV[ClesSimplification]{ACompleter}{\pointilles[20pt]}{\num{\fpeval{\PfCDenominateurDiv/\PfCDivCom}}}}% \xdef\PfCNumerateurDiv{\fpeval{\PfCNumerateurDiv/\PfCDivCom}}% \xdef\PfCDenominateurDiv{\fpeval{\PfCDenominateurDiv/\PfCDivCom}}% \DiviseurCommun{\PfCNumerateurDiv}{\PfCDenominateurDiv}% @@ -170,7 +174,7 @@ }{% \ensuremath{% \whiledo{\PfCDivCom>1}{% - \frac{\num{\fpeval{\PfCNumerateurDiv/\the\PfCDivCom}}\times\mathcolor{PfCSimpliCol}{\num{\the\PfCDivCom}}}{\num{\fpeval{\PfCDenominateurDiv/\the\PfCDivCom}}\times\mathcolor{PfCSimpliCol}{\num{\the\PfCDivCom}}}=\frac{\num{\fpeval{\PfCNumerateurDiv/\PfCDivCom}}}{\num{\fpeval{\PfCDenominateurDiv/\PfCDivCom}}}% + \frac{\ifboolKV[ClesSimplification]{ACompleter}{\pointilles[20pt]}{\num{\fpeval{\PfCNumerateurDiv/\the\PfCDivCom}}}\times\mathcolor{PfCSimpliCol}{\num{\the\PfCDivCom}}}{\ifboolKV[ClesSimplification]{ACompleter}{\pointilles[20pt]}{\num{\fpeval{\PfCDenominateurDiv/\the\PfCDivCom}}}\times\mathcolor{PfCSimpliCol}{\num{\the\PfCDivCom}}}=\frac{\ifboolKV[ClesSimplification]{ACompleter}{\pointilles[20pt]}{\num{\fpeval{\PfCNumerateurDiv/\PfCDivCom}}}}{\ifboolKV[ClesSimplification]{ACompleter}{\pointilles[20pt]}{\num{\fpeval{\PfCDenominateurDiv/\PfCDivCom}}}}% \xdef\PfCNumerateurDiv{\fpeval{\PfCNumerateurDiv/\PfCDivCom}}% \xdef\PfCDenominateurDiv{\fpeval{\PfCDenominateurDiv/\PfCDivCom}}% \DiviseurCommun{\PfCNumerateurDiv}{\PfCDenominateurDiv}% @@ -180,7 +184,7 @@ }% }% -\setKVdefault[ClesSimplification]{Details=false,All=false,Longue=false,Fleches=false,Contraire=0,Couleur=black,Debut=false,Impose=false,Decomposition=false,DecompositionSeule=false}% +\setKVdefault[ClesSimplification]{Details=false,All=false,Longue=false,Fleches=false,Contraire=0,Couleur=black,Debut=false,Impose=false,Decomposition=false,DecompositionSeule=false,ACompleter=false}% \defKV[ClesSimplification]{Nombre=\setKV[ClesSimplification]{Impose}}% \newcounter{NbFrac}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCSolides.tex b/Master/texmf-dist/tex/latex/profcollege/PfCSolides.tex index 037b80e50f0..8ed8899a371 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCSolides.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCSolides.tex @@ -1,6 +1,10 @@ %%% % Solide et sections %%% +\def\filedateSolides{2024/08/20}% +\def\fileversionSolides{0.1a}% +\message{-- \filedateSolides\space v\fileversionSolides}% +% \setKVdefault[ClesSolides]{Nom=cube,Aretes,Sommets,Pointilles,Largeur=1.5,Hauteur=1,Profondeur=0.75,ListeSommets={A,B,C,D,E,F,G,H},Rho=1500,Phi=30,Theta=20,Distance=50,Code=false,Couleur=white,Anglex=0,Arete=1,RayonCone=1,HauteurCone=2,HauteurPrisme=2,SommetsPrisme=6,HauteurPyramide=2,SommetsPyramide=5,Reguliere=false,DecalageSommet={(0,0,0)},RayonCylindre=1,HauteurCylindre=2,RayonSphere=1,AutoLabel=true,Sections=false,CoefSection=0.3,Axes=false,PointsSection={M,N,O,P},RemplisSection=false,ObjetSection={0.5,E,H,0.25,F,G,G,B}}% \defKV[ClesSolides]{Traces=\setKV[ClesSolides]{Code}}% \defKV[ClesSolides]{Section=\setKV[ClesSolides]{Sections}}% @@ -101,6 +105,7 @@ %Fc[101]:=1;Fc[102]:=2;Fc[103]:=6;Fc[104]:=5; %endfor; endfor; + DefinirSommets(#1); DessineObjet; % picture Depart; % Depart=currentpicture; @@ -108,6 +113,10 @@ % for k=1 upto 8: % dotlabel.top(decimal(k),Projette(TS[k])); % endfor; + u:=1cm; + if Code: + \useKV[ClesSolides]{Traces}; + fi; \end{mplibcode} \mplibnumbersystem{scaled} \fi @@ -487,7 +496,6 @@ if Code: \useKV[ClesSolides]{Traces}; fi; - \end{mplibcode} \mplibnumbersystem{scaled} \fi @@ -729,7 +737,7 @@ % trace polygone(MSection1,MSection2,MSection3,MSection4); color dcer,ccer; % 1er cote -> ok - DotLabel("",RetiensDefSection[4]); + %DotLabel("",RetiensDefSection[4]); dcer:=Oeil-RetiensDefSection[4]; ccer:=Normal(RetiensDefSection[4],RetiensDefSection[2],RetiensDefSection[1]); draw chemin(MSection1,MSection2) if (ProduitScalaire(dcer,ccer)<0):dashed evenly fi; diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCSommeAngles.tex b/Master/texmf-dist/tex/latex/profcollege/PfCSommeAngles.tex index df62edfbce7..f0a1e12cc9b 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCSommeAngles.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCSommeAngles.tex @@ -1,6 +1,10 @@ %%% % Somme des angles %%% +\def\filedateSommeAngles{2024/08/04}% +\def\fileversionSommeAngles{0.1}% +\message{-- \filedateSommeAngles\space v\fileversionSommeAngles}% +% \setKVdefault[ClesSommeAngle]{Detail=true,Isocele=false,Rectangle=false,Figure=false,FigureSeule=false,Angle=0,Perso=false,Echelle=1cm}% \def\MPFigureSommeAngle#1#2#3#4#5{% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCSquaro.tex b/Master/texmf-dist/tex/latex/profcollege/PfCSquaro.tex index 9de4a7afdf9..7afe0e55fb0 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCSquaro.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCSquaro.tex @@ -1,10 +1,21 @@ %%% % Squaro %%% -\setKVdefault[Squaro]{Solution=false,Longueur=8,Largeur=8,Echelle=8mm,Nom=Jeu1,Graines=false} +\def\filedateSquarO{2024/08/04}% +\def\fileversionSquarO{0.1}% +\message{-- \filedateSquarO\space v\fileversionSquarO}% +% +\newtoks\tokPfCSquaro% +\def\UpdatetoksSquaro#1\nil{\addtotok\tokPfCSquaro{#1,}}% + +\setKVdefault[Squaro]{Solution=false,Longueur=8,Largeur=8,Echelle=8mm,Nom=Jeu1,Graines=false,Persos=false} \defKV[Squaro]{Graine=\setKV[Squaro]{Graines}}% +\defKV[Squaro]{Perso=\setKV[Squaro]{Persos}\setsepchar{,}\ignoreemptyitems\readlist*\ListeSquaroPerso{#1}\reademptyitems% + \foreachitem\compteur\in\ListeSquaroPerso{\expandafter\UpdatetoksSquaro\compteur\nil}% +}% \NewDocumentCommand\SquarO{o}{% + \tokPfCSquaro{}% \useKVdefault[Squaro]% \setKV[Squaro]{#1}% \BuildSquaro% @@ -14,9 +25,10 @@ numeric Longueur,Largeur; Longueur=\useKV[Squaro]{Longueur}; Largeur=\useKV[Squaro]{Largeur}; - boolean Solution,Graines; + boolean Solution,Graines,Persos; Solution=\useKV[Squaro]{Solution}; Graines=\useKV[Squaro]{Graines}; + Persos=\useKV[Squaro]{Persos}; if Graines: randomseed:=\useKV[Squaro]{Graine}; fi; @@ -26,13 +38,35 @@ p:=0; pair A[];%centre des carrés. boolean Allume[][]; -} + % + if Persos: + n:=0; + for p_=\the\tokPfCSquaro: + n:=n+1; + ligne:=(n-1) div (Largeur+2); + colonne:=(n-1) mod (Longueur+1); + Allume[ligne][colonne]=if p_=1:true else:false fi; + endfor; + else: + for k=0 upto Largeur: + for l=0 upto Longueur: + m:=uniformdeviate(1); + if m<0.5: + Allume[k][l]=true; + else: + Allume[k][l]=false; + fi; + endfor; + endfor; + fi; +}% \NewDocumentCommand\BuildSquaro{}{% \ifluatex \mplibforcehmode \begin{mplibcode} \BuildSquarobase + % for k=0 upto Longueur-1: for l=0 upto Largeur-1: p:=p+1; @@ -40,21 +74,18 @@ trace (unitsquare scaled u) shifted A[p]; endfor; endfor; - + % for k=0 upto Largeur: for l=0 upto Longueur: - m:=uniformdeviate(1); - if m<0.5: - Allume[k][l]=true; + if Allume[k][l]: fill cercles(u*(l,-k+1),1mm) if Solution=false:withcolor white fi; else: - Allume[k][l]=false; fill cercles(u*(l,-k+1),1mm) withcolor white; fi; trace cercles(u*(l,-k+1),1mm); endfor; endfor; - + % for k=0 upto Largeur-1: for l=0 upto Longueur-1: Retiens:=0; @@ -67,29 +98,28 @@ endfor; \end{mplibcode} \else - \begin{mpost}[mpsettings={\BuildSquarobase}] - for k=0 upto Longueur-1: + \begin{mpost}[mpsettings={\BuildSquarobase}] + % + % + for k=0 upto Longueur-1: for l=0 upto Largeur-1: p:=p+1; A[p]=u*(k,-l); trace (unitsquare scaled u) shifted A[p]; - endfor; - endfor; - - for k=0 upto Largeur: - for l=0 upto Longueur: - m:=uniformdeviate(1); - if m<0.5: - Allume[k][l]=true; + endfor; + endfor; + % + for k=0 upto Largeur: + for l=0 upto Longueur: + if Allume[k][l]: fill cercles(u*(l,-k+1),1mm) if Solution=false:withcolor white fi; else: - Allume[k][l]=false; fill cercles(u*(l,-k+1),1mm) withcolor white; fi; trace cercles(u*(l,-k+1),1mm); - endfor; - endfor; - + endfor; + endfor; + % for k=0 upto Largeur-1: for l=0 upto Longueur-1: Retiens:=0; diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCStatistiques.tex b/Master/texmf-dist/tex/latex/profcollege/PfCStatistiques.tex index 98566be426a..5d7b786d8e4 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCStatistiques.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCStatistiques.tex @@ -1,6 +1,10 @@ %%% % Statistiques %%% +\def\filedateStat{2024/08/04}% +\def\fileversionStat{0.1}% +\message{-- \filedateStat\space v\fileversionStat}% +% \newcommand\NbDonnees{}% \newcommand\SommeDonnees{}% \newcommand\EffectifTotal{}% @@ -18,7 +22,7 @@ Tableau=false,Stretch=1,Frequence=false,EffectifTotal=false,% Etendue=false,Moyenne=false,SET=false,ValeurExacte=false,MoyenneA,Somme,Mediane=false,DetailsMediane=false,UneMediane=false,QuartileUn=false,QuartileTrois=false,Total=false,Concret=false,% Largeur=1cm,Precision=2,PrecisionF=0,Donnee=Valeurs,Effectif=Effectif,Grille=false,Origine=0,Angle=false,SemiAngle=false,Qualitatif=false,Classes=false,TableauVide=false,ECC=false,Coupure=10,CouleurTab=gray!15,Graphique=false,Batons=true,Centre=false,CentreVide=false,Crochets=false,% % Pour les diags batons -EpaisseurBatons=1,ListeCouleursB={a},Lecture=false,LectureFine=false,AideLecture=false,Reponses=false,DonneesSup=false,AbscisseRotation=false,Tiret=false,AngleRotationAbscisse=0,Pasx=1,Pasy=1,Unitex=0.5,Unitey=0.5,Depart=0,CouleurDefaut=black,Date=false,GrandNombrey=false,GrandNombrex=false,PasGrillex=1,PasGrilley=1,% +EpaisseurBatons=1,ListeCouleursB={a},Lecture=false,LectureFine=false,AideLecture=false,Reponses=false,DonneesSup=false,AbscisseRotation=false,Tiret=false,Pasx=1,Pasy=1,Unitex=0.5,Unitey=0.5,Depart=0,CouleurDefaut=black,Date=false,GrandNombrey=false,GrandNombrex=false,PasGrillex=1,PasGrilley=1,% % Pour les diags circulaires Rayon=3cm,AffichageAngle=false,AffichageDonnee=false,ListeCouleurs={white},Hachures=false,ListeHachures={60},LectureInverse=false,EcartHachures=0.25,EpaisseurHachures=1,Legende,LegendeVide=false,ACompleter=false,DebutAngle=0,%on utilisera également la clé CouleurDefaut %Pour les représentations @@ -466,7 +470,6 @@ ModeleCouleur=5% unitex:=\useKV[ClesStat]{Unitex}*cm; unitey:=\useKV[ClesStat]{Unitey}*cm; xpartorigine:=\useKV[ClesStat]{Origine}; - AngleRotation=\useKV[ClesStat]{AngleRotationAbscisse}; boolean Rotation,Lecture,LectureFine,AideLecture,DonneesSup,Reponses,Qualitatif,Tiret,LegendeVide,Retour,GrandNombrex,GrandNombrey,Date,Grille; GrandNombrex=\useKV[ClesStat]{GrandNombrex}; GrandNombrey=\useKV[ClesStat]{GrandNombrey}; @@ -478,6 +481,11 @@ ModeleCouleur=5% fi; Date:=\useKV[ClesStat]{Date}; Rotation=\useKV[ClesStat]{AbscisseRotation}; + if Rotation: + AngleRotation=\useKV[ClesStat]{AngleRotationAbscisse}; + else: + AngleRotation=0; + fi; Lecture:=\useKV[ClesStat]{Lecture}; LectureFine:=\useKV[ClesStat]{LectureFine}; AideLecture:=\useKV[ClesStat]{AideLecture}; diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCTableauDoubleEntree.tex b/Master/texmf-dist/tex/latex/profcollege/PfCTableauDoubleEntree.tex new file mode 100644 index 00000000000..f13fe2fad5b --- /dev/null +++ b/Master/texmf-dist/tex/latex/profcollege/PfCTableauDoubleEntree.tex @@ -0,0 +1,62 @@ +%%% +% Tableau Double Entree +%%% +\def\filedateTDE{2024/08/15}% +\def\fileversionTDE{0.1a}% +\message{-- \filedateTDE\space v\fileversionTDE}% + +\setKVdefault[TDE]{Colonnes=5,Lignes=4,Legende={},LegendesH={B,C,D,Total},LegendesV={1,2,Total},Couleur=Cornsilk,Vide=false,Totaux,Questions=false,Stretch=1}% + +\NewDocumentCommand\TableauDoubleEntree{om}{% + \useKVdefault[TDE]% + \setKV[TDE]{#1}% + \xdef\PfCFooH{\useKV[TDE]{LegendesH}}% + \xdef\PfCFooV{\useKV[TDE]{LegendesV}}% + \setsepchar{,}\reademptyitems% + \readlist*\ListeH{\PfCFooH}% + \readlist*\ListeV{\PfCFooV}% + \readlist*\ListeDonnees{#2}% + \ifboolKV[TDE]{Totaux}{}{% + % Vider les lignes du total + \xintFor* ##1 in{\xintSeq{1}{\fpeval{\ListeVlen-1}}}\do{% + \xintFor* ##2 in{\xintSeq{1}{\fpeval{\ListeHlen-0}}}\do{% + \modulo{\fpeval{##2+(##1-1)*(\ListeHlen-0)}}{\fpeval{\ListeHlen-0}}% + \ifnum\remainder=0\relax% + \xdef\ListeDonneesSansTotauxAv{\ListeDonneesSansTotauxAv,}% + \else% + \ifnum\fpeval{##2+(##1-1)*(\ListeHlen-0)}=1\relax% + \xdef\ListeDonneesSansTotauxAv{\ListeDonnees[\fpeval{##2+(##1-1)*(\ListeHlen-0)}]}% + \else% + \xdef\ListeDonneesSansTotauxAv{\ListeDonneesSansTotauxAv,\ListeDonnees[\fpeval{##2+(##1-1)*(\ListeHlen-0)}]}% + \fi% + \fi% + }% + }% + % On ajoute la dernière ligne qui est vide + \xintFor* ##2 in{\xintSeq{1}{\fpeval{\ListeHlen-0}}}\do{% + \xdef\ListeDonneesSansTotauxAv{\ListeDonneesSansTotauxAv,}% + }% + % On relit la liste des données. + \setsepchar{,}\reademptyitems% + \readlist*\ListeDonnees{\ListeDonneesSansTotauxAv}% + \reademptyitems% + }% + % + % Pour vider le tableau, on utilise la clé <Vide>. + % On choisit quelques éléments ^^ à écrire + \ifboolKV[TDE]{Questions}{% + %en réflexion (voir v5) + }{}% + % + \colorlet{PfCColorTDE}{\useKV[TDE]{Couleur}}% + \renewcommand{\arraystretch}{\useKV[TDE]{Stretch}}% + \begin{tabular}{|*{\fpeval{\ListeHlen+1}}{c|}} + \hline + \cellcolor{PfCColorTDE}\useKV[TDE]{Legende}\xintFor*##1 in{\xintSeq{1}{\ListeHlen}}\do{\uppercase{&}\cellcolor{PfCColorTDE}\ListeH[##1]}\\ + \hline + \xintFor* ##1 in{\xintSeq{1}{\ListeVlen}}\do{ + \cellcolor{PfCColorTDE}\ListeV[##1]\xintFor*##2 in{\xintSeq{1}{\ListeHlen}}\do{\uppercase{&}\ifboolKV[TDE]{Vide}{}{\ListeDonnees[\fpeval{(##2-0)+(##1-1)*(\ListeHlen-0)}]}}\\ + \hline + } + \end{tabular} +}%
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCTableauxUnites.tex b/Master/texmf-dist/tex/latex/profcollege/PfCTableauxUnites.tex index 75270180d37..933fcb80a2b 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCTableauxUnites.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCTableauxUnites.tex @@ -1,7 +1,11 @@ %%% % Tableaux d'unit\'es %%% -\setKVdefault[ClesTableaux]{Virgule=true,Incline=false,Entiers=false,Decimaux=false,Milliards=false,Millions=false,Micro=false,Nano=false,Partie=false,CouleurG=gray!15,CouleurM=gray!15,Couleurm=gray!15,Couleuru=gray!15,Couleurd=gray!15,Classes=false,Nombres=false,Puissances=false,NbLignes=2,Metre=false,Are=false,Capacite=false,Carre=false,CarreA=false,Cube=false,Litre=false,Gramme=false,Fleches=false,FlechesB=false,FlechesH=false,Colonnes=false,Prefixes=false,Escalier=false,CubeA=false,Taille=5,Largeur=4.75em,Nom=PfCTableau,CodeAfter={},PuissancesSeules=false,Colonne=-1,Octet=false,CouleurGN=white,CadreGN=black,Tabcolsep=0.275\tabcolsep,Exterieur=false,Condense=false}% +\def\filedateTableaux{2024/08/15}% +\def\fileversionTableaux{0.1a}% +\message{-- \filedateTableaux\space v\fileversionTableaux}% +\message{`PfCTableauxUnites.tex' v\fileversionTableaux\space (\filedateTableaux)} +\setKVdefault[ClesTableaux]{Virgule=true,Incline=false,Entiers=false,Decimaux=false,Milliards=false,Millions=false,Micro=false,Nano=false,Partie=false,CouleurG=gray!15,CouleurM=gray!15,Couleurm=gray!15,Couleuru=gray!15,Couleurd=gray!15,Classes=false,Nombres=false,Puissances=false,NbLignes=2,Metre=false,Are=false,Capacite=false,Carre=false,CarreA=false,Cube=false,Litre=false,Gramme=false,Fleches=false,FlechesB=false,FlechesH=false,Colonnes=false,Prefixes=false,Escalier=false,CubeA=false,Taille=5,Largeur=4.75em,Nom=PfCTableau,CodeAfter={},PuissancesSeules=false,Colonne=-1,Octet=false,CouleurGN=white,CadreGN=black,Tabcolsep=0.275\tabcolsep,Exterieur=false,Condense=false,DoubleEntree=false}% \defKV[ClesTableaux]{ColonnesSup=\setKV[ClesTableaux]{Exterieur}}% % \newcommand\PfCTBstrut{\rule[-1.2ex]{0pt}{3.8ex}}% Top and Bottom strut @@ -52,7 +56,10 @@ \xdef\PfCCoefConversion{10}% }{}% \PfCTableauIncline% - }{% + }{%Fin Escalier + \ifboolKV[ClesTableaux]{DoubleEntree}{% + \TableauDoubleEntree[#1]{#2}% + }{}% % %%% Clé Octet % diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCTablesOperations.tex b/Master/texmf-dist/tex/latex/profcollege/PfCTablesOperations.tex index 3399cbecff9..df109d964a8 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCTablesOperations.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCTablesOperations.tex @@ -1,6 +1,10 @@ %%% % Tables Addition-Multiplication %%% +\def\filedateTableOp{2024/08/04}% +\def\fileversionTableOp{0.1}% +\message{-- \filedateTableOp\space v\fileversionTableOp}% +% \setKVdefault[Tables]{Addition=false,Soustraction=false,Multiplication,Seul=false,Debut=0,Fin=10,Couleur=white,Inverse=false} % pour m\'emoire diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCTectonic.tex b/Master/texmf-dist/tex/latex/profcollege/PfCTectonic.tex index df859b0453b..3026bf9be0a 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCTectonic.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCTectonic.tex @@ -1,6 +1,10 @@ %%% % Tectonic %%% +\def\filedateTectonic{2024/08/04}% +\def\fileversionTectonic{0.1}% +\message{-- \filedateTectonic\space v\fileversionTectonic}% +% \setKVdefault[ClesTectonic]{CouleurCase=LightGray,TLargeur=5,THauteur=5,Solution=false,Largeur=25pt,CouleurSolution=black,Tailles=false,Aide=false}% \defKV[ClesTectonic]{Taille=\setKV[ClesTectonic]{Tailles}}% \defKV[ClesTectonic]{ListeNombres=\setKV[ClesTectonic]{Aide}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCThales.tex b/Master/texmf-dist/tex/latex/profcollege/PfCThales.tex index d4adb5be013..140bde3f234 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCThales.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCThales.tex @@ -1,6 +1,10 @@ %%% % Thales %%% +\def\filedateThales{2024/08/04}% +\def\fileversionThales{0.1}% +\message{-- \filedateThales\space v\fileversionThales}% +% \newcount\ppcm% \newcommand\PPCM[2]{% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCTicketCaisse.tex b/Master/texmf-dist/tex/latex/profcollege/PfCTicketCaisse.tex index 1c460e36939..2286b083329 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCTicketCaisse.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCTicketCaisse.tex @@ -1,8 +1,16 @@ %%% % Ticket de caisse %%% +\def\filedateTicketCaisse{2024/08/04}% +\def\fileversionTicketCaisse{0.1}% +\message{-- \filedateTicketCaisse\space v\fileversionTicketCaisse}% +% \newcounter{PfCNbInsulte}% +\newcounter{PfCChoixService}% \setcounter{PfCNbInsulte}{0}% +\setcounter{PfCChoixService}{0}% +% +\newlength\PfCTicketLarg \NewDocumentCommand\PfCPrixInsulte{sm}{% \setsepchar{,}\ignoreemptyitems% @@ -67,15 +75,17 @@ }% \makeatother -\setKVdefault[TicketCaisse]{Largeur=222,Especes=50,Enseigne=Au comptoir des maths,DateAchat=\today,HeureAchat=15:13:34,Taches=false,Rendu,Total,UK=false,US=false,CFA=false,CFP=false,CHF=false,Euro=false,Solution=false} +\setKVdefault[TicketCaisse]{Largeur=222pt,Especes=50,Simple=false,Taxes=false,SansRendu=false,Enseigne=Au comptoir des maths,DateAchat=\today,HeureAchat=15:13:34,Taches=false,Rendu,Total,SousTotal=false,UK=false,US=false,CFA=false,CFP=false,CHF=false,Euro=false,Solution=false} \defKV[TicketCaisse]{Couleur=\colorlet{PfCTicketCouleurSolution}{#1}\setKV[TicketCaisse]{Solution}} +\defKV[TicketCaisse]{Service=\setKV[TicketCaisse]{Taxes}} -\NewDocumentCommand\TicketCaisse{om}{% +\NewDocumentCommand\TicketCaisse{som}{% \setcounter{PfCNbInsulte}{0}% \useKVdefault[TicketCaisse]% - \setKV[TicketCaisse]{#1}% + \setKV[TicketCaisse]{#2}% + \setlength{\PfCTicketLarg}{\useKV[TicketCaisse]{Largeur}}% \setsepchar[*]{,*/}% - \readlist*\ListeAchats{#2}% + \readlist*\ListeAchats{#3}% % On fait trois listes pour les retenir % Liste Quantités \xdef\PfCFooQuantites{}% @@ -122,9 +132,123 @@ \xintFor* ##1 in{\xintSeq{1}{\ListeAchatslen}}\do{% \xdef\PfCTCTotal{\fpeval{\PfCTCTotal+\ListeQuantites[##1]*\ListePUnitaires[##1]}}% }% -% Le coût total est \PfCTCTotal\\ + \ifboolKV[TicketCaisse]{Taxes}{% + % On décompose la clé + \StrChar{\useKV[TicketCaisse]{Service}}{1}[\MyLetter]% + % Si le premier caractère est !, il faut regarder si le deuxième caractère est une étoile + \IfStrEq{\MyLetter}{!}{% + \StrChar{\useKV[TicketCaisse]{Service}}{2}[\MyLettera]% + \IfStrEq{\MyLettera}{*}{% + \StrGobbleLeft{\useKV[TicketCaisse]{Service}}{2}[\PfCTCValeurService] + \setcounter{PfCChoixService}{3}% + }{% + \StrGobbleLeft{\useKV[TicketCaisse]{Service}}{1}[\PfCTCValeurService] + \setcounter{PfCChoixService}{1}% + }% + }{%il faut regarder si c'est une étoile + \StrChar{\useKV[TicketCaisse]{Service}}{1}[\MyLettera]% + \IfStrEq{\MyLettera}{*}{% + \StrGobbleLeft{\useKV[TicketCaisse]{Service}}{1}[\PfCTCValeurService] + \setcounter{PfCChoixService}{2} + }{% + \xdef\PfCTCValeurService{\useKV[TicketCaisse]{Service}}% + \setcounter{PfCChoixService}{0} + }% + }% + % On fait les calculs associés à la clé. + \xdef\PfCTCSousTotal{\PfCTCTotal}% + \xdef\PfCTCService{\fpeval{\PfCTCValeurService*\PfCTCSousTotal/100}}% + \xdef\PfCTCTotal{\fpeval{\PfCTCSousTotal+\PfCTCService}}% + }{}% + % Le coût total est \PfCTCTotal\\ + \IfBooleanTF{#1}{% + \ttfamily + \begin{tabular}{|m{0.48\PfCTicketLarg}m{0.13\PfCTicketLarg}m{0.165\PfCTicketLarg}m{0.225\PfCTicketLarg}|}% + \hline + &&&\\% + \multicolumn{4}{|c|}{\Large\bfseries\useKV[TicketCaisse]{Enseigne}}\\% + &&&\\% + \hline% + &&&\\% + \footnotesize\sc Description&\centering \footnotesize\sc Qte.&\centering\footnotesize\sc P.u.&\hfill\footnotesize\sc Prix \ifboolKV[TicketCaisse]{Taxes}{H.T.}{Net}\\% + &&&\\% + \xintFor* ##1 in{\xintSeq{1}{\ListeAchatslen}}\do{% + \ListeElements[##1]&% + \centering + \footnotesize% + \StrChar{\ListeAchats[##1,1]}{1}[\MyLetter]% + \IfStrEq{\MyLetter}{!}{\PfCPrixInsulte*{\ListeQuantites[##1]}}{\xintifboolexpr{\fpeval{\ListeQuantites[##1]}==1}{}{\num{\ListeQuantites[##1]}}}% + & + \hfill + \footnotesize + %Savoir si le nombre d'articles est affiché + \StrChar{\ListeAchats[##1,1]}{1}[\MyLetter]% + % Si le nombre d'articles n'est pas affiché, il faut impérativement afficher le prix unitaire + \IfStrEq{\MyLetter}{!}{% + \PrixTicket{\ListePUnitaires[##1]}% + }{% + % On regarde si on affiche le prix unitaire + \StrChar{\ListeAchats[##1,3]}{1}[\MyLettera]% + % Si c'est un !, on affiche pas + % Sinon, on affiche + \IfStrEq{\MyLettera}{!}{% + \PfCPrixInsulte*{\PrixTicket{\ListePUnitaires[##1]}}% + }{% + \xintifboolexpr{\fpeval{\ListeQuantites[##1]}==1}{}{% + \PrixTicket{\ListePUnitaires[##1]}% + }% + }% + }% + &\hfill + \StrChar{\ListeAchats[##1,3]}{1}[\MyLetter]% + % Si le premier caractère est !, il faut regarder si le deuxième caractère est une étoile + \IfStrEq{\MyLetter}{!}{% + \StrChar{\ListeAchats[##1,3]}{2}[\MyLettera]% + \IfStrEq{\MyLettera}{*}{% + \PfCPrixInsulte*{\PrixTicket{\fpeval{\ListeQuantites[##1]*\ListePUnitaires[##1]}}}% + }{% + \PrixTicket{\fpeval{\ListeQuantites[##1]*\ListePUnitaires[##1]}}% + }% + }{%il faut regarder si c'est une étoile + \StrChar{\ListeAchats[##1,3]}{1}[\MyLettera]% + \IfStrEq{\MyLettera}{*}{% + \PfCPrixInsulte{\PrixTicket{\fpeval{\ListeQuantites[##1]*\ListePUnitaires[##1]}}}% + }{% + \PrixTicket{\fpeval{\ListeQuantites[##1]*\ListePUnitaires[##1]}}% + }% + }% + \\ + }% + &&&\\% + \hline% + &&&\\ + % Partie Service + \ifboolKV[TicketCaisse]{Taxes}{% + Total H.T.\uppercase{&}\uppercase{&}\uppercase{&}\hfill\ifboolKV[TicketCaisse]{SousTotal}{\ifnum\thePfCNbInsulte=0\relax\PrixTicket{\PfCTCSousTotal}\else\PfCPrixInsulte*{\PrixTicket{\PfCTCSousTotal}}\fi}{\PfCPrixInsulte*{\PrixTicket{\PfCTCSousTotal}}} + \\% + Service % + \ifodd\thePfCChoixService\relax \PfCPrixInsulte{\num{\PfCTCValeurService}}\else\num{\PfCTCValeurService}\fi~\si{\percent}% + &&&\hfill + \ifnum\thePfCChoixService>1\relax \PfCPrixInsulte{\PrixTicket{\PfCTCService}}\else\PrixTicket{\PfCTCService}\fi% + \\ + &&&\\ + \hline + &&&\\ + }{}% + \ifboolKV[TicketCaisse]{Simple}{}{% + Total\ifboolKV[TicketCaisse]{Taxes}{ T.T.C.}{}&&&\hfill\ifboolKV[TicketCaisse]{Total}{\ifnum\thePfCNbInsulte=0\relax\PrixTicket{\PfCTCTotal}\else\PfCPrixInsulte*{\PrixTicket{\PfCTCTotal}}\fi}{\PfCPrixInsulte*{\PrixTicket{\PfCTCTotal}}}\\% + \ifboolKV[TicketCaisse]{SansRendu}{}{% + Espèces&&&\hfill\PrixTicket{\useKV[TicketCaisse]{Especes}}\\% + Rendu&&&\hfill\ifboolKV[TicketCaisse]{Rendu}{\PrixTicket{\fpeval{\useKV[TicketCaisse]{Especes}-\PfCTCTotal}}}{\PfCPrixInsulte*{\PrixTicket{\fpeval{\useKV[TicketCaisse]{Especes}-\PfCTCTotal}}}}\\% + } + &&&\\% + }% + \multicolumn{4}{|c|}{\footnotesize\useKV[TicketCaisse]{DateAchat}\qquad\useKV[TicketCaisse]{HeureAchat}}\\% + \hline + \end{tabular} + }{% {\ttfamily% - \begin{NiceTabular}{m{107pt}m{29pt}m{36pt}m{50pt}}% + \begin{NiceTabular}{m{0.48\PfCTicketLarg}m{0.13\PfCTicketLarg}m{0.165\PfCTicketLarg}m{0.225\PfCTicketLarg}}% \CodeBefore \tikz\node[opacity=0.2,yshift=-1.5cm] at ($(1-|1)!0.5!(1-|last)$) {\Large\bfseries\reflectbox{ \begin{tabular}{c} @@ -148,7 +272,7 @@ \\% \Cdots\\% \\% - \Block[l]{}{\footnotesize\sc Description}&\Block{}{\footnotesize\sc Qte.}&\Block{}{\footnotesize\sc P.u.}&\Block[r]{}{\footnotesize\sc Prix Net}\\% + \Block[l]{}{\footnotesize\sc Description}&\Block{}{\footnotesize\sc Qte.}&\Block{}{\footnotesize\sc P.u.}&\Block[r]{}{\footnotesize\sc Prix \ifboolKV[TicketCaisse]{Taxes}{H.T.}{Net}}\\% \\% \xintFor* ##1 in{\xintSeq{1}{\ListeAchatslen}}\do{% \ListeElements[##1]&% @@ -200,11 +324,28 @@ }% \\% \Cdots\\% - Total&&&\Block[r]{}{\ifboolKV[TicketCaisse]{Total}{\ifnum\thePfCNbInsulte=0\relax\PrixTicket{\PfCTCTotal}\else\PfCPrixInsulte*{\PrixTicket{\PfCTCTotal}}\fi}{\PfCPrixInsulte*{\PrixTicket{\PfCTCTotal}}}}\\% - Espèces&&&\Block[r]{}{\PrixTicket{\useKV[TicketCaisse]{Especes}}}\\% - Rendu&&&\Block[r]{}{\ifboolKV[TicketCaisse]{Rendu}{\PrixTicket{\fpeval{\useKV[TicketCaisse]{Especes}-\PfCTCTotal}}}{\PfCPrixInsulte*{\PrixTicket{\fpeval{\useKV[TicketCaisse]{Especes}-\PfCTCTotal}}}}}\\% + % Partie Service + \ifboolKV[TicketCaisse]{Taxes}{% + Total H.T.&&&\Block[r]{}{\ifboolKV[TicketCaisse]{SousTotal}{\ifnum\thePfCNbInsulte=0\relax\PrixTicket{\PfCTCSousTotal}\else\PfCPrixInsulte*{\PrixTicket{\PfCTCSousTotal}}\fi}{\PfCPrixInsulte*{\PrixTicket{\PfCTCSousTotal}}} + }\\% + Service % + \ifodd\thePfCChoixService\relax \PfCPrixInsulte{\num{\PfCTCValeurService}}\else\num{\PfCTCValeurService}\fi~\si{\percent}% + &&&\Block[r]{}{% + \ifnum\thePfCChoixService>1\relax \PfCPrixInsulte{\PrixTicket{\PfCTCService}}\else\PrixTicket{\PfCTCService}\fi% + }\\ + \Cdots\\ + \\ + }{}% + \ifboolKV[TicketCaisse]{Simple}{}{% + Total\ifboolKV[TicketCaisse]{Taxes}{ T.T.C.}{}&&&\Block[r]{}{\ifboolKV[TicketCaisse]{Total}{\ifnum\thePfCNbInsulte=0\relax\PrixTicket{\PfCTCTotal}\else\PfCPrixInsulte*{\PrixTicket{\PfCTCTotal}}\fi}{\PfCPrixInsulte*{\PrixTicket{\PfCTCTotal}}}}\\% + \ifboolKV[TicketCaisse]{SansRendu}{}{% + Espèces&&&\Block[r]{}{\PrixTicket{\useKV[TicketCaisse]{Especes}}}\\% + Rendu&&&\Block[r]{}{\ifboolKV[TicketCaisse]{Rendu}{\PrixTicket{\fpeval{\useKV[TicketCaisse]{Especes}-\PfCTCTotal}}}{\PfCPrixInsulte*{\PrixTicket{\fpeval{\useKV[TicketCaisse]{Especes}-\PfCTCTotal}}}}}\\% + } \\% - \Block{1-4}{\footnotesize\useKV[TicketCaisse]{DateAchat}\qquad\useKV[TicketCaisse]{HeureAchat}}&&&\\% + }% + \Block{1-4}{\footnotesize\useKV[TicketCaisse]{DateAchat}\qquad\useKV[TicketCaisse]{HeureAchat}}&&&\\% \end{NiceTabular} }% + } }%
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCTortueBase.tex b/Master/texmf-dist/tex/latex/profcollege/PfCTortueBase.tex index 461a42fb717..05a6524e987 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCTortueBase.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCTortueBase.tex @@ -1,6 +1,10 @@ %%% % Tortue %%% +\def\filedateTortue{2024/08/04}% +\def\fileversionTortue{0.1}% +\message{-- \filedateTortue\space v\fileversionTortue}% +% \setKVdefault[Tortue]{% Pas=0.2mm,%Déplacement, Etapes=false,%Pour arrêter la construction à une étape particulière diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCTrigonometrie.tex b/Master/texmf-dist/tex/latex/profcollege/PfCTrigonometrie.tex index 38fe05ce606..0bd7a90da63 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCTrigonometrie.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCTrigonometrie.tex @@ -1,6 +1,10 @@ %%% % Trigonom\'etrie %%% +\def\filedateTrigo{2024/08/04}% +\def\fileversionTrigo{0.1}% +\message{-- \filedateTrigo\space v\fileversionTrigo}% +% \def\MPFigTrigo#1#2#3#4#5#6#7#8{% \ifluatex % \mplibcodeinherit{enable} diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCTrio.tex b/Master/texmf-dist/tex/latex/profcollege/PfCTrio.tex index 560258ff59d..06c0a77e3bc 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCTrio.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCTrio.tex @@ -1,3 +1,10 @@ +%%% +%Trio +%%% +\def\filedateTrio{2024/08/04}% +\def\fileversionTrio{0.1}% +\message{-- \filedateTrio\space v\fileversionTrio}% +% \newlength\PfCTrioHauteur% \newcounter{PfCTrioLettre}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCTriominos.tex b/Master/texmf-dist/tex/latex/profcollege/PfCTriominos.tex index efc6cd24b31..b2ece6c0d49 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCTriominos.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCTriominos.tex @@ -1,6 +1,10 @@ %%% % Triominos %%% +\def\filedateTriominos{2024/08/04}% +\def\fileversionTriominos{0.1}% +\message{-- \filedateTriominos\space v\fileversionTriominos}% +% \setKVdefault[ClesTriomino]{Longueur=5cm,Etages=3,Ecart=0.6,AffichagePiece=false,Hexagone=false,Recapitulatif=false,Colonnes=2}% \defKV[ClesTriomino]{Piece=\setKV[ClesTriomino]{AffichagePiece=true}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCUrneProba.tex b/Master/texmf-dist/tex/latex/profcollege/PfCUrneProba.tex index 895f96136c2..0d00e039c41 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCUrneProba.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCUrneProba.tex @@ -1,6 +1,10 @@ %%% % Urne et probabilités %%% +\def\filedateUrneProba{2024/08/04}% +\def\fileversionUrneProba{0.1}% +\message{-- \filedateUrneProba\space v\fileversionUrneProba}% +% \newtoks\tokUrneListeCouleurs% \newtoks\tokUrneListeColonnes% \newtoks\tokUrneListeNombres% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCVisualisationMulDeci.tex b/Master/texmf-dist/tex/latex/profcollege/PfCVisualisationMulDeci.tex index 54a1a079cc6..99024a43586 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCVisualisationMulDeci.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCVisualisationMulDeci.tex @@ -1,6 +1,10 @@ %%% % Visualisation Multiplication Décimaux %%% +\def\filedateVisuMulDeci{2024/08/04}% +\def\fileversionVisuMulDeci{0.1}% +\message{-- \filedateVisuMulDeci\space v\fileversionVisuMulDeci}% +% \setKVdefault[VisMulDec]{Couleur=Orange,CouleurUnite=DarkGreen,Dixiemes=false,Unite=2}% \newtoks\toksvismuldec% diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCVueCubes.tex b/Master/texmf-dist/tex/latex/profcollege/PfCVueCubes.tex index 9365b7e6216..196358d9bf8 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCVueCubes.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCVueCubes.tex @@ -1,6 +1,10 @@ %%% % Vue Cubes %%% +\def\filedateVueCubes{2024/08/26}% +\def\fileversionVueCubes{0.1a}% +\message{-- \filedateVueCubes\space v\fileversionVueCubes}% +% \setKVdefault[VueCubes]{Solution=false,Hauteur=5,Profondeur=4,Largeur=3,Angle=60,Nom=Ex1,Trou=false,Echelle=0.25,CouleurCube=LightSteelBlue,CouleurFleche=LightGray,Face=false,Creation=false,Grilles=false,Seul=false,Perso=false,EclateX=0,EclateZ=0,EclateY=0} \newtoks\toklisteVueCube% @@ -30,9 +34,9 @@ \readlist*\PfCListeHauteursCubes{#2}% \reademptyitems% \foreachitem\compteur\in\PfCListeHauteursCubes{\expandafter\UpdatetoksVueCube\compteur\nil}% - \BuildVueCubes{\useKV[VueCubes]{Angle}}{\the\toklisteVueCube}% + \BuildVueCubes{\useKV[VueCubes]{Angle}}{\the\toklisteVueCube}{\useKV[VueCubes]{Nom}}% }{% - \BuildVueCubes{\useKV[VueCubes]{Angle}}{}% + \BuildVueCubes{\useKV[VueCubes]{Angle}}{}{\useKV[VueCubes]{Nom}}% }% }% }% @@ -100,11 +104,13 @@ \fi } -\NewDocumentCommand\BuildVueCubes{m m}{% +\NewDocumentCommand\BuildVueCubes{m m m}{% \ifluatex \mplibforcehmode \xdef\PfCVueCubeNom{\useKV[VueCubes]{Nom}}% \begin{mplibcode}[\PfCVueCubeNom] + string NomRetenu; + NomRetenu=str #3; input PfCSolid; intensite:=1.5; @@ -176,6 +182,9 @@ endfor; fi; + write decimal(TotalObj) to "PfCNombreCubes"&NomRetenu&".tex";% + write EOF to "PfCNombreCubes"&NomRetenu&".tex";% + % Pour la fleche path Fleche; color A[]; diff --git a/Master/texmf-dist/tex/latex/profcollege/PfCYohaku.tex b/Master/texmf-dist/tex/latex/profcollege/PfCYohaku.tex index c710834b934..942e66c111c 100644 --- a/Master/texmf-dist/tex/latex/profcollege/PfCYohaku.tex +++ b/Master/texmf-dist/tex/latex/profcollege/PfCYohaku.tex @@ -1,6 +1,10 @@ %%% % Yohaku %%% +\def\filedateYohaku{2024/08/04}% +\def\fileversionYohaku{0.1}% +\message{-- \filedateYohaku\space v\fileversionYohaku}% +% \setKVdefault[Yohaku]{Taille=2,Largeur=1cm,Hauteur=1cm,Addition,Multiplication=false,Perso=false,Limite=50,Relatif=false,Negatif=false,Pair=false,Impair=false,Premier=false,Solution=false,Visible=false,Bordure=false,CouleurResultat=gray!15,Ligne=0,Colonne=0,PasL=0,PasC=0,CouleurZone=gray!25}% \defKV[Yohaku]{Case=\setKV[Yohaku]{Visible}}% diff --git a/Master/texmf-dist/tex/latex/profcollege/ProfCollege.sty b/Master/texmf-dist/tex/latex/profcollege/ProfCollege.sty index a6b767a3bf1..df794a8d866 100644 --- a/Master/texmf-dist/tex/latex/profcollege/ProfCollege.sty +++ b/Master/texmf-dist/tex/latex/profcollege/ProfCollege.sty @@ -2,9 +2,9 @@ % licence : Released under the LaTeX Project Public License v1.3c % or later, see http://www.latex-project.org/lppl.txtf \NeedsTeXFormat{LaTeX2e}% -\def\filedate{2024/07/03}% +\def\filedate{2024/09/04}% \let\PfCfiledate\filedate% -\def\fileversion{0.99-A-g}% +\def\fileversion{0.99-A-j}% \let\PfCfileversion\fileversion% \ProvidesPackage{ProfCollege}[\filedate\space v\fileversion\space Aide pour utiliser LaTeX au college]% @@ -340,6 +340,37 @@ \fi }% +\newlength{\PfCLongueurBarreHor} +\setKVdefault[PfCLigneCompleter]{Ecart=20pt,Couleurs=false}% +\defKV[PfCLigneCompleter]{Couleur=\setKV[PfCLigneCompleter]{Couleurs}}% + +\NewDocumentCommand\ListeACompleter{som}{% + \useKVdefault[PfCLigneCompleter]% + \setKV[PfCLigneCompleter]{#2}% + \ifboolKV[PfCLigneCompleter]{Couleurs}{\colorlet{PfCLC}{\useKV[PfCLigneCompleter]{Couleur}}}{}% + \setlength{\PfCLongueurBarreHor}{\useKV[PfCLigneCompleter]{Ecart}}% + \setsepchar{,}\reademptyitems% + \readlist*\ListeTiti{#3}% + \foreachitem\compteur\in\ListeTiti{% + \itemtomacro\ListeTiti[\compteurcnt]\PfCCaractere% + \StrChar{\PfCCaractere}{1}[\RetiensElmt]% + \IfStrEq{\RetiensElmt}{!}{% + \IfBooleanTF{#1}{% + \ifboolKV[PfCLigneCompleter]{Couleurs}{\colorlet{saved}{.}\color{PfCLC}}{}\StrGobbleLeft{\PfCCaractere}{1}\ifboolKV[PfCLigneCompleter]{Couleurs}{\color{saved}}{}% + }{% + \hbox to \PfCLongueurBarreHor{\hrulefill}% + } + }{% + \ListeTiti[\compteurcnt]% + }% + \ifnum\compteurcnt=\ListeTitilen\relax% + .% + \else% + , + \fi% + }% +}% + %https://tex.stackexchange.com/questions/128991/frac-or-inference-rule-with-dotted-line \newcommand\PfCfrac[2]{% \ooalign{$\genfrac{}{}{0pt}{0}{#1}{#2}$\cr\PfCdotover\cr}% @@ -825,6 +856,9 @@ \def\PfCSymbolTimes{\times}% \def\PfCSymbolDiv{\div}% +\input{PfCCheque} +\input{PfCCalculsDetailles} +\input{PfCTableauDoubleEntree} \input{PfCUrneProba} \input{PfCProbaFrequence} \input{PfCVisualisationMulDeci} @@ -975,8 +1009,5 @@ \input{PfCScratch} \RequirePackage{PfCInfixRPN} -%\makeatletter -%\let\@nil\@empty -%\makeatother \input{PfCArbreCalcul}
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty b/Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty index e37ce44eeb0..fffb3c5da9d 100644 --- a/Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty +++ b/Master/texmf-dist/tex/latex/proflycee/ProfLycee.sty @@ -3,7 +3,8 @@ % or later, see http://www.latex-project.org/lppl.txtf \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ProfLycee}[2024/07/13 3.04d Aide pour l'utilisation de LaTeX en lycee] +\ProvidesPackage{ProfLycee}[2024/09/01 3.04e Aide pour l'utilisation de LaTeX en lycee] +% 3.04e Commandes prix/angle/pourcent en lien avec siunitx % 3.04d PitonInputFile et styles % 3.04c Max et min pour des fonctions % 3.04b Travail sur la loi binomiale + Ajout de clés pour les environnements graphiques diff --git a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-ecritures.tex b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-ecritures.tex index 0a1555c4e96..f524c41cf31 100644 --- a/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-ecritures.tex +++ b/Master/texmf-dist/tex/latex/proflycee/proflycee-tools-ecritures.tex @@ -10,6 +10,39 @@ \RequirePackage{mleftright} %pour une meilleure gestion des espacements avec \left \right :-) %\RequirePackage{mathrsfs}%pour \mathscr (à voir...) +%===UNITÉS + +\NewDocumentCommand\pflprix{ o m }{% + \IfValueTF{#1}% + {% + \num[round-mode=places,round-precision=#1]{#2}\,\text{€}% + }% + {% + \num{#2}\,\text{€}% + }% +} + +\NewDocumentCommand\pflangle{ o m }{% + \IfValueTF{#1}% + {% + \num[round-mode=places,round-precision=#1]{#2}\text{\textdegree}% + }% + {% + \num{#2}\text{\textdegree}% + }% +} + +\NewDocumentCommand\pflpcent{ o m }{% + \IfValueTF{#1}% + {% + \num[round-mode=places,round-precision=#1]{#2}\,\%% + }% + {% + \num{#2}\,\%% + }% +} + + %===ENSEMBLES CLASSIQUES \ifthenelse{\isundefined{\N}}% {% diff --git a/Master/texmf-dist/tex/latex/profmaquette/ProfMaquette.sty b/Master/texmf-dist/tex/latex/profmaquette/ProfMaquette.sty index 9aa462bb76f..d03683957ca 100644 --- a/Master/texmf-dist/tex/latex/profmaquette/ProfMaquette.sty +++ b/Master/texmf-dist/tex/latex/profmaquette/ProfMaquette.sty @@ -2,20 +2,33 @@ % licence : Released under the LaTeX Project Public License v1.3c % or later, see http://www.latex-project.org/lppl.txtf \NeedsTeXFormat{LaTeX2e}% -\def\filedate{2024/05/02}% +\def\filedate{2024/09/01}% \let\PfMfiledate\filedate% -\def\fileversion{0.94}% +\def\fileversion{0.98}% \let\PfMfileversion\fileversion% \ProvidesPackage{ProfMaquette}[\filedate\space v\fileversion\space Maquettage de documents]% \newif\if@Dyslexie \@Dyslexiefalse +\newif\if@CAN \@CANfalse +\newif\if@Revision \@Revisionfalse +\newif\if@AssembleCorrections \@AssembleCorrectionsfalse +\newif\if@Personnel \@Personnelfalse \DeclareOption{Dyslexie}{\@Dyslexietrue} +\DeclareOption{CAN}{\@CANtrue} +\DeclareOption{Revision}{\@Revisiontrue} +\DeclareOption{AssembleCorrections}{\@AssembleCorrectionstrue} +\DeclareOption{Personnel}{\@Personneltrue} \ProcessOptions\relax + +\if@AssembleCorrections + \AddToHook{env/document/end}[AC]{\PfMAffichageTousCorriges}% +\fi + % packages nécessaires \RequirePackage{verbatim}% - +\RequirePackage{xintexpr} \RequirePackage{calc}% \RequirePackage{xlop}% @@ -34,23 +47,25 @@ \RequirePackage{modulus}% \RequirePackage{ragged2e}% - +\RequirePackage{fontawesome5} \makeatletter \gdef\PfMFontSize{\@ptsize} %\gdef\PfMFontSize{\f@size} \makeatother %définition des clés \RequirePackage{simplekv}% -\setKVdefault[Boulot]{Dys=false,Taille=14,Cours=false,Base=false,BaseHTML=false,CAN=false,Fiche=false,DM=false,DS=false,IE=false,Kholle=false,RecapBrevet=false,PdT=false,Parcours=false,Contrat=false,FdR=false,ParcoursPerso=false,OlympiadesAPMEP=false,CorrigeInverse=false,CorrigeSeul=false,CorrigeApres=false,CorrigeFin=false,CorrigeAll=false,Brevet=false,BaremeComplet=false,BaremeGlobal=false,CorrectionColonnes=false,Epaisseur=0pt,VersSolution=false,AvecEntrainement=false,Small=false,Footnotesize=false,Scriptsize=false,AllDirect=false,AllPouce=false}%Les deux derniers pour essayer de mettre tous les exercices d'un même fichier en mode Reponse, en mode Indice. Pas implanté, pas testé +\setKVdefault[Boulot]{Dys=false,Taille=14,Cours=false,Base=false,BaseHTML=false,CAN=false,Fiche=false,DM=false,DS=false,IE=false,Kholle=false,RecapBrevet=false,PdT=false,Parcours=false,Contrat=false,FdR=false,ParcoursPerso=false,OlympiadesAPMEP=false,LivreHeros=false,CorrigeInverse=false,CorrigeSeul=false,CorrigeApres=false,CorrigeFin=false,CorrigeAll=false,Brevet=false,BaremeComplet=false,BaremeGlobal=false,CorrectionColonnes=false,EntrainementColonnes=false,Epaisseur=0pt,EEpaisseur=0pt,ESansSaut=false,VersSolution=false,AvecEntrainement=false,Small=false,Footnotesize=false,Scriptsize=false,AllDirect=false,AllPouce=false,Input=false}%Les deux derniers pour essayer de mettre tous les exercices d'un même fichier en mode Reponse, en mode Indice. Pas implanté, pas testé \defKV[Boulot]{Colonnes=\setKV[Boulot]{CorrectionColonnes}}% +\defKV[Boulot]{EColonnes=\setKV[Boulot]{EntrainementColonnes}}% \setKVdefault[Cours]{Couleur=Crimson,Theme=Trace écrite,NomExercice=Exercice}% \setKVdefault[DM]{Numero=1,Date=\today,Classe={},Niveau=3,Code=\jobname}% \setKVdefault[DS]{Numero=1,Date=\today,Classe={},Niveau=3,Code=\jobname,Calculatrice=false,Sujet=A}% \setKVdefault[Fiche]{Theme=Les nombres décimaux,Date=\today,Niveau=6,Classe={},Code={},NomExercice=Exercice,}% \setKVdefault[PdT]{Theme=Les nombres décimaux,Date=\today,Niveau=6,Classe={},Code={},NomExercice=Exercice}% \setKVdefault[FdR]{Theme=Les nombres décimaux,Date=\today,Niveau=6,Classe={},Code={},NomExercice=Exercice}% -\setKVdefault[Parcours]{Theme=Les nombres décimaux,Date=\today,Niveau=6,Classe={},Code={},NomExercice=Exercice,Vertical=false}% +\setKVdefault[Parcours]{Theme=Les nombres décimaux,Date=\today,Niveau=6,Classe={},Code={},NomExercice=Exercice,Vertical=false,Plan=false,Court=false}% \setKVdefault[Contrat]{Theme=Les nombres décimaux,Date=\today,Niveau=6,Classe={},Code={},NomExercice=Exercice}% +\setKVdefault[OlympiadesAPMEP]{Theme=Les nombres décimaux}% \setKVdefault[ParcoursPerso]{Fichier={}}% \setKVdefault[IE]{Nom=\'Evaluation,Sujets=false,Theme={},Numero=1,Date=\today,Classe={},Niveau=3,Code=\jobname,Calculatrice=false}% \defKV[IE]{Sujet=\setKV[IE]{Sujets}}% @@ -58,7 +73,7 @@ \setKVdefault[Kholle]{Sujet=1,Numero=1,Date=15,Niveau=TSI-1,Code=\jobname,Lieu=Lycée du Hainaut (Valenciennes),NomEleve=Albert Einstein,CR=false}% \setKVdefault[CAN]{Date=\today,Niveau=6,Duree=9,CoefQ=0.4,CoefR=0.35,CoefJ=0.1}% -\setKVdefault[ClesExercices]{NbQuestions=1,PasTitre=false,AffichageSource=false,BaremeTotal,BaremeDetaille=false,MotPoint=point,AffichageTitre=false,Calculatrice=true,Oral=false,Difficulte=0,AffichageCompetence=false,PasCorrige=false,Direct=false,Pouce=false,Parcours=false,Contrat=false,FdR=false,Routes=false,Stops=false,Background=white,Cadre=gray!50,Numerote,Ligne=false,Doublespacing=false,Onehalfspacing=false,Cadres=false,TitreSol=false,NonUtilise=false,Profile=false,PasEntrainement=false}% +\setKVdefault[ClesExercices]{NbQuestions=1,PasTitre=false,AffichageSource=false,BaremeTotal,BaremeDetaille=false,MotPoint=point,AffichageTitre=false,Calculatrice=true,Oral=false,Difficulte=0,AffichageCompetence=false,PasCorrige=false,Direct=false,Pouce=false,Parcours=false,Contrat=false,FdR=false,Routes=false,Stops=false,Background=white,Cadre=gray!50,Numerote,Ligne=false,Doublespacing=false,Onehalfspacing=false,Cadres=false,Grilles=false,Cinq=false,Huit=false,TitreSol=false,NonUtilise=false,Profile=false,AEntretenir=false,Fragile=false,AvecIndications=false,ACompleter=false,Aide=0,Score=0,EchelleSeyes=8}% \defKV[ClesExercices]{TitreSolution=\setKV[ClesExercices]{TitreSol}}% \defKV[ClesExercices]{Source=\setKV[ClesExercices]{AffichageSource}}% \defKV[ClesExercices]{Titre=\setKV[ClesExercices]{AffichageTitre}}% @@ -69,10 +84,21 @@ \defKV[ClesExercices]{Stop=\setKV[ClesExercices]{Stops}}% \defKV[ClesExercices]{Lignes=\setKV[ClesExercices]{Ligne}}% \defKV[ClesExercices]{Encart=\setKV[ClesExercices]{Cadres}}% +\defKV[ClesExercices]{CinqCinq=\setKV[ClesExercices]{Grilles}\setKV[ClesExercices]{Cinq}}% +\defKV[ClesExercices]{Seyes=\setKV[ClesExercices]{Grilles}\setKV[ClesExercices]{Huit}}% \def\PfMTexteEncart{Indique ton travail ci-dessous.}% -\setKVdefault[SchemaParcours]{Colonnes=100,Rayon=2.5mm,Largeur=7.5mm,Couleur=LightSteelBlue,Csv=false}% +\setKVdefault[SchemaParcours]{Colonnes=100,Rayon=2.5mm,Largeur=7.5mm,Couleur=gray!70}%,Csv=false}% \setKVdefault[SchemaContrat]{Ecart=7mm,Rayon=2.5mm}% -\setKVdefault[SchemaFdR]{Ecart=7mm,Colonnes=100,Rayon=2.5mm,Largeur=7.5mm,Couleur=LightSteelBlue,Csv=false}% +\setKVdefault[SchemaFdR]{Ecart=7mm,Colonnes=100,Rayon=2.5mm,Largeur=7.5mm,Couleur=gray!70}%,Csv=false}% +% Commande pour retenir le nombre d'exercices par maquette.Utile seulement pour la clé AssembleCorrection +\xdef\PfMRetiensLienExoMa{}% +\xdef\PfMRetiensLienDefMa{}% +% Commande pour passer des options à travers la clé Input. Elle remplace \input :) +\NewDocumentCommand\Input{om}{% + \def\Relecture{\setKV[ClesExercices]{#1}}% + \input{#2}% + \def\Relecture{}% +}% % Sucres \makeatletter% \NewDocumentCommand\PfMDotfill{}{% @@ -88,7 +114,15 @@ % \NewDocumentCommand\PfMNbLignesRestantes{}{% \edef\measurepage{\dimexpr\pagegoal-\pagetotal\relax}% + \edef\measurepagemax{\dimexpr\textheight\relax}% + % \edef\measurepage{\dimeval{\pagegoal-\pagetotal-\baselineskip}}% \xdef\PfMResteLignes{\fpeval{trunc((\the\measurepage)/(\baselineskip),0)}}% + \xdef\PfMResteLignesMax{\fpeval{trunc((\the\measurepagemax)/(\baselineskip),0)}}% + \ifnum\PfMResteLignesMax<\PfMResteLignes\relax + \xdef\PfMResteLignes{\PfMResteLignesMax} + \fi + %\xdef\PfMResteLignes{\dimeval{trunc((\the\measurepage)/(\baselineskip),0)}}% + %Il reste \PfMResteLignes{} lignes alors que le nombre maximal de lignes sur une page est \PfMResteLignesMax{}. }% \NewDocumentCommand\PfMLignesFinales{}{% @@ -123,23 +157,30 @@ \newlength\PfMLargeurJury% \newlength\PfMEspaceAvantLignes% \newlength\PfMEspaceApresLignes% -\newlength\PfMLargeurComp +\newlength\PfMLargeurComp% \newlength\CRRHauteur% \newlength\PfMEcartSupInterMots% -\setlength{\CRRHauteur}{10cm} +\newlength\PfMCoefcompetences% +\def\PfMCoefCompetences{0.85}% +\setlength{\CRRHauteur}{10cm}% \setlength{\PfMHauteurAppreciation}{5cm}% \setlength{\PfMHauteurRemarque}{5cm}% -\setlength{\PfMEspaceAvantLignes}{1em} -\setlength{\PfMEspaceApresLignes}{1em} +\setlength{\PfMEspaceAvantLignes}{1em}% +\setlength{\PfMEspaceApresLignes}{1em}% \setlength{\PfMEcartSupInterMots}{1pt}% +\setlength{\PfMCoefcompetences}{0.7\linewidth}% % définition des compteurs \newcounter{PfMMaquette}%Pour compter le nombres de "travaux" \setcounter{PfMMaquette}{0}% +\newcounter{PfMMaquetteSol}[PfMMaquette]%Pour compter le nombres de "travaux" dans les corrections +\setcounter{PfMMaquetteSol}{0}% \newcounter{PfMSection}%Pour le barème et ne pas faire obstruction à section \setcounter{PfMSection}{0}% \newcounter{PfMExo}[PfMMaquette]%Numéro des exercices \setcounter{PfMExo}{0}% -\newcounter{PfMExoSol}%Pour repérer les valeurs aléatoires construites automatiquement dans la solution +%\newcounter{PfMExoSolAlea}%Pour repérer les valeurs aléatoires construites automatiquement dans la solution +%\setcounter{PfMExoSolAlea}{0}% +\newcounter{PfMExoSol}[PfMMaquette]% \setcounter{PfMExoSol}{0}% \newcounter{PfMExoEntrai}%Pour repérer les entrainements \setcounter{PfMExoEntrai}{0}% @@ -152,12 +193,17 @@ \newcounter{RetiensSol}%Pour l'affichage des solutions \newcounter{RetiensRep}%Pour l'affichage des reponses. \newcounter{RetiensInd}%Pour l'affichage des indices. +\newcounter{RetiensIndic}%Pour l'affichage des indications. +\newcounter{PfMRetiensQr}%Pour l'affichage des entrainements \setcounter{RetiensSol}{0}% \setcounter{RetiensRep}{0}% \setcounter{RetiensInd}{0}% +\setcounter{RetiensIndic}{0}% +\setcounter{PfMRetiensQr}{0}% \newcounter{PfMNbLogo}%Pour décaler les logos sur la ligne haute de tcolorbox \setcounter{PfMNbLogo}{0}% \newcount\Orientation%Pour le schéma des parcours +\newcount\TotalParcoursTikz%Pour le total des exos à utiliser dans l'affichage des parcours tikz \newcounter{PfMCNNumQ}% \newcounter{Nbcolonnes} @@ -166,6 +212,8 @@ \newif\ifPfMDeuxColonnes \newif\ifPfMRectoVerso +\newif\ifPfMRevision + \makeatletter \if@twocolumn \PfMDeuxColonnestrue @@ -179,6 +227,11 @@ \else \PfMRectoVersofalse \fi +\if@Revision + \PfMRevisiontrue +\else + \PfMRevisionfalse +\fi \makeatother % couleurs @@ -228,6 +281,22 @@ \ifboolKV[Boulot]{CAN}{}{\end{tcolorbox}}% }% +\tcbset{% + indications/.style={ + empty, + right=0pt, + left=0mm, + top=0pt, + bottom=0pt, + frame engine=path, + % colframe=Crimson!10, + frame hidden, + notitle, + sharp corners=west, + borderline west={3pt}{0pt}{black!50} + } +} + %% Option french pour les mathématiques % By CT \NewDocumentCommand\TypoMathFrance{}{% @@ -291,7 +360,7 @@ \NewDocumentCommand\RepartirEffectifTotal{mmm}{% % #1 valeur de l'effectif total % #2 nombre de valeurs à obtenir - % #3 écart acceptable :) autour de la moyenen + % #3 écart acceptable :) autour de la moyenne \xdef\PfCSLEffectifs{}% \xdef\PfCValeurMoyenneTemp{\fpeval{floor(#1/#2)}}% \xdef\PfCRetiensRETSomme{}% @@ -791,7 +860,8 @@ \setcounter{Melquestions}{0}% \setsepchar{\item}\ignoreemptyitems% \readlist*\ListeTest{#2}% -% La liste des éléments retenus est \showitems*\ListeTest[] + \reademptyitems + % La liste des éléments retenus est \showitems*\ListeTest[]\par \IfNoValueTF{#1}{% \ChoixAleaMultiMix{\ListeTestlen}{1}{\ListeTestlen}{0}{\ListeShuffleA}% \xdef\MelangeValeurTotale{\ListeTestlen}% @@ -802,6 +872,8 @@ \ExporteListe{ListeShuffle}{\ListeShuffleA}% \setsepchar{,}\ignoreemptyitems% \readlist*\ListeNumQ{\ListeShuffleA}% + \reademptyitems + % L'ordre des questions est \ListeNumQ[] \setcounter{Comptequestions}{1}% \begin{enumerate} \loop% @@ -815,11 +887,15 @@ \NewDocumentEnvironment{Enumelangesol}{b}{% \setcounter{Melquestions}{0}% - \setsepchar{\item}% + \setsepchar{\item}\ignoreemptyitems% \readlist*\ListeTest{#1}% + \reademptyitems \RestoreListe{ListeShuffle}% \setsepchar{,}\ignoreemptyitems% \readlist*\ListeNumQ{\ListeShuffle}% + \reademptyitems +% la liste des éléments retenus est \showitems*\ListeTest[]\par +% L'ordre des questions est \ListeNumQ[]\par \setcounter{Comptequestions}{1}% \begin{enumerate} \loop% @@ -882,7 +958,7 @@ } \def\buildtabcompetences{% - \[\begin{tabular}{|p{0.70\linewidth}|*{3}{>{\centering\arraybackslash}p{0.05\linewidth}|}} + \[\begin{tabular}{|p{\PfMCoefcompetences}|*{3}{>{\centering\arraybackslash}p{0.05\linewidth}|}} \cline{2-4} \multicolumn{1}{c|}{}&\PfMCompNA&\PfMCompECA&\PfMCompA\\ \hline @@ -892,7 +968,7 @@ }% \def\Buildtabcompetences#1#2{% - \setlength{\PfMLargeurComp}{\fpeval{0.85-0.05*#1}\linewidth-\fpeval{2*(#1-3)}\tabcolsep}% + \setlength{\PfMLargeurComp}{\fpeval{\PfMCoefCompetences-0.05*#1}\linewidth-\fpeval{2*(#1-3)}\tabcolsep}% \[\begin{tabular}{|p{\PfMLargeurComp}|*{#1}{>{\centering\arraybackslash}p{0.05\linewidth}|}}% \cline{2-\fpeval{1+#1}}% \multicolumn{1}{c|}{}\xintFor* ##1 in{\xintSeq{1}{#1}}\do{% @@ -914,7 +990,7 @@ \def\SolutionWrite{% \setcounter{PfMAlea}{0}% \@bsphack% - \immediate\openout \verbatim@out "\jobname-Ex\thePfMExo.sol"% + \immediate\openout \verbatim@out "\jobname-Ma\thePfMMaquette-Ex\thePfMExo.sol"% \let\do\@makeother\dospecials% \catcode`\^^M\active% \def\verbatim@processline{% @@ -924,7 +1000,7 @@ \def\SolutionWritePP{% \@bsphack - \immediate\openout \verbatim@out "\jobname-PPEx\thePfMExo.sol" % + \immediate\openout \verbatim@out "\jobname-Ma\thePfMMaquette-PPEx\thePfMExo.sol" % \let\do\@makeother\dospecials \catcode`\^^M\active \def\verbatim@processline{% @@ -934,7 +1010,7 @@ \def\ReponseWrite{% \@bsphack - \immediate\openout \verbatim@out "\jobname-Ex\thePfMExo.rep" % + \immediate\openout \verbatim@out "\jobname-Ma\thePfMMaquette-Ex\thePfMExo.rep" % \let\do\@makeother\dospecials \catcode`\^^M\active \def\verbatim@processline{% @@ -944,7 +1020,7 @@ \def\IndiceWrite{% \@bsphack - \immediate\openout \verbatim@out "\jobname-Ex\thePfMExo.cdp" %coup de pouce + \immediate\openout \verbatim@out "\jobname-Ma\thePfMMaquette-Ex\thePfMExo.cdp" %coup de pouce \let\do\@makeother\dospecials \catcode`\^^M\active \def\verbatim@processline{% @@ -953,7 +1029,7 @@ \def\endIndiceWrite{\immediate\closeout\verbatim@out\@esphack} \makeatother -\def\SolutionNow{\textbf{Correction de l'exercice --}\par\nopagebreak\setcounter{PfMExoSol}{\thePfMExo}\setcounter{PfMAlea}{0}\PfMAffichageHideItemSolution} +\def\SolutionNow{\textbf{Correction de l'exercice --}\par\nopagebreak\setcounter{PfMExoSol}{\thePfMExo}\setcounter{PfMAlea}{0}\PfMAffichageHideItemSolution}%\setcounter{PfMExoSolAlea}{\thePfMExo} \def\endSolutionNow{\par\goodbreak\PfMshowitems} \def\ReponseNow{\textbf{Réponse(s) de l'exercice --}\par\nopagebreak\PfMAffichageHideItemSolution} @@ -965,6 +1041,48 @@ \NewDocumentEnvironment{Solution}{}{}{}% \NewDocumentEnvironment{Reponse}{}{}{}% \NewDocumentEnvironment{Indice}{}{}{}% +\NewDocumentEnvironment{PfMHide}{+b}{}{}% +\NewDocumentEnvironment{PfMSeek}{+b}{#1}{}% + +\NewDocumentEnvironment{AideA}{+b}{% + \ifnum\fpeval{\useKV[ClesExercices]{Aide}}>0\relax% + \begin{PfMSeek}% + #1 + \end{PfMSeek}% + \else% + \begin{PfMHide}% + #1 + \end{PfMHide} + \fi% +}{% +}% + +\NewDocumentEnvironment{AideB}{+b}{% + \ifnum\fpeval{\useKV[ClesExercices]{Aide}}>1\relax% + \begin{PfMSeek}% + #1 + \end{PfMSeek} + \else% + \begin{PfMHide}% + #1 + \end{PfMHide} + \fi% +}{% +}% + +\NewDocumentEnvironment{Indications}{+b}{% + \ifnum\theRetiensIndic=1\relax% + \textbf{\PfMTexteDesIndications :}\par% + \else% + \begin{PfMHide}% + \fi% + #1 +}{% + \ifnum\theRetiensIndic=1\relax% + \else + \end{PfMHide}% + \fi% +}% \NewDocumentCommand\PfMChoixAffichageCorrection{}{% \ifboolKV[Boulot]{CorrigeAll}{% @@ -1050,24 +1168,40 @@ }% }% -\def\PfMTexteDuCorrige{Corrigé de l'exercice} -\def\PfMTexteDeLEntrainement{Automatisme(s) lié(s) à l'exercice} +\NewDocumentCommand\PfMChoixEntrainement{}{% + \setcounter{PfMRetiensQr}{0}% + \ifboolKV[ClesExercices]{AEntretenir}{\setcounter{PfMRetiensQr}{1}}{}% +}% + +\NewDocumentCommand\PfMChoixAffichageEntrainement{}{% + \ifnum\thePfMRetiensQr=1\relax% + \let\Entrainement\EntrainementWrite\let\endEntrainement\endEntrainementWrite% + \else% + \let\Entrainement\comment\let\endEntrainement\endcomment + \fi% +}% + +\def\PfMTexteDuCorrige{Corrigé de l'exercice}% +\def\PfMTexteDeLEntrainement{Automatisme(s) lié(s) à l'exercice}% +\def\PfMTexteDesIndications{Indications}% \NewDocumentCommand\PfMAffichageCorrige{}{% \ifboolKV[Boulot]{CAN}{% \xintFor* ##1 in{\xintSeq{1}{\PfMCANTotalExo}}\do{% \setcounter{PfMExoSol}{##1}% \setcounter{PfMAlea}{0}% - \IfFileExists{\jobname-Ex##1.sol}{\textbf{Question\ifnum\PfMCANTotalExo=1\relax\else~\ifboolKV[Boulot]{CorrigeSeul}{##1}{\ref{TestCAN-##1}}:\fi}~\input{\jobname-Ex##1.sol}\par\goodbreak}{}%page-\thePfMMaquette-##1 + \IfFileExists{\jobname-Ma\thePfMMaquette-Ex##1.sol}{\textbf{Question\ifnum\PfMCANTotalExo=1\relax\else~\ifboolKV[Boulot]{CorrigeSeul}{##1}{\ref{TestCAN-##1}}:\fi}~\input{\jobname-Ma\thePfMMaquette-Ex##1.sol}\par\goodbreak}{}%page-\thePfMMaquette-##1 }% }{% \setcounter{PfMExoSol}{0}% + %\setcounter{PfMExoSolAlea}{0}% \xintFor* ##1 in{\xintSeq{1}{\thePfMExo}}\do{% \refstepcounter{PfMExoSol}%{##1}% - \label{pagesol-\thePfMMaquette-\thePfMExoSol} + %\stepcounter{PfMExoSolAlea}% + \label{pagesol-\thePfMMaquette-\thePfMExoSol}% \setcounter{PfMAlea}{0}% - \IfFileExists{\jobname-Ex##1.sol}{\PfMAffichageHideItemSolution\textbf{\PfMTexteDuCorrige\ifnum\thePfMExo=1\relax\else~\ifboolKV[Boulot]{CorrigeSeul}{##1}{\ref{page-\thePfMMaquette-##1}}\fi\PfMAffichageTitreSolution}\par\nopagebreak\input{\jobname-Ex##1.sol}\par\goodbreak}{\IfFileExists{\jobname-Ex##1.rep}{\PfMAffichageHideItemSolution\textbf{Réponse(s) seule(s) de l'exercice\ifnum\thePfMExo=1\relax\else~\ifboolKV[Boulot]{CorrigeSeul}{##1}{\ref{page-\thePfMMaquette-##1}}\fi}\par\nopagebreak\input{\jobname-Ex##1.rep}\par\goodbreak}{% - \IfFileExists{\jobname-Ex##1.cdp}{\PfMAffichageHideItemSolution\textbf{Indice(s) pour l'exercice\ifnum\thePfMExo=1\relax\else~\ifboolKV[Boulot]{CorrigeSeul}{##1}{\ref{page-\thePfMMaquette-##1}}\fi}\par\nopagebreak\input{\jobname-Ex##1.cdp}\par\goodbreak}{}% + \IfFileExists{\jobname-Ma\thePfMMaquette-Ex##1.sol}{\PfMAffichageHideItemSolution\textbf{\PfMTexteDuCorrige\ifnum\thePfMExo=1\relax\else~\ifboolKV[Boulot]{CorrigeSeul}{##1}{\ref{page-\thePfMMaquette-##1}}\fi\PfMAffichageTitreSolution}\par\nopagebreak\input{\jobname-Ma\thePfMMaquette-Ex##1.sol}\par\goodbreak}{\IfFileExists{\jobname-Ma\thePfMMaquette-Ex##1.rep}{\PfMAffichageHideItemSolution\textbf{Réponse(s) seule(s) de l'exercice\ifnum\thePfMExo=1\relax\else~\ifboolKV[Boulot]{CorrigeSeul}{##1}{\ref{page-\thePfMMaquette-##1}}\fi}\par\nopagebreak\input{\jobname-Ma\thePfMMaquette-Ex##1.rep}\par\goodbreak}{% + \IfFileExists{\jobname-Ma\thePfMMaquette-Ex##1.cdp}{\PfMAffichageHideItemSolution\textbf{Indice(s) pour l'exercice\ifnum\thePfMExo=1\relax\else~\ifboolKV[Boulot]{CorrigeSeul}{##1}{\ref{page-\thePfMMaquette-##1}}\fi}\par\nopagebreak\input{\jobname-Ma\thePfMMaquette-Ex##1.cdp}\par\goodbreak}{}% }% }% \PfMshowitems% @@ -1075,33 +1209,76 @@ }% }% +% Tous les corrigés +\NewDocumentCommand\PfMAffichageTousCorriges{}{% + \setsepchar{,}\ignoreemptyitems% + \readlist*\ListeNombreExoMq{\PfMRetiensLienExoMa}% + \reademptyitems% + \xintFor* ##2 in{\xintSeq{1}{\thePfMMaquette}}\do{% + \refstepcounter{PfMMaquetteSol}% + \setcounter{PfMExoSol}{0}% + %\setcounter{PfMExoSolAlea}{0}% + \ifPfMRectoVerso% + \cleardoublepage% + \else% + \clearpage% + \fi% + \input{\jobname-DefiMq-##2} + \ifboolKV[Boulot]{CorrectionColonnes}{\begin{multicols}{\useKV[Boulot]{Colonnes}}}{}% + \xintFor* ##1 in{\xintSeq{1}{\ListeNombreExoMq[##2]}}\do{% + \stepcounter{PfMExoSol}% + %\stepcounter{PfMExoSolAlea}% + \label{pagesol-\thePfMMaquetteSol-\thePfMExoSol}% + \setcounter{PfMAlea}{0}% + \IfFileExists{\jobname-Ma##2-Ex##1.sol}{\PfMAffichageHideItemSolution\textbf{\PfMTexteDuCorrige\ifnum\thePfMExo=1\relax\else~\ifboolKV[Boulot]{CorrigeSeul}{##1}{\ref{page-##2-##1}}\fi\PfMAffichageTitreSolution}\par\nopagebreak\input{\jobname-Ma##2-Ex##1.sol}\par\goodbreak}{\IfFileExists{\jobname-Ma##2-Ex##1.rep}{\PfMAffichageHideItemSolution\textbf{Réponse(s) seule(s) de l'exercice\ifnum\thePfMExo=1\relax\else~\ifboolKV[Boulot]{CorrigeSeul}{##1}{\ref{page-##2-##1}}\fi}\par\nopagebreak\input{\jobname-Ma##2-Ex##1.rep}\par\goodbreak}{% + \IfFileExists{\jobname-Ma##2-Ex##1.cdp}{\PfMAffichageHideItemSolution\textbf{Indice(s) pour l'exercice\ifnum\thePfMExo=1\relax\else~\ifboolKV[Boulot]{CorrigeSeul}{##1}{\ref{page-##2-##1}}\fi}\par\nopagebreak\input{\jobname-Ma##2-Ex##1.cdp}\par\goodbreak}{}% + }% + }% + \PfMshowitems% + }% + \ifboolKV[Boulot]{CorrectionColonnes}{\end{multicols}}{}% + }% +}% + \NewDocumentEnvironment{Entrainement}{}{}{}% \makeatletter \def\EntrainementWrite{% \@bsphack% - \immediate\openout \verbatim@out "\jobname-Ex\thePfMExo.qrc"% + \immediate\openout \verbatim@out "\jobname-Ma\thePfMMaquette-Ex\thePfMExo.qrc"% \let\do\@makeother\dospecials% \catcode`\^^M\active% \def\verbatim@processline{% \immediate\write\verbatim@out{\the\verbatim@line}}% \verbatim@start}% \def\endEntrainementWrite{\immediate\closeout\verbatim@out\@esphack}% - -\let\Entrainement\EntrainementWrite\let\endEntrainement\endEntrainementWrite% \makeatother \NewDocumentCommand\PfMAffichageEntrainement{}{% - \clearpage + \ifboolKV[Boulot]{ESansSaut}{\vfill}{% + \ifPfMDeuxColonnes + \newpage + \else + \ifPfMRectoVerso + \cleardoublepage + \else + \clearpage + \fi + \fi + }% \TikzAutomatismes + \setlength{\columnseprule}{\useKV[Boulot]{EEpaisseur}}% + \ifboolKV[Boulot]{EntrainementColonnes}{\begin{multicols}{\useKV[Boulot]{EColonnes}}}{}% \setcounter{PfMExoEntrai}{0}% \xintFor* ##1 in{\xintSeq{1}{\thePfMExo}}\do{% \refstepcounter{PfMExoEntrai}% - \IfFileExists{\jobname-Ex##1.qrc}{% + \IfFileExists{\jobname-Ma\thePfMMaquette-Ex##1.qrc}{% \begin{center} - \label{pageentrai-\thePfMMaquette-\thePfMExoEntrai}% - \textbf{\PfMTexteDeLEntrainement\ifnum\thePfMExo=1\relax\else~\ref{page-\thePfMMaquette-##1}\fi}\par\nopagebreak\input{\jobname-Ex##1.qrc}\end{center}}{}% + \label{pageentrai-\thePfMMaquette-\thePfMExoEntrai}% + \textbf{\PfMTexteDeLEntrainement\ifnum\thePfMExo=1\relax\else~\ref{page-\thePfMMaquette-##1}\fi}\par\nopagebreak\input{\jobname-Ma\thePfMMaquette-Ex##1.qrc}\end{center}% + }{}% }% + \ifboolKV[Boulot]{EntrainementColonnes}{\end{multicols}}{}% }% \NewDocumentCommand\TikzAutomatismes{}{% @@ -1128,17 +1305,23 @@ \newcommand*\brm[1]{% \ifboolKV[Boulot]{Fiche}{}{% - \immediate\write\@auxout{% - \string\opadd*{#1}% - {total\the\c@PfMSection-\the\c@PfMExo}% - {total\the\c@PfMSection-\the\c@PfMExo}% - \string\opcopy{\thePfMExo}{TotalExo}% + \ifboolKV[Boulot]{FdR}{}{% + \ifboolKV[Boulot]{Contrat}{}{% + \ifboolKV[Boulot]{Parcours}{}{% + \immediate\write\@auxout{% + \string\opadd*{#1}% + {total\the\c@PfMSection-\the\c@PfMExo}% + {total\the\c@PfMSection-\the\c@PfMExo}% + \string\opcopy{\thePfMExo}{TotalExo}% + }% + \ifboolKV[ClesExercices]{BaremeDetaille}{% + \setlength{\brouillon}{\BaremeEspace@Marge-\linewidth+\textwidth}% + \makebox[0pt][r]{\footnotesize\FranPt{#1}\hspace*{\brouillon}}% + \ignorespaces% + }{}% + }% + }% }% - \ifboolKV[ClesExercices]{BaremeDetaille}{% - \setlength{\brouillon}{\BaremeEspace@Marge-\linewidth+\textwidth}% - \makebox[0pt][r]{\footnotesize\FranPt{#1}\hspace*{\brouillon}}% - \ignorespaces% - }{}% }% }% @@ -1178,11 +1361,25 @@ \@ifundefined{Op@total#1}{recompilez}% {% \opunzero{total#1}% on ne sait jamais - \opset{decimalsepsymbol={,}} + \opset{decimalsepsymbol={,}}% \opprint{total#1}~% - \opset{decimalsepsymbol={.}} + \opset{decimalsepsymbol={.}}% + \useKV[ClesExercices]{MotPoint}% \opcmp{total#1}{2}% - \ifopge \useKV[ClesExercices]{MotPoint}s\else \useKV[ClesExercices]{MotPoint}\fi + \ifopge s\fi% + }% +} + +\newcommand\ScoreMaximal{% + \@ifundefined{Op@ScoreTotal\thePfMMaquette}{recompilez}% + {% + \opunzero{ScoreTotal\thePfMMaquette}% on ne sait jamais + \opset{decimalsepsymbol={,}}% + \opprint{ScoreTotal\thePfMMaquette}~% + \opset{decimalsepsymbol={.}}% + \useKV[ClesExercices]{MotPoint}% + \opcmp{ScoreTotal\thePfMMaquette}{2}% + \ifopge s\fi% }% } @@ -1251,12 +1448,12 @@ \NewDocumentCommand{\PfMLienVersEntrainement}{}{% \ifboolKV[Boulot]{AvecEntrainement}{% - \ifboolKV[ClesExercices]{PasEntrainement}{}{% + \ifboolKV[ClesExercices]{AEntretenir}{% \node[% fill=tcbcolback,% anchor=center,rotate=45% ] at ($(frame.north east)!0.75!(frame.south east)$){\hyperref[pageentrai-\thePfMMaquette-\thePfMExo]{\faDumbbell}};% - }% + }{}% }{}% }% @@ -1307,7 +1504,6 @@ %%% Base des exercices DM \tcbset{% tikzdm/.style={% - %lowerbox=ignored, enhanced, breakable, colback=white, @@ -1346,21 +1542,23 @@ }% }% -\NewDocumentEnvironment{exerciceDM}{so+b}{% +\NewDocumentEnvironment{exerciceDM}{so}{% \setcounter{PfMAlea}{0}% + % Mettre les indications hors-jeu + \setcounter{RetiensIndic}{0} \useKVdefault[ClesExercices]% \setKV[ClesExercices]{#2}% + \ifboolKV[Boulot]{Input}{\Relecture}{}% \ifboolKV[ClesExercices]{NonUtilise}{% % Mettre la correction hors-jeu \setKV[ClesExercices]{PasCorrige}% \PfMChoixCorrection% + \begin{PfMHide} }{% \IfBooleanTF{#1}{% \setKV[ClesExercices]{Numerote=false}% }{}% - \refstepcounter{PfMSection}% - \PfMChoixCorrection% - \refstepcounter{PfMExo}% + \PfMAvantLesExercices% \ifboolKV[Boulot]{CorrigeSeul}{}{% \PfMChoixTitreSolution% \immediate\write\@auxout{% @@ -1376,12 +1574,11 @@ label=page-\thePfMMaquette-\thePfMExo,% ]% \ifboolKV[Boulot]{Dys}{\raggedright}{}% - #3 }% }% }{% - \ifboolKV[ClesExercices]{NonUtilise}{}{% - \ifboolKV[Boulot]{CorrigeSeul}{}{ + \ifboolKV[ClesExercices]{NonUtilise}{\end{PfMHide}}{% + \ifboolKV[Boulot]{CorrigeSeul}{}{ \end{tcolorbox}% \PfMApresLesExercices% }% @@ -1509,23 +1706,25 @@ }% -\NewDocumentEnvironment{exerciceContrat}{so+b}{% +\NewDocumentEnvironment{exerciceContrat}{so}{% \setcounter{PfMAlea}{0}% \setcounter{PfMNbLogo}{1}% + % Mettre les indications hors-jeu + \setcounter{RetiensIndic}{0} \useKVdefault[ClesExercices]% \setKV[ClesExercices]{#2}% + \ifboolKV[Boulot]{Input}{\Relecture}{}% \ifboolKV[ClesExercices]{NonUtilise}{% % Mettre la correction hors-jeu \setKV[ClesExercices]{PasCorrige}% \PfMChoixCorrection% + \begin{PfMHide} }{% \IfBooleanTF{#1}{% \setKV[ClesExercices]{Numerote=false}% }{}% \setKV[ClesExercices]{BaremeTotal=false,BaremeDetaille=false}% - \refstepcounter{PfMSection}% - \PfMChoixCorrection% - \refstepcounter{PfMExo}% + \PfMAvantLesExercices% \ifboolKV[Boulot]{CorrigeSeul}{}{% \PfMChoixTitreSolution% \immediate\write\@auxout{\string\opcopy{\thePfMExo}{\Roman{PfMMaquette}-ContratTotalExo}}% @@ -1546,11 +1745,10 @@ label=page-\thePfMMaquette-\thePfMExo ] \ifboolKV[Boulot]{Dys}{\raggedright}{}% - #3 }% }% }{% - \ifboolKV[ClesExercices]{NonUtilise}{}{% + \ifboolKV[ClesExercices]{NonUtilise}{\end{PfMHide}}{% \ifboolKV[Boulot]{CorrigeSeul}{}{% \end{tcolorbox} \PfMApresLesExercices% @@ -1799,7 +1997,7 @@ \xdef\RetiensLeDepart{0}% \xdef\RetiensLesReponses{0}% \xdef\RetiensNonAffichees{0}% - \xdef\RetiensEtage{0} + \xdef\RetiensEtage{0}% \xintFor* ##1 in{\xintSeq{1}{\ListeRouteHautelen}}\do{% \xintifboolexpr{\ListeRouteHaute[##1]==0}{% \xdef\RetiensEtage{\fpeval{\RetiensEtage+1}}% @@ -1814,7 +2012,7 @@ \xintifboolexpr{\fpeval{\RetiensLesReponses-1}==\RetiensNonAffichees}{% % % }{% - \xintFor* ##2 in{\xintSeq{\fpeval{\RetiensLeDepart+1}}{\fpeval{\RetiensLeDepart+\RetiensLesReponses}}}\do{ + \xintFor* ##2 in{\xintSeq{\fpeval{\RetiensLeDepart+1}}{\fpeval{\RetiensLeDepart+\RetiensLesReponses}}}\do{% \xintifboolexpr{\ListeRouteHaute[##2]<0}{% \draw (B-##2) to (B-\fpeval{##2+1});% }{% @@ -1863,24 +2061,28 @@ \fi \immediate\write\@auxout{\noexpand\expandafter\gdef\noexpand\csname \Roman{PfMMaquette}FdR#1\endcsname{\csname \Roman{PfMMaquette}route#1\endcsname}}% }% - -\NewDocumentEnvironment{exerciceFdR}{so+b}{% + +\def\Relecture{}% + +\NewDocumentEnvironment{exerciceFdR}{so}{% \setcounter{PfMAlea}{0}% \setcounter{PfMNbLogo}{1}% + % Mettre les indications hors-jeu + \setcounter{RetiensIndic}{0} \useKVdefault[ClesExercices]% \setKV[ClesExercices]{#2}% + \ifboolKV[Boulot]{Input}{\Relecture}{}% \ifboolKV[ClesExercices]{NonUtilise}{% % Mettre la correction hors-jeu \setKV[ClesExercices]{PasCorrige}% \PfMChoixCorrection% + \begin{PfMHide} }{% \IfBooleanTF{#1}{% \setKV[ClesExercices]{Numerote=false}% }{}% \setKV[ClesExercices]{BaremeTotal=false,BaremeDetaille=false}% - \stepcounter{PfMSection}% - \PfMChoixCorrection% - \refstepcounter{PfMExo}% + \PfMAvantLesExercices% \ifboolKV[Boulot]{CorrigeSeul}{}{% \PfMChoixTitreSolution% \immediate\write\@auxout{\string\opcopy{\thePfMExo}{\Roman{PfMMaquette}-FdRTotalExo}}% @@ -1914,11 +2116,10 @@ label=page-\thePfMMaquette-\thePfMExo ] \ifboolKV[Boulot]{Dys}{\raggedright}{}% - #3 }% }% }{% - \ifboolKV[ClesExercices]{NonUtilise}{}{% + \ifboolKV[ClesExercices]{NonUtilise}{\end{PfMHide}}{% \ifboolKV[Boulot]{CorrigeSeul}{}{% \end{tcolorbox} \PfMApresLesExercices% @@ -1945,7 +2146,7 @@ \string\opcopy{\thePfMExo}{TotalExo}% }% \@bsphack% - \immediate\openout \verbatim@out "\jobname-Ex\thePfMExo.can"% + \immediate\openout \verbatim@out "\jobname-Ma\thePfMMaquette-Ex\thePfMExo.can"% \let\do\@makeother\dospecials% \catcode`\^^M\active% \def\verbatim@processline{\immediate\write\verbatim@out{\the\verbatim@line}}% @@ -1970,7 +2171,6 @@ \tcbset{% usercan/.style={% enhanced, - % spread upwards=-1cm,colback=gray!5% frame hidden, colback=white, middle=24pt, @@ -2030,7 +2230,6 @@ \Large\sffamily Course aux nombres (Correction) \end{center} \hfill\useKV[CAN]{Niveau}% - %\par{\tiny\useKV[CAN]{Code}}\hfill{\scriptsize\useKV[CAN]{Date}}% \end{tcolorbox}% } %%% FdR %%% @@ -2112,19 +2311,33 @@ \reademptyitems% \xdef\PfMFooTestA{\ListeExercicesPA[1]}% \ifnum\ListeExercicesPAlen>1\relax% - \xintFor* ##1 in{\xintSeq{2}{\ListeExercicesPAlen}}\do{% - \xdef\PfMFooTestA{\PfMFooTestA,\ListeExercicesPA[##1]}% - }% + \xintFor* ##1 in{\xintSeq{2}{\ListeExercicesPAlen}}\do{% + \xdef\PfMFooTestA{\PfMFooTestA,\ListeExercicesPA[##1]}% + }% \fi% - \ifboolKV[Parcours]{Vertical}{% - \BuildParcoursTikzV{\ParcoursTotalExo}{\PfMFooTestA}% + \ifboolKV[Parcours]{Plan}{% + \BuildParcoursPlan{\ParcoursTotalExo}{\PfMFooTestA}% }{% - \BuildParcoursTikz{\ParcoursTotalExo}{\PfMFooTestA}% + \ifboolKV[Parcours]{Vertical}{% + \BuildParcoursTikzV{\ParcoursTotalExo}{\PfMFooTestA}% + }{% + \BuildParcoursTikz{\ParcoursTotalExo}{\PfMFooTestA}% + }% }% }% }% %\makeatother +\NewDocumentCommand\BuildParcoursPlan{mm}{% + \setsepchar{,}% + \readlist*\ListeRetiens{#2}% + \begin{enumerate} + \foreachitem\compteur\in\ListeRetiens{% + \item[$\square$] Exercice \ref{page-\thePfMMaquette-\ListeRetiens[\compteurcnt]}% + }% + \end{enumerate} +}% + \NewDocumentCommand\BuildParcoursTikzV{mm}{% \setsepchar{,}% \readlist*\ListeRetiens{#2}% @@ -2155,8 +2368,13 @@ \begin{tikzpicture}[anchor=center,baseline=-1.25mm] % On place les points \Orientation=1\relax + \ifboolKV[Parcours]{Court}{% + \TotalParcoursTikz=\ListeRetienslen% + }{% + \TotalParcoursTikz=#1% + }% \coordinate[anchor=base,baseline=-1.25mm] (A-1) at (0,0);% - \xintFor* ##1 in{\xintSeq{2}{\fpeval{#1+1}}}\do{% + \xintFor* ##1 in{\xintSeq{2}{\fpeval{\the\TotalParcoursTikz+1}}}\do{% \modulo{##1}{\useKV[SchemaParcours]{Colonnes}}% \ifnum\remainder=0\relax% \Orientation=\numexpr\Orientation*(-1)\relax% @@ -2165,17 +2383,23 @@ \coordinate[xshift=\the\Orientation*\PfMLargeurSchemaParcours] (A-##1) at (A-\fpeval{##1-1});% \fi% }% - \foreach\i in{2,...,#1}{% - \draw[line width=1pt] (A-\fpeval{\i-1}) -- (A-\i);% - }% - % - \draw[line width=1pt,>=latex,->] (A-#1)--(A-\fpeval{#1+1}); - % - \xintFor* ##1 in{\xintSeq{1}{#1}}\do{% - \draw[fill=white,dashed](A-##1) circle (2.5mm) node{##1};% + \foreach\i in{1,...,\the\TotalParcoursTikz}{% + \draw[line width=1pt] (A-\i) -- (A-\fpeval{\i+1});% }% - \foreachitem\compteur\in\ListeRetiens{% - \draw[fill=PfMCouleurSP](A-\ListeRetiens[\compteurcnt]) circle (2.5mm) node{\ref{page-\thePfMMaquette-\ListeRetiens[\compteurcnt]}};% +% % + \draw[line width=1pt,>=latex,->] (A-\the\TotalParcoursTikz)--(A-\fpeval{\the\TotalParcoursTikz+1}); +% % + \ifboolKV[Parcours]{Court}{% + \foreachitem\compteur\in\ListeRetiens{% + \draw[fill=PfMCouleurSP](A-\compteurcnt) circle (2.5mm) node{\ref{page-\thePfMMaquette-\ListeRetiens[\compteurcnt]}};% + }% + }{% + \xintFor* ##1 in{\xintSeq{1}{\the\TotalParcoursTikz}}\do{% + \draw[fill=white,dashed](A-##1) circle (2.5mm) node{##1};% + }% + \foreachitem\compteur\in\ListeRetiens{% + \draw[fill=PfMCouleurSP](A-\ListeRetiens[\compteurcnt]) circle (2.5mm) node{\ref{page-\thePfMMaquette-\ListeRetiens[\compteurcnt]}};% + }% }% \end{tikzpicture}% }% @@ -2195,7 +2419,7 @@ \stepcounter{PfMExo}% \PfMChoixCorrection% \@bsphack% - \immediate\openout \verbatim@out "\jobname-PPEx\thePfMExo.tex" % + \immediate\openout \verbatim@out "\jobname-Ma\thePfMMaquette-PPEx\thePfMExo.tex" % \immediate\write\verbatim@out{\string\begin{exercice}} \let\do\@makeother\dospecials% \catcode`\^^M\active% @@ -2205,23 +2429,25 @@ \def\endexerciceParcoursPerso{\immediate\write\verbatim@out{\string\end{exercice}}\immediate\closeout\verbatim@out\@esphack}% -\NewDocumentEnvironment{exerciceParcours}{so+b}{% +\NewDocumentEnvironment{exerciceParcours}{so}{% \setcounter{PfMAlea}{0}% \setcounter{PfMNbLogo}{1}% + % Mettre les indications hors-jeu + \setcounter{RetiensIndic}{0} \useKVdefault[ClesExercices]% \setKV[ClesExercices]{#2}% + \ifboolKV[Boulot]{Input}{\Relecture}{}% \ifboolKV[ClesExercices]{NonUtilise}{% % Mettre la correction hors-jeu \setKV[ClesExercices]{PasCorrige}% \PfMChoixCorrection% + \begin{PfMHide} }{% \IfBooleanTF{#1}{% \setKV[ClesExercices]{Numerote=false}% }{}% \setKV[ClesExercices]{BaremeTotal=false,BaremeDetaille=false}% - \refstepcounter{PfMSection}% - \PfMChoixCorrection% - \refstepcounter{PfMExo}% + \PfMAvantLesExercices% \ifboolKV[Boulot]{CorrigeSeul}{}{% \PfMChoixTitreSolution% \immediate\write\@auxout{\string\opcopy{\thePfMExo}{\Roman{PfMMaquette}-ParcoursTotalExo}}% @@ -2242,11 +2468,10 @@ label=page-\thePfMMaquette-\thePfMExo ] \ifboolKV[Boulot]{Dys}{\raggedright}{}% - #3 }% }% }{% - \ifboolKV[ClesExercices]{NonUtilise}{}{% + \ifboolKV[ClesExercices]{NonUtilise}{\end{PfMHide}}{% \ifboolKV[Boulot]{CorrigeSeul}{}{% \end{tcolorbox} \PfMApresLesExercices% @@ -2310,17 +2535,158 @@ }% }% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\NewDocumentCommand\PfMScore{m}{% + \immediate\write\@auxout{% + \string\opadd*{#1}{ScoreTotal\thePfMMaquette}{ScoreTotal\thePfMMaquette}% + }% + \num{#1} pt\xintifboolexpr{#1>2 || #1==2}{s}{}% +}% + +\def\PfMMPGrilleCode{% + PapierLargeur=floor(\mpdim{\linewidth}/(5mm)); + color PapierCouleur; + PapierCouleur=0.8white; + % + vardef Papier(expr nb,score)= + path horizon,verticon; + horizon=(0,0)--(PapierLargeur*5mm,0); + verticon=(0,0)--(0,abs(nb)*5mm); + picture Papiers; + Papiers=image( + drawoptions(withcolor PapierCouleur); + for k=0 upto PapierLargeur: + draw verticon shifted((k*5mm,0)); + endfor; + for k=0 upto abs(nb): + draw horizon shifted((0,k*5mm)); + endfor; + drawoptions(); + if nb<0: + path cc,cd,ce; + cd=(unitsquare xscaled (3*5mm) yscaled (abs(nb)*5mm)) shifted(5mm*(PapierLargeur-3,0)); + ce=(unitsquare scaled (2*5mm)) shifted(5mm*(PapierLargeur-2.5,1)); + cc=(unitsquare xscaled (6*5mm) yscaled (2*5mm)) shifted(5mm*(PapierLargeur-10,1)); + fill cd withcolor PapierCouleur; + fill ce withcolor white; + fill cc withcolor white; + %drawoptions(withpen pencircle scaled 1); + draw ce; + draw cc; + draw cd; + draw polygone((0,0),(PapierLargeur*5mm,0),5mm*(PapierLargeur,abs(nb)),5mm*(0,abs(nb))); + if score>0: + label.bot(TEX("\PfMScore{"&decimal(score)&"}"),5mm*(PapierLargeur-1.5,1)); + fi; + fi; + ); + Papiers + enddef; +}% + +\def\PfMPapierCinqCinq#1#2{% + \begin{center} + \ifluatex% + \mplibforcehmode% + \begin{mplibcode}% + \PfMMPGrilleCode + trace Papier(#1,#2); + \end{mplibcode}% + \else% + \begin{mpost}[mpsettings={\PfMMPGrilleCode}] + trace Papier(#1,#2); + \end{mpost}% + \fi% + \end{center} +}% + +\def\PfMMPSeyesCode{% + u:=\useKV[ClesExercices]{EchelleSeyes}*1mm; + PapierLargeur=floor(\mpdim{\linewidth}/(u)); + color PapierCouleur; + PapierCouleur=0.8white;%\useKV[Papiers]{Couleur}; + vardef Seyes(expr nb,score)= + path horizon,verticon; + horizon=(0,0)--u*(PapierLargeur,0); + verticon=(0,0)--u*(0,abs(nb)); + picture PapierSeyes; + PapierSeyes=image( + drawoptions(withcolor PapierCouleur); + for k=0 upto (PapierLargeur): + draw verticon shifted((k*u,0)); + endfor; + for k=0 step 0.25 until abs(nb): + draw horizon shifted((0,k*u)) withpen pencircle scaled 0.5; + endfor; + for k=0 upto abs(nb): + draw horizon shifted((0,k*u)) withpen pencircle scaled 1.25; + endfor; + drawoptions(); + if nb<0: + path cc,cd,ce; + cd=(unitsquare xscaled (2*u) yscaled (abs(nb)*u)) shifted(u*(PapierLargeur-2,0)); + ce=(unitsquare scaled (1*u)) shifted(u*(PapierLargeur-1.5,1)); + cc=(unitsquare xscaled (4*u) yscaled (1*u)) shifted(u*(PapierLargeur-7,1)); + fill cd withcolor PapierCouleur; + fill ce withcolor white; + fill cc withcolor white; + draw cc; + draw cd; + draw ce; + draw polygone((0,0),(PapierLargeur*u,0),u*(PapierLargeur,abs(nb)),u*(0,abs(nb))); + if score>0: + label.bot(TEX("\PfMScore{"&decimal(score)&"}"),u*(PapierLargeur-1,1)); + fi; + fi; + ); + PapierSeyes + enddef; +}% + +\def\PfMPapierSeyes#1#2{% + \begin{center} + \ifluatex% + \mplibforcehmode% + \begin{mplibcode}% + \PfMMPSeyesCode + trace Seyes(#1,#2); + \end{mplibcode}% + \else% + \begin{mpost}[mpsettings={\PfMMPSeyesCode}]% + trace Seyes(#1,#2); + \end{mpost} + \fi% + \end{center} +}% + \NewDocumentCommand\PfMApresLesExercices{}{% \ifboolKV[ClesExercices]{Ligne}{% - % \vspace{\PfMEspaceAvantLignes} - \PfMSetStretch\PfMLignespointilles{\useKV[ClesExercices]{Lignes}}% + \vspace*{\PfMEspaceAvantLignes}% + \PfMSetStretch\PfMLignespointilles{\useKV[ClesExercices]{Lignes}}% \par\vspace*{\PfMEspaceApresLignes}\par% }{}% \par% \ifboolKV[ClesExercices]{Cadres}{% - \begin{PfMtcbEncart}% - % - \end{PfMtcbEncart}% + \begin{PfMtcbEncart}% + % + \end{PfMtcbEncart}% + }{}% + \ifboolKV[ClesExercices]{Grilles}{% + \ifboolKV[ClesExercices]{Cinq}{% + \PfMPapierCinqCinq{\useKV[ClesExercices]{CinqCinq}}{\useKV[ClesExercices]{Score}}% + }{}% + \ifboolKV[ClesExercices]{Huit}{% + \PfMPapierSeyes{\useKV[ClesExercices]{Seyes}}{\useKV[ClesExercices]{Score}}% + }{}% + }{}% + \ifboolKV[ClesExercices]{Profile}{\PfMshowitems}{}% + \ifboolKV[ClesExercices]{ACompleter}{% + \IfHookExistsTF{env/center/begin}{\RemoveFromHook{env/center/begin}[*]}{}% + \IfHookExistsTF{env/center/end}{\RemoveFromHook{env/center/end}[*]}{}% + \IfHookExistsTF{env/itemize/begin}{\RemoveFromHook{env/itemize/begin}[*]}{}% + \IfHookExistsTF{env/itemize/end}{\RemoveFromHook{env/itemize/end}[*]}{}% + \IfHookExistsTF{env/description/begin}{\RemoveFromHook{env/description/begin}[*]}{}% + \IfHookExistsTF{env/description/end}{\RemoveFromHook{env/description/end}[*]}{}% }{}% }% @@ -2329,7 +2695,7 @@ \expandafter\xdef\csname PfMEcrireTitreSol\endcsname{\csname PfMTSol\Roman{PfMExoSol}\endcsname}% \ifx\bla\PfMEcrireTitreSol\bla% \else - \PfMEcrireTitreSol% + ~:~\PfMEcrireTitreSol% \fi% }% @@ -2361,68 +2727,105 @@ \fi% }% -\newbox\PfMBoxSauvegarde% +\NewDocumentCommand\PfMAvantLesExercices{}{% + \ifboolKV[ClesExercices]{AvecIndications}{\setcounter{RetiensIndic}{1}}{}% + \ifboolKV[ClesExercices]{Profile}{\PfMhideitems}{}% + \refstepcounter{PfMSection}% + \PfMChoixCorrection% + \PfMChoixEntrainement% + \refstepcounter{PfMExo}% + \ifboolKV[ClesExercices]{ACompleter}{% + \let\oldenumerate\enumerate% + \let\oldendenumerate\endenumerate% + \let\enumerate\autoenumerate% + \let\endenumerate\endautoenumerate% + \AddToHook{env/center/begin}[Bcenter]{\let\item\olditem}% + \AddToHook{env/center/end}[Ecenter]{\let\item\litem}% + \AddToHook{env/description/begin}[Bdescription]{\let\item\olditem}% + \AddToHook{env/description/end}[Edescription]{\let\item\litem}% + \AddToHook{env/itemize/begin}[Bitemize]{\let\item\olditem}% + \AddToHook{env/itemize/end}[Eitemize]{\let\item\litem}% + }{}% +}% -\NewDocumentEnvironment{exerciceFiche}{so+b}{% +\NewDocumentEnvironment{exerciceFiche}{so}{% \setcounter{PfMAlea}{0}% \setcounter{PfMNbLogo}{1}% + % Mettre les indications hors-jeu + \setcounter{RetiensIndic}{0} \useKVdefault[ClesExercices]% \setKV[ClesExercices]{#2}% + \ifboolKV[Boulot]{Input}{\Relecture}{}% \ifboolKV[ClesExercices]{NonUtilise}{% % Mettre la correction hors-jeu \setKV[ClesExercices]{PasCorrige}% \PfMChoixCorrection% + \begin{PfMHide} }{% \IfBooleanTF{#1}{% \setKV[ClesExercices]{Numerote=false}% }{}% - \ifboolKV[ClesExercices]{Profile}{\PfMhideitems}{}% \colorlet{ColExoFiche}{\useKV[ClesExercices]{Background}}% \colorlet{PfMCadreFiche}{\useKV[ClesExercices]{Cadre}}% \setKV[ClesExercices]{BaremeTotal=false,BaremeDetaille=false}% - \refstepcounter{PfMSection}% - \PfMChoixCorrection% - \refstepcounter{PfMExo}% + \PfMAvantLesExercices% \ifboolKV[Boulot]{CorrigeSeul}{}{% - \PfMChoixTitreSolution% - \PfMChoixHideItemSolution% - \begin{tcolorbox}[% - tikzfiche, - label is label, - label=page-\thePfMMaquette-\thePfMExo - ] - \ifboolKV[Boulot]{Dys}{\raggedright}{}% - % - #3 + \PfMChoixTitreSolution% + \PfMChoixHideItemSolution% + \begin{tcolorbox}[% + tikzfiche, + label is label, + label=page-\thePfMMaquette-\thePfMExo + ] + \ifboolKV[Boulot]{Dys}{\raggedright}{}% }% }% }{% - \ifboolKV[ClesExercices]{NonUtilise}{}{% + \ifboolKV[ClesExercices]{NonUtilise}{\end{PfMHide}}{% \ifboolKV[Boulot]{CorrigeSeul}{}{ \end{tcolorbox}% - \ifboolKV[ClesExercices]{Profile}{\PfMshowitems}{}% + % \ifboolKV[ClesExercices]{Profile}{\PfMshowitems}{}% \PfMApresLesExercices% }% }% }% +%\makeatletter +\NewDocumentCommand\TikzOlympiadesAPMEPCor{m}{% + \ifPfMRectoVerso% + \cleardoublepage% + \else% + \clearpage% + \fi% + \setKV[OlympiadesAPMEP]{#1}% + \begin{tcolorbox}[colback=colLogo] + \begin{Dispo}*{\normalsize\logoapmep{\scale@logo}} + \Large\sffamily \useKV[OlympiadesAPMEP]{Theme} + + (Correction)% + \end{Dispo} + \end{tcolorbox}% +}% +%\makeatother + \NewDocumentEnvironment{exerciceOlympiadesAPMEP}{so}{% \setcounter{PfMAlea}{0}% \setcounter{PfMNbLogo}{1}% + % Mettre les indications hors-jeu + \setcounter{RetiensIndic}{0} \useKVdefault[ClesExercices]% \setKV[ClesExercices]{#2}% + \ifboolKV[Boulot]{Input}{\Relecture}{}% \ifboolKV[ClesExercices]{NonUtilise}{% % Mettre la correction hors-jeu \setKV[ClesExercices]{PasCorrige}% \PfMChoixCorrection% + \begin{PfMHide} }{% \IfBooleanTF{#1}{% \setKV[ClesExercices]{Numerote=false}% }{}% - \ifboolKV[ClesExercices]{Profile}{\PfMhideitems}{}% - \colorlet{ColExoFiche}{\useKV[ClesExercices]{Background}}% - \colorlet{PfMCadreFiche}{\useKV[ClesExercices]{Cadre}}% - \setKV[ClesExercices]{BaremeTotal=false,BaremeDetaille=false}% + \PfMAvantLesExercices% \refstepcounter{PfMSection}% \PfMChoixCorrection% \refstepcounter{PfMExo}% @@ -2438,29 +2841,30 @@ }% }% }{% - \ifboolKV[ClesExercices]{NonUtilise}{}{% + \ifboolKV[ClesExercices]{NonUtilise}{\end{PfMHide}}{% \end{tcolorbox}% - \ifboolKV[ClesExercices]{Profile}{\PfMshowitems}{}% + %\ifboolKV[ClesExercices]{Profile}{\PfMshowitems}{}% \PfMApresLesExercices% - } + }% }% -\NewDocumentEnvironment{exerciceDS}{so+b}{% +\NewDocumentEnvironment{exerciceDS}{so}{% \setcounter{PfMAlea}{0}% + % Mettre les indications hors-jeu + \setcounter{RetiensIndic}{0} \useKVdefault[ClesExercices]% \setKV[ClesExercices]{#2}% + \ifboolKV[Boulot]{Input}{\Relecture}{}% \ifboolKV[ClesExercices]{NonUtilise}{% % Mettre la correction hors-jeu \setKV[ClesExercices]{PasCorrige}% \PfMChoixCorrection% + \begin{PfMHide} }{% \IfBooleanTF{#1}{% \setKV[ClesExercices]{Numerote=false}% }{}% - \ifboolKV[ClesExercices]{Profile}{\PfMhideitems}{}% - \refstepcounter{PfMSection}% - \PfMChoixCorrection% - \refstepcounter{PfMExo}% + \PfMAvantLesExercices \ifboolKV[Boulot]{CorrigeSeul}{}{% \PfMChoixTitreSolution% \immediate\write\@auxout{% @@ -2476,11 +2880,10 @@ label=page-\thePfMMaquette-\thePfMExo ] \ifboolKV[Boulot]{Dys}{\raggedright}{}% - #3 }% }% }{% - \ifboolKV[ClesExercices]{NonUtilise}{}{% + \ifboolKV[ClesExercices]{NonUtilise}{\end{PfMHide}}{% \ifboolKV[Boulot]{CorrigeSeul}{}{% \end{tcolorbox}% \PfMApresLesExercices% @@ -2490,8 +2893,11 @@ \NewDocumentEnvironment{ExerciceRecapBrevet}{so}{% \setcounter{PfMAlea}{0}% + % Mettre les indications hors-jeu + \setcounter{RetiensIndic}{0} \useKVdefault[ClesExercices]% \setKV[ClesExercices]{#2}% + \ifboolKV[Boulot]{Input}{\Relecture}{}% \IfBooleanTF{#1}{% \setKV[ClesExercices]{Numerote=false}% }{}% @@ -2655,8 +3061,11 @@ \newenvironment{exercicePdT}[1][]{% \setcounter{PfMAlea}{0}% \setcounter{PfMNbLogo}{1} + % Mettre les indications hors-jeu + \setcounter{RetiensIndic}{0} \useKVdefault[ClesExercices]% \setKV[ClesExercices]{#1}% + \ifboolKV[Boulot]{Input}{\Relecture}{}% \setKV[ClesExercices]{BaremeTotal=false,BaremeDetaille=false}% \refstepcounter{PfMSection}% \PfMChoixCorrection% @@ -2704,6 +3113,17 @@ \end{tikzpicture}% }% +\NewDocumentCommand\CheminNeutre{m}{% + \setsepchar[*]{,*/}% + \readlist*\ListeCheminVrai{#1}% + \setsepchar{,}% + \begin{tikzpicture}[remember picture,overlay]% + \foreachitem\compteur\in\ListeCheminVrai{% + \draw[cheminPdT] (\ListeCheminVrai[\compteurcnt,1]) to (\ListeCheminVrai[\compteurcnt,2]);% + }% + \end{tikzpicture}% +}% + \NewDocumentCommand\CheminFaux{m}{% \setsepchar[*]{,*/}% \readlist*\ListeCheminVrai{#1}% @@ -2785,8 +3205,11 @@ }% \NewDocumentEnvironment{exerciceKholle}{o}{% + % Mettre les indications hors-jeu + \setcounter{RetiensIndic}{0} \useKVdefault[ClesExercices]% \setKV[ClesExercices]{#1}% + \ifboolKV[Boulot]{Input}{\Relecture}{}% \setKV[ClesExercices]{BaremeTotal=false,BaremeDetaille=false}% \PfMChoixCorrection% \refstepcounter{PfMExo}% @@ -2803,8 +3226,11 @@ \newenvironment{exerciceBase}[1][]{% \setcounter{PfMAlea}{0}% \setcounter{PfMNbLogo}{1} + % Mettre les indications hors-jeu + \setcounter{RetiensIndic}{0} \useKVdefault[ClesExercices] \setKV[ClesExercices]{#1} + \ifboolKV[Boulot]{Input}{\Relecture}{}% \setKV[ClesExercices]{BaremeTotal=false,BaremeDetaille=false} \refstepcounter{PfMExo} \tcolorbox[% @@ -2816,8 +3242,11 @@ \newenvironment{exerciceBaseHTML}[1][]{% \setcounter{PfMAlea}{0}% \setcounter{PfMNbLogo}{1} + % Mettre les indications hors-jeu + \setcounter{RetiensIndic}{0} \useKVdefault[ClesExercices] \setKV[ClesExercices]{#1} + \ifboolKV[Boulot]{Input}{\Relecture}{}% \setKV[ClesExercices]{BaremeTotal=false,BaremeDetaille=false} \refstepcounter{PfMExo} \tcolorbox[% @@ -3083,7 +3512,7 @@ % colframe=PfMCadreFiche, frame hidden, overlay unbroken and first={% - \draw[colLogo,line width=1pt] ([yshift=-10pt]frame.north west)--([yshift=-10pt]frame.north east); + \draw[colLogo,line width=1pt] ([yshift=-12pt]frame.north west)--([yshift=-12pt]frame.north east); \node[% name=A, fill=ColExoFiche, @@ -3311,13 +3740,13 @@ \ifnum\fpeval{\ListeExerciceslen}=1\relax{} \setKVdefault[ClesExercices]{Numerote=false} % \begin{exercice}* - \input{\jobname-PPEx\ListeExercices[1].tex}% + \input{\jobname-Ma\thePfMMaquette-PPEx\ListeExercices[1].tex}% % \end{exercice}% \setKVdefault[ClesExercices]{Numerote} \else \foreach\i in{1,...,\ListeExerciceslen}{% % \begin{exercice} - \input{\jobname-PPEx\ListeExercices[\i].tex}% + \input{\jobname-Ma\thePfMMaquette-PPEx\ListeExercices[\i].tex}% % \end{exercice}% } \fi @@ -3327,10 +3756,10 @@ \TikzFicheCor{#1,Code=\normalsize\Prenom~\Nom}% \readlist*\ListeExercices{\RecapListeExo}% \ifnum\fpeval{\ListeExerciceslen}=1\relax{} - \textbf{Corrigé de l'exercice} : \input{\jobname-PPEx\ListeExercices[1].sol}\par\goodbreak% + \textbf{Corrigé de l'exercice} : \input{\jobname-Ma\thePfMMaquette-PPEx\ListeExercices[1].sol}\par\goodbreak% \else \foreach\i in{1,...,\ListeExerciceslen}{% - \textbf{Corrigé de l'exercice \i} : \input{\jobname-PPEx\ListeExercices[\i].sol}\par\goodbreak% + \textbf{Corrigé de l'exercice \i} : \input{\jobname-Ma\thePfMMaquette-PPEx\ListeExercices[\i].sol}\par\goodbreak% }% \fi% \fi% @@ -3344,7 +3773,7 @@ \TikzFicheCor{#1,Code=\normalsize\Prenom~\Nom}% \readlist*\ListeExercices{\RecapListeExo}% \foreach\i in{1,...,\ListeExerciceslen}{% - \IfFileExists{\jobname-PPEx\ListeExercices[\i].sol}{\textbf{Corrigé de l'exercice \i} : \input{\jobname-PPEx\ListeExercices[\i].sol}\par\goodbreak}{}% + \IfFileExists{\jobname-PPEx\ListeExercices[\i].sol}{\textbf{Corrigé de l'exercice \i} : \input{\jobname-Ma\thePfMMaquette-PPEx\ListeExercices[\i].sol}\par\goodbreak}{}% }% }% }% @@ -3363,14 +3792,6 @@ }{% \ifnum\thePfMMaquette=1\relax% \else% - %\ifnum\PfMFontSize=0\relax% - % \fontsize{10}{\fpeval{1.2*10}}% - %\else\ifnum\PfMFontSize=1\relax% - % \fontsize{11}{\fpeval{1.2*11}}% - % \else% - % \fontsize{12}{\fpeval{1.2*12}}% - % \fi% - %\fi% \fontsize{\fpeval{10+\PfMFontSize}}{\fpeval{1.2*(10+\PfMFontSize)}}% \selectfont% \renewcommand{\JustifyingParindent}{\parindent} @@ -3395,9 +3816,17 @@ }% %% Pour factoriser l'appel aux corrections dans l'environnement Maquette +\makeatletter \NewDocumentCommand\PfMPrepareCorrection{m}{% \useKVdefault[Boulot]% \setKV[Boulot]{#1}% + \if@CAN + \ifnum\thepage<5\relax + \xintFor* ##1 in{\xintSeq{1}{\fpeval{5-\thepage}}}\do{% + ~\clearpage% + }% + \fi% + \fi% \if@Dyslexie% \setKV[Boulot]{Dys}% \fi% @@ -3405,6 +3834,7 @@ \setlength{\columnseprule}{\useKV[Boulot]{Epaisseur}}% \PfMChangerTailleCorrection% }% +\makeatletter \NewDocumentCommand\PfMAffichageCorrectionColonnes{}{% \ifboolKV[Boulot]{CorrectionColonnes}{\begin{multicols}{\useKV[Boulot]{Colonnes}}}{}% @@ -3418,9 +3848,63 @@ \ifboolKV[Boulot]{CorrectionColonnes}{\end{multicols}}{}% }% +% GameBook +\tcbset{% + userlivreheros/.style={% + spread upwards=-1cm,colback=Ivory,colframe=black!25!Ivory% + }% +}% + +\setKVdefault[LivreHeros]{Theme=Les nombres décimaux} + +\NewDocumentCommand\vaen{m}{\ref{#1}}% + +\NewDocumentCommand\TikzLivreHeros{}{% + \begin{tcolorbox}[userlivreheros]% + \begin{center} + \Large\sffamily \useKV[LivreHeros]{Theme} + \end{center} + \end{tcolorbox}% +}% + +\tcbset{% + tikzLH/.style={% + before skip=1em, + enhanced, + coltitle=black, + colbacktitle=black!10!Ivory, + colframe=white, + colback=white, + attach boxed title to top center={yshift=-2mm}, + label is label + }% +}% + +\newcounter{PfMGameBook}[PfMMaquette] +\setcounter{PfMGameBook}{0} + +\makeatletter +\def\ExoGBWrite{% + \setcounter{PfMAlea}{0}% + \PfMChoixCorrection% + \stepcounter{PfMExo}% + \immediate\write\@auxout{% + \string\opcopy{\thePfMExo}{TotalExo}% + }% + \@bsphack% + \immediate\openout \verbatim@out "\jobname-Ma\thePfMMaquette-Ex\thePfMExo.gb"% + \let\do\@makeother\dospecials% + \catcode`\^^M\active% + \def\verbatim@processline{\immediate\write\verbatim@out{\the\verbatim@line}}% + \verbatim@start}% +\def\endExoGBWrite{\immediate\closeout\verbatim@out\@esphack}% +\makeatother +%%%% + %%%%%%%%%%%%%%% Debut Maquette %%%%%%% % Environnement englobant le tout. \makeatletter +\newwrite\PfMfile@out% \NewDocumentEnvironment{Maquette}{om}{% % on remet à zéro les compteurs de solutions : inutile ? \setcounter{RetiensSol}{0}% @@ -3431,10 +3915,21 @@ \setcounter{PfMSOS}{0}% % nouvelles valeurs. \stepcounter{PfMMaquette}% + \immediate\write\@auxout{% + \string\opcopy{0}{ScoreTotal\thePfMMaquette} + }% + %%\opadd*{#1}{ScoreTotal\thePfMMaquette}{ScoreTotal\thePfMMaquette}% + \if@AssembleCorrections + \immediate\openout\PfMfile@out \jobname-DefiMq-\thePfMMaquette.tex% + \immediate\write\PfMfile@out{\unexpanded{\useKVdefault[Boulot]}}% + \immediate\write\PfMfile@out{\unexpanded{\setKV[Boulot]{#1}}}% + \immediate\write\PfMfile@out{\TikzFicheCor{\unexpanded{#2}}}% + \immediate\closeout\PfMfile@out% + \fi % options de boulot \IfHookExistsTF{env/Maquette/after}{\RemoveFromHook{env/Maquette/after}[*]}{}% - %\IfHookExistsTF{env/exercice/after}{\RemoveFromHook{env/exercice/after}[*]}{}% - % \AddToHook{env/exercice/after}[ChoixExo]{\PfMChoixAffichageCorrection}% + \AddToHook{env/Maquette/after}[RetiensExo]{\xdef\PfMRetiensLienExoMa{\PfMRetiensLienExoMa,\thePfMExo}} + %-------------- \useKVdefault[Boulot]% \setKV[Boulot]{#1}% \ifboolKV[Boulot]{CorrigeSeul}{\setKV[Boulot]{CorrigeFin}}{}% @@ -3442,32 +3937,34 @@ \setKV[Boulot]{Dys} \fi \PfMBasculeDys% - \IfHookExistsTF{env/exercice/after}{\RemoveFromHook{env/exercice/after}[*]\AddToHook{env/exercice/after}[ChoixExo]{\PfMChoixAffichageCorrection}}{\AddToHook{env/exercice/after}[ChoixExo]{\PfMChoixAffichageCorrection}}% + \IfHookExistsTF{env/exercice/after}{\RemoveFromHook{env/exercice/after}[*]\AddToHook{env/exercice/after}[ChoixExo]{\PfMChoixAffichageCorrection\PfMChoixAffichageEntrainement}}{\AddToHook{env/exercice/after}[ChoixExo]{\PfMChoixAffichageCorrection\PfMChoixAffichageEntrainement}}% % Test \IfHookExistsTF{env/exercice/begin}{\RemoveFromHook{env/exercice/begin}[*]}{}% \IfHookExistsTF{env/Maquette/end}{\RemoveFromHook{env/Maquette/end}[*]}{}% \ifboolKV[Boulot]{OlympiadesAPMEP}{% - \setKV[OlympiadesAPMEP]{#2}%\TikzOlympiadesAPMEP% - \let\exercice\exerciceOlympiadesAPMEP\let\endexercice\endexerciceOlympiadesAPMEP% - \ifboolKV[Boulot]{CorrigeFin}{% - \AddToHook{env/Maquette/after}[Correction]{% - \PfMPrepareCorrection{#1}% - \PfMAffichageCorrectionColonnes% - }% - }{}% - }{% - \ifboolKV[Boulot]{CAN}{% + % \input{PfMMaquetteOlympAPMEP}% + \setKV[OlympiadesAPMEP]{#2}%\TikzOlympiadesAPMEP% + \let\exercice\exerciceOlympiadesAPMEP\let\endexercice\endexerciceOlympiadesAPMEP% + \ifboolKV[Boulot]{CorrigeFin}{% + \AddToHook{env/Maquette/after}[Correction]{% + \PfMPrepareCorrection{#1}% + \TikzOlympiadesAPMEPCor{#2}% + \PfMAffichageCorrectionColonnes% + }% + }{}% + }{% + \ifboolKV[Boulot]{CAN}{% + % \input{PfMMaquetteCAN.tex} \setKV[CAN]{#2}% - %\ifboolKV[Boulot]{CorrigeSeul}{}{\TikzCAN}% \setcounter{PfMCNNumQ}{0}% \setlength{\PfMLargeurQuestion}{\useKV[CAN]{CoefQ}\linewidth}\setlength{\PfMLargeurReponse}{\useKV[CAN]{CoefR}\linewidth}\setlength{\PfMLargeurJury}{\useKV[CAN]{CoefJ}\linewidth}% \let\exercice\ExoCANWrite\let\endexercice\endExoCANWrite% \AddToHook{env/exercice/begin}{\setcounter{PfMAlea}{0}}% \AddToHook{env/Maquette/end}{% - \xdef\PfMAncienneGraine{\PfMChoisisGraineAlea{123456789}} + \xdef\PfMAncienneGraine{\PfMChoisisGraineAlea{123456789}}% \xdef\PfMCANTotalExo{\thePfMExo}% \setbox\PfMSauvegardeBox\vbox{% - \PfMGraineAlea{\thePfMMaquette} + \PfMGraineAlea{\thePfMMaquette}% \setcounter{PfMExo}{0}% \renewcommand{\arraystretch}{2}% \begin{longtable}{|c|m{\PfMLargeurQuestion}|>{\centering\arraybackslash}m{\PfMLargeurReponse}|m{\PfMLargeurJury}|}% @@ -3476,21 +3973,21 @@ \hline% \endhead% \xintFor* ##1 in {\xintSeq{1}{\PfMCANTotalExo}}\do{% - \refstepcounter{PfMCNNumQ}\ttfamily{\thePfMCNNumQ}\label{TestCAN-\thePfMCNNumQ}&\Complement{}\stepcounter{PfMExo}\setcounter{PfMAlea}{0}\input{\jobname-Ex##1.can}&\CNReponse&\\ + \refstepcounter{PfMCNNumQ}\ttfamily{\thePfMCNNumQ}\label{TestCAN-\thePfMCNNumQ}&\Complement{}\stepcounter{PfMExo}\setcounter{PfMAlea}{0}\input{\jobname-Ma\thePfMMaquette-Ex##1.can}&\CNReponse&\\ \hline% }% \end{longtable}% \renewcommand{\arraystretch}{1}% - } + }% \ifboolKV[Boulot]{CorrigeInverse}{% - \PfMPrepareCorrection{#1}% - \TikzCANCor{#2}% - \PfMAffichageCorrectionColonnes% - \clearpage - \normalsize% - \TikzCAN% - \PfMGraineAlea{\thePfMMaquette}% - \setcounter{PfMCNNumQ}{0}% + \PfMPrepareCorrection{#1}% + \TikzCANCor{#2}% + \PfMAffichageCorrectionColonnes% + \clearpage + \normalsize% + \TikzCAN% + \PfMGraineAlea{\thePfMMaquette}% + \setcounter{PfMCNNumQ}{0}% \setcounter{PfMExo}{0}% \renewcommand{\arraystretch}{2}% \begin{longtable}{|c|m{\PfMLargeurQuestion}|>{\centering\arraybackslash}m{\PfMLargeurReponse}|m{\PfMLargeurJury}|}% @@ -3499,7 +3996,7 @@ \hline% \endhead% \xintFor* ##1 in {\xintSeq{1}{\PfMCANTotalExo}}\do{% - \refstepcounter{PfMCNNumQ}\ttfamily{\thePfMCNNumQ}\label{TestCAN-\thePfMCNNumQ}&\Complement{}\stepcounter{PfMExo}\setcounter{PfMAlea}{0}\input{\jobname-Ex##1.can}&\CNReponse&\\ + \refstepcounter{PfMCNNumQ}\ttfamily{\thePfMCNNumQ}\label{TestCAN-\thePfMCNNumQ}&\Complement{}\stepcounter{PfMExo}\setcounter{PfMAlea}{0}\input{\jobname-Ma\thePfMMaquette-Ex##1.can}&\CNReponse&\\ \hline% }% \end{longtable}% @@ -3508,7 +4005,7 @@ \PfMGraineAlea{\PfMAncienneGraine}% \TikzCAN% \setcounter{PfMCNNumQ}{0}% - \setcounter{PfMExo}{0}% + \setcounter{PfMExo}{0}% \renewcommand{\arraystretch}{2}% \begin{longtable}{|c|m{\PfMLargeurQuestion}|>{\centering\arraybackslash}m{\PfMLargeurReponse}|m{\PfMLargeurJury}|}% \hhline{~---}% @@ -3516,233 +4013,276 @@ \hline% \endhead% \xintFor* ##1 in {\xintSeq{1}{\PfMCANTotalExo}}\do{% - \refstepcounter{PfMCNNumQ}\ttfamily{\thePfMCNNumQ}\label{TestCAN-\thePfMCNNumQ}&\Complement{}\stepcounter{PfMExo}\setcounter{PfMAlea}{0}\input{\jobname-Ex##1.can}&\CNReponse&\\ + \refstepcounter{PfMCNNumQ}\ttfamily{\thePfMCNNumQ}\label{TestCAN-\thePfMCNNumQ}&\Complement{}\stepcounter{PfMExo}\setcounter{PfMAlea}{0}\input{\jobname-Ma\thePfMMaquette-Ex##1.can}&\CNReponse&\\ \hline% }% \end{longtable}% \renewcommand{\arraystretch}{1}% - \ifboolKV[Boulot]{CorrigeFin}{\ifboolKV[Boulot]{CorrigeInverse}{}{\clearpage - \PfMPrepareCorrection{#1}% - \TikzCANCor{#2}% - \PfMAffichageCorrectionColonnes% - } - }{} - } + \ifboolKV[Boulot]{CorrigeFin}{% + \ifboolKV[Boulot]{CorrigeInverse}{}{% + \clearpage + \PfMPrepareCorrection{#1}% + \TikzCANCor{#2}% + \PfMAffichageCorrectionColonnes% + }% + }{}% + }% }% }{% \ifboolKV[Boulot]{FdR}{% - \ifboolKV[Boulot]{CorrigeSeul}{}{% - \setKV[FdR]{#2}\TikzFdR% - } - \let\exercice\exerciceFdR\let\endexercice\endexerciceFdR% - \ifboolKV[Boulot]{AvecEntrainement}{% - \AddToHook{env/Maquette/end}[Haltere]{% - \PfMAffichageEntrainementColonnes% - }% - }{}% - \ifboolKV[Boulot]{CorrigeFin}{% - \AddToHook{env/Maquette/after}[Correction]{% - \PfMPrepareCorrection{#1}% - \TikzFdRCor{#2}% - \PfMAffichageCorrectionColonnes + % \input{PfMMaquetteFdR.tex}% + \ifboolKV[Boulot]{CorrigeSeul}{}{% + \setKV[FdR]{#2}\TikzFdR% }% - }{}% - }{% - \ifboolKV[Boulot]{Contrat}{% - \ifboolKV[Boulot]{CorrigeSeul}{}{% - \setKV[Contrat]{#2}\TikzContrat% - } - \let\exercice\exerciceContrat\let\endexercice\endexerciceContrat% - \ifboolKV[Boulot]{AvecEntrainement}{% - \AddToHook{env/Maquette/end}[Haltere]{% - \PfMAffichageEntrainementColonnes% - }% - }{}% - \ifboolKV[Boulot]{CorrigeFin}{% + \let\exercice\exerciceFdR\let\endexercice\endexerciceFdR% + \ifboolKV[Boulot]{AvecEntrainement}{% + \AddToHook{env/Maquette/end}[Haltere]{% + \PfMAffichageEntrainementColonnes% + }% + }{}% + \ifboolKV[Boulot]{CorrigeFin}{% \AddToHook{env/Maquette/after}[Correction]{% \PfMPrepareCorrection{#1}% - \TikzContratCor{#2}% - \PfMAffichageCorrectionColonnes% - }% - }{}% - }{% - \ifboolKV[Boulot]{Cours}{% - \setKV[Cours]{#2}% - \TikzCours% - \let\exercice\exerciceFiche\let\endexercice\endexerciceFiche% - \ifboolKV[Boulot]{CorrigeFin}{% - \AddToHook{env/Maquette/after}[Correction]{% - \PfMPrepareCorrection{#1}% - \TikzFicheCor{#2}% - \PfMAffichageCorrectionColonnes - }% - }{}% - }{% - \ifboolKV[Boulot]{RecapBrevet}{% - \setKV[RecapBrevet]{#2}% - \TikzRecapBrevet% - \let\exercice\ExerciceRecapBrevet\let\endexercice\endExerciceRecapBrevet% - \ifboolKV[Boulot]{CorrigeFin}{% - \AddToHook{env/Maquette/after}[Correction]{% - \PfMPrepareCorrection{#1}% - \TikzRecapBrevetCor{#2}% - \PfMAffichageCorrectionColonnes% - }% - }{}% - }{% - \ifboolKV[Boulot]{ParcoursPerso}{% - \setKV[ParcoursPerso]{#2}% - \DTLloaddb[noheader,keys={PrenomEleve,NomEleve,ListeExo}]{dataperso}{\useKV[ParcoursPerso]{Fichier}.csv}% - \let\exercice\exerciceParcoursPerso\let\endexercice\endexerciceParcoursPerso% - \ifboolKV[Boulot]{CorrigeFin}{\setcounter{PfMCorrigeParcoursPerso}{1}}{}% - \setcounter{PfMExo}{0}% - \AtEndDocument{% - \Recapitulatif{#1}{#2}% - }% - }{% - \ifboolKV[Boulot]{Parcours}{% - \ifboolKV[Boulot]{CorrigeSeul}{}{% - \setKV[Parcours]{#2}\TikzParcours% - } - \let\exercice\exerciceParcours\let\endexercice\endexerciceParcours% - \ifboolKV[Boulot]{AvecEntrainement}{% - \AddToHook{env/Maquette/end}[Haltere]{% - \PfMAffichageEntrainementColonnes% - }% - }{}% - \ifboolKV[Boulot]{CorrigeFin}{% - \AddToHook{env/Maquette/after}[Correction]{% - \PfMPrepareCorrection{#1}% - \TikzParcoursCor{#2} - \PfMAffichageCorrectionColonnes - }% + \TikzFdRCor{#2}% + \PfMAffichageCorrectionColonnes% + }% }{}% }{% - \ifboolKV[Boulot]{PdT}{% - \ifboolKV[Boulot]{CorrigeSeul}{}{% - \setKV[PdT]{#2}\TikzPdT% - } - \let\exercice\exercicePdT\let\endexercice\endexercicePdT% + \ifboolKV[Boulot]{Contrat}{% + % \input{PfMMaquetteContrat.tex}% + \ifboolKV[Boulot]{CorrigeSeul}{}{% + \setKV[Contrat]{#2}\TikzContrat% + }% + \let\exercice\exerciceContrat\let\endexercice\endexerciceContrat% + \ifboolKV[Boulot]{AvecEntrainement}{% + \AddToHook{env/Maquette/end}[Haltere]{% + \PfMAffichageEntrainementColonnes% + }% + }{}% \ifboolKV[Boulot]{CorrigeFin}{% - \AddToHook{env/Maquette/after}[Correction]{% - \PfMPrepareCorrection{#1}% - \TikzPdTCor{#2}% - \PfMAffichageCorrectionColonnes% + \AddToHook{env/Maquette/after}[Correction]{% + \PfMPrepareCorrection{#1}% + \TikzContratCor{#2}% + \PfMAffichageCorrectionColonnes% }% }{}% }{% - \ifboolKV[Boulot]{DM}{% - \ifboolKV[Boulot]{CorrigeSeul}{}{% - \setKV[DM]{#2}\TikzDM% - } - \let\exercice\exerciceDM\let\endexercice\endexerciceDM% + \ifboolKV[Boulot]{Cours}{% + % \input{PfMMaquetteCours.tex}% + \setKV[Cours]{#2}% + \TikzCours% + \let\exercice\exerciceFiche\let\endexercice\endexerciceFiche% \ifboolKV[Boulot]{CorrigeFin}{% - \AddToHook{env/Maquette/after}[Correction]{% - \PfMPrepareCorrection{#1}% - \TikzDMCor{#2}% - \PfMAffichageCorrectionColonnes% + \AddToHook{env/Maquette/after}[Correction]{% + \PfMPrepareCorrection{#1}% + \TikzFicheCor{#2}% + \PfMAffichageCorrectionColonnes% }% }{}% }{% - \ifboolKV[Boulot]{Fiche}{% - \ifboolKV[Boulot]{CorrigeSeul}{}{% - \setKV[Fiche]{#2}% - \TikzFiche% + \ifboolKV[Boulot]{RecapBrevet}{% + % \input{PfMMaquetteRecapBrevet.tex}% + \setKV[RecapBrevet]{#2}% + \TikzRecapBrevet% + \let\exercice\ExerciceRecapBrevet\let\endexercice\endExerciceRecapBrevet% + \ifboolKV[Boulot]{CorrigeFin}{% + \AddToHook{env/Maquette/after}[Correction]{% + \PfMPrepareCorrection{#1}% + \TikzRecapBrevetCor{#2}% + \PfMAffichageCorrectionColonnes% }% - \let\exercice\exerciceFiche\let\endexercice\endexerciceFiche% - \ifboolKV[Boulot]{AvecEntrainement}{% + }{}% + }{% + \ifboolKV[Boulot]{ParcoursPerso}{% + % \input{PfMMaquetteParcoursPerso.tex}% + \setKV[ParcoursPerso]{#2}% + \DTLloaddb[noheader,keys={PrenomEleve,NomEleve,ListeExo}]{dataperso}{\useKV[ParcoursPerso]{Fichier}.csv}% + \let\exercice\exerciceParcoursPerso\let\endexercice\endexerciceParcoursPerso% + \ifboolKV[Boulot]{CorrigeFin}{\setcounter{PfMCorrigeParcoursPerso}{1}}{}% + \setcounter{PfMExo}{0}% + \AtEndDocument{% + \Recapitulatif{#1}{#2}% + }% + }{% + \ifboolKV[Boulot]{Parcours}{% + % \input{PfMMaquetteParcours.tex}% + \ifboolKV[Boulot]{CorrigeSeul}{}{% + \setKV[Parcours]{#2}\TikzParcours% + }% + \let\exercice\exerciceParcours\let\endexercice\endexerciceParcours% + \ifboolKV[Boulot]{AvecEntrainement}{% \AddToHook{env/Maquette/end}[Haltere]{% \PfMAffichageEntrainementColonnes% }% }{}% - \ifboolKV[Boulot]{CorrigeFin}{% - \ifboolKV[Boulot]{CorrigeAll}{% - \AddToHook{env/Maquette/after}[Correction]{% - \PfMPrepareCorrection{#1}% - \TikzFicheCor{#2}% - \ifboolKV[Boulot]{CorrectionColonnes}{\begin{multicols}{\useKV[Boulot]{Colonnes}}}{}% - \xintFor* ##1 in{\xintSeq{1}{\thePfMExo}}\do{% - \IfFileExists{\jobname-Ex##1.sol}{\textbf{Corrigé de l'exercice ##1}\par\nopagebreak\input{\jobname-Ex##1.sol}\par\goodbreak}{}% - }% - \ifboolKV[Boulot]{CorrectionColonnes}{\end{multicols}}{}% - \TikzFicheCorRep{#2}% - \ifboolKV[Boulot]{CorrectionColonnes}{\begin{multicols}{\useKV[Boulot]{Colonnes}}}{}% - \xintFor* ##1 in{\xintSeq{1}{\thePfMExo}}\do{% - \IfFileExists{\jobname-Ex##1.rep}{\textbf{Réponse(s) de l'exercice ##1}\par\nopagebreak\input{\jobname-Ex##1.rep}\par\goodbreak}{}% - }% - \ifboolKV[Boulot]{CorrectionColonnes}{\end{multicols}}{}% - \TikzFicheCorInd{#2}% - \ifboolKV[Boulot]{CorrectionColonnes}{\begin{multicols}{\useKV[Boulot]{Colonnes}}}{}% - \xintFor* ##1 in{\xintSeq{1}{\thePfMExo}}\do{% - \IfFileExists{\jobname-Ex##1.cdp}{\textbf{Indice(s) pour l'exercice ##1}\par\nopagebreak\input{\jobname-Ex##1.cdp}\par\goodbreak}{}% - }% - \ifboolKV[Boulot]{CorrectionColonnes}{\end{multicols}}{}% - }% - }{% - \AddToHook{env/Maquette/after}[Correction]{% - \useKVdefault[Boulot]% - \setKV[Boulot]{#1}% - %% - \if@Dyslexie - \setKV[Boulot]{Dys} - \fi - \PfMBasculeDys% - \setlength{\columnseprule}{\useKV[Boulot]{Epaisseur}}% - \TikzFicheCor{#2}% - \PfMChangerTailleCorrection% - \ifboolKV[Boulot]{CorrectionColonnes}{\begin{multicols}{\useKV[Boulot]{Colonnes}}}{}% - \PfMAffichageCorrige% - \ifboolKV[Boulot]{CorrectionColonnes}{\end{multicols}}{}% - }% - }% - }{}% - }{% - \ifboolKV[Boulot]{DS}{% - \ifboolKV[Boulot]{CorrigeSeul}{}{% - \setKV[DS]{#2}\TikzDS% - }% - \let\exercice\exerciceDS\let\endexercice\endexerciceDS% - \ifboolKV[Boulot]{BaremeComplet}{% - \begin{center} - \TableauRecapitulatif - \end{center} - }{}% - \ifboolKV[Boulot]{CorrigeFin}{% + \ifboolKV[Boulot]{CorrigeFin}{% \AddToHook{env/Maquette/after}[Correction]{% - \PfMPrepareCorrection{#1} - \TikzDSCor{#2}% + \PfMPrepareCorrection{#1}% + \TikzParcoursCor{#2}% \PfMAffichageCorrectionColonnes% - }% - }{}% - }{% - \ifboolKV[Boulot]{IE}{% - \ifboolKV[Boulot]{CorrigeSeul}{}{% - \setKV[IE]{#2}\TikzIE% - } - \let\exercice\exerciceDS\let\endexercice\endexerciceDS%On garde exerciceDS - \ifboolKV[Boulot]{CorrigeFin}{% - \AddToHook{env/Maquette/after}[Correction]{% - \PfMPrepareCorrection{#1} - \TikzIECor{#2}% - \PfMAffichageCorrectionColonnes }% }{}% }{% - \ifboolKV[Boulot]{Kholle}{% - \setKV[Kholle]{#2}% - \TikzKholle% - \let\exercice\exerciceKholle\let\endexercice\endexerciceKholle% - \ifboolKV[Kholle]{CR}{}{% + \ifboolKV[Boulot]{PdT}{% + % \input{PfMMaquettePdT.tex}% + \ifboolKV[Boulot]{CorrigeSeul}{}{% + \setKV[PdT]{#2}\TikzPdT% + }% + \let\exercice\exercicePdT\let\endexercice\endexercicePdT% + \ifboolKV[Boulot]{CorrigeFin}{% + \AddToHook{env/Maquette/after}[Correction]{% + \PfMPrepareCorrection{#1}% + \TikzPdTCor{#2}% + \PfMAffichageCorrectionColonnes% + }% + }{}% + }{% + \ifboolKV[Boulot]{DM}{% + % \input{PfMMaquetteDM.tex}% + \ifboolKV[Boulot]{CorrigeSeul}{}{% + \setKV[DM]{#2}\TikzDM% + }% + \let\exercice\exerciceDM\let\endexercice\endexerciceDM% \ifboolKV[Boulot]{CorrigeFin}{% \AddToHook{env/Maquette/after}[Correction]{% - \TikzKholleCor{#2}% - \TikzKholleCor{#2}% - \TikzKholleCor{#2}% - \PfMAffichageCorrige% + \PfMPrepareCorrection{#1}% + \TikzDMCor{#2}% + \PfMAffichageCorrectionColonnes% }% }{}% + }{% + \ifboolKV[Boulot]{Fiche}{% + \ifboolKV[Boulot]{CorrigeSeul}{}{% + \setKV[Fiche]{#2}% + \TikzFiche% + }% + \let\exercice\exerciceFiche\let\endexercice\endexerciceFiche% + \ifboolKV[Boulot]{AvecEntrainement}{% + \AddToHook{env/Maquette/end}[Haltere]{% + \PfMAffichageEntrainementColonnes% + }% + }{}% + \ifboolKV[Boulot]{CorrigeFin}{% + \ifboolKV[Boulot]{CorrigeAll}{% + \AddToHook{env/Maquette/after}[Correction]{% + \PfMPrepareCorrection{#1}% + \TikzFicheCor{#2}% + \ifboolKV[Boulot]{CorrectionColonnes}{\begin{multicols}{\useKV[Boulot]{Colonnes}}}{}% + \xintFor* ##1 in{\xintSeq{1}{\thePfMExo}}\do{% + \IfFileExists{\jobname-Ma\thePfMMaquette-Ex##1.sol}{\textbf{Corrigé de l'exercice ##1}\par\nopagebreak\input{\jobname-Ma\thePfMMaquette-Ex##1.sol}\par\goodbreak}{}% + }% + \ifboolKV[Boulot]{CorrectionColonnes}{\end{multicols}}{}% + \TikzFicheCorRep{#2}% + \ifboolKV[Boulot]{CorrectionColonnes}{\begin{multicols}{\useKV[Boulot]{Colonnes}}}{}% + \xintFor* ##1 in{\xintSeq{1}{\thePfMExo}}\do{% + \IfFileExists{\jobname-Ma\thePfMMaquette-Ex##1.rep}{\textbf{Réponse(s) de l'exercice ##1}\par\nopagebreak\input{\jobname-Ma\thePfMMaquette-Ex##1.rep}\par\goodbreak}{}% + }% + \ifboolKV[Boulot]{CorrectionColonnes}{\end{multicols}}{}% + \TikzFicheCorInd{#2}% + \ifboolKV[Boulot]{CorrectionColonnes}{\begin{multicols}{\useKV[Boulot]{Colonnes}}}{}% + \xintFor* ##1 in{\xintSeq{1}{\thePfMExo}}\do{% + \IfFileExists{\jobname-Ma\thePfMMaquette-Ex##1.cdp}{\textbf{Indice(s) pour l'exercice ##1}\par\nopagebreak\input{\jobname-Ma\thePfMMaquette-Ex##1.cdp}\par\goodbreak}{}% + }% + \ifboolKV[Boulot]{CorrectionColonnes}{\end{multicols}}{}% + }% + }{% + \AddToHook{env/Maquette/after}[Correction]{% +% \useKVdefault[Boulot]% +% \setKV[Boulot]{#1}% +% %% +% \if@Dyslexie +% \setKV[Boulot]{Dys}% +% \fi +% \PfMBasculeDys% +% \setlength{\columnseprule}{\useKV[Boulot]{Epaisseur}}% + \if@AssembleCorrections + \else + \PfMPrepareCorrection{#1}% + \TikzFicheCor{#2}% + \PfMAffichageCorrectionColonnes% + \fi% + }% + }% + }{}% + }{% + \ifboolKV[Boulot]{DS}{% + % \input{PfMMaquetteDS.tex}% + \ifboolKV[Boulot]{CorrigeSeul}{}{% + \setKV[DS]{#2}\TikzDS% + }% + \let\exercice\exerciceDS\let\endexercice\endexerciceDS% + \ifboolKV[Boulot]{BaremeComplet}{% + \begin{center} + \TableauRecapitulatif + \end{center} + }{}% + \ifboolKV[Boulot]{CorrigeFin}{% + \AddToHook{env/Maquette/after}[Correction]{% + \PfMPrepareCorrection{#1}% + \TikzDSCor{#2}% + \PfMAffichageCorrectionColonnes% + }% + }{}% + }{% + \ifboolKV[Boulot]{IE}{% + % \input{PfMMaquetteIE.tex}% + \ifboolKV[Boulot]{CorrigeSeul}{}{% + \setKV[IE]{#2}\TikzIE% + }% + \let\exercice\exerciceDS\let\endexercice\endexerciceDS%On garde exerciceDS + \ifboolKV[Boulot]{CorrigeFin}{% + \AddToHook{env/Maquette/after}[Correction]{% + \PfMPrepareCorrection{#1}% + \TikzIECor{#2}% + \PfMAffichageCorrectionColonnes% + }% + }{}% + }{% + \ifboolKV[Boulot]{Kholle}{% + % \input{PfMMaquetteKholle.tex}% + \setKV[Kholle]{#2}% + \TikzKholle% + \let\exercice\exerciceKholle\let\endexercice\endexerciceKholle% + \ifboolKV[Kholle]{CR}{}{% + \ifboolKV[Boulot]{CorrigeFin}{% + \AddToHook{env/Maquette/after}[Correction]{% + \TikzKholleCor{#2}% + \TikzKholleCor{#2}% + \TikzKholleCor{#2}% + \PfMAffichageCorrige% + }% + }{}% + }% + }{% + \ifboolKV[Boulot]{LivreHeros}{% + \setKV[LivreHeros]{#2}% + \TikzLivreHeros% + \let\exercice\ExoGBWrite\let\endexercice\endExoGBWrite% + \AddToHook{env/Maquette/end}{% + \xdef\PfMListeExoGB{}% + \xintFor* ##1 in{\xintSeq{2}{\thePfMExo}}\do{% + \xdef\PfMListeExoGB{\PfMListeExoGB,##1}% + }% + \MelangeListe{\PfMListeExoGB}{\fpeval{\thePfMExo-1}}% + \xdef\PfMFooMelange{1,\faa}% + \setsepchar{,}\ignoreemptyitems\readlist*\ListePerm{\PfMFooMelange}\reademptyitems% + \phantomsection{} + \addcontentsline{toc}{section}{\useKV[LivreHeros]{Theme}}% + \xintFor* ##1 in{\xintSeq{1}{\thePfMExo}}\do{% + \itemtomacro\ListePerm[##1]\PfMPermute% + \begin{tcolorbox}[tikzLH,title=##1]% + \refstepcounter{PfMGameBook}% + \input{\jobname-Ma\thePfMMaquette-Ex\PfMPermute.gb}% + \end{tcolorbox}% + }% + }% + }{}% + }% + }% + }% + }% }% - }{}% + }% }% }% }% @@ -3751,11 +4291,6 @@ }% }% }% -}% -}% -}% -}% -}% }{}% \makeatother %D'après JCC @@ -4391,8 +4926,9 @@ \BaremeEspaceMarge{-82pt} } -\AddToHook{env/multicols/begin}{\setcounter{Nbcolonnes}{2}}% -\AddToHook{env/multicols/after}{\setcounter{Nbcolonnes}{4}}% +%\AddToHook{env/multicols/begin}{\setcounter{Nbcolonnes}{2}}% +%\AddToHook{env/multicols/after}{\setcounter{Nbcolonnes}{4}}% + \NewDocumentEnvironment{Dispo}{sm+b}{% \ifPfMDeuxColonnes \IfBooleanTF{#1}{% @@ -4468,4 +5004,114 @@ }% \fi% \end{align*} +}{}% + +\def\RetiensEchelle{1cm} +\def\ChoixNbQuestions{3} +\makeatletter +\if@CAN + \AddToHook{env/document/before}{% + \ProvidesPackage{ProfMaquette}[Mode CAN (CP)]% + \RequirePackage{pgfmorepages} + \pgfmorepagesloadextralayouts + \pgfpagesuselayout{4 on 2, book format}[a4paper,landscape] + } +\fi + +\if@Revision + \AddToHook{env/document/before}{% + \ProvidesPackage{ProfMaquette}[Mode Revision (CP)]% + \setcounter{Nbcolonnes}{2}% + \def\RetiensEchelle{0.5cm} + \RequirePackage{pgfmorepages} + \pgfmorepagesloadextralayouts + \pgfpagesuselayout{4 on 2, book format}[a4paper] + } +\fi + +\if@Personnel + \input{PfMPerso.cfg} +\fi +\makeatother + +% enumitem obligatoire ^^ +\RequirePackage{enumitem} +% d'après https://tex.stackexchange.com/questions/164613/adding-code-at-the-end-of-each-list-item +\newif\iffirstlegal\firstlegalfalse% We need a toggle to track whether the item is first in the list or not + +\newlist{Test}{enumerate}{3} + +\def\PfMPar{\par} + +\NewDocumentCommand\litem{}{} + +\let\olditem\item% save the standard definition of \item in a macro, \olditem + +\setlist[Test,1]{% + leftmargin=*, + label=\arabic*., + before={% + \setcounter{PfMProfondeur}{1}% + \setcounter{PfMNbLignesFinitem}{0} + \firstlegaltrue% set the toggle for first item in the list to true + \def\Primeitem{\iffirstlegal\olditem\stepcounter{PfMNbLignesFinitem}% + \firstlegalfalse + \else + \ifnum\PfMListeDesAjoutsdeLignes[\thePfMNbLignesFinitem]>1\relax\PfMPar\Lignespointilles{\PfMListeDesAjoutsdeLignes[\thePfMNbLignesFinitem]}\else\ifnum\PfMListeDesAjoutsdeLignes[\thePfMNbLignesFinitem]=1\relax\PfMPar\pointilles\fi\fi% + \olditem\stepcounter{PfMNbLignesFinitem}% + \fi + }% new, temporary defition of \item + \let\litem\Primeitem + \let\item\litem + }, + after={% + \ifnum\PfMListeDesAjoutsdeLignes[\thePfMNbLignesFinitem]>0\relax\PfMPar\Lignespointilles{\PfMListeDesAjoutsdeLignes[\thePfMNbLignesFinitem]}\else\ifnum\PfMListeDesAjoutsdeLignes[\thePfMNbLignesFinitem]=1\relax\PfMPar\pointilles\fi\fi% + % fill for final item in list + \let\litem\olditem% restore standard definition of \item + \let\item\olditem + \setcounter{PfMProfondeur}{0}% + }% +}% + +\setlist[Test,2]{% + leftmargin=*, + label=(\alph*), + before={% + \setcounter{PfMProfondeur}{2}% + \setcounter{PfMNbLignesFinitemi}{0} + \firstlegaltrue% + \def\Seconditem{\iffirstlegal\olditem\stepcounter{PfMNbLignesFinitemi}\firstlegalfalse\else% + \ifnum\PfMListeDesAjoutsdeLignesi[\thePfMNbLignesFinitemi]>1\relax\PfMPar\Lignespointilles{\PfMListeDesAjoutsdeLignesi[\thePfMNbLignesFinitemi]}\else\ifnum\PfMListeDesAjoutsdeLignesi[\thePfMNbLignesFinitemi]=1\relax\PfMPar\pointilles\fi + \fi% + \olditem\stepcounter{PfMNbLignesFinitemi} + \fi + }% new, temporary defition of \item + \let\litem\Seconditem + \let\item\litem + }, + after={% + \ifnum\PfMListeDesAjoutsdeLignesi[\thePfMNbLignesFinitemi]>1\relax\PfMPar\Lignespointilles{\PfMListeDesAjoutsdeLignesi[\thePfMNbLignesFinitemi]}\else\ifnum\PfMListeDesAjoutsdeLignesi[\thePfMNbLignesFinitemi]=1\relax\PfMPar\pointilles\fi + \fi% +% % fill for final item in list + \let\litem\Primeitem% + \let\item\litem + \setcounter{PfMProfondeur}{1}% + }% +} + +\newcounter{PfMNbLignesFinitem} +\newcounter{PfMNbLignesFinitemi} +\newcounter{PfMProfondeur} +\setcounter{PfMProfondeur}{0}% + +\NewDocumentEnvironment{autoenumerate}{O{}m +b}{% + \setsepchar{,}\ignoreemptyitems% + \ifnum\thePfMProfondeur=0\relax% + \readlist*\PfMListeDesAjoutsdeLignes{#2}% + \else% + \readlist*\PfMListeDesAjoutsdeLignesi{#2}% + \fi% + \begin{Test}[#1]% + #3 + \end{Test}% }{}%
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/pst-coil/pst-coil.sty b/Master/texmf-dist/tex/latex/pst-coil/pst-coil.sty index d5b0311532b..1def1526c09 100644 --- a/Master/texmf-dist/tex/latex/pst-coil/pst-coil.sty +++ b/Master/texmf-dist/tex/latex/pst-coil/pst-coil.sty @@ -1,4 +1,4 @@ -%% $Id: pst-coil.sty 539 2011-07-12 08:22:33Z herbert $ +%% $Id: pst-coil.sty 930 2024-08-13 18:19:44Z herbert $ \RequirePackage{pstricks} \ProvidesPackage{pst-coil}[2010/02/01 package wrapper for pst-coil.tex (hv)] diff --git a/Master/texmf-dist/tex/latex/regulatory/regulatory.sty b/Master/texmf-dist/tex/latex/regulatory/regulatory.sty index 2e89a19a376..2755a8ac9bd 100644 --- a/Master/texmf-dist/tex/latex/regulatory/regulatory.sty +++ b/Master/texmf-dist/tex/latex/regulatory/regulatory.sty @@ -19,9 +19,9 @@ % example1-nl.tex, example2-nl.tex, % example1-en.tex, example2-en.tex, % md-example.tex, example.md, -% fc-dutch.def and regulatory.sty +% regulatory.sty \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{regulatory}[2024/01/27 0.0.3 Xerdi's Regulatory Package] +\ProvidesPackage{regulatory}[2024/09/04 0.0.4 Xerdi's Regulatory Package] \RequirePackage{pgfopts} \RequirePackage{xifthen} diff --git a/Master/texmf-dist/tex/latex/reptheorem/reptheorem.sty b/Master/texmf-dist/tex/latex/reptheorem/reptheorem.sty index 2d12f462221..8faae5eb735 100644 --- a/Master/texmf-dist/tex/latex/reptheorem/reptheorem.sty +++ b/Master/texmf-dist/tex/latex/reptheorem/reptheorem.sty @@ -25,7 +25,7 @@ %% reptheorem.sty, reptheorem.pdf, reptheorem.ins %% -\ProvidesPackage{reptheorem}[2024-03-27 v1.0 Reptheorem package] +\ProvidesPackage{reptheorem}[2024-08-12 v1.1 Reptheorem package] \def\reptheorem@theoremfile{\relax} \NewDocumentCommand{\theoremfile}{ O{\jobname.thm} }{ \def\reptheorem@theoremfile{#1} @@ -50,14 +50,18 @@ File #1 not found. I will not import any theorems.% } #4 \end{#1} +\expandafter\gdef\csname thmtype@#2\endcsname{#1} \expandafter\long\expandafter\gdef\csname thm@#2\endcsname{#4}% \expandafter\gdef\csname thmdesc@#2\endcsname{#3}% \long\gdef\@thmoutput{% +\string\expandafter\string\gdef\noexpand% +\csname thmtype@#2\string\endcsname{#1}% +^^J% \string\expandafter\string\long\string\expandafter% \string\gdef\noexpand\csname thm@#2\string\endcsname{#4}% ^^J% -\string\expandafter\string\expandafter% -\string\gdef\noexpand\csname thmdesc@#2\string\endcsname{#3}% +\string\expandafter\string\gdef\noexpand% +\csname thmdesc@#2\string\endcsname{#3}% } \write\@auxout{\@thmoutput} \if\reptheorem@theoremfile\relax @@ -66,40 +70,45 @@ File #1 not found. I will not import any theorems.% \fi }{} \newcounter{old@counter} -\NewDocumentCommand{\repthm}{ m m +o }{ +\NewDocumentCommand{\repthm}{ m +o }{ \begingroup -\setcounter{old@counter}{\value{#1}} - \def\thetheorem{\ref{#2}} +\ifcsname thmtype@#1\endcsname% +\expandafter\let\expandafter\@@thmtype\csname thmtype@#1\endcsname% +\else% +\def\@@thmtype{theorem}% +\fi% +\setcounter{old@counter}{\value{\@@thmtype}} + \def\thetheorem{\ref{#1}} \let\@@theoremnotdefined\relax -\ifcsname thm@#2\endcsname% Check if theorem is even defined -\expandafter\edef\expandafter\@@thmdesc{\csname thmdesc@#2\endcsname}% -\expandafter\let\expandafter\@@thm\csname thm@#2\endcsname +\ifcsname thm@#1\endcsname% Check if theorem is even defined +\expandafter\edef\expandafter\@@thmdesc{\csname thmdesc@#1\endcsname}% +\expandafter\let\expandafter\@@thm\csname thm@#1\endcsname \IfValueTF{\@@thmdesc}{% Check if theorem has name -\begin{#1}[\@@thmdesc] +\begin{\@@thmtype}[\@@thmdesc] \@@thm -\end{#1} +\end{\@@thmtype} }{% No optionals -\begin{#1} +\begin{\@@thmtype} \@@thm -\end{#1} +\end{\@@thmtype} } \else -\IfValueTF{#3}{ -\begin{#1} -#3 -\end{#1} +\IfValueTF{#2}{ +\begin{\@@thmtype} +#2 +\end{\@@thmtype} }{% No theorem or alt text provided: throw warning -\begin{#1} -\end{#1} +\begin{\@@thmtype} +\end{\@@thmtype} \PackageWarning{reptheorem}{% -Theorem #2 not defined; rebuild your project. +Theorem #1 not defined; rebuild your project. If the issue persists, create the theorem using \begin{makethm} or consider adding alt text to \repthm using the optional parameter% } } \fi -\setcounter{#1}{\value{old@counter}} +\setcounter{\@@thmtype}{\value{old@counter}} \endgroup } diff --git a/Master/texmf-dist/tex/latex/rpgicons/rpgicons-l3.sty b/Master/texmf-dist/tex/latex/rpgicons/rpgicons-l3.sty index 3103502bf3c..cc33d61bf2f 100644 --- a/Master/texmf-dist/tex/latex/rpgicons/rpgicons-l3.sty +++ b/Master/texmf-dist/tex/latex/rpgicons/rpgicons-l3.sty @@ -10,8 +10,8 @@ % % This work has the LPPL maintenance status `maintained'. % -\ProvidesExplPackage {rpgicons-l3} {2024-05-15} {1.8.3} - {rpg Icons Package (l3 Variant)} +\ProvidesExplPackage {rpgicons-l3} {2024-08-08} {1.8.4} + {RPG Icons Package (l3 Variant)} \bool_new:N \l__rpgicons_unicode_mode_bool \sys_if_engine_luatex:T { @@ -792,22 +792,22 @@ \draw_path_lineto:n { 0cm , -.425cm } \draw_path_moveto:n { -.425cm , 0cm } \draw_path_lineto:n { .425cm , 0cm } - \draw_path_moveto:n { \draw_point_polar:nnn { 30 } { .325cm } { .225cm } } - \draw_path_lineto:n { \draw_point_polar:nn { 30 } { .4cm} } - \draw_path_moveto:n { \draw_point_polar:nnn { 60 } { .325cm } { .225cm } } - \draw_path_lineto:n { \draw_point_polar:nn { 60 } { .4cm} } - \draw_path_moveto:n { \draw_point_polar:nnn { 120 } { .325cm } { .225cm } } - \draw_path_lineto:n { \draw_point_polar:nn { 120 } { .4cm} } - \draw_path_moveto:n { \draw_point_polar:nnn { 150 } { .325cm } { .225cm } } - \draw_path_lineto:n { \draw_point_polar:nn { 150 } { .4cm} } - \draw_path_moveto:n { \draw_point_polar:nnn { 210 } { .325cm } { .225cm } } - \draw_path_lineto:n { \draw_point_polar:nn { 210 } { .4cm} } - \draw_path_moveto:n { \draw_point_polar:nnn { 240 } { .325cm } { .225cm } } - \draw_path_lineto:n { \draw_point_polar:nn { 240 } { .4cm} } - \draw_path_moveto:n { \draw_point_polar:nnn { 300 } { .325cm } { .225cm } } - \draw_path_lineto:n { \draw_point_polar:nn { 300 } { .4cm} } - \draw_path_moveto:n { \draw_point_polar:nnn { 330 } { .325cm } { .225cm } } - \draw_path_lineto:n { \draw_point_polar:nn { 330 } { .4cm} } + \draw_path_moveto:n { \draw_point_polar:nnn { .325cm } { .225cm } { 30 } } + \draw_path_lineto:n { \draw_point_polar:nn { .4cm } { 30 } } + \draw_path_moveto:n { \draw_point_polar:nnn { .325cm } { .225cm } { 60 } } + \draw_path_lineto:n { \draw_point_polar:nn { .4cm } { 60 } } + \draw_path_moveto:n { \draw_point_polar:nnn { .325cm } { .225cm } { 120 } } + \draw_path_lineto:n { \draw_point_polar:nn { .4cm } { 120 } } + \draw_path_moveto:n { \draw_point_polar:nnn { .325cm } { .225cm } { 150 } } + \draw_path_lineto:n { \draw_point_polar:nn { .4cm } { 150 } } + \draw_path_moveto:n { \draw_point_polar:nnn { .325cm } { .225cm } { 210 } } + \draw_path_lineto:n { \draw_point_polar:nn { .4cm } { 210 } } + \draw_path_moveto:n { \draw_point_polar:nnn { .325cm } { .225cm } { 240 } } + \draw_path_lineto:n { \draw_point_polar:nn { .4cm } { 240 } } + \draw_path_moveto:n { \draw_point_polar:nnn { .325cm } { .225cm } { 300 } } + \draw_path_lineto:n { \draw_point_polar:nn { .4cm } { 300 } } + \draw_path_moveto:n { \draw_point_polar:nnn { .325cm } { .225cm } { 330 } } + \draw_path_lineto:n { \draw_point_polar:nn { .4cm } { 330 } } } \cs_new:Npn \rpgicons_draw_shape_illusion: { @@ -1546,7 +1546,7 @@ } \cs_new:Npn \rpgicons_draw_frame_damage: { - \draw_path_circle:nn { 0cm , 0cm } { .45cm } + \draw_path_circle:nn { 0cm , 0cm } { .5cm } } % USER COMMANDS @@ -1910,7 +1910,7 @@ } \cs_if_exist:NF \spell { \cs_new_eq:NN \spell \RPGIconsSpell } -\NewDocumentCommand { \RPGIconsSpellschool } { O{positive} m O{} } { +\NewDocumentCommand { \RPGIconsSpellschool } { O{negative} m O{} } { \group_begin: \keys_set_groups:nne { rpgicons / local ~ options } { extra } {#3} \keys_set:ne { rpgicons / local ~ options } { \clist_use:Nn \l_rpgicons_types_every_spellschool_style_clist { , } } diff --git a/Master/texmf-dist/tex/latex/rpgicons/rpgicons-pgf.sty b/Master/texmf-dist/tex/latex/rpgicons/rpgicons-pgf.sty index 0e0c0371874..dd75a7b4c0b 100644 --- a/Master/texmf-dist/tex/latex/rpgicons/rpgicons-pgf.sty +++ b/Master/texmf-dist/tex/latex/rpgicons/rpgicons-pgf.sty @@ -11,7 +11,7 @@ % This work has the LPPL maintenance status `maintained'. % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{rpgicons-pgf}[2024-05-15 rpg Icons Package (PGF Variant) (1.8.3)] +\ProvidesPackage{rpgicons-pgf}[2024-08-08 RPG Icons Package (PGF Variant) (1.8.4)] % provide pics option \newif\ifrpgicons@pics\rpgicons@picsfalse diff --git a/Master/texmf-dist/tex/latex/rpgicons/rpgicons.sty b/Master/texmf-dist/tex/latex/rpgicons/rpgicons.sty index 8079232a4fb..63a5fa2fc08 100644 --- a/Master/texmf-dist/tex/latex/rpgicons/rpgicons.sty +++ b/Master/texmf-dist/tex/latex/rpgicons/rpgicons.sty @@ -10,8 +10,8 @@ % % This work has the LPPL maintenance status `maintained'. % -\ProvidesExplPackage {rpgicons} {2024-05-15} {1.8.3} - {rpg Icons Package} +\ProvidesExplPackage {rpgicons} {2024-08-08} {1.8.4} + {RPG Icons Package} \bool_new:N \l__rpgicons_use_legacy_variant_bool \clist_new:N \l__rpgicons_forwarded_options_clist diff --git a/Master/texmf-dist/tex/latex/rub-kunstgeschichte/rub-kunstgeschichte.cls b/Master/texmf-dist/tex/latex/rub-kunstgeschichte/rub-kunstgeschichte.cls index ce7e04a509a..55e34820747 100644 --- a/Master/texmf-dist/tex/latex/rub-kunstgeschichte/rub-kunstgeschichte.cls +++ b/Master/texmf-dist/tex/latex/rub-kunstgeschichte/rub-kunstgeschichte.cls @@ -30,9 +30,45 @@ \NeedsTeXFormat{LaTeX2e}[2022-06-01] \ProvidesClass{rub-kunstgeschichte} - [2024-05-26 v0.1.0 RUB KGI class] + [2024-09-06 v0.2.0 RUB Kunstgeschichte class] +%% Class options +\DeclareKeys[rubkgi]{ + biblatex.store = \@rubkgi@biblatexOptions, + biblatex.usage = load +} +\DeclareKeys[rubkgi]{ + hyperref.code = \PassOptionsToPackage{#1}{hyperref}, + hyperref.usage = load +} +%% TeX switch to decide wether to load the parskip package +\newif\if@rubkgi@parskip +\@rubkgi@parskiptrue +\DeclareKeys[rubkgi]{ + parskip.if = @rubkgi@parskip, + parskip.usage = load, + noparskip.ifnot = @rubkgi@parskip, + noparskip.usage = load +} +\ProcessKeyOptions[rubkgi] %% Load base class with 12pt base font size \LoadClass[12pt]{article} +%% biblatex options +\PassOptionsToPackage{ + backend=biber, + singletitle=true, + autocite=footnote, + autopunct=false +}{biblatex} +%% biblatex-dw package +\PassOptionsToPackage{ + style=authortitle-dw, + firstfull=true, + addyear=true +}{biblatex} +%% pass biblatex class options along +\PassOptionsToPackage{\@rubkgi@biblatexOptions}{biblatex} +%% load biblatex +\RequirePackage{biblatex} %% Set 1.5 times line spacing \RequirePackage[onehalfspacing]{setspace} %% Set a4 paper size and margins @@ -40,6 +76,14 @@ a4paper, top=2cm,left=2cm,bottom=2cm,right=4cm ]{geometry} +%% Avoid paragraph indentation +\if@rubkgi@parskip + \RequirePackage{parskip} +\fi +%% Hyperref +\RequirePackage{hyperref} +\hypersetup{hidelinks=true} + \endinput %% %% End of file `rub-kunstgeschichte.cls'. diff --git a/Master/texmf-dist/tex/latex/scrhack/scrhack-2023-07-07.sty b/Master/texmf-dist/tex/latex/scrhack/scrhack-2023-07-07.sty new file mode 100644 index 00000000000..9c5eb1b3b73 --- /dev/null +++ b/Master/texmf-dist/tex/latex/scrhack/scrhack-2023-07-07.sty @@ -0,0 +1,190 @@ +%% +%% This is file `scrhack-2023-07-07.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% scrhack-2023-07-07.dtx (with options: `package,identify') +%% scrhack-2023-07-07.dtx (with options: `package,option') +%% scrhack-2023-07-07.dtx (with options: `package,body') +%% +%% IMPORTANT NOTICE: +%% +%% For the copyright see the source file. +%% +%% Any modified versions of this file must be renamed +%% with new filenames distinct from scrhack-2023-07-07.sty. +%% +%% For distribution of the original source see the terms +%% for copying and modification in the file scrhack-2023-07-07.dtx scrhack-2023-07-07.dtx scrhack-2023-07-07.dtx. +%% +%% This generated file may be distributed as long as the +%% original source files, as listed above, are part of the +%% same distribution. (The sources need not necessarily be +%% in the same archive or directory.) +%%% using: package,identify +\ProvidesPackage{scrhack}[% + 2024-04-17 v3.42 + legacy version of package scrhack% +] +%%% using: package,option +\RequirePackage{scrkbase}[2022-11-11] +\@ifpackagelater{scrkbase}{2023-07-14}{% + \PackageInfo{scrhack}{KOMA-Script >= 3.42 detected.\MessageBreak + In this case you should not use this legacy version of\MessageBreak + scrhack, but should be able to use the current version\MessageBreak + or even replace loading scrhack by loading really\MessageBreak + needed third-party patches, e.g., floatbytocbasic.\MessageBreak + But you are the boss ..}% +}{% + \@ifpackagelater{scrkbase}{2022-11-11}{% + \PackageWarningNoLine{scrhack}{KOMA-Script < 3.42 detected.\MessageBreak + In this case the original scrhack of that version\MessageBreak + should also be installed and used instead of this\MessageBreak + legacy package}% + }{% + \PackageError{scrhack}{incompatible KOMA-Script < v3.39 detected}{% + This error is fatal!\MessageBreak + Loading of scrhack will be aborted!}% + \expandafter\let\csname ver@scrhack.sty\endcsname\undefined + \endinput + }% +} +\KOMA@ifkey{hyperref}{@scrhack@hyperref}% +\KOMAExecuteOptions{hyperref=true}% +\KOMA@ifkey{floatrow}{@scrhack@floatrow} +\KOMAExecuteOptions{floatrow=true} +\KOMA@ifkey{float}{@scrhack@float}% +\KOMAExecuteOptions{float=true}% +\KOMA@ifkey{listings}{@scrhack@listings} +\KOMAExecuteOptions{listings=true} +\RequirePackage{xpatch}% +\KOMA@ifkey{nomencl}{@scrhack@nomencl} +\KOMAExecuteOptions{nomencl=true} +\KOMA@ifkey{setspace}{@scrhack@setspace} +\KOMAExecuteOptions{setspace=true} +\RequirePackage{xpatch}% +\KOMA@ifkey{lscape}{@scrhack@lscape}% +\KOMAExecuteOptions{lscape=true}% +\KOMA@ifkey{standardsections}{@scrhack@standardsections} +\KOMAExecuteOptions{standardsections=false} +\KOMAProcessOptions\relax +%%% using: package,body +\newcommand{\scr@ifexpected}[2]{% + \begingroup + \let\@tempa#1 + #2 + \ifx\@tempa#1 + \aftergroup\@firstoftwo + \else + \aftergroup\@secondoftwo + \fi + \endgroup +} +\newcommand*{\scr@hack@load}[2]{% + \expandafter\ifx\csname ver@#2.#1\endcsname\relax + \expandafter\@secondoftwo + \else + \expandafter\ifx\csname ver@#2.hak\endcsname\relax + \expandafter\expandafter\expandafter\@firstoftwo + \else + \expandafter\expandafter\expandafter\@secondoftwo + \fi + \fi + {% + \PackageInfo{scrhack}{loading #2 hack}% + \edef\reserved@a{% + \noexpand\makeatletter\noexpand\input{#2.hak}% + \noexpand\catcode`\noexpand\@\the\catcode`\@\relax + }\reserved@a + }{% + \PackageInfo{scrhack}{ignorring #2 hack}% + }% +} +\BeforePackage{hyperref}{% + \scr@ifundefinedorrelax{hy@insteadofrefstepcounter}{}{% + \PackageInfo{scrhack}{hyperref hack deactivated because of\MessageBreak + detection of KOMA-Script class, that doesn't\MessageBreak + need that hack,}% + \KOMAExecuteOptions[scrhack.sty]{hyperref=false}% + }% +} +\AfterPackage*{hyperref}{% + \if@scrhack@hyperref + \@ifpackagelater{hyperref}{2009/11/24}{% + \PackageInfo{scrhack}{hyperref hack deactivated because of\MessageBreak + detection of hyperref version, that doesn't\MessageBreak + need that hack,}% + \KOMAExecuteOptions[scrhack.sty]{hyperref=false}% + }{% + \AtEndOfPackage{% + \KOMA@key[scrhack.sty]{hyperref}[true]{% + \PackageWarning{scrhack}{option `hyperref=#1' ignored}% + \FamilyKeyStateProcessed + }% + \if@scrhack@hyperref\scr@hack@load\@pkgextension{hyperref}\fi + }% + }% + \fi +} +\AfterPackage*{floatrow}{% + \KOMAoptions{float=false}% + \PackageInfo{scrhack}{option `float' deactivated}% + \KOMA@key[scrhack.sty]{floatrow}{% + \PackageWarning{scrhack}{option `floatrow' ignored}% + \FamilyKeyStateProcessed + }% + \if@scrhack@floatrow\scr@hack@load\@pkgextension{floatrow}\fi +} +\AfterPackage*{float}{% + \KOMA@key[scrhack.sty]{float}{% + \PackageWarning{scrhack}{option `float' ignored}% + \FamilyKeyStateProcessed + }% + \if@scrhack@float\scr@hack@load\@pkgextension{float}\fi +} +\AfterPackage*{listings}{% + \@ifpackagelater{lstmisc}{2024/02/15}{% + \PackageInfo{scrhack}{listings hack deactivated because of\MessageBreak + detection of listings version, that doesn't\MessageBreak + need that hack,}% + \KOMAExecuteOptions[scrhack.sty]{listings=false}% + }{% + \if@scrhack@listings\scr@hack@load\@pkgextension{listings}\fi + }% + \KOMA@key[scrhack.sty]{listings}[true]{% + \PackageWarning{scrhack}{option `listings=#1' ignored}% + \FamilyKeyStateProcessed + }% +} +\AfterPackage*{nomencl}{% + \KOMA@key[scrhack.sty]{nomencl}{% + \PackageWarning{scrhack}{option `nomencl' ignored}% + \FamilyKeyStateProcessed + }% + \if@scrhack@nomencl\scr@hack@load\@pkgextension{nomencl}\fi +} +\AfterPackage*{setspace}{% + \KOMA@key[scrhack.sty]{setspace}{% + \PackageWarning{scrhack}{option `setspace' ignored}% + \FamilyKeyStateProcessed + }% + \if@scrhack@setspace\scr@hack@load\@pkgextension{setspace}\fi +} +\AfterPackage*{lscape}{% + \if@scrhack@lscape\scr@hack@load\@pkgextension{lscape}\else + \KOMA@key[scrhack.sty]{lscape}{% + \PackageWarning{scrhack}{option `lscape' ignored}% + \FamilyKeyStateProcessed + }% + \fi +} +\AtEndOfPackage{% + \if@scrhack@standardsections + \PackageInfo{scrhack}{loading standard classes sections hack}% + \input{standardsections.hak}% + \fi +} +\endinput +%% +%% End of file `scrhack-2023-07-07.sty'. diff --git a/Master/texmf-dist/tex/latex/scrhack/scrhack.sty b/Master/texmf-dist/tex/latex/scrhack/scrhack.sty new file mode 100644 index 00000000000..82ab328aaf5 --- /dev/null +++ b/Master/texmf-dist/tex/latex/scrhack/scrhack.sty @@ -0,0 +1,390 @@ +%% +%% This is file `scrhack.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% scrhack.dtx (with options: `package') +%% +%% IMPORTANT NOTICE: +%% +%% For the copyright see the source file. +%% +%% Any modified versions of this file must be renamed +%% with new filenames distinct from scrhack.sty. +%% +%% For distribution of the original source see the terms +%% for copying and modification in the file scrhack.dtx. +%% +%% This generated file may be distributed as long as the +%% original source files, as listed above, are part of the +%% same distribution. (The sources need not necessarily be +%% in the same archive or directory.) +\providecommand\DeclareRelease[3]{} +\providecommand\DeclareCurrentRelease[2]{} +\DeclareRelease{v3.41}{2023-07-07}{scrhack-2023-07-07.sty} +\DeclareCurrentRelease{}{2023-07-15} +\ProvidesPackage{scrhack} + [2024-09-04 v3.42 + scrhack emulation package] +\ifnum 0=\ifcsname IfFormatAtLeastTF\endcsname + \IfFormatAtLeastTF{2022-06-01}{1}{0}% + \else + 0% + \fi\relax + \PackageError{scrhack}{LaTeX kernel too old}{% + The package needs at least LaTeX 2022-06-01.\MessageBreak + This error is fatal. Loading will be aborted.% + }% + \endinput +\fi +\ExplSyntaxOn +\msg_new:nnn { scrhack } { option-too-late } + { + option~`#1'~after~loading~package~`#2'~ignored. + } +\msg_new:nnn { scrhack } { deprecated-option } + { + deprecated~option~`#1'~ignored. + } +\DeclareKeys{% + float .code = \__scrhack_switch_float:n { #1 }, + float .default:n = true, + float .usage = preamble, +} +\bool_new:N \__scrhack_float_bool + +\cs_new:Nn \__scrhack_switch_float:n + { + \str_case_e:nnF { \str_foldcase:n { #1 } } + { + {true} { + \@ifpackageloaded { floatbytocbasic } + { + \msg_info:nnnn { scrhack } { option-too-late } + { float = true } { floatbytocbasic } + } + { + \bool_if:NF \__scrhack_float_bool + { + \hook_gput_code:nnn { package/float/after } { scrhack } + { + \RequirePackage { floatbytocbasic } + } + \bool_gset_true:N \__scrhack_float_bool + } + } + } + {false} { + \@ifpackageloaded { floatbytocbasic } + { + \msg_warning:nnnn { scrhack } { option-too-late } + { float=false } { floatbytocbasic } + } + { + \bool_if:NT \__scrhack_float_bool + { + \hook_gremove_code:nn { package/float/after } { scrhack } + } + \bool_gset_false:N \@s@_float_bool + } + } + } + { + \msg_warning:nnn { keys } { boolean-values-only } { float } + } + } +\SetKeys{float=true} +\DeclareKeys{% + floatrow .code = \__scrhack_switch_floatrow:n { #1 }, + floatrow .default:n = true, + floatrow .usage = preamble, +} +\bool_new:N \__scrhack_floatrow_bool + +\cs_new:Nn \__scrhack_switch_floatrow:n + { + \str_case_e:nnF { \str_foldcase:n { #1 } } + { + {true} { + \@ifpackageloaded { floatrowbytocbasic } + { + \msg_info:nnnn { scrhack } { option-too-late } + { floatrow = true } { floatrowbytocbasic } + } + { + \bool_if:NF \__scrhack_floatrow_bool + { + \hook_gput_code:nnn { package/floatrow/after } + { scrhack } + { + \RequirePackage { floatrowbytocbasic } + } + \bool_gset_true:N \__scrhack_floatrow_bool + } + } + } + {false} { + \@ifpackageloaded { floatrowbytocbasic } + { + \msg_warning:nnnn { scrhack } { option-too-late } + { floatrow=false } { floatrowbytocbasic } + } + { + \bool_if:NT \__scrhack_floatrow_bool + { + \hook_gremove_code:nn { package/floatrow/after } + { scrhack } + } + \bool_gset_false:N \@s@_floatrow_bool + } + } + } + { + \msg_warning:nnn { keys } { boolean-values-only } { floatrow } + } + } +\SetKeys{floatrow=true} +\DeclareKeys{% + hyperref .code = \__scrhack_switch_hyperref:n { #1 }, + hyperref .default:n = true, + hyperref .usage = preamble, +} +\cs_new:Nn \__scrhack_switch_hyperref:n + { + \str_case_e:nnF { \str_foldcase:n { #1 } } + { + {true} { + \msg_warning:nnn { scrhack } { deprecated-option } + { hyperref=#1 } + } + {false} { + \msg_info:nnn { scrhack } { deprecated-option } + { hyperref=#1 } + } + } + { + \msg_warning:nnn { keys } { boolean-values-only } { hyperref } + } + } +\DeclareKeys{% + listings .code = \__scrhack_switch_listings:n { #1 }, + listings .default:n = true, + listings .usage = preamble, +} +\cs_new:Nn \__scrhack_switch_listings:n + { + \str_case_e:nnF { \str_foldcase:n { #1 } } + { + {true} { + \msg_warning:nnn { scrhack } { deprecated-option } + { listings=#1 } + } + {false} { + \msg_info:nnn { scrhack } { deprecated-option } + { listings=#1 } + } + } + { + \msg_warning:nnn { keys } { boolean-values-only } { listings } + } + } +\DeclareKeys{% + lscape .code = \__scrhack_switch_lscape:n { #1 }, + lscape .default:n = true, + lscape .usage = preamble, +} +\bool_new:N \__scrhack_lscape_bool + +\cs_new:Nn \__scrhack_switch_lscape:n + { + \str_case_e:nnF { \str_foldcase:n { #1 } } + { + {true} { + \@ifpackageloaded { lscapeenhanced } + { + \msg_info:nnnn { scrhack } { option-too-late } + { lscape = true } { lscapeenhanced } + } + { + \bool_if:NF \__scrhack_lscape_bool + { + \hook_gput_code:nnn { package/lscape/after } + { scrhack } + { + \RequirePackage { lscapeenhanced } + } + \bool_gset_true:N \__scrhack_lscape_bool + } + } + } + {false} { + \@ifpackageloaded { lscapeenhanced } + { + \msg_warning:nnnn { scrhack } { option-too-late } + { lscape=false } { lscapeenhanced } + } + { + \bool_if:NT \__scrhack_lscape_bool + { + \hook_gremove_code:nn { package/lscape/after } + { scrhack } + } + \bool_gset_false:N \@s@_lscape_bool + } + } + } + { + \msg_warning:nnn { keys } { boolean-values-only } { lscape } + } + } +\SetKeys{lscape=true} +\DeclareKeys{% + nomencl .code = \__scrhack_switch_nomencl:n { #1 }, + nomencl .default:n = true, + nomencl .usage = preamble, +} +\cs_new:Nn \__scrhack_switch_nomencl:n + { + \str_case_e:nnF { \str_foldcase:n { #1 } } + { + {true} { + \msg_warning:nnn { scrhack } { deprecated-option } + { nomencl=#1 } + } + {false} { + \msg_info:nnn { scrhack } { deprecated-option } + { nomencl=#1 } + } + } + { + \msg_warning:nnn { keys } { boolean-values-only } { nomencl } + } + } +\DeclareKeys{% + setspace .code = \__scrhack_switch_setspace:n { #1 }, + setspace .default:n = true, + setspace .usage = preamble, +} +\bool_new:N \__scrhack_setspace_bool + +\cs_new:Nn \__scrhack_switch_setspace:n + { + \str_case_e:nnF { \str_foldcase:n { #1 } } + { + {true} { + \@ifpackageloaded { setspaceenhanced } + { + \msg_info:nnnn { scrhack } { option-too-late } + { setspace = true } { setspaceenhanced } + } + { + \bool_if:NF \__scrhack_setspace_bool + { + \hook_gput_code:nnn { package/setspace/after } { scrhack } + { + \exp_last_unbraced:Ne \RequirePackage + { + [ \use:c { @raw@opt@setspace.sty }, + byselectfont, + keepfontsize ] + } + { setspaceenhanced } + } + \bool_gset_true:N \__scrhack_setspace_bool + } + } + } + {false} { + \@ifpackageloaded { setspaceenhanced } + { + \msg_warning:nnnn { scrhack } { option-too-late } + { setspace=false } { setspaceenhanced } + } + { + \bool_if:NT \__scrhack_setspace_bool + { + \hook_gremove_code:nn { package/setspace/after } { scrhack } + } + \bool_gset_false:N \@s@_setspace_bool + } + } + } + { + \msg_warning:nnn { keys } { boolean-values-only } { setspace } + } + } +\SetKeys{setspace=true} +\DeclareKeys{% + standardsections .code = \__scrhack_switch_standardsectioning:n { #1 }, + standardsections .default:n = true, + standardsections .usage = preamble, +} +\bool_new:N \__scrhack_standardsectioning_bool + +\cs_new:Nn \__scrhack_switch_standardsectioning:n + { + \str_case_e:nnF { \str_foldcase:n { #1 } } + { + {true} { + \@ifpackageloaded { standardsectioning } + { + \msg_info:nnnn { scrhack } { option-too-late } + { standardsectioning = true } { standardsectioning } + } + { + \bool_if:NF \__scrhack_standardsectioning_bool + { + \str_set:Nx \l_tmpa_str { \cs_meaning:N \normalsize } + \str_if_in:NnTF + \l_tmpa_str + { \@latex@error } + { + \hook_gput_code:nnn { class/after } { scrhack } + { + \RequirePackage { standardsectioning } + \exp_args:Nnnx \hook_gput_code:nnn + { begindocument/before } { scrhack } + { + \exp_not:N \cs_gset:Npn + \exp_after:wN \exp_not:N + \cs:w ver@standardsectioning.sty \cs_end: + { + \cs:w ver@standardsectioning.sty \cs_end: + } + } + \cs_undefine:c { var@standardsectioning.sty } + } + \bool_gset_true:N \__scrhack_standardsectioning_bool + } + { + \RequirePackage{ standardsectioning } + \bool_gset_false:N \__scrhack_standardsectioning_bool + } + } + } + } + {false} { + \@ifpackageloaded { standardsectioning } + { + \msg_warning:nnnn { scrhack } { option-too-late } + { standardsectioning=false } { standardsectioning } + } + { + \bool_if:NT \__scrhack_standardsectioning_bool + { + \hook_gremove_code:nn { class/after } { scrhack } + } + \bool_gset_false:N \@s@_standardsectioning_bool + } + } + } + { + \msg_warning:nnn { keys } { boolean-values-only } { standardsectioning } + } + } +\ExplSyntaxOff +\ProcessKeyOptions\relax +\endinput +%% +%% End of file `scrhack.sty'. diff --git a/Master/texmf-dist/tex/latex/se2thesis/se2colors.sty b/Master/texmf-dist/tex/latex/se2thesis/se2colors.sty index 6215da68498..1ac9a8c7cbd 100644 --- a/Master/texmf-dist/tex/latex/se2thesis/se2colors.sty +++ b/Master/texmf-dist/tex/latex/se2thesis/se2colors.sty @@ -48,7 +48,7 @@ \endinput }% \providecommand \IfFormatAtLeastTF { \@ifl@t@r \fmtversion } -\ProvidesExplPackage {se2colors} {2024-07-31} {4.3.1} +\ProvidesExplPackage {se2colors} {2024-08-12} {4.3.2} {A colour support package for the se2thesis bundle} \keys_define:nn { seiicolors } { diff --git a/Master/texmf-dist/tex/latex/se2thesis/se2fonts.sty b/Master/texmf-dist/tex/latex/se2thesis/se2fonts.sty index badcca87339..e86497c76be 100644 --- a/Master/texmf-dist/tex/latex/se2thesis/se2fonts.sty +++ b/Master/texmf-dist/tex/latex/se2thesis/se2fonts.sty @@ -48,7 +48,7 @@ \endinput }% \providecommand \IfFormatAtLeastTF { \@ifl@t@r \fmtversion } -\ProvidesExplPackage {se2fonts} {2024-07-31} {4.3.1} +\ProvidesExplPackage {se2fonts} {2024-08-12} {4.3.2} {A font-selection support package for the se2thesis bundle} \msg_new:nnnn { seiifonts } { pdflatex-used } { You~ are~ using~ pdfLaTeX~ with~ the~ se2fonts~ packages.} diff --git a/Master/texmf-dist/tex/latex/se2thesis/se2packages.sty b/Master/texmf-dist/tex/latex/se2thesis/se2packages.sty index d90249d449d..ae26465fee6 100644 --- a/Master/texmf-dist/tex/latex/se2thesis/se2packages.sty +++ b/Master/texmf-dist/tex/latex/se2thesis/se2packages.sty @@ -48,7 +48,7 @@ \endinput }% \providecommand \IfFormatAtLeastTF { \@ifl@t@r \fmtversion } -\ProvidesExplPackage {se2packages} {2024-07-31} {4.3.1} +\ProvidesExplPackage {se2packages} {2024-08-12} {4.3.2} {Supporting packages for the se2thesis bundle} \bool_new:N \l__slcd_packages_csquotes_bool \bool_new:N \l__slcd_packages_booktabs_bool diff --git a/Master/texmf-dist/tex/latex/se2thesis/se2thesis.cls b/Master/texmf-dist/tex/latex/se2thesis/se2thesis.cls index 416c4f3788c..7893d3da55c 100644 --- a/Master/texmf-dist/tex/latex/se2thesis/se2thesis.cls +++ b/Master/texmf-dist/tex/latex/se2thesis/se2thesis.cls @@ -48,7 +48,7 @@ \endinput }% \providecommand \IfFormatAtLeastTF { \@ifl@t@r \fmtversion } -\ProvidesExplClass {se2thesis} {2024-07-31} {4.3.1} +\ProvidesExplClass {se2thesis} {2024-08-12} {4.3.2} {A thesis class for the Chair of Software Engineering II} \prg_new_conditional:Nnn \slcd_package_if_loaded:n { p, T, F, TF } { @@ -532,7 +532,10 @@ \renewcommand*{\@lowertitleback}{% \group_begin: \noindent\textbf{\@author}:\\ - \emph{\@title}\\ + \group_begin: + \let\\\relax + \emph{\@title} + \group_end:\\ \tl_if_eq:NnT \l__slcd_thesis_type_tl { bachelor } { \GetTranslation{Bachelor-thesis},~ } \tl_if_eq:NnT \l__slcd_thesis_type_tl { master } diff --git a/Master/texmf-dist/tex/latex/se2thesis/se2translations-english.trsl b/Master/texmf-dist/tex/latex/se2thesis/se2translations-english.trsl index 5c7f1f86166..734d6f34a1f 100644 --- a/Master/texmf-dist/tex/latex/se2thesis/se2translations-english.trsl +++ b/Master/texmf-dist/tex/latex/se2thesis/se2translations-english.trsl @@ -32,7 +32,7 @@ %% se2packages.sty, %% se2thesis-master-thesis-example.bib, and %% se2thesis-master-thesis-example.pdf -\ProvideDictionaryFor{English}{se2translations}[2024/07/31] +\ProvideDictionaryFor{English}{se2translations}[2024/08/12] \ProvideDictTranslation{abstract}{abstract} \ProvideDictTranslation{Abstract}{Abstract} \ProvideDictTranslation{acknowledgement}{acknowledgement} diff --git a/Master/texmf-dist/tex/latex/se2thesis/se2translations-german.trsl b/Master/texmf-dist/tex/latex/se2thesis/se2translations-german.trsl index ade918f74a4..867b6e3b1aa 100644 --- a/Master/texmf-dist/tex/latex/se2thesis/se2translations-german.trsl +++ b/Master/texmf-dist/tex/latex/se2thesis/se2translations-german.trsl @@ -32,7 +32,7 @@ %% se2packages.sty, %% se2thesis-master-thesis-example.bib, and %% se2thesis-master-thesis-example.pdf -\ProvideDictionaryFor{German}{se2translations}[2024/07/31] +\ProvideDictionaryFor{German}{se2translations}[2024/08/12] \ProvideDictTranslation{abstract}{Zusammenfassung} \ProvideDictTranslation{Abstract}{Zusammenfassung} \ProvideDictTranslation{acknowledgement}{Danksagung} diff --git a/Master/texmf-dist/tex/latex/simpleicons/simpleicons.sty b/Master/texmf-dist/tex/latex/simpleicons/simpleicons.sty index ddbf8358707..cde8a0271b2 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/simpleicons.sty +++ b/Master/texmf-dist/tex/latex/simpleicons/simpleicons.sty @@ -1,6 +1,6 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{simpleicons}[2024/07/26 13.2.0 Simple Icons 13.2.0 Logos] +\ProvidesPackage{simpleicons}[2024/09/06 13.8.0 Simple Icons 13.8.0 Logos] \RequirePackage{iftex} diff --git a/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-pdftex.tex b/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-pdftex.tex index 53e5a02632a..d71dcdf0fa8 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-pdftex.tex +++ b/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-pdftex.tex @@ -321,2838 +321,2850 @@ \expandafter\def\csname simpleicon@baremetricsicon\endcsname {\simpleiconsmaptwo\symbol{63}} \expandafter\def\csname simpleicon@barmeniaicon\endcsname {\simpleiconsmaptwo\symbol{64}} \expandafter\def\csname simpleicon@basecampicon\endcsname {\simpleiconsmaptwo\symbol{65}} - \expandafter\def\csname simpleicon@basicattentiontokenicon\endcsname {\simpleiconsmaptwo\symbol{66}} - \expandafter\def\csname simpleicon@bastyonicon\endcsname {\simpleiconsmaptwo\symbol{67}} - \expandafter\def\csname simpleicon@baticon\endcsname {\simpleiconsmaptwo\symbol{68}} - \expandafter\def\csname simpleicon@bataicon\endcsname {\simpleiconsmaptwo\symbol{69}} - \expandafter\def\csname simpleicon@battledotneticon\endcsname {\simpleiconsmaptwo\symbol{70}} - \expandafter\def\csname simpleicon@bazelicon\endcsname {\simpleiconsmaptwo\symbol{71}} - \expandafter\def\csname simpleicon@beatporticon\endcsname {\simpleiconsmaptwo\symbol{72}} - \expandafter\def\csname simpleicon@beatsicon\endcsname {\simpleiconsmaptwo\symbol{73}} - \expandafter\def\csname simpleicon@beatsbydreicon\endcsname {\simpleiconsmaptwo\symbol{74}} - \expandafter\def\csname simpleicon@beatstarsicon\endcsname {\simpleiconsmaptwo\symbol{75}} - \expandafter\def\csname simpleicon@beekeeperstudioicon\endcsname {\simpleiconsmaptwo\symbol{76}} - \expandafter\def\csname simpleicon@behanceicon\endcsname {\simpleiconsmaptwo\symbol{77}} - \expandafter\def\csname simpleicon@beijingsubwayicon\endcsname {\simpleiconsmaptwo\symbol{78}} - \expandafter\def\csname simpleicon@bemicon\endcsname {\simpleiconsmaptwo\symbol{79}} - \expandafter\def\csname simpleicon@bentleyicon\endcsname {\simpleiconsmaptwo\symbol{80}} - \expandafter\def\csname simpleicon@bentoicon\endcsname {\simpleiconsmaptwo\symbol{81}} - \expandafter\def\csname simpleicon@bentoboxicon\endcsname {\simpleiconsmaptwo\symbol{82}} - \expandafter\def\csname simpleicon@bentomlicon\endcsname {\simpleiconsmaptwo\symbol{83}} - \expandafter\def\csname simpleicon@berealicon\endcsname {\simpleiconsmaptwo\symbol{84}} - \expandafter\def\csname simpleicon@betfairicon\endcsname {\simpleiconsmaptwo\symbol{85}} - \expandafter\def\csname simpleicon@betterstackicon\endcsname {\simpleiconsmaptwo\symbol{86}} - \expandafter\def\csname simpleicon@bevyicon\endcsname {\simpleiconsmaptwo\symbol{87}} - \expandafter\def\csname simpleicon@bigbasketicon\endcsname {\simpleiconsmaptwo\symbol{88}} - \expandafter\def\csname simpleicon@bigbluebuttonicon\endcsname {\simpleiconsmaptwo\symbol{89}} - \expandafter\def\csname simpleicon@bigcartelicon\endcsname {\simpleiconsmaptwo\symbol{90}} - \expandafter\def\csname simpleicon@bigcommerceicon\endcsname {\simpleiconsmaptwo\symbol{91}} - \expandafter\def\csname simpleicon@bilibiliicon\endcsname {\simpleiconsmaptwo\symbol{92}} - \expandafter\def\csname simpleicon@billboardicon\endcsname {\simpleiconsmaptwo\symbol{93}} - \expandafter\def\csname simpleicon@bimicon\endcsname {\simpleiconsmaptwo\symbol{94}} - \expandafter\def\csname simpleicon@binanceicon\endcsname {\simpleiconsmaptwo\symbol{95}} - \expandafter\def\csname simpleicon@biolinkicon\endcsname {\simpleiconsmaptwo\symbol{96}} - \expandafter\def\csname simpleicon@biomeicon\endcsname {\simpleiconsmaptwo\symbol{97}} - \expandafter\def\csname simpleicon@bisecthostingicon\endcsname {\simpleiconsmaptwo\symbol{98}} - \expandafter\def\csname simpleicon@biticon\endcsname {\simpleiconsmaptwo\symbol{99}} - \expandafter\def\csname simpleicon@bitbucketicon\endcsname {\simpleiconsmaptwo\symbol{100}} - \expandafter\def\csname simpleicon@bitcoinicon\endcsname {\simpleiconsmaptwo\symbol{101}} - \expandafter\def\csname simpleicon@bitcoincashicon\endcsname {\simpleiconsmaptwo\symbol{102}} - \expandafter\def\csname simpleicon@bitcoinsvicon\endcsname {\simpleiconsmaptwo\symbol{103}} - \expandafter\def\csname simpleicon@bitcometicon\endcsname {\simpleiconsmaptwo\symbol{104}} - \expandafter\def\csname simpleicon@bitdefendericon\endcsname {\simpleiconsmaptwo\symbol{105}} - \expandafter\def\csname simpleicon@bitlyicon\endcsname {\simpleiconsmaptwo\symbol{106}} - \expandafter\def\csname simpleicon@bitriseicon\endcsname {\simpleiconsmaptwo\symbol{107}} - \expandafter\def\csname simpleicon@bittorrenticon\endcsname {\simpleiconsmaptwo\symbol{108}} - \expandafter\def\csname simpleicon@bitwardenicon\endcsname {\simpleiconsmaptwo\symbol{109}} - \expandafter\def\csname simpleicon@bitwigicon\endcsname {\simpleiconsmaptwo\symbol{110}} - \expandafter\def\csname simpleicon@blackberryicon\endcsname {\simpleiconsmaptwo\symbol{111}} - \expandafter\def\csname simpleicon@blackmagicdesignicon\endcsname {\simpleiconsmaptwo\symbol{112}} - \expandafter\def\csname simpleicon@blazemetericon\endcsname {\simpleiconsmaptwo\symbol{113}} - \expandafter\def\csname simpleicon@blazoricon\endcsname {\simpleiconsmaptwo\symbol{114}} - \expandafter\def\csname simpleicon@blendericon\endcsname {\simpleiconsmaptwo\symbol{115}} - \expandafter\def\csname simpleicon@blockbenchicon\endcsname {\simpleiconsmaptwo\symbol{116}} - \expandafter\def\csname simpleicon@blockchaindotcomicon\endcsname {\simpleiconsmaptwo\symbol{117}} - \expandafter\def\csname simpleicon@bloggericon\endcsname {\simpleiconsmaptwo\symbol{118}} - \expandafter\def\csname simpleicon@bloglovinicon\endcsname {\simpleiconsmaptwo\symbol{119}} - \expandafter\def\csname simpleicon@blueprinticon\endcsname {\simpleiconsmaptwo\symbol{120}} - \expandafter\def\csname simpleicon@blueskyicon\endcsname {\simpleiconsmaptwo\symbol{121}} - \expandafter\def\csname simpleicon@bluesoundicon\endcsname {\simpleiconsmaptwo\symbol{122}} - \expandafter\def\csname simpleicon@bluetoothicon\endcsname {\simpleiconsmaptwo\symbol{123}} - \expandafter\def\csname simpleicon@bmcsoftwareicon\endcsname {\simpleiconsmaptwo\symbol{124}} - \expandafter\def\csname simpleicon@bmwicon\endcsname {\simpleiconsmaptwo\symbol{125}} - \expandafter\def\csname simpleicon@bnbchainicon\endcsname {\simpleiconsmaptwo\symbol{126}} - \expandafter\def\csname simpleicon@boardgamegeekicon\endcsname {\simpleiconsmaptwo\symbol{127}} - \expandafter\def\csname simpleicon@boaticon\endcsname {\simpleiconsmaptwo\symbol{128}} - \expandafter\def\csname simpleicon@boehringeringelheimicon\endcsname {\simpleiconsmaptwo\symbol{129}} - \expandafter\def\csname simpleicon@boeingicon\endcsname {\simpleiconsmaptwo\symbol{130}} - \expandafter\def\csname simpleicon@bombardiericon\endcsname {\simpleiconsmaptwo\symbol{131}} - \expandafter\def\csname simpleicon@bookalopeicon\endcsname {\simpleiconsmaptwo\symbol{132}} - \expandafter\def\csname simpleicon@bookbubicon\endcsname {\simpleiconsmaptwo\symbol{133}} - \expandafter\def\csname simpleicon@bookmetericon\endcsname {\simpleiconsmaptwo\symbol{134}} - \expandafter\def\csname simpleicon@bookmyshowicon\endcsname {\simpleiconsmaptwo\symbol{135}} - \expandafter\def\csname simpleicon@bookstackicon\endcsname {\simpleiconsmaptwo\symbol{136}} - \expandafter\def\csname simpleicon@boosticon\endcsname {\simpleiconsmaptwo\symbol{137}} - \expandafter\def\csname simpleicon@boostyicon\endcsname {\simpleiconsmaptwo\symbol{138}} - \expandafter\def\csname simpleicon@bootsicon\endcsname {\simpleiconsmaptwo\symbol{139}} - \expandafter\def\csname simpleicon@bootstrapicon\endcsname {\simpleiconsmaptwo\symbol{140}} - \expandafter\def\csname simpleicon@borgbackupicon\endcsname {\simpleiconsmaptwo\symbol{141}} - \expandafter\def\csname simpleicon@boschicon\endcsname {\simpleiconsmaptwo\symbol{142}} - \expandafter\def\csname simpleicon@boseicon\endcsname {\simpleiconsmaptwo\symbol{143}} - \expandafter\def\csname simpleicon@botblecmsicon\endcsname {\simpleiconsmaptwo\symbol{144}} - \expandafter\def\csname simpleicon@boulangericon\endcsname {\simpleiconsmaptwo\symbol{145}} - \expandafter\def\csname simpleicon@bowericon\endcsname {\simpleiconsmaptwo\symbol{146}} - \expandafter\def\csname simpleicon@boxicon\endcsname {\simpleiconsmaptwo\symbol{147}} - \expandafter\def\csname simpleicon@boxysvgicon\endcsname {\simpleiconsmaptwo\symbol{148}} - \expandafter\def\csname simpleicon@braintreeicon\endcsname {\simpleiconsmaptwo\symbol{149}} - \expandafter\def\csname simpleicon@brandfoldericon\endcsname {\simpleiconsmaptwo\symbol{150}} - \expandafter\def\csname simpleicon@braveicon\endcsname {\simpleiconsmaptwo\symbol{151}} - \expandafter\def\csname simpleicon@breakericon\endcsname {\simpleiconsmaptwo\symbol{152}} - \expandafter\def\csname simpleicon@brenntagicon\endcsname {\simpleiconsmaptwo\symbol{153}} - \expandafter\def\csname simpleicon@brevoicon\endcsname {\simpleiconsmaptwo\symbol{154}} - \expandafter\def\csname simpleicon@brexicon\endcsname {\simpleiconsmaptwo\symbol{155}} - \expandafter\def\csname simpleicon@bricksicon\endcsname {\simpleiconsmaptwo\symbol{156}} - \expandafter\def\csname simpleicon@britishairwaysicon\endcsname {\simpleiconsmaptwo\symbol{157}} - \expandafter\def\csname simpleicon@broadcomicon\endcsname {\simpleiconsmaptwo\symbol{158}} - \expandafter\def\csname simpleicon@brunoicon\endcsname {\simpleiconsmaptwo\symbol{159}} - \expandafter\def\csname simpleicon@bsdicon\endcsname {\simpleiconsmaptwo\symbol{160}} - \expandafter\def\csname simpleicon@bspwmicon\endcsname {\simpleiconsmaptwo\symbol{161}} - \expandafter\def\csname simpleicon@bticon\endcsname {\simpleiconsmaptwo\symbol{162}} - \expandafter\def\csname simpleicon@buddyicon\endcsname {\simpleiconsmaptwo\symbol{163}} - \expandafter\def\csname simpleicon@budibaseicon\endcsname {\simpleiconsmaptwo\symbol{164}} - \expandafter\def\csname simpleicon@buefyicon\endcsname {\simpleiconsmaptwo\symbol{165}} - \expandafter\def\csname simpleicon@buffericon\endcsname {\simpleiconsmaptwo\symbol{166}} - \expandafter\def\csname simpleicon@bugattiicon\endcsname {\simpleiconsmaptwo\symbol{167}} - \expandafter\def\csname simpleicon@bugcrowdicon\endcsname {\simpleiconsmaptwo\symbol{168}} - \expandafter\def\csname simpleicon@bugsnagicon\endcsname {\simpleiconsmaptwo\symbol{169}} - \expandafter\def\csname simpleicon@buhlicon\endcsname {\simpleiconsmaptwo\symbol{170}} - \expandafter\def\csname simpleicon@buildkiteicon\endcsname {\simpleiconsmaptwo\symbol{171}} - \expandafter\def\csname simpleicon@bukalapakicon\endcsname {\simpleiconsmaptwo\symbol{172}} - \expandafter\def\csname simpleicon@bulmaicon\endcsname {\simpleiconsmaptwo\symbol{173}} - \expandafter\def\csname simpleicon@bunicon\endcsname {\simpleiconsmaptwo\symbol{174}} - \expandafter\def\csname simpleicon@bungieicon\endcsname {\simpleiconsmaptwo\symbol{175}} - \expandafter\def\csname simpleicon@bunqicon\endcsname {\simpleiconsmaptwo\symbol{176}} - \expandafter\def\csname simpleicon@burgerkingicon\endcsname {\simpleiconsmaptwo\symbol{177}} - \expandafter\def\csname simpleicon@burpsuiteicon\endcsname {\simpleiconsmaptwo\symbol{178}} - \expandafter\def\csname simpleicon@burtonicon\endcsname {\simpleiconsmaptwo\symbol{179}} - \expandafter\def\csname simpleicon@buymeacoffeeicon\endcsname {\simpleiconsmaptwo\symbol{180}} - \expandafter\def\csname simpleicon@buyselladsicon\endcsname {\simpleiconsmaptwo\symbol{181}} - \expandafter\def\csname simpleicon@buzzfeedicon\endcsname {\simpleiconsmaptwo\symbol{182}} - \expandafter\def\csname simpleicon@bvgicon\endcsname {\simpleiconsmaptwo\symbol{183}} - \expandafter\def\csname simpleicon@byjusicon\endcsname {\simpleiconsmaptwo\symbol{184}} - \expandafter\def\csname simpleicon@bytedanceicon\endcsname {\simpleiconsmaptwo\symbol{185}} - \expandafter\def\csname simpleicon@cicon\endcsname {\simpleiconsmaptwo\symbol{186}} - \expandafter\def\csname simpleicon@cacheticon\endcsname {\simpleiconsmaptwo\symbol{187}} - \expandafter\def\csname simpleicon@caddyicon\endcsname {\simpleiconsmaptwo\symbol{188}} - \expandafter\def\csname simpleicon@cadillacicon\endcsname {\simpleiconsmaptwo\symbol{189}} - \expandafter\def\csname simpleicon@cafepressicon\endcsname {\simpleiconsmaptwo\symbol{190}} - \expandafter\def\csname simpleicon@caffeineicon\endcsname {\simpleiconsmaptwo\symbol{191}} - \expandafter\def\csname simpleicon@cairographicsicon\endcsname {\simpleiconsmaptwo\symbol{192}} - \expandafter\def\csname simpleicon@cairometroicon\endcsname {\simpleiconsmaptwo\symbol{193}} - \expandafter\def\csname simpleicon@cakephpicon\endcsname {\simpleiconsmaptwo\symbol{194}} - \expandafter\def\csname simpleicon@caldotcomicon\endcsname {\simpleiconsmaptwo\symbol{195}} - \expandafter\def\csname simpleicon@calendlyicon\endcsname {\simpleiconsmaptwo\symbol{196}} - \expandafter\def\csname simpleicon@calibrewebicon\endcsname {\simpleiconsmaptwo\symbol{197}} - \expandafter\def\csname simpleicon@campaignmonitoricon\endcsname {\simpleiconsmaptwo\symbol{198}} - \expandafter\def\csname simpleicon@camundaicon\endcsname {\simpleiconsmaptwo\symbol{199}} - \expandafter\def\csname simpleicon@canonicalicon\endcsname {\simpleiconsmaptwo\symbol{200}} - \expandafter\def\csname simpleicon@canvaicon\endcsname {\simpleiconsmaptwo\symbol{201}} - \expandafter\def\csname simpleicon@canvasicon\endcsname {\simpleiconsmaptwo\symbol{202}} - \expandafter\def\csname simpleicon@capacitoricon\endcsname {\simpleiconsmaptwo\symbol{203}} - \expandafter\def\csname simpleicon@cardanoicon\endcsname {\simpleiconsmaptwo\symbol{204}} - \expandafter\def\csname simpleicon@carlsberggroupicon\endcsname {\simpleiconsmaptwo\symbol{205}} - \expandafter\def\csname simpleicon@carrdicon\endcsname {\simpleiconsmaptwo\symbol{206}} - \expandafter\def\csname simpleicon@carrefouricon\endcsname {\simpleiconsmaptwo\symbol{207}} - \expandafter\def\csname simpleicon@carthrottleicon\endcsname {\simpleiconsmaptwo\symbol{208}} - \expandafter\def\csname simpleicon@cartoicon\endcsname {\simpleiconsmaptwo\symbol{209}} - \expandafter\def\csname simpleicon@cashappicon\endcsname {\simpleiconsmaptwo\symbol{210}} - \expandafter\def\csname simpleicon@castboxicon\endcsname {\simpleiconsmaptwo\symbol{211}} - \expandafter\def\csname simpleicon@castoramaicon\endcsname {\simpleiconsmaptwo\symbol{212}} - \expandafter\def\csname simpleicon@castroicon\endcsname {\simpleiconsmaptwo\symbol{213}} - \expandafter\def\csname simpleicon@caterpillaricon\endcsname {\simpleiconsmaptwo\symbol{214}} - \expandafter\def\csname simpleicon@cbcicon\endcsname {\simpleiconsmaptwo\symbol{215}} - \expandafter\def\csname simpleicon@cbsicon\endcsname {\simpleiconsmaptwo\symbol{216}} - \expandafter\def\csname simpleicon@ccleanericon\endcsname {\simpleiconsmaptwo\symbol{217}} - \expandafter\def\csname simpleicon@cdprojekticon\endcsname {\simpleiconsmaptwo\symbol{218}} - \expandafter\def\csname simpleicon@celeryicon\endcsname {\simpleiconsmaptwo\symbol{219}} - \expandafter\def\csname simpleicon@celestronicon\endcsname {\simpleiconsmaptwo\symbol{220}} - \expandafter\def\csname simpleicon@centosicon\endcsname {\simpleiconsmaptwo\symbol{221}} - \expandafter\def\csname simpleicon@cephicon\endcsname {\simpleiconsmaptwo\symbol{222}} - \expandafter\def\csname simpleicon@cesiumicon\endcsname {\simpleiconsmaptwo\symbol{223}} - \expandafter\def\csname simpleicon@chaiicon\endcsname {\simpleiconsmaptwo\symbol{224}} - \expandafter\def\csname simpleicon@chainguardicon\endcsname {\simpleiconsmaptwo\symbol{225}} - \expandafter\def\csname simpleicon@chainlinkicon\endcsname {\simpleiconsmaptwo\symbol{226}} - \expandafter\def\csname simpleicon@chakrauiicon\endcsname {\simpleiconsmaptwo\symbol{227}} - \expandafter\def\csname simpleicon@channel4icon\endcsname {\simpleiconsmaptwo\symbol{228}} - \expandafter\def\csname simpleicon@charlesicon\endcsname {\simpleiconsmaptwo\symbol{229}} - \expandafter\def\csname simpleicon@chartdotjsicon\endcsname {\simpleiconsmaptwo\symbol{230}} - \expandafter\def\csname simpleicon@chartmogulicon\endcsname {\simpleiconsmaptwo\symbol{231}} - \expandafter\def\csname simpleicon@chaseicon\endcsname {\simpleiconsmaptwo\symbol{232}} - \expandafter\def\csname simpleicon@chatboticon\endcsname {\simpleiconsmaptwo\symbol{233}} - \expandafter\def\csname simpleicon@chatwooticon\endcsname {\simpleiconsmaptwo\symbol{234}} - \expandafter\def\csname simpleicon@checkioicon\endcsname {\simpleiconsmaptwo\symbol{235}} - \expandafter\def\csname simpleicon@checkmarxicon\endcsname {\simpleiconsmaptwo\symbol{236}} - \expandafter\def\csname simpleicon@checkmkicon\endcsname {\simpleiconsmaptwo\symbol{237}} - \expandafter\def\csname simpleicon@chedrauiicon\endcsname {\simpleiconsmaptwo\symbol{238}} - \expandafter\def\csname simpleicon@cheerioicon\endcsname {\simpleiconsmaptwo\symbol{239}} - \expandafter\def\csname simpleicon@cheficon\endcsname {\simpleiconsmaptwo\symbol{240}} - \expandafter\def\csname simpleicon@chemexicon\endcsname {\simpleiconsmaptwo\symbol{241}} - \expandafter\def\csname simpleicon@chessdotcomicon\endcsname {\simpleiconsmaptwo\symbol{242}} - \expandafter\def\csname simpleicon@chevroleticon\endcsname {\simpleiconsmaptwo\symbol{243}} - \expandafter\def\csname simpleicon@chianetworkicon\endcsname {\simpleiconsmaptwo\symbol{244}} - \expandafter\def\csname simpleicon@chinaeasternairlinesicon\endcsname {\simpleiconsmaptwo\symbol{245}} - \expandafter\def\csname simpleicon@chinasouthernairlinesicon\endcsname {\simpleiconsmaptwo\symbol{246}} - \expandafter\def\csname simpleicon@chocolateyicon\endcsname {\simpleiconsmaptwo\symbol{247}} - \expandafter\def\csname simpleicon@chromaticicon\endcsname {\simpleiconsmaptwo\symbol{248}} - \expandafter\def\csname simpleicon@chromecasticon\endcsname {\simpleiconsmaptwo\symbol{249}} - \expandafter\def\csname simpleicon@chromewebstoreicon\endcsname {\simpleiconsmaptwo\symbol{250}} - \expandafter\def\csname simpleicon@chryslericon\endcsname {\simpleiconsmaptwo\symbol{251}} - \expandafter\def\csname simpleicon@chupachupsicon\endcsname {\simpleiconsmaptwo\symbol{252}} - \expandafter\def\csname simpleicon@ciliumicon\endcsname {\simpleiconsmaptwo\symbol{253}} - \expandafter\def\csname simpleicon@cinema4dicon\endcsname {\simpleiconsmaptwo\symbol{254}} - \expandafter\def\csname simpleicon@circleicon\endcsname {\simpleiconsmaptwo\symbol{255}} - \expandafter\def\csname simpleicon@circleciicon\endcsname {\simpleiconsmapthree\symbol{0}} - \expandafter\def\csname simpleicon@circuitverseicon\endcsname {\simpleiconsmapthree\symbol{1}} - \expandafter\def\csname simpleicon@cirrusciicon\endcsname {\simpleiconsmapthree\symbol{2}} - \expandafter\def\csname simpleicon@ciscoicon\endcsname {\simpleiconsmapthree\symbol{3}} - \expandafter\def\csname simpleicon@citrixicon\endcsname {\simpleiconsmapthree\symbol{4}} - \expandafter\def\csname simpleicon@citroenicon\endcsname {\simpleiconsmapthree\symbol{5}} - \expandafter\def\csname simpleicon@civicrmicon\endcsname {\simpleiconsmapthree\symbol{6}} - \expandafter\def\csname simpleicon@civoicon\endcsname {\simpleiconsmapthree\symbol{7}} - \expandafter\def\csname simpleicon@ckeditor4icon\endcsname {\simpleiconsmapthree\symbol{8}} - \expandafter\def\csname simpleicon@clarifaiicon\endcsname {\simpleiconsmapthree\symbol{9}} - \expandafter\def\csname simpleicon@clarisicon\endcsname {\simpleiconsmapthree\symbol{10}} - \expandafter\def\csname simpleicon@clarivateicon\endcsname {\simpleiconsmapthree\symbol{11}} - \expandafter\def\csname simpleicon@clerkicon\endcsname {\simpleiconsmapthree\symbol{12}} - \expandafter\def\csname simpleicon@clevercloudicon\endcsname {\simpleiconsmapthree\symbol{13}} - \expandafter\def\csname simpleicon@clickhouseicon\endcsname {\simpleiconsmapthree\symbol{14}} - \expandafter\def\csname simpleicon@clickupicon\endcsname {\simpleiconsmapthree\symbol{15}} - \expandafter\def\csname simpleicon@clionicon\endcsname {\simpleiconsmapthree\symbol{16}} - \expandafter\def\csname simpleicon@cliqzicon\endcsname {\simpleiconsmapthree\symbol{17}} - \expandafter\def\csname simpleicon@clockifyicon\endcsname {\simpleiconsmapthree\symbol{18}} - \expandafter\def\csname simpleicon@clojureicon\endcsname {\simpleiconsmapthree\symbol{19}} - \expandafter\def\csname simpleicon@cloud66icon\endcsname {\simpleiconsmapthree\symbol{20}} - \expandafter\def\csname simpleicon@cloudbeesicon\endcsname {\simpleiconsmapthree\symbol{21}} - \expandafter\def\csname simpleicon@cloudcannonicon\endcsname {\simpleiconsmapthree\symbol{22}} - \expandafter\def\csname simpleicon@clouderaicon\endcsname {\simpleiconsmapthree\symbol{23}} - \expandafter\def\csname simpleicon@cloudflareicon\endcsname {\simpleiconsmapthree\symbol{24}} - \expandafter\def\csname simpleicon@cloudflarepagesicon\endcsname {\simpleiconsmapthree\symbol{25}} - \expandafter\def\csname simpleicon@cloudflareworkersicon\endcsname {\simpleiconsmapthree\symbol{26}} - \expandafter\def\csname simpleicon@cloudfoundryicon\endcsname {\simpleiconsmapthree\symbol{27}} - \expandafter\def\csname simpleicon@cloudinaryicon\endcsname {\simpleiconsmapthree\symbol{28}} - \expandafter\def\csname simpleicon@cloudronicon\endcsname {\simpleiconsmapthree\symbol{29}} - \expandafter\def\csname simpleicon@cloudsmithicon\endcsname {\simpleiconsmapthree\symbol{30}} - \expandafter\def\csname simpleicon@cloudwaysicon\endcsname {\simpleiconsmapthree\symbol{31}} - \expandafter\def\csname simpleicon@clubforceicon\endcsname {\simpleiconsmapthree\symbol{32}} - \expandafter\def\csname simpleicon@clubhouseicon\endcsname {\simpleiconsmapthree\symbol{33}} - \expandafter\def\csname simpleicon@clypicon\endcsname {\simpleiconsmapthree\symbol{34}} - \expandafter\def\csname simpleicon@cmakeicon\endcsname {\simpleiconsmapthree\symbol{35}} - \expandafter\def\csname simpleicon@cncficon\endcsname {\simpleiconsmapthree\symbol{36}} - \expandafter\def\csname simpleicon@cneticon\endcsname {\simpleiconsmapthree\symbol{37}} - \expandafter\def\csname simpleicon@cnnicon\endcsname {\simpleiconsmapthree\symbol{38}} - \expandafter\def\csname simpleicon@cocacolaicon\endcsname {\simpleiconsmapthree\symbol{39}} - \expandafter\def\csname simpleicon@cockpiticon\endcsname {\simpleiconsmapthree\symbol{40}} - \expandafter\def\csname simpleicon@cockroachlabsicon\endcsname {\simpleiconsmapthree\symbol{41}} - \expandafter\def\csname simpleicon@cocoapodsicon\endcsname {\simpleiconsmapthree\symbol{42}} - \expandafter\def\csname simpleicon@cocosicon\endcsname {\simpleiconsmapthree\symbol{43}} - \expandafter\def\csname simpleicon@codaicon\endcsname {\simpleiconsmapthree\symbol{44}} - \expandafter\def\csname simpleicon@codacyicon\endcsname {\simpleiconsmapthree\symbol{45}} - \expandafter\def\csname simpleicon@codebergicon\endcsname {\simpleiconsmapthree\symbol{46}} - \expandafter\def\csname simpleicon@codeblocksicon\endcsname {\simpleiconsmapthree\symbol{47}} - \expandafter\def\csname simpleicon@codecademyicon\endcsname {\simpleiconsmapthree\symbol{48}} - \expandafter\def\csname simpleicon@codeceptjsicon\endcsname {\simpleiconsmapthree\symbol{49}} - \expandafter\def\csname simpleicon@codecheficon\endcsname {\simpleiconsmapthree\symbol{50}} - \expandafter\def\csname simpleicon@codeclimateicon\endcsname {\simpleiconsmapthree\symbol{51}} - \expandafter\def\csname simpleicon@codecovicon\endcsname {\simpleiconsmapthree\symbol{52}} - \expandafter\def\csname simpleicon@codefactoricon\endcsname {\simpleiconsmapthree\symbol{53}} - \expandafter\def\csname simpleicon@codeforcesicon\endcsname {\simpleiconsmapthree\symbol{54}} - \expandafter\def\csname simpleicon@codefreshicon\endcsname {\simpleiconsmapthree\symbol{55}} - \expandafter\def\csname simpleicon@codeignitericon\endcsname {\simpleiconsmapthree\symbol{56}} - \expandafter\def\csname simpleicon@codeiumicon\endcsname {\simpleiconsmapthree\symbol{57}} - \expandafter\def\csname simpleicon@codemagicicon\endcsname {\simpleiconsmapthree\symbol{58}} - \expandafter\def\csname simpleicon@codementoricon\endcsname {\simpleiconsmapthree\symbol{59}} - \expandafter\def\csname simpleicon@codemirroricon\endcsname {\simpleiconsmapthree\symbol{60}} - \expandafter\def\csname simpleicon@codenewbieicon\endcsname {\simpleiconsmapthree\symbol{61}} - \expandafter\def\csname simpleicon@codepenicon\endcsname {\simpleiconsmapthree\symbol{62}} - \expandafter\def\csname simpleicon@codeprojecticon\endcsname {\simpleiconsmapthree\symbol{63}} - \expandafter\def\csname simpleicon@codericon\endcsname {\simpleiconsmapthree\symbol{64}} - \expandafter\def\csname simpleicon@codersrankicon\endcsname {\simpleiconsmapthree\symbol{65}} - \expandafter\def\csname simpleicon@coderwallicon\endcsname {\simpleiconsmapthree\symbol{66}} - \expandafter\def\csname simpleicon@codesandboxicon\endcsname {\simpleiconsmapthree\symbol{67}} - \expandafter\def\csname simpleicon@codeshipicon\endcsname {\simpleiconsmapthree\symbol{68}} - \expandafter\def\csname simpleicon@codesignalicon\endcsname {\simpleiconsmapthree\symbol{69}} - \expandafter\def\csname simpleicon@codestreamicon\endcsname {\simpleiconsmapthree\symbol{70}} - \expandafter\def\csname simpleicon@codewarsicon\endcsname {\simpleiconsmapthree\symbol{71}} - \expandafter\def\csname simpleicon@codingameicon\endcsname {\simpleiconsmapthree\symbol{72}} - \expandafter\def\csname simpleicon@codingninjasicon\endcsname {\simpleiconsmapthree\symbol{73}} - \expandafter\def\csname simpleicon@codioicon\endcsname {\simpleiconsmapthree\symbol{74}} - \expandafter\def\csname simpleicon@coffeescripticon\endcsname {\simpleiconsmapthree\symbol{75}} - \expandafter\def\csname simpleicon@coggleicon\endcsname {\simpleiconsmapthree\symbol{76}} - \expandafter\def\csname simpleicon@cognizanticon\endcsname {\simpleiconsmapthree\symbol{77}} - \expandafter\def\csname simpleicon@coilicon\endcsname {\simpleiconsmapthree\symbol{78}} - \expandafter\def\csname simpleicon@coinbaseicon\endcsname {\simpleiconsmapthree\symbol{79}} - \expandafter\def\csname simpleicon@coinmarketcapicon\endcsname {\simpleiconsmapthree\symbol{80}} - \expandafter\def\csname simpleicon@comicfuryicon\endcsname {\simpleiconsmapthree\symbol{81}} - \expandafter\def\csname simpleicon@commaicon\endcsname {\simpleiconsmapthree\symbol{82}} - \expandafter\def\csname simpleicon@commerzbankicon\endcsname {\simpleiconsmapthree\symbol{83}} - \expandafter\def\csname simpleicon@commitlinticon\endcsname {\simpleiconsmapthree\symbol{84}} - \expandafter\def\csname simpleicon@commodoreicon\endcsname {\simpleiconsmapthree\symbol{85}} - \expandafter\def\csname simpleicon@commonworkflowlanguageicon\endcsname {\simpleiconsmapthree\symbol{86}} - \expandafter\def\csname simpleicon@compilerexplorericon\endcsname {\simpleiconsmapthree\symbol{87}} - \expandafter\def\csname simpleicon@composericon\endcsname {\simpleiconsmapthree\symbol{88}} - \expandafter\def\csname simpleicon@comptiaicon\endcsname {\simpleiconsmapthree\symbol{89}} - \expandafter\def\csname simpleicon@comsolicon\endcsname {\simpleiconsmapthree\symbol{90}} - \expandafter\def\csname simpleicon@conanicon\endcsname {\simpleiconsmapthree\symbol{91}} - \expandafter\def\csname simpleicon@concourseicon\endcsname {\simpleiconsmapthree\symbol{92}} - \expandafter\def\csname simpleicon@condaforgeicon\endcsname {\simpleiconsmapthree\symbol{93}} - \expandafter\def\csname simpleicon@conektaicon\endcsname {\simpleiconsmapthree\symbol{94}} - \expandafter\def\csname simpleicon@confluenceicon\endcsname {\simpleiconsmapthree\symbol{95}} - \expandafter\def\csname simpleicon@construct3icon\endcsname {\simpleiconsmapthree\symbol{96}} - \expandafter\def\csname simpleicon@consulicon\endcsname {\simpleiconsmapthree\symbol{97}} - \expandafter\def\csname simpleicon@contactlesspaymenticon\endcsname {\simpleiconsmapthree\symbol{98}} - \expandafter\def\csname simpleicon@containerdicon\endcsname {\simpleiconsmapthree\symbol{99}} - \expandafter\def\csname simpleicon@contaoicon\endcsname {\simpleiconsmapthree\symbol{100}} - \expandafter\def\csname simpleicon@contentfulicon\endcsname {\simpleiconsmapthree\symbol{101}} - \expandafter\def\csname simpleicon@contentstackicon\endcsname {\simpleiconsmapthree\symbol{102}} - \expandafter\def\csname simpleicon@contributorcovenanticon\endcsname {\simpleiconsmapthree\symbol{103}} - \expandafter\def\csname simpleicon@conventionalcommitsicon\endcsname {\simpleiconsmapthree\symbol{104}} - \expandafter\def\csname simpleicon@convertioicon\endcsname {\simpleiconsmapthree\symbol{105}} - \expandafter\def\csname simpleicon@cookiecuttericon\endcsname {\simpleiconsmapthree\symbol{106}} - \expandafter\def\csname simpleicon@coolermastericon\endcsname {\simpleiconsmapthree\symbol{107}} - \expandafter\def\csname simpleicon@coopicon\endcsname {\simpleiconsmapthree\symbol{108}} - \expandafter\def\csname simpleicon@copaairlinesicon\endcsname {\simpleiconsmapthree\symbol{109}} - \expandafter\def\csname simpleicon@coppelicon\endcsname {\simpleiconsmapthree\symbol{110}} - \expandafter\def\csname simpleicon@coraicon\endcsname {\simpleiconsmapthree\symbol{111}} - \expandafter\def\csname simpleicon@coreldrawicon\endcsname {\simpleiconsmapthree\symbol{112}} - \expandafter\def\csname simpleicon@coronaengineicon\endcsname {\simpleiconsmapthree\symbol{113}} - \expandafter\def\csname simpleicon@coronarenderericon\endcsname {\simpleiconsmapthree\symbol{114}} - \expandafter\def\csname simpleicon@corsairicon\endcsname {\simpleiconsmapthree\symbol{115}} - \expandafter\def\csname simpleicon@couchbaseicon\endcsname {\simpleiconsmapthree\symbol{116}} - \expandafter\def\csname simpleicon@counterstrikeicon\endcsname {\simpleiconsmapthree\symbol{117}} - \expandafter\def\csname simpleicon@countingworksproicon\endcsname {\simpleiconsmapthree\symbol{118}} - \expandafter\def\csname simpleicon@courseraicon\endcsname {\simpleiconsmapthree\symbol{119}} - \expandafter\def\csname simpleicon@coverallsicon\endcsname {\simpleiconsmapthree\symbol{120}} - \expandafter\def\csname simpleicon@cpanelicon\endcsname {\simpleiconsmapthree\symbol{121}} - \expandafter\def\csname simpleicon@cplusplusicon\endcsname {\simpleiconsmapthree\symbol{122}} - \expandafter\def\csname simpleicon@cplusplusbuildericon\endcsname {\simpleiconsmapthree\symbol{123}} - \expandafter\def\csname simpleicon@craftcmsicon\endcsname {\simpleiconsmapthree\symbol{124}} - \expandafter\def\csname simpleicon@craftsmanicon\endcsname {\simpleiconsmapthree\symbol{125}} - \expandafter\def\csname simpleicon@cratedbicon\endcsname {\simpleiconsmapthree\symbol{126}} - \expandafter\def\csname simpleicon@crayonicon\endcsname {\simpleiconsmapthree\symbol{127}} - \expandafter\def\csname simpleicon@crealityicon\endcsname {\simpleiconsmapthree\symbol{128}} - \expandafter\def\csname simpleicon@createreactappicon\endcsname {\simpleiconsmapthree\symbol{129}} - \expandafter\def\csname simpleicon@creativecommonsicon\endcsname {\simpleiconsmapthree\symbol{130}} - \expandafter\def\csname simpleicon@creativetechnologyicon\endcsname {\simpleiconsmapthree\symbol{131}} - \expandafter\def\csname simpleicon@credlyicon\endcsname {\simpleiconsmapthree\symbol{132}} - \expandafter\def\csname simpleicon@crehanaicon\endcsname {\simpleiconsmapthree\symbol{133}} - \expandafter\def\csname simpleicon@crewunitedicon\endcsname {\simpleiconsmapthree\symbol{134}} - \expandafter\def\csname simpleicon@criticalroleicon\endcsname {\simpleiconsmapthree\symbol{135}} - \expandafter\def\csname simpleicon@crowdinicon\endcsname {\simpleiconsmapthree\symbol{136}} - \expandafter\def\csname simpleicon@crowdsourceicon\endcsname {\simpleiconsmapthree\symbol{137}} - \expandafter\def\csname simpleicon@crunchbaseicon\endcsname {\simpleiconsmapthree\symbol{138}} - \expandafter\def\csname simpleicon@crunchyrollicon\endcsname {\simpleiconsmapthree\symbol{139}} - \expandafter\def\csname simpleicon@cryengineicon\endcsname {\simpleiconsmapthree\symbol{140}} - \expandafter\def\csname simpleicon@cryptpadicon\endcsname {\simpleiconsmapthree\symbol{141}} - \expandafter\def\csname simpleicon@crystalicon\endcsname {\simpleiconsmapthree\symbol{142}} - \expandafter\def\csname simpleicon@css3icon\endcsname {\simpleiconsmapthree\symbol{143}} - \expandafter\def\csname simpleicon@cssdesignawardsicon\endcsname {\simpleiconsmapthree\symbol{144}} - \expandafter\def\csname simpleicon@cssmodulesicon\endcsname {\simpleiconsmapthree\symbol{145}} - \expandafter\def\csname simpleicon@csswizardryicon\endcsname {\simpleiconsmapthree\symbol{146}} - \expandafter\def\csname simpleicon@ctsicon\endcsname {\simpleiconsmapthree\symbol{147}} - \expandafter\def\csname simpleicon@cucumbericon\endcsname {\simpleiconsmapthree\symbol{148}} - \expandafter\def\csname simpleicon@culturaicon\endcsname {\simpleiconsmapthree\symbol{149}} - \expandafter\def\csname simpleicon@curlicon\endcsname {\simpleiconsmapthree\symbol{150}} - \expandafter\def\csname simpleicon@curseforgeicon\endcsname {\simpleiconsmapthree\symbol{151}} - \expandafter\def\csname simpleicon@custominkicon\endcsname {\simpleiconsmapthree\symbol{152}} - \expandafter\def\csname simpleicon@cyberdefendersicon\endcsname {\simpleiconsmapthree\symbol{153}} - \expandafter\def\csname simpleicon@cycling74icon\endcsname {\simpleiconsmapthree\symbol{154}} - \expandafter\def\csname simpleicon@cypressicon\endcsname {\simpleiconsmapthree\symbol{155}} - \expandafter\def\csname simpleicon@cytoscapedotjsicon\endcsname {\simpleiconsmapthree\symbol{156}} - \expandafter\def\csname simpleicon@dicon\endcsname {\simpleiconsmapthree\symbol{157}} - \expandafter\def\csname simpleicon@d3dotjsicon\endcsname {\simpleiconsmapthree\symbol{158}} - \expandafter\def\csname simpleicon@daciaicon\endcsname {\simpleiconsmapthree\symbol{159}} - \expandafter\def\csname simpleicon@daficon\endcsname {\simpleiconsmapthree\symbol{160}} - \expandafter\def\csname simpleicon@dailydotdevicon\endcsname {\simpleiconsmapthree\symbol{161}} - \expandafter\def\csname simpleicon@dailymotionicon\endcsname {\simpleiconsmapthree\symbol{162}} - \expandafter\def\csname simpleicon@daisyuiicon\endcsname {\simpleiconsmapthree\symbol{163}} - \expandafter\def\csname simpleicon@dapricon\endcsname {\simpleiconsmapthree\symbol{164}} - \expandafter\def\csname simpleicon@darkreadericon\endcsname {\simpleiconsmapthree\symbol{165}} - \expandafter\def\csname simpleicon@darticon\endcsname {\simpleiconsmapthree\symbol{166}} - \expandafter\def\csname simpleicon@dartyicon\endcsname {\simpleiconsmapthree\symbol{167}} - \expandafter\def\csname simpleicon@dasersteicon\endcsname {\simpleiconsmapthree\symbol{168}} - \expandafter\def\csname simpleicon@dashicon\endcsname {\simpleiconsmapthree\symbol{169}} - \expandafter\def\csname simpleicon@dashlaneicon\endcsname {\simpleiconsmapthree\symbol{170}} - \expandafter\def\csname simpleicon@daskicon\endcsname {\simpleiconsmapthree\symbol{171}} - \expandafter\def\csname simpleicon@dassaultsystemesicon\endcsname {\simpleiconsmapthree\symbol{172}} - \expandafter\def\csname simpleicon@databricksicon\endcsname {\simpleiconsmapthree\symbol{173}} - \expandafter\def\csname simpleicon@datacampicon\endcsname {\simpleiconsmapthree\symbol{174}} - \expandafter\def\csname simpleicon@datadogicon\endcsname {\simpleiconsmapthree\symbol{175}} - \expandafter\def\csname simpleicon@datadotaiicon\endcsname {\simpleiconsmapthree\symbol{176}} - \expandafter\def\csname simpleicon@datagripicon\endcsname {\simpleiconsmapthree\symbol{177}} - \expandafter\def\csname simpleicon@dataikuicon\endcsname {\simpleiconsmapthree\symbol{178}} - \expandafter\def\csname simpleicon@datastaxicon\endcsname {\simpleiconsmapthree\symbol{179}} - \expandafter\def\csname simpleicon@datefnsicon\endcsname {\simpleiconsmapthree\symbol{180}} - \expandafter\def\csname simpleicon@datevicon\endcsname {\simpleiconsmapthree\symbol{181}} - \expandafter\def\csname simpleicon@datocmsicon\endcsname {\simpleiconsmapthree\symbol{182}} - \expandafter\def\csname simpleicon@dattoicon\endcsname {\simpleiconsmapthree\symbol{183}} - \expandafter\def\csname simpleicon@davinciresolveicon\endcsname {\simpleiconsmapthree\symbol{184}} - \expandafter\def\csname simpleicon@dazhongdianpingicon\endcsname {\simpleiconsmapthree\symbol{185}} - \expandafter\def\csname simpleicon@daznicon\endcsname {\simpleiconsmapthree\symbol{186}} - \expandafter\def\csname simpleicon@dbeavericon\endcsname {\simpleiconsmapthree\symbol{187}} - \expandafter\def\csname simpleicon@dblpicon\endcsname {\simpleiconsmapthree\symbol{188}} - \expandafter\def\csname simpleicon@dbticon\endcsname {\simpleiconsmapthree\symbol{189}} - \expandafter\def\csname simpleicon@dcentertainmenticon\endcsname {\simpleiconsmapthree\symbol{190}} - \expandafter\def\csname simpleicon@debianicon\endcsname {\simpleiconsmapthree\symbol{191}} - \expandafter\def\csname simpleicon@decapcmsicon\endcsname {\simpleiconsmapthree\symbol{192}} - \expandafter\def\csname simpleicon@decentralandicon\endcsname {\simpleiconsmapthree\symbol{193}} - \expandafter\def\csname simpleicon@dedgeicon\endcsname {\simpleiconsmapthree\symbol{194}} - \expandafter\def\csname simpleicon@deepcoolicon\endcsname {\simpleiconsmapthree\symbol{195}} - \expandafter\def\csname simpleicon@deepgramicon\endcsname {\simpleiconsmapthree\symbol{196}} - \expandafter\def\csname simpleicon@deepinicon\endcsname {\simpleiconsmapthree\symbol{197}} - \expandafter\def\csname simpleicon@deeplicon\endcsname {\simpleiconsmapthree\symbol{198}} - \expandafter\def\csname simpleicon@deepnoteicon\endcsname {\simpleiconsmapthree\symbol{199}} - \expandafter\def\csname simpleicon@deliciousicon\endcsname {\simpleiconsmapthree\symbol{200}} - \expandafter\def\csname simpleicon@deliverooicon\endcsname {\simpleiconsmapthree\symbol{201}} - \expandafter\def\csname simpleicon@dellicon\endcsname {\simpleiconsmapthree\symbol{202}} - \expandafter\def\csname simpleicon@delonghiicon\endcsname {\simpleiconsmapthree\symbol{203}} - \expandafter\def\csname simpleicon@delphiicon\endcsname {\simpleiconsmapthree\symbol{204}} - \expandafter\def\csname simpleicon@deltaicon\endcsname {\simpleiconsmapthree\symbol{205}} - \expandafter\def\csname simpleicon@delugeicon\endcsname {\simpleiconsmapthree\symbol{206}} - \expandafter\def\csname simpleicon@denoicon\endcsname {\simpleiconsmapthree\symbol{207}} - \expandafter\def\csname simpleicon@denonicon\endcsname {\simpleiconsmapthree\symbol{208}} - \expandafter\def\csname simpleicon@dependaboticon\endcsname {\simpleiconsmapthree\symbol{209}} - \expandafter\def\csname simpleicon@dependencycheckicon\endcsname {\simpleiconsmapthree\symbol{210}} - \expandafter\def\csname simpleicon@depositphotosicon\endcsname {\simpleiconsmapthree\symbol{211}} - \expandafter\def\csname simpleicon@derspiegelicon\endcsname {\simpleiconsmapthree\symbol{212}} - \expandafter\def\csname simpleicon@deutschebahnicon\endcsname {\simpleiconsmapthree\symbol{213}} - \expandafter\def\csname simpleicon@deutschebankicon\endcsname {\simpleiconsmapthree\symbol{214}} - \expandafter\def\csname simpleicon@deutscheposticon\endcsname {\simpleiconsmapthree\symbol{215}} - \expandafter\def\csname simpleicon@devdottoicon\endcsname {\simpleiconsmapthree\symbol{216}} - \expandafter\def\csname simpleicon@devexpressicon\endcsname {\simpleiconsmapthree\symbol{217}} - \expandafter\def\csname simpleicon@deviantarticon\endcsname {\simpleiconsmapthree\symbol{218}} - \expandafter\def\csname simpleicon@devposticon\endcsname {\simpleiconsmapthree\symbol{219}} - \expandafter\def\csname simpleicon@devranticon\endcsname {\simpleiconsmapthree\symbol{220}} - \expandafter\def\csname simpleicon@dgraphicon\endcsname {\simpleiconsmapthree\symbol{221}} - \expandafter\def\csname simpleicon@dhlicon\endcsname {\simpleiconsmapthree\symbol{222}} - \expandafter\def\csname simpleicon@diagramsdotneticon\endcsname {\simpleiconsmapthree\symbol{223}} - \expandafter\def\csname simpleicon@dialogflowicon\endcsname {\simpleiconsmapthree\symbol{224}} - \expandafter\def\csname simpleicon@diasporaicon\endcsname {\simpleiconsmapthree\symbol{225}} - \expandafter\def\csname simpleicon@dictionarydotcomicon\endcsname {\simpleiconsmapthree\symbol{226}} - \expandafter\def\csname simpleicon@diggicon\endcsname {\simpleiconsmapthree\symbol{227}} - \expandafter\def\csname simpleicon@digikeyelectronicsicon\endcsname {\simpleiconsmapthree\symbol{228}} - \expandafter\def\csname simpleicon@digitaloceanicon\endcsname {\simpleiconsmapthree\symbol{229}} - \expandafter\def\csname simpleicon@dinersclubicon\endcsname {\simpleiconsmapthree\symbol{230}} - \expandafter\def\csname simpleicon@dioricon\endcsname {\simpleiconsmapthree\symbol{231}} - \expandafter\def\csname simpleicon@directusicon\endcsname {\simpleiconsmapthree\symbol{232}} - \expandafter\def\csname simpleicon@discogsicon\endcsname {\simpleiconsmapthree\symbol{233}} - \expandafter\def\csname simpleicon@discordicon\endcsname {\simpleiconsmapthree\symbol{234}} - \expandafter\def\csname simpleicon@discourseicon\endcsname {\simpleiconsmapthree\symbol{235}} - \expandafter\def\csname simpleicon@discovericon\endcsname {\simpleiconsmapthree\symbol{236}} - \expandafter\def\csname simpleicon@disqusicon\endcsname {\simpleiconsmapthree\symbol{237}} - \expandafter\def\csname simpleicon@disrooticon\endcsname {\simpleiconsmapthree\symbol{238}} - \expandafter\def\csname simpleicon@distrokidicon\endcsname {\simpleiconsmapthree\symbol{239}} - \expandafter\def\csname simpleicon@djangoicon\endcsname {\simpleiconsmapthree\symbol{240}} - \expandafter\def\csname simpleicon@djiicon\endcsname {\simpleiconsmapthree\symbol{241}} - \expandafter\def\csname simpleicon@dlibicon\endcsname {\simpleiconsmapthree\symbol{242}} - \expandafter\def\csname simpleicon@dlnaicon\endcsname {\simpleiconsmapthree\symbol{243}} - \expandafter\def\csname simpleicon@dmicon\endcsname {\simpleiconsmapthree\symbol{244}} - \expandafter\def\csname simpleicon@dockericon\endcsname {\simpleiconsmapthree\symbol{245}} - \expandafter\def\csname simpleicon@docsdotrsicon\endcsname {\simpleiconsmapthree\symbol{246}} - \expandafter\def\csname simpleicon@docsifyicon\endcsname {\simpleiconsmapthree\symbol{247}} - \expandafter\def\csname simpleicon@doctrineicon\endcsname {\simpleiconsmapthree\symbol{248}} - \expandafter\def\csname simpleicon@docusaurusicon\endcsname {\simpleiconsmapthree\symbol{249}} - \expandafter\def\csname simpleicon@dogecoinicon\endcsname {\simpleiconsmapthree\symbol{250}} - \expandafter\def\csname simpleicon@doiicon\endcsname {\simpleiconsmapthree\symbol{251}} - \expandafter\def\csname simpleicon@dolbyicon\endcsname {\simpleiconsmapthree\symbol{252}} - \expandafter\def\csname simpleicon@doordashicon\endcsname {\simpleiconsmapthree\symbol{253}} - \expandafter\def\csname simpleicon@dota2icon\endcsname {\simpleiconsmapthree\symbol{254}} - \expandafter\def\csname simpleicon@dotenvicon\endcsname {\simpleiconsmapthree\symbol{255}} - \expandafter\def\csname simpleicon@dotneticon\endcsname {\simpleiconsmapfour\symbol{0}} - \expandafter\def\csname simpleicon@doubanicon\endcsname {\simpleiconsmapfour\symbol{1}} - \expandafter\def\csname simpleicon@doubanreadicon\endcsname {\simpleiconsmapfour\symbol{2}} - \expandafter\def\csname simpleicon@dovecoticon\endcsname {\simpleiconsmapfour\symbol{3}} - \expandafter\def\csname simpleicon@dovetailicon\endcsname {\simpleiconsmapfour\symbol{4}} - \expandafter\def\csname simpleicon@doxygenicon\endcsname {\simpleiconsmapfour\symbol{5}} - \expandafter\def\csname simpleicon@dpdicon\endcsname {\simpleiconsmapfour\symbol{6}} - \expandafter\def\csname simpleicon@dragonframeicon\endcsname {\simpleiconsmapfour\symbol{7}} - \expandafter\def\csname simpleicon@draugiemdotlvicon\endcsname {\simpleiconsmapfour\symbol{8}} - \expandafter\def\csname simpleicon@dreamstimeicon\endcsname {\simpleiconsmapfour\symbol{9}} - \expandafter\def\csname simpleicon@dribbbleicon\endcsname {\simpleiconsmapfour\symbol{10}} - \expandafter\def\csname simpleicon@drizzleicon\endcsname {\simpleiconsmapfour\symbol{11}} - \expandafter\def\csname simpleicon@droneicon\endcsname {\simpleiconsmapfour\symbol{12}} - \expandafter\def\csname simpleicon@droobleicon\endcsname {\simpleiconsmapfour\symbol{13}} - \expandafter\def\csname simpleicon@dropboxicon\endcsname {\simpleiconsmapfour\symbol{14}} - \expandafter\def\csname simpleicon@drupalicon\endcsname {\simpleiconsmapfour\symbol{15}} - \expandafter\def\csname simpleicon@dsautomobilesicon\endcsname {\simpleiconsmapfour\symbol{16}} - \expandafter\def\csname simpleicon@dtsicon\endcsname {\simpleiconsmapfour\symbol{17}} - \expandafter\def\csname simpleicon@dtubeicon\endcsname {\simpleiconsmapfour\symbol{18}} - \expandafter\def\csname simpleicon@ducatiicon\endcsname {\simpleiconsmapfour\symbol{19}} - \expandafter\def\csname simpleicon@duckdbicon\endcsname {\simpleiconsmapfour\symbol{20}} - \expandafter\def\csname simpleicon@duckduckgoicon\endcsname {\simpleiconsmapfour\symbol{21}} - \expandafter\def\csname simpleicon@dungeonsanddragonsicon\endcsname {\simpleiconsmapfour\symbol{22}} - \expandafter\def\csname simpleicon@dunkedicon\endcsname {\simpleiconsmapfour\symbol{23}} - \expandafter\def\csname simpleicon@dunzoicon\endcsname {\simpleiconsmapfour\symbol{24}} - \expandafter\def\csname simpleicon@duolingoicon\endcsname {\simpleiconsmapfour\symbol{25}} - \expandafter\def\csname simpleicon@duplicatiicon\endcsname {\simpleiconsmapfour\symbol{26}} - \expandafter\def\csname simpleicon@dvcicon\endcsname {\simpleiconsmapfour\symbol{27}} - \expandafter\def\csname simpleicon@dwavesystemsicon\endcsname {\simpleiconsmapfour\symbol{28}} - \expandafter\def\csname simpleicon@dwmicon\endcsname {\simpleiconsmapfour\symbol{29}} - \expandafter\def\csname simpleicon@dynatraceicon\endcsname {\simpleiconsmapfour\symbol{30}} - \expandafter\def\csname simpleicon@eicon\endcsname {\simpleiconsmapfour\symbol{31}} - \expandafter\def\csname simpleicon@e3icon\endcsname {\simpleiconsmapfour\symbol{32}} - \expandafter\def\csname simpleicon@eaicon\endcsname {\simpleiconsmapfour\symbol{33}} - \expandafter\def\csname simpleicon@eagleicon\endcsname {\simpleiconsmapfour\symbol{34}} - \expandafter\def\csname simpleicon@easyedaicon\endcsname {\simpleiconsmapfour\symbol{35}} - \expandafter\def\csname simpleicon@easyjeticon\endcsname {\simpleiconsmapfour\symbol{36}} - \expandafter\def\csname simpleicon@ebayicon\endcsname {\simpleiconsmapfour\symbol{37}} - \expandafter\def\csname simpleicon@eboxicon\endcsname {\simpleiconsmapfour\symbol{38}} - \expandafter\def\csname simpleicon@eclipseadoptiumicon\endcsname {\simpleiconsmapfour\symbol{39}} - \expandafter\def\csname simpleicon@eclipsecheicon\endcsname {\simpleiconsmapfour\symbol{40}} - \expandafter\def\csname simpleicon@eclipseideicon\endcsname {\simpleiconsmapfour\symbol{41}} - \expandafter\def\csname simpleicon@eclipsejettyicon\endcsname {\simpleiconsmapfour\symbol{42}} - \expandafter\def\csname simpleicon@eclipsemosquittoicon\endcsname {\simpleiconsmapfour\symbol{43}} - \expandafter\def\csname simpleicon@eclipsevertdotxicon\endcsname {\simpleiconsmapfour\symbol{44}} - \expandafter\def\csname simpleicon@ecovacsicon\endcsname {\simpleiconsmapfour\symbol{45}} - \expandafter\def\csname simpleicon@edekaicon\endcsname {\simpleiconsmapfour\symbol{46}} - \expandafter\def\csname simpleicon@edgeimpulseicon\endcsname {\simpleiconsmapfour\symbol{47}} - \expandafter\def\csname simpleicon@editorconfigicon\endcsname {\simpleiconsmapfour\symbol{48}} - \expandafter\def\csname simpleicon@edotleclercicon\endcsname {\simpleiconsmapfour\symbol{49}} - \expandafter\def\csname simpleicon@educativeicon\endcsname {\simpleiconsmapfour\symbol{50}} - \expandafter\def\csname simpleicon@edxicon\endcsname {\simpleiconsmapfour\symbol{51}} - \expandafter\def\csname simpleicon@eggheadicon\endcsname {\simpleiconsmapfour\symbol{52}} - \expandafter\def\csname simpleicon@egnyteicon\endcsname {\simpleiconsmapfour\symbol{53}} - \expandafter\def\csname simpleicon@eighticon\endcsname {\simpleiconsmapfour\symbol{54}} - \expandafter\def\csname simpleicon@eightsleepicon\endcsname {\simpleiconsmapfour\symbol{55}} - \expandafter\def\csname simpleicon@ejsicon\endcsname {\simpleiconsmapfour\symbol{56}} - \expandafter\def\csname simpleicon@elasticicon\endcsname {\simpleiconsmapfour\symbol{57}} - \expandafter\def\csname simpleicon@elasticcloudicon\endcsname {\simpleiconsmapfour\symbol{58}} - \expandafter\def\csname simpleicon@elasticsearchicon\endcsname {\simpleiconsmapfour\symbol{59}} - \expandafter\def\csname simpleicon@elasticstackicon\endcsname {\simpleiconsmapfour\symbol{60}} - \expandafter\def\csname simpleicon@elavonicon\endcsname {\simpleiconsmapfour\symbol{61}} - \expandafter\def\csname simpleicon@electronicon\endcsname {\simpleiconsmapfour\symbol{62}} - \expandafter\def\csname simpleicon@electronbuildericon\endcsname {\simpleiconsmapfour\symbol{63}} - \expandafter\def\csname simpleicon@electronfiddleicon\endcsname {\simpleiconsmapfour\symbol{64}} - \expandafter\def\csname simpleicon@elegooicon\endcsname {\simpleiconsmapfour\symbol{65}} - \expandafter\def\csname simpleicon@elementicon\endcsname {\simpleiconsmapfour\symbol{66}} - \expandafter\def\csname simpleicon@elementaryicon\endcsname {\simpleiconsmapfour\symbol{67}} - \expandafter\def\csname simpleicon@elementoricon\endcsname {\simpleiconsmapfour\symbol{68}} - \expandafter\def\csname simpleicon@eleventyicon\endcsname {\simpleiconsmapfour\symbol{69}} - \expandafter\def\csname simpleicon@elgatoicon\endcsname {\simpleiconsmapfour\symbol{70}} - \expandafter\def\csname simpleicon@elixiricon\endcsname {\simpleiconsmapfour\symbol{71}} - \expandafter\def\csname simpleicon@eljuevesicon\endcsname {\simpleiconsmapfour\symbol{72}} - \expandafter\def\csname simpleicon@elloicon\endcsname {\simpleiconsmapfour\symbol{73}} - \expandafter\def\csname simpleicon@elmicon\endcsname {\simpleiconsmapfour\symbol{74}} - \expandafter\def\csname simpleicon@elseviericon\endcsname {\simpleiconsmapfour\symbol{75}} - \expandafter\def\csname simpleicon@embarcaderoicon\endcsname {\simpleiconsmapfour\symbol{76}} - \expandafter\def\csname simpleicon@embarkicon\endcsname {\simpleiconsmapfour\symbol{77}} - \expandafter\def\csname simpleicon@emberdotjsicon\endcsname {\simpleiconsmapfour\symbol{78}} - \expandafter\def\csname simpleicon@embyicon\endcsname {\simpleiconsmapfour\symbol{79}} - \expandafter\def\csname simpleicon@emiratesicon\endcsname {\simpleiconsmapfour\symbol{80}} - \expandafter\def\csname simpleicon@emlakjeticon\endcsname {\simpleiconsmapfour\symbol{81}} - \expandafter\def\csname simpleicon@empirekredicon\endcsname {\simpleiconsmapfour\symbol{82}} - \expandafter\def\csname simpleicon@endeavourosicon\endcsname {\simpleiconsmapfour\symbol{83}} - \expandafter\def\csname simpleicon@engadgeticon\endcsname {\simpleiconsmapfour\symbol{84}} - \expandafter\def\csname simpleicon@enpassicon\endcsname {\simpleiconsmapfour\symbol{85}} - \expandafter\def\csname simpleicon@enterprisedbicon\endcsname {\simpleiconsmapfour\symbol{86}} - \expandafter\def\csname simpleicon@envatoicon\endcsname {\simpleiconsmapfour\symbol{87}} - \expandafter\def\csname simpleicon@envoyproxyicon\endcsname {\simpleiconsmapfour\symbol{88}} - \expandafter\def\csname simpleicon@epelicon\endcsname {\simpleiconsmapfour\symbol{89}} - \expandafter\def\csname simpleicon@epicgamesicon\endcsname {\simpleiconsmapfour\symbol{90}} - \expandafter\def\csname simpleicon@epsonicon\endcsname {\simpleiconsmapfour\symbol{91}} - \expandafter\def\csname simpleicon@equinixmetalicon\endcsname {\simpleiconsmapfour\symbol{92}} - \expandafter\def\csname simpleicon@erasericon\endcsname {\simpleiconsmapfour\symbol{93}} - \expandafter\def\csname simpleicon@ericssonicon\endcsname {\simpleiconsmapfour\symbol{94}} - \expandafter\def\csname simpleicon@erlangicon\endcsname {\simpleiconsmapfour\symbol{95}} - \expandafter\def\csname simpleicon@erpnexticon\endcsname {\simpleiconsmapfour\symbol{96}} - \expandafter\def\csname simpleicon@esbuildicon\endcsname {\simpleiconsmapfour\symbol{97}} - \expandafter\def\csname simpleicon@eseaicon\endcsname {\simpleiconsmapfour\symbol{98}} - \expandafter\def\csname simpleicon@eslgamingicon\endcsname {\simpleiconsmapfour\symbol{99}} - \expandafter\def\csname simpleicon@eslinticon\endcsname {\simpleiconsmapfour\symbol{100}} - \expandafter\def\csname simpleicon@esotericsoftwareicon\endcsname {\simpleiconsmapfour\symbol{101}} - \expandafter\def\csname simpleicon@esphomeicon\endcsname {\simpleiconsmapfour\symbol{102}} - \expandafter\def\csname simpleicon@espressificon\endcsname {\simpleiconsmapfour\symbol{103}} - \expandafter\def\csname simpleicon@esriicon\endcsname {\simpleiconsmapfour\symbol{104}} - \expandafter\def\csname simpleicon@etcdicon\endcsname {\simpleiconsmapfour\symbol{105}} - \expandafter\def\csname simpleicon@ethereumicon\endcsname {\simpleiconsmapfour\symbol{106}} - \expandafter\def\csname simpleicon@ethersicon\endcsname {\simpleiconsmapfour\symbol{107}} - \expandafter\def\csname simpleicon@ethiopianairlinesicon\endcsname {\simpleiconsmapfour\symbol{108}} - \expandafter\def\csname simpleicon@etihadairwaysicon\endcsname {\simpleiconsmapfour\symbol{109}} - \expandafter\def\csname simpleicon@etsyicon\endcsname {\simpleiconsmapfour\symbol{110}} - \expandafter\def\csname simpleicon@eventbriteicon\endcsname {\simpleiconsmapfour\symbol{111}} - \expandafter\def\csname simpleicon@eventstoreicon\endcsname {\simpleiconsmapfour\symbol{112}} - \expandafter\def\csname simpleicon@evernoteicon\endcsname {\simpleiconsmapfour\symbol{113}} - \expandafter\def\csname simpleicon@excalidrawicon\endcsname {\simpleiconsmapfour\symbol{114}} - \expandafter\def\csname simpleicon@exercismicon\endcsname {\simpleiconsmapfour\symbol{115}} - \expandafter\def\csname simpleicon@exordoicon\endcsname {\simpleiconsmapfour\symbol{116}} - \expandafter\def\csname simpleicon@exoscaleicon\endcsname {\simpleiconsmapfour\symbol{117}} - \expandafter\def\csname simpleicon@expediaicon\endcsname {\simpleiconsmapfour\symbol{118}} - \expandafter\def\csname simpleicon@expensifyicon\endcsname {\simpleiconsmapfour\symbol{119}} - \expandafter\def\csname simpleicon@expertsexchangeicon\endcsname {\simpleiconsmapfour\symbol{120}} - \expandafter\def\csname simpleicon@expoicon\endcsname {\simpleiconsmapfour\symbol{121}} - \expandafter\def\csname simpleicon@expressicon\endcsname {\simpleiconsmapfour\symbol{122}} - \expandafter\def\csname simpleicon@expressvpnicon\endcsname {\simpleiconsmapfour\symbol{123}} - \expandafter\def\csname simpleicon@eyeemicon\endcsname {\simpleiconsmapfour\symbol{124}} - \expandafter\def\csname simpleicon@f1icon\endcsname {\simpleiconsmapfour\symbol{125}} - \expandafter\def\csname simpleicon@f5icon\endcsname {\simpleiconsmapfour\symbol{126}} - \expandafter\def\csname simpleicon@facebookicon\endcsname {\simpleiconsmapfour\symbol{127}} - \expandafter\def\csname simpleicon@facebookgamingicon\endcsname {\simpleiconsmapfour\symbol{128}} - \expandafter\def\csname simpleicon@facebookliveicon\endcsname {\simpleiconsmapfour\symbol{129}} - \expandafter\def\csname simpleicon@faceiticon\endcsname {\simpleiconsmapfour\symbol{130}} - \expandafter\def\csname simpleicon@facepunchicon\endcsname {\simpleiconsmapfour\symbol{131}} - \expandafter\def\csname simpleicon@fairphoneicon\endcsname {\simpleiconsmapfour\symbol{132}} - \expandafter\def\csname simpleicon@falcoicon\endcsname {\simpleiconsmapfour\symbol{133}} - \expandafter\def\csname simpleicon@falconicon\endcsname {\simpleiconsmapfour\symbol{134}} - \expandafter\def\csname simpleicon@fampayicon\endcsname {\simpleiconsmapfour\symbol{135}} - \expandafter\def\csname simpleicon@fandangoicon\endcsname {\simpleiconsmapfour\symbol{136}} - \expandafter\def\csname simpleicon@fandomicon\endcsname {\simpleiconsmapfour\symbol{137}} - \expandafter\def\csname simpleicon@fanfouicon\endcsname {\simpleiconsmapfour\symbol{138}} - \expandafter\def\csname simpleicon@fantomicon\endcsname {\simpleiconsmapfour\symbol{139}} - \expandafter\def\csname simpleicon@farcastericon\endcsname {\simpleiconsmapfour\symbol{140}} - \expandafter\def\csname simpleicon@fareharboricon\endcsname {\simpleiconsmapfour\symbol{141}} - \expandafter\def\csname simpleicon@farfetchicon\endcsname {\simpleiconsmapfour\symbol{142}} - \expandafter\def\csname simpleicon@fastapiicon\endcsname {\simpleiconsmapfour\symbol{143}} - \expandafter\def\csname simpleicon@fastifyicon\endcsname {\simpleiconsmapfour\symbol{144}} - \expandafter\def\csname simpleicon@fastlaneicon\endcsname {\simpleiconsmapfour\symbol{145}} - \expandafter\def\csname simpleicon@fastlyicon\endcsname {\simpleiconsmapfour\symbol{146}} - \expandafter\def\csname simpleicon@fathomicon\endcsname {\simpleiconsmapfour\symbol{147}} - \expandafter\def\csname simpleicon@faunaicon\endcsname {\simpleiconsmapfour\symbol{148}} - \expandafter\def\csname simpleicon@favroicon\endcsname {\simpleiconsmapfour\symbol{149}} - \expandafter\def\csname simpleicon@fdroidicon\endcsname {\simpleiconsmapfour\symbol{150}} - \expandafter\def\csname simpleicon@feathubicon\endcsname {\simpleiconsmapfour\symbol{151}} - \expandafter\def\csname simpleicon@fedexicon\endcsname {\simpleiconsmapfour\symbol{152}} - \expandafter\def\csname simpleicon@fedoraicon\endcsname {\simpleiconsmapfour\symbol{153}} - \expandafter\def\csname simpleicon@feedlyicon\endcsname {\simpleiconsmapfour\symbol{154}} - \expandafter\def\csname simpleicon@ferrariicon\endcsname {\simpleiconsmapfour\symbol{155}} - \expandafter\def\csname simpleicon@ferrarinvicon\endcsname {\simpleiconsmapfour\symbol{156}} - \expandafter\def\csname simpleicon@ferretdbicon\endcsname {\simpleiconsmapfour\symbol{157}} - \expandafter\def\csname simpleicon@ffmpegicon\endcsname {\simpleiconsmapfour\symbol{158}} - \expandafter\def\csname simpleicon@fiicon\endcsname {\simpleiconsmapfour\symbol{159}} - \expandafter\def\csname simpleicon@fiaticon\endcsname {\simpleiconsmapfour\symbol{160}} - \expandafter\def\csname simpleicon@fidoallianceicon\endcsname {\simpleiconsmapfour\symbol{161}} - \expandafter\def\csname simpleicon@fifaicon\endcsname {\simpleiconsmapfour\symbol{162}} - \expandafter\def\csname simpleicon@figicon\endcsname {\simpleiconsmapfour\symbol{163}} - \expandafter\def\csname simpleicon@figmaicon\endcsname {\simpleiconsmapfour\symbol{164}} - \expandafter\def\csname simpleicon@figshareicon\endcsname {\simpleiconsmapfour\symbol{165}} - \expandafter\def\csname simpleicon@filaicon\endcsname {\simpleiconsmapfour\symbol{166}} - \expandafter\def\csname simpleicon@filedotioicon\endcsname {\simpleiconsmapfour\symbol{167}} - \expandafter\def\csname simpleicon@filesicon\endcsname {\simpleiconsmapfour\symbol{168}} - \expandafter\def\csname simpleicon@filezillaicon\endcsname {\simpleiconsmapfour\symbol{169}} - \expandafter\def\csname simpleicon@finecoicon\endcsname {\simpleiconsmapfour\symbol{170}} - \expandafter\def\csname simpleicon@fingicon\endcsname {\simpleiconsmapfour\symbol{171}} - \expandafter\def\csname simpleicon@firebaseicon\endcsname {\simpleiconsmapfour\symbol{172}} - \expandafter\def\csname simpleicon@firefishicon\endcsname {\simpleiconsmapfour\symbol{173}} - \expandafter\def\csname simpleicon@fireflyiiiicon\endcsname {\simpleiconsmapfour\symbol{174}} - \expandafter\def\csname simpleicon@firefoxicon\endcsname {\simpleiconsmapfour\symbol{175}} - \expandafter\def\csname simpleicon@firefoxbrowsericon\endcsname {\simpleiconsmapfour\symbol{176}} - \expandafter\def\csname simpleicon@fireshipicon\endcsname {\simpleiconsmapfour\symbol{177}} - \expandafter\def\csname simpleicon@firewallaicon\endcsname {\simpleiconsmapfour\symbol{178}} - \expandafter\def\csname simpleicon@firsticon\endcsname {\simpleiconsmapfour\symbol{179}} - \expandafter\def\csname simpleicon@fishshellicon\endcsname {\simpleiconsmapfour\symbol{180}} - \expandafter\def\csname simpleicon@fitbiticon\endcsname {\simpleiconsmapfour\symbol{181}} - \expandafter\def\csname simpleicon@fivemicon\endcsname {\simpleiconsmapfour\symbol{182}} - \expandafter\def\csname simpleicon@fiverricon\endcsname {\simpleiconsmapfour\symbol{183}} - \expandafter\def\csname simpleicon@fizzicon\endcsname {\simpleiconsmapfour\symbol{184}} - \expandafter\def\csname simpleicon@flashforgeicon\endcsname {\simpleiconsmapfour\symbol{185}} - \expandafter\def\csname simpleicon@flaskicon\endcsname {\simpleiconsmapfour\symbol{186}} - \expandafter\def\csname simpleicon@flaticon\endcsname {\simpleiconsmapfour\symbol{187}} - \expandafter\def\csname simpleicon@flathubicon\endcsname {\simpleiconsmapfour\symbol{188}} - \expandafter\def\csname simpleicon@flatpakicon\endcsname {\simpleiconsmapfour\symbol{189}} - \expandafter\def\csname simpleicon@flickricon\endcsname {\simpleiconsmapfour\symbol{190}} - \expandafter\def\csname simpleicon@flightawareicon\endcsname {\simpleiconsmapfour\symbol{191}} - \expandafter\def\csname simpleicon@flipboardicon\endcsname {\simpleiconsmapfour\symbol{192}} - \expandafter\def\csname simpleicon@flipkarticon\endcsname {\simpleiconsmapfour\symbol{193}} - \expandafter\def\csname simpleicon@floatplaneicon\endcsname {\simpleiconsmapfour\symbol{194}} - \expandafter\def\csname simpleicon@floodicon\endcsname {\simpleiconsmapfour\symbol{195}} - \expandafter\def\csname simpleicon@fluentbiticon\endcsname {\simpleiconsmapfour\symbol{196}} - \expandafter\def\csname simpleicon@fluentdicon\endcsname {\simpleiconsmapfour\symbol{197}} - \expandafter\def\csname simpleicon@flukeicon\endcsname {\simpleiconsmapfour\symbol{198}} - \expandafter\def\csname simpleicon@fluttericon\endcsname {\simpleiconsmapfour\symbol{199}} - \expandafter\def\csname simpleicon@fluxicon\endcsname {\simpleiconsmapfour\symbol{200}} - \expandafter\def\csname simpleicon@fluxusicon\endcsname {\simpleiconsmapfour\symbol{201}} - \expandafter\def\csname simpleicon@flywayicon\endcsname {\simpleiconsmapfour\symbol{202}} - \expandafter\def\csname simpleicon@fmodicon\endcsname {\simpleiconsmapfour\symbol{203}} - \expandafter\def\csname simpleicon@fnacicon\endcsname {\simpleiconsmapfour\symbol{204}} - \expandafter\def\csname simpleicon@foliumicon\endcsname {\simpleiconsmapfour\symbol{205}} - \expandafter\def\csname simpleicon@fonomaicon\endcsname {\simpleiconsmapfour\symbol{206}} - \expandafter\def\csname simpleicon@fontawesomeicon\endcsname {\simpleiconsmapfour\symbol{207}} - \expandafter\def\csname simpleicon@fontbaseicon\endcsname {\simpleiconsmapfour\symbol{208}} - \expandafter\def\csname simpleicon@fontforgeicon\endcsname {\simpleiconsmapfour\symbol{209}} - \expandafter\def\csname simpleicon@foobar2000icon\endcsname {\simpleiconsmapfour\symbol{210}} - \expandafter\def\csname simpleicon@foodpandaicon\endcsname {\simpleiconsmapfour\symbol{211}} - \expandafter\def\csname simpleicon@fordicon\endcsname {\simpleiconsmapfour\symbol{212}} - \expandafter\def\csname simpleicon@forgejoicon\endcsname {\simpleiconsmapfour\symbol{213}} - \expandafter\def\csname simpleicon@formikicon\endcsname {\simpleiconsmapfour\symbol{214}} - \expandafter\def\csname simpleicon@formspreeicon\endcsname {\simpleiconsmapfour\symbol{215}} - \expandafter\def\csname simpleicon@formstackicon\endcsname {\simpleiconsmapfour\symbol{216}} - \expandafter\def\csname simpleicon@fortineticon\endcsname {\simpleiconsmapfour\symbol{217}} - \expandafter\def\csname simpleicon@fortranicon\endcsname {\simpleiconsmapfour\symbol{218}} - \expandafter\def\csname simpleicon@fossaicon\endcsname {\simpleiconsmapfour\symbol{219}} - \expandafter\def\csname simpleicon@fossilscmicon\endcsname {\simpleiconsmapfour\symbol{220}} - \expandafter\def\csname simpleicon@foundryvirtualtabletopicon\endcsname {\simpleiconsmapfour\symbol{221}} - \expandafter\def\csname simpleicon@foursquareicon\endcsname {\simpleiconsmapfour\symbol{222}} - \expandafter\def\csname simpleicon@foursquarecityguideicon\endcsname {\simpleiconsmapfour\symbol{223}} - \expandafter\def\csname simpleicon@foxicon\endcsname {\simpleiconsmapfour\symbol{224}} - \expandafter\def\csname simpleicon@foxtelicon\endcsname {\simpleiconsmapfour\symbol{225}} - \expandafter\def\csname simpleicon@fozzyicon\endcsname {\simpleiconsmapfour\symbol{226}} - \expandafter\def\csname simpleicon@framericon\endcsname {\simpleiconsmapfour\symbol{227}} - \expandafter\def\csname simpleicon@frameworkicon\endcsname {\simpleiconsmapfour\symbol{228}} - \expandafter\def\csname simpleicon@framework7icon\endcsname {\simpleiconsmapfour\symbol{229}} - \expandafter\def\csname simpleicon@franprixicon\endcsname {\simpleiconsmapfour\symbol{230}} - \expandafter\def\csname simpleicon@frappeicon\endcsname {\simpleiconsmapfour\symbol{231}} - \expandafter\def\csname simpleicon@fraunhofergesellschafticon\endcsname {\simpleiconsmapfour\symbol{232}} - \expandafter\def\csname simpleicon@freebsdicon\endcsname {\simpleiconsmapfour\symbol{233}} - \expandafter\def\csname simpleicon@freecadicon\endcsname {\simpleiconsmapfour\symbol{234}} - \expandafter\def\csname simpleicon@freecodecampicon\endcsname {\simpleiconsmapfour\symbol{235}} - \expandafter\def\csname simpleicon@freedesktopdotorgicon\endcsname {\simpleiconsmapfour\symbol{236}} - \expandafter\def\csname simpleicon@freelancericon\endcsname {\simpleiconsmapfour\symbol{237}} - \expandafter\def\csname simpleicon@freelancermapicon\endcsname {\simpleiconsmapfour\symbol{238}} - \expandafter\def\csname simpleicon@freenasicon\endcsname {\simpleiconsmapfour\symbol{239}} - \expandafter\def\csname simpleicon@freepikicon\endcsname {\simpleiconsmapfour\symbol{240}} - \expandafter\def\csname simpleicon@frontendmentoricon\endcsname {\simpleiconsmapfour\symbol{241}} - \expandafter\def\csname simpleicon@frontifyicon\endcsname {\simpleiconsmapfour\symbol{242}} - \expandafter\def\csname simpleicon@fsecureicon\endcsname {\simpleiconsmapfour\symbol{243}} - \expandafter\def\csname simpleicon@fsharpicon\endcsname {\simpleiconsmapfour\symbol{244}} - \expandafter\def\csname simpleicon@fuboicon\endcsname {\simpleiconsmapfour\symbol{245}} - \expandafter\def\csname simpleicon@fuelericon\endcsname {\simpleiconsmapfour\symbol{246}} - \expandafter\def\csname simpleicon@fugacloudicon\endcsname {\simpleiconsmapfour\symbol{247}} - \expandafter\def\csname simpleicon@fujifilmicon\endcsname {\simpleiconsmapfour\symbol{248}} - \expandafter\def\csname simpleicon@fujitsuicon\endcsname {\simpleiconsmapfour\symbol{249}} - \expandafter\def\csname simpleicon@funimationicon\endcsname {\simpleiconsmapfour\symbol{250}} - \expandafter\def\csname simpleicon@furaffinityicon\endcsname {\simpleiconsmapfour\symbol{251}} - \expandafter\def\csname simpleicon@furrynetworkicon\endcsname {\simpleiconsmapfour\symbol{252}} - \expandafter\def\csname simpleicon@fusionauthicon\endcsname {\simpleiconsmapfour\symbol{253}} - \expandafter\def\csname simpleicon@futurelearnicon\endcsname {\simpleiconsmapfour\symbol{254}} - \expandafter\def\csname simpleicon@g2icon\endcsname {\simpleiconsmapfour\symbol{255}} - \expandafter\def\csname simpleicon@g2aicon\endcsname {\simpleiconsmapfive\symbol{0}} - \expandafter\def\csname simpleicon@g2gicon\endcsname {\simpleiconsmapfive\symbol{1}} - \expandafter\def\csname simpleicon@galaxusicon\endcsname {\simpleiconsmapfive\symbol{2}} - \expandafter\def\csname simpleicon@gameandwatchicon\endcsname {\simpleiconsmapfive\symbol{3}} - \expandafter\def\csname simpleicon@gamebananaicon\endcsname {\simpleiconsmapfive\symbol{4}} - \expandafter\def\csname simpleicon@gamedevelopericon\endcsname {\simpleiconsmapfive\symbol{5}} - \expandafter\def\csname simpleicon@gamejolticon\endcsname {\simpleiconsmapfive\symbol{6}} - \expandafter\def\csname simpleicon@gamelofticon\endcsname {\simpleiconsmapfive\symbol{7}} - \expandafter\def\csname simpleicon@gamemakericon\endcsname {\simpleiconsmapfive\symbol{8}} - \expandafter\def\csname simpleicon@garminicon\endcsname {\simpleiconsmapfive\symbol{9}} - \expandafter\def\csname simpleicon@gatlingicon\endcsname {\simpleiconsmapfive\symbol{10}} - \expandafter\def\csname simpleicon@gatsbyicon\endcsname {\simpleiconsmapfive\symbol{11}} - \expandafter\def\csname simpleicon@gcoreicon\endcsname {\simpleiconsmapfive\symbol{12}} - \expandafter\def\csname simpleicon@gdalicon\endcsname {\simpleiconsmapfive\symbol{13}} - \expandafter\def\csname simpleicon@geanticon\endcsname {\simpleiconsmapfive\symbol{14}} - \expandafter\def\csname simpleicon@geeksforgeeksicon\endcsname {\simpleiconsmapfive\symbol{15}} - \expandafter\def\csname simpleicon@generalelectricicon\endcsname {\simpleiconsmapfive\symbol{16}} - \expandafter\def\csname simpleicon@generalmotorsicon\endcsname {\simpleiconsmapfive\symbol{17}} - \expandafter\def\csname simpleicon@geniusicon\endcsname {\simpleiconsmapfive\symbol{18}} - \expandafter\def\csname simpleicon@gentooicon\endcsname {\simpleiconsmapfive\symbol{19}} - \expandafter\def\csname simpleicon@geocachingicon\endcsname {\simpleiconsmapfive\symbol{20}} - \expandafter\def\csname simpleicon@geodeicon\endcsname {\simpleiconsmapfive\symbol{21}} - \expandafter\def\csname simpleicon@geopandasicon\endcsname {\simpleiconsmapfive\symbol{22}} - \expandafter\def\csname simpleicon@gerriticon\endcsname {\simpleiconsmapfive\symbol{23}} - \expandafter\def\csname simpleicon@getxicon\endcsname {\simpleiconsmapfive\symbol{24}} - \expandafter\def\csname simpleicon@ghosticon\endcsname {\simpleiconsmapfive\symbol{25}} - \expandafter\def\csname simpleicon@ghosteryicon\endcsname {\simpleiconsmapfive\symbol{26}} - \expandafter\def\csname simpleicon@gimpicon\endcsname {\simpleiconsmapfive\symbol{27}} - \expandafter\def\csname simpleicon@ginicon\endcsname {\simpleiconsmapfive\symbol{28}} - \expandafter\def\csname simpleicon@giphyicon\endcsname {\simpleiconsmapfive\symbol{29}} - \expandafter\def\csname simpleicon@giticon\endcsname {\simpleiconsmapfive\symbol{30}} - \expandafter\def\csname simpleicon@gitbookicon\endcsname {\simpleiconsmapfive\symbol{31}} - \expandafter\def\csname simpleicon@gitconnectedicon\endcsname {\simpleiconsmapfive\symbol{32}} - \expandafter\def\csname simpleicon@giteaicon\endcsname {\simpleiconsmapfive\symbol{33}} - \expandafter\def\csname simpleicon@giteeicon\endcsname {\simpleiconsmapfive\symbol{34}} - \expandafter\def\csname simpleicon@gitextensionsicon\endcsname {\simpleiconsmapfive\symbol{35}} - \expandafter\def\csname simpleicon@gitforwindowsicon\endcsname {\simpleiconsmapfive\symbol{36}} - \expandafter\def\csname simpleicon@githubicon\endcsname {\simpleiconsmapfive\symbol{37}} - \expandafter\def\csname simpleicon@githubactionsicon\endcsname {\simpleiconsmapfive\symbol{38}} - \expandafter\def\csname simpleicon@githubcopiloticon\endcsname {\simpleiconsmapfive\symbol{39}} - \expandafter\def\csname simpleicon@githubpagesicon\endcsname {\simpleiconsmapfive\symbol{40}} - \expandafter\def\csname simpleicon@githubsponsorsicon\endcsname {\simpleiconsmapfive\symbol{41}} - \expandafter\def\csname simpleicon@gitignoredotioicon\endcsname {\simpleiconsmapfive\symbol{42}} - \expandafter\def\csname simpleicon@gitkrakenicon\endcsname {\simpleiconsmapfive\symbol{43}} - \expandafter\def\csname simpleicon@gitlabicon\endcsname {\simpleiconsmapfive\symbol{44}} - \expandafter\def\csname simpleicon@gitlfsicon\endcsname {\simpleiconsmapfive\symbol{45}} - \expandafter\def\csname simpleicon@gitpodicon\endcsname {\simpleiconsmapfive\symbol{46}} - \expandafter\def\csname simpleicon@gittericon\endcsname {\simpleiconsmapfive\symbol{47}} - \expandafter\def\csname simpleicon@glassdooricon\endcsname {\simpleiconsmapfive\symbol{48}} - \expandafter\def\csname simpleicon@glideicon\endcsname {\simpleiconsmapfive\symbol{49}} - \expandafter\def\csname simpleicon@glitchicon\endcsname {\simpleiconsmapfive\symbol{50}} - \expandafter\def\csname simpleicon@globusicon\endcsname {\simpleiconsmapfive\symbol{51}} - \expandafter\def\csname simpleicon@glovoicon\endcsname {\simpleiconsmapfive\symbol{52}} - \expandafter\def\csname simpleicon@gltficon\endcsname {\simpleiconsmapfive\symbol{53}} - \expandafter\def\csname simpleicon@gmailicon\endcsname {\simpleiconsmapfive\symbol{54}} - \expandafter\def\csname simpleicon@gnomeicon\endcsname {\simpleiconsmapfive\symbol{55}} - \expandafter\def\csname simpleicon@gnometerminalicon\endcsname {\simpleiconsmapfive\symbol{56}} - \expandafter\def\csname simpleicon@gnuicon\endcsname {\simpleiconsmapfive\symbol{57}} - \expandafter\def\csname simpleicon@gnubashicon\endcsname {\simpleiconsmapfive\symbol{58}} - \expandafter\def\csname simpleicon@gnuemacsicon\endcsname {\simpleiconsmapfive\symbol{59}} - \expandafter\def\csname simpleicon@gnuicecaticon\endcsname {\simpleiconsmapfive\symbol{60}} - \expandafter\def\csname simpleicon@gnuprivacyguardicon\endcsname {\simpleiconsmapfive\symbol{61}} - \expandafter\def\csname simpleicon@gnusocialicon\endcsname {\simpleiconsmapfive\symbol{62}} - \expandafter\def\csname simpleicon@goicon\endcsname {\simpleiconsmapfive\symbol{63}} - \expandafter\def\csname simpleicon@gocdicon\endcsname {\simpleiconsmapfive\symbol{64}} - \expandafter\def\csname simpleicon@godaddyicon\endcsname {\simpleiconsmapfive\symbol{65}} - \expandafter\def\csname simpleicon@godotengineicon\endcsname {\simpleiconsmapfive\symbol{66}} - \expandafter\def\csname simpleicon@gofundmeicon\endcsname {\simpleiconsmapfive\symbol{67}} - \expandafter\def\csname simpleicon@gogdotcomicon\endcsname {\simpleiconsmapfive\symbol{68}} - \expandafter\def\csname simpleicon@gojekicon\endcsname {\simpleiconsmapfive\symbol{69}} - \expandafter\def\csname simpleicon@golandicon\endcsname {\simpleiconsmapfive\symbol{70}} - \expandafter\def\csname simpleicon@goldenlineicon\endcsname {\simpleiconsmapfive\symbol{71}} - \expandafter\def\csname simpleicon@goldmansachsicon\endcsname {\simpleiconsmapfive\symbol{72}} - \expandafter\def\csname simpleicon@goodreadsicon\endcsname {\simpleiconsmapfive\symbol{73}} - \expandafter\def\csname simpleicon@googleicon\endcsname {\simpleiconsmapfive\symbol{74}} - \expandafter\def\csname simpleicon@googleadmobicon\endcsname {\simpleiconsmapfive\symbol{75}} - \expandafter\def\csname simpleicon@googleadsicon\endcsname {\simpleiconsmapfive\symbol{76}} - \expandafter\def\csname simpleicon@googleadsenseicon\endcsname {\simpleiconsmapfive\symbol{77}} - \expandafter\def\csname simpleicon@googleanalyticsicon\endcsname {\simpleiconsmapfive\symbol{78}} - \expandafter\def\csname simpleicon@googleappsscripticon\endcsname {\simpleiconsmapfive\symbol{79}} - \expandafter\def\csname simpleicon@googleassistanticon\endcsname {\simpleiconsmapfive\symbol{80}} - \expandafter\def\csname simpleicon@googleauthenticatoricon\endcsname {\simpleiconsmapfive\symbol{81}} - \expandafter\def\csname simpleicon@googlebigqueryicon\endcsname {\simpleiconsmapfive\symbol{82}} - \expandafter\def\csname simpleicon@googlebigtableicon\endcsname {\simpleiconsmapfive\symbol{83}} - \expandafter\def\csname simpleicon@googlecalendaricon\endcsname {\simpleiconsmapfive\symbol{84}} - \expandafter\def\csname simpleicon@googlecampaignmanager360icon\endcsname {\simpleiconsmapfive\symbol{85}} - \expandafter\def\csname simpleicon@googlecardboardicon\endcsname {\simpleiconsmapfive\symbol{86}} - \expandafter\def\csname simpleicon@googlechaticon\endcsname {\simpleiconsmapfive\symbol{87}} - \expandafter\def\csname simpleicon@googlechromeicon\endcsname {\simpleiconsmapfive\symbol{88}} - \expandafter\def\csname simpleicon@googlechronicleicon\endcsname {\simpleiconsmapfive\symbol{89}} - \expandafter\def\csname simpleicon@googleclassroomicon\endcsname {\simpleiconsmapfive\symbol{90}} - \expandafter\def\csname simpleicon@googlecloudicon\endcsname {\simpleiconsmapfive\symbol{91}} - \expandafter\def\csname simpleicon@googlecloudcomposericon\endcsname {\simpleiconsmapfive\symbol{92}} - \expandafter\def\csname simpleicon@googlecloudspannericon\endcsname {\simpleiconsmapfive\symbol{93}} - \expandafter\def\csname simpleicon@googlecloudstorageicon\endcsname {\simpleiconsmapfive\symbol{94}} - \expandafter\def\csname simpleicon@googlecolabicon\endcsname {\simpleiconsmapfive\symbol{95}} - \expandafter\def\csname simpleicon@googlecontaineroptimizedosicon\endcsname {\simpleiconsmapfive\symbol{96}} - \expandafter\def\csname simpleicon@googledataflowicon\endcsname {\simpleiconsmapfive\symbol{97}} - \expandafter\def\csname simpleicon@googledataprocicon\endcsname {\simpleiconsmapfive\symbol{98}} - \expandafter\def\csname simpleicon@googledatastudioicon\endcsname {\simpleiconsmapfive\symbol{99}} - \expandafter\def\csname simpleicon@googledisplayandvideo360icon\endcsname {\simpleiconsmapfive\symbol{100}} - \expandafter\def\csname simpleicon@googledocsicon\endcsname {\simpleiconsmapfive\symbol{101}} - \expandafter\def\csname simpleicon@googledriveicon\endcsname {\simpleiconsmapfive\symbol{102}} - \expandafter\def\csname simpleicon@googleearthicon\endcsname {\simpleiconsmapfive\symbol{103}} - \expandafter\def\csname simpleicon@googleearthengineicon\endcsname {\simpleiconsmapfive\symbol{104}} - \expandafter\def\csname simpleicon@googlefiticon\endcsname {\simpleiconsmapfive\symbol{105}} - \expandafter\def\csname simpleicon@googlefontsicon\endcsname {\simpleiconsmapfive\symbol{106}} - \expandafter\def\csname simpleicon@googleformsicon\endcsname {\simpleiconsmapfive\symbol{107}} - \expandafter\def\csname simpleicon@googlegeminiicon\endcsname {\simpleiconsmapfive\symbol{108}} - \expandafter\def\csname simpleicon@googlehomeicon\endcsname {\simpleiconsmapfive\symbol{109}} - \expandafter\def\csname simpleicon@googlekeepicon\endcsname {\simpleiconsmapfive\symbol{110}} - \expandafter\def\csname simpleicon@googlelensicon\endcsname {\simpleiconsmapfive\symbol{111}} - \expandafter\def\csname simpleicon@googlemapsicon\endcsname {\simpleiconsmapfive\symbol{112}} - \expandafter\def\csname simpleicon@googlemarketingplatformicon\endcsname {\simpleiconsmapfive\symbol{113}} - \expandafter\def\csname simpleicon@googlemeeticon\endcsname {\simpleiconsmapfive\symbol{114}} - \expandafter\def\csname simpleicon@googlemessagesicon\endcsname {\simpleiconsmapfive\symbol{115}} - \expandafter\def\csname simpleicon@googlenearbyicon\endcsname {\simpleiconsmapfive\symbol{116}} - \expandafter\def\csname simpleicon@googlenewsicon\endcsname {\simpleiconsmapfive\symbol{117}} - \expandafter\def\csname simpleicon@googlepayicon\endcsname {\simpleiconsmapfive\symbol{118}} - \expandafter\def\csname simpleicon@googlephotosicon\endcsname {\simpleiconsmapfive\symbol{119}} - \expandafter\def\csname simpleicon@googleplayicon\endcsname {\simpleiconsmapfive\symbol{120}} - \expandafter\def\csname simpleicon@googlepubsubicon\endcsname {\simpleiconsmapfive\symbol{121}} - \expandafter\def\csname simpleicon@googlescholaricon\endcsname {\simpleiconsmapfive\symbol{122}} - \expandafter\def\csname simpleicon@googlesearchconsoleicon\endcsname {\simpleiconsmapfive\symbol{123}} - \expandafter\def\csname simpleicon@googlesheetsicon\endcsname {\simpleiconsmapfive\symbol{124}} - \expandafter\def\csname simpleicon@googleslidesicon\endcsname {\simpleiconsmapfive\symbol{125}} - \expandafter\def\csname simpleicon@googlestreetviewicon\endcsname {\simpleiconsmapfive\symbol{126}} - \expandafter\def\csname simpleicon@googletagmanagericon\endcsname {\simpleiconsmapfive\symbol{127}} - \expandafter\def\csname simpleicon@googletasksicon\endcsname {\simpleiconsmapfive\symbol{128}} - \expandafter\def\csname simpleicon@googletranslateicon\endcsname {\simpleiconsmapfive\symbol{129}} - \expandafter\def\csname simpleicon@gotomeetingicon\endcsname {\simpleiconsmapfive\symbol{130}} - \expandafter\def\csname simpleicon@grabicon\endcsname {\simpleiconsmapfive\symbol{131}} - \expandafter\def\csname simpleicon@gradleicon\endcsname {\simpleiconsmapfive\symbol{132}} - \expandafter\def\csname simpleicon@gradleplaypublishericon\endcsname {\simpleiconsmapfive\symbol{133}} - \expandafter\def\csname simpleicon@grafanaicon\endcsname {\simpleiconsmapfive\symbol{134}} - \expandafter\def\csname simpleicon@grammarlyicon\endcsname {\simpleiconsmapfive\symbol{135}} - \expandafter\def\csname simpleicon@grandfraisicon\endcsname {\simpleiconsmapfive\symbol{136}} - \expandafter\def\csname simpleicon@grapheneosicon\endcsname {\simpleiconsmapfive\symbol{137}} - \expandafter\def\csname simpleicon@graphiteicon\endcsname {\simpleiconsmapfive\symbol{138}} - \expandafter\def\csname simpleicon@graphqlicon\endcsname {\simpleiconsmapfive\symbol{139}} - \expandafter\def\csname simpleicon@gravicon\endcsname {\simpleiconsmapfive\symbol{140}} - \expandafter\def\csname simpleicon@gravataricon\endcsname {\simpleiconsmapfive\symbol{141}} - \expandafter\def\csname simpleicon@graylogicon\endcsname {\simpleiconsmapfive\symbol{142}} - \expandafter\def\csname simpleicon@greasyforkicon\endcsname {\simpleiconsmapfive\symbol{143}} - \expandafter\def\csname simpleicon@greatlearningicon\endcsname {\simpleiconsmapfive\symbol{144}} - \expandafter\def\csname simpleicon@greenhouseicon\endcsname {\simpleiconsmapfive\symbol{145}} - \expandafter\def\csname simpleicon@greensockicon\endcsname {\simpleiconsmapfive\symbol{146}} - \expandafter\def\csname simpleicon@griddotaiicon\endcsname {\simpleiconsmapfive\symbol{147}} - \expandafter\def\csname simpleicon@gridsomeicon\endcsname {\simpleiconsmapfive\symbol{148}} - \expandafter\def\csname simpleicon@groupmeicon\endcsname {\simpleiconsmapfive\symbol{149}} - \expandafter\def\csname simpleicon@grouponicon\endcsname {\simpleiconsmapfive\symbol{150}} - \expandafter\def\csname simpleicon@grubhubicon\endcsname {\simpleiconsmapfive\symbol{151}} - \expandafter\def\csname simpleicon@grunticon\endcsname {\simpleiconsmapfive\symbol{152}} - \expandafter\def\csname simpleicon@gskicon\endcsname {\simpleiconsmapfive\symbol{153}} - \expandafter\def\csname simpleicon@gsmarenadotcomicon\endcsname {\simpleiconsmapfive\symbol{154}} - \expandafter\def\csname simpleicon@gstreamericon\endcsname {\simpleiconsmapfive\symbol{155}} - \expandafter\def\csname simpleicon@gtkicon\endcsname {\simpleiconsmapfive\symbol{156}} - \expandafter\def\csname simpleicon@guangzhoumetroicon\endcsname {\simpleiconsmapfive\symbol{157}} - \expandafter\def\csname simpleicon@guildedicon\endcsname {\simpleiconsmapfive\symbol{158}} - \expandafter\def\csname simpleicon@gulpicon\endcsname {\simpleiconsmapfive\symbol{159}} - \expandafter\def\csname simpleicon@gumroadicon\endcsname {\simpleiconsmapfive\symbol{160}} - \expandafter\def\csname simpleicon@gumtreeicon\endcsname {\simpleiconsmapfive\symbol{161}} - \expandafter\def\csname simpleicon@gunicornicon\endcsname {\simpleiconsmapfive\symbol{162}} - \expandafter\def\csname simpleicon@gurobiicon\endcsname {\simpleiconsmapfive\symbol{163}} - \expandafter\def\csname simpleicon@gustoicon\endcsname {\simpleiconsmapfive\symbol{164}} - \expandafter\def\csname simpleicon@gutenbergicon\endcsname {\simpleiconsmapfive\symbol{165}} - \expandafter\def\csname simpleicon@h3icon\endcsname {\simpleiconsmapfive\symbol{166}} - \expandafter\def\csname simpleicon@habricon\endcsname {\simpleiconsmapfive\symbol{167}} - \expandafter\def\csname simpleicon@hackadayicon\endcsname {\simpleiconsmapfive\symbol{168}} - \expandafter\def\csname simpleicon@hackclubicon\endcsname {\simpleiconsmapfive\symbol{169}} - \expandafter\def\csname simpleicon@hackerearthicon\endcsname {\simpleiconsmapfive\symbol{170}} - \expandafter\def\csname simpleicon@hackernoonicon\endcsname {\simpleiconsmapfive\symbol{171}} - \expandafter\def\csname simpleicon@hackeroneicon\endcsname {\simpleiconsmapfive\symbol{172}} - \expandafter\def\csname simpleicon@hackerrankicon\endcsname {\simpleiconsmapfive\symbol{173}} - \expandafter\def\csname simpleicon@hackstericon\endcsname {\simpleiconsmapfive\symbol{174}} - \expandafter\def\csname simpleicon@hacktheboxicon\endcsname {\simpleiconsmapfive\symbol{175}} - \expandafter\def\csname simpleicon@halicon\endcsname {\simpleiconsmapfive\symbol{176}} - \expandafter\def\csname simpleicon@handlebarsdotjsicon\endcsname {\simpleiconsmapfive\symbol{177}} - \expandafter\def\csname simpleicon@handmicon\endcsname {\simpleiconsmapfive\symbol{178}} - \expandafter\def\csname simpleicon@handshakeicon\endcsname {\simpleiconsmapfive\symbol{179}} - \expandafter\def\csname simpleicon@handshakeprotocolicon\endcsname {\simpleiconsmapfive\symbol{180}} - \expandafter\def\csname simpleicon@happycowicon\endcsname {\simpleiconsmapfive\symbol{181}} - \expandafter\def\csname simpleicon@harboricon\endcsname {\simpleiconsmapfive\symbol{182}} - \expandafter\def\csname simpleicon@harmonyosicon\endcsname {\simpleiconsmapfive\symbol{183}} - \expandafter\def\csname simpleicon@hashicorpicon\endcsname {\simpleiconsmapfive\symbol{184}} - \expandafter\def\csname simpleicon@hashnodeicon\endcsname {\simpleiconsmapfive\symbol{185}} - \expandafter\def\csname simpleicon@haskellicon\endcsname {\simpleiconsmapfive\symbol{186}} - \expandafter\def\csname simpleicon@hasuraicon\endcsname {\simpleiconsmapfive\symbol{187}} - \expandafter\def\csname simpleicon@hatenabookmarkicon\endcsname {\simpleiconsmapfive\symbol{188}} - \expandafter\def\csname simpleicon@haveibeenpwnedicon\endcsname {\simpleiconsmapfive\symbol{189}} - \expandafter\def\csname simpleicon@haxeicon\endcsname {\simpleiconsmapfive\symbol{190}} - \expandafter\def\csname simpleicon@hboicon\endcsname {\simpleiconsmapfive\symbol{191}} - \expandafter\def\csname simpleicon@hclicon\endcsname {\simpleiconsmapfive\symbol{192}} - \expandafter\def\csname simpleicon@hdfcbankicon\endcsname {\simpleiconsmapfive\symbol{193}} - \expandafter\def\csname simpleicon@headlessuiicon\endcsname {\simpleiconsmapfive\symbol{194}} - \expandafter\def\csname simpleicon@headphonezoneicon\endcsname {\simpleiconsmapfive\symbol{195}} - \expandafter\def\csname simpleicon@headspaceicon\endcsname {\simpleiconsmapfive\symbol{196}} - \expandafter\def\csname simpleicon@hearthicon\endcsname {\simpleiconsmapfive\symbol{197}} - \expandafter\def\csname simpleicon@hearthisdotaticon\endcsname {\simpleiconsmapfive\symbol{198}} - \expandafter\def\csname simpleicon@hederaicon\endcsname {\simpleiconsmapfive\symbol{199}} - \expandafter\def\csname simpleicon@heliumicon\endcsname {\simpleiconsmapfive\symbol{200}} - \expandafter\def\csname simpleicon@hellofreshicon\endcsname {\simpleiconsmapfive\symbol{201}} - \expandafter\def\csname simpleicon@hellyhansenicon\endcsname {\simpleiconsmapfive\symbol{202}} - \expandafter\def\csname simpleicon@helmicon\endcsname {\simpleiconsmapfive\symbol{203}} - \expandafter\def\csname simpleicon@helpdeskicon\endcsname {\simpleiconsmapfive\symbol{204}} - \expandafter\def\csname simpleicon@helpscouticon\endcsname {\simpleiconsmapfive\symbol{205}} - \expandafter\def\csname simpleicon@hepsiemlakicon\endcsname {\simpleiconsmapfive\symbol{206}} - \expandafter\def\csname simpleicon@hereicon\endcsname {\simpleiconsmapfive\symbol{207}} - \expandafter\def\csname simpleicon@herokuicon\endcsname {\simpleiconsmapfive\symbol{208}} - \expandafter\def\csname simpleicon@hetznericon\endcsname {\simpleiconsmapfive\symbol{209}} - \expandafter\def\csname simpleicon@hevyicon\endcsname {\simpleiconsmapfive\symbol{210}} - \expandafter\def\csname simpleicon@hexleticon\endcsname {\simpleiconsmapfive\symbol{211}} - \expandafter\def\csname simpleicon@hexoicon\endcsname {\simpleiconsmapfive\symbol{212}} - \expandafter\def\csname simpleicon@heyicon\endcsname {\simpleiconsmapfive\symbol{213}} - \expandafter\def\csname simpleicon@hibernateicon\endcsname {\simpleiconsmapfive\symbol{214}} - \expandafter\def\csname simpleicon@hibobicon\endcsname {\simpleiconsmapfive\symbol{215}} - \expandafter\def\csname simpleicon@hiltonicon\endcsname {\simpleiconsmapfive\symbol{216}} - \expandafter\def\csname simpleicon@hiltonhotelsandresortsicon\endcsname {\simpleiconsmapfive\symbol{217}} - \expandafter\def\csname simpleicon@hitachiicon\endcsname {\simpleiconsmapfive\symbol{218}} - \expandafter\def\csname simpleicon@hiveicon\endcsname {\simpleiconsmapfive\symbol{219}} - \expandafter\def\csname simpleicon@hiveblockchainicon\endcsname {\simpleiconsmapfive\symbol{220}} - \expandafter\def\csname simpleicon@hivemqicon\endcsname {\simpleiconsmapfive\symbol{221}} - \expandafter\def\csname simpleicon@homarricon\endcsname {\simpleiconsmapfive\symbol{222}} - \expandafter\def\csname simpleicon@homeadvisoricon\endcsname {\simpleiconsmapfive\symbol{223}} - \expandafter\def\csname simpleicon@homeassistanticon\endcsname {\simpleiconsmapfive\symbol{224}} - \expandafter\def\csname simpleicon@homeassistantcommunitystoreicon\endcsname {\simpleiconsmapfive\symbol{225}} - \expandafter\def\csname simpleicon@homebrewicon\endcsname {\simpleiconsmapfive\symbol{226}} - \expandafter\def\csname simpleicon@homebridgeicon\endcsname {\simpleiconsmapfive\symbol{227}} - \expandafter\def\csname simpleicon@homepageicon\endcsname {\simpleiconsmapfive\symbol{228}} - \expandafter\def\csname simpleicon@homifyicon\endcsname {\simpleiconsmapfive\symbol{229}} - \expandafter\def\csname simpleicon@hondaicon\endcsname {\simpleiconsmapfive\symbol{230}} - \expandafter\def\csname simpleicon@honeyicon\endcsname {\simpleiconsmapfive\symbol{231}} - \expandafter\def\csname simpleicon@honoicon\endcsname {\simpleiconsmapfive\symbol{232}} - \expandafter\def\csname simpleicon@honoricon\endcsname {\simpleiconsmapfive\symbol{233}} - \expandafter\def\csname simpleicon@hootsuiteicon\endcsname {\simpleiconsmapfive\symbol{234}} - \expandafter\def\csname simpleicon@hoppscotchicon\endcsname {\simpleiconsmapfive\symbol{235}} - \expandafter\def\csname simpleicon@hostingericon\endcsname {\simpleiconsmapfive\symbol{236}} - \expandafter\def\csname simpleicon@hotelsdotcomicon\endcsname {\simpleiconsmapfive\symbol{237}} - \expandafter\def\csname simpleicon@hotjaricon\endcsname {\simpleiconsmapfive\symbol{238}} - \expandafter\def\csname simpleicon@hotwireicon\endcsname {\simpleiconsmapfive\symbol{239}} - \expandafter\def\csname simpleicon@houdiniicon\endcsname {\simpleiconsmapfive\symbol{240}} - \expandafter\def\csname simpleicon@houzzicon\endcsname {\simpleiconsmapfive\symbol{241}} - \expandafter\def\csname simpleicon@hpicon\endcsname {\simpleiconsmapfive\symbol{242}} - \expandafter\def\csname simpleicon@hsbcicon\endcsname {\simpleiconsmapfive\symbol{243}} - \expandafter\def\csname simpleicon@html5icon\endcsname {\simpleiconsmapfive\symbol{244}} - \expandafter\def\csname simpleicon@htmlacademyicon\endcsname {\simpleiconsmapfive\symbol{245}} - \expandafter\def\csname simpleicon@htmxicon\endcsname {\simpleiconsmapfive\symbol{246}} - \expandafter\def\csname simpleicon@htopicon\endcsname {\simpleiconsmapfive\symbol{247}} - \expandafter\def\csname simpleicon@httpieicon\endcsname {\simpleiconsmapfive\symbol{248}} - \expandafter\def\csname simpleicon@huaweiicon\endcsname {\simpleiconsmapfive\symbol{249}} - \expandafter\def\csname simpleicon@hubspoticon\endcsname {\simpleiconsmapfive\symbol{250}} - \expandafter\def\csname simpleicon@huggingfaceicon\endcsname {\simpleiconsmapfive\symbol{251}} - \expandafter\def\csname simpleicon@hugoicon\endcsname {\simpleiconsmapfive\symbol{252}} - \expandafter\def\csname simpleicon@humblebundleicon\endcsname {\simpleiconsmapfive\symbol{253}} - \expandafter\def\csname simpleicon@hungryjacksicon\endcsname {\simpleiconsmapfive\symbol{254}} - \expandafter\def\csname simpleicon@husqvarnaicon\endcsname {\simpleiconsmapfive\symbol{255}} - \expandafter\def\csname simpleicon@hypericon\endcsname {\simpleiconsmapsix\symbol{0}} - \expandafter\def\csname simpleicon@hyperskillicon\endcsname {\simpleiconsmapsix\symbol{1}} - \expandafter\def\csname simpleicon@hypothesisicon\endcsname {\simpleiconsmapsix\symbol{2}} - \expandafter\def\csname simpleicon@hyprlandicon\endcsname {\simpleiconsmapsix\symbol{3}} - \expandafter\def\csname simpleicon@hyundaiicon\endcsname {\simpleiconsmapsix\symbol{4}} - \expandafter\def\csname simpleicon@i18nexticon\endcsname {\simpleiconsmapsix\symbol{5}} - \expandafter\def\csname simpleicon@i3icon\endcsname {\simpleiconsmapsix\symbol{6}} - \expandafter\def\csname simpleicon@iataicon\endcsname {\simpleiconsmapsix\symbol{7}} - \expandafter\def\csname simpleicon@ibeaconicon\endcsname {\simpleiconsmapsix\symbol{8}} - \expandafter\def\csname simpleicon@iberiaicon\endcsname {\simpleiconsmapsix\symbol{9}} - \expandafter\def\csname simpleicon@icedicon\endcsname {\simpleiconsmapsix\symbol{10}} - \expandafter\def\csname simpleicon@icelandicon\endcsname {\simpleiconsmapsix\symbol{11}} - \expandafter\def\csname simpleicon@icicibankicon\endcsname {\simpleiconsmapsix\symbol{12}} - \expandafter\def\csname simpleicon@icingaicon\endcsname {\simpleiconsmapsix\symbol{13}} - \expandafter\def\csname simpleicon@icloudicon\endcsname {\simpleiconsmapsix\symbol{14}} - \expandafter\def\csname simpleicon@icomoonicon\endcsname {\simpleiconsmapsix\symbol{15}} - \expandafter\def\csname simpleicon@iconicon\endcsname {\simpleiconsmapsix\symbol{16}} - \expandafter\def\csname simpleicon@iconfindericon\endcsname {\simpleiconsmapsix\symbol{17}} - \expandafter\def\csname simpleicon@iconifyicon\endcsname {\simpleiconsmapsix\symbol{18}} - \expandafter\def\csname simpleicon@iconjaricon\endcsname {\simpleiconsmapsix\symbol{19}} - \expandafter\def\csname simpleicon@icons8icon\endcsname {\simpleiconsmapsix\symbol{20}} - \expandafter\def\csname simpleicon@icqicon\endcsname {\simpleiconsmapsix\symbol{21}} - \expandafter\def\csname simpleicon@ieeeicon\endcsname {\simpleiconsmapsix\symbol{22}} - \expandafter\def\csname simpleicon@ifixiticon\endcsname {\simpleiconsmapsix\symbol{23}} - \expandafter\def\csname simpleicon@ifoodicon\endcsname {\simpleiconsmapsix\symbol{24}} - \expandafter\def\csname simpleicon@ifttticon\endcsname {\simpleiconsmapsix\symbol{25}} - \expandafter\def\csname simpleicon@igdbicon\endcsname {\simpleiconsmapsix\symbol{26}} - \expandafter\def\csname simpleicon@ignicon\endcsname {\simpleiconsmapsix\symbol{27}} - \expandafter\def\csname simpleicon@iheartradioicon\endcsname {\simpleiconsmapsix\symbol{28}} - \expandafter\def\csname simpleicon@ikeaicon\endcsname {\simpleiconsmapsix\symbol{29}} - \expandafter\def\csname simpleicon@iledefrancemobilitesicon\endcsname {\simpleiconsmapsix\symbol{30}} - \expandafter\def\csname simpleicon@imagedotscicon\endcsname {\simpleiconsmapsix\symbol{31}} - \expandafter\def\csname simpleicon@imagejicon\endcsname {\simpleiconsmapsix\symbol{32}} - \expandafter\def\csname simpleicon@imdbicon\endcsname {\simpleiconsmapsix\symbol{33}} - \expandafter\def\csname simpleicon@imessageicon\endcsname {\simpleiconsmapsix\symbol{34}} - \expandafter\def\csname simpleicon@imguricon\endcsname {\simpleiconsmapsix\symbol{35}} - \expandafter\def\csname simpleicon@immericon\endcsname {\simpleiconsmapsix\symbol{36}} - \expandafter\def\csname simpleicon@immichicon\endcsname {\simpleiconsmapsix\symbol{37}} - \expandafter\def\csname simpleicon@imouicon\endcsname {\simpleiconsmapsix\symbol{38}} - \expandafter\def\csname simpleicon@improvmxicon\endcsname {\simpleiconsmapsix\symbol{39}} - \expandafter\def\csname simpleicon@indeedicon\endcsname {\simpleiconsmapsix\symbol{40}} - \expandafter\def\csname simpleicon@indiansuperleagueicon\endcsname {\simpleiconsmapsix\symbol{41}} - \expandafter\def\csname simpleicon@indiehackersicon\endcsname {\simpleiconsmapsix\symbol{42}} - \expandafter\def\csname simpleicon@indigoicon\endcsname {\simpleiconsmapsix\symbol{43}} - \expandafter\def\csname simpleicon@inertiaicon\endcsname {\simpleiconsmapsix\symbol{44}} - \expandafter\def\csname simpleicon@infinitiicon\endcsname {\simpleiconsmapsix\symbol{45}} - \expandafter\def\csname simpleicon@influxdbicon\endcsname {\simpleiconsmapsix\symbol{46}} - \expandafter\def\csname simpleicon@infomaniakicon\endcsname {\simpleiconsmapsix\symbol{47}} - \expandafter\def\csname simpleicon@infoqicon\endcsname {\simpleiconsmapsix\symbol{48}} - \expandafter\def\csname simpleicon@informaticaicon\endcsname {\simpleiconsmapsix\symbol{49}} - \expandafter\def\csname simpleicon@infosysicon\endcsname {\simpleiconsmapsix\symbol{50}} - \expandafter\def\csname simpleicon@infracosticon\endcsname {\simpleiconsmapsix\symbol{51}} - \expandafter\def\csname simpleicon@ingressicon\endcsname {\simpleiconsmapsix\symbol{52}} - \expandafter\def\csname simpleicon@inkdropicon\endcsname {\simpleiconsmapsix\symbol{53}} - \expandafter\def\csname simpleicon@inkscapeicon\endcsname {\simpleiconsmapsix\symbol{54}} - \expandafter\def\csname simpleicon@inoreadericon\endcsname {\simpleiconsmapsix\symbol{55}} - \expandafter\def\csname simpleicon@insomniaicon\endcsname {\simpleiconsmapsix\symbol{56}} - \expandafter\def\csname simpleicon@inspireicon\endcsname {\simpleiconsmapsix\symbol{57}} - \expandafter\def\csname simpleicon@insta360icon\endcsname {\simpleiconsmapsix\symbol{58}} - \expandafter\def\csname simpleicon@instacarticon\endcsname {\simpleiconsmapsix\symbol{59}} - \expandafter\def\csname simpleicon@instagramicon\endcsname {\simpleiconsmapsix\symbol{60}} - \expandafter\def\csname simpleicon@instapapericon\endcsname {\simpleiconsmapsix\symbol{61}} - \expandafter\def\csname simpleicon@instatusicon\endcsname {\simpleiconsmapsix\symbol{62}} - \expandafter\def\csname simpleicon@instructablesicon\endcsname {\simpleiconsmapsix\symbol{63}} - \expandafter\def\csname simpleicon@instructureicon\endcsname {\simpleiconsmapsix\symbol{64}} - \expandafter\def\csname simpleicon@intelicon\endcsname {\simpleiconsmapsix\symbol{65}} - \expandafter\def\csname simpleicon@intellijideaicon\endcsname {\simpleiconsmapsix\symbol{66}} - \expandafter\def\csname simpleicon@interactiondesignfoundationicon\endcsname {\simpleiconsmapsix\symbol{67}} - \expandafter\def\csname simpleicon@interactjsicon\endcsname {\simpleiconsmapsix\symbol{68}} - \expandafter\def\csname simpleicon@interbaseicon\endcsname {\simpleiconsmapsix\symbol{69}} - \expandafter\def\csname simpleicon@intercomicon\endcsname {\simpleiconsmapsix\symbol{70}} - \expandafter\def\csname simpleicon@intermarcheicon\endcsname {\simpleiconsmapsix\symbol{71}} - \expandafter\def\csname simpleicon@internetarchiveicon\endcsname {\simpleiconsmapsix\symbol{72}} - \expandafter\def\csname simpleicon@internetcomputericon\endcsname {\simpleiconsmapsix\symbol{73}} - \expandafter\def\csname simpleicon@intigritiicon\endcsname {\simpleiconsmapsix\symbol{74}} - \expandafter\def\csname simpleicon@intuiticon\endcsname {\simpleiconsmapsix\symbol{75}} - \expandafter\def\csname simpleicon@invisionicon\endcsname {\simpleiconsmapsix\symbol{76}} - \expandafter\def\csname simpleicon@invoiceninjaicon\endcsname {\simpleiconsmapsix\symbol{77}} - \expandafter\def\csname simpleicon@iobrokericon\endcsname {\simpleiconsmapsix\symbol{78}} - \expandafter\def\csname simpleicon@ionicicon\endcsname {\simpleiconsmapsix\symbol{79}} - \expandafter\def\csname simpleicon@ionosicon\endcsname {\simpleiconsmapsix\symbol{80}} - \expandafter\def\csname simpleicon@iosicon\endcsname {\simpleiconsmapsix\symbol{81}} - \expandafter\def\csname simpleicon@iotaicon\endcsname {\simpleiconsmapsix\symbol{82}} - \expandafter\def\csname simpleicon@ipfsicon\endcsname {\simpleiconsmapsix\symbol{83}} - \expandafter\def\csname simpleicon@irisicon\endcsname {\simpleiconsmapsix\symbol{84}} - \expandafter\def\csname simpleicon@iroboticon\endcsname {\simpleiconsmapsix\symbol{85}} - \expandafter\def\csname simpleicon@isc2icon\endcsname {\simpleiconsmapsix\symbol{86}} - \expandafter\def\csname simpleicon@issuuicon\endcsname {\simpleiconsmapsix\symbol{87}} - \expandafter\def\csname simpleicon@istioicon\endcsname {\simpleiconsmapsix\symbol{88}} - \expandafter\def\csname simpleicon@itchdotioicon\endcsname {\simpleiconsmapsix\symbol{89}} - \expandafter\def\csname simpleicon@iterm2icon\endcsname {\simpleiconsmapsix\symbol{90}} - \expandafter\def\csname simpleicon@itunesicon\endcsname {\simpleiconsmapsix\symbol{91}} - \expandafter\def\csname simpleicon@itvxicon\endcsname {\simpleiconsmapsix\symbol{92}} - \expandafter\def\csname simpleicon@ivecoicon\endcsname {\simpleiconsmapsix\symbol{93}} - \expandafter\def\csname simpleicon@jabbericon\endcsname {\simpleiconsmapsix\symbol{94}} - \expandafter\def\csname simpleicon@jaegericon\endcsname {\simpleiconsmapsix\symbol{95}} - \expandafter\def\csname simpleicon@jaguaricon\endcsname {\simpleiconsmapsix\symbol{96}} - \expandafter\def\csname simpleicon@jamboardicon\endcsname {\simpleiconsmapsix\symbol{97}} - \expandafter\def\csname simpleicon@jamesonicon\endcsname {\simpleiconsmapsix\symbol{98}} - \expandafter\def\csname simpleicon@jamstackicon\endcsname {\simpleiconsmapsix\symbol{99}} - \expandafter\def\csname simpleicon@jasmineicon\endcsname {\simpleiconsmapsix\symbol{100}} - \expandafter\def\csname simpleicon@javascripticon\endcsname {\simpleiconsmapsix\symbol{101}} - \expandafter\def\csname simpleicon@jblicon\endcsname {\simpleiconsmapsix\symbol{102}} - \expandafter\def\csname simpleicon@jcbicon\endcsname {\simpleiconsmapsix\symbol{103}} - \expandafter\def\csname simpleicon@jeepicon\endcsname {\simpleiconsmapsix\symbol{104}} - \expandafter\def\csname simpleicon@jekyllicon\endcsname {\simpleiconsmapsix\symbol{105}} - \expandafter\def\csname simpleicon@jellyfinicon\endcsname {\simpleiconsmapsix\symbol{106}} - \expandafter\def\csname simpleicon@jenkinsicon\endcsname {\simpleiconsmapsix\symbol{107}} - \expandafter\def\csname simpleicon@jesticon\endcsname {\simpleiconsmapsix\symbol{108}} - \expandafter\def\csname simpleicon@jeticon\endcsname {\simpleiconsmapsix\symbol{109}} - \expandafter\def\csname simpleicon@jetblueicon\endcsname {\simpleiconsmapsix\symbol{110}} - \expandafter\def\csname simpleicon@jetbrainsicon\endcsname {\simpleiconsmapsix\symbol{111}} - \expandafter\def\csname simpleicon@jetpackcomposeicon\endcsname {\simpleiconsmapsix\symbol{112}} - \expandafter\def\csname simpleicon@jfrogicon\endcsname {\simpleiconsmapsix\symbol{113}} - \expandafter\def\csname simpleicon@jfrogpipelinesicon\endcsname {\simpleiconsmapsix\symbol{114}} - \expandafter\def\csname simpleicon@jhipstericon\endcsname {\simpleiconsmapsix\symbol{115}} - \expandafter\def\csname simpleicon@jinjaicon\endcsname {\simpleiconsmapsix\symbol{116}} - \expandafter\def\csname simpleicon@jiraicon\endcsname {\simpleiconsmapsix\symbol{117}} - \expandafter\def\csname simpleicon@jirasoftwareicon\endcsname {\simpleiconsmapsix\symbol{118}} - \expandafter\def\csname simpleicon@jitpackicon\endcsname {\simpleiconsmapsix\symbol{119}} - \expandafter\def\csname simpleicon@jitsiicon\endcsname {\simpleiconsmapsix\symbol{120}} - \expandafter\def\csname simpleicon@johndeereicon\endcsname {\simpleiconsmapsix\symbol{121}} - \expandafter\def\csname simpleicon@joomlaicon\endcsname {\simpleiconsmapsix\symbol{122}} - \expandafter\def\csname simpleicon@joplinicon\endcsname {\simpleiconsmapsix\symbol{123}} - \expandafter\def\csname simpleicon@jordanicon\endcsname {\simpleiconsmapsix\symbol{124}} - \expandafter\def\csname simpleicon@jouavicon\endcsname {\simpleiconsmapsix\symbol{125}} - \expandafter\def\csname simpleicon@jovianicon\endcsname {\simpleiconsmapsix\symbol{126}} - \expandafter\def\csname simpleicon@jpegicon\endcsname {\simpleiconsmapsix\symbol{127}} - \expandafter\def\csname simpleicon@jqueryicon\endcsname {\simpleiconsmapsix\symbol{128}} - \expandafter\def\csname simpleicon@jrgroupicon\endcsname {\simpleiconsmapsix\symbol{129}} - \expandafter\def\csname simpleicon@jsdelivricon\endcsname {\simpleiconsmapsix\symbol{130}} - \expandafter\def\csname simpleicon@jsfiddleicon\endcsname {\simpleiconsmapsix\symbol{131}} - \expandafter\def\csname simpleicon@jsonicon\endcsname {\simpleiconsmapsix\symbol{132}} - \expandafter\def\csname simpleicon@jsonwebtokensicon\endcsname {\simpleiconsmapsix\symbol{133}} - \expandafter\def\csname simpleicon@jsricon\endcsname {\simpleiconsmapsix\symbol{134}} - \expandafter\def\csname simpleicon@jssicon\endcsname {\simpleiconsmapsix\symbol{135}} - \expandafter\def\csname simpleicon@juceicon\endcsname {\simpleiconsmapsix\symbol{136}} - \expandafter\def\csname simpleicon@juejinicon\endcsname {\simpleiconsmapsix\symbol{137}} - \expandafter\def\csname simpleicon@jukeicon\endcsname {\simpleiconsmapsix\symbol{138}} - \expandafter\def\csname simpleicon@juliaicon\endcsname {\simpleiconsmapsix\symbol{139}} - \expandafter\def\csname simpleicon@junipernetworksicon\endcsname {\simpleiconsmapsix\symbol{140}} - \expandafter\def\csname simpleicon@junit5icon\endcsname {\simpleiconsmapsix\symbol{141}} - \expandafter\def\csname simpleicon@jupytericon\endcsname {\simpleiconsmapsix\symbol{142}} - \expandafter\def\csname simpleicon@justeaticon\endcsname {\simpleiconsmapsix\symbol{143}} - \expandafter\def\csname simpleicon@justgivingicon\endcsname {\simpleiconsmapsix\symbol{144}} - \expandafter\def\csname simpleicon@k3sicon\endcsname {\simpleiconsmapsix\symbol{145}} - \expandafter\def\csname simpleicon@k6icon\endcsname {\simpleiconsmapsix\symbol{146}} - \expandafter\def\csname simpleicon@kaggleicon\endcsname {\simpleiconsmapsix\symbol{147}} - \expandafter\def\csname simpleicon@kagiicon\endcsname {\simpleiconsmapsix\symbol{148}} - \expandafter\def\csname simpleicon@kahooticon\endcsname {\simpleiconsmapsix\symbol{149}} - \expandafter\def\csname simpleicon@kaiosicon\endcsname {\simpleiconsmapsix\symbol{150}} - \expandafter\def\csname simpleicon@kakaoicon\endcsname {\simpleiconsmapsix\symbol{151}} - \expandafter\def\csname simpleicon@kakaotalkicon\endcsname {\simpleiconsmapsix\symbol{152}} - \expandafter\def\csname simpleicon@kalilinuxicon\endcsname {\simpleiconsmapsix\symbol{153}} - \expandafter\def\csname simpleicon@kamailioicon\endcsname {\simpleiconsmapsix\symbol{154}} - \expandafter\def\csname simpleicon@kanikoicon\endcsname {\simpleiconsmapsix\symbol{155}} - \expandafter\def\csname simpleicon@karlsruherverkehrsverbundicon\endcsname {\simpleiconsmapsix\symbol{156}} - \expandafter\def\csname simpleicon@kasasmarticon\endcsname {\simpleiconsmapsix\symbol{157}} - \expandafter\def\csname simpleicon@kashflowicon\endcsname {\simpleiconsmapsix\symbol{158}} - \expandafter\def\csname simpleicon@kasperskyicon\endcsname {\simpleiconsmapsix\symbol{159}} - \expandafter\def\csname simpleicon@katacodaicon\endcsname {\simpleiconsmapsix\symbol{160}} - \expandafter\def\csname simpleicon@katanaicon\endcsname {\simpleiconsmapsix\symbol{161}} - \expandafter\def\csname simpleicon@kauflandicon\endcsname {\simpleiconsmapsix\symbol{162}} - \expandafter\def\csname simpleicon@kdeicon\endcsname {\simpleiconsmapsix\symbol{163}} - \expandafter\def\csname simpleicon@kdenliveicon\endcsname {\simpleiconsmapsix\symbol{164}} - \expandafter\def\csname simpleicon@kedroicon\endcsname {\simpleiconsmapsix\symbol{165}} - \expandafter\def\csname simpleicon@keeneticicon\endcsname {\simpleiconsmapsix\symbol{166}} - \expandafter\def\csname simpleicon@keepachangelogicon\endcsname {\simpleiconsmapsix\symbol{167}} - \expandafter\def\csname simpleicon@keepassxcicon\endcsname {\simpleiconsmapsix\symbol{168}} - \expandafter\def\csname simpleicon@kenticoicon\endcsname {\simpleiconsmapsix\symbol{169}} - \expandafter\def\csname simpleicon@kerasicon\endcsname {\simpleiconsmapsix\symbol{170}} - \expandafter\def\csname simpleicon@keybaseicon\endcsname {\simpleiconsmapsix\symbol{171}} - \expandafter\def\csname simpleicon@keycdnicon\endcsname {\simpleiconsmapsix\symbol{172}} - \expandafter\def\csname simpleicon@keycloakicon\endcsname {\simpleiconsmapsix\symbol{173}} - \expandafter\def\csname simpleicon@keystoneicon\endcsname {\simpleiconsmapsix\symbol{174}} - \expandafter\def\csname simpleicon@kfcicon\endcsname {\simpleiconsmapsix\symbol{175}} - \expandafter\def\csname simpleicon@khanacademyicon\endcsname {\simpleiconsmapsix\symbol{176}} - \expandafter\def\csname simpleicon@khronosgroupicon\endcsname {\simpleiconsmapsix\symbol{177}} - \expandafter\def\csname simpleicon@kiaicon\endcsname {\simpleiconsmapsix\symbol{178}} - \expandafter\def\csname simpleicon@kibanaicon\endcsname {\simpleiconsmapsix\symbol{179}} - \expandafter\def\csname simpleicon@kicadicon\endcsname {\simpleiconsmapsix\symbol{180}} - \expandafter\def\csname simpleicon@kickicon\endcsname {\simpleiconsmapsix\symbol{181}} - \expandafter\def\csname simpleicon@kickstartericon\endcsname {\simpleiconsmapsix\symbol{182}} - \expandafter\def\csname simpleicon@kikicon\endcsname {\simpleiconsmapsix\symbol{183}} - \expandafter\def\csname simpleicon@kingstontechnologyicon\endcsname {\simpleiconsmapsix\symbol{184}} - \expandafter\def\csname simpleicon@kinopoiskicon\endcsname {\simpleiconsmapsix\symbol{185}} - \expandafter\def\csname simpleicon@kinstaicon\endcsname {\simpleiconsmapsix\symbol{186}} - \expandafter\def\csname simpleicon@kirbyicon\endcsname {\simpleiconsmapsix\symbol{187}} - \expandafter\def\csname simpleicon@kiticon\endcsname {\simpleiconsmapsix\symbol{188}} - \expandafter\def\csname simpleicon@kitsuicon\endcsname {\simpleiconsmapsix\symbol{189}} - \expandafter\def\csname simpleicon@klarnaicon\endcsname {\simpleiconsmapsix\symbol{190}} - \expandafter\def\csname simpleicon@klmicon\endcsname {\simpleiconsmapsix\symbol{191}} - \expandafter\def\csname simpleicon@klookicon\endcsname {\simpleiconsmapsix\symbol{192}} - \expandafter\def\csname simpleicon@knativeicon\endcsname {\simpleiconsmapsix\symbol{193}} - \expandafter\def\csname simpleicon@knexdotjsicon\endcsname {\simpleiconsmapsix\symbol{194}} - \expandafter\def\csname simpleicon@knimeicon\endcsname {\simpleiconsmapsix\symbol{195}} - \expandafter\def\csname simpleicon@knipicon\endcsname {\simpleiconsmapsix\symbol{196}} - \expandafter\def\csname simpleicon@knowledgebaseicon\endcsname {\simpleiconsmapsix\symbol{197}} - \expandafter\def\csname simpleicon@knownicon\endcsname {\simpleiconsmapsix\symbol{198}} - \expandafter\def\csname simpleicon@koaicon\endcsname {\simpleiconsmapsix\symbol{199}} - \expandafter\def\csname simpleicon@kocicon\endcsname {\simpleiconsmapsix\symbol{200}} - \expandafter\def\csname simpleicon@kodakicon\endcsname {\simpleiconsmapsix\symbol{201}} - \expandafter\def\csname simpleicon@kodiicon\endcsname {\simpleiconsmapsix\symbol{202}} - \expandafter\def\csname simpleicon@koenigseggicon\endcsname {\simpleiconsmapsix\symbol{203}} - \expandafter\def\csname simpleicon@kofaxicon\endcsname {\simpleiconsmapsix\symbol{204}} - \expandafter\def\csname simpleicon@kofiicon\endcsname {\simpleiconsmapsix\symbol{205}} - \expandafter\def\csname simpleicon@komooticon\endcsname {\simpleiconsmapsix\symbol{206}} - \expandafter\def\csname simpleicon@konamiicon\endcsname {\simpleiconsmapsix\symbol{207}} - \expandafter\def\csname simpleicon@kongicon\endcsname {\simpleiconsmapsix\symbol{208}} - \expandafter\def\csname simpleicon@kongregateicon\endcsname {\simpleiconsmapsix\symbol{209}} - \expandafter\def\csname simpleicon@konvaicon\endcsname {\simpleiconsmapsix\symbol{210}} - \expandafter\def\csname simpleicon@kotlinicon\endcsname {\simpleiconsmapsix\symbol{211}} - \expandafter\def\csname simpleicon@koyebicon\endcsname {\simpleiconsmapsix\symbol{212}} - \expandafter\def\csname simpleicon@kritaicon\endcsname {\simpleiconsmapsix\symbol{213}} - \expandafter\def\csname simpleicon@ktmicon\endcsname {\simpleiconsmapsix\symbol{214}} - \expandafter\def\csname simpleicon@ktoricon\endcsname {\simpleiconsmapsix\symbol{215}} - \expandafter\def\csname simpleicon@kuaishouicon\endcsname {\simpleiconsmapsix\symbol{216}} - \expandafter\def\csname simpleicon@kubernetesicon\endcsname {\simpleiconsmapsix\symbol{217}} - \expandafter\def\csname simpleicon@kubuntuicon\endcsname {\simpleiconsmapsix\symbol{218}} - \expandafter\def\csname simpleicon@kucoinicon\endcsname {\simpleiconsmapsix\symbol{219}} - \expandafter\def\csname simpleicon@kumaicon\endcsname {\simpleiconsmapsix\symbol{220}} - \expandafter\def\csname simpleicon@kununuicon\endcsname {\simpleiconsmapsix\symbol{221}} - \expandafter\def\csname simpleicon@kuulaicon\endcsname {\simpleiconsmapsix\symbol{222}} - \expandafter\def\csname simpleicon@kxicon\endcsname {\simpleiconsmapsix\symbol{223}} - \expandafter\def\csname simpleicon@kyoceraicon\endcsname {\simpleiconsmapsix\symbol{224}} - \expandafter\def\csname simpleicon@labviewicon\endcsname {\simpleiconsmapsix\symbol{225}} - \expandafter\def\csname simpleicon@ladaicon\endcsname {\simpleiconsmapsix\symbol{226}} - \expandafter\def\csname simpleicon@lamborghiniicon\endcsname {\simpleiconsmapsix\symbol{227}} - \expandafter\def\csname simpleicon@landrovericon\endcsname {\simpleiconsmapsix\symbol{228}} - \expandafter\def\csname simpleicon@langchainicon\endcsname {\simpleiconsmapsix\symbol{229}} - \expandafter\def\csname simpleicon@lapceicon\endcsname {\simpleiconsmapsix\symbol{230}} - \expandafter\def\csname simpleicon@laragonicon\endcsname {\simpleiconsmapsix\symbol{231}} - \expandafter\def\csname simpleicon@laravelicon\endcsname {\simpleiconsmapsix\symbol{232}} - \expandafter\def\csname simpleicon@laravelhorizonicon\endcsname {\simpleiconsmapsix\symbol{233}} - \expandafter\def\csname simpleicon@laravelnovaicon\endcsname {\simpleiconsmapsix\symbol{234}} - \expandafter\def\csname simpleicon@lastdotfmicon\endcsname {\simpleiconsmapsix\symbol{235}} - \expandafter\def\csname simpleicon@lastpassicon\endcsname {\simpleiconsmapsix\symbol{236}} - \expandafter\def\csname simpleicon@latexicon\endcsname {\simpleiconsmapsix\symbol{237}} - \expandafter\def\csname simpleicon@launchpadicon\endcsname {\simpleiconsmapsix\symbol{238}} - \expandafter\def\csname simpleicon@lazarusicon\endcsname {\simpleiconsmapsix\symbol{239}} - \expandafter\def\csname simpleicon@lazyvimicon\endcsname {\simpleiconsmapsix\symbol{240}} - \expandafter\def\csname simpleicon@lbryicon\endcsname {\simpleiconsmapsix\symbol{241}} - \expandafter\def\csname simpleicon@leaderpriceicon\endcsname {\simpleiconsmapsix\symbol{242}} - \expandafter\def\csname simpleicon@leafleticon\endcsname {\simpleiconsmapsix\symbol{243}} - \expandafter\def\csname simpleicon@leagueoflegendsicon\endcsname {\simpleiconsmapsix\symbol{244}} - \expandafter\def\csname simpleicon@leanpubicon\endcsname {\simpleiconsmapsix\symbol{245}} - \expandafter\def\csname simpleicon@leetcodeicon\endcsname {\simpleiconsmapsix\symbol{246}} - \expandafter\def\csname simpleicon@legacygamesicon\endcsname {\simpleiconsmapsix\symbol{247}} - \expandafter\def\csname simpleicon@leicaicon\endcsname {\simpleiconsmapsix\symbol{248}} - \expandafter\def\csname simpleicon@lemmyicon\endcsname {\simpleiconsmapsix\symbol{249}} - \expandafter\def\csname simpleicon@lemonsqueezyicon\endcsname {\simpleiconsmapsix\symbol{250}} - \expandafter\def\csname simpleicon@lenovoicon\endcsname {\simpleiconsmapsix\symbol{251}} - \expandafter\def\csname simpleicon@lensicon\endcsname {\simpleiconsmapsix\symbol{252}} - \expandafter\def\csname simpleicon@leptosicon\endcsname {\simpleiconsmapsix\symbol{253}} - \expandafter\def\csname simpleicon@lequipeicon\endcsname {\simpleiconsmapsix\symbol{254}} - \expandafter\def\csname simpleicon@lernaicon\endcsname {\simpleiconsmapsix\symbol{255}} - \expandafter\def\csname simpleicon@leroymerlinicon\endcsname {\simpleiconsmapseven\symbol{0}} - \expandafter\def\csname simpleicon@leslibrairesicon\endcsname {\simpleiconsmapseven\symbol{1}} - \expandafter\def\csname simpleicon@lessicon\endcsname {\simpleiconsmapseven\symbol{2}} - \expandafter\def\csname simpleicon@letsencrypticon\endcsname {\simpleiconsmapseven\symbol{3}} - \expandafter\def\csname simpleicon@letterboxdicon\endcsname {\simpleiconsmapseven\symbol{4}} - \expandafter\def\csname simpleicon@levelsdotfyiicon\endcsname {\simpleiconsmapseven\symbol{5}} - \expandafter\def\csname simpleicon@lgicon\endcsname {\simpleiconsmapseven\symbol{6}} - \expandafter\def\csname simpleicon@liberadotchaticon\endcsname {\simpleiconsmapseven\symbol{7}} - \expandafter\def\csname simpleicon@liberapayicon\endcsname {\simpleiconsmapseven\symbol{8}} - \expandafter\def\csname simpleicon@librariesdotioicon\endcsname {\simpleiconsmapseven\symbol{9}} - \expandafter\def\csname simpleicon@librarythingicon\endcsname {\simpleiconsmapseven\symbol{10}} - \expandafter\def\csname simpleicon@libreofficeicon\endcsname {\simpleiconsmapseven\symbol{11}} - \expandafter\def\csname simpleicon@libreofficebaseicon\endcsname {\simpleiconsmapseven\symbol{12}} - \expandafter\def\csname simpleicon@libreofficecalcicon\endcsname {\simpleiconsmapseven\symbol{13}} - \expandafter\def\csname simpleicon@libreofficedrawicon\endcsname {\simpleiconsmapseven\symbol{14}} - \expandafter\def\csname simpleicon@libreofficeimpressicon\endcsname {\simpleiconsmapseven\symbol{15}} - \expandafter\def\csname simpleicon@libreofficemathicon\endcsname {\simpleiconsmapseven\symbol{16}} - \expandafter\def\csname simpleicon@libreofficewritericon\endcsname {\simpleiconsmapseven\symbol{17}} - \expandafter\def\csname simpleicon@librewolficon\endcsname {\simpleiconsmapseven\symbol{18}} - \expandafter\def\csname simpleicon@libuvicon\endcsname {\simpleiconsmapseven\symbol{19}} - \expandafter\def\csname simpleicon@lichessicon\endcsname {\simpleiconsmapseven\symbol{20}} - \expandafter\def\csname simpleicon@lidlicon\endcsname {\simpleiconsmapseven\symbol{21}} - \expandafter\def\csname simpleicon@lifxicon\endcsname {\simpleiconsmapseven\symbol{22}} - \expandafter\def\csname simpleicon@lightburnicon\endcsname {\simpleiconsmapseven\symbol{23}} - \expandafter\def\csname simpleicon@lighthouseicon\endcsname {\simpleiconsmapseven\symbol{24}} - \expandafter\def\csname simpleicon@lightningicon\endcsname {\simpleiconsmapseven\symbol{25}} - \expandafter\def\csname simpleicon@limesurveyicon\endcsname {\simpleiconsmapseven\symbol{26}} - \expandafter\def\csname simpleicon@lineicon\endcsname {\simpleiconsmapseven\symbol{27}} - \expandafter\def\csname simpleicon@lineageosicon\endcsname {\simpleiconsmapseven\symbol{28}} - \expandafter\def\csname simpleicon@linearicon\endcsname {\simpleiconsmapseven\symbol{29}} - \expandafter\def\csname simpleicon@liningicon\endcsname {\simpleiconsmapseven\symbol{30}} - \expandafter\def\csname simpleicon@linkedinicon\endcsname {\simpleiconsmapseven\symbol{31}} - \expandafter\def\csname simpleicon@linkerdicon\endcsname {\simpleiconsmapseven\symbol{32}} - \expandafter\def\csname simpleicon@linkfireicon\endcsname {\simpleiconsmapseven\symbol{33}} - \expandafter\def\csname simpleicon@linksysicon\endcsname {\simpleiconsmapseven\symbol{34}} - \expandafter\def\csname simpleicon@linktreeicon\endcsname {\simpleiconsmapseven\symbol{35}} - \expandafter\def\csname simpleicon@lintcodeicon\endcsname {\simpleiconsmapseven\symbol{36}} - \expandafter\def\csname simpleicon@linuxicon\endcsname {\simpleiconsmapseven\symbol{37}} - \expandafter\def\csname simpleicon@linuxcontainersicon\endcsname {\simpleiconsmapseven\symbol{38}} - \expandafter\def\csname simpleicon@linuxfoundationicon\endcsname {\simpleiconsmapseven\symbol{39}} - \expandafter\def\csname simpleicon@linuxminticon\endcsname {\simpleiconsmapseven\symbol{40}} - \expandafter\def\csname simpleicon@linuxprofessionalinstituteicon\endcsname {\simpleiconsmapseven\symbol{41}} - \expandafter\def\csname simpleicon@linuxservericon\endcsname {\simpleiconsmapseven\symbol{42}} - \expandafter\def\csname simpleicon@lionairicon\endcsname {\simpleiconsmapseven\symbol{43}} - \expandafter\def\csname simpleicon@liquibaseicon\endcsname {\simpleiconsmapseven\symbol{44}} - \expandafter\def\csname simpleicon@listmonkicon\endcsname {\simpleiconsmapseven\symbol{45}} - \expandafter\def\csname simpleicon@liticon\endcsname {\simpleiconsmapseven\symbol{46}} - \expandafter\def\csname simpleicon@litecoinicon\endcsname {\simpleiconsmapseven\symbol{47}} - \expandafter\def\csname simpleicon@literalicon\endcsname {\simpleiconsmapseven\symbol{48}} - \expandafter\def\csname simpleicon@litiengineicon\endcsname {\simpleiconsmapseven\symbol{49}} - \expandafter\def\csname simpleicon@livechaticon\endcsname {\simpleiconsmapseven\symbol{50}} - \expandafter\def\csname simpleicon@livejournalicon\endcsname {\simpleiconsmapseven\symbol{51}} - \expandafter\def\csname simpleicon@livewireicon\endcsname {\simpleiconsmapseven\symbol{52}} - \expandafter\def\csname simpleicon@llvmicon\endcsname {\simpleiconsmapseven\symbol{53}} - \expandafter\def\csname simpleicon@lmmsicon\endcsname {\simpleiconsmapseven\symbol{54}} - \expandafter\def\csname simpleicon@lobstersicon\endcsname {\simpleiconsmapseven\symbol{55}} - \expandafter\def\csname simpleicon@localicon\endcsname {\simpleiconsmapseven\symbol{56}} - \expandafter\def\csname simpleicon@lodashicon\endcsname {\simpleiconsmapseven\symbol{57}} - \expandafter\def\csname simpleicon@logitechicon\endcsname {\simpleiconsmapseven\symbol{58}} - \expandafter\def\csname simpleicon@logitechgicon\endcsname {\simpleiconsmapseven\symbol{59}} - \expandafter\def\csname simpleicon@logmeinicon\endcsname {\simpleiconsmapseven\symbol{60}} - \expandafter\def\csname simpleicon@logseqicon\endcsname {\simpleiconsmapseven\symbol{61}} - \expandafter\def\csname simpleicon@logstashicon\endcsname {\simpleiconsmapseven\symbol{62}} - \expandafter\def\csname simpleicon@lookericon\endcsname {\simpleiconsmapseven\symbol{63}} - \expandafter\def\csname simpleicon@loomicon\endcsname {\simpleiconsmapseven\symbol{64}} - \expandafter\def\csname simpleicon@loopicon\endcsname {\simpleiconsmapseven\symbol{65}} - \expandafter\def\csname simpleicon@loopbackicon\endcsname {\simpleiconsmapseven\symbol{66}} - \expandafter\def\csname simpleicon@lootcrateicon\endcsname {\simpleiconsmapseven\symbol{67}} - \expandafter\def\csname simpleicon@lospecicon\endcsname {\simpleiconsmapseven\symbol{68}} - \expandafter\def\csname simpleicon@lotpolishairlinesicon\endcsname {\simpleiconsmapseven\symbol{69}} - \expandafter\def\csname simpleicon@ltspiceicon\endcsname {\simpleiconsmapseven\symbol{70}} - \expandafter\def\csname simpleicon@luaicon\endcsname {\simpleiconsmapseven\symbol{71}} - \expandafter\def\csname simpleicon@lubuntuicon\endcsname {\simpleiconsmapseven\symbol{72}} - \expandafter\def\csname simpleicon@luciaicon\endcsname {\simpleiconsmapseven\symbol{73}} - \expandafter\def\csname simpleicon@lucidicon\endcsname {\simpleiconsmapseven\symbol{74}} - \expandafter\def\csname simpleicon@ludwigicon\endcsname {\simpleiconsmapseven\symbol{75}} - \expandafter\def\csname simpleicon@lufthansaicon\endcsname {\simpleiconsmapseven\symbol{76}} - \expandafter\def\csname simpleicon@lumenicon\endcsname {\simpleiconsmapseven\symbol{77}} - \expandafter\def\csname simpleicon@lunacyicon\endcsname {\simpleiconsmapseven\symbol{78}} - \expandafter\def\csname simpleicon@lutrisicon\endcsname {\simpleiconsmapseven\symbol{79}} - \expandafter\def\csname simpleicon@lydiaicon\endcsname {\simpleiconsmapseven\symbol{80}} - \expandafter\def\csname simpleicon@lyfticon\endcsname {\simpleiconsmapseven\symbol{81}} - \expandafter\def\csname simpleicon@maasicon\endcsname {\simpleiconsmapseven\symbol{82}} - \expandafter\def\csname simpleicon@macosicon\endcsname {\simpleiconsmapseven\symbol{83}} - \expandafter\def\csname simpleicon@macpawicon\endcsname {\simpleiconsmapseven\symbol{84}} - \expandafter\def\csname simpleicon@macysicon\endcsname {\simpleiconsmapseven\symbol{85}} - \expandafter\def\csname simpleicon@magasinsuicon\endcsname {\simpleiconsmapseven\symbol{86}} - \expandafter\def\csname simpleicon@magentoicon\endcsname {\simpleiconsmapseven\symbol{87}} - \expandafter\def\csname simpleicon@magicicon\endcsname {\simpleiconsmapseven\symbol{88}} - \expandafter\def\csname simpleicon@magiskicon\endcsname {\simpleiconsmapseven\symbol{89}} - \expandafter\def\csname simpleicon@mahindraicon\endcsname {\simpleiconsmapseven\symbol{90}} - \expandafter\def\csname simpleicon@mailchimpicon\endcsname {\simpleiconsmapseven\symbol{91}} - \expandafter\def\csname simpleicon@maildotcomicon\endcsname {\simpleiconsmapseven\symbol{92}} - \expandafter\def\csname simpleicon@maildotruicon\endcsname {\simpleiconsmapseven\symbol{93}} - \expandafter\def\csname simpleicon@mailgunicon\endcsname {\simpleiconsmapseven\symbol{94}} - \expandafter\def\csname simpleicon@mailtrapicon\endcsname {\simpleiconsmapseven\symbol{95}} - \expandafter\def\csname simpleicon@mainwpicon\endcsname {\simpleiconsmapseven\symbol{96}} - \expandafter\def\csname simpleicon@majorleaguehackingicon\endcsname {\simpleiconsmapseven\symbol{97}} - \expandafter\def\csname simpleicon@makeicon\endcsname {\simpleiconsmapseven\symbol{98}} - \expandafter\def\csname simpleicon@makerboticon\endcsname {\simpleiconsmapseven\symbol{99}} - \expandafter\def\csname simpleicon@malticon\endcsname {\simpleiconsmapseven\symbol{100}} - \expandafter\def\csname simpleicon@malwarebytesicon\endcsname {\simpleiconsmapseven\symbol{101}} - \expandafter\def\csname simpleicon@mambauiicon\endcsname {\simpleiconsmapseven\symbol{102}} - \expandafter\def\csname simpleicon@mampicon\endcsname {\simpleiconsmapseven\symbol{103}} - \expandafter\def\csname simpleicon@manicon\endcsname {\simpleiconsmapseven\symbol{104}} - \expandafter\def\csname simpleicon@manageiqicon\endcsname {\simpleiconsmapseven\symbol{105}} - \expandafter\def\csname simpleicon@manjaroicon\endcsname {\simpleiconsmapseven\symbol{106}} - \expandafter\def\csname simpleicon@mantineicon\endcsname {\simpleiconsmapseven\symbol{107}} - \expandafter\def\csname simpleicon@mapboxicon\endcsname {\simpleiconsmapseven\symbol{108}} - \expandafter\def\csname simpleicon@maplibreicon\endcsname {\simpleiconsmapseven\symbol{109}} - \expandafter\def\csname simpleicon@mariadbicon\endcsname {\simpleiconsmapseven\symbol{110}} - \expandafter\def\csname simpleicon@mariadbfoundationicon\endcsname {\simpleiconsmapseven\symbol{111}} - \expandafter\def\csname simpleicon@markdownicon\endcsname {\simpleiconsmapseven\symbol{112}} - \expandafter\def\csname simpleicon@marketoicon\endcsname {\simpleiconsmapseven\symbol{113}} - \expandafter\def\csname simpleicon@markoicon\endcsname {\simpleiconsmapseven\symbol{114}} - \expandafter\def\csname simpleicon@marriotticon\endcsname {\simpleiconsmapseven\symbol{115}} - \expandafter\def\csname simpleicon@marvelappicon\endcsname {\simpleiconsmapseven\symbol{116}} - \expandafter\def\csname simpleicon@maseratiicon\endcsname {\simpleiconsmapseven\symbol{117}} - \expandafter\def\csname simpleicon@mastercardicon\endcsname {\simpleiconsmapseven\symbol{118}} - \expandafter\def\csname simpleicon@mastercomfigicon\endcsname {\simpleiconsmapseven\symbol{119}} - \expandafter\def\csname simpleicon@mastodonicon\endcsname {\simpleiconsmapseven\symbol{120}} - \expandafter\def\csname simpleicon@materialdesignicon\endcsname {\simpleiconsmapseven\symbol{121}} - \expandafter\def\csname simpleicon@materialdesigniconsicon\endcsname {\simpleiconsmapseven\symbol{122}} - \expandafter\def\csname simpleicon@materialformkdocsicon\endcsname {\simpleiconsmapseven\symbol{123}} - \expandafter\def\csname simpleicon@matillionicon\endcsname {\simpleiconsmapseven\symbol{124}} - \expandafter\def\csname simpleicon@matomoicon\endcsname {\simpleiconsmapseven\symbol{125}} - \expandafter\def\csname simpleicon@matrixicon\endcsname {\simpleiconsmapseven\symbol{126}} - \expandafter\def\csname simpleicon@matterdotjsicon\endcsname {\simpleiconsmapseven\symbol{127}} - \expandafter\def\csname simpleicon@mattermosticon\endcsname {\simpleiconsmapseven\symbol{128}} - \expandafter\def\csname simpleicon@matterneticon\endcsname {\simpleiconsmapseven\symbol{129}} - \expandafter\def\csname simpleicon@mauticicon\endcsname {\simpleiconsmapseven\symbol{130}} - \expandafter\def\csname simpleicon@maxicon\endcsname {\simpleiconsmapseven\symbol{131}} - \expandafter\def\csname simpleicon@maxplanckgesellschafticon\endcsname {\simpleiconsmapseven\symbol{132}} - \expandafter\def\csname simpleicon@maytagicon\endcsname {\simpleiconsmapseven\symbol{133}} - \expandafter\def\csname simpleicon@mazdaicon\endcsname {\simpleiconsmapseven\symbol{134}} - \expandafter\def\csname simpleicon@mcafeeicon\endcsname {\simpleiconsmapseven\symbol{135}} - \expandafter\def\csname simpleicon@mcdonaldsicon\endcsname {\simpleiconsmapseven\symbol{136}} - \expandafter\def\csname simpleicon@mclarenicon\endcsname {\simpleiconsmapseven\symbol{137}} - \expandafter\def\csname simpleicon@mdbookicon\endcsname {\simpleiconsmapseven\symbol{138}} - \expandafter\def\csname simpleicon@mdnwebdocsicon\endcsname {\simpleiconsmapseven\symbol{139}} - \expandafter\def\csname simpleicon@mdxicon\endcsname {\simpleiconsmapseven\symbol{140}} - \expandafter\def\csname simpleicon@mediafireicon\endcsname {\simpleiconsmapseven\symbol{141}} - \expandafter\def\csname simpleicon@mediamarkticon\endcsname {\simpleiconsmapseven\symbol{142}} - \expandafter\def\csname simpleicon@mediatekicon\endcsname {\simpleiconsmapseven\symbol{143}} - \expandafter\def\csname simpleicon@medibangpainticon\endcsname {\simpleiconsmapseven\symbol{144}} - \expandafter\def\csname simpleicon@mediumicon\endcsname {\simpleiconsmapseven\symbol{145}} - \expandafter\def\csname simpleicon@medusaicon\endcsname {\simpleiconsmapseven\symbol{146}} - \expandafter\def\csname simpleicon@meetupicon\endcsname {\simpleiconsmapseven\symbol{147}} - \expandafter\def\csname simpleicon@megaicon\endcsname {\simpleiconsmapseven\symbol{148}} - \expandafter\def\csname simpleicon@meilisearchicon\endcsname {\simpleiconsmapseven\symbol{149}} - \expandafter\def\csname simpleicon@meituanicon\endcsname {\simpleiconsmapseven\symbol{150}} - \expandafter\def\csname simpleicon@meizuicon\endcsname {\simpleiconsmapseven\symbol{151}} - \expandafter\def\csname simpleicon@mendeleyicon\endcsname {\simpleiconsmapseven\symbol{152}} - \expandafter\def\csname simpleicon@mentorcruiseicon\endcsname {\simpleiconsmapseven\symbol{153}} - \expandafter\def\csname simpleicon@mercadopagoicon\endcsname {\simpleiconsmapseven\symbol{154}} - \expandafter\def\csname simpleicon@mercedesicon\endcsname {\simpleiconsmapseven\symbol{155}} - \expandafter\def\csname simpleicon@merckicon\endcsname {\simpleiconsmapseven\symbol{156}} - \expandafter\def\csname simpleicon@mercurialicon\endcsname {\simpleiconsmapseven\symbol{157}} - \expandafter\def\csname simpleicon@mermaidicon\endcsname {\simpleiconsmapseven\symbol{158}} - \expandafter\def\csname simpleicon@messengericon\endcsname {\simpleiconsmapseven\symbol{159}} - \expandafter\def\csname simpleicon@metaicon\endcsname {\simpleiconsmapseven\symbol{160}} - \expandafter\def\csname simpleicon@metabaseicon\endcsname {\simpleiconsmapseven\symbol{161}} - \expandafter\def\csname simpleicon@metacriticicon\endcsname {\simpleiconsmapseven\symbol{162}} - \expandafter\def\csname simpleicon@metafiltericon\endcsname {\simpleiconsmapseven\symbol{163}} - \expandafter\def\csname simpleicon@metasploiticon\endcsname {\simpleiconsmapseven\symbol{164}} - \expandafter\def\csname simpleicon@meteoricon\endcsname {\simpleiconsmapseven\symbol{165}} - \expandafter\def\csname simpleicon@metroicon\endcsname {\simpleiconsmapseven\symbol{166}} - \expandafter\def\csname simpleicon@metrodelaciudaddemexicoicon\endcsname {\simpleiconsmapseven\symbol{167}} - \expandafter\def\csname simpleicon@metrodemadridicon\endcsname {\simpleiconsmapseven\symbol{168}} - \expandafter\def\csname simpleicon@metrodeparisicon\endcsname {\simpleiconsmapseven\symbol{169}} - \expandafter\def\csname simpleicon@meweicon\endcsname {\simpleiconsmapseven\symbol{170}} - \expandafter\def\csname simpleicon@mgicon\endcsname {\simpleiconsmapseven\symbol{171}} - \expandafter\def\csname simpleicon@microbiticon\endcsname {\simpleiconsmapseven\symbol{172}} - \expandafter\def\csname simpleicon@microdotblogicon\endcsname {\simpleiconsmapseven\symbol{173}} - \expandafter\def\csname simpleicon@microeditoricon\endcsname {\simpleiconsmapseven\symbol{174}} - \expandafter\def\csname simpleicon@microgeneticsicon\endcsname {\simpleiconsmapseven\symbol{175}} - \expandafter\def\csname simpleicon@micropythonicon\endcsname {\simpleiconsmapseven\symbol{176}} - \expandafter\def\csname simpleicon@microstationicon\endcsname {\simpleiconsmapseven\symbol{177}} - \expandafter\def\csname simpleicon@microstrategyicon\endcsname {\simpleiconsmapseven\symbol{178}} - \expandafter\def\csname simpleicon@midiicon\endcsname {\simpleiconsmapseven\symbol{179}} - \expandafter\def\csname simpleicon@migaduicon\endcsname {\simpleiconsmapseven\symbol{180}} - \expandafter\def\csname simpleicon@mikrotikicon\endcsname {\simpleiconsmapseven\symbol{181}} - \expandafter\def\csname simpleicon@milanoteicon\endcsname {\simpleiconsmapseven\symbol{182}} - \expandafter\def\csname simpleicon@milvusicon\endcsname {\simpleiconsmapseven\symbol{183}} - \expandafter\def\csname simpleicon@mindsicon\endcsname {\simpleiconsmapseven\symbol{184}} - \expandafter\def\csname simpleicon@minetesticon\endcsname {\simpleiconsmapseven\symbol{185}} - \expandafter\def\csname simpleicon@miniicon\endcsname {\simpleiconsmapseven\symbol{186}} - \expandafter\def\csname simpleicon@minioicon\endcsname {\simpleiconsmapseven\symbol{187}} - \expandafter\def\csname simpleicon@mintlifyicon\endcsname {\simpleiconsmapseven\symbol{188}} - \expandafter\def\csname simpleicon@minutemailericon\endcsname {\simpleiconsmapseven\symbol{189}} - \expandafter\def\csname simpleicon@mirahezeicon\endcsname {\simpleiconsmapseven\symbol{190}} - \expandafter\def\csname simpleicon@miroicon\endcsname {\simpleiconsmapseven\symbol{191}} - \expandafter\def\csname simpleicon@misskeyicon\endcsname {\simpleiconsmapseven\symbol{192}} - \expandafter\def\csname simpleicon@mitsubishiicon\endcsname {\simpleiconsmapseven\symbol{193}} - \expandafter\def\csname simpleicon@mixicon\endcsname {\simpleiconsmapseven\symbol{194}} - \expandafter\def\csname simpleicon@mixcloudicon\endcsname {\simpleiconsmapseven\symbol{195}} - \expandafter\def\csname simpleicon@mixpanelicon\endcsname {\simpleiconsmapseven\symbol{196}} - \expandafter\def\csname simpleicon@mlbicon\endcsname {\simpleiconsmapseven\symbol{197}} - \expandafter\def\csname simpleicon@mlflowicon\endcsname {\simpleiconsmapseven\symbol{198}} - \expandafter\def\csname simpleicon@mobxicon\endcsname {\simpleiconsmapseven\symbol{199}} - \expandafter\def\csname simpleicon@mobxstatetreeicon\endcsname {\simpleiconsmapseven\symbol{200}} - \expandafter\def\csname simpleicon@mochaicon\endcsname {\simpleiconsmapseven\symbol{201}} - \expandafter\def\csname simpleicon@mockserviceworkericon\endcsname {\simpleiconsmapseven\symbol{202}} - \expandafter\def\csname simpleicon@modalicon\endcsname {\simpleiconsmapseven\symbol{203}} - \expandafter\def\csname simpleicon@modinicon\endcsname {\simpleiconsmapseven\symbol{204}} - \expandafter\def\csname simpleicon@modrinthicon\endcsname {\simpleiconsmapseven\symbol{205}} - \expandafter\def\csname simpleicon@modxicon\endcsname {\simpleiconsmapseven\symbol{206}} - \expandafter\def\csname simpleicon@moleculericon\endcsname {\simpleiconsmapseven\symbol{207}} - \expandafter\def\csname simpleicon@momenteoicon\endcsname {\simpleiconsmapseven\symbol{208}} - \expandafter\def\csname simpleicon@moneroicon\endcsname {\simpleiconsmapseven\symbol{209}} - \expandafter\def\csname simpleicon@moneygramicon\endcsname {\simpleiconsmapseven\symbol{210}} - \expandafter\def\csname simpleicon@mongodbicon\endcsname {\simpleiconsmapseven\symbol{211}} - \expandafter\def\csname simpleicon@mongooseicon\endcsname {\simpleiconsmapseven\symbol{212}} - \expandafter\def\csname simpleicon@mongoosedotwsicon\endcsname {\simpleiconsmapseven\symbol{213}} - \expandafter\def\csname simpleicon@monicaicon\endcsname {\simpleiconsmapseven\symbol{214}} - \expandafter\def\csname simpleicon@monkeytieicon\endcsname {\simpleiconsmapseven\symbol{215}} - \expandafter\def\csname simpleicon@monkeytypeicon\endcsname {\simpleiconsmapseven\symbol{216}} - \expandafter\def\csname simpleicon@monogameicon\endcsname {\simpleiconsmapseven\symbol{217}} - \expandafter\def\csname simpleicon@monoprixicon\endcsname {\simpleiconsmapseven\symbol{218}} - \expandafter\def\csname simpleicon@monstericon\endcsname {\simpleiconsmapseven\symbol{219}} - \expandafter\def\csname simpleicon@monzoicon\endcsname {\simpleiconsmapseven\symbol{220}} - \expandafter\def\csname simpleicon@mooicon\endcsname {\simpleiconsmapseven\symbol{221}} - \expandafter\def\csname simpleicon@moodleicon\endcsname {\simpleiconsmapseven\symbol{222}} - \expandafter\def\csname simpleicon@moonrepoicon\endcsname {\simpleiconsmapseven\symbol{223}} - \expandafter\def\csname simpleicon@moqicon\endcsname {\simpleiconsmapseven\symbol{224}} - \expandafter\def\csname simpleicon@moqupsicon\endcsname {\simpleiconsmapseven\symbol{225}} - \expandafter\def\csname simpleicon@morrisonsicon\endcsname {\simpleiconsmapseven\symbol{226}} - \expandafter\def\csname simpleicon@moscowmetroicon\endcsname {\simpleiconsmapseven\symbol{227}} - \expandafter\def\csname simpleicon@motorolaicon\endcsname {\simpleiconsmapseven\symbol{228}} - \expandafter\def\csname simpleicon@mozillaicon\endcsname {\simpleiconsmapseven\symbol{229}} - \expandafter\def\csname simpleicon@mpvicon\endcsname {\simpleiconsmapseven\symbol{230}} - \expandafter\def\csname simpleicon@mqtticon\endcsname {\simpleiconsmapseven\symbol{231}} - \expandafter\def\csname simpleicon@msiicon\endcsname {\simpleiconsmapseven\symbol{232}} - \expandafter\def\csname simpleicon@msibusinessicon\endcsname {\simpleiconsmapseven\symbol{233}} - \expandafter\def\csname simpleicon@mtaicon\endcsname {\simpleiconsmapseven\symbol{234}} - \expandafter\def\csname simpleicon@mtricon\endcsname {\simpleiconsmapseven\symbol{235}} - \expandafter\def\csname simpleicon@mubiicon\endcsname {\simpleiconsmapseven\symbol{236}} - \expandafter\def\csname simpleicon@muiicon\endcsname {\simpleiconsmapseven\symbol{237}} - \expandafter\def\csname simpleicon@mulesofticon\endcsname {\simpleiconsmapseven\symbol{238}} - \expandafter\def\csname simpleicon@mullericon\endcsname {\simpleiconsmapseven\symbol{239}} - \expandafter\def\csname simpleicon@multisimicon\endcsname {\simpleiconsmapseven\symbol{240}} - \expandafter\def\csname simpleicon@mumbleicon\endcsname {\simpleiconsmapseven\symbol{241}} - \expandafter\def\csname simpleicon@muoicon\endcsname {\simpleiconsmapseven\symbol{242}} - \expandafter\def\csname simpleicon@muralicon\endcsname {\simpleiconsmapseven\symbol{243}} - \expandafter\def\csname simpleicon@musescoreicon\endcsname {\simpleiconsmapseven\symbol{244}} - \expandafter\def\csname simpleicon@musicbrainzicon\endcsname {\simpleiconsmapseven\symbol{245}} - \expandafter\def\csname simpleicon@mxlinuxicon\endcsname {\simpleiconsmapseven\symbol{246}} - \expandafter\def\csname simpleicon@myanimelisticon\endcsname {\simpleiconsmapseven\symbol{247}} - \expandafter\def\csname simpleicon@mygeticon\endcsname {\simpleiconsmapseven\symbol{248}} - \expandafter\def\csname simpleicon@myobicon\endcsname {\simpleiconsmapseven\symbol{249}} - \expandafter\def\csname simpleicon@myspaceicon\endcsname {\simpleiconsmapseven\symbol{250}} - \expandafter\def\csname simpleicon@mysqlicon\endcsname {\simpleiconsmapseven\symbol{251}} - \expandafter\def\csname simpleicon@n26icon\endcsname {\simpleiconsmapseven\symbol{252}} - \expandafter\def\csname simpleicon@n8nicon\endcsname {\simpleiconsmapseven\symbol{253}} - \expandafter\def\csname simpleicon@namebaseicon\endcsname {\simpleiconsmapseven\symbol{254}} - \expandafter\def\csname simpleicon@namecheapicon\endcsname {\simpleiconsmapseven\symbol{255}} - \expandafter\def\csname simpleicon@namemcicon\endcsname {\simpleiconsmapeight\symbol{0}} - \expandafter\def\csname simpleicon@namesiloicon\endcsname {\simpleiconsmapeight\symbol{1}} - \expandafter\def\csname simpleicon@namuwikiicon\endcsname {\simpleiconsmapeight\symbol{2}} - \expandafter\def\csname simpleicon@nanoicon\endcsname {\simpleiconsmapeight\symbol{3}} - \expandafter\def\csname simpleicon@nasaicon\endcsname {\simpleiconsmapeight\symbol{4}} - \expandafter\def\csname simpleicon@nationalgridicon\endcsname {\simpleiconsmapeight\symbol{5}} - \expandafter\def\csname simpleicon@nationalrailicon\endcsname {\simpleiconsmapeight\symbol{6}} - \expandafter\def\csname simpleicon@nativescripticon\endcsname {\simpleiconsmapeight\symbol{7}} - \expandafter\def\csname simpleicon@natsdotioicon\endcsname {\simpleiconsmapeight\symbol{8}} - \expandafter\def\csname simpleicon@navericon\endcsname {\simpleiconsmapeight\symbol{9}} - \expandafter\def\csname simpleicon@nbaicon\endcsname {\simpleiconsmapeight\symbol{10}} - \expandafter\def\csname simpleicon@nbbicon\endcsname {\simpleiconsmapeight\symbol{11}} - \expandafter\def\csname simpleicon@nbcicon\endcsname {\simpleiconsmapeight\symbol{12}} - \expandafter\def\csname simpleicon@ndricon\endcsname {\simpleiconsmapeight\symbol{13}} - \expandafter\def\csname simpleicon@nearicon\endcsname {\simpleiconsmapeight\symbol{14}} - \expandafter\def\csname simpleicon@necicon\endcsname {\simpleiconsmapeight\symbol{15}} - \expandafter\def\csname simpleicon@neo4jicon\endcsname {\simpleiconsmapeight\symbol{16}} - \expandafter\def\csname simpleicon@neovimicon\endcsname {\simpleiconsmapeight\symbol{17}} - \expandafter\def\csname simpleicon@neptuneicon\endcsname {\simpleiconsmapeight\symbol{18}} - \expandafter\def\csname simpleicon@nestjsicon\endcsname {\simpleiconsmapeight\symbol{19}} - \expandafter\def\csname simpleicon@netappicon\endcsname {\simpleiconsmapeight\symbol{20}} - \expandafter\def\csname simpleicon@netbsdicon\endcsname {\simpleiconsmapeight\symbol{21}} - \expandafter\def\csname simpleicon@netcupicon\endcsname {\simpleiconsmapeight\symbol{22}} - \expandafter\def\csname simpleicon@netdataicon\endcsname {\simpleiconsmapeight\symbol{23}} - \expandafter\def\csname simpleicon@neteasecloudmusicicon\endcsname {\simpleiconsmapeight\symbol{24}} - \expandafter\def\csname simpleicon@netflixicon\endcsname {\simpleiconsmapeight\symbol{25}} - \expandafter\def\csname simpleicon@netgearicon\endcsname {\simpleiconsmapeight\symbol{26}} - \expandafter\def\csname simpleicon@netlifyicon\endcsname {\simpleiconsmapeight\symbol{27}} - \expandafter\def\csname simpleicon@netteicon\endcsname {\simpleiconsmapeight\symbol{28}} - \expandafter\def\csname simpleicon@nettoicon\endcsname {\simpleiconsmapeight\symbol{29}} - \expandafter\def\csname simpleicon@neutralinojsicon\endcsname {\simpleiconsmapeight\symbol{30}} - \expandafter\def\csname simpleicon@newbalanceicon\endcsname {\simpleiconsmapeight\symbol{31}} - \expandafter\def\csname simpleicon@neweggicon\endcsname {\simpleiconsmapeight\symbol{32}} - \expandafter\def\csname simpleicon@newjapanprowrestlingicon\endcsname {\simpleiconsmapeight\symbol{33}} - \expandafter\def\csname simpleicon@newrelicicon\endcsname {\simpleiconsmapeight\symbol{34}} - \expandafter\def\csname simpleicon@newyorktimesicon\endcsname {\simpleiconsmapeight\symbol{35}} - \expandafter\def\csname simpleicon@nextbilliondotaiicon\endcsname {\simpleiconsmapeight\symbol{36}} - \expandafter\def\csname simpleicon@nextcloudicon\endcsname {\simpleiconsmapeight\symbol{37}} - \expandafter\def\csname simpleicon@nextdnsicon\endcsname {\simpleiconsmapeight\symbol{38}} - \expandafter\def\csname simpleicon@nextdooricon\endcsname {\simpleiconsmapeight\symbol{39}} - \expandafter\def\csname simpleicon@nextdotjsicon\endcsname {\simpleiconsmapeight\symbol{40}} - \expandafter\def\csname simpleicon@nextraicon\endcsname {\simpleiconsmapeight\symbol{41}} - \expandafter\def\csname simpleicon@nextuiicon\endcsname {\simpleiconsmapeight\symbol{42}} - \expandafter\def\csname simpleicon@nexusmodsicon\endcsname {\simpleiconsmapeight\symbol{43}} - \expandafter\def\csname simpleicon@nfcicon\endcsname {\simpleiconsmapeight\symbol{44}} - \expandafter\def\csname simpleicon@nginxicon\endcsname {\simpleiconsmapeight\symbol{45}} - \expandafter\def\csname simpleicon@nginxproxymanagericon\endcsname {\simpleiconsmapeight\symbol{46}} - \expandafter\def\csname simpleicon@ngrokicon\endcsname {\simpleiconsmapeight\symbol{47}} - \expandafter\def\csname simpleicon@ngrxicon\endcsname {\simpleiconsmapeight\symbol{48}} - \expandafter\def\csname simpleicon@nhlicon\endcsname {\simpleiconsmapeight\symbol{49}} - \expandafter\def\csname simpleicon@nicehashicon\endcsname {\simpleiconsmapeight\symbol{50}} - \expandafter\def\csname simpleicon@niconicoicon\endcsname {\simpleiconsmapeight\symbol{51}} - \expandafter\def\csname simpleicon@nikeicon\endcsname {\simpleiconsmapeight\symbol{52}} - \expandafter\def\csname simpleicon@nikonicon\endcsname {\simpleiconsmapeight\symbol{53}} - \expandafter\def\csname simpleicon@nimicon\endcsname {\simpleiconsmapeight\symbol{54}} - \expandafter\def\csname simpleicon@nintendoicon\endcsname {\simpleiconsmapeight\symbol{55}} - \expandafter\def\csname simpleicon@nintendo3dsicon\endcsname {\simpleiconsmapeight\symbol{56}} - \expandafter\def\csname simpleicon@nintendogamecubeicon\endcsname {\simpleiconsmapeight\symbol{57}} - \expandafter\def\csname simpleicon@nintendoswitchicon\endcsname {\simpleiconsmapeight\symbol{58}} - \expandafter\def\csname simpleicon@nissanicon\endcsname {\simpleiconsmapeight\symbol{59}} - \expandafter\def\csname simpleicon@nixosicon\endcsname {\simpleiconsmapeight\symbol{60}} - \expandafter\def\csname simpleicon@nodedotjsicon\endcsname {\simpleiconsmapeight\symbol{61}} - \expandafter\def\csname simpleicon@nodemonicon\endcsname {\simpleiconsmapeight\symbol{62}} - \expandafter\def\csname simpleicon@noderedicon\endcsname {\simpleiconsmapeight\symbol{63}} - \expandafter\def\csname simpleicon@nokiaicon\endcsname {\simpleiconsmapeight\symbol{64}} - \expandafter\def\csname simpleicon@nomadicon\endcsname {\simpleiconsmapeight\symbol{65}} - \expandafter\def\csname simpleicon@norcoicon\endcsname {\simpleiconsmapeight\symbol{66}} - \expandafter\def\csname simpleicon@nordicsemiconductoricon\endcsname {\simpleiconsmapeight\symbol{67}} - \expandafter\def\csname simpleicon@nordvpnicon\endcsname {\simpleiconsmapeight\symbol{68}} - \expandafter\def\csname simpleicon@normalizedotcssicon\endcsname {\simpleiconsmapeight\symbol{69}} - \expandafter\def\csname simpleicon@nortonicon\endcsname {\simpleiconsmapeight\symbol{70}} - \expandafter\def\csname simpleicon@norwegianicon\endcsname {\simpleiconsmapeight\symbol{71}} - \expandafter\def\csname simpleicon@notepadplusplusicon\endcsname {\simpleiconsmapeight\symbol{72}} - \expandafter\def\csname simpleicon@notionicon\endcsname {\simpleiconsmapeight\symbol{73}} - \expandafter\def\csname simpleicon@notisticon\endcsname {\simpleiconsmapeight\symbol{74}} - \expandafter\def\csname simpleicon@nounprojecticon\endcsname {\simpleiconsmapeight\symbol{75}} - \expandafter\def\csname simpleicon@novuicon\endcsname {\simpleiconsmapeight\symbol{76}} - \expandafter\def\csname simpleicon@nowicon\endcsname {\simpleiconsmapeight\symbol{77}} - \expandafter\def\csname simpleicon@npmicon\endcsname {\simpleiconsmapeight\symbol{78}} - \expandafter\def\csname simpleicon@nrwlicon\endcsname {\simpleiconsmapeight\symbol{79}} - \expandafter\def\csname simpleicon@nsisicon\endcsname {\simpleiconsmapeight\symbol{80}} - \expandafter\def\csname simpleicon@ntfyicon\endcsname {\simpleiconsmapeight\symbol{81}} - \expandafter\def\csname simpleicon@nubankicon\endcsname {\simpleiconsmapeight\symbol{82}} - \expandafter\def\csname simpleicon@nucleoicon\endcsname {\simpleiconsmapeight\symbol{83}} - \expandafter\def\csname simpleicon@nugeticon\endcsname {\simpleiconsmapeight\symbol{84}} - \expandafter\def\csname simpleicon@nukeicon\endcsname {\simpleiconsmapeight\symbol{85}} - \expandafter\def\csname simpleicon@numbaicon\endcsname {\simpleiconsmapeight\symbol{86}} - \expandafter\def\csname simpleicon@numpyicon\endcsname {\simpleiconsmapeight\symbol{87}} - \expandafter\def\csname simpleicon@nunjucksicon\endcsname {\simpleiconsmapeight\symbol{88}} - \expandafter\def\csname simpleicon@nushellicon\endcsname {\simpleiconsmapeight\symbol{89}} - \expandafter\def\csname simpleicon@nutanixicon\endcsname {\simpleiconsmapeight\symbol{90}} - \expandafter\def\csname simpleicon@nuxtdotjsicon\endcsname {\simpleiconsmapeight\symbol{91}} - \expandafter\def\csname simpleicon@nvidiaicon\endcsname {\simpleiconsmapeight\symbol{92}} - \expandafter\def\csname simpleicon@nvmicon\endcsname {\simpleiconsmapeight\symbol{93}} - \expandafter\def\csname simpleicon@nxicon\endcsname {\simpleiconsmapeight\symbol{94}} - \expandafter\def\csname simpleicon@nxpicon\endcsname {\simpleiconsmapeight\symbol{95}} - \expandafter\def\csname simpleicon@nzxticon\endcsname {\simpleiconsmapeight\symbol{96}} - \expandafter\def\csname simpleicon@observableicon\endcsname {\simpleiconsmapeight\symbol{97}} - \expandafter\def\csname simpleicon@obsidianicon\endcsname {\simpleiconsmapeight\symbol{98}} - \expandafter\def\csname simpleicon@obsstudioicon\endcsname {\simpleiconsmapeight\symbol{99}} - \expandafter\def\csname simpleicon@ocamlicon\endcsname {\simpleiconsmapeight\symbol{100}} - \expandafter\def\csname simpleicon@oclificon\endcsname {\simpleiconsmapeight\symbol{101}} - \expandafter\def\csname simpleicon@octanerendericon\endcsname {\simpleiconsmapeight\symbol{102}} - \expandafter\def\csname simpleicon@octaveicon\endcsname {\simpleiconsmapeight\symbol{103}} - \expandafter\def\csname simpleicon@octobercmsicon\endcsname {\simpleiconsmapeight\symbol{104}} - \expandafter\def\csname simpleicon@octoprinticon\endcsname {\simpleiconsmapeight\symbol{105}} - \expandafter\def\csname simpleicon@octopusdeployicon\endcsname {\simpleiconsmapeight\symbol{106}} - \expandafter\def\csname simpleicon@oculusicon\endcsname {\simpleiconsmapeight\symbol{107}} - \expandafter\def\csname simpleicon@odnoklassnikiicon\endcsname {\simpleiconsmapeight\symbol{108}} - \expandafter\def\csname simpleicon@odooicon\endcsname {\simpleiconsmapeight\symbol{109}} - \expandafter\def\csname simpleicon@odyseeicon\endcsname {\simpleiconsmapeight\symbol{110}} - \expandafter\def\csname simpleicon@ohdearicon\endcsname {\simpleiconsmapeight\symbol{111}} - \expandafter\def\csname simpleicon@okcupidicon\endcsname {\simpleiconsmapeight\symbol{112}} - \expandafter\def\csname simpleicon@oktaicon\endcsname {\simpleiconsmapeight\symbol{113}} - \expandafter\def\csname simpleicon@oneplusicon\endcsname {\simpleiconsmapeight\symbol{114}} - \expandafter\def\csname simpleicon@onlyfansicon\endcsname {\simpleiconsmapeight\symbol{115}} - \expandafter\def\csname simpleicon@onlyofficeicon\endcsname {\simpleiconsmapeight\symbol{116}} - \expandafter\def\csname simpleicon@onnxicon\endcsname {\simpleiconsmapeight\symbol{117}} - \expandafter\def\csname simpleicon@onstaricon\endcsname {\simpleiconsmapeight\symbol{118}} - \expandafter\def\csname simpleicon@opelicon\endcsname {\simpleiconsmapeight\symbol{119}} - \expandafter\def\csname simpleicon@openaccessicon\endcsname {\simpleiconsmapeight\symbol{120}} - \expandafter\def\csname simpleicon@openaiicon\endcsname {\simpleiconsmapeight\symbol{121}} - \expandafter\def\csname simpleicon@openaigymicon\endcsname {\simpleiconsmapeight\symbol{122}} - \expandafter\def\csname simpleicon@openapiinitiativeicon\endcsname {\simpleiconsmapeight\symbol{123}} - \expandafter\def\csname simpleicon@openbadgesicon\endcsname {\simpleiconsmapeight\symbol{124}} - \expandafter\def\csname simpleicon@openbsdicon\endcsname {\simpleiconsmapeight\symbol{125}} - \expandafter\def\csname simpleicon@openbugbountyicon\endcsname {\simpleiconsmapeight\symbol{126}} - \expandafter\def\csname simpleicon@opencollectiveicon\endcsname {\simpleiconsmapeight\symbol{127}} - \expandafter\def\csname simpleicon@opencontainersinitiativeicon\endcsname {\simpleiconsmapeight\symbol{128}} - \expandafter\def\csname simpleicon@opencvicon\endcsname {\simpleiconsmapeight\symbol{129}} - \expandafter\def\csname simpleicon@openfaasicon\endcsname {\simpleiconsmapeight\symbol{130}} - \expandafter\def\csname simpleicon@openglicon\endcsname {\simpleiconsmapeight\symbol{131}} - \expandafter\def\csname simpleicon@openhabicon\endcsname {\simpleiconsmapeight\symbol{132}} - \expandafter\def\csname simpleicon@openidicon\endcsname {\simpleiconsmapeight\symbol{133}} - \expandafter\def\csname simpleicon@openjdkicon\endcsname {\simpleiconsmapeight\symbol{134}} - \expandafter\def\csname simpleicon@openjsfoundationicon\endcsname {\simpleiconsmapeight\symbol{135}} - \expandafter\def\csname simpleicon@openlayersicon\endcsname {\simpleiconsmapeight\symbol{136}} - \expandafter\def\csname simpleicon@openmediavaulticon\endcsname {\simpleiconsmapeight\symbol{137}} - \expandafter\def\csname simpleicon@openminedicon\endcsname {\simpleiconsmapeight\symbol{138}} - \expandafter\def\csname simpleicon@opennebulaicon\endcsname {\simpleiconsmapeight\symbol{139}} - \expandafter\def\csname simpleicon@openprojecticon\endcsname {\simpleiconsmapeight\symbol{140}} - \expandafter\def\csname simpleicon@openscadicon\endcsname {\simpleiconsmapeight\symbol{141}} - \expandafter\def\csname simpleicon@openseaicon\endcsname {\simpleiconsmapeight\symbol{142}} - \expandafter\def\csname simpleicon@opensearchicon\endcsname {\simpleiconsmapeight\symbol{143}} - \expandafter\def\csname simpleicon@opensourcehardwareicon\endcsname {\simpleiconsmapeight\symbol{144}} - \expandafter\def\csname simpleicon@opensourceinitiativeicon\endcsname {\simpleiconsmapeight\symbol{145}} - \expandafter\def\csname simpleicon@opensslicon\endcsname {\simpleiconsmapeight\symbol{146}} - \expandafter\def\csname simpleicon@openstackicon\endcsname {\simpleiconsmapeight\symbol{147}} - \expandafter\def\csname simpleicon@openstreetmapicon\endcsname {\simpleiconsmapeight\symbol{148}} - \expandafter\def\csname simpleicon@opensuseicon\endcsname {\simpleiconsmapeight\symbol{149}} - \expandafter\def\csname simpleicon@opentelemetryicon\endcsname {\simpleiconsmapeight\symbol{150}} - \expandafter\def\csname simpleicon@opentexticon\endcsname {\simpleiconsmapeight\symbol{151}} - \expandafter\def\csname simpleicon@opentofuicon\endcsname {\simpleiconsmapeight\symbol{152}} - \expandafter\def\csname simpleicon@openverseicon\endcsname {\simpleiconsmapeight\symbol{153}} - \expandafter\def\csname simpleicon@openvpnicon\endcsname {\simpleiconsmapeight\symbol{154}} - \expandafter\def\csname simpleicon@openwrticon\endcsname {\simpleiconsmapeight\symbol{155}} - \expandafter\def\csname simpleicon@openzeppelinicon\endcsname {\simpleiconsmapeight\symbol{156}} - \expandafter\def\csname simpleicon@openzfsicon\endcsname {\simpleiconsmapeight\symbol{157}} - \expandafter\def\csname simpleicon@operaicon\endcsname {\simpleiconsmapeight\symbol{158}} - \expandafter\def\csname simpleicon@operagxicon\endcsname {\simpleiconsmapeight\symbol{159}} - \expandafter\def\csname simpleicon@opnsenseicon\endcsname {\simpleiconsmapeight\symbol{160}} - \expandafter\def\csname simpleicon@oppoicon\endcsname {\simpleiconsmapeight\symbol{161}} - \expandafter\def\csname simpleicon@opsgenieicon\endcsname {\simpleiconsmapeight\symbol{162}} - \expandafter\def\csname simpleicon@opslevelicon\endcsname {\simpleiconsmapeight\symbol{163}} - \expandafter\def\csname simpleicon@optimismicon\endcsname {\simpleiconsmapeight\symbol{164}} - \expandafter\def\csname simpleicon@oracleicon\endcsname {\simpleiconsmapeight\symbol{165}} - \expandafter\def\csname simpleicon@orangeicon\endcsname {\simpleiconsmapeight\symbol{166}} - \expandafter\def\csname simpleicon@orcidicon\endcsname {\simpleiconsmapeight\symbol{167}} - \expandafter\def\csname simpleicon@oreillyicon\endcsname {\simpleiconsmapeight\symbol{168}} - \expandafter\def\csname simpleicon@orgicon\endcsname {\simpleiconsmapeight\symbol{169}} - \expandafter\def\csname simpleicon@organicmapsicon\endcsname {\simpleiconsmapeight\symbol{170}} - \expandafter\def\csname simpleicon@originicon\endcsname {\simpleiconsmapeight\symbol{171}} - \expandafter\def\csname simpleicon@osanoicon\endcsname {\simpleiconsmapeight\symbol{172}} - \expandafter\def\csname simpleicon@osficon\endcsname {\simpleiconsmapeight\symbol{173}} - \expandafter\def\csname simpleicon@osgeoicon\endcsname {\simpleiconsmapeight\symbol{174}} - \expandafter\def\csname simpleicon@oshkoshicon\endcsname {\simpleiconsmapeight\symbol{175}} - \expandafter\def\csname simpleicon@osmcicon\endcsname {\simpleiconsmapeight\symbol{176}} - \expandafter\def\csname simpleicon@osuicon\endcsname {\simpleiconsmapeight\symbol{177}} - \expandafter\def\csname simpleicon@ottoicon\endcsname {\simpleiconsmapeight\symbol{178}} - \expandafter\def\csname simpleicon@outlineicon\endcsname {\simpleiconsmapeight\symbol{179}} - \expandafter\def\csname simpleicon@overcasticon\endcsname {\simpleiconsmapeight\symbol{180}} - \expandafter\def\csname simpleicon@overleaficon\endcsname {\simpleiconsmapeight\symbol{181}} - \expandafter\def\csname simpleicon@ovhicon\endcsname {\simpleiconsmapeight\symbol{182}} - \expandafter\def\csname simpleicon@owaspicon\endcsname {\simpleiconsmapeight\symbol{183}} - \expandafter\def\csname simpleicon@owncloudicon\endcsname {\simpleiconsmapeight\symbol{184}} - \expandafter\def\csname simpleicon@oxygenicon\endcsname {\simpleiconsmapeight\symbol{185}} - \expandafter\def\csname simpleicon@oyoicon\endcsname {\simpleiconsmapeight\symbol{186}} - \expandafter\def\csname simpleicon@p5dotjsicon\endcsname {\simpleiconsmapeight\symbol{187}} - \expandafter\def\csname simpleicon@packagisticon\endcsname {\simpleiconsmapeight\symbol{188}} - \expandafter\def\csname simpleicon@packericon\endcsname {\simpleiconsmapeight\symbol{189}} - \expandafter\def\csname simpleicon@packticon\endcsname {\simpleiconsmapeight\symbol{190}} - \expandafter\def\csname simpleicon@paddleicon\endcsname {\simpleiconsmapeight\symbol{191}} - \expandafter\def\csname simpleicon@paddlepaddleicon\endcsname {\simpleiconsmapeight\symbol{192}} - \expandafter\def\csname simpleicon@paddypowericon\endcsname {\simpleiconsmapeight\symbol{193}} - \expandafter\def\csname simpleicon@pagekiticon\endcsname {\simpleiconsmapeight\symbol{194}} - \expandafter\def\csname simpleicon@pagerdutyicon\endcsname {\simpleiconsmapeight\symbol{195}} - \expandafter\def\csname simpleicon@pagespeedinsightsicon\endcsname {\simpleiconsmapeight\symbol{196}} - \expandafter\def\csname simpleicon@pagseguroicon\endcsname {\simpleiconsmapeight\symbol{197}} - \expandafter\def\csname simpleicon@palantiricon\endcsname {\simpleiconsmapeight\symbol{198}} - \expandafter\def\csname simpleicon@paloaltonetworksicon\endcsname {\simpleiconsmapeight\symbol{199}} - \expandafter\def\csname simpleicon@paloaltosoftwareicon\endcsname {\simpleiconsmapeight\symbol{200}} - \expandafter\def\csname simpleicon@panasonicicon\endcsname {\simpleiconsmapeight\symbol{201}} - \expandafter\def\csname simpleicon@pandasicon\endcsname {\simpleiconsmapeight\symbol{202}} - \expandafter\def\csname simpleicon@pandoraicon\endcsname {\simpleiconsmapeight\symbol{203}} - \expandafter\def\csname simpleicon@pantheonicon\endcsname {\simpleiconsmapeight\symbol{204}} - \expandafter\def\csname simpleicon@paperlessngxicon\endcsname {\simpleiconsmapeight\symbol{205}} - \expandafter\def\csname simpleicon@paperspaceicon\endcsname {\simpleiconsmapeight\symbol{206}} - \expandafter\def\csname simpleicon@paperswithcodeicon\endcsname {\simpleiconsmapeight\symbol{207}} - \expandafter\def\csname simpleicon@paramountplusicon\endcsname {\simpleiconsmapeight\symbol{208}} - \expandafter\def\csname simpleicon@paritysubstrateicon\endcsname {\simpleiconsmapeight\symbol{209}} - \expandafter\def\csname simpleicon@parrotsecurityicon\endcsname {\simpleiconsmapeight\symbol{210}} - \expandafter\def\csname simpleicon@parsedotlyicon\endcsname {\simpleiconsmapeight\symbol{211}} - \expandafter\def\csname simpleicon@passporticon\endcsname {\simpleiconsmapeight\symbol{212}} - \expandafter\def\csname simpleicon@pastebinicon\endcsname {\simpleiconsmapeight\symbol{213}} - \expandafter\def\csname simpleicon@patreonicon\endcsname {\simpleiconsmapeight\symbol{214}} - \expandafter\def\csname simpleicon@paychexicon\endcsname {\simpleiconsmapeight\symbol{215}} - \expandafter\def\csname simpleicon@payhipicon\endcsname {\simpleiconsmapeight\symbol{216}} - \expandafter\def\csname simpleicon@payloadcmsicon\endcsname {\simpleiconsmapeight\symbol{217}} - \expandafter\def\csname simpleicon@payoneericon\endcsname {\simpleiconsmapeight\symbol{218}} - \expandafter\def\csname simpleicon@paypalicon\endcsname {\simpleiconsmapeight\symbol{219}} - \expandafter\def\csname simpleicon@paytmicon\endcsname {\simpleiconsmapeight\symbol{220}} - \expandafter\def\csname simpleicon@pcgamingwikiicon\endcsname {\simpleiconsmapeight\symbol{221}} - \expandafter\def\csname simpleicon@pdmicon\endcsname {\simpleiconsmapeight\symbol{222}} - \expandafter\def\csname simpleicon@pdqicon\endcsname {\simpleiconsmapeight\symbol{223}} - \expandafter\def\csname simpleicon@peakdesignicon\endcsname {\simpleiconsmapeight\symbol{224}} - \expandafter\def\csname simpleicon@pearsonicon\endcsname {\simpleiconsmapeight\symbol{225}} - \expandafter\def\csname simpleicon@peerlisticon\endcsname {\simpleiconsmapeight\symbol{226}} - \expandafter\def\csname simpleicon@peertubeicon\endcsname {\simpleiconsmapeight\symbol{227}} - \expandafter\def\csname simpleicon@pegasusairlinesicon\endcsname {\simpleiconsmapeight\symbol{228}} - \expandafter\def\csname simpleicon@pelicanicon\endcsname {\simpleiconsmapeight\symbol{229}} - \expandafter\def\csname simpleicon@pelotonicon\endcsname {\simpleiconsmapeight\symbol{230}} - \expandafter\def\csname simpleicon@pennyicon\endcsname {\simpleiconsmapeight\symbol{231}} - \expandafter\def\csname simpleicon@penpoticon\endcsname {\simpleiconsmapeight\symbol{232}} - \expandafter\def\csname simpleicon@percyicon\endcsname {\simpleiconsmapeight\symbol{233}} - \expandafter\def\csname simpleicon@perforceicon\endcsname {\simpleiconsmapeight\symbol{234}} - \expandafter\def\csname simpleicon@perlicon\endcsname {\simpleiconsmapeight\symbol{235}} - \expandafter\def\csname simpleicon@perplexityicon\endcsname {\simpleiconsmapeight\symbol{236}} - \expandafter\def\csname simpleicon@persistenticon\endcsname {\simpleiconsmapeight\symbol{237}} - \expandafter\def\csname simpleicon@personioicon\endcsname {\simpleiconsmapeight\symbol{238}} - \expandafter\def\csname simpleicon@petsathomeicon\endcsname {\simpleiconsmapeight\symbol{239}} - \expandafter\def\csname simpleicon@peugeoticon\endcsname {\simpleiconsmapeight\symbol{240}} - \expandafter\def\csname simpleicon@pexelsicon\endcsname {\simpleiconsmapeight\symbol{241}} - \expandafter\def\csname simpleicon@pfsenseicon\endcsname {\simpleiconsmapeight\symbol{242}} - \expandafter\def\csname simpleicon@phabricatoricon\endcsname {\simpleiconsmapeight\symbol{243}} - \expandafter\def\csname simpleicon@philipshueicon\endcsname {\simpleiconsmapeight\symbol{244}} - \expandafter\def\csname simpleicon@phoenixframeworkicon\endcsname {\simpleiconsmapeight\symbol{245}} - \expandafter\def\csname simpleicon@phonepeicon\endcsname {\simpleiconsmapeight\symbol{246}} - \expandafter\def\csname simpleicon@phosphoriconsicon\endcsname {\simpleiconsmapeight\symbol{247}} - \expandafter\def\csname simpleicon@photobucketicon\endcsname {\simpleiconsmapeight\symbol{248}} - \expandafter\def\csname simpleicon@photocrowdicon\endcsname {\simpleiconsmapeight\symbol{249}} - \expandafter\def\csname simpleicon@photonicon\endcsname {\simpleiconsmapeight\symbol{250}} - \expandafter\def\csname simpleicon@photopeaicon\endcsname {\simpleiconsmapeight\symbol{251}} - \expandafter\def\csname simpleicon@phpicon\endcsname {\simpleiconsmapeight\symbol{252}} - \expandafter\def\csname simpleicon@phpmyadminicon\endcsname {\simpleiconsmapeight\symbol{253}} - \expandafter\def\csname simpleicon@phpstormicon\endcsname {\simpleiconsmapeight\symbol{254}} - \expandafter\def\csname simpleicon@piaggiogroupicon\endcsname {\simpleiconsmapeight\symbol{255}} - \expandafter\def\csname simpleicon@piaproicon\endcsname {\simpleiconsmapnine\symbol{0}} - \expandafter\def\csname simpleicon@picardsurgelesicon\endcsname {\simpleiconsmapnine\symbol{1}} - \expandafter\def\csname simpleicon@picartodottvicon\endcsname {\simpleiconsmapnine\symbol{2}} - \expandafter\def\csname simpleicon@picnicicon\endcsname {\simpleiconsmapnine\symbol{3}} - \expandafter\def\csname simpleicon@picpayicon\endcsname {\simpleiconsmapnine\symbol{4}} - \expandafter\def\csname simpleicon@picrewicon\endcsname {\simpleiconsmapnine\symbol{5}} - \expandafter\def\csname simpleicon@picxyicon\endcsname {\simpleiconsmapnine\symbol{6}} - \expandafter\def\csname simpleicon@piholeicon\endcsname {\simpleiconsmapnine\symbol{7}} - \expandafter\def\csname simpleicon@pimcoreicon\endcsname {\simpleiconsmapnine\symbol{8}} - \expandafter\def\csname simpleicon@pinboardicon\endcsname {\simpleiconsmapnine\symbol{9}} - \expandafter\def\csname simpleicon@pinescripticon\endcsname {\simpleiconsmapnine\symbol{10}} - \expandafter\def\csname simpleicon@pinetworkicon\endcsname {\simpleiconsmapnine\symbol{11}} - \expandafter\def\csname simpleicon@pingdomicon\endcsname {\simpleiconsmapnine\symbol{12}} - \expandafter\def\csname simpleicon@pinoicon\endcsname {\simpleiconsmapnine\symbol{13}} - \expandafter\def\csname simpleicon@pinteresticon\endcsname {\simpleiconsmapnine\symbol{14}} - \expandafter\def\csname simpleicon@pioneerdjicon\endcsname {\simpleiconsmapnine\symbol{15}} - \expandafter\def\csname simpleicon@pipedicon\endcsname {\simpleiconsmapnine\symbol{16}} - \expandafter\def\csname simpleicon@pipxicon\endcsname {\simpleiconsmapnine\symbol{17}} - \expandafter\def\csname simpleicon@pivotaltrackericon\endcsname {\simpleiconsmapnine\symbol{18}} - \expandafter\def\csname simpleicon@piwigoicon\endcsname {\simpleiconsmapnine\symbol{19}} - \expandafter\def\csname simpleicon@pixicon\endcsname {\simpleiconsmapnine\symbol{20}} - \expandafter\def\csname simpleicon@pixabayicon\endcsname {\simpleiconsmapnine\symbol{21}} - \expandafter\def\csname simpleicon@pixelfedicon\endcsname {\simpleiconsmapnine\symbol{22}} - \expandafter\def\csname simpleicon@pixivicon\endcsname {\simpleiconsmapnine\symbol{23}} - \expandafter\def\csname simpleicon@pixlricon\endcsname {\simpleiconsmapnine\symbol{24}} - \expandafter\def\csname simpleicon@pkgsrcicon\endcsname {\simpleiconsmapnine\symbol{25}} - \expandafter\def\csname simpleicon@planeticon\endcsname {\simpleiconsmapnine\symbol{26}} - \expandafter\def\csname simpleicon@planetscaleicon\endcsname {\simpleiconsmapnine\symbol{27}} - \expandafter\def\csname simpleicon@plangridicon\endcsname {\simpleiconsmapnine\symbol{28}} - \expandafter\def\csname simpleicon@platformdotshicon\endcsname {\simpleiconsmapnine\symbol{29}} - \expandafter\def\csname simpleicon@platformioicon\endcsname {\simpleiconsmapnine\symbol{30}} - \expandafter\def\csname simpleicon@platziicon\endcsname {\simpleiconsmapnine\symbol{31}} - \expandafter\def\csname simpleicon@plausibleanalyticsicon\endcsname {\simpleiconsmapnine\symbol{32}} - \expandafter\def\csname simpleicon@playcanvasicon\endcsname {\simpleiconsmapnine\symbol{33}} - \expandafter\def\csname simpleicon@playerdotmeicon\endcsname {\simpleiconsmapnine\symbol{34}} - \expandafter\def\csname simpleicon@playerfmicon\endcsname {\simpleiconsmapnine\symbol{35}} - \expandafter\def\csname simpleicon@playstationicon\endcsname {\simpleiconsmapnine\symbol{36}} - \expandafter\def\csname simpleicon@playstation2icon\endcsname {\simpleiconsmapnine\symbol{37}} - \expandafter\def\csname simpleicon@playstation3icon\endcsname {\simpleiconsmapnine\symbol{38}} - \expandafter\def\csname simpleicon@playstation4icon\endcsname {\simpleiconsmapnine\symbol{39}} - \expandafter\def\csname simpleicon@playstation5icon\endcsname {\simpleiconsmapnine\symbol{40}} - \expandafter\def\csname simpleicon@playstationportableicon\endcsname {\simpleiconsmapnine\symbol{41}} - \expandafter\def\csname simpleicon@playstationvitaicon\endcsname {\simpleiconsmapnine\symbol{42}} - \expandafter\def\csname simpleicon@pleromaicon\endcsname {\simpleiconsmapnine\symbol{43}} - \expandafter\def\csname simpleicon@pleskicon\endcsname {\simpleiconsmapnine\symbol{44}} - \expandafter\def\csname simpleicon@plexicon\endcsname {\simpleiconsmapnine\symbol{45}} - \expandafter\def\csname simpleicon@plotlyicon\endcsname {\simpleiconsmapnine\symbol{46}} - \expandafter\def\csname simpleicon@plumeicon\endcsname {\simpleiconsmapnine\symbol{47}} - \expandafter\def\csname simpleicon@pluralsighticon\endcsname {\simpleiconsmapnine\symbol{48}} - \expandafter\def\csname simpleicon@plurkicon\endcsname {\simpleiconsmapnine\symbol{49}} - \expandafter\def\csname simpleicon@pluscodesicon\endcsname {\simpleiconsmapnine\symbol{50}} - \expandafter\def\csname simpleicon@pm2icon\endcsname {\simpleiconsmapnine\symbol{51}} - \expandafter\def\csname simpleicon@pnpmicon\endcsname {\simpleiconsmapnine\symbol{52}} - \expandafter\def\csname simpleicon@pocketicon\endcsname {\simpleiconsmapnine\symbol{53}} - \expandafter\def\csname simpleicon@pocketbaseicon\endcsname {\simpleiconsmapnine\symbol{54}} - \expandafter\def\csname simpleicon@pocketcastsicon\endcsname {\simpleiconsmapnine\symbol{55}} - \expandafter\def\csname simpleicon@podcastaddicticon\endcsname {\simpleiconsmapnine\symbol{56}} - \expandafter\def\csname simpleicon@podcastindexicon\endcsname {\simpleiconsmapnine\symbol{57}} - \expandafter\def\csname simpleicon@podmanicon\endcsname {\simpleiconsmapnine\symbol{58}} - \expandafter\def\csname simpleicon@poeicon\endcsname {\simpleiconsmapnine\symbol{59}} - \expandafter\def\csname simpleicon@poetryicon\endcsname {\simpleiconsmapnine\symbol{60}} - \expandafter\def\csname simpleicon@pointyicon\endcsname {\simpleiconsmapnine\symbol{61}} - \expandafter\def\csname simpleicon@pokemonicon\endcsname {\simpleiconsmapnine\symbol{62}} - \expandafter\def\csname simpleicon@polarsicon\endcsname {\simpleiconsmapnine\symbol{63}} - \expandafter\def\csname simpleicon@polestaricon\endcsname {\simpleiconsmapnine\symbol{64}} - \expandafter\def\csname simpleicon@polkadoticon\endcsname {\simpleiconsmapnine\symbol{65}} - \expandafter\def\csname simpleicon@polyicon\endcsname {\simpleiconsmapnine\symbol{66}} - \expandafter\def\csname simpleicon@polygonicon\endcsname {\simpleiconsmapnine\symbol{67}} - \expandafter\def\csname simpleicon@polymerprojecticon\endcsname {\simpleiconsmapnine\symbol{68}} - \expandafter\def\csname simpleicon@polyworkicon\endcsname {\simpleiconsmapnine\symbol{69}} - \expandafter\def\csname simpleicon@pond5icon\endcsname {\simpleiconsmapnine\symbol{70}} - \expandafter\def\csname simpleicon@poposicon\endcsname {\simpleiconsmapnine\symbol{71}} - \expandafter\def\csname simpleicon@porkbunicon\endcsname {\simpleiconsmapnine\symbol{72}} - \expandafter\def\csname simpleicon@porscheicon\endcsname {\simpleiconsmapnine\symbol{73}} - \expandafter\def\csname simpleicon@portainericon\endcsname {\simpleiconsmapnine\symbol{74}} - \expandafter\def\csname simpleicon@portswiggericon\endcsname {\simpleiconsmapnine\symbol{75}} - \expandafter\def\csname simpleicon@positicon\endcsname {\simpleiconsmapnine\symbol{76}} - \expandafter\def\csname simpleicon@postcssicon\endcsname {\simpleiconsmapnine\symbol{77}} - \expandafter\def\csname simpleicon@postgresqlicon\endcsname {\simpleiconsmapnine\symbol{78}} - \expandafter\def\csname simpleicon@posthogicon\endcsname {\simpleiconsmapnine\symbol{79}} - \expandafter\def\csname simpleicon@postmanicon\endcsname {\simpleiconsmapnine\symbol{80}} - \expandafter\def\csname simpleicon@postmatesicon\endcsname {\simpleiconsmapnine\symbol{81}} - \expandafter\def\csname simpleicon@powersicon\endcsname {\simpleiconsmapnine\symbol{82}} - \expandafter\def\csname simpleicon@prdotcoicon\endcsname {\simpleiconsmapnine\symbol{83}} - \expandafter\def\csname simpleicon@preacticon\endcsname {\simpleiconsmapnine\symbol{84}} - \expandafter\def\csname simpleicon@precommiticon\endcsname {\simpleiconsmapnine\symbol{85}} - \expandafter\def\csname simpleicon@prefecticon\endcsname {\simpleiconsmapnine\symbol{86}} - \expandafter\def\csname simpleicon@premierleagueicon\endcsname {\simpleiconsmapnine\symbol{87}} - \expandafter\def\csname simpleicon@prepbytesicon\endcsname {\simpleiconsmapnine\symbol{88}} - \expandafter\def\csname simpleicon@prestashopicon\endcsname {\simpleiconsmapnine\symbol{89}} - \expandafter\def\csname simpleicon@prestoicon\endcsname {\simpleiconsmapnine\symbol{90}} - \expandafter\def\csname simpleicon@prettiericon\endcsname {\simpleiconsmapnine\symbol{91}} - \expandafter\def\csname simpleicon@pretzelicon\endcsname {\simpleiconsmapnine\symbol{92}} - \expandafter\def\csname simpleicon@preventionicon\endcsname {\simpleiconsmapnine\symbol{93}} - \expandafter\def\csname simpleicon@preziicon\endcsname {\simpleiconsmapnine\symbol{94}} - \expandafter\def\csname simpleicon@primeicon\endcsname {\simpleiconsmapnine\symbol{95}} - \expandafter\def\csname simpleicon@primengicon\endcsname {\simpleiconsmapnine\symbol{96}} - \expandafter\def\csname simpleicon@primereacticon\endcsname {\simpleiconsmapnine\symbol{97}} - \expandafter\def\csname simpleicon@primevideoicon\endcsname {\simpleiconsmapnine\symbol{98}} - \expandafter\def\csname simpleicon@printablesicon\endcsname {\simpleiconsmapnine\symbol{99}} - \expandafter\def\csname simpleicon@prismaicon\endcsname {\simpleiconsmapnine\symbol{100}} - \expandafter\def\csname simpleicon@prismicicon\endcsname {\simpleiconsmapnine\symbol{101}} - \expandafter\def\csname simpleicon@privatedivisionicon\endcsname {\simpleiconsmapnine\symbol{102}} - \expandafter\def\csname simpleicon@privateinternetaccessicon\endcsname {\simpleiconsmapnine\symbol{103}} - \expandafter\def\csname simpleicon@proboticon\endcsname {\simpleiconsmapnine\symbol{104}} - \expandafter\def\csname simpleicon@processingfoundationicon\endcsname {\simpleiconsmapnine\symbol{105}} - \expandafter\def\csname simpleicon@processwireicon\endcsname {\simpleiconsmapnine\symbol{106}} - \expandafter\def\csname simpleicon@producthunticon\endcsname {\simpleiconsmapnine\symbol{107}} - \expandafter\def\csname simpleicon@progateicon\endcsname {\simpleiconsmapnine\symbol{108}} - \expandafter\def\csname simpleicon@progressicon\endcsname {\simpleiconsmapnine\symbol{109}} - \expandafter\def\csname simpleicon@prometheusicon\endcsname {\simpleiconsmapnine\symbol{110}} - \expandafter\def\csname simpleicon@pronounsdotpageicon\endcsname {\simpleiconsmapnine\symbol{111}} - \expandafter\def\csname simpleicon@prosiebenicon\endcsname {\simpleiconsmapnine\symbol{112}} - \expandafter\def\csname simpleicon@proteusicon\endcsname {\simpleiconsmapnine\symbol{113}} - \expandafter\def\csname simpleicon@protocolsdotioicon\endcsname {\simpleiconsmapnine\symbol{114}} - \expandafter\def\csname simpleicon@protodotioicon\endcsname {\simpleiconsmapnine\symbol{115}} - \expandafter\def\csname simpleicon@protonicon\endcsname {\simpleiconsmapnine\symbol{116}} - \expandafter\def\csname simpleicon@protoncalendaricon\endcsname {\simpleiconsmapnine\symbol{117}} - \expandafter\def\csname simpleicon@protondbicon\endcsname {\simpleiconsmapnine\symbol{118}} - \expandafter\def\csname simpleicon@protondriveicon\endcsname {\simpleiconsmapnine\symbol{119}} - \expandafter\def\csname simpleicon@protonmailicon\endcsname {\simpleiconsmapnine\symbol{120}} - \expandafter\def\csname simpleicon@protonvpnicon\endcsname {\simpleiconsmapnine\symbol{121}} - \expandafter\def\csname simpleicon@protoolsicon\endcsname {\simpleiconsmapnine\symbol{122}} - \expandafter\def\csname simpleicon@protractoricon\endcsname {\simpleiconsmapnine\symbol{123}} - \expandafter\def\csname simpleicon@proxmoxicon\endcsname {\simpleiconsmapnine\symbol{124}} - \expandafter\def\csname simpleicon@pterodactylicon\endcsname {\simpleiconsmapnine\symbol{125}} - \expandafter\def\csname simpleicon@pubgicon\endcsname {\simpleiconsmapnine\symbol{126}} - \expandafter\def\csname simpleicon@publonsicon\endcsname {\simpleiconsmapnine\symbol{127}} - \expandafter\def\csname simpleicon@pubmedicon\endcsname {\simpleiconsmapnine\symbol{128}} - \expandafter\def\csname simpleicon@pugicon\endcsname {\simpleiconsmapnine\symbol{129}} - \expandafter\def\csname simpleicon@pulumiicon\endcsname {\simpleiconsmapnine\symbol{130}} - \expandafter\def\csname simpleicon@pumaicon\endcsname {\simpleiconsmapnine\symbol{131}} - \expandafter\def\csname simpleicon@puppeticon\endcsname {\simpleiconsmapnine\symbol{132}} - \expandafter\def\csname simpleicon@puppeteericon\endcsname {\simpleiconsmapnine\symbol{133}} - \expandafter\def\csname simpleicon@purescripticon\endcsname {\simpleiconsmapnine\symbol{134}} - \expandafter\def\csname simpleicon@purgecssicon\endcsname {\simpleiconsmapnine\symbol{135}} - \expandafter\def\csname simpleicon@purismicon\endcsname {\simpleiconsmapnine\symbol{136}} - \expandafter\def\csname simpleicon@pushbulleticon\endcsname {\simpleiconsmapnine\symbol{137}} - \expandafter\def\csname simpleicon@pushericon\endcsname {\simpleiconsmapnine\symbol{138}} - \expandafter\def\csname simpleicon@pwaicon\endcsname {\simpleiconsmapnine\symbol{139}} - \expandafter\def\csname simpleicon@pycharmicon\endcsname {\simpleiconsmapnine\symbol{140}} - \expandafter\def\csname simpleicon@pycqaicon\endcsname {\simpleiconsmapnine\symbol{141}} - \expandafter\def\csname simpleicon@pydanticicon\endcsname {\simpleiconsmapnine\symbol{142}} - \expandafter\def\csname simpleicon@pygicon\endcsname {\simpleiconsmapnine\symbol{143}} - \expandafter\def\csname simpleicon@pypiicon\endcsname {\simpleiconsmapnine\symbol{144}} - \expandafter\def\csname simpleicon@pypyicon\endcsname {\simpleiconsmapnine\symbol{145}} - \expandafter\def\csname simpleicon@pyscaffoldicon\endcsname {\simpleiconsmapnine\symbol{146}} - \expandafter\def\csname simpleicon@pysyfticon\endcsname {\simpleiconsmapnine\symbol{147}} - \expandafter\def\csname simpleicon@pytesticon\endcsname {\simpleiconsmapnine\symbol{148}} - \expandafter\def\csname simpleicon@pythonicon\endcsname {\simpleiconsmapnine\symbol{149}} - \expandafter\def\csname simpleicon@pythonanywhereicon\endcsname {\simpleiconsmapnine\symbol{150}} - \expandafter\def\csname simpleicon@pytorchicon\endcsname {\simpleiconsmapnine\symbol{151}} - \expandafter\def\csname simpleicon@pyupicon\endcsname {\simpleiconsmapnine\symbol{152}} - \expandafter\def\csname simpleicon@qantasicon\endcsname {\simpleiconsmapnine\symbol{153}} - \expandafter\def\csname simpleicon@qaseicon\endcsname {\simpleiconsmapnine\symbol{154}} - \expandafter\def\csname simpleicon@qatarairwaysicon\endcsname {\simpleiconsmapnine\symbol{155}} - \expandafter\def\csname simpleicon@qbittorrenticon\endcsname {\simpleiconsmapnine\symbol{156}} - \expandafter\def\csname simpleicon@qemuicon\endcsname {\simpleiconsmapnine\symbol{157}} - \expandafter\def\csname simpleicon@qgisicon\endcsname {\simpleiconsmapnine\symbol{158}} - \expandafter\def\csname simpleicon@qiicon\endcsname {\simpleiconsmapnine\symbol{159}} - \expandafter\def\csname simpleicon@qiitaicon\endcsname {\simpleiconsmapnine\symbol{160}} - \expandafter\def\csname simpleicon@qiskiticon\endcsname {\simpleiconsmapnine\symbol{161}} - \expandafter\def\csname simpleicon@qiwiicon\endcsname {\simpleiconsmapnine\symbol{162}} - \expandafter\def\csname simpleicon@qlikicon\endcsname {\simpleiconsmapnine\symbol{163}} - \expandafter\def\csname simpleicon@qmkicon\endcsname {\simpleiconsmapnine\symbol{164}} - \expandafter\def\csname simpleicon@qnapicon\endcsname {\simpleiconsmapnine\symbol{165}} - \expandafter\def\csname simpleicon@qticon\endcsname {\simpleiconsmapnine\symbol{166}} - \expandafter\def\csname simpleicon@qualcommicon\endcsname {\simpleiconsmapnine\symbol{167}} - \expandafter\def\csname simpleicon@qualtricsicon\endcsname {\simpleiconsmapnine\symbol{168}} - \expandafter\def\csname simpleicon@qualysicon\endcsname {\simpleiconsmapnine\symbol{169}} - \expandafter\def\csname simpleicon@quantcasticon\endcsname {\simpleiconsmapnine\symbol{170}} - \expandafter\def\csname simpleicon@quantconnecticon\endcsname {\simpleiconsmapnine\symbol{171}} - \expandafter\def\csname simpleicon@quarkusicon\endcsname {\simpleiconsmapnine\symbol{172}} - \expandafter\def\csname simpleicon@quartoicon\endcsname {\simpleiconsmapnine\symbol{173}} - \expandafter\def\csname simpleicon@quasaricon\endcsname {\simpleiconsmapnine\symbol{174}} - \expandafter\def\csname simpleicon@qubesosicon\endcsname {\simpleiconsmapnine\symbol{175}} - \expandafter\def\csname simpleicon@questicon\endcsname {\simpleiconsmapnine\symbol{176}} - \expandafter\def\csname simpleicon@quickbooksicon\endcsname {\simpleiconsmapnine\symbol{177}} - \expandafter\def\csname simpleicon@quicklookicon\endcsname {\simpleiconsmapnine\symbol{178}} - \expandafter\def\csname simpleicon@quicktimeicon\endcsname {\simpleiconsmapnine\symbol{179}} - \expandafter\def\csname simpleicon@quicktypeicon\endcsname {\simpleiconsmapnine\symbol{180}} - \expandafter\def\csname simpleicon@quipicon\endcsname {\simpleiconsmapnine\symbol{181}} - \expandafter\def\csname simpleicon@quizleticon\endcsname {\simpleiconsmapnine\symbol{182}} - \expandafter\def\csname simpleicon@quoraicon\endcsname {\simpleiconsmapnine\symbol{183}} - \expandafter\def\csname simpleicon@qwanticon\endcsname {\simpleiconsmapnine\symbol{184}} - \expandafter\def\csname simpleicon@qwikicon\endcsname {\simpleiconsmapnine\symbol{185}} - \expandafter\def\csname simpleicon@qwiklabsicon\endcsname {\simpleiconsmapnine\symbol{186}} - \expandafter\def\csname simpleicon@qzoneicon\endcsname {\simpleiconsmapnine\symbol{187}} - \expandafter\def\csname simpleicon@ricon\endcsname {\simpleiconsmapnine\symbol{188}} - \expandafter\def\csname simpleicon@r3icon\endcsname {\simpleiconsmapnine\symbol{189}} - \expandafter\def\csname simpleicon@rabbitmqicon\endcsname {\simpleiconsmapnine\symbol{190}} - \expandafter\def\csname simpleicon@racketicon\endcsname {\simpleiconsmapnine\symbol{191}} - \expandafter\def\csname simpleicon@radaricon\endcsname {\simpleiconsmapnine\symbol{192}} - \expandafter\def\csname simpleicon@radarricon\endcsname {\simpleiconsmapnine\symbol{193}} - \expandafter\def\csname simpleicon@radiopublicicon\endcsname {\simpleiconsmapnine\symbol{194}} - \expandafter\def\csname simpleicon@radixuiicon\endcsname {\simpleiconsmapnine\symbol{195}} - \expandafter\def\csname simpleicon@radstudioicon\endcsname {\simpleiconsmapnine\symbol{196}} - \expandafter\def\csname simpleicon@railwayicon\endcsname {\simpleiconsmapnine\symbol{197}} - \expandafter\def\csname simpleicon@rainmetericon\endcsname {\simpleiconsmapnine\symbol{198}} - \expandafter\def\csname simpleicon@rakutenicon\endcsname {\simpleiconsmapnine\symbol{199}} - \expandafter\def\csname simpleicon@ramicon\endcsname {\simpleiconsmapnine\symbol{200}} - \expandafter\def\csname simpleicon@ranchericon\endcsname {\simpleiconsmapnine\symbol{201}} - \expandafter\def\csname simpleicon@rapidicon\endcsname {\simpleiconsmapnine\symbol{202}} - \expandafter\def\csname simpleicon@raribleicon\endcsname {\simpleiconsmapnine\symbol{203}} - \expandafter\def\csname simpleicon@rasaicon\endcsname {\simpleiconsmapnine\symbol{204}} - \expandafter\def\csname simpleicon@raspberrypiicon\endcsname {\simpleiconsmapnine\symbol{205}} - \expandafter\def\csname simpleicon@ravelryicon\endcsname {\simpleiconsmapnine\symbol{206}} - \expandafter\def\csname simpleicon@rayicon\endcsname {\simpleiconsmapnine\symbol{207}} - \expandafter\def\csname simpleicon@raycasticon\endcsname {\simpleiconsmapnine\symbol{208}} - \expandafter\def\csname simpleicon@raylibicon\endcsname {\simpleiconsmapnine\symbol{209}} - \expandafter\def\csname simpleicon@razericon\endcsname {\simpleiconsmapnine\symbol{210}} - \expandafter\def\csname simpleicon@razorpayicon\endcsname {\simpleiconsmapnine\symbol{211}} - \expandafter\def\csname simpleicon@rcloneicon\endcsname {\simpleiconsmapnine\symbol{212}} - \expandafter\def\csname simpleicon@reacticon\endcsname {\simpleiconsmapnine\symbol{213}} - \expandafter\def\csname simpleicon@reactbootstrapicon\endcsname {\simpleiconsmapnine\symbol{214}} - \expandafter\def\csname simpleicon@reacthookformicon\endcsname {\simpleiconsmapnine\symbol{215}} - \expandafter\def\csname simpleicon@reactiveresumeicon\endcsname {\simpleiconsmapnine\symbol{216}} - \expandafter\def\csname simpleicon@reactivexicon\endcsname {\simpleiconsmapnine\symbol{217}} - \expandafter\def\csname simpleicon@reactosicon\endcsname {\simpleiconsmapnine\symbol{218}} - \expandafter\def\csname simpleicon@reactqueryicon\endcsname {\simpleiconsmapnine\symbol{219}} - \expandafter\def\csname simpleicon@reactroutericon\endcsname {\simpleiconsmapnine\symbol{220}} - \expandafter\def\csname simpleicon@reacttableicon\endcsname {\simpleiconsmapnine\symbol{221}} - \expandafter\def\csname simpleicon@readdotcvicon\endcsname {\simpleiconsmapnine\symbol{222}} - \expandafter\def\csname simpleicon@readmeicon\endcsname {\simpleiconsmapnine\symbol{223}} - \expandafter\def\csname simpleicon@readthedocsicon\endcsname {\simpleiconsmapnine\symbol{224}} - \expandafter\def\csname simpleicon@realmicon\endcsname {\simpleiconsmapnine\symbol{225}} - \expandafter\def\csname simpleicon@reasonicon\endcsname {\simpleiconsmapnine\symbol{226}} - \expandafter\def\csname simpleicon@reasonstudiosicon\endcsname {\simpleiconsmapnine\symbol{227}} - \expandafter\def\csname simpleicon@recoilicon\endcsname {\simpleiconsmapnine\symbol{228}} - \expandafter\def\csname simpleicon@redicon\endcsname {\simpleiconsmapnine\symbol{229}} - \expandafter\def\csname simpleicon@redashicon\endcsname {\simpleiconsmapnine\symbol{230}} - \expandafter\def\csname simpleicon@redbubbleicon\endcsname {\simpleiconsmapnine\symbol{231}} - \expandafter\def\csname simpleicon@redbullicon\endcsname {\simpleiconsmapnine\symbol{232}} - \expandafter\def\csname simpleicon@redditicon\endcsname {\simpleiconsmapnine\symbol{233}} - \expandafter\def\csname simpleicon@redhaticon\endcsname {\simpleiconsmapnine\symbol{234}} - \expandafter\def\csname simpleicon@redhatopenshifticon\endcsname {\simpleiconsmapnine\symbol{235}} - \expandafter\def\csname simpleicon@redisicon\endcsname {\simpleiconsmapnine\symbol{236}} - \expandafter\def\csname simpleicon@redmineicon\endcsname {\simpleiconsmapnine\symbol{237}} - \expandafter\def\csname simpleicon@redoxicon\endcsname {\simpleiconsmapnine\symbol{238}} - \expandafter\def\csname simpleicon@redsysicon\endcsname {\simpleiconsmapnine\symbol{239}} - \expandafter\def\csname simpleicon@reduxicon\endcsname {\simpleiconsmapnine\symbol{240}} - \expandafter\def\csname simpleicon@reduxsagaicon\endcsname {\simpleiconsmapnine\symbol{241}} - \expandafter\def\csname simpleicon@redwoodjsicon\endcsname {\simpleiconsmapnine\symbol{242}} - \expandafter\def\csname simpleicon@reebokicon\endcsname {\simpleiconsmapnine\symbol{243}} - \expandafter\def\csname simpleicon@refineicon\endcsname {\simpleiconsmapnine\symbol{244}} - \expandafter\def\csname simpleicon@relayicon\endcsname {\simpleiconsmapnine\symbol{245}} - \expandafter\def\csname simpleicon@relianceindustrieslimitedicon\endcsname {\simpleiconsmapnine\symbol{246}} - \expandafter\def\csname simpleicon@remarkicon\endcsname {\simpleiconsmapnine\symbol{247}} - \expandafter\def\csname simpleicon@remedyentertainmenticon\endcsname {\simpleiconsmapnine\symbol{248}} - \expandafter\def\csname simpleicon@remixicon\endcsname {\simpleiconsmapnine\symbol{249}} - \expandafter\def\csname simpleicon@removedotbgicon\endcsname {\simpleiconsmapnine\symbol{250}} - \expandafter\def\csname simpleicon@renaulticon\endcsname {\simpleiconsmapnine\symbol{251}} - \expandafter\def\csname simpleicon@rendericon\endcsname {\simpleiconsmapnine\symbol{252}} - \expandafter\def\csname simpleicon@renovateicon\endcsname {\simpleiconsmapnine\symbol{253}} - \expandafter\def\csname simpleicon@renpyicon\endcsname {\simpleiconsmapnine\symbol{254}} - \expandafter\def\csname simpleicon@renrenicon\endcsname {\simpleiconsmapnine\symbol{255}} - \expandafter\def\csname simpleicon@repliticon\endcsname {\simpleiconsmaponezero\symbol{0}} - \expandafter\def\csname simpleicon@republicofgamersicon\endcsname {\simpleiconsmaponezero\symbol{1}} - \expandafter\def\csname simpleicon@rescripticon\endcsname {\simpleiconsmaponezero\symbol{2}} - \expandafter\def\csname simpleicon@rescuetimeicon\endcsname {\simpleiconsmaponezero\symbol{3}} - \expandafter\def\csname simpleicon@researchgateicon\endcsname {\simpleiconsmaponezero\symbol{4}} - \expandafter\def\csname simpleicon@resendicon\endcsname {\simpleiconsmaponezero\symbol{5}} - \expandafter\def\csname simpleicon@resharpericon\endcsname {\simpleiconsmaponezero\symbol{6}} - \expandafter\def\csname simpleicon@resurrectionremixosicon\endcsname {\simpleiconsmaponezero\symbol{7}} - \expandafter\def\csname simpleicon@retoolicon\endcsname {\simpleiconsmaponezero\symbol{8}} - \expandafter\def\csname simpleicon@retroarchicon\endcsname {\simpleiconsmaponezero\symbol{9}} - \expandafter\def\csname simpleicon@retropieicon\endcsname {\simpleiconsmaponezero\symbol{10}} - \expandafter\def\csname simpleicon@revancedicon\endcsname {\simpleiconsmaponezero\symbol{11}} - \expandafter\def\csname simpleicon@revealdotjsicon\endcsname {\simpleiconsmaponezero\symbol{12}} - \expandafter\def\csname simpleicon@reverbnationicon\endcsname {\simpleiconsmaponezero\symbol{13}} - \expandafter\def\csname simpleicon@revoltdotchaticon\endcsname {\simpleiconsmaponezero\symbol{14}} - \expandafter\def\csname simpleicon@revoluticon\endcsname {\simpleiconsmaponezero\symbol{15}} - \expandafter\def\csname simpleicon@revueicon\endcsname {\simpleiconsmaponezero\symbol{16}} - \expandafter\def\csname simpleicon@reweicon\endcsname {\simpleiconsmaponezero\symbol{17}} - \expandafter\def\csname simpleicon@rezgoicon\endcsname {\simpleiconsmaponezero\symbol{18}} - \expandafter\def\csname simpleicon@rhinocerosicon\endcsname {\simpleiconsmaponezero\symbol{19}} - \expandafter\def\csname simpleicon@richicon\endcsname {\simpleiconsmaponezero\symbol{20}} - \expandafter\def\csname simpleicon@ridericon\endcsname {\simpleiconsmaponezero\symbol{21}} - \expandafter\def\csname simpleicon@rimacautomobiliicon\endcsname {\simpleiconsmaponezero\symbol{22}} - \expandafter\def\csname simpleicon@rimeicon\endcsname {\simpleiconsmaponezero\symbol{23}} - \expandafter\def\csname simpleicon@ringicon\endcsname {\simpleiconsmaponezero\symbol{24}} - \expandafter\def\csname simpleicon@riotgamesicon\endcsname {\simpleiconsmaponezero\symbol{25}} - \expandafter\def\csname simpleicon@rippleicon\endcsname {\simpleiconsmaponezero\symbol{26}} - \expandafter\def\csname simpleicon@riscvicon\endcsname {\simpleiconsmaponezero\symbol{27}} - \expandafter\def\csname simpleicon@riseupicon\endcsname {\simpleiconsmaponezero\symbol{28}} - \expandafter\def\csname simpleicon@ritzcarltonicon\endcsname {\simpleiconsmaponezero\symbol{29}} - \expandafter\def\csname simpleicon@riveicon\endcsname {\simpleiconsmaponezero\symbol{30}} - \expandafter\def\csname simpleicon@roadmapdotshicon\endcsname {\simpleiconsmaponezero\symbol{31}} - \expandafter\def\csname simpleicon@roamresearchicon\endcsname {\simpleiconsmaponezero\symbol{32}} - \expandafter\def\csname simpleicon@robinhoodicon\endcsname {\simpleiconsmaponezero\symbol{33}} - \expandafter\def\csname simpleicon@robloxicon\endcsname {\simpleiconsmaponezero\symbol{34}} - \expandafter\def\csname simpleicon@robloxstudioicon\endcsname {\simpleiconsmaponezero\symbol{35}} - \expandafter\def\csname simpleicon@robotframeworkicon\endcsname {\simpleiconsmaponezero\symbol{36}} - \expandafter\def\csname simpleicon@rocketicon\endcsname {\simpleiconsmaponezero\symbol{37}} - \expandafter\def\csname simpleicon@rocketdotchaticon\endcsname {\simpleiconsmaponezero\symbol{38}} - \expandafter\def\csname simpleicon@rocksdbicon\endcsname {\simpleiconsmaponezero\symbol{39}} - \expandafter\def\csname simpleicon@rockstargamesicon\endcsname {\simpleiconsmaponezero\symbol{40}} - \expandafter\def\csname simpleicon@rockwellautomationicon\endcsname {\simpleiconsmaponezero\symbol{41}} - \expandafter\def\csname simpleicon@rockylinuxicon\endcsname {\simpleiconsmaponezero\symbol{42}} - \expandafter\def\csname simpleicon@rokuicon\endcsname {\simpleiconsmaponezero\symbol{43}} - \expandafter\def\csname simpleicon@roll20icon\endcsname {\simpleiconsmaponezero\symbol{44}} - \expandafter\def\csname simpleicon@rollsroyceicon\endcsname {\simpleiconsmaponezero\symbol{45}} - \expandafter\def\csname simpleicon@rollupdotjsicon\endcsname {\simpleiconsmaponezero\symbol{46}} - \expandafter\def\csname simpleicon@roonicon\endcsname {\simpleiconsmaponezero\symbol{47}} - \expandafter\def\csname simpleicon@rootmeicon\endcsname {\simpleiconsmaponezero\symbol{48}} - \expandafter\def\csname simpleicon@rootsicon\endcsname {\simpleiconsmaponezero\symbol{49}} - \expandafter\def\csname simpleicon@rootsbedrockicon\endcsname {\simpleiconsmaponezero\symbol{50}} - \expandafter\def\csname simpleicon@rootssageicon\endcsname {\simpleiconsmaponezero\symbol{51}} - \expandafter\def\csname simpleicon@rosicon\endcsname {\simpleiconsmaponezero\symbol{52}} - \expandafter\def\csname simpleicon@rossmannicon\endcsname {\simpleiconsmaponezero\symbol{53}} - \expandafter\def\csname simpleicon@rotaryinternationalicon\endcsname {\simpleiconsmaponezero\symbol{54}} - \expandafter\def\csname simpleicon@rottentomatoesicon\endcsname {\simpleiconsmaponezero\symbol{55}} - \expandafter\def\csname simpleicon@roundcubeicon\endcsname {\simpleiconsmaponezero\symbol{56}} - \expandafter\def\csname simpleicon@rsocketicon\endcsname {\simpleiconsmaponezero\symbol{57}} - \expandafter\def\csname simpleicon@rssicon\endcsname {\simpleiconsmaponezero\symbol{58}} - \expandafter\def\csname simpleicon@rstudioideicon\endcsname {\simpleiconsmaponezero\symbol{59}} - \expandafter\def\csname simpleicon@rteicon\endcsname {\simpleiconsmaponezero\symbol{60}} - \expandafter\def\csname simpleicon@rtlicon\endcsname {\simpleiconsmaponezero\symbol{61}} - \expandafter\def\csname simpleicon@rtlzweiicon\endcsname {\simpleiconsmaponezero\symbol{62}} - \expandafter\def\csname simpleicon@rtmicon\endcsname {\simpleiconsmaponezero\symbol{63}} - \expandafter\def\csname simpleicon@rubocopicon\endcsname {\simpleiconsmaponezero\symbol{64}} - \expandafter\def\csname simpleicon@rubyicon\endcsname {\simpleiconsmaponezero\symbol{65}} - \expandafter\def\csname simpleicon@rubygemsicon\endcsname {\simpleiconsmaponezero\symbol{66}} - \expandafter\def\csname simpleicon@rubymineicon\endcsname {\simpleiconsmaponezero\symbol{67}} - \expandafter\def\csname simpleicon@rubyonrailsicon\endcsname {\simpleiconsmaponezero\symbol{68}} - \expandafter\def\csname simpleicon@rubysinatraicon\endcsname {\simpleiconsmaponezero\symbol{69}} - \expandafter\def\csname simpleicon@rufficon\endcsname {\simpleiconsmaponezero\symbol{70}} - \expandafter\def\csname simpleicon@rumahwebicon\endcsname {\simpleiconsmaponezero\symbol{71}} - \expandafter\def\csname simpleicon@rumbleicon\endcsname {\simpleiconsmaponezero\symbol{72}} - \expandafter\def\csname simpleicon@rundeckicon\endcsname {\simpleiconsmaponezero\symbol{73}} - \expandafter\def\csname simpleicon@runkeepericon\endcsname {\simpleiconsmaponezero\symbol{74}} - \expandafter\def\csname simpleicon@runkiticon\endcsname {\simpleiconsmaponezero\symbol{75}} - \expandafter\def\csname simpleicon@runrundotiticon\endcsname {\simpleiconsmaponezero\symbol{76}} - \expandafter\def\csname simpleicon@rusticon\endcsname {\simpleiconsmaponezero\symbol{77}} - \expandafter\def\csname simpleicon@rustdeskicon\endcsname {\simpleiconsmaponezero\symbol{78}} - \expandafter\def\csname simpleicon@rxdbicon\endcsname {\simpleiconsmaponezero\symbol{79}} - \expandafter\def\csname simpleicon@ryanairicon\endcsname {\simpleiconsmaponezero\symbol{80}} - \expandafter\def\csname simpleicon@ryeicon\endcsname {\simpleiconsmaponezero\symbol{81}} - \expandafter\def\csname simpleicon@s7airlinesicon\endcsname {\simpleiconsmaponezero\symbol{82}} - \expandafter\def\csname simpleicon@sabanciicon\endcsname {\simpleiconsmaponezero\symbol{83}} - \expandafter\def\csname simpleicon@safariicon\endcsname {\simpleiconsmaponezero\symbol{84}} - \expandafter\def\csname simpleicon@sageicon\endcsname {\simpleiconsmaponezero\symbol{85}} - \expandafter\def\csname simpleicon@sahibindenicon\endcsname {\simpleiconsmaponezero\symbol{86}} - \expandafter\def\csname simpleicon@sailfishosicon\endcsname {\simpleiconsmaponezero\symbol{87}} - \expandafter\def\csname simpleicon@sailsdotjsicon\endcsname {\simpleiconsmaponezero\symbol{88}} - \expandafter\def\csname simpleicon@salesforceicon\endcsname {\simpleiconsmaponezero\symbol{89}} - \expandafter\def\csname simpleicon@sallaicon\endcsname {\simpleiconsmaponezero\symbol{90}} - \expandafter\def\csname simpleicon@saltprojecticon\endcsname {\simpleiconsmaponezero\symbol{91}} - \expandafter\def\csname simpleicon@samsclubicon\endcsname {\simpleiconsmaponezero\symbol{92}} - \expandafter\def\csname simpleicon@samsungicon\endcsname {\simpleiconsmaponezero\symbol{93}} - \expandafter\def\csname simpleicon@samsungpayicon\endcsname {\simpleiconsmaponezero\symbol{94}} - \expandafter\def\csname simpleicon@sandiskicon\endcsname {\simpleiconsmaponezero\symbol{95}} - \expandafter\def\csname simpleicon@sanfranciscomunicipalrailwayicon\endcsname {\simpleiconsmaponezero\symbol{96}} - \expandafter\def\csname simpleicon@sanicicon\endcsname {\simpleiconsmaponezero\symbol{97}} - \expandafter\def\csname simpleicon@sanityicon\endcsname {\simpleiconsmaponezero\symbol{98}} - \expandafter\def\csname simpleicon@saopaulometroicon\endcsname {\simpleiconsmaponezero\symbol{99}} - \expandafter\def\csname simpleicon@sapicon\endcsname {\simpleiconsmaponezero\symbol{100}} - \expandafter\def\csname simpleicon@sartoriusicon\endcsname {\simpleiconsmaponezero\symbol{101}} - \expandafter\def\csname simpleicon@sassicon\endcsname {\simpleiconsmaponezero\symbol{102}} - \expandafter\def\csname simpleicon@sat1icon\endcsname {\simpleiconsmaponezero\symbol{103}} - \expandafter\def\csname simpleicon@satelliteicon\endcsname {\simpleiconsmaponezero\symbol{104}} - \expandafter\def\csname simpleicon@saturnicon\endcsname {\simpleiconsmaponezero\symbol{105}} - \expandafter\def\csname simpleicon@saucelabsicon\endcsname {\simpleiconsmaponezero\symbol{106}} - \expandafter\def\csname simpleicon@saudiaicon\endcsname {\simpleiconsmaponezero\symbol{107}} - \expandafter\def\csname simpleicon@scalaicon\endcsname {\simpleiconsmaponezero\symbol{108}} - \expandafter\def\csname simpleicon@scalewayicon\endcsname {\simpleiconsmaponezero\symbol{109}} - \expandafter\def\csname simpleicon@scaniaicon\endcsname {\simpleiconsmaponezero\symbol{110}} - \expandafter\def\csname simpleicon@schneiderelectricicon\endcsname {\simpleiconsmaponezero\symbol{111}} - \expandafter\def\csname simpleicon@scikitlearnicon\endcsname {\simpleiconsmaponezero\symbol{112}} - \expandafter\def\csname simpleicon@scilabicon\endcsname {\simpleiconsmaponezero\symbol{113}} - \expandafter\def\csname simpleicon@scipyicon\endcsname {\simpleiconsmaponezero\symbol{114}} - \expandafter\def\csname simpleicon@scopusicon\endcsname {\simpleiconsmaponezero\symbol{115}} - \expandafter\def\csname simpleicon@scpfoundationicon\endcsname {\simpleiconsmaponezero\symbol{116}} - \expandafter\def\csname simpleicon@scrapboxicon\endcsname {\simpleiconsmaponezero\symbol{117}} - \expandafter\def\csname simpleicon@scrapyicon\endcsname {\simpleiconsmaponezero\symbol{118}} - \expandafter\def\csname simpleicon@scratchicon\endcsname {\simpleiconsmaponezero\symbol{119}} - \expandafter\def\csname simpleicon@screencastifyicon\endcsname {\simpleiconsmaponezero\symbol{120}} - \expandafter\def\csname simpleicon@scribdicon\endcsname {\simpleiconsmaponezero\symbol{121}} - \expandafter\def\csname simpleicon@scrimbaicon\endcsname {\simpleiconsmaponezero\symbol{122}} - \expandafter\def\csname simpleicon@scrollrevealicon\endcsname {\simpleiconsmaponezero\symbol{123}} - \expandafter\def\csname simpleicon@scrumallianceicon\endcsname {\simpleiconsmaponezero\symbol{124}} - \expandafter\def\csname simpleicon@scrutinizerciicon\endcsname {\simpleiconsmaponezero\symbol{125}} - \expandafter\def\csname simpleicon@scylladbicon\endcsname {\simpleiconsmaponezero\symbol{126}} - \expandafter\def\csname simpleicon@seagateicon\endcsname {\simpleiconsmaponezero\symbol{127}} - \expandafter\def\csname simpleicon@searxngicon\endcsname {\simpleiconsmaponezero\symbol{128}} - \expandafter\def\csname simpleicon@seaticon\endcsname {\simpleiconsmaponezero\symbol{129}} - \expandafter\def\csname simpleicon@seatgeekicon\endcsname {\simpleiconsmaponezero\symbol{130}} - \expandafter\def\csname simpleicon@securityscorecardicon\endcsname {\simpleiconsmaponezero\symbol{131}} - \expandafter\def\csname simpleicon@sefariaicon\endcsname {\simpleiconsmaponezero\symbol{132}} - \expandafter\def\csname simpleicon@segaicon\endcsname {\simpleiconsmaponezero\symbol{133}} - \expandafter\def\csname simpleicon@seleniumicon\endcsname {\simpleiconsmaponezero\symbol{134}} - \expandafter\def\csname simpleicon@sellfyicon\endcsname {\simpleiconsmaponezero\symbol{135}} - \expandafter\def\csname simpleicon@semanticreleaseicon\endcsname {\simpleiconsmaponezero\symbol{136}} - \expandafter\def\csname simpleicon@semanticscholaricon\endcsname {\simpleiconsmaponezero\symbol{137}} - \expandafter\def\csname simpleicon@semanticuiicon\endcsname {\simpleiconsmaponezero\symbol{138}} - \expandafter\def\csname simpleicon@semanticuireacticon\endcsname {\simpleiconsmaponezero\symbol{139}} - \expandafter\def\csname simpleicon@semanticwebicon\endcsname {\simpleiconsmaponezero\symbol{140}} - \expandafter\def\csname simpleicon@semaphoreciicon\endcsname {\simpleiconsmaponezero\symbol{141}} - \expandafter\def\csname simpleicon@semrushicon\endcsname {\simpleiconsmaponezero\symbol{142}} - \expandafter\def\csname simpleicon@semvericon\endcsname {\simpleiconsmaponezero\symbol{143}} - \expandafter\def\csname simpleicon@senchaicon\endcsname {\simpleiconsmaponezero\symbol{144}} - \expandafter\def\csname simpleicon@sennheisericon\endcsname {\simpleiconsmaponezero\symbol{145}} - \expandafter\def\csname simpleicon@sensuicon\endcsname {\simpleiconsmaponezero\symbol{146}} - \expandafter\def\csname simpleicon@sentryicon\endcsname {\simpleiconsmaponezero\symbol{147}} - \expandafter\def\csname simpleicon@sepaicon\endcsname {\simpleiconsmaponezero\symbol{148}} - \expandafter\def\csname simpleicon@sequelizeicon\endcsname {\simpleiconsmaponezero\symbol{149}} - \expandafter\def\csname simpleicon@serverfaulticon\endcsname {\simpleiconsmaponezero\symbol{150}} - \expandafter\def\csname simpleicon@serverlessicon\endcsname {\simpleiconsmaponezero\symbol{151}} - \expandafter\def\csname simpleicon@sessionicon\endcsname {\simpleiconsmaponezero\symbol{152}} - \expandafter\def\csname simpleicon@sessionizeicon\endcsname {\simpleiconsmaponezero\symbol{153}} - \expandafter\def\csname simpleicon@setappicon\endcsname {\simpleiconsmaponezero\symbol{154}} - \expandafter\def\csname simpleicon@sfmlicon\endcsname {\simpleiconsmaponezero\symbol{155}} - \expandafter\def\csname simpleicon@shadcnuiicon\endcsname {\simpleiconsmaponezero\symbol{156}} - \expandafter\def\csname simpleicon@shadowicon\endcsname {\simpleiconsmaponezero\symbol{157}} - \expandafter\def\csname simpleicon@shanghaimetroicon\endcsname {\simpleiconsmaponezero\symbol{158}} - \expandafter\def\csname simpleicon@sharexicon\endcsname {\simpleiconsmaponezero\symbol{159}} - \expandafter\def\csname simpleicon@sharpicon\endcsname {\simpleiconsmaponezero\symbol{160}} - \expandafter\def\csname simpleicon@shazamicon\endcsname {\simpleiconsmaponezero\symbol{161}} - \expandafter\def\csname simpleicon@shellicon\endcsname {\simpleiconsmaponezero\symbol{162}} - \expandafter\def\csname simpleicon@shellyicon\endcsname {\simpleiconsmaponezero\symbol{163}} - \expandafter\def\csname simpleicon@shenzhenmetroicon\endcsname {\simpleiconsmaponezero\symbol{164}} - \expandafter\def\csname simpleicon@shieldsdotioicon\endcsname {\simpleiconsmaponezero\symbol{165}} - \expandafter\def\csname simpleicon@shikimoriicon\endcsname {\simpleiconsmaponezero\symbol{166}} - \expandafter\def\csname simpleicon@shopeeicon\endcsname {\simpleiconsmaponezero\symbol{167}} - \expandafter\def\csname simpleicon@shopifyicon\endcsname {\simpleiconsmaponezero\symbol{168}} - \expandafter\def\csname simpleicon@shopwareicon\endcsname {\simpleiconsmaponezero\symbol{169}} - \expandafter\def\csname simpleicon@shortcuticon\endcsname {\simpleiconsmaponezero\symbol{170}} - \expandafter\def\csname simpleicon@showpadicon\endcsname {\simpleiconsmaponezero\symbol{171}} - \expandafter\def\csname simpleicon@showtimeicon\endcsname {\simpleiconsmaponezero\symbol{172}} - \expandafter\def\csname simpleicon@showwcaseicon\endcsname {\simpleiconsmaponezero\symbol{173}} - \expandafter\def\csname simpleicon@shutterstockicon\endcsname {\simpleiconsmaponezero\symbol{174}} - \expandafter\def\csname simpleicon@sidekiqicon\endcsname {\simpleiconsmaponezero\symbol{175}} - \expandafter\def\csname simpleicon@sidequesticon\endcsname {\simpleiconsmaponezero\symbol{176}} - \expandafter\def\csname simpleicon@siemensicon\endcsname {\simpleiconsmaponezero\symbol{177}} - \expandafter\def\csname simpleicon@sifiveicon\endcsname {\simpleiconsmaponezero\symbol{178}} - \expandafter\def\csname simpleicon@signalicon\endcsname {\simpleiconsmaponezero\symbol{179}} - \expandafter\def\csname simpleicon@similarwebicon\endcsname {\simpleiconsmaponezero\symbol{180}} - \expandafter\def\csname simpleicon@simklicon\endcsname {\simpleiconsmaponezero\symbol{181}} - \expandafter\def\csname simpleicon@simpleanalyticsicon\endcsname {\simpleiconsmaponezero\symbol{182}} - \expandafter\def\csname simpleicon@simpleiconsicon\endcsname {\simpleiconsmaponezero\symbol{183}} - \expandafter\def\csname simpleicon@simpleloginicon\endcsname {\simpleiconsmaponezero\symbol{184}} - \expandafter\def\csname simpleicon@simplenoteicon\endcsname {\simpleiconsmaponezero\symbol{185}} - \expandafter\def\csname simpleicon@sinaweiboicon\endcsname {\simpleiconsmaponezero\symbol{186}} - \expandafter\def\csname simpleicon@singaporeairlinesicon\endcsname {\simpleiconsmaponezero\symbol{187}} - \expandafter\def\csname simpleicon@singlestoreicon\endcsname {\simpleiconsmaponezero\symbol{188}} - \expandafter\def\csname simpleicon@sitecoreicon\endcsname {\simpleiconsmaponezero\symbol{189}} - \expandafter\def\csname simpleicon@sitepointicon\endcsname {\simpleiconsmaponezero\symbol{190}} - \expandafter\def\csname simpleicon@siyuanicon\endcsname {\simpleiconsmaponezero\symbol{191}} - \expandafter\def\csname simpleicon@skaffoldicon\endcsname {\simpleiconsmaponezero\symbol{192}} - \expandafter\def\csname simpleicon@sketchicon\endcsname {\simpleiconsmaponezero\symbol{193}} - \expandafter\def\csname simpleicon@sketchfabicon\endcsname {\simpleiconsmaponezero\symbol{194}} - \expandafter\def\csname simpleicon@sketchupicon\endcsname {\simpleiconsmaponezero\symbol{195}} - \expandafter\def\csname simpleicon@skillshareicon\endcsname {\simpleiconsmaponezero\symbol{196}} - \expandafter\def\csname simpleicon@skodaicon\endcsname {\simpleiconsmaponezero\symbol{197}} - \expandafter\def\csname simpleicon@skyicon\endcsname {\simpleiconsmaponezero\symbol{198}} - \expandafter\def\csname simpleicon@skypackicon\endcsname {\simpleiconsmaponezero\symbol{199}} - \expandafter\def\csname simpleicon@skyrockicon\endcsname {\simpleiconsmaponezero\symbol{200}} - \expandafter\def\csname simpleicon@slackicon\endcsname {\simpleiconsmaponezero\symbol{201}} - \expandafter\def\csname simpleicon@slackwareicon\endcsname {\simpleiconsmaponezero\symbol{202}} - \expandafter\def\csname simpleicon@slashdoticon\endcsname {\simpleiconsmaponezero\symbol{203}} - \expandafter\def\csname simpleicon@slickpicicon\endcsname {\simpleiconsmaponezero\symbol{204}} - \expandafter\def\csname simpleicon@slidesicon\endcsname {\simpleiconsmaponezero\symbol{205}} - \expandafter\def\csname simpleicon@slideshareicon\endcsname {\simpleiconsmaponezero\symbol{206}} - \expandafter\def\csname simpleicon@slinticon\endcsname {\simpleiconsmaponezero\symbol{207}} - \expandafter\def\csname simpleicon@smarticon\endcsname {\simpleiconsmaponezero\symbol{208}} - \expandafter\def\csname simpleicon@smartthingsicon\endcsname {\simpleiconsmaponezero\symbol{209}} - \expandafter\def\csname simpleicon@smashdotggicon\endcsname {\simpleiconsmaponezero\symbol{210}} - \expandafter\def\csname simpleicon@smashingmagazineicon\endcsname {\simpleiconsmaponezero\symbol{211}} - \expandafter\def\csname simpleicon@smrticon\endcsname {\simpleiconsmaponezero\symbol{212}} - \expandafter\def\csname simpleicon@smugmugicon\endcsname {\simpleiconsmaponezero\symbol{213}} - \expandafter\def\csname simpleicon@snapchaticon\endcsname {\simpleiconsmaponezero\symbol{214}} - \expandafter\def\csname simpleicon@snapcrafticon\endcsname {\simpleiconsmaponezero\symbol{215}} - \expandafter\def\csname simpleicon@sncficon\endcsname {\simpleiconsmaponezero\symbol{216}} - \expandafter\def\csname simpleicon@snorticon\endcsname {\simpleiconsmaponezero\symbol{217}} - \expandafter\def\csname simpleicon@snowflakeicon\endcsname {\simpleiconsmaponezero\symbol{218}} - \expandafter\def\csname simpleicon@snowpackicon\endcsname {\simpleiconsmaponezero\symbol{219}} - \expandafter\def\csname simpleicon@snykicon\endcsname {\simpleiconsmaponezero\symbol{220}} - \expandafter\def\csname simpleicon@socialbladeicon\endcsname {\simpleiconsmaponezero\symbol{221}} - \expandafter\def\csname simpleicon@society6icon\endcsname {\simpleiconsmaponezero\symbol{222}} - \expandafter\def\csname simpleicon@socketdotioicon\endcsname {\simpleiconsmaponezero\symbol{223}} - \expandafter\def\csname simpleicon@softpediaicon\endcsname {\simpleiconsmaponezero\symbol{224}} - \expandafter\def\csname simpleicon@sogouicon\endcsname {\simpleiconsmaponezero\symbol{225}} - \expandafter\def\csname simpleicon@solanaicon\endcsname {\simpleiconsmaponezero\symbol{226}} - \expandafter\def\csname simpleicon@solidicon\endcsname {\simpleiconsmaponezero\symbol{227}} - \expandafter\def\csname simpleicon@solidityicon\endcsname {\simpleiconsmaponezero\symbol{228}} - \expandafter\def\csname simpleicon@sololearnicon\endcsname {\simpleiconsmaponezero\symbol{229}} - \expandafter\def\csname simpleicon@solusicon\endcsname {\simpleiconsmaponezero\symbol{230}} - \expandafter\def\csname simpleicon@sonaricon\endcsname {\simpleiconsmaponezero\symbol{231}} - \expandafter\def\csname simpleicon@sonarcloudicon\endcsname {\simpleiconsmaponezero\symbol{232}} - \expandafter\def\csname simpleicon@sonarlinticon\endcsname {\simpleiconsmaponezero\symbol{233}} - \expandafter\def\csname simpleicon@sonarqubeicon\endcsname {\simpleiconsmaponezero\symbol{234}} - \expandafter\def\csname simpleicon@sonarricon\endcsname {\simpleiconsmaponezero\symbol{235}} - \expandafter\def\csname simpleicon@sonatypeicon\endcsname {\simpleiconsmaponezero\symbol{236}} - \expandafter\def\csname simpleicon@songkickicon\endcsname {\simpleiconsmaponezero\symbol{237}} - \expandafter\def\csname simpleicon@songodaicon\endcsname {\simpleiconsmaponezero\symbol{238}} - \expandafter\def\csname simpleicon@sonicwallicon\endcsname {\simpleiconsmaponezero\symbol{239}} - \expandafter\def\csname simpleicon@sonosicon\endcsname {\simpleiconsmaponezero\symbol{240}} - \expandafter\def\csname simpleicon@sonyicon\endcsname {\simpleiconsmaponezero\symbol{241}} - \expandafter\def\csname simpleicon@sorianaicon\endcsname {\simpleiconsmaponezero\symbol{242}} - \expandafter\def\csname simpleicon@soundchartsicon\endcsname {\simpleiconsmaponezero\symbol{243}} - \expandafter\def\csname simpleicon@soundcloudicon\endcsname {\simpleiconsmaponezero\symbol{244}} - \expandafter\def\csname simpleicon@sourceengineicon\endcsname {\simpleiconsmaponezero\symbol{245}} - \expandafter\def\csname simpleicon@sourceforgeicon\endcsname {\simpleiconsmaponezero\symbol{246}} - \expandafter\def\csname simpleicon@sourcehuticon\endcsname {\simpleiconsmaponezero\symbol{247}} - \expandafter\def\csname simpleicon@sourcetreeicon\endcsname {\simpleiconsmaponezero\symbol{248}} - \expandafter\def\csname simpleicon@southwestairlinesicon\endcsname {\simpleiconsmaponezero\symbol{249}} - \expandafter\def\csname simpleicon@spacemacsicon\endcsname {\simpleiconsmaponezero\symbol{250}} - \expandafter\def\csname simpleicon@spaceshipicon\endcsname {\simpleiconsmaponezero\symbol{251}} - \expandafter\def\csname simpleicon@spacexicon\endcsname {\simpleiconsmaponezero\symbol{252}} - \expandafter\def\csname simpleicon@spacyicon\endcsname {\simpleiconsmaponezero\symbol{253}} - \expandafter\def\csname simpleicon@sparkaricon\endcsname {\simpleiconsmaponezero\symbol{254}} - \expandafter\def\csname simpleicon@sparkasseicon\endcsname {\simpleiconsmaponezero\symbol{255}} - \expandafter\def\csname simpleicon@sparkfunicon\endcsname {\simpleiconsmaponeone\symbol{0}} - \expandafter\def\csname simpleicon@sparkposticon\endcsname {\simpleiconsmaponeone\symbol{1}} - \expandafter\def\csname simpleicon@spdxicon\endcsname {\simpleiconsmaponeone\symbol{2}} - \expandafter\def\csname simpleicon@speakerdeckicon\endcsname {\simpleiconsmaponeone\symbol{3}} - \expandafter\def\csname simpleicon@spectrumicon\endcsname {\simpleiconsmaponeone\symbol{4}} - \expandafter\def\csname simpleicon@speedtesticon\endcsname {\simpleiconsmaponeone\symbol{5}} - \expandafter\def\csname simpleicon@speedypageicon\endcsname {\simpleiconsmaponeone\symbol{6}} - \expandafter\def\csname simpleicon@sphinxicon\endcsname {\simpleiconsmaponeone\symbol{7}} - \expandafter\def\csname simpleicon@spigotmcicon\endcsname {\simpleiconsmaponeone\symbol{8}} - \expandafter\def\csname simpleicon@spineicon\endcsname {\simpleiconsmaponeone\symbol{9}} - \expandafter\def\csname simpleicon@spinnakericon\endcsname {\simpleiconsmaponeone\symbol{10}} - \expandafter\def\csname simpleicon@spinrillaicon\endcsname {\simpleiconsmaponeone\symbol{11}} - \expandafter\def\csname simpleicon@splunkicon\endcsname {\simpleiconsmaponeone\symbol{12}} - \expandafter\def\csname simpleicon@spojicon\endcsname {\simpleiconsmaponeone\symbol{13}} - \expandafter\def\csname simpleicon@spondicon\endcsname {\simpleiconsmaponeone\symbol{14}} - \expandafter\def\csname simpleicon@spotifyicon\endcsname {\simpleiconsmaponeone\symbol{15}} - \expandafter\def\csname simpleicon@spotlighticon\endcsname {\simpleiconsmaponeone\symbol{16}} - \expandafter\def\csname simpleicon@spreadshirticon\endcsname {\simpleiconsmaponeone\symbol{17}} - \expandafter\def\csname simpleicon@spreakericon\endcsname {\simpleiconsmaponeone\symbol{18}} - \expandafter\def\csname simpleicon@springicon\endcsname {\simpleiconsmaponeone\symbol{19}} - \expandafter\def\csname simpleicon@springcreatorsicon\endcsname {\simpleiconsmaponeone\symbol{20}} - \expandafter\def\csname simpleicon@springbooticon\endcsname {\simpleiconsmaponeone\symbol{21}} - \expandafter\def\csname simpleicon@springsecurityicon\endcsname {\simpleiconsmaponeone\symbol{22}} - \expandafter\def\csname simpleicon@spyderideicon\endcsname {\simpleiconsmaponeone\symbol{23}} - \expandafter\def\csname simpleicon@sqlalchemyicon\endcsname {\simpleiconsmaponeone\symbol{24}} - \expandafter\def\csname simpleicon@sqliteicon\endcsname {\simpleiconsmaponeone\symbol{25}} - \expandafter\def\csname simpleicon@squareicon\endcsname {\simpleiconsmaponeone\symbol{26}} - \expandafter\def\csname simpleicon@squareenixicon\endcsname {\simpleiconsmaponeone\symbol{27}} - \expandafter\def\csname simpleicon@squarespaceicon\endcsname {\simpleiconsmaponeone\symbol{28}} - \expandafter\def\csname simpleicon@srgssricon\endcsname {\simpleiconsmaponeone\symbol{29}} - \expandafter\def\csname simpleicon@ssrnicon\endcsname {\simpleiconsmaponeone\symbol{30}} - \expandafter\def\csname simpleicon@ssticon\endcsname {\simpleiconsmaponeone\symbol{31}} - \expandafter\def\csname simpleicon@stackbiticon\endcsname {\simpleiconsmaponeone\symbol{32}} - \expandafter\def\csname simpleicon@stackblitzicon\endcsname {\simpleiconsmaponeone\symbol{33}} - \expandafter\def\csname simpleicon@stackediticon\endcsname {\simpleiconsmaponeone\symbol{34}} - \expandafter\def\csname simpleicon@stackexchangeicon\endcsname {\simpleiconsmaponeone\symbol{35}} - \expandafter\def\csname simpleicon@stackhawkicon\endcsname {\simpleiconsmaponeone\symbol{36}} - \expandafter\def\csname simpleicon@stackoverflowicon\endcsname {\simpleiconsmaponeone\symbol{37}} - \expandafter\def\csname simpleicon@stackpathicon\endcsname {\simpleiconsmaponeone\symbol{38}} - \expandafter\def\csname simpleicon@stackshareicon\endcsname {\simpleiconsmaponeone\symbol{39}} - \expandafter\def\csname simpleicon@stadiaicon\endcsname {\simpleiconsmaponeone\symbol{40}} - \expandafter\def\csname simpleicon@staffbaseicon\endcsname {\simpleiconsmaponeone\symbol{41}} - \expandafter\def\csname simpleicon@stagetimericon\endcsname {\simpleiconsmaponeone\symbol{42}} - \expandafter\def\csname simpleicon@standardjsicon\endcsname {\simpleiconsmaponeone\symbol{43}} - \expandafter\def\csname simpleicon@standardresumeicon\endcsname {\simpleiconsmaponeone\symbol{44}} - \expandafter\def\csname simpleicon@starbucksicon\endcsname {\simpleiconsmaponeone\symbol{45}} - \expandafter\def\csname simpleicon@stardockicon\endcsname {\simpleiconsmaponeone\symbol{46}} - \expandafter\def\csname simpleicon@starlingbankicon\endcsname {\simpleiconsmaponeone\symbol{47}} - \expandafter\def\csname simpleicon@starshipicon\endcsname {\simpleiconsmaponeone\symbol{48}} - \expandafter\def\csname simpleicon@startrekicon\endcsname {\simpleiconsmaponeone\symbol{49}} - \expandafter\def\csname simpleicon@starzicon\endcsname {\simpleiconsmaponeone\symbol{50}} - \expandafter\def\csname simpleicon@statamicicon\endcsname {\simpleiconsmaponeone\symbol{51}} - \expandafter\def\csname simpleicon@statistaicon\endcsname {\simpleiconsmaponeone\symbol{52}} - \expandafter\def\csname simpleicon@statuspageicon\endcsname {\simpleiconsmaponeone\symbol{53}} - \expandafter\def\csname simpleicon@statuspalicon\endcsname {\simpleiconsmaponeone\symbol{54}} - \expandafter\def\csname simpleicon@steamicon\endcsname {\simpleiconsmaponeone\symbol{55}} - \expandafter\def\csname simpleicon@steamdbicon\endcsname {\simpleiconsmaponeone\symbol{56}} - \expandafter\def\csname simpleicon@steamdeckicon\endcsname {\simpleiconsmaponeone\symbol{57}} - \expandafter\def\csname simpleicon@steamworksicon\endcsname {\simpleiconsmaponeone\symbol{58}} - \expandafter\def\csname simpleicon@steelseriesicon\endcsname {\simpleiconsmaponeone\symbol{59}} - \expandafter\def\csname simpleicon@steemicon\endcsname {\simpleiconsmaponeone\symbol{60}} - \expandafter\def\csname simpleicon@steemiticon\endcsname {\simpleiconsmaponeone\symbol{61}} - \expandafter\def\csname simpleicon@steinbergicon\endcsname {\simpleiconsmaponeone\symbol{62}} - \expandafter\def\csname simpleicon@stellaricon\endcsname {\simpleiconsmaponeone\symbol{63}} - \expandafter\def\csname simpleicon@stencilicon\endcsname {\simpleiconsmaponeone\symbol{64}} - \expandafter\def\csname simpleicon@stencylicon\endcsname {\simpleiconsmaponeone\symbol{65}} - \expandafter\def\csname simpleicon@stimulusicon\endcsname {\simpleiconsmaponeone\symbol{66}} - \expandafter\def\csname simpleicon@stitchericon\endcsname {\simpleiconsmaponeone\symbol{67}} - \expandafter\def\csname simpleicon@stmicroelectronicsicon\endcsname {\simpleiconsmaponeone\symbol{68}} - \expandafter\def\csname simpleicon@stockxicon\endcsname {\simpleiconsmaponeone\symbol{69}} - \expandafter\def\csname simpleicon@stopstalkicon\endcsname {\simpleiconsmaponeone\symbol{70}} - \expandafter\def\csname simpleicon@storyblokicon\endcsname {\simpleiconsmaponeone\symbol{71}} - \expandafter\def\csname simpleicon@storybookicon\endcsname {\simpleiconsmaponeone\symbol{72}} - \expandafter\def\csname simpleicon@strapiicon\endcsname {\simpleiconsmaponeone\symbol{73}} - \expandafter\def\csname simpleicon@stravaicon\endcsname {\simpleiconsmaponeone\symbol{74}} - \expandafter\def\csname simpleicon@streamlabsicon\endcsname {\simpleiconsmaponeone\symbol{75}} - \expandafter\def\csname simpleicon@streamliticon\endcsname {\simpleiconsmaponeone\symbol{76}} - \expandafter\def\csname simpleicon@streamrunnersicon\endcsname {\simpleiconsmaponeone\symbol{77}} - \expandafter\def\csname simpleicon@stripeicon\endcsname {\simpleiconsmaponeone\symbol{78}} - \expandafter\def\csname simpleicon@strongswanicon\endcsname {\simpleiconsmaponeone\symbol{79}} - \expandafter\def\csname simpleicon@strykericon\endcsname {\simpleiconsmaponeone\symbol{80}} - \expandafter\def\csname simpleicon@stubhubicon\endcsname {\simpleiconsmaponeone\symbol{81}} - \expandafter\def\csname simpleicon@studio3ticon\endcsname {\simpleiconsmaponeone\symbol{82}} - \expandafter\def\csname simpleicon@studyverseicon\endcsname {\simpleiconsmaponeone\symbol{83}} - \expandafter\def\csname simpleicon@styledcomponentsicon\endcsname {\simpleiconsmaponeone\symbol{84}} - \expandafter\def\csname simpleicon@stylelinticon\endcsname {\simpleiconsmaponeone\symbol{85}} - \expandafter\def\csname simpleicon@styleshareicon\endcsname {\simpleiconsmaponeone\symbol{86}} - \expandafter\def\csname simpleicon@stylusicon\endcsname {\simpleiconsmaponeone\symbol{87}} - \expandafter\def\csname simpleicon@subaruicon\endcsname {\simpleiconsmaponeone\symbol{88}} - \expandafter\def\csname simpleicon@sublimetexticon\endcsname {\simpleiconsmaponeone\symbol{89}} - \expandafter\def\csname simpleicon@substackicon\endcsname {\simpleiconsmaponeone\symbol{90}} - \expandafter\def\csname simpleicon@subtitleediticon\endcsname {\simpleiconsmaponeone\symbol{91}} - \expandafter\def\csname simpleicon@subversionicon\endcsname {\simpleiconsmaponeone\symbol{92}} - \expandafter\def\csname simpleicon@sucklessicon\endcsname {\simpleiconsmaponeone\symbol{93}} - \expandafter\def\csname simpleicon@sumologicicon\endcsname {\simpleiconsmaponeone\symbol{94}} - \expandafter\def\csname simpleicon@sunoicon\endcsname {\simpleiconsmaponeone\symbol{95}} - \expandafter\def\csname simpleicon@sunriseicon\endcsname {\simpleiconsmaponeone\symbol{96}} - \expandafter\def\csname simpleicon@supabaseicon\endcsname {\simpleiconsmaponeone\symbol{97}} - \expandafter\def\csname simpleicon@supercreaseicon\endcsname {\simpleiconsmaponeone\symbol{98}} - \expandafter\def\csname simpleicon@supermicroicon\endcsname {\simpleiconsmaponeone\symbol{99}} - \expandafter\def\csname simpleicon@superusericon\endcsname {\simpleiconsmaponeone\symbol{100}} - \expandafter\def\csname simpleicon@surrealdbicon\endcsname {\simpleiconsmaponeone\symbol{101}} - \expandafter\def\csname simpleicon@surveymonkeyicon\endcsname {\simpleiconsmaponeone\symbol{102}} - \expandafter\def\csname simpleicon@suseicon\endcsname {\simpleiconsmaponeone\symbol{103}} - \expandafter\def\csname simpleicon@suzukiicon\endcsname {\simpleiconsmaponeone\symbol{104}} - \expandafter\def\csname simpleicon@svelteicon\endcsname {\simpleiconsmaponeone\symbol{105}} - \expandafter\def\csname simpleicon@svgicon\endcsname {\simpleiconsmaponeone\symbol{106}} - \expandafter\def\csname simpleicon@svgdotjsicon\endcsname {\simpleiconsmaponeone\symbol{107}} - \expandafter\def\csname simpleicon@svgoicon\endcsname {\simpleiconsmaponeone\symbol{108}} - \expandafter\def\csname simpleicon@swaggericon\endcsname {\simpleiconsmaponeone\symbol{109}} - \expandafter\def\csname simpleicon@swarmicon\endcsname {\simpleiconsmaponeone\symbol{110}} - \expandafter\def\csname simpleicon@swcicon\endcsname {\simpleiconsmaponeone\symbol{111}} - \expandafter\def\csname simpleicon@swifticon\endcsname {\simpleiconsmaponeone\symbol{112}} - \expandafter\def\csname simpleicon@swiggyicon\endcsname {\simpleiconsmaponeone\symbol{113}} - \expandafter\def\csname simpleicon@swipericon\endcsname {\simpleiconsmaponeone\symbol{114}} - \expandafter\def\csname simpleicon@swricon\endcsname {\simpleiconsmaponeone\symbol{115}} - \expandafter\def\csname simpleicon@symantecicon\endcsname {\simpleiconsmaponeone\symbol{116}} - \expandafter\def\csname simpleicon@symbolabicon\endcsname {\simpleiconsmaponeone\symbol{117}} - \expandafter\def\csname simpleicon@symfonyicon\endcsname {\simpleiconsmaponeone\symbol{118}} - \expandafter\def\csname simpleicon@symphonyicon\endcsname {\simpleiconsmaponeone\symbol{119}} - \expandafter\def\csname simpleicon@sympyicon\endcsname {\simpleiconsmaponeone\symbol{120}} - \expandafter\def\csname simpleicon@syncthingicon\endcsname {\simpleiconsmaponeone\symbol{121}} - \expandafter\def\csname simpleicon@synologyicon\endcsname {\simpleiconsmaponeone\symbol{122}} - \expandafter\def\csname simpleicon@system76icon\endcsname {\simpleiconsmaponeone\symbol{123}} - \expandafter\def\csname simpleicon@tabelogicon\endcsname {\simpleiconsmaponeone\symbol{124}} - \expandafter\def\csname simpleicon@tableauicon\endcsname {\simpleiconsmaponeone\symbol{125}} - \expandafter\def\csname simpleicon@tablecheckicon\endcsname {\simpleiconsmaponeone\symbol{126}} - \expandafter\def\csname simpleicon@tacobellicon\endcsname {\simpleiconsmaponeone\symbol{127}} - \expandafter\def\csname simpleicon@tadoicon\endcsname {\simpleiconsmaponeone\symbol{128}} - \expandafter\def\csname simpleicon@taichigraphicsicon\endcsname {\simpleiconsmaponeone\symbol{129}} - \expandafter\def\csname simpleicon@taichilangicon\endcsname {\simpleiconsmaponeone\symbol{130}} - \expandafter\def\csname simpleicon@tailsicon\endcsname {\simpleiconsmaponeone\symbol{131}} - \expandafter\def\csname simpleicon@tailscaleicon\endcsname {\simpleiconsmaponeone\symbol{132}} - \expandafter\def\csname simpleicon@tailwindcssicon\endcsname {\simpleiconsmaponeone\symbol{133}} - \expandafter\def\csname simpleicon@taipyicon\endcsname {\simpleiconsmaponeone\symbol{134}} - \expandafter\def\csname simpleicon@taketwointeractivesoftwareicon\endcsname {\simpleiconsmaponeone\symbol{135}} - \expandafter\def\csname simpleicon@talendicon\endcsname {\simpleiconsmaponeone\symbol{136}} - \expandafter\def\csname simpleicon@talenthouseicon\endcsname {\simpleiconsmaponeone\symbol{137}} - \expandafter\def\csname simpleicon@talosicon\endcsname {\simpleiconsmaponeone\symbol{138}} - \expandafter\def\csname simpleicon@tamiyaicon\endcsname {\simpleiconsmaponeone\symbol{139}} - \expandafter\def\csname simpleicon@tampermonkeyicon\endcsname {\simpleiconsmaponeone\symbol{140}} - \expandafter\def\csname simpleicon@taobaoicon\endcsname {\simpleiconsmaponeone\symbol{141}} - \expandafter\def\csname simpleicon@tapasicon\endcsname {\simpleiconsmaponeone\symbol{142}} - \expandafter\def\csname simpleicon@targeticon\endcsname {\simpleiconsmaponeone\symbol{143}} - \expandafter\def\csname simpleicon@taskicon\endcsname {\simpleiconsmaponeone\symbol{144}} - \expandafter\def\csname simpleicon@tasmotaicon\endcsname {\simpleiconsmaponeone\symbol{145}} - \expandafter\def\csname simpleicon@tataicon\endcsname {\simpleiconsmaponeone\symbol{146}} - \expandafter\def\csname simpleicon@tauriicon\endcsname {\simpleiconsmaponeone\symbol{147}} - \expandafter\def\csname simpleicon@taxbuzzicon\endcsname {\simpleiconsmaponeone\symbol{148}} - \expandafter\def\csname simpleicon@tcsicon\endcsname {\simpleiconsmaponeone\symbol{149}} - \expandafter\def\csname simpleicon@tealicon\endcsname {\simpleiconsmaponeone\symbol{150}} - \expandafter\def\csname simpleicon@teamcityicon\endcsname {\simpleiconsmaponeone\symbol{151}} - \expandafter\def\csname simpleicon@teamspeakicon\endcsname {\simpleiconsmaponeone\symbol{152}} - \expandafter\def\csname simpleicon@teamviewericon\endcsname {\simpleiconsmaponeone\symbol{153}} - \expandafter\def\csname simpleicon@techcrunchicon\endcsname {\simpleiconsmaponeone\symbol{154}} - \expandafter\def\csname simpleicon@tedicon\endcsname {\simpleiconsmaponeone\symbol{155}} - \expandafter\def\csname simpleicon@teepublicicon\endcsname {\simpleiconsmaponeone\symbol{156}} - \expandafter\def\csname simpleicon@teespringicon\endcsname {\simpleiconsmaponeone\symbol{157}} - \expandafter\def\csname simpleicon@tektonicon\endcsname {\simpleiconsmaponeone\symbol{158}} - \expandafter\def\csname simpleicon@tele5icon\endcsname {\simpleiconsmaponeone\symbol{159}} - \expandafter\def\csname simpleicon@telegramicon\endcsname {\simpleiconsmaponeone\symbol{160}} - \expandafter\def\csname simpleicon@telegraphicon\endcsname {\simpleiconsmaponeone\symbol{161}} - \expandafter\def\csname simpleicon@telequebecicon\endcsname {\simpleiconsmaponeone\symbol{162}} - \expandafter\def\csname simpleicon@temporalicon\endcsname {\simpleiconsmaponeone\symbol{163}} - \expandafter\def\csname simpleicon@tencentqqicon\endcsname {\simpleiconsmaponeone\symbol{164}} - \expandafter\def\csname simpleicon@tensorflowicon\endcsname {\simpleiconsmaponeone\symbol{165}} - \expandafter\def\csname simpleicon@teradataicon\endcsname {\simpleiconsmaponeone\symbol{166}} - \expandafter\def\csname simpleicon@teratailicon\endcsname {\simpleiconsmaponeone\symbol{167}} - \expandafter\def\csname simpleicon@termiusicon\endcsname {\simpleiconsmaponeone\symbol{168}} - \expandafter\def\csname simpleicon@terraformicon\endcsname {\simpleiconsmaponeone\symbol{169}} - \expandafter\def\csname simpleicon@tescoicon\endcsname {\simpleiconsmaponeone\symbol{170}} - \expandafter\def\csname simpleicon@teslaicon\endcsname {\simpleiconsmaponeone\symbol{171}} - \expandafter\def\csname simpleicon@testcafeicon\endcsname {\simpleiconsmaponeone\symbol{172}} - \expandafter\def\csname simpleicon@testinicon\endcsname {\simpleiconsmaponeone\symbol{173}} - \expandafter\def\csname simpleicon@testinglibraryicon\endcsname {\simpleiconsmaponeone\symbol{174}} - \expandafter\def\csname simpleicon@testrailicon\endcsname {\simpleiconsmaponeone\symbol{175}} - \expandafter\def\csname simpleicon@tethericon\endcsname {\simpleiconsmaponeone\symbol{176}} - \expandafter\def\csname simpleicon@textpatternicon\endcsname {\simpleiconsmaponeone\symbol{177}} - \expandafter\def\csname simpleicon@tgaicon\endcsname {\simpleiconsmaponeone\symbol{178}} - \expandafter\def\csname simpleicon@thangsicon\endcsname {\simpleiconsmaponeone\symbol{179}} - \expandafter\def\csname simpleicon@thealgorithmsicon\endcsname {\simpleiconsmaponeone\symbol{180}} - \expandafter\def\csname simpleicon@theboringcompanyicon\endcsname {\simpleiconsmaponeone\symbol{181}} - \expandafter\def\csname simpleicon@theconversationicon\endcsname {\simpleiconsmaponeone\symbol{182}} - \expandafter\def\csname simpleicon@thefinalsicon\endcsname {\simpleiconsmaponeone\symbol{183}} - \expandafter\def\csname simpleicon@theirishtimesicon\endcsname {\simpleiconsmaponeone\symbol{184}} - \expandafter\def\csname simpleicon@themightyicon\endcsname {\simpleiconsmaponeone\symbol{185}} - \expandafter\def\csname simpleicon@themodelsresourceicon\endcsname {\simpleiconsmaponeone\symbol{186}} - \expandafter\def\csname simpleicon@themoviedatabaseicon\endcsname {\simpleiconsmaponeone\symbol{187}} - \expandafter\def\csname simpleicon@thenorthfaceicon\endcsname {\simpleiconsmaponeone\symbol{188}} - \expandafter\def\csname simpleicon@theodinprojecticon\endcsname {\simpleiconsmaponeone\symbol{189}} - \expandafter\def\csname simpleicon@theregistericon\endcsname {\simpleiconsmaponeone\symbol{190}} - \expandafter\def\csname simpleicon@thesoundsresourceicon\endcsname {\simpleiconsmaponeone\symbol{191}} - \expandafter\def\csname simpleicon@thespritersresourceicon\endcsname {\simpleiconsmaponeone\symbol{192}} - \expandafter\def\csname simpleicon@thewashingtonposticon\endcsname {\simpleiconsmaponeone\symbol{193}} - \expandafter\def\csname simpleicon@thingiverseicon\endcsname {\simpleiconsmaponeone\symbol{194}} - \expandafter\def\csname simpleicon@thinkpadicon\endcsname {\simpleiconsmaponeone\symbol{195}} - \expandafter\def\csname simpleicon@thirdwebicon\endcsname {\simpleiconsmaponeone\symbol{196}} - \expandafter\def\csname simpleicon@threadlessicon\endcsname {\simpleiconsmaponeone\symbol{197}} - \expandafter\def\csname simpleicon@threadsicon\endcsname {\simpleiconsmaponeone\symbol{198}} - \expandafter\def\csname simpleicon@threedotjsicon\endcsname {\simpleiconsmaponeone\symbol{199}} - \expandafter\def\csname simpleicon@threemaicon\endcsname {\simpleiconsmaponeone\symbol{200}} - \expandafter\def\csname simpleicon@thumbtackicon\endcsname {\simpleiconsmaponeone\symbol{201}} - \expandafter\def\csname simpleicon@thunderbirdicon\endcsname {\simpleiconsmaponeone\symbol{202}} - \expandafter\def\csname simpleicon@thunderstoreicon\endcsname {\simpleiconsmaponeone\symbol{203}} - \expandafter\def\csname simpleicon@thurgauerkantonalbankicon\endcsname {\simpleiconsmaponeone\symbol{204}} - \expandafter\def\csname simpleicon@thymeleaficon\endcsname {\simpleiconsmaponeone\symbol{205}} - \expandafter\def\csname simpleicon@ticketmastericon\endcsname {\simpleiconsmaponeone\symbol{206}} - \expandafter\def\csname simpleicon@ticktickicon\endcsname {\simpleiconsmaponeone\symbol{207}} - \expandafter\def\csname simpleicon@tidalicon\endcsname {\simpleiconsmaponeone\symbol{208}} - \expandafter\def\csname simpleicon@tiddlywikiicon\endcsname {\simpleiconsmaponeone\symbol{209}} - \expandafter\def\csname simpleicon@tideicon\endcsname {\simpleiconsmaponeone\symbol{210}} - \expandafter\def\csname simpleicon@tidyverseicon\endcsname {\simpleiconsmaponeone\symbol{211}} - \expandafter\def\csname simpleicon@tietoevryicon\endcsname {\simpleiconsmaponeone\symbol{212}} - \expandafter\def\csname simpleicon@tiktokicon\endcsname {\simpleiconsmaponeone\symbol{213}} - \expandafter\def\csname simpleicon@tildapublishingicon\endcsname {\simpleiconsmaponeone\symbol{214}} - \expandafter\def\csname simpleicon@tileicon\endcsname {\simpleiconsmaponeone\symbol{215}} - \expandafter\def\csname simpleicon@timescaleicon\endcsname {\simpleiconsmaponeone\symbol{216}} - \expandafter\def\csname simpleicon@tinaicon\endcsname {\simpleiconsmaponeone\symbol{217}} - \expandafter\def\csname simpleicon@tindericon\endcsname {\simpleiconsmaponeone\symbol{218}} - \expandafter\def\csname simpleicon@tindieicon\endcsname {\simpleiconsmaponeone\symbol{219}} - \expandafter\def\csname simpleicon@tinkercadicon\endcsname {\simpleiconsmaponeone\symbol{220}} - \expandafter\def\csname simpleicon@tinygradicon\endcsname {\simpleiconsmaponeone\symbol{221}} - \expandafter\def\csname simpleicon@tinylettericon\endcsname {\simpleiconsmaponeone\symbol{222}} - \expandafter\def\csname simpleicon@tistoryicon\endcsname {\simpleiconsmaponeone\symbol{223}} - \expandafter\def\csname simpleicon@tldrawicon\endcsname {\simpleiconsmaponeone\symbol{224}} - \expandafter\def\csname simpleicon@tmobileicon\endcsname {\simpleiconsmaponeone\symbol{225}} - \expandafter\def\csname simpleicon@tmuxicon\endcsname {\simpleiconsmaponeone\symbol{226}} - \expandafter\def\csname simpleicon@todoisticon\endcsname {\simpleiconsmaponeone\symbol{227}} - \expandafter\def\csname simpleicon@togglicon\endcsname {\simpleiconsmaponeone\symbol{228}} - \expandafter\def\csname simpleicon@toggltrackicon\endcsname {\simpleiconsmaponeone\symbol{229}} - \expandafter\def\csname simpleicon@tokyometroicon\endcsname {\simpleiconsmaponeone\symbol{230}} - \expandafter\def\csname simpleicon@tollicon\endcsname {\simpleiconsmaponeone\symbol{231}} - \expandafter\def\csname simpleicon@tomlicon\endcsname {\simpleiconsmaponeone\symbol{232}} - \expandafter\def\csname simpleicon@tomorrowlandicon\endcsname {\simpleiconsmaponeone\symbol{233}} - \expandafter\def\csname simpleicon@tonicon\endcsname {\simpleiconsmaponeone\symbol{234}} - \expandafter\def\csname simpleicon@topcodericon\endcsname {\simpleiconsmaponeone\symbol{235}} - \expandafter\def\csname simpleicon@topdotggicon\endcsname {\simpleiconsmaponeone\symbol{236}} - \expandafter\def\csname simpleicon@toptalicon\endcsname {\simpleiconsmaponeone\symbol{237}} - \expandafter\def\csname simpleicon@torbrowsericon\endcsname {\simpleiconsmaponeone\symbol{238}} - \expandafter\def\csname simpleicon@torprojecticon\endcsname {\simpleiconsmaponeone\symbol{239}} - \expandafter\def\csname simpleicon@toshibaicon\endcsname {\simpleiconsmaponeone\symbol{240}} - \expandafter\def\csname simpleicon@totvsicon\endcsname {\simpleiconsmaponeone\symbol{241}} - \expandafter\def\csname simpleicon@tourboxicon\endcsname {\simpleiconsmaponeone\symbol{242}} - \expandafter\def\csname simpleicon@towericon\endcsname {\simpleiconsmaponeone\symbol{243}} - \expandafter\def\csname simpleicon@toyotaicon\endcsname {\simpleiconsmaponeone\symbol{244}} - \expandafter\def\csname simpleicon@tplinkicon\endcsname {\simpleiconsmaponeone\symbol{245}} - \expandafter\def\csname simpleicon@tqdmicon\endcsname {\simpleiconsmaponeone\symbol{246}} - \expandafter\def\csname simpleicon@traccaricon\endcsname {\simpleiconsmaponeone\symbol{247}} - \expandafter\def\csname simpleicon@tradingviewicon\endcsname {\simpleiconsmaponeone\symbol{248}} - \expandafter\def\csname simpleicon@traefikmeshicon\endcsname {\simpleiconsmaponeone\symbol{249}} - \expandafter\def\csname simpleicon@traefikproxyicon\endcsname {\simpleiconsmaponeone\symbol{250}} - \expandafter\def\csname simpleicon@trailforksicon\endcsname {\simpleiconsmaponeone\symbol{251}} - \expandafter\def\csname simpleicon@trainerroadicon\endcsname {\simpleiconsmaponeone\symbol{252}} - \expandafter\def\csname simpleicon@trakticon\endcsname {\simpleiconsmaponeone\symbol{253}} - \expandafter\def\csname simpleicon@transifexicon\endcsname {\simpleiconsmaponeone\symbol{254}} - \expandafter\def\csname simpleicon@transmissionicon\endcsname {\simpleiconsmaponeone\symbol{255}} - \expandafter\def\csname simpleicon@transportforirelandicon\endcsname {\simpleiconsmaponetwo\symbol{0}} - \expandafter\def\csname simpleicon@transportforlondonicon\endcsname {\simpleiconsmaponetwo\symbol{1}} - \expandafter\def\csname simpleicon@travisciicon\endcsname {\simpleiconsmaponetwo\symbol{2}} - \expandafter\def\csname simpleicon@treehouseicon\endcsname {\simpleiconsmaponetwo\symbol{3}} - \expandafter\def\csname simpleicon@trelloicon\endcsname {\simpleiconsmaponetwo\symbol{4}} - \expandafter\def\csname simpleicon@trendmicroicon\endcsname {\simpleiconsmaponetwo\symbol{5}} - \expandafter\def\csname simpleicon@treyarchicon\endcsname {\simpleiconsmaponetwo\symbol{6}} - \expandafter\def\csname simpleicon@tricentisicon\endcsname {\simpleiconsmaponetwo\symbol{7}} - \expandafter\def\csname simpleicon@triliumicon\endcsname {\simpleiconsmaponetwo\symbol{8}} - \expandafter\def\csname simpleicon@trillericon\endcsname {\simpleiconsmaponetwo\symbol{9}} - \expandafter\def\csname simpleicon@trillertvicon\endcsname {\simpleiconsmaponetwo\symbol{10}} - \expandafter\def\csname simpleicon@trinoicon\endcsname {\simpleiconsmaponetwo\symbol{11}} - \expandafter\def\csname simpleicon@tripadvisoricon\endcsname {\simpleiconsmaponetwo\symbol{12}} - \expandafter\def\csname simpleicon@tripdotcomicon\endcsname {\simpleiconsmaponetwo\symbol{13}} - \expandafter\def\csname simpleicon@trivagoicon\endcsname {\simpleiconsmaponetwo\symbol{14}} - \expandafter\def\csname simpleicon@trivyicon\endcsname {\simpleiconsmaponetwo\symbol{15}} - \expandafter\def\csname simpleicon@troveicon\endcsname {\simpleiconsmaponetwo\symbol{16}} - \expandafter\def\csname simpleicon@trpcicon\endcsname {\simpleiconsmaponetwo\symbol{17}} - \expandafter\def\csname simpleicon@truenasicon\endcsname {\simpleiconsmaponetwo\symbol{18}} - \expandafter\def\csname simpleicon@trueupicon\endcsname {\simpleiconsmaponetwo\symbol{19}} - \expandafter\def\csname simpleicon@truliaicon\endcsname {\simpleiconsmaponetwo\symbol{20}} - \expandafter\def\csname simpleicon@trustedshopsicon\endcsname {\simpleiconsmaponetwo\symbol{21}} - \expandafter\def\csname simpleicon@trustpiloticon\endcsname {\simpleiconsmaponetwo\symbol{22}} - \expandafter\def\csname simpleicon@tryhackmeicon\endcsname {\simpleiconsmaponetwo\symbol{23}} - \expandafter\def\csname simpleicon@tryitonlineicon\endcsname {\simpleiconsmaponetwo\symbol{24}} - \expandafter\def\csname simpleicon@tsnodeicon\endcsname {\simpleiconsmaponetwo\symbol{25}} - \expandafter\def\csname simpleicon@tubiicon\endcsname {\simpleiconsmaponetwo\symbol{26}} - \expandafter\def\csname simpleicon@tuiicon\endcsname {\simpleiconsmaponetwo\symbol{27}} - \expandafter\def\csname simpleicon@tumblricon\endcsname {\simpleiconsmaponetwo\symbol{28}} - \expandafter\def\csname simpleicon@tuneinicon\endcsname {\simpleiconsmaponetwo\symbol{29}} - \expandafter\def\csname simpleicon@turboicon\endcsname {\simpleiconsmaponetwo\symbol{30}} - \expandafter\def\csname simpleicon@turborepoicon\endcsname {\simpleiconsmaponetwo\symbol{31}} - \expandafter\def\csname simpleicon@turbosquidicon\endcsname {\simpleiconsmaponetwo\symbol{32}} - \expandafter\def\csname simpleicon@turkishairlinesicon\endcsname {\simpleiconsmaponetwo\symbol{33}} - \expandafter\def\csname simpleicon@tursoicon\endcsname {\simpleiconsmaponetwo\symbol{34}} - \expandafter\def\csname simpleicon@tutanotaicon\endcsname {\simpleiconsmaponetwo\symbol{35}} - \expandafter\def\csname simpleicon@tv4playicon\endcsname {\simpleiconsmaponetwo\symbol{36}} - \expandafter\def\csname simpleicon@tvtimeicon\endcsname {\simpleiconsmaponetwo\symbol{37}} - \expandafter\def\csname simpleicon@twilioicon\endcsname {\simpleiconsmaponetwo\symbol{38}} - \expandafter\def\csname simpleicon@twinklyicon\endcsname {\simpleiconsmaponetwo\symbol{39}} - \expandafter\def\csname simpleicon@twinmotionicon\endcsname {\simpleiconsmaponetwo\symbol{40}} - \expandafter\def\csname simpleicon@twitchicon\endcsname {\simpleiconsmaponetwo\symbol{41}} - \expandafter\def\csname simpleicon@typeformicon\endcsname {\simpleiconsmaponetwo\symbol{42}} - \expandafter\def\csname simpleicon@typeormicon\endcsname {\simpleiconsmaponetwo\symbol{43}} - \expandafter\def\csname simpleicon@typericon\endcsname {\simpleiconsmaponetwo\symbol{44}} - \expandafter\def\csname simpleicon@typescripticon\endcsname {\simpleiconsmaponetwo\symbol{45}} - \expandafter\def\csname simpleicon@typo3icon\endcsname {\simpleiconsmaponetwo\symbol{46}} - \expandafter\def\csname simpleicon@typsticon\endcsname {\simpleiconsmaponetwo\symbol{47}} - \expandafter\def\csname simpleicon@ubericon\endcsname {\simpleiconsmaponetwo\symbol{48}} - \expandafter\def\csname simpleicon@ubereatsicon\endcsname {\simpleiconsmaponetwo\symbol{49}} - \expandafter\def\csname simpleicon@ubiquitiicon\endcsname {\simpleiconsmaponetwo\symbol{50}} - \expandafter\def\csname simpleicon@ubisofticon\endcsname {\simpleiconsmaponetwo\symbol{51}} - \expandafter\def\csname simpleicon@ublockoriginicon\endcsname {\simpleiconsmaponetwo\symbol{52}} - \expandafter\def\csname simpleicon@ubuntuicon\endcsname {\simpleiconsmaponetwo\symbol{53}} - \expandafter\def\csname simpleicon@ubuntumateicon\endcsname {\simpleiconsmaponetwo\symbol{54}} - \expandafter\def\csname simpleicon@udacityicon\endcsname {\simpleiconsmaponetwo\symbol{55}} - \expandafter\def\csname simpleicon@udemyicon\endcsname {\simpleiconsmaponetwo\symbol{56}} - \expandafter\def\csname simpleicon@ufcicon\endcsname {\simpleiconsmaponetwo\symbol{57}} - \expandafter\def\csname simpleicon@uikiticon\endcsname {\simpleiconsmaponetwo\symbol{58}} - \expandafter\def\csname simpleicon@uipathicon\endcsname {\simpleiconsmaponetwo\symbol{59}} - \expandafter\def\csname simpleicon@ululeicon\endcsname {\simpleiconsmaponetwo\symbol{60}} - \expandafter\def\csname simpleicon@umamiicon\endcsname {\simpleiconsmaponetwo\symbol{61}} - \expandafter\def\csname simpleicon@umbracoicon\endcsname {\simpleiconsmaponetwo\symbol{62}} - \expandafter\def\csname simpleicon@umlicon\endcsname {\simpleiconsmaponetwo\symbol{63}} - \expandafter\def\csname simpleicon@unacademyicon\endcsname {\simpleiconsmaponetwo\symbol{64}} - \expandafter\def\csname simpleicon@underarmouricon\endcsname {\simpleiconsmaponetwo\symbol{65}} - \expandafter\def\csname simpleicon@underscoredotjsicon\endcsname {\simpleiconsmaponetwo\symbol{66}} - \expandafter\def\csname simpleicon@undertaleicon\endcsname {\simpleiconsmaponetwo\symbol{67}} - \expandafter\def\csname simpleicon@unicodeicon\endcsname {\simpleiconsmaponetwo\symbol{68}} - \expandafter\def\csname simpleicon@unilevericon\endcsname {\simpleiconsmaponetwo\symbol{69}} - \expandafter\def\csname simpleicon@uniqloicon\endcsname {\simpleiconsmaponetwo\symbol{70}} - \expandafter\def\csname simpleicon@uniqlojaicon\endcsname {\simpleiconsmaponetwo\symbol{71}} - \expandafter\def\csname simpleicon@unitedairlinesicon\endcsname {\simpleiconsmaponetwo\symbol{72}} - \expandafter\def\csname simpleicon@unitednationsicon\endcsname {\simpleiconsmaponetwo\symbol{73}} - \expandafter\def\csname simpleicon@unityicon\endcsname {\simpleiconsmaponetwo\symbol{74}} - \expandafter\def\csname simpleicon@unjsicon\endcsname {\simpleiconsmaponetwo\symbol{75}} - \expandafter\def\csname simpleicon@unlicenseicon\endcsname {\simpleiconsmaponetwo\symbol{76}} - \expandafter\def\csname simpleicon@unocssicon\endcsname {\simpleiconsmaponetwo\symbol{77}} - \expandafter\def\csname simpleicon@unpkgicon\endcsname {\simpleiconsmaponetwo\symbol{78}} - \expandafter\def\csname simpleicon@unraidicon\endcsname {\simpleiconsmaponetwo\symbol{79}} - \expandafter\def\csname simpleicon@unrealengineicon\endcsname {\simpleiconsmaponetwo\symbol{80}} - \expandafter\def\csname simpleicon@unsplashicon\endcsname {\simpleiconsmaponetwo\symbol{81}} - \expandafter\def\csname simpleicon@untappdicon\endcsname {\simpleiconsmaponetwo\symbol{82}} - \expandafter\def\csname simpleicon@upcloudicon\endcsname {\simpleiconsmaponetwo\symbol{83}} - \expandafter\def\csname simpleicon@upholdicon\endcsname {\simpleiconsmaponetwo\symbol{84}} - \expandafter\def\csname simpleicon@uplabsicon\endcsname {\simpleiconsmaponetwo\symbol{85}} - \expandafter\def\csname simpleicon@upptimeicon\endcsname {\simpleiconsmaponetwo\symbol{86}} - \expandafter\def\csname simpleicon@upsicon\endcsname {\simpleiconsmaponetwo\symbol{87}} - \expandafter\def\csname simpleicon@upstashicon\endcsname {\simpleiconsmaponetwo\symbol{88}} - \expandafter\def\csname simpleicon@uptimekumaicon\endcsname {\simpleiconsmaponetwo\symbol{89}} - \expandafter\def\csname simpleicon@uptoboxicon\endcsname {\simpleiconsmaponetwo\symbol{90}} - \expandafter\def\csname simpleicon@upworkicon\endcsname {\simpleiconsmaponetwo\symbol{91}} - \expandafter\def\csname simpleicon@uspsicon\endcsname {\simpleiconsmaponetwo\symbol{92}} - \expandafter\def\csname simpleicon@utorrenticon\endcsname {\simpleiconsmaponetwo\symbol{93}} - \expandafter\def\csname simpleicon@vicon\endcsname {\simpleiconsmaponetwo\symbol{94}} - \expandafter\def\csname simpleicon@v2exicon\endcsname {\simpleiconsmaponetwo\symbol{95}} - \expandafter\def\csname simpleicon@v8icon\endcsname {\simpleiconsmaponetwo\symbol{96}} - \expandafter\def\csname simpleicon@vaadinicon\endcsname {\simpleiconsmaponetwo\symbol{97}} - \expandafter\def\csname simpleicon@vagranticon\endcsname {\simpleiconsmaponetwo\symbol{98}} - \expandafter\def\csname simpleicon@valaicon\endcsname {\simpleiconsmaponetwo\symbol{99}} - \expandafter\def\csname simpleicon@valoranticon\endcsname {\simpleiconsmaponetwo\symbol{100}} - \expandafter\def\csname simpleicon@valveicon\endcsname {\simpleiconsmaponetwo\symbol{101}} - \expandafter\def\csname simpleicon@vaporicon\endcsname {\simpleiconsmaponetwo\symbol{102}} - \expandafter\def\csname simpleicon@vaulticon\endcsname {\simpleiconsmaponetwo\symbol{103}} - \expandafter\def\csname simpleicon@vaultwardenicon\endcsname {\simpleiconsmaponetwo\symbol{104}} - \expandafter\def\csname simpleicon@vauxhallicon\endcsname {\simpleiconsmaponetwo\symbol{105}} - \expandafter\def\csname simpleicon@vbulletinicon\endcsname {\simpleiconsmaponetwo\symbol{106}} - \expandafter\def\csname simpleicon@vectaryicon\endcsname {\simpleiconsmaponetwo\symbol{107}} - \expandafter\def\csname simpleicon@vectorlogozoneicon\endcsname {\simpleiconsmaponetwo\symbol{108}} - \expandafter\def\csname simpleicon@vectorworksicon\endcsname {\simpleiconsmaponetwo\symbol{109}} - \expandafter\def\csname simpleicon@veeamicon\endcsname {\simpleiconsmaponetwo\symbol{110}} - \expandafter\def\csname simpleicon@veedicon\endcsname {\simpleiconsmaponetwo\symbol{111}} - \expandafter\def\csname simpleicon@veepeeicon\endcsname {\simpleiconsmaponetwo\symbol{112}} - \expandafter\def\csname simpleicon@vegaicon\endcsname {\simpleiconsmaponetwo\symbol{113}} - \expandafter\def\csname simpleicon@vegasicon\endcsname {\simpleiconsmaponetwo\symbol{114}} - \expandafter\def\csname simpleicon@velogicon\endcsname {\simpleiconsmaponetwo\symbol{115}} - \expandafter\def\csname simpleicon@venmoicon\endcsname {\simpleiconsmaponetwo\symbol{116}} - \expandafter\def\csname simpleicon@vercelicon\endcsname {\simpleiconsmaponetwo\symbol{117}} - \expandafter\def\csname simpleicon@verdaccioicon\endcsname {\simpleiconsmaponetwo\symbol{118}} - \expandafter\def\csname simpleicon@veritasicon\endcsname {\simpleiconsmaponetwo\symbol{119}} - \expandafter\def\csname simpleicon@verizonicon\endcsname {\simpleiconsmaponetwo\symbol{120}} - \expandafter\def\csname simpleicon@vespaicon\endcsname {\simpleiconsmaponetwo\symbol{121}} - \expandafter\def\csname simpleicon@vexxhosticon\endcsname {\simpleiconsmaponetwo\symbol{122}} - \expandafter\def\csname simpleicon@vfairsicon\endcsname {\simpleiconsmaponetwo\symbol{123}} - \expandafter\def\csname simpleicon@viadeoicon\endcsname {\simpleiconsmaponetwo\symbol{124}} - \expandafter\def\csname simpleicon@viaplayicon\endcsname {\simpleiconsmaponetwo\symbol{125}} - \expandafter\def\csname simpleicon@vibericon\endcsname {\simpleiconsmaponetwo\symbol{126}} - \expandafter\def\csname simpleicon@vibloicon\endcsname {\simpleiconsmaponetwo\symbol{127}} - \expandafter\def\csname simpleicon@victoriametricsicon\endcsname {\simpleiconsmaponetwo\symbol{128}} - \expandafter\def\csname simpleicon@victronenergyicon\endcsname {\simpleiconsmaponetwo\symbol{129}} - \expandafter\def\csname simpleicon@vimicon\endcsname {\simpleiconsmaponetwo\symbol{130}} - \expandafter\def\csname simpleicon@vimeoicon\endcsname {\simpleiconsmaponetwo\symbol{131}} - \expandafter\def\csname simpleicon@vimeolivestreamicon\endcsname {\simpleiconsmaponetwo\symbol{132}} - \expandafter\def\csname simpleicon@virginicon\endcsname {\simpleiconsmaponetwo\symbol{133}} - \expandafter\def\csname simpleicon@virginatlanticicon\endcsname {\simpleiconsmaponetwo\symbol{134}} - \expandafter\def\csname simpleicon@virginmediaicon\endcsname {\simpleiconsmaponetwo\symbol{135}} - \expandafter\def\csname simpleicon@virtualboxicon\endcsname {\simpleiconsmaponetwo\symbol{136}} - \expandafter\def\csname simpleicon@virustotalicon\endcsname {\simpleiconsmaponetwo\symbol{137}} - \expandafter\def\csname simpleicon@visaicon\endcsname {\simpleiconsmaponetwo\symbol{138}} - \expandafter\def\csname simpleicon@visxicon\endcsname {\simpleiconsmaponetwo\symbol{139}} - \expandafter\def\csname simpleicon@viteicon\endcsname {\simpleiconsmaponetwo\symbol{140}} - \expandafter\def\csname simpleicon@vitepressicon\endcsname {\simpleiconsmaponetwo\symbol{141}} - \expandafter\def\csname simpleicon@vitessicon\endcsname {\simpleiconsmaponetwo\symbol{142}} - \expandafter\def\csname simpleicon@vitesticon\endcsname {\simpleiconsmaponetwo\symbol{143}} - \expandafter\def\csname simpleicon@vivaldiicon\endcsname {\simpleiconsmaponetwo\symbol{144}} - \expandafter\def\csname simpleicon@vivawalleticon\endcsname {\simpleiconsmaponetwo\symbol{145}} - \expandafter\def\csname simpleicon@vivinoicon\endcsname {\simpleiconsmaponetwo\symbol{146}} - \expandafter\def\csname simpleicon@vivinticon\endcsname {\simpleiconsmaponetwo\symbol{147}} - \expandafter\def\csname simpleicon@vivoicon\endcsname {\simpleiconsmaponetwo\symbol{148}} - \expandafter\def\csname simpleicon@vkicon\endcsname {\simpleiconsmaponetwo\symbol{149}} - \expandafter\def\csname simpleicon@vlcmediaplayericon\endcsname {\simpleiconsmaponetwo\symbol{150}} - \expandafter\def\csname simpleicon@vmwareicon\endcsname {\simpleiconsmaponetwo\symbol{151}} - \expandafter\def\csname simpleicon@vodafoneicon\endcsname {\simpleiconsmaponetwo\symbol{152}} - \expandafter\def\csname simpleicon@voidlinuxicon\endcsname {\simpleiconsmaponetwo\symbol{153}} - \expandafter\def\csname simpleicon@voipdotmsicon\endcsname {\simpleiconsmaponetwo\symbol{154}} - \expandafter\def\csname simpleicon@volkswagenicon\endcsname {\simpleiconsmaponetwo\symbol{155}} - \expandafter\def\csname simpleicon@volvoicon\endcsname {\simpleiconsmaponetwo\symbol{156}} - \expandafter\def\csname simpleicon@vonageicon\endcsname {\simpleiconsmaponetwo\symbol{157}} - \expandafter\def\csname simpleicon@vorondesignicon\endcsname {\simpleiconsmaponetwo\symbol{158}} - \expandafter\def\csname simpleicon@vowpalwabbiticon\endcsname {\simpleiconsmaponetwo\symbol{159}} - \expandafter\def\csname simpleicon@voxicon\endcsname {\simpleiconsmaponetwo\symbol{160}} - \expandafter\def\csname simpleicon@vscoicon\endcsname {\simpleiconsmaponetwo\symbol{161}} - \expandafter\def\csname simpleicon@vscodiumicon\endcsname {\simpleiconsmaponetwo\symbol{162}} - \expandafter\def\csname simpleicon@vtexicon\endcsname {\simpleiconsmaponetwo\symbol{163}} - \expandafter\def\csname simpleicon@vuedotjsicon\endcsname {\simpleiconsmaponetwo\symbol{164}} - \expandafter\def\csname simpleicon@vuetifyicon\endcsname {\simpleiconsmaponetwo\symbol{165}} - \expandafter\def\csname simpleicon@vulkanicon\endcsname {\simpleiconsmaponetwo\symbol{166}} - \expandafter\def\csname simpleicon@vultricon\endcsname {\simpleiconsmaponetwo\symbol{167}} - \expandafter\def\csname simpleicon@vyondicon\endcsname {\simpleiconsmaponetwo\symbol{168}} - \expandafter\def\csname simpleicon@w3schoolsicon\endcsname {\simpleiconsmaponetwo\symbol{169}} - \expandafter\def\csname simpleicon@wacomicon\endcsname {\simpleiconsmaponetwo\symbol{170}} - \expandafter\def\csname simpleicon@wagmiicon\endcsname {\simpleiconsmaponetwo\symbol{171}} - \expandafter\def\csname simpleicon@wagtailicon\endcsname {\simpleiconsmaponetwo\symbol{172}} - \expandafter\def\csname simpleicon@wailsicon\endcsname {\simpleiconsmaponetwo\symbol{173}} - \expandafter\def\csname simpleicon@wakatimeicon\endcsname {\simpleiconsmaponetwo\symbol{174}} - \expandafter\def\csname simpleicon@walkmanicon\endcsname {\simpleiconsmaponetwo\symbol{175}} - \expandafter\def\csname simpleicon@wallabagicon\endcsname {\simpleiconsmaponetwo\symbol{176}} - \expandafter\def\csname simpleicon@walletconnecticon\endcsname {\simpleiconsmaponetwo\symbol{177}} - \expandafter\def\csname simpleicon@walmarticon\endcsname {\simpleiconsmaponetwo\symbol{178}} - \expandafter\def\csname simpleicon@wantedlyicon\endcsname {\simpleiconsmaponetwo\symbol{179}} - \expandafter\def\csname simpleicon@wappalyzericon\endcsname {\simpleiconsmaponetwo\symbol{180}} - \expandafter\def\csname simpleicon@warnerbrosicon\endcsname {\simpleiconsmaponetwo\symbol{181}} - \expandafter\def\csname simpleicon@warpicon\endcsname {\simpleiconsmaponetwo\symbol{182}} - \expandafter\def\csname simpleicon@wasabiicon\endcsname {\simpleiconsmaponetwo\symbol{183}} - \expandafter\def\csname simpleicon@wasmcloudicon\endcsname {\simpleiconsmaponetwo\symbol{184}} - \expandafter\def\csname simpleicon@wasmericon\endcsname {\simpleiconsmaponetwo\symbol{185}} - \expandafter\def\csname simpleicon@watchtowericon\endcsname {\simpleiconsmaponetwo\symbol{186}} - \expandafter\def\csname simpleicon@wattpadicon\endcsname {\simpleiconsmaponetwo\symbol{187}} - \expandafter\def\csname simpleicon@waylandicon\endcsname {\simpleiconsmaponetwo\symbol{188}} - \expandafter\def\csname simpleicon@wazeicon\endcsname {\simpleiconsmaponetwo\symbol{189}} - \expandafter\def\csname simpleicon@wazirxicon\endcsname {\simpleiconsmaponetwo\symbol{190}} - \expandafter\def\csname simpleicon@wearosicon\endcsname {\simpleiconsmaponetwo\symbol{191}} - \expandafter\def\csname simpleicon@weasylicon\endcsname {\simpleiconsmaponetwo\symbol{192}} - \expandafter\def\csname simpleicon@web3dotjsicon\endcsname {\simpleiconsmaponetwo\symbol{193}} - \expandafter\def\csname simpleicon@webassemblyicon\endcsname {\simpleiconsmaponetwo\symbol{194}} - \expandafter\def\csname simpleicon@webauthnicon\endcsname {\simpleiconsmaponetwo\symbol{195}} - \expandafter\def\csname simpleicon@webcomponentsdotorgicon\endcsname {\simpleiconsmaponetwo\symbol{196}} - \expandafter\def\csname simpleicon@webdriverioicon\endcsname {\simpleiconsmaponetwo\symbol{197}} - \expandafter\def\csname simpleicon@webexicon\endcsname {\simpleiconsmaponetwo\symbol{198}} - \expandafter\def\csname simpleicon@webflowicon\endcsname {\simpleiconsmaponetwo\symbol{199}} - \expandafter\def\csname simpleicon@webglicon\endcsname {\simpleiconsmaponetwo\symbol{200}} - \expandafter\def\csname simpleicon@webgpuicon\endcsname {\simpleiconsmaponetwo\symbol{201}} - \expandafter\def\csname simpleicon@weblateicon\endcsname {\simpleiconsmaponetwo\symbol{202}} - \expandafter\def\csname simpleicon@webminicon\endcsname {\simpleiconsmaponetwo\symbol{203}} - \expandafter\def\csname simpleicon@webmoneyicon\endcsname {\simpleiconsmaponetwo\symbol{204}} - \expandafter\def\csname simpleicon@webpackicon\endcsname {\simpleiconsmaponetwo\symbol{205}} - \expandafter\def\csname simpleicon@webrtcicon\endcsname {\simpleiconsmaponetwo\symbol{206}} - \expandafter\def\csname simpleicon@webstormicon\endcsname {\simpleiconsmaponetwo\symbol{207}} - \expandafter\def\csname simpleicon@webtoonicon\endcsname {\simpleiconsmaponetwo\symbol{208}} - \expandafter\def\csname simpleicon@webtreesicon\endcsname {\simpleiconsmaponetwo\symbol{209}} - \expandafter\def\csname simpleicon@wechaticon\endcsname {\simpleiconsmaponetwo\symbol{210}} - \expandafter\def\csname simpleicon@wegameicon\endcsname {\simpleiconsmaponetwo\symbol{211}} - \expandafter\def\csname simpleicon@weightsandbiasesicon\endcsname {\simpleiconsmaponetwo\symbol{212}} - \expandafter\def\csname simpleicon@welcometothejungleicon\endcsname {\simpleiconsmaponetwo\symbol{213}} - \expandafter\def\csname simpleicon@wellfoundicon\endcsname {\simpleiconsmaponetwo\symbol{214}} - \expandafter\def\csname simpleicon@wellsfargoicon\endcsname {\simpleiconsmaponetwo\symbol{215}} - \expandafter\def\csname simpleicon@wemoicon\endcsname {\simpleiconsmaponetwo\symbol{216}} - \expandafter\def\csname simpleicon@westerndigitalicon\endcsname {\simpleiconsmaponetwo\symbol{217}} - \expandafter\def\csname simpleicon@westernunionicon\endcsname {\simpleiconsmaponetwo\symbol{218}} - \expandafter\def\csname simpleicon@wetransfericon\endcsname {\simpleiconsmaponetwo\symbol{219}} - \expandafter\def\csname simpleicon@weztermicon\endcsname {\simpleiconsmaponetwo\symbol{220}} - \expandafter\def\csname simpleicon@wgpuicon\endcsname {\simpleiconsmaponetwo\symbol{221}} - \expandafter\def\csname simpleicon@whatsappicon\endcsname {\simpleiconsmaponetwo\symbol{222}} - \expandafter\def\csname simpleicon@wheniworkicon\endcsname {\simpleiconsmaponetwo\symbol{223}} - \expandafter\def\csname simpleicon@wiiicon\endcsname {\simpleiconsmaponetwo\symbol{224}} - \expandafter\def\csname simpleicon@wiiuicon\endcsname {\simpleiconsmaponetwo\symbol{225}} - \expandafter\def\csname simpleicon@wikidataicon\endcsname {\simpleiconsmaponetwo\symbol{226}} - \expandafter\def\csname simpleicon@wikidotggicon\endcsname {\simpleiconsmaponetwo\symbol{227}} - \expandafter\def\csname simpleicon@wikidotjsicon\endcsname {\simpleiconsmaponetwo\symbol{228}} - \expandafter\def\csname simpleicon@wikimediacommonsicon\endcsname {\simpleiconsmaponetwo\symbol{229}} - \expandafter\def\csname simpleicon@wikimediafoundationicon\endcsname {\simpleiconsmaponetwo\symbol{230}} - \expandafter\def\csname simpleicon@wikipediaicon\endcsname {\simpleiconsmaponetwo\symbol{231}} - \expandafter\def\csname simpleicon@wikiquoteicon\endcsname {\simpleiconsmaponetwo\symbol{232}} - \expandafter\def\csname simpleicon@wikivoyageicon\endcsname {\simpleiconsmaponetwo\symbol{233}} - \expandafter\def\csname simpleicon@winampicon\endcsname {\simpleiconsmaponetwo\symbol{234}} - \expandafter\def\csname simpleicon@wiproicon\endcsname {\simpleiconsmaponetwo\symbol{235}} - \expandafter\def\csname simpleicon@wireicon\endcsname {\simpleiconsmaponetwo\symbol{236}} - \expandafter\def\csname simpleicon@wireguardicon\endcsname {\simpleiconsmaponetwo\symbol{237}} - \expandafter\def\csname simpleicon@wiresharkicon\endcsname {\simpleiconsmaponetwo\symbol{238}} - \expandafter\def\csname simpleicon@wiseicon\endcsname {\simpleiconsmaponetwo\symbol{239}} - \expandafter\def\csname simpleicon@wishicon\endcsname {\simpleiconsmaponetwo\symbol{240}} - \expandafter\def\csname simpleicon@wistiaicon\endcsname {\simpleiconsmaponetwo\symbol{241}} - \expandafter\def\csname simpleicon@wixicon\endcsname {\simpleiconsmaponetwo\symbol{242}} - \expandafter\def\csname simpleicon@wizzairicon\endcsname {\simpleiconsmaponetwo\symbol{243}} - \expandafter\def\csname simpleicon@wolframicon\endcsname {\simpleiconsmaponetwo\symbol{244}} - \expandafter\def\csname simpleicon@wolframlanguageicon\endcsname {\simpleiconsmaponetwo\symbol{245}} - \expandafter\def\csname simpleicon@wolframmathematicaicon\endcsname {\simpleiconsmaponetwo\symbol{246}} - \expandafter\def\csname simpleicon@wondershareicon\endcsname {\simpleiconsmaponetwo\symbol{247}} - \expandafter\def\csname simpleicon@wondersharefilmoraicon\endcsname {\simpleiconsmaponetwo\symbol{248}} - \expandafter\def\csname simpleicon@wooicon\endcsname {\simpleiconsmaponetwo\symbol{249}} - \expandafter\def\csname simpleicon@woocommerceicon\endcsname {\simpleiconsmaponetwo\symbol{250}} - \expandafter\def\csname simpleicon@wordpressicon\endcsname {\simpleiconsmaponetwo\symbol{251}} - \expandafter\def\csname simpleicon@workplaceicon\endcsname {\simpleiconsmaponetwo\symbol{252}} - \expandafter\def\csname simpleicon@worldhealthorganizationicon\endcsname {\simpleiconsmaponetwo\symbol{253}} - \expandafter\def\csname simpleicon@wpengineicon\endcsname {\simpleiconsmaponetwo\symbol{254}} - \expandafter\def\csname simpleicon@wpexplorericon\endcsname {\simpleiconsmaponetwo\symbol{255}} - \expandafter\def\csname simpleicon@wprocketicon\endcsname {\simpleiconsmaponethree\symbol{0}} - \expandafter\def\csname simpleicon@writedotasicon\endcsname {\simpleiconsmaponethree\symbol{1}} - \expandafter\def\csname simpleicon@wweicon\endcsname {\simpleiconsmaponethree\symbol{2}} - \expandafter\def\csname simpleicon@wwiseicon\endcsname {\simpleiconsmaponethree\symbol{3}} - \expandafter\def\csname simpleicon@wykopicon\endcsname {\simpleiconsmaponethree\symbol{4}} - \expandafter\def\csname simpleicon@wyzeicon\endcsname {\simpleiconsmaponethree\symbol{5}} - \expandafter\def\csname simpleicon@xicon\endcsname {\simpleiconsmaponethree\symbol{6}} - \expandafter\def\csname simpleicon@xamppicon\endcsname {\simpleiconsmaponethree\symbol{7}} - \expandafter\def\csname simpleicon@xcodeicon\endcsname {\simpleiconsmaponethree\symbol{8}} - \expandafter\def\csname simpleicon@xdadevelopersicon\endcsname {\simpleiconsmaponethree\symbol{9}} - \expandafter\def\csname simpleicon@xdotorgicon\endcsname {\simpleiconsmaponethree\symbol{10}} - \expandafter\def\csname simpleicon@xenditicon\endcsname {\simpleiconsmaponethree\symbol{11}} - \expandafter\def\csname simpleicon@xeroicon\endcsname {\simpleiconsmaponethree\symbol{12}} - \expandafter\def\csname simpleicon@xfceicon\endcsname {\simpleiconsmaponethree\symbol{13}} - \expandafter\def\csname simpleicon@xiaohongshuicon\endcsname {\simpleiconsmaponethree\symbol{14}} - \expandafter\def\csname simpleicon@xiaomiicon\endcsname {\simpleiconsmaponethree\symbol{15}} - \expandafter\def\csname simpleicon@xingicon\endcsname {\simpleiconsmaponethree\symbol{16}} - \expandafter\def\csname simpleicon@xmppicon\endcsname {\simpleiconsmaponethree\symbol{17}} - \expandafter\def\csname simpleicon@xoicon\endcsname {\simpleiconsmaponethree\symbol{18}} - \expandafter\def\csname simpleicon@xrpicon\endcsname {\simpleiconsmaponethree\symbol{19}} - \expandafter\def\csname simpleicon@xspliticon\endcsname {\simpleiconsmaponethree\symbol{20}} - \expandafter\def\csname simpleicon@xstateicon\endcsname {\simpleiconsmaponethree\symbol{21}} - \expandafter\def\csname simpleicon@yabaiicon\endcsname {\simpleiconsmaponethree\symbol{22}} - \expandafter\def\csname simpleicon@yaleicon\endcsname {\simpleiconsmaponethree\symbol{23}} - \expandafter\def\csname simpleicon@yamahacorporationicon\endcsname {\simpleiconsmaponethree\symbol{24}} - \expandafter\def\csname simpleicon@yamahamotorcorporationicon\endcsname {\simpleiconsmaponethree\symbol{25}} - \expandafter\def\csname simpleicon@yamlicon\endcsname {\simpleiconsmaponethree\symbol{26}} - \expandafter\def\csname simpleicon@yandexcloudicon\endcsname {\simpleiconsmaponethree\symbol{27}} - \expandafter\def\csname simpleicon@yarnicon\endcsname {\simpleiconsmaponethree\symbol{28}} - \expandafter\def\csname simpleicon@ycombinatoricon\endcsname {\simpleiconsmaponethree\symbol{29}} - \expandafter\def\csname simpleicon@yelpicon\endcsname {\simpleiconsmaponethree\symbol{30}} - \expandafter\def\csname simpleicon@yetiicon\endcsname {\simpleiconsmaponethree\symbol{31}} - \expandafter\def\csname simpleicon@yoasticon\endcsname {\simpleiconsmaponethree\symbol{32}} - \expandafter\def\csname simpleicon@youtubeicon\endcsname {\simpleiconsmaponethree\symbol{33}} - \expandafter\def\csname simpleicon@youtubegamingicon\endcsname {\simpleiconsmaponethree\symbol{34}} - \expandafter\def\csname simpleicon@youtubekidsicon\endcsname {\simpleiconsmaponethree\symbol{35}} - \expandafter\def\csname simpleicon@youtubemusicicon\endcsname {\simpleiconsmaponethree\symbol{36}} - \expandafter\def\csname simpleicon@youtubeshortsicon\endcsname {\simpleiconsmaponethree\symbol{37}} - \expandafter\def\csname simpleicon@youtubestudioicon\endcsname {\simpleiconsmaponethree\symbol{38}} - \expandafter\def\csname simpleicon@youtubetvicon\endcsname {\simpleiconsmaponethree\symbol{39}} - \expandafter\def\csname simpleicon@yricon\endcsname {\simpleiconsmaponethree\symbol{40}} - \expandafter\def\csname simpleicon@yubicoicon\endcsname {\simpleiconsmaponethree\symbol{41}} - \expandafter\def\csname simpleicon@yunohosticon\endcsname {\simpleiconsmaponethree\symbol{42}} - \expandafter\def\csname simpleicon@zabkaicon\endcsname {\simpleiconsmaponethree\symbol{43}} - \expandafter\def\csname simpleicon@zaimicon\endcsname {\simpleiconsmaponethree\symbol{44}} - \expandafter\def\csname simpleicon@zalandoicon\endcsname {\simpleiconsmaponethree\symbol{45}} - \expandafter\def\csname simpleicon@zaloicon\endcsname {\simpleiconsmaponethree\symbol{46}} - \expandafter\def\csname simpleicon@zapicon\endcsname {\simpleiconsmaponethree\symbol{47}} - \expandafter\def\csname simpleicon@zapiericon\endcsname {\simpleiconsmaponethree\symbol{48}} - \expandafter\def\csname simpleicon@zaraicon\endcsname {\simpleiconsmaponethree\symbol{49}} - \expandafter\def\csname simpleicon@zazzleicon\endcsname {\simpleiconsmaponethree\symbol{50}} - \expandafter\def\csname simpleicon@zcashicon\endcsname {\simpleiconsmaponethree\symbol{51}} - \expandafter\def\csname simpleicon@zcoolicon\endcsname {\simpleiconsmaponethree\symbol{52}} - \expandafter\def\csname simpleicon@zdficon\endcsname {\simpleiconsmaponethree\symbol{53}} - \expandafter\def\csname simpleicon@zebpayicon\endcsname {\simpleiconsmaponethree\symbol{54}} - \expandafter\def\csname simpleicon@zebratechnologiesicon\endcsname {\simpleiconsmaponethree\symbol{55}} - \expandafter\def\csname simpleicon@zedindustriesicon\endcsname {\simpleiconsmaponethree\symbol{56}} - \expandafter\def\csname simpleicon@zelleicon\endcsname {\simpleiconsmaponethree\symbol{57}} - \expandafter\def\csname simpleicon@zendicon\endcsname {\simpleiconsmaponethree\symbol{58}} - \expandafter\def\csname simpleicon@zendeskicon\endcsname {\simpleiconsmaponethree\symbol{59}} - \expandafter\def\csname simpleicon@zennicon\endcsname {\simpleiconsmaponethree\symbol{60}} - \expandafter\def\csname simpleicon@zenodoicon\endcsname {\simpleiconsmaponethree\symbol{61}} - \expandafter\def\csname simpleicon@zensaricon\endcsname {\simpleiconsmaponethree\symbol{62}} - \expandafter\def\csname simpleicon@zerodhaicon\endcsname {\simpleiconsmaponethree\symbol{63}} - \expandafter\def\csname simpleicon@zerplyicon\endcsname {\simpleiconsmaponethree\symbol{64}} - \expandafter\def\csname simpleicon@zettlricon\endcsname {\simpleiconsmaponethree\symbol{65}} - \expandafter\def\csname simpleicon@zhihuicon\endcsname {\simpleiconsmaponethree\symbol{66}} - \expandafter\def\csname simpleicon@zigicon\endcsname {\simpleiconsmaponethree\symbol{67}} - \expandafter\def\csname simpleicon@zigbeeicon\endcsname {\simpleiconsmaponethree\symbol{68}} - \expandafter\def\csname simpleicon@zigbee2mqtticon\endcsname {\simpleiconsmaponethree\symbol{69}} - \expandafter\def\csname simpleicon@ziggoicon\endcsname {\simpleiconsmaponethree\symbol{70}} - \expandafter\def\csname simpleicon@zilchicon\endcsname {\simpleiconsmaponethree\symbol{71}} - \expandafter\def\csname simpleicon@zillowicon\endcsname {\simpleiconsmaponethree\symbol{72}} - \expandafter\def\csname simpleicon@zincsearchicon\endcsname {\simpleiconsmaponethree\symbol{73}} - \expandafter\def\csname simpleicon@zingaticon\endcsname {\simpleiconsmaponethree\symbol{74}} - \expandafter\def\csname simpleicon@zodicon\endcsname {\simpleiconsmaponethree\symbol{75}} - \expandafter\def\csname simpleicon@zohoicon\endcsname {\simpleiconsmaponethree\symbol{76}} - \expandafter\def\csname simpleicon@zoipericon\endcsname {\simpleiconsmaponethree\symbol{77}} - \expandafter\def\csname simpleicon@zomatoicon\endcsname {\simpleiconsmaponethree\symbol{78}} - \expandafter\def\csname simpleicon@zoomicon\endcsname {\simpleiconsmaponethree\symbol{79}} - \expandafter\def\csname simpleicon@zorinicon\endcsname {\simpleiconsmaponethree\symbol{80}} - \expandafter\def\csname simpleicon@zoteroicon\endcsname {\simpleiconsmaponethree\symbol{81}} - \expandafter\def\csname simpleicon@zshicon\endcsname {\simpleiconsmaponethree\symbol{82}} - \expandafter\def\csname simpleicon@zulipicon\endcsname {\simpleiconsmaponethree\symbol{83}} - \expandafter\def\csname simpleicon@zyteicon\endcsname {\simpleiconsmaponethree\symbol{84}}
\ No newline at end of file + \expandafter\def\csname simpleicon@baserowicon\endcsname {\simpleiconsmaptwo\symbol{66}} + \expandafter\def\csname simpleicon@basicattentiontokenicon\endcsname {\simpleiconsmaptwo\symbol{67}} + \expandafter\def\csname simpleicon@bastyonicon\endcsname {\simpleiconsmaptwo\symbol{68}} + \expandafter\def\csname simpleicon@baticon\endcsname {\simpleiconsmaptwo\symbol{69}} + \expandafter\def\csname simpleicon@bataicon\endcsname {\simpleiconsmaptwo\symbol{70}} + \expandafter\def\csname simpleicon@battledotneticon\endcsname {\simpleiconsmaptwo\symbol{71}} + \expandafter\def\csname simpleicon@bazelicon\endcsname {\simpleiconsmaptwo\symbol{72}} + \expandafter\def\csname simpleicon@beatporticon\endcsname {\simpleiconsmaptwo\symbol{73}} + \expandafter\def\csname simpleicon@beatsicon\endcsname {\simpleiconsmaptwo\symbol{74}} + \expandafter\def\csname simpleicon@beatsbydreicon\endcsname {\simpleiconsmaptwo\symbol{75}} + \expandafter\def\csname simpleicon@beatstarsicon\endcsname {\simpleiconsmaptwo\symbol{76}} + \expandafter\def\csname simpleicon@beekeeperstudioicon\endcsname {\simpleiconsmaptwo\symbol{77}} + \expandafter\def\csname simpleicon@behanceicon\endcsname {\simpleiconsmaptwo\symbol{78}} + \expandafter\def\csname simpleicon@beijingsubwayicon\endcsname {\simpleiconsmaptwo\symbol{79}} + \expandafter\def\csname simpleicon@bemicon\endcsname {\simpleiconsmaptwo\symbol{80}} + \expandafter\def\csname simpleicon@bentleyicon\endcsname {\simpleiconsmaptwo\symbol{81}} + \expandafter\def\csname simpleicon@bentoicon\endcsname {\simpleiconsmaptwo\symbol{82}} + \expandafter\def\csname simpleicon@bentoboxicon\endcsname {\simpleiconsmaptwo\symbol{83}} + \expandafter\def\csname simpleicon@bentomlicon\endcsname {\simpleiconsmaptwo\symbol{84}} + \expandafter\def\csname simpleicon@berealicon\endcsname {\simpleiconsmaptwo\symbol{85}} + \expandafter\def\csname simpleicon@betfairicon\endcsname {\simpleiconsmaptwo\symbol{86}} + \expandafter\def\csname simpleicon@betterstackicon\endcsname {\simpleiconsmaptwo\symbol{87}} + \expandafter\def\csname simpleicon@bevyicon\endcsname {\simpleiconsmaptwo\symbol{88}} + \expandafter\def\csname simpleicon@bigbasketicon\endcsname {\simpleiconsmaptwo\symbol{89}} + \expandafter\def\csname simpleicon@bigbluebuttonicon\endcsname {\simpleiconsmaptwo\symbol{90}} + \expandafter\def\csname simpleicon@bigcartelicon\endcsname {\simpleiconsmaptwo\symbol{91}} + \expandafter\def\csname simpleicon@bigcommerceicon\endcsname {\simpleiconsmaptwo\symbol{92}} + \expandafter\def\csname simpleicon@bilibiliicon\endcsname {\simpleiconsmaptwo\symbol{93}} + \expandafter\def\csname simpleicon@billboardicon\endcsname {\simpleiconsmaptwo\symbol{94}} + \expandafter\def\csname simpleicon@bimicon\endcsname {\simpleiconsmaptwo\symbol{95}} + \expandafter\def\csname simpleicon@binanceicon\endcsname {\simpleiconsmaptwo\symbol{96}} + \expandafter\def\csname simpleicon@biolinkicon\endcsname {\simpleiconsmaptwo\symbol{97}} + \expandafter\def\csname simpleicon@biomeicon\endcsname {\simpleiconsmaptwo\symbol{98}} + \expandafter\def\csname simpleicon@bisecthostingicon\endcsname {\simpleiconsmaptwo\symbol{99}} + \expandafter\def\csname simpleicon@biticon\endcsname {\simpleiconsmaptwo\symbol{100}} + \expandafter\def\csname simpleicon@bitbucketicon\endcsname {\simpleiconsmaptwo\symbol{101}} + \expandafter\def\csname simpleicon@bitcoinicon\endcsname {\simpleiconsmaptwo\symbol{102}} + \expandafter\def\csname simpleicon@bitcoincashicon\endcsname {\simpleiconsmaptwo\symbol{103}} + \expandafter\def\csname simpleicon@bitcoinsvicon\endcsname {\simpleiconsmaptwo\symbol{104}} + \expandafter\def\csname simpleicon@bitcometicon\endcsname {\simpleiconsmaptwo\symbol{105}} + \expandafter\def\csname simpleicon@bitdefendericon\endcsname {\simpleiconsmaptwo\symbol{106}} + \expandafter\def\csname simpleicon@bitlyicon\endcsname {\simpleiconsmaptwo\symbol{107}} + \expandafter\def\csname simpleicon@bitriseicon\endcsname {\simpleiconsmaptwo\symbol{108}} + \expandafter\def\csname simpleicon@bittorrenticon\endcsname {\simpleiconsmaptwo\symbol{109}} + \expandafter\def\csname simpleicon@bitwardenicon\endcsname {\simpleiconsmaptwo\symbol{110}} + \expandafter\def\csname simpleicon@bitwigicon\endcsname {\simpleiconsmaptwo\symbol{111}} + \expandafter\def\csname simpleicon@blackberryicon\endcsname {\simpleiconsmaptwo\symbol{112}} + \expandafter\def\csname simpleicon@blackmagicdesignicon\endcsname {\simpleiconsmaptwo\symbol{113}} + \expandafter\def\csname simpleicon@blazemetericon\endcsname {\simpleiconsmaptwo\symbol{114}} + \expandafter\def\csname simpleicon@blazoricon\endcsname {\simpleiconsmaptwo\symbol{115}} + \expandafter\def\csname simpleicon@blendericon\endcsname {\simpleiconsmaptwo\symbol{116}} + \expandafter\def\csname simpleicon@blockbenchicon\endcsname {\simpleiconsmaptwo\symbol{117}} + \expandafter\def\csname simpleicon@blockchaindotcomicon\endcsname {\simpleiconsmaptwo\symbol{118}} + \expandafter\def\csname simpleicon@bloggericon\endcsname {\simpleiconsmaptwo\symbol{119}} + \expandafter\def\csname simpleicon@bloglovinicon\endcsname {\simpleiconsmaptwo\symbol{120}} + \expandafter\def\csname simpleicon@blueprinticon\endcsname {\simpleiconsmaptwo\symbol{121}} + \expandafter\def\csname simpleicon@blueskyicon\endcsname {\simpleiconsmaptwo\symbol{122}} + \expandafter\def\csname simpleicon@bluesoundicon\endcsname {\simpleiconsmaptwo\symbol{123}} + \expandafter\def\csname simpleicon@bluetoothicon\endcsname {\simpleiconsmaptwo\symbol{124}} + \expandafter\def\csname simpleicon@bmcsoftwareicon\endcsname {\simpleiconsmaptwo\symbol{125}} + \expandafter\def\csname simpleicon@bmwicon\endcsname {\simpleiconsmaptwo\symbol{126}} + \expandafter\def\csname simpleicon@bnbchainicon\endcsname {\simpleiconsmaptwo\symbol{127}} + \expandafter\def\csname simpleicon@boardgamegeekicon\endcsname {\simpleiconsmaptwo\symbol{128}} + \expandafter\def\csname simpleicon@boaticon\endcsname {\simpleiconsmaptwo\symbol{129}} + \expandafter\def\csname simpleicon@boehringeringelheimicon\endcsname {\simpleiconsmaptwo\symbol{130}} + \expandafter\def\csname simpleicon@boeingicon\endcsname {\simpleiconsmaptwo\symbol{131}} + \expandafter\def\csname simpleicon@bombardiericon\endcsname {\simpleiconsmaptwo\symbol{132}} + \expandafter\def\csname simpleicon@bookalopeicon\endcsname {\simpleiconsmaptwo\symbol{133}} + \expandafter\def\csname simpleicon@bookbubicon\endcsname {\simpleiconsmaptwo\symbol{134}} + \expandafter\def\csname simpleicon@bookmetericon\endcsname {\simpleiconsmaptwo\symbol{135}} + \expandafter\def\csname simpleicon@bookmyshowicon\endcsname {\simpleiconsmaptwo\symbol{136}} + \expandafter\def\csname simpleicon@bookstackicon\endcsname {\simpleiconsmaptwo\symbol{137}} + \expandafter\def\csname simpleicon@boosticon\endcsname {\simpleiconsmaptwo\symbol{138}} + \expandafter\def\csname simpleicon@boostyicon\endcsname {\simpleiconsmaptwo\symbol{139}} + \expandafter\def\csname simpleicon@bootsicon\endcsname {\simpleiconsmaptwo\symbol{140}} + \expandafter\def\csname simpleicon@bootstrapicon\endcsname {\simpleiconsmaptwo\symbol{141}} + \expandafter\def\csname simpleicon@borgbackupicon\endcsname {\simpleiconsmaptwo\symbol{142}} + \expandafter\def\csname simpleicon@boschicon\endcsname {\simpleiconsmaptwo\symbol{143}} + \expandafter\def\csname simpleicon@boseicon\endcsname {\simpleiconsmaptwo\symbol{144}} + \expandafter\def\csname simpleicon@botblecmsicon\endcsname {\simpleiconsmaptwo\symbol{145}} + \expandafter\def\csname simpleicon@boulangericon\endcsname {\simpleiconsmaptwo\symbol{146}} + \expandafter\def\csname simpleicon@bowericon\endcsname {\simpleiconsmaptwo\symbol{147}} + \expandafter\def\csname simpleicon@boxicon\endcsname {\simpleiconsmaptwo\symbol{148}} + \expandafter\def\csname simpleicon@boxysvgicon\endcsname {\simpleiconsmaptwo\symbol{149}} + \expandafter\def\csname simpleicon@braintreeicon\endcsname {\simpleiconsmaptwo\symbol{150}} + \expandafter\def\csname simpleicon@brandfoldericon\endcsname {\simpleiconsmaptwo\symbol{151}} + \expandafter\def\csname simpleicon@braveicon\endcsname {\simpleiconsmaptwo\symbol{152}} + \expandafter\def\csname simpleicon@breakericon\endcsname {\simpleiconsmaptwo\symbol{153}} + \expandafter\def\csname simpleicon@brenntagicon\endcsname {\simpleiconsmaptwo\symbol{154}} + \expandafter\def\csname simpleicon@brevoicon\endcsname {\simpleiconsmaptwo\symbol{155}} + \expandafter\def\csname simpleicon@brexicon\endcsname {\simpleiconsmaptwo\symbol{156}} + \expandafter\def\csname simpleicon@bricksicon\endcsname {\simpleiconsmaptwo\symbol{157}} + \expandafter\def\csname simpleicon@britishairwaysicon\endcsname {\simpleiconsmaptwo\symbol{158}} + \expandafter\def\csname simpleicon@broadcomicon\endcsname {\simpleiconsmaptwo\symbol{159}} + \expandafter\def\csname simpleicon@brunoicon\endcsname {\simpleiconsmaptwo\symbol{160}} + \expandafter\def\csname simpleicon@bsdicon\endcsname {\simpleiconsmaptwo\symbol{161}} + \expandafter\def\csname simpleicon@bspwmicon\endcsname {\simpleiconsmaptwo\symbol{162}} + \expandafter\def\csname simpleicon@bticon\endcsname {\simpleiconsmaptwo\symbol{163}} + \expandafter\def\csname simpleicon@buddyicon\endcsname {\simpleiconsmaptwo\symbol{164}} + \expandafter\def\csname simpleicon@budibaseicon\endcsname {\simpleiconsmaptwo\symbol{165}} + \expandafter\def\csname simpleicon@buefyicon\endcsname {\simpleiconsmaptwo\symbol{166}} + \expandafter\def\csname simpleicon@buffericon\endcsname {\simpleiconsmaptwo\symbol{167}} + \expandafter\def\csname simpleicon@bugattiicon\endcsname {\simpleiconsmaptwo\symbol{168}} + \expandafter\def\csname simpleicon@bugcrowdicon\endcsname {\simpleiconsmaptwo\symbol{169}} + \expandafter\def\csname simpleicon@bugsnagicon\endcsname {\simpleiconsmaptwo\symbol{170}} + \expandafter\def\csname simpleicon@buhlicon\endcsname {\simpleiconsmaptwo\symbol{171}} + \expandafter\def\csname simpleicon@buildkiteicon\endcsname {\simpleiconsmaptwo\symbol{172}} + \expandafter\def\csname simpleicon@bukalapakicon\endcsname {\simpleiconsmaptwo\symbol{173}} + \expandafter\def\csname simpleicon@bulmaicon\endcsname {\simpleiconsmaptwo\symbol{174}} + \expandafter\def\csname simpleicon@bunicon\endcsname {\simpleiconsmaptwo\symbol{175}} + \expandafter\def\csname simpleicon@bungieicon\endcsname {\simpleiconsmaptwo\symbol{176}} + \expandafter\def\csname simpleicon@bunqicon\endcsname {\simpleiconsmaptwo\symbol{177}} + \expandafter\def\csname simpleicon@burgerkingicon\endcsname {\simpleiconsmaptwo\symbol{178}} + \expandafter\def\csname simpleicon@burpsuiteicon\endcsname {\simpleiconsmaptwo\symbol{179}} + \expandafter\def\csname simpleicon@burtonicon\endcsname {\simpleiconsmaptwo\symbol{180}} + \expandafter\def\csname simpleicon@buymeacoffeeicon\endcsname {\simpleiconsmaptwo\symbol{181}} + \expandafter\def\csname simpleicon@buyselladsicon\endcsname {\simpleiconsmaptwo\symbol{182}} + \expandafter\def\csname simpleicon@buzzfeedicon\endcsname {\simpleiconsmaptwo\symbol{183}} + \expandafter\def\csname simpleicon@bvgicon\endcsname {\simpleiconsmaptwo\symbol{184}} + \expandafter\def\csname simpleicon@byjusicon\endcsname {\simpleiconsmaptwo\symbol{185}} + \expandafter\def\csname simpleicon@bytedanceicon\endcsname {\simpleiconsmaptwo\symbol{186}} + \expandafter\def\csname simpleicon@cicon\endcsname {\simpleiconsmaptwo\symbol{187}} + \expandafter\def\csname simpleicon@cacheticon\endcsname {\simpleiconsmaptwo\symbol{188}} + \expandafter\def\csname simpleicon@caddyicon\endcsname {\simpleiconsmaptwo\symbol{189}} + \expandafter\def\csname simpleicon@cadillacicon\endcsname {\simpleiconsmaptwo\symbol{190}} + \expandafter\def\csname simpleicon@cafepressicon\endcsname {\simpleiconsmaptwo\symbol{191}} + \expandafter\def\csname simpleicon@caffeineicon\endcsname {\simpleiconsmaptwo\symbol{192}} + \expandafter\def\csname simpleicon@cairographicsicon\endcsname {\simpleiconsmaptwo\symbol{193}} + \expandafter\def\csname simpleicon@cairometroicon\endcsname {\simpleiconsmaptwo\symbol{194}} + \expandafter\def\csname simpleicon@cakephpicon\endcsname {\simpleiconsmaptwo\symbol{195}} + \expandafter\def\csname simpleicon@caldotcomicon\endcsname {\simpleiconsmaptwo\symbol{196}} + \expandafter\def\csname simpleicon@calendlyicon\endcsname {\simpleiconsmaptwo\symbol{197}} + \expandafter\def\csname simpleicon@calibrewebicon\endcsname {\simpleiconsmaptwo\symbol{198}} + \expandafter\def\csname simpleicon@campaignmonitoricon\endcsname {\simpleiconsmaptwo\symbol{199}} + \expandafter\def\csname simpleicon@camundaicon\endcsname {\simpleiconsmaptwo\symbol{200}} + \expandafter\def\csname simpleicon@canonicalicon\endcsname {\simpleiconsmaptwo\symbol{201}} + \expandafter\def\csname simpleicon@canvaicon\endcsname {\simpleiconsmaptwo\symbol{202}} + \expandafter\def\csname simpleicon@canvasicon\endcsname {\simpleiconsmaptwo\symbol{203}} + \expandafter\def\csname simpleicon@capacitoricon\endcsname {\simpleiconsmaptwo\symbol{204}} + \expandafter\def\csname simpleicon@cardanoicon\endcsname {\simpleiconsmaptwo\symbol{205}} + \expandafter\def\csname simpleicon@carlsberggroupicon\endcsname {\simpleiconsmaptwo\symbol{206}} + \expandafter\def\csname simpleicon@carrdicon\endcsname {\simpleiconsmaptwo\symbol{207}} + \expandafter\def\csname simpleicon@carrefouricon\endcsname {\simpleiconsmaptwo\symbol{208}} + \expandafter\def\csname simpleicon@carthrottleicon\endcsname {\simpleiconsmaptwo\symbol{209}} + \expandafter\def\csname simpleicon@cartoicon\endcsname {\simpleiconsmaptwo\symbol{210}} + \expandafter\def\csname simpleicon@cashappicon\endcsname {\simpleiconsmaptwo\symbol{211}} + \expandafter\def\csname simpleicon@castboxicon\endcsname {\simpleiconsmaptwo\symbol{212}} + \expandafter\def\csname simpleicon@castoramaicon\endcsname {\simpleiconsmaptwo\symbol{213}} + \expandafter\def\csname simpleicon@castroicon\endcsname {\simpleiconsmaptwo\symbol{214}} + \expandafter\def\csname simpleicon@caterpillaricon\endcsname {\simpleiconsmaptwo\symbol{215}} + \expandafter\def\csname simpleicon@cbcicon\endcsname {\simpleiconsmaptwo\symbol{216}} + \expandafter\def\csname simpleicon@cbsicon\endcsname {\simpleiconsmaptwo\symbol{217}} + \expandafter\def\csname simpleicon@ccleanericon\endcsname {\simpleiconsmaptwo\symbol{218}} + \expandafter\def\csname simpleicon@cdprojekticon\endcsname {\simpleiconsmaptwo\symbol{219}} + \expandafter\def\csname simpleicon@celeryicon\endcsname {\simpleiconsmaptwo\symbol{220}} + \expandafter\def\csname simpleicon@celestronicon\endcsname {\simpleiconsmaptwo\symbol{221}} + \expandafter\def\csname simpleicon@centosicon\endcsname {\simpleiconsmaptwo\symbol{222}} + \expandafter\def\csname simpleicon@cephicon\endcsname {\simpleiconsmaptwo\symbol{223}} + \expandafter\def\csname simpleicon@cesiumicon\endcsname {\simpleiconsmaptwo\symbol{224}} + \expandafter\def\csname simpleicon@chaiicon\endcsname {\simpleiconsmaptwo\symbol{225}} + \expandafter\def\csname simpleicon@chainguardicon\endcsname {\simpleiconsmaptwo\symbol{226}} + \expandafter\def\csname simpleicon@chainlinkicon\endcsname {\simpleiconsmaptwo\symbol{227}} + \expandafter\def\csname simpleicon@chakrauiicon\endcsname {\simpleiconsmaptwo\symbol{228}} + \expandafter\def\csname simpleicon@channel4icon\endcsname {\simpleiconsmaptwo\symbol{229}} + \expandafter\def\csname simpleicon@charlesicon\endcsname {\simpleiconsmaptwo\symbol{230}} + \expandafter\def\csname simpleicon@chartdotjsicon\endcsname {\simpleiconsmaptwo\symbol{231}} + \expandafter\def\csname simpleicon@chartmogulicon\endcsname {\simpleiconsmaptwo\symbol{232}} + \expandafter\def\csname simpleicon@chaseicon\endcsname {\simpleiconsmaptwo\symbol{233}} + \expandafter\def\csname simpleicon@chatboticon\endcsname {\simpleiconsmaptwo\symbol{234}} + \expandafter\def\csname simpleicon@chatwooticon\endcsname {\simpleiconsmaptwo\symbol{235}} + \expandafter\def\csname simpleicon@checkioicon\endcsname {\simpleiconsmaptwo\symbol{236}} + \expandafter\def\csname simpleicon@checkmarxicon\endcsname {\simpleiconsmaptwo\symbol{237}} + \expandafter\def\csname simpleicon@checkmkicon\endcsname {\simpleiconsmaptwo\symbol{238}} + \expandafter\def\csname simpleicon@chedrauiicon\endcsname {\simpleiconsmaptwo\symbol{239}} + \expandafter\def\csname simpleicon@cheerioicon\endcsname {\simpleiconsmaptwo\symbol{240}} + \expandafter\def\csname simpleicon@cheficon\endcsname {\simpleiconsmaptwo\symbol{241}} + \expandafter\def\csname simpleicon@chemexicon\endcsname {\simpleiconsmaptwo\symbol{242}} + \expandafter\def\csname simpleicon@chessdotcomicon\endcsname {\simpleiconsmaptwo\symbol{243}} + \expandafter\def\csname simpleicon@chevroleticon\endcsname {\simpleiconsmaptwo\symbol{244}} + \expandafter\def\csname simpleicon@chianetworkicon\endcsname {\simpleiconsmaptwo\symbol{245}} + \expandafter\def\csname simpleicon@chinaeasternairlinesicon\endcsname {\simpleiconsmaptwo\symbol{246}} + \expandafter\def\csname simpleicon@chinasouthernairlinesicon\endcsname {\simpleiconsmaptwo\symbol{247}} + \expandafter\def\csname simpleicon@chocolateyicon\endcsname {\simpleiconsmaptwo\symbol{248}} + \expandafter\def\csname simpleicon@chromaticicon\endcsname {\simpleiconsmaptwo\symbol{249}} + \expandafter\def\csname simpleicon@chromecasticon\endcsname {\simpleiconsmaptwo\symbol{250}} + \expandafter\def\csname simpleicon@chromewebstoreicon\endcsname {\simpleiconsmaptwo\symbol{251}} + \expandafter\def\csname simpleicon@chryslericon\endcsname {\simpleiconsmaptwo\symbol{252}} + \expandafter\def\csname simpleicon@chupachupsicon\endcsname {\simpleiconsmaptwo\symbol{253}} + \expandafter\def\csname simpleicon@ciliumicon\endcsname {\simpleiconsmaptwo\symbol{254}} + \expandafter\def\csname simpleicon@cinema4dicon\endcsname {\simpleiconsmaptwo\symbol{255}} + \expandafter\def\csname simpleicon@circleicon\endcsname {\simpleiconsmapthree\symbol{0}} + \expandafter\def\csname simpleicon@circleciicon\endcsname {\simpleiconsmapthree\symbol{1}} + \expandafter\def\csname simpleicon@circuitverseicon\endcsname {\simpleiconsmapthree\symbol{2}} + \expandafter\def\csname simpleicon@cirrusciicon\endcsname {\simpleiconsmapthree\symbol{3}} + \expandafter\def\csname simpleicon@ciscoicon\endcsname {\simpleiconsmapthree\symbol{4}} + \expandafter\def\csname simpleicon@citrixicon\endcsname {\simpleiconsmapthree\symbol{5}} + \expandafter\def\csname simpleicon@citroenicon\endcsname {\simpleiconsmapthree\symbol{6}} + \expandafter\def\csname simpleicon@civicrmicon\endcsname {\simpleiconsmapthree\symbol{7}} + \expandafter\def\csname simpleicon@civoicon\endcsname {\simpleiconsmapthree\symbol{8}} + \expandafter\def\csname simpleicon@ckeditor4icon\endcsname {\simpleiconsmapthree\symbol{9}} + \expandafter\def\csname simpleicon@clarifaiicon\endcsname {\simpleiconsmapthree\symbol{10}} + \expandafter\def\csname simpleicon@clarisicon\endcsname {\simpleiconsmapthree\symbol{11}} + \expandafter\def\csname simpleicon@clarivateicon\endcsname {\simpleiconsmapthree\symbol{12}} + \expandafter\def\csname simpleicon@clerkicon\endcsname {\simpleiconsmapthree\symbol{13}} + \expandafter\def\csname simpleicon@clevercloudicon\endcsname {\simpleiconsmapthree\symbol{14}} + \expandafter\def\csname simpleicon@clickhouseicon\endcsname {\simpleiconsmapthree\symbol{15}} + \expandafter\def\csname simpleicon@clickupicon\endcsname {\simpleiconsmapthree\symbol{16}} + \expandafter\def\csname simpleicon@clionicon\endcsname {\simpleiconsmapthree\symbol{17}} + \expandafter\def\csname simpleicon@cliqzicon\endcsname {\simpleiconsmapthree\symbol{18}} + \expandafter\def\csname simpleicon@clockifyicon\endcsname {\simpleiconsmapthree\symbol{19}} + \expandafter\def\csname simpleicon@clojureicon\endcsname {\simpleiconsmapthree\symbol{20}} + \expandafter\def\csname simpleicon@cloud66icon\endcsname {\simpleiconsmapthree\symbol{21}} + \expandafter\def\csname simpleicon@cloudbeesicon\endcsname {\simpleiconsmapthree\symbol{22}} + \expandafter\def\csname simpleicon@cloudcannonicon\endcsname {\simpleiconsmapthree\symbol{23}} + \expandafter\def\csname simpleicon@clouderaicon\endcsname {\simpleiconsmapthree\symbol{24}} + \expandafter\def\csname simpleicon@cloudflareicon\endcsname {\simpleiconsmapthree\symbol{25}} + \expandafter\def\csname simpleicon@cloudflarepagesicon\endcsname {\simpleiconsmapthree\symbol{26}} + \expandafter\def\csname simpleicon@cloudflareworkersicon\endcsname {\simpleiconsmapthree\symbol{27}} + \expandafter\def\csname simpleicon@cloudfoundryicon\endcsname {\simpleiconsmapthree\symbol{28}} + \expandafter\def\csname simpleicon@cloudinaryicon\endcsname {\simpleiconsmapthree\symbol{29}} + \expandafter\def\csname simpleicon@cloudronicon\endcsname {\simpleiconsmapthree\symbol{30}} + \expandafter\def\csname simpleicon@cloudsmithicon\endcsname {\simpleiconsmapthree\symbol{31}} + \expandafter\def\csname simpleicon@cloudwaysicon\endcsname {\simpleiconsmapthree\symbol{32}} + \expandafter\def\csname simpleicon@clubforceicon\endcsname {\simpleiconsmapthree\symbol{33}} + \expandafter\def\csname simpleicon@clubhouseicon\endcsname {\simpleiconsmapthree\symbol{34}} + \expandafter\def\csname simpleicon@clypicon\endcsname {\simpleiconsmapthree\symbol{35}} + \expandafter\def\csname simpleicon@cmakeicon\endcsname {\simpleiconsmapthree\symbol{36}} + \expandafter\def\csname simpleicon@cncficon\endcsname {\simpleiconsmapthree\symbol{37}} + \expandafter\def\csname simpleicon@cneticon\endcsname {\simpleiconsmapthree\symbol{38}} + \expandafter\def\csname simpleicon@cnnicon\endcsname {\simpleiconsmapthree\symbol{39}} + \expandafter\def\csname simpleicon@cocacolaicon\endcsname {\simpleiconsmapthree\symbol{40}} + \expandafter\def\csname simpleicon@cockpiticon\endcsname {\simpleiconsmapthree\symbol{41}} + \expandafter\def\csname simpleicon@cockroachlabsicon\endcsname {\simpleiconsmapthree\symbol{42}} + \expandafter\def\csname simpleicon@cocoapodsicon\endcsname {\simpleiconsmapthree\symbol{43}} + \expandafter\def\csname simpleicon@cocosicon\endcsname {\simpleiconsmapthree\symbol{44}} + \expandafter\def\csname simpleicon@codaicon\endcsname {\simpleiconsmapthree\symbol{45}} + \expandafter\def\csname simpleicon@codacyicon\endcsname {\simpleiconsmapthree\symbol{46}} + \expandafter\def\csname simpleicon@codebergicon\endcsname {\simpleiconsmapthree\symbol{47}} + \expandafter\def\csname simpleicon@codeblocksicon\endcsname {\simpleiconsmapthree\symbol{48}} + \expandafter\def\csname simpleicon@codecademyicon\endcsname {\simpleiconsmapthree\symbol{49}} + \expandafter\def\csname simpleicon@codeceptjsicon\endcsname {\simpleiconsmapthree\symbol{50}} + \expandafter\def\csname simpleicon@codecheficon\endcsname {\simpleiconsmapthree\symbol{51}} + \expandafter\def\csname simpleicon@codeclimateicon\endcsname {\simpleiconsmapthree\symbol{52}} + \expandafter\def\csname simpleicon@codecovicon\endcsname {\simpleiconsmapthree\symbol{53}} + \expandafter\def\csname simpleicon@codefactoricon\endcsname {\simpleiconsmapthree\symbol{54}} + \expandafter\def\csname simpleicon@codeforcesicon\endcsname {\simpleiconsmapthree\symbol{55}} + \expandafter\def\csname simpleicon@codefreshicon\endcsname {\simpleiconsmapthree\symbol{56}} + \expandafter\def\csname simpleicon@codeignitericon\endcsname {\simpleiconsmapthree\symbol{57}} + \expandafter\def\csname simpleicon@codeiumicon\endcsname {\simpleiconsmapthree\symbol{58}} + \expandafter\def\csname simpleicon@codemagicicon\endcsname {\simpleiconsmapthree\symbol{59}} + \expandafter\def\csname simpleicon@codementoricon\endcsname {\simpleiconsmapthree\symbol{60}} + \expandafter\def\csname simpleicon@codemirroricon\endcsname {\simpleiconsmapthree\symbol{61}} + \expandafter\def\csname simpleicon@codenewbieicon\endcsname {\simpleiconsmapthree\symbol{62}} + \expandafter\def\csname simpleicon@codepenicon\endcsname {\simpleiconsmapthree\symbol{63}} + \expandafter\def\csname simpleicon@codeprojecticon\endcsname {\simpleiconsmapthree\symbol{64}} + \expandafter\def\csname simpleicon@codericon\endcsname {\simpleiconsmapthree\symbol{65}} + \expandafter\def\csname simpleicon@codersrankicon\endcsname {\simpleiconsmapthree\symbol{66}} + \expandafter\def\csname simpleicon@coderwallicon\endcsname {\simpleiconsmapthree\symbol{67}} + \expandafter\def\csname simpleicon@codesandboxicon\endcsname {\simpleiconsmapthree\symbol{68}} + \expandafter\def\csname simpleicon@codeshipicon\endcsname {\simpleiconsmapthree\symbol{69}} + \expandafter\def\csname simpleicon@codesignalicon\endcsname {\simpleiconsmapthree\symbol{70}} + \expandafter\def\csname simpleicon@codestreamicon\endcsname {\simpleiconsmapthree\symbol{71}} + \expandafter\def\csname simpleicon@codewarsicon\endcsname {\simpleiconsmapthree\symbol{72}} + \expandafter\def\csname simpleicon@codingameicon\endcsname {\simpleiconsmapthree\symbol{73}} + \expandafter\def\csname simpleicon@codingninjasicon\endcsname {\simpleiconsmapthree\symbol{74}} + \expandafter\def\csname simpleicon@codioicon\endcsname {\simpleiconsmapthree\symbol{75}} + \expandafter\def\csname simpleicon@coffeescripticon\endcsname {\simpleiconsmapthree\symbol{76}} + \expandafter\def\csname simpleicon@coggleicon\endcsname {\simpleiconsmapthree\symbol{77}} + \expandafter\def\csname simpleicon@cognizanticon\endcsname {\simpleiconsmapthree\symbol{78}} + \expandafter\def\csname simpleicon@coilicon\endcsname {\simpleiconsmapthree\symbol{79}} + \expandafter\def\csname simpleicon@coinbaseicon\endcsname {\simpleiconsmapthree\symbol{80}} + \expandafter\def\csname simpleicon@coinmarketcapicon\endcsname {\simpleiconsmapthree\symbol{81}} + \expandafter\def\csname simpleicon@comicfuryicon\endcsname {\simpleiconsmapthree\symbol{82}} + \expandafter\def\csname simpleicon@commaicon\endcsname {\simpleiconsmapthree\symbol{83}} + \expandafter\def\csname simpleicon@commerzbankicon\endcsname {\simpleiconsmapthree\symbol{84}} + \expandafter\def\csname simpleicon@commitlinticon\endcsname {\simpleiconsmapthree\symbol{85}} + \expandafter\def\csname simpleicon@commodoreicon\endcsname {\simpleiconsmapthree\symbol{86}} + \expandafter\def\csname simpleicon@commonworkflowlanguageicon\endcsname {\simpleiconsmapthree\symbol{87}} + \expandafter\def\csname simpleicon@compilerexplorericon\endcsname {\simpleiconsmapthree\symbol{88}} + \expandafter\def\csname simpleicon@composericon\endcsname {\simpleiconsmapthree\symbol{89}} + \expandafter\def\csname simpleicon@comptiaicon\endcsname {\simpleiconsmapthree\symbol{90}} + \expandafter\def\csname simpleicon@comsolicon\endcsname {\simpleiconsmapthree\symbol{91}} + \expandafter\def\csname simpleicon@conanicon\endcsname {\simpleiconsmapthree\symbol{92}} + \expandafter\def\csname simpleicon@concourseicon\endcsname {\simpleiconsmapthree\symbol{93}} + \expandafter\def\csname simpleicon@condaforgeicon\endcsname {\simpleiconsmapthree\symbol{94}} + \expandafter\def\csname simpleicon@conektaicon\endcsname {\simpleiconsmapthree\symbol{95}} + \expandafter\def\csname simpleicon@confluenceicon\endcsname {\simpleiconsmapthree\symbol{96}} + \expandafter\def\csname simpleicon@construct3icon\endcsname {\simpleiconsmapthree\symbol{97}} + \expandafter\def\csname simpleicon@consulicon\endcsname {\simpleiconsmapthree\symbol{98}} + \expandafter\def\csname simpleicon@contactlesspaymenticon\endcsname {\simpleiconsmapthree\symbol{99}} + \expandafter\def\csname simpleicon@containerdicon\endcsname {\simpleiconsmapthree\symbol{100}} + \expandafter\def\csname simpleicon@contaoicon\endcsname {\simpleiconsmapthree\symbol{101}} + \expandafter\def\csname simpleicon@contentfulicon\endcsname {\simpleiconsmapthree\symbol{102}} + \expandafter\def\csname simpleicon@contentstackicon\endcsname {\simpleiconsmapthree\symbol{103}} + \expandafter\def\csname simpleicon@contributorcovenanticon\endcsname {\simpleiconsmapthree\symbol{104}} + \expandafter\def\csname simpleicon@conventionalcommitsicon\endcsname {\simpleiconsmapthree\symbol{105}} + \expandafter\def\csname simpleicon@convertioicon\endcsname {\simpleiconsmapthree\symbol{106}} + \expandafter\def\csname simpleicon@cookiecuttericon\endcsname {\simpleiconsmapthree\symbol{107}} + \expandafter\def\csname simpleicon@coolermastericon\endcsname {\simpleiconsmapthree\symbol{108}} + \expandafter\def\csname simpleicon@coopicon\endcsname {\simpleiconsmapthree\symbol{109}} + \expandafter\def\csname simpleicon@copaairlinesicon\endcsname {\simpleiconsmapthree\symbol{110}} + \expandafter\def\csname simpleicon@coppelicon\endcsname {\simpleiconsmapthree\symbol{111}} + \expandafter\def\csname simpleicon@coraicon\endcsname {\simpleiconsmapthree\symbol{112}} + \expandafter\def\csname simpleicon@coreldrawicon\endcsname {\simpleiconsmapthree\symbol{113}} + \expandafter\def\csname simpleicon@coronaengineicon\endcsname {\simpleiconsmapthree\symbol{114}} + \expandafter\def\csname simpleicon@coronarenderericon\endcsname {\simpleiconsmapthree\symbol{115}} + \expandafter\def\csname simpleicon@corsairicon\endcsname {\simpleiconsmapthree\symbol{116}} + \expandafter\def\csname simpleicon@couchbaseicon\endcsname {\simpleiconsmapthree\symbol{117}} + \expandafter\def\csname simpleicon@counterstrikeicon\endcsname {\simpleiconsmapthree\symbol{118}} + \expandafter\def\csname simpleicon@countingworksproicon\endcsname {\simpleiconsmapthree\symbol{119}} + \expandafter\def\csname simpleicon@courseraicon\endcsname {\simpleiconsmapthree\symbol{120}} + \expandafter\def\csname simpleicon@coverallsicon\endcsname {\simpleiconsmapthree\symbol{121}} + \expandafter\def\csname simpleicon@cpanelicon\endcsname {\simpleiconsmapthree\symbol{122}} + \expandafter\def\csname simpleicon@cplusplusicon\endcsname {\simpleiconsmapthree\symbol{123}} + \expandafter\def\csname simpleicon@cplusplusbuildericon\endcsname {\simpleiconsmapthree\symbol{124}} + \expandafter\def\csname simpleicon@craftcmsicon\endcsname {\simpleiconsmapthree\symbol{125}} + \expandafter\def\csname simpleicon@craftsmanicon\endcsname {\simpleiconsmapthree\symbol{126}} + \expandafter\def\csname simpleicon@cratedbicon\endcsname {\simpleiconsmapthree\symbol{127}} + \expandafter\def\csname simpleicon@crayonicon\endcsname {\simpleiconsmapthree\symbol{128}} + \expandafter\def\csname simpleicon@crealityicon\endcsname {\simpleiconsmapthree\symbol{129}} + \expandafter\def\csname simpleicon@createreactappicon\endcsname {\simpleiconsmapthree\symbol{130}} + \expandafter\def\csname simpleicon@creativecommonsicon\endcsname {\simpleiconsmapthree\symbol{131}} + \expandafter\def\csname simpleicon@creativetechnologyicon\endcsname {\simpleiconsmapthree\symbol{132}} + \expandafter\def\csname simpleicon@credlyicon\endcsname {\simpleiconsmapthree\symbol{133}} + \expandafter\def\csname simpleicon@crehanaicon\endcsname {\simpleiconsmapthree\symbol{134}} + \expandafter\def\csname simpleicon@crewunitedicon\endcsname {\simpleiconsmapthree\symbol{135}} + \expandafter\def\csname simpleicon@criticalroleicon\endcsname {\simpleiconsmapthree\symbol{136}} + \expandafter\def\csname simpleicon@crowdinicon\endcsname {\simpleiconsmapthree\symbol{137}} + \expandafter\def\csname simpleicon@crowdsourceicon\endcsname {\simpleiconsmapthree\symbol{138}} + \expandafter\def\csname simpleicon@crunchbaseicon\endcsname {\simpleiconsmapthree\symbol{139}} + \expandafter\def\csname simpleicon@crunchyrollicon\endcsname {\simpleiconsmapthree\symbol{140}} + \expandafter\def\csname simpleicon@cryengineicon\endcsname {\simpleiconsmapthree\symbol{141}} + \expandafter\def\csname simpleicon@cryptpadicon\endcsname {\simpleiconsmapthree\symbol{142}} + \expandafter\def\csname simpleicon@crystalicon\endcsname {\simpleiconsmapthree\symbol{143}} + \expandafter\def\csname simpleicon@css3icon\endcsname {\simpleiconsmapthree\symbol{144}} + \expandafter\def\csname simpleicon@cssdesignawardsicon\endcsname {\simpleiconsmapthree\symbol{145}} + \expandafter\def\csname simpleicon@cssmodulesicon\endcsname {\simpleiconsmapthree\symbol{146}} + \expandafter\def\csname simpleicon@csswizardryicon\endcsname {\simpleiconsmapthree\symbol{147}} + \expandafter\def\csname simpleicon@ctsicon\endcsname {\simpleiconsmapthree\symbol{148}} + \expandafter\def\csname simpleicon@cucumbericon\endcsname {\simpleiconsmapthree\symbol{149}} + \expandafter\def\csname simpleicon@culturaicon\endcsname {\simpleiconsmapthree\symbol{150}} + \expandafter\def\csname simpleicon@curlicon\endcsname {\simpleiconsmapthree\symbol{151}} + \expandafter\def\csname simpleicon@curseforgeicon\endcsname {\simpleiconsmapthree\symbol{152}} + \expandafter\def\csname simpleicon@custominkicon\endcsname {\simpleiconsmapthree\symbol{153}} + \expandafter\def\csname simpleicon@cyberdefendersicon\endcsname {\simpleiconsmapthree\symbol{154}} + \expandafter\def\csname simpleicon@cycling74icon\endcsname {\simpleiconsmapthree\symbol{155}} + \expandafter\def\csname simpleicon@cypressicon\endcsname {\simpleiconsmapthree\symbol{156}} + \expandafter\def\csname simpleicon@cytoscapedotjsicon\endcsname {\simpleiconsmapthree\symbol{157}} + \expandafter\def\csname simpleicon@dicon\endcsname {\simpleiconsmapthree\symbol{158}} + \expandafter\def\csname simpleicon@d3dotjsicon\endcsname {\simpleiconsmapthree\symbol{159}} + \expandafter\def\csname simpleicon@daciaicon\endcsname {\simpleiconsmapthree\symbol{160}} + \expandafter\def\csname simpleicon@daficon\endcsname {\simpleiconsmapthree\symbol{161}} + \expandafter\def\csname simpleicon@dailydotdevicon\endcsname {\simpleiconsmapthree\symbol{162}} + \expandafter\def\csname simpleicon@dailymotionicon\endcsname {\simpleiconsmapthree\symbol{163}} + \expandafter\def\csname simpleicon@daisyuiicon\endcsname {\simpleiconsmapthree\symbol{164}} + \expandafter\def\csname simpleicon@dapricon\endcsname {\simpleiconsmapthree\symbol{165}} + \expandafter\def\csname simpleicon@darkreadericon\endcsname {\simpleiconsmapthree\symbol{166}} + \expandafter\def\csname simpleicon@darticon\endcsname {\simpleiconsmapthree\symbol{167}} + \expandafter\def\csname simpleicon@dartyicon\endcsname {\simpleiconsmapthree\symbol{168}} + \expandafter\def\csname simpleicon@dasersteicon\endcsname {\simpleiconsmapthree\symbol{169}} + \expandafter\def\csname simpleicon@dashicon\endcsname {\simpleiconsmapthree\symbol{170}} + \expandafter\def\csname simpleicon@dashlaneicon\endcsname {\simpleiconsmapthree\symbol{171}} + \expandafter\def\csname simpleicon@daskicon\endcsname {\simpleiconsmapthree\symbol{172}} + \expandafter\def\csname simpleicon@dassaultsystemesicon\endcsname {\simpleiconsmapthree\symbol{173}} + \expandafter\def\csname simpleicon@databricksicon\endcsname {\simpleiconsmapthree\symbol{174}} + \expandafter\def\csname simpleicon@datacampicon\endcsname {\simpleiconsmapthree\symbol{175}} + \expandafter\def\csname simpleicon@datadogicon\endcsname {\simpleiconsmapthree\symbol{176}} + \expandafter\def\csname simpleicon@datadotaiicon\endcsname {\simpleiconsmapthree\symbol{177}} + \expandafter\def\csname simpleicon@datagripicon\endcsname {\simpleiconsmapthree\symbol{178}} + \expandafter\def\csname simpleicon@dataikuicon\endcsname {\simpleiconsmapthree\symbol{179}} + \expandafter\def\csname simpleicon@datastaxicon\endcsname {\simpleiconsmapthree\symbol{180}} + \expandafter\def\csname simpleicon@datefnsicon\endcsname {\simpleiconsmapthree\symbol{181}} + \expandafter\def\csname simpleicon@datevicon\endcsname {\simpleiconsmapthree\symbol{182}} + \expandafter\def\csname simpleicon@datocmsicon\endcsname {\simpleiconsmapthree\symbol{183}} + \expandafter\def\csname simpleicon@dattoicon\endcsname {\simpleiconsmapthree\symbol{184}} + \expandafter\def\csname simpleicon@davinciresolveicon\endcsname {\simpleiconsmapthree\symbol{185}} + \expandafter\def\csname simpleicon@dazhongdianpingicon\endcsname {\simpleiconsmapthree\symbol{186}} + \expandafter\def\csname simpleicon@daznicon\endcsname {\simpleiconsmapthree\symbol{187}} + \expandafter\def\csname simpleicon@dbeavericon\endcsname {\simpleiconsmapthree\symbol{188}} + \expandafter\def\csname simpleicon@dblpicon\endcsname {\simpleiconsmapthree\symbol{189}} + \expandafter\def\csname simpleicon@dbticon\endcsname {\simpleiconsmapthree\symbol{190}} + \expandafter\def\csname simpleicon@dcentertainmenticon\endcsname {\simpleiconsmapthree\symbol{191}} + \expandafter\def\csname simpleicon@debianicon\endcsname {\simpleiconsmapthree\symbol{192}} + \expandafter\def\csname simpleicon@decapcmsicon\endcsname {\simpleiconsmapthree\symbol{193}} + \expandafter\def\csname simpleicon@decentralandicon\endcsname {\simpleiconsmapthree\symbol{194}} + \expandafter\def\csname simpleicon@dedgeicon\endcsname {\simpleiconsmapthree\symbol{195}} + \expandafter\def\csname simpleicon@deepcoolicon\endcsname {\simpleiconsmapthree\symbol{196}} + \expandafter\def\csname simpleicon@deepgramicon\endcsname {\simpleiconsmapthree\symbol{197}} + \expandafter\def\csname simpleicon@deepinicon\endcsname {\simpleiconsmapthree\symbol{198}} + \expandafter\def\csname simpleicon@deeplicon\endcsname {\simpleiconsmapthree\symbol{199}} + \expandafter\def\csname simpleicon@deepnoteicon\endcsname {\simpleiconsmapthree\symbol{200}} + \expandafter\def\csname simpleicon@deliciousicon\endcsname {\simpleiconsmapthree\symbol{201}} + \expandafter\def\csname simpleicon@deliverooicon\endcsname {\simpleiconsmapthree\symbol{202}} + \expandafter\def\csname simpleicon@dellicon\endcsname {\simpleiconsmapthree\symbol{203}} + \expandafter\def\csname simpleicon@delonghiicon\endcsname {\simpleiconsmapthree\symbol{204}} + \expandafter\def\csname simpleicon@delphiicon\endcsname {\simpleiconsmapthree\symbol{205}} + \expandafter\def\csname simpleicon@deltaicon\endcsname {\simpleiconsmapthree\symbol{206}} + \expandafter\def\csname simpleicon@delugeicon\endcsname {\simpleiconsmapthree\symbol{207}} + \expandafter\def\csname simpleicon@denoicon\endcsname {\simpleiconsmapthree\symbol{208}} + \expandafter\def\csname simpleicon@denonicon\endcsname {\simpleiconsmapthree\symbol{209}} + \expandafter\def\csname simpleicon@dependaboticon\endcsname {\simpleiconsmapthree\symbol{210}} + \expandafter\def\csname simpleicon@dependencycheckicon\endcsname {\simpleiconsmapthree\symbol{211}} + \expandafter\def\csname simpleicon@depositphotosicon\endcsname {\simpleiconsmapthree\symbol{212}} + \expandafter\def\csname simpleicon@derspiegelicon\endcsname {\simpleiconsmapthree\symbol{213}} + \expandafter\def\csname simpleicon@deutschebahnicon\endcsname {\simpleiconsmapthree\symbol{214}} + \expandafter\def\csname simpleicon@deutschebankicon\endcsname {\simpleiconsmapthree\symbol{215}} + \expandafter\def\csname simpleicon@deutscheposticon\endcsname {\simpleiconsmapthree\symbol{216}} + \expandafter\def\csname simpleicon@devdottoicon\endcsname {\simpleiconsmapthree\symbol{217}} + \expandafter\def\csname simpleicon@devexpressicon\endcsname {\simpleiconsmapthree\symbol{218}} + \expandafter\def\csname simpleicon@deviantarticon\endcsname {\simpleiconsmapthree\symbol{219}} + \expandafter\def\csname simpleicon@devposticon\endcsname {\simpleiconsmapthree\symbol{220}} + \expandafter\def\csname simpleicon@devranticon\endcsname {\simpleiconsmapthree\symbol{221}} + \expandafter\def\csname simpleicon@dgraphicon\endcsname {\simpleiconsmapthree\symbol{222}} + \expandafter\def\csname simpleicon@dhlicon\endcsname {\simpleiconsmapthree\symbol{223}} + \expandafter\def\csname simpleicon@diagramsdotneticon\endcsname {\simpleiconsmapthree\symbol{224}} + \expandafter\def\csname simpleicon@dialogflowicon\endcsname {\simpleiconsmapthree\symbol{225}} + \expandafter\def\csname simpleicon@diasporaicon\endcsname {\simpleiconsmapthree\symbol{226}} + \expandafter\def\csname simpleicon@dictionarydotcomicon\endcsname {\simpleiconsmapthree\symbol{227}} + \expandafter\def\csname simpleicon@diggicon\endcsname {\simpleiconsmapthree\symbol{228}} + \expandafter\def\csname simpleicon@digikeyelectronicsicon\endcsname {\simpleiconsmapthree\symbol{229}} + \expandafter\def\csname simpleicon@digitaloceanicon\endcsname {\simpleiconsmapthree\symbol{230}} + \expandafter\def\csname simpleicon@dinersclubicon\endcsname {\simpleiconsmapthree\symbol{231}} + \expandafter\def\csname simpleicon@dioricon\endcsname {\simpleiconsmapthree\symbol{232}} + \expandafter\def\csname simpleicon@directusicon\endcsname {\simpleiconsmapthree\symbol{233}} + \expandafter\def\csname simpleicon@discogsicon\endcsname {\simpleiconsmapthree\symbol{234}} + \expandafter\def\csname simpleicon@discordicon\endcsname {\simpleiconsmapthree\symbol{235}} + \expandafter\def\csname simpleicon@discourseicon\endcsname {\simpleiconsmapthree\symbol{236}} + \expandafter\def\csname simpleicon@discovericon\endcsname {\simpleiconsmapthree\symbol{237}} + \expandafter\def\csname simpleicon@disqusicon\endcsname {\simpleiconsmapthree\symbol{238}} + \expandafter\def\csname simpleicon@disrooticon\endcsname {\simpleiconsmapthree\symbol{239}} + \expandafter\def\csname simpleicon@distrokidicon\endcsname {\simpleiconsmapthree\symbol{240}} + \expandafter\def\csname simpleicon@djangoicon\endcsname {\simpleiconsmapthree\symbol{241}} + \expandafter\def\csname simpleicon@djiicon\endcsname {\simpleiconsmapthree\symbol{242}} + \expandafter\def\csname simpleicon@dlibicon\endcsname {\simpleiconsmapthree\symbol{243}} + \expandafter\def\csname simpleicon@dlnaicon\endcsname {\simpleiconsmapthree\symbol{244}} + \expandafter\def\csname simpleicon@dmicon\endcsname {\simpleiconsmapthree\symbol{245}} + \expandafter\def\csname simpleicon@dockericon\endcsname {\simpleiconsmapthree\symbol{246}} + \expandafter\def\csname simpleicon@docsdotrsicon\endcsname {\simpleiconsmapthree\symbol{247}} + \expandafter\def\csname simpleicon@docsifyicon\endcsname {\simpleiconsmapthree\symbol{248}} + \expandafter\def\csname simpleicon@doctrineicon\endcsname {\simpleiconsmapthree\symbol{249}} + \expandafter\def\csname simpleicon@docusaurusicon\endcsname {\simpleiconsmapthree\symbol{250}} + \expandafter\def\csname simpleicon@dogecoinicon\endcsname {\simpleiconsmapthree\symbol{251}} + \expandafter\def\csname simpleicon@doiicon\endcsname {\simpleiconsmapthree\symbol{252}} + \expandafter\def\csname simpleicon@dolbyicon\endcsname {\simpleiconsmapthree\symbol{253}} + \expandafter\def\csname simpleicon@doordashicon\endcsname {\simpleiconsmapthree\symbol{254}} + \expandafter\def\csname simpleicon@dota2icon\endcsname {\simpleiconsmapthree\symbol{255}} + \expandafter\def\csname simpleicon@dotenvicon\endcsname {\simpleiconsmapfour\symbol{0}} + \expandafter\def\csname simpleicon@dotneticon\endcsname {\simpleiconsmapfour\symbol{1}} + \expandafter\def\csname simpleicon@doubanicon\endcsname {\simpleiconsmapfour\symbol{2}} + \expandafter\def\csname simpleicon@doubanreadicon\endcsname {\simpleiconsmapfour\symbol{3}} + \expandafter\def\csname simpleicon@dovecoticon\endcsname {\simpleiconsmapfour\symbol{4}} + \expandafter\def\csname simpleicon@dovetailicon\endcsname {\simpleiconsmapfour\symbol{5}} + \expandafter\def\csname simpleicon@doxygenicon\endcsname {\simpleiconsmapfour\symbol{6}} + \expandafter\def\csname simpleicon@dpdicon\endcsname {\simpleiconsmapfour\symbol{7}} + \expandafter\def\csname simpleicon@dragonframeicon\endcsname {\simpleiconsmapfour\symbol{8}} + \expandafter\def\csname simpleicon@draugiemdotlvicon\endcsname {\simpleiconsmapfour\symbol{9}} + \expandafter\def\csname simpleicon@dreamstimeicon\endcsname {\simpleiconsmapfour\symbol{10}} + \expandafter\def\csname simpleicon@dribbbleicon\endcsname {\simpleiconsmapfour\symbol{11}} + \expandafter\def\csname simpleicon@drizzleicon\endcsname {\simpleiconsmapfour\symbol{12}} + \expandafter\def\csname simpleicon@droneicon\endcsname {\simpleiconsmapfour\symbol{13}} + \expandafter\def\csname simpleicon@droobleicon\endcsname {\simpleiconsmapfour\symbol{14}} + \expandafter\def\csname simpleicon@dropboxicon\endcsname {\simpleiconsmapfour\symbol{15}} + \expandafter\def\csname simpleicon@drupalicon\endcsname {\simpleiconsmapfour\symbol{16}} + \expandafter\def\csname simpleicon@dsautomobilesicon\endcsname {\simpleiconsmapfour\symbol{17}} + \expandafter\def\csname simpleicon@dtsicon\endcsname {\simpleiconsmapfour\symbol{18}} + \expandafter\def\csname simpleicon@dtubeicon\endcsname {\simpleiconsmapfour\symbol{19}} + \expandafter\def\csname simpleicon@ducatiicon\endcsname {\simpleiconsmapfour\symbol{20}} + \expandafter\def\csname simpleicon@duckdbicon\endcsname {\simpleiconsmapfour\symbol{21}} + \expandafter\def\csname simpleicon@duckduckgoicon\endcsname {\simpleiconsmapfour\symbol{22}} + \expandafter\def\csname simpleicon@dungeonsanddragonsicon\endcsname {\simpleiconsmapfour\symbol{23}} + \expandafter\def\csname simpleicon@dunkedicon\endcsname {\simpleiconsmapfour\symbol{24}} + \expandafter\def\csname simpleicon@dunzoicon\endcsname {\simpleiconsmapfour\symbol{25}} + \expandafter\def\csname simpleicon@duolingoicon\endcsname {\simpleiconsmapfour\symbol{26}} + \expandafter\def\csname simpleicon@duplicatiicon\endcsname {\simpleiconsmapfour\symbol{27}} + \expandafter\def\csname simpleicon@dvcicon\endcsname {\simpleiconsmapfour\symbol{28}} + \expandafter\def\csname simpleicon@dwavesystemsicon\endcsname {\simpleiconsmapfour\symbol{29}} + \expandafter\def\csname simpleicon@dwmicon\endcsname {\simpleiconsmapfour\symbol{30}} + \expandafter\def\csname simpleicon@dynatraceicon\endcsname {\simpleiconsmapfour\symbol{31}} + \expandafter\def\csname simpleicon@eicon\endcsname {\simpleiconsmapfour\symbol{32}} + \expandafter\def\csname simpleicon@e3icon\endcsname {\simpleiconsmapfour\symbol{33}} + \expandafter\def\csname simpleicon@eaicon\endcsname {\simpleiconsmapfour\symbol{34}} + \expandafter\def\csname simpleicon@eagleicon\endcsname {\simpleiconsmapfour\symbol{35}} + \expandafter\def\csname simpleicon@easyedaicon\endcsname {\simpleiconsmapfour\symbol{36}} + \expandafter\def\csname simpleicon@easyjeticon\endcsname {\simpleiconsmapfour\symbol{37}} + \expandafter\def\csname simpleicon@ebayicon\endcsname {\simpleiconsmapfour\symbol{38}} + \expandafter\def\csname simpleicon@eboxicon\endcsname {\simpleiconsmapfour\symbol{39}} + \expandafter\def\csname simpleicon@eclipseadoptiumicon\endcsname {\simpleiconsmapfour\symbol{40}} + \expandafter\def\csname simpleicon@eclipsecheicon\endcsname {\simpleiconsmapfour\symbol{41}} + \expandafter\def\csname simpleicon@eclipseideicon\endcsname {\simpleiconsmapfour\symbol{42}} + \expandafter\def\csname simpleicon@eclipsejettyicon\endcsname {\simpleiconsmapfour\symbol{43}} + \expandafter\def\csname simpleicon@eclipsemosquittoicon\endcsname {\simpleiconsmapfour\symbol{44}} + \expandafter\def\csname simpleicon@eclipsevertdotxicon\endcsname {\simpleiconsmapfour\symbol{45}} + \expandafter\def\csname simpleicon@ecovacsicon\endcsname {\simpleiconsmapfour\symbol{46}} + \expandafter\def\csname simpleicon@edekaicon\endcsname {\simpleiconsmapfour\symbol{47}} + \expandafter\def\csname simpleicon@edgeimpulseicon\endcsname {\simpleiconsmapfour\symbol{48}} + \expandafter\def\csname simpleicon@editorconfigicon\endcsname {\simpleiconsmapfour\symbol{49}} + \expandafter\def\csname simpleicon@edotleclercicon\endcsname {\simpleiconsmapfour\symbol{50}} + \expandafter\def\csname simpleicon@educativeicon\endcsname {\simpleiconsmapfour\symbol{51}} + \expandafter\def\csname simpleicon@edxicon\endcsname {\simpleiconsmapfour\symbol{52}} + \expandafter\def\csname simpleicon@eggheadicon\endcsname {\simpleiconsmapfour\symbol{53}} + \expandafter\def\csname simpleicon@egnyteicon\endcsname {\simpleiconsmapfour\symbol{54}} + \expandafter\def\csname simpleicon@eighticon\endcsname {\simpleiconsmapfour\symbol{55}} + \expandafter\def\csname simpleicon@eightsleepicon\endcsname {\simpleiconsmapfour\symbol{56}} + \expandafter\def\csname simpleicon@ejsicon\endcsname {\simpleiconsmapfour\symbol{57}} + \expandafter\def\csname simpleicon@elasticicon\endcsname {\simpleiconsmapfour\symbol{58}} + \expandafter\def\csname simpleicon@elasticcloudicon\endcsname {\simpleiconsmapfour\symbol{59}} + \expandafter\def\csname simpleicon@elasticsearchicon\endcsname {\simpleiconsmapfour\symbol{60}} + \expandafter\def\csname simpleicon@elasticstackicon\endcsname {\simpleiconsmapfour\symbol{61}} + \expandafter\def\csname simpleicon@elavonicon\endcsname {\simpleiconsmapfour\symbol{62}} + \expandafter\def\csname simpleicon@electronicon\endcsname {\simpleiconsmapfour\symbol{63}} + \expandafter\def\csname simpleicon@electronbuildericon\endcsname {\simpleiconsmapfour\symbol{64}} + \expandafter\def\csname simpleicon@electronfiddleicon\endcsname {\simpleiconsmapfour\symbol{65}} + \expandafter\def\csname simpleicon@elegooicon\endcsname {\simpleiconsmapfour\symbol{66}} + \expandafter\def\csname simpleicon@elementicon\endcsname {\simpleiconsmapfour\symbol{67}} + \expandafter\def\csname simpleicon@elementaryicon\endcsname {\simpleiconsmapfour\symbol{68}} + \expandafter\def\csname simpleicon@elementoricon\endcsname {\simpleiconsmapfour\symbol{69}} + \expandafter\def\csname simpleicon@eleventyicon\endcsname {\simpleiconsmapfour\symbol{70}} + \expandafter\def\csname simpleicon@elgatoicon\endcsname {\simpleiconsmapfour\symbol{71}} + \expandafter\def\csname simpleicon@elixiricon\endcsname {\simpleiconsmapfour\symbol{72}} + \expandafter\def\csname simpleicon@eljuevesicon\endcsname {\simpleiconsmapfour\symbol{73}} + \expandafter\def\csname simpleicon@elloicon\endcsname {\simpleiconsmapfour\symbol{74}} + \expandafter\def\csname simpleicon@elmicon\endcsname {\simpleiconsmapfour\symbol{75}} + \expandafter\def\csname simpleicon@elseviericon\endcsname {\simpleiconsmapfour\symbol{76}} + \expandafter\def\csname simpleicon@embarcaderoicon\endcsname {\simpleiconsmapfour\symbol{77}} + \expandafter\def\csname simpleicon@embarkicon\endcsname {\simpleiconsmapfour\symbol{78}} + \expandafter\def\csname simpleicon@emberdotjsicon\endcsname {\simpleiconsmapfour\symbol{79}} + \expandafter\def\csname simpleicon@embyicon\endcsname {\simpleiconsmapfour\symbol{80}} + \expandafter\def\csname simpleicon@emiratesicon\endcsname {\simpleiconsmapfour\symbol{81}} + \expandafter\def\csname simpleicon@emlakjeticon\endcsname {\simpleiconsmapfour\symbol{82}} + \expandafter\def\csname simpleicon@empirekredicon\endcsname {\simpleiconsmapfour\symbol{83}} + \expandafter\def\csname simpleicon@endeavourosicon\endcsname {\simpleiconsmapfour\symbol{84}} + \expandafter\def\csname simpleicon@engadgeticon\endcsname {\simpleiconsmapfour\symbol{85}} + \expandafter\def\csname simpleicon@enpassicon\endcsname {\simpleiconsmapfour\symbol{86}} + \expandafter\def\csname simpleicon@enterprisedbicon\endcsname {\simpleiconsmapfour\symbol{87}} + \expandafter\def\csname simpleicon@envatoicon\endcsname {\simpleiconsmapfour\symbol{88}} + \expandafter\def\csname simpleicon@envoyproxyicon\endcsname {\simpleiconsmapfour\symbol{89}} + \expandafter\def\csname simpleicon@epelicon\endcsname {\simpleiconsmapfour\symbol{90}} + \expandafter\def\csname simpleicon@epicgamesicon\endcsname {\simpleiconsmapfour\symbol{91}} + \expandafter\def\csname simpleicon@epsonicon\endcsname {\simpleiconsmapfour\symbol{92}} + \expandafter\def\csname simpleicon@equinixmetalicon\endcsname {\simpleiconsmapfour\symbol{93}} + \expandafter\def\csname simpleicon@erasericon\endcsname {\simpleiconsmapfour\symbol{94}} + \expandafter\def\csname simpleicon@ericssonicon\endcsname {\simpleiconsmapfour\symbol{95}} + \expandafter\def\csname simpleicon@erlangicon\endcsname {\simpleiconsmapfour\symbol{96}} + \expandafter\def\csname simpleicon@erpnexticon\endcsname {\simpleiconsmapfour\symbol{97}} + \expandafter\def\csname simpleicon@esbuildicon\endcsname {\simpleiconsmapfour\symbol{98}} + \expandafter\def\csname simpleicon@eseaicon\endcsname {\simpleiconsmapfour\symbol{99}} + \expandafter\def\csname simpleicon@eslgamingicon\endcsname {\simpleiconsmapfour\symbol{100}} + \expandafter\def\csname simpleicon@eslinticon\endcsname {\simpleiconsmapfour\symbol{101}} + \expandafter\def\csname simpleicon@esotericsoftwareicon\endcsname {\simpleiconsmapfour\symbol{102}} + \expandafter\def\csname simpleicon@esphomeicon\endcsname {\simpleiconsmapfour\symbol{103}} + \expandafter\def\csname simpleicon@espressificon\endcsname {\simpleiconsmapfour\symbol{104}} + \expandafter\def\csname simpleicon@esriicon\endcsname {\simpleiconsmapfour\symbol{105}} + \expandafter\def\csname simpleicon@etcdicon\endcsname {\simpleiconsmapfour\symbol{106}} + \expandafter\def\csname simpleicon@ethereumicon\endcsname {\simpleiconsmapfour\symbol{107}} + \expandafter\def\csname simpleicon@ethersicon\endcsname {\simpleiconsmapfour\symbol{108}} + \expandafter\def\csname simpleicon@ethiopianairlinesicon\endcsname {\simpleiconsmapfour\symbol{109}} + \expandafter\def\csname simpleicon@etihadairwaysicon\endcsname {\simpleiconsmapfour\symbol{110}} + \expandafter\def\csname simpleicon@etsyicon\endcsname {\simpleiconsmapfour\symbol{111}} + \expandafter\def\csname simpleicon@eventbriteicon\endcsname {\simpleiconsmapfour\symbol{112}} + \expandafter\def\csname simpleicon@eventstoreicon\endcsname {\simpleiconsmapfour\symbol{113}} + \expandafter\def\csname simpleicon@evernoteicon\endcsname {\simpleiconsmapfour\symbol{114}} + \expandafter\def\csname simpleicon@excalidrawicon\endcsname {\simpleiconsmapfour\symbol{115}} + \expandafter\def\csname simpleicon@exercismicon\endcsname {\simpleiconsmapfour\symbol{116}} + \expandafter\def\csname simpleicon@exordoicon\endcsname {\simpleiconsmapfour\symbol{117}} + \expandafter\def\csname simpleicon@exoscaleicon\endcsname {\simpleiconsmapfour\symbol{118}} + \expandafter\def\csname simpleicon@expediaicon\endcsname {\simpleiconsmapfour\symbol{119}} + \expandafter\def\csname simpleicon@expensifyicon\endcsname {\simpleiconsmapfour\symbol{120}} + \expandafter\def\csname simpleicon@expertsexchangeicon\endcsname {\simpleiconsmapfour\symbol{121}} + \expandafter\def\csname simpleicon@expoicon\endcsname {\simpleiconsmapfour\symbol{122}} + \expandafter\def\csname simpleicon@expressicon\endcsname {\simpleiconsmapfour\symbol{123}} + \expandafter\def\csname simpleicon@expressvpnicon\endcsname {\simpleiconsmapfour\symbol{124}} + \expandafter\def\csname simpleicon@eyeemicon\endcsname {\simpleiconsmapfour\symbol{125}} + \expandafter\def\csname simpleicon@f1icon\endcsname {\simpleiconsmapfour\symbol{126}} + \expandafter\def\csname simpleicon@f5icon\endcsname {\simpleiconsmapfour\symbol{127}} + \expandafter\def\csname simpleicon@facebookicon\endcsname {\simpleiconsmapfour\symbol{128}} + \expandafter\def\csname simpleicon@facebookgamingicon\endcsname {\simpleiconsmapfour\symbol{129}} + \expandafter\def\csname simpleicon@facebookliveicon\endcsname {\simpleiconsmapfour\symbol{130}} + \expandafter\def\csname simpleicon@faceiticon\endcsname {\simpleiconsmapfour\symbol{131}} + \expandafter\def\csname simpleicon@facepunchicon\endcsname {\simpleiconsmapfour\symbol{132}} + \expandafter\def\csname simpleicon@fairphoneicon\endcsname {\simpleiconsmapfour\symbol{133}} + \expandafter\def\csname simpleicon@falcoicon\endcsname {\simpleiconsmapfour\symbol{134}} + \expandafter\def\csname simpleicon@falconicon\endcsname {\simpleiconsmapfour\symbol{135}} + \expandafter\def\csname simpleicon@fampayicon\endcsname {\simpleiconsmapfour\symbol{136}} + \expandafter\def\csname simpleicon@fandangoicon\endcsname {\simpleiconsmapfour\symbol{137}} + \expandafter\def\csname simpleicon@fandomicon\endcsname {\simpleiconsmapfour\symbol{138}} + \expandafter\def\csname simpleicon@fanfouicon\endcsname {\simpleiconsmapfour\symbol{139}} + \expandafter\def\csname simpleicon@fantomicon\endcsname {\simpleiconsmapfour\symbol{140}} + \expandafter\def\csname simpleicon@farcastericon\endcsname {\simpleiconsmapfour\symbol{141}} + \expandafter\def\csname simpleicon@fareharboricon\endcsname {\simpleiconsmapfour\symbol{142}} + \expandafter\def\csname simpleicon@farfetchicon\endcsname {\simpleiconsmapfour\symbol{143}} + \expandafter\def\csname simpleicon@fastapiicon\endcsname {\simpleiconsmapfour\symbol{144}} + \expandafter\def\csname simpleicon@fastifyicon\endcsname {\simpleiconsmapfour\symbol{145}} + \expandafter\def\csname simpleicon@fastlaneicon\endcsname {\simpleiconsmapfour\symbol{146}} + \expandafter\def\csname simpleicon@fastlyicon\endcsname {\simpleiconsmapfour\symbol{147}} + \expandafter\def\csname simpleicon@fathomicon\endcsname {\simpleiconsmapfour\symbol{148}} + \expandafter\def\csname simpleicon@faunaicon\endcsname {\simpleiconsmapfour\symbol{149}} + \expandafter\def\csname simpleicon@favroicon\endcsname {\simpleiconsmapfour\symbol{150}} + \expandafter\def\csname simpleicon@fdroidicon\endcsname {\simpleiconsmapfour\symbol{151}} + \expandafter\def\csname simpleicon@feathubicon\endcsname {\simpleiconsmapfour\symbol{152}} + \expandafter\def\csname simpleicon@fedexicon\endcsname {\simpleiconsmapfour\symbol{153}} + \expandafter\def\csname simpleicon@fedoraicon\endcsname {\simpleiconsmapfour\symbol{154}} + \expandafter\def\csname simpleicon@feedlyicon\endcsname {\simpleiconsmapfour\symbol{155}} + \expandafter\def\csname simpleicon@ferrariicon\endcsname {\simpleiconsmapfour\symbol{156}} + \expandafter\def\csname simpleicon@ferrarinvicon\endcsname {\simpleiconsmapfour\symbol{157}} + \expandafter\def\csname simpleicon@ferretdbicon\endcsname {\simpleiconsmapfour\symbol{158}} + \expandafter\def\csname simpleicon@ffmpegicon\endcsname {\simpleiconsmapfour\symbol{159}} + \expandafter\def\csname simpleicon@fiicon\endcsname {\simpleiconsmapfour\symbol{160}} + \expandafter\def\csname simpleicon@fiaticon\endcsname {\simpleiconsmapfour\symbol{161}} + \expandafter\def\csname simpleicon@fidoallianceicon\endcsname {\simpleiconsmapfour\symbol{162}} + \expandafter\def\csname simpleicon@fifaicon\endcsname {\simpleiconsmapfour\symbol{163}} + \expandafter\def\csname simpleicon@figicon\endcsname {\simpleiconsmapfour\symbol{164}} + \expandafter\def\csname simpleicon@figmaicon\endcsname {\simpleiconsmapfour\symbol{165}} + \expandafter\def\csname simpleicon@figshareicon\endcsname {\simpleiconsmapfour\symbol{166}} + \expandafter\def\csname simpleicon@filaicon\endcsname {\simpleiconsmapfour\symbol{167}} + \expandafter\def\csname simpleicon@filedotioicon\endcsname {\simpleiconsmapfour\symbol{168}} + \expandafter\def\csname simpleicon@filesicon\endcsname {\simpleiconsmapfour\symbol{169}} + \expandafter\def\csname simpleicon@filezillaicon\endcsname {\simpleiconsmapfour\symbol{170}} + \expandafter\def\csname simpleicon@finecoicon\endcsname {\simpleiconsmapfour\symbol{171}} + \expandafter\def\csname simpleicon@fingicon\endcsname {\simpleiconsmapfour\symbol{172}} + \expandafter\def\csname simpleicon@firebaseicon\endcsname {\simpleiconsmapfour\symbol{173}} + \expandafter\def\csname simpleicon@firefishicon\endcsname {\simpleiconsmapfour\symbol{174}} + \expandafter\def\csname simpleicon@fireflyiiiicon\endcsname {\simpleiconsmapfour\symbol{175}} + \expandafter\def\csname simpleicon@firefoxicon\endcsname {\simpleiconsmapfour\symbol{176}} + \expandafter\def\csname simpleicon@firefoxbrowsericon\endcsname {\simpleiconsmapfour\symbol{177}} + \expandafter\def\csname simpleicon@fireshipicon\endcsname {\simpleiconsmapfour\symbol{178}} + \expandafter\def\csname simpleicon@firewallaicon\endcsname {\simpleiconsmapfour\symbol{179}} + \expandafter\def\csname simpleicon@firsticon\endcsname {\simpleiconsmapfour\symbol{180}} + \expandafter\def\csname simpleicon@fishshellicon\endcsname {\simpleiconsmapfour\symbol{181}} + \expandafter\def\csname simpleicon@fitbiticon\endcsname {\simpleiconsmapfour\symbol{182}} + \expandafter\def\csname simpleicon@fivemicon\endcsname {\simpleiconsmapfour\symbol{183}} + \expandafter\def\csname simpleicon@fiverricon\endcsname {\simpleiconsmapfour\symbol{184}} + \expandafter\def\csname simpleicon@fizzicon\endcsname {\simpleiconsmapfour\symbol{185}} + \expandafter\def\csname simpleicon@flashforgeicon\endcsname {\simpleiconsmapfour\symbol{186}} + \expandafter\def\csname simpleicon@flaskicon\endcsname {\simpleiconsmapfour\symbol{187}} + \expandafter\def\csname simpleicon@flaticon\endcsname {\simpleiconsmapfour\symbol{188}} + \expandafter\def\csname simpleicon@flathubicon\endcsname {\simpleiconsmapfour\symbol{189}} + \expandafter\def\csname simpleicon@flatpakicon\endcsname {\simpleiconsmapfour\symbol{190}} + \expandafter\def\csname simpleicon@flickricon\endcsname {\simpleiconsmapfour\symbol{191}} + \expandafter\def\csname simpleicon@flightawareicon\endcsname {\simpleiconsmapfour\symbol{192}} + \expandafter\def\csname simpleicon@flipboardicon\endcsname {\simpleiconsmapfour\symbol{193}} + \expandafter\def\csname simpleicon@flipkarticon\endcsname {\simpleiconsmapfour\symbol{194}} + \expandafter\def\csname simpleicon@floatplaneicon\endcsname {\simpleiconsmapfour\symbol{195}} + \expandafter\def\csname simpleicon@floodicon\endcsname {\simpleiconsmapfour\symbol{196}} + \expandafter\def\csname simpleicon@fluentbiticon\endcsname {\simpleiconsmapfour\symbol{197}} + \expandafter\def\csname simpleicon@fluentdicon\endcsname {\simpleiconsmapfour\symbol{198}} + \expandafter\def\csname simpleicon@flukeicon\endcsname {\simpleiconsmapfour\symbol{199}} + \expandafter\def\csname simpleicon@fluttericon\endcsname {\simpleiconsmapfour\symbol{200}} + \expandafter\def\csname simpleicon@fluxicon\endcsname {\simpleiconsmapfour\symbol{201}} + \expandafter\def\csname simpleicon@fluxusicon\endcsname {\simpleiconsmapfour\symbol{202}} + \expandafter\def\csname simpleicon@flydotioicon\endcsname {\simpleiconsmapfour\symbol{203}} + \expandafter\def\csname simpleicon@flywayicon\endcsname {\simpleiconsmapfour\symbol{204}} + \expandafter\def\csname simpleicon@fmodicon\endcsname {\simpleiconsmapfour\symbol{205}} + \expandafter\def\csname simpleicon@fnacicon\endcsname {\simpleiconsmapfour\symbol{206}} + \expandafter\def\csname simpleicon@foliumicon\endcsname {\simpleiconsmapfour\symbol{207}} + \expandafter\def\csname simpleicon@fonomaicon\endcsname {\simpleiconsmapfour\symbol{208}} + \expandafter\def\csname simpleicon@fontawesomeicon\endcsname {\simpleiconsmapfour\symbol{209}} + \expandafter\def\csname simpleicon@fontbaseicon\endcsname {\simpleiconsmapfour\symbol{210}} + \expandafter\def\csname simpleicon@fontforgeicon\endcsname {\simpleiconsmapfour\symbol{211}} + \expandafter\def\csname simpleicon@foobar2000icon\endcsname {\simpleiconsmapfour\symbol{212}} + \expandafter\def\csname simpleicon@foodpandaicon\endcsname {\simpleiconsmapfour\symbol{213}} + \expandafter\def\csname simpleicon@fordicon\endcsname {\simpleiconsmapfour\symbol{214}} + \expandafter\def\csname simpleicon@forgejoicon\endcsname {\simpleiconsmapfour\symbol{215}} + \expandafter\def\csname simpleicon@formikicon\endcsname {\simpleiconsmapfour\symbol{216}} + \expandafter\def\csname simpleicon@formspreeicon\endcsname {\simpleiconsmapfour\symbol{217}} + \expandafter\def\csname simpleicon@formstackicon\endcsname {\simpleiconsmapfour\symbol{218}} + \expandafter\def\csname simpleicon@fortineticon\endcsname {\simpleiconsmapfour\symbol{219}} + \expandafter\def\csname simpleicon@fortranicon\endcsname {\simpleiconsmapfour\symbol{220}} + \expandafter\def\csname simpleicon@fossaicon\endcsname {\simpleiconsmapfour\symbol{221}} + \expandafter\def\csname simpleicon@fossilscmicon\endcsname {\simpleiconsmapfour\symbol{222}} + \expandafter\def\csname simpleicon@foundryvirtualtabletopicon\endcsname {\simpleiconsmapfour\symbol{223}} + \expandafter\def\csname simpleicon@foursquareicon\endcsname {\simpleiconsmapfour\symbol{224}} + \expandafter\def\csname simpleicon@foursquarecityguideicon\endcsname {\simpleiconsmapfour\symbol{225}} + \expandafter\def\csname simpleicon@foxicon\endcsname {\simpleiconsmapfour\symbol{226}} + \expandafter\def\csname simpleicon@foxtelicon\endcsname {\simpleiconsmapfour\symbol{227}} + \expandafter\def\csname simpleicon@fozzyicon\endcsname {\simpleiconsmapfour\symbol{228}} + \expandafter\def\csname simpleicon@framericon\endcsname {\simpleiconsmapfour\symbol{229}} + \expandafter\def\csname simpleicon@frameworkicon\endcsname {\simpleiconsmapfour\symbol{230}} + \expandafter\def\csname simpleicon@framework7icon\endcsname {\simpleiconsmapfour\symbol{231}} + \expandafter\def\csname simpleicon@franprixicon\endcsname {\simpleiconsmapfour\symbol{232}} + \expandafter\def\csname simpleicon@frappeicon\endcsname {\simpleiconsmapfour\symbol{233}} + \expandafter\def\csname simpleicon@fraunhofergesellschafticon\endcsname {\simpleiconsmapfour\symbol{234}} + \expandafter\def\csname simpleicon@freebsdicon\endcsname {\simpleiconsmapfour\symbol{235}} + \expandafter\def\csname simpleicon@freecadicon\endcsname {\simpleiconsmapfour\symbol{236}} + \expandafter\def\csname simpleicon@freecodecampicon\endcsname {\simpleiconsmapfour\symbol{237}} + \expandafter\def\csname simpleicon@freedesktopdotorgicon\endcsname {\simpleiconsmapfour\symbol{238}} + \expandafter\def\csname simpleicon@freelancericon\endcsname {\simpleiconsmapfour\symbol{239}} + \expandafter\def\csname simpleicon@freelancermapicon\endcsname {\simpleiconsmapfour\symbol{240}} + \expandafter\def\csname simpleicon@freenasicon\endcsname {\simpleiconsmapfour\symbol{241}} + \expandafter\def\csname simpleicon@freepikicon\endcsname {\simpleiconsmapfour\symbol{242}} + \expandafter\def\csname simpleicon@frontendmentoricon\endcsname {\simpleiconsmapfour\symbol{243}} + \expandafter\def\csname simpleicon@frontifyicon\endcsname {\simpleiconsmapfour\symbol{244}} + \expandafter\def\csname simpleicon@fsecureicon\endcsname {\simpleiconsmapfour\symbol{245}} + \expandafter\def\csname simpleicon@fsharpicon\endcsname {\simpleiconsmapfour\symbol{246}} + \expandafter\def\csname simpleicon@fuboicon\endcsname {\simpleiconsmapfour\symbol{247}} + \expandafter\def\csname simpleicon@fuelericon\endcsname {\simpleiconsmapfour\symbol{248}} + \expandafter\def\csname simpleicon@fugacloudicon\endcsname {\simpleiconsmapfour\symbol{249}} + \expandafter\def\csname simpleicon@fujifilmicon\endcsname {\simpleiconsmapfour\symbol{250}} + \expandafter\def\csname simpleicon@fujitsuicon\endcsname {\simpleiconsmapfour\symbol{251}} + \expandafter\def\csname simpleicon@funimationicon\endcsname {\simpleiconsmapfour\symbol{252}} + \expandafter\def\csname simpleicon@furaffinityicon\endcsname {\simpleiconsmapfour\symbol{253}} + \expandafter\def\csname simpleicon@furrynetworkicon\endcsname {\simpleiconsmapfour\symbol{254}} + \expandafter\def\csname simpleicon@fusionauthicon\endcsname {\simpleiconsmapfour\symbol{255}} + \expandafter\def\csname simpleicon@futurelearnicon\endcsname {\simpleiconsmapfive\symbol{0}} + \expandafter\def\csname simpleicon@g2icon\endcsname {\simpleiconsmapfive\symbol{1}} + \expandafter\def\csname simpleicon@g2aicon\endcsname {\simpleiconsmapfive\symbol{2}} + \expandafter\def\csname simpleicon@g2gicon\endcsname {\simpleiconsmapfive\symbol{3}} + \expandafter\def\csname simpleicon@galaxusicon\endcsname {\simpleiconsmapfive\symbol{4}} + \expandafter\def\csname simpleicon@gameandwatchicon\endcsname {\simpleiconsmapfive\symbol{5}} + \expandafter\def\csname simpleicon@gamebananaicon\endcsname {\simpleiconsmapfive\symbol{6}} + \expandafter\def\csname simpleicon@gamedevelopericon\endcsname {\simpleiconsmapfive\symbol{7}} + \expandafter\def\csname simpleicon@gamejolticon\endcsname {\simpleiconsmapfive\symbol{8}} + \expandafter\def\csname simpleicon@gamelofticon\endcsname {\simpleiconsmapfive\symbol{9}} + \expandafter\def\csname simpleicon@gamemakericon\endcsname {\simpleiconsmapfive\symbol{10}} + \expandafter\def\csname simpleicon@garminicon\endcsname {\simpleiconsmapfive\symbol{11}} + \expandafter\def\csname simpleicon@gatlingicon\endcsname {\simpleiconsmapfive\symbol{12}} + \expandafter\def\csname simpleicon@gatsbyicon\endcsname {\simpleiconsmapfive\symbol{13}} + \expandafter\def\csname simpleicon@gcoreicon\endcsname {\simpleiconsmapfive\symbol{14}} + \expandafter\def\csname simpleicon@gdalicon\endcsname {\simpleiconsmapfive\symbol{15}} + \expandafter\def\csname simpleicon@geanticon\endcsname {\simpleiconsmapfive\symbol{16}} + \expandafter\def\csname simpleicon@geeksforgeeksicon\endcsname {\simpleiconsmapfive\symbol{17}} + \expandafter\def\csname simpleicon@generalelectricicon\endcsname {\simpleiconsmapfive\symbol{18}} + \expandafter\def\csname simpleicon@generalmotorsicon\endcsname {\simpleiconsmapfive\symbol{19}} + \expandafter\def\csname simpleicon@geniusicon\endcsname {\simpleiconsmapfive\symbol{20}} + \expandafter\def\csname simpleicon@gentooicon\endcsname {\simpleiconsmapfive\symbol{21}} + \expandafter\def\csname simpleicon@geocachingicon\endcsname {\simpleiconsmapfive\symbol{22}} + \expandafter\def\csname simpleicon@geodeicon\endcsname {\simpleiconsmapfive\symbol{23}} + \expandafter\def\csname simpleicon@geopandasicon\endcsname {\simpleiconsmapfive\symbol{24}} + \expandafter\def\csname simpleicon@gerriticon\endcsname {\simpleiconsmapfive\symbol{25}} + \expandafter\def\csname simpleicon@getxicon\endcsname {\simpleiconsmapfive\symbol{26}} + \expandafter\def\csname simpleicon@ghosticon\endcsname {\simpleiconsmapfive\symbol{27}} + \expandafter\def\csname simpleicon@ghosteryicon\endcsname {\simpleiconsmapfive\symbol{28}} + \expandafter\def\csname simpleicon@gimpicon\endcsname {\simpleiconsmapfive\symbol{29}} + \expandafter\def\csname simpleicon@ginicon\endcsname {\simpleiconsmapfive\symbol{30}} + \expandafter\def\csname simpleicon@giphyicon\endcsname {\simpleiconsmapfive\symbol{31}} + \expandafter\def\csname simpleicon@giticon\endcsname {\simpleiconsmapfive\symbol{32}} + \expandafter\def\csname simpleicon@gitbookicon\endcsname {\simpleiconsmapfive\symbol{33}} + \expandafter\def\csname simpleicon@gitconnectedicon\endcsname {\simpleiconsmapfive\symbol{34}} + \expandafter\def\csname simpleicon@giteaicon\endcsname {\simpleiconsmapfive\symbol{35}} + \expandafter\def\csname simpleicon@giteeicon\endcsname {\simpleiconsmapfive\symbol{36}} + \expandafter\def\csname simpleicon@gitextensionsicon\endcsname {\simpleiconsmapfive\symbol{37}} + \expandafter\def\csname simpleicon@gitforwindowsicon\endcsname {\simpleiconsmapfive\symbol{38}} + \expandafter\def\csname simpleicon@githubicon\endcsname {\simpleiconsmapfive\symbol{39}} + \expandafter\def\csname simpleicon@githubactionsicon\endcsname {\simpleiconsmapfive\symbol{40}} + \expandafter\def\csname simpleicon@githubcopiloticon\endcsname {\simpleiconsmapfive\symbol{41}} + \expandafter\def\csname simpleicon@githubpagesicon\endcsname {\simpleiconsmapfive\symbol{42}} + \expandafter\def\csname simpleicon@githubsponsorsicon\endcsname {\simpleiconsmapfive\symbol{43}} + \expandafter\def\csname simpleicon@gitignoredotioicon\endcsname {\simpleiconsmapfive\symbol{44}} + \expandafter\def\csname simpleicon@gitkrakenicon\endcsname {\simpleiconsmapfive\symbol{45}} + \expandafter\def\csname simpleicon@gitlabicon\endcsname {\simpleiconsmapfive\symbol{46}} + \expandafter\def\csname simpleicon@gitlfsicon\endcsname {\simpleiconsmapfive\symbol{47}} + \expandafter\def\csname simpleicon@gitpodicon\endcsname {\simpleiconsmapfive\symbol{48}} + \expandafter\def\csname simpleicon@gittericon\endcsname {\simpleiconsmapfive\symbol{49}} + \expandafter\def\csname simpleicon@glassdooricon\endcsname {\simpleiconsmapfive\symbol{50}} + \expandafter\def\csname simpleicon@glideicon\endcsname {\simpleiconsmapfive\symbol{51}} + \expandafter\def\csname simpleicon@glitchicon\endcsname {\simpleiconsmapfive\symbol{52}} + \expandafter\def\csname simpleicon@globusicon\endcsname {\simpleiconsmapfive\symbol{53}} + \expandafter\def\csname simpleicon@glovoicon\endcsname {\simpleiconsmapfive\symbol{54}} + \expandafter\def\csname simpleicon@gltficon\endcsname {\simpleiconsmapfive\symbol{55}} + \expandafter\def\csname simpleicon@gmailicon\endcsname {\simpleiconsmapfive\symbol{56}} + \expandafter\def\csname simpleicon@gnomeicon\endcsname {\simpleiconsmapfive\symbol{57}} + \expandafter\def\csname simpleicon@gnometerminalicon\endcsname {\simpleiconsmapfive\symbol{58}} + \expandafter\def\csname simpleicon@gnuicon\endcsname {\simpleiconsmapfive\symbol{59}} + \expandafter\def\csname simpleicon@gnubashicon\endcsname {\simpleiconsmapfive\symbol{60}} + \expandafter\def\csname simpleicon@gnuemacsicon\endcsname {\simpleiconsmapfive\symbol{61}} + \expandafter\def\csname simpleicon@gnuicecaticon\endcsname {\simpleiconsmapfive\symbol{62}} + \expandafter\def\csname simpleicon@gnuprivacyguardicon\endcsname {\simpleiconsmapfive\symbol{63}} + \expandafter\def\csname simpleicon@gnusocialicon\endcsname {\simpleiconsmapfive\symbol{64}} + \expandafter\def\csname simpleicon@goicon\endcsname {\simpleiconsmapfive\symbol{65}} + \expandafter\def\csname simpleicon@gocdicon\endcsname {\simpleiconsmapfive\symbol{66}} + \expandafter\def\csname simpleicon@godaddyicon\endcsname {\simpleiconsmapfive\symbol{67}} + \expandafter\def\csname simpleicon@godotengineicon\endcsname {\simpleiconsmapfive\symbol{68}} + \expandafter\def\csname simpleicon@gofundmeicon\endcsname {\simpleiconsmapfive\symbol{69}} + \expandafter\def\csname simpleicon@gogdotcomicon\endcsname {\simpleiconsmapfive\symbol{70}} + \expandafter\def\csname simpleicon@gojekicon\endcsname {\simpleiconsmapfive\symbol{71}} + \expandafter\def\csname simpleicon@golandicon\endcsname {\simpleiconsmapfive\symbol{72}} + \expandafter\def\csname simpleicon@goldenlineicon\endcsname {\simpleiconsmapfive\symbol{73}} + \expandafter\def\csname simpleicon@goldmansachsicon\endcsname {\simpleiconsmapfive\symbol{74}} + \expandafter\def\csname simpleicon@goodreadsicon\endcsname {\simpleiconsmapfive\symbol{75}} + \expandafter\def\csname simpleicon@googleicon\endcsname {\simpleiconsmapfive\symbol{76}} + \expandafter\def\csname simpleicon@googleadmobicon\endcsname {\simpleiconsmapfive\symbol{77}} + \expandafter\def\csname simpleicon@googleadsicon\endcsname {\simpleiconsmapfive\symbol{78}} + \expandafter\def\csname simpleicon@googleadsenseicon\endcsname {\simpleiconsmapfive\symbol{79}} + \expandafter\def\csname simpleicon@googleanalyticsicon\endcsname {\simpleiconsmapfive\symbol{80}} + \expandafter\def\csname simpleicon@googleappsscripticon\endcsname {\simpleiconsmapfive\symbol{81}} + \expandafter\def\csname simpleicon@googleassistanticon\endcsname {\simpleiconsmapfive\symbol{82}} + \expandafter\def\csname simpleicon@googleauthenticatoricon\endcsname {\simpleiconsmapfive\symbol{83}} + \expandafter\def\csname simpleicon@googlebigqueryicon\endcsname {\simpleiconsmapfive\symbol{84}} + \expandafter\def\csname simpleicon@googlebigtableicon\endcsname {\simpleiconsmapfive\symbol{85}} + \expandafter\def\csname simpleicon@googlecalendaricon\endcsname {\simpleiconsmapfive\symbol{86}} + \expandafter\def\csname simpleicon@googlecampaignmanager360icon\endcsname {\simpleiconsmapfive\symbol{87}} + \expandafter\def\csname simpleicon@googlecardboardicon\endcsname {\simpleiconsmapfive\symbol{88}} + \expandafter\def\csname simpleicon@googlechaticon\endcsname {\simpleiconsmapfive\symbol{89}} + \expandafter\def\csname simpleicon@googlechromeicon\endcsname {\simpleiconsmapfive\symbol{90}} + \expandafter\def\csname simpleicon@googlechronicleicon\endcsname {\simpleiconsmapfive\symbol{91}} + \expandafter\def\csname simpleicon@googleclassroomicon\endcsname {\simpleiconsmapfive\symbol{92}} + \expandafter\def\csname simpleicon@googlecloudicon\endcsname {\simpleiconsmapfive\symbol{93}} + \expandafter\def\csname simpleicon@googlecloudcomposericon\endcsname {\simpleiconsmapfive\symbol{94}} + \expandafter\def\csname simpleicon@googlecloudspannericon\endcsname {\simpleiconsmapfive\symbol{95}} + \expandafter\def\csname simpleicon@googlecloudstorageicon\endcsname {\simpleiconsmapfive\symbol{96}} + \expandafter\def\csname simpleicon@googlecolabicon\endcsname {\simpleiconsmapfive\symbol{97}} + \expandafter\def\csname simpleicon@googlecontaineroptimizedosicon\endcsname {\simpleiconsmapfive\symbol{98}} + \expandafter\def\csname simpleicon@googledataflowicon\endcsname {\simpleiconsmapfive\symbol{99}} + \expandafter\def\csname simpleicon@googledataprocicon\endcsname {\simpleiconsmapfive\symbol{100}} + \expandafter\def\csname simpleicon@googledatastudioicon\endcsname {\simpleiconsmapfive\symbol{101}} + \expandafter\def\csname simpleicon@googledisplayandvideo360icon\endcsname {\simpleiconsmapfive\symbol{102}} + \expandafter\def\csname simpleicon@googledocsicon\endcsname {\simpleiconsmapfive\symbol{103}} + \expandafter\def\csname simpleicon@googledriveicon\endcsname {\simpleiconsmapfive\symbol{104}} + \expandafter\def\csname simpleicon@googleearthicon\endcsname {\simpleiconsmapfive\symbol{105}} + \expandafter\def\csname simpleicon@googleearthengineicon\endcsname {\simpleiconsmapfive\symbol{106}} + \expandafter\def\csname simpleicon@googlefiticon\endcsname {\simpleiconsmapfive\symbol{107}} + \expandafter\def\csname simpleicon@googlefontsicon\endcsname {\simpleiconsmapfive\symbol{108}} + \expandafter\def\csname simpleicon@googleformsicon\endcsname {\simpleiconsmapfive\symbol{109}} + \expandafter\def\csname simpleicon@googlegeminiicon\endcsname {\simpleiconsmapfive\symbol{110}} + \expandafter\def\csname simpleicon@googlehomeicon\endcsname {\simpleiconsmapfive\symbol{111}} + \expandafter\def\csname simpleicon@googlekeepicon\endcsname {\simpleiconsmapfive\symbol{112}} + \expandafter\def\csname simpleicon@googlelensicon\endcsname {\simpleiconsmapfive\symbol{113}} + \expandafter\def\csname simpleicon@googlemapsicon\endcsname {\simpleiconsmapfive\symbol{114}} + \expandafter\def\csname simpleicon@googlemarketingplatformicon\endcsname {\simpleiconsmapfive\symbol{115}} + \expandafter\def\csname simpleicon@googlemeeticon\endcsname {\simpleiconsmapfive\symbol{116}} + \expandafter\def\csname simpleicon@googlemessagesicon\endcsname {\simpleiconsmapfive\symbol{117}} + \expandafter\def\csname simpleicon@googlenearbyicon\endcsname {\simpleiconsmapfive\symbol{118}} + \expandafter\def\csname simpleicon@googlenewsicon\endcsname {\simpleiconsmapfive\symbol{119}} + \expandafter\def\csname simpleicon@googlepayicon\endcsname {\simpleiconsmapfive\symbol{120}} + \expandafter\def\csname simpleicon@googlephotosicon\endcsname {\simpleiconsmapfive\symbol{121}} + \expandafter\def\csname simpleicon@googleplayicon\endcsname {\simpleiconsmapfive\symbol{122}} + \expandafter\def\csname simpleicon@googlepubsubicon\endcsname {\simpleiconsmapfive\symbol{123}} + \expandafter\def\csname simpleicon@googlescholaricon\endcsname {\simpleiconsmapfive\symbol{124}} + \expandafter\def\csname simpleicon@googlesearchconsoleicon\endcsname {\simpleiconsmapfive\symbol{125}} + \expandafter\def\csname simpleicon@googlesheetsicon\endcsname {\simpleiconsmapfive\symbol{126}} + \expandafter\def\csname simpleicon@googleslidesicon\endcsname {\simpleiconsmapfive\symbol{127}} + \expandafter\def\csname simpleicon@googlestreetviewicon\endcsname {\simpleiconsmapfive\symbol{128}} + \expandafter\def\csname simpleicon@googletagmanagericon\endcsname {\simpleiconsmapfive\symbol{129}} + \expandafter\def\csname simpleicon@googletasksicon\endcsname {\simpleiconsmapfive\symbol{130}} + \expandafter\def\csname simpleicon@googletranslateicon\endcsname {\simpleiconsmapfive\symbol{131}} + \expandafter\def\csname simpleicon@gotomeetingicon\endcsname {\simpleiconsmapfive\symbol{132}} + \expandafter\def\csname simpleicon@grabicon\endcsname {\simpleiconsmapfive\symbol{133}} + \expandafter\def\csname simpleicon@gradleicon\endcsname {\simpleiconsmapfive\symbol{134}} + \expandafter\def\csname simpleicon@gradleplaypublishericon\endcsname {\simpleiconsmapfive\symbol{135}} + \expandafter\def\csname simpleicon@grafanaicon\endcsname {\simpleiconsmapfive\symbol{136}} + \expandafter\def\csname simpleicon@grammarlyicon\endcsname {\simpleiconsmapfive\symbol{137}} + \expandafter\def\csname simpleicon@grandfraisicon\endcsname {\simpleiconsmapfive\symbol{138}} + \expandafter\def\csname simpleicon@grapheneosicon\endcsname {\simpleiconsmapfive\symbol{139}} + \expandafter\def\csname simpleicon@graphiteicon\endcsname {\simpleiconsmapfive\symbol{140}} + \expandafter\def\csname simpleicon@graphqlicon\endcsname {\simpleiconsmapfive\symbol{141}} + \expandafter\def\csname simpleicon@gravicon\endcsname {\simpleiconsmapfive\symbol{142}} + \expandafter\def\csname simpleicon@gravataricon\endcsname {\simpleiconsmapfive\symbol{143}} + \expandafter\def\csname simpleicon@graylogicon\endcsname {\simpleiconsmapfive\symbol{144}} + \expandafter\def\csname simpleicon@greasyforkicon\endcsname {\simpleiconsmapfive\symbol{145}} + \expandafter\def\csname simpleicon@greatlearningicon\endcsname {\simpleiconsmapfive\symbol{146}} + \expandafter\def\csname simpleicon@greenhouseicon\endcsname {\simpleiconsmapfive\symbol{147}} + \expandafter\def\csname simpleicon@greensockicon\endcsname {\simpleiconsmapfive\symbol{148}} + \expandafter\def\csname simpleicon@griddotaiicon\endcsname {\simpleiconsmapfive\symbol{149}} + \expandafter\def\csname simpleicon@gridsomeicon\endcsname {\simpleiconsmapfive\symbol{150}} + \expandafter\def\csname simpleicon@groupmeicon\endcsname {\simpleiconsmapfive\symbol{151}} + \expandafter\def\csname simpleicon@grouponicon\endcsname {\simpleiconsmapfive\symbol{152}} + \expandafter\def\csname simpleicon@grubhubicon\endcsname {\simpleiconsmapfive\symbol{153}} + \expandafter\def\csname simpleicon@grunticon\endcsname {\simpleiconsmapfive\symbol{154}} + \expandafter\def\csname simpleicon@gskicon\endcsname {\simpleiconsmapfive\symbol{155}} + \expandafter\def\csname simpleicon@gsmarenadotcomicon\endcsname {\simpleiconsmapfive\symbol{156}} + \expandafter\def\csname simpleicon@gstreamericon\endcsname {\simpleiconsmapfive\symbol{157}} + \expandafter\def\csname simpleicon@gtkicon\endcsname {\simpleiconsmapfive\symbol{158}} + \expandafter\def\csname simpleicon@guangzhoumetroicon\endcsname {\simpleiconsmapfive\symbol{159}} + \expandafter\def\csname simpleicon@guildedicon\endcsname {\simpleiconsmapfive\symbol{160}} + \expandafter\def\csname simpleicon@gulpicon\endcsname {\simpleiconsmapfive\symbol{161}} + \expandafter\def\csname simpleicon@gumroadicon\endcsname {\simpleiconsmapfive\symbol{162}} + \expandafter\def\csname simpleicon@gumtreeicon\endcsname {\simpleiconsmapfive\symbol{163}} + \expandafter\def\csname simpleicon@gunicornicon\endcsname {\simpleiconsmapfive\symbol{164}} + \expandafter\def\csname simpleicon@gurobiicon\endcsname {\simpleiconsmapfive\symbol{165}} + \expandafter\def\csname simpleicon@gustoicon\endcsname {\simpleiconsmapfive\symbol{166}} + \expandafter\def\csname simpleicon@gutenbergicon\endcsname {\simpleiconsmapfive\symbol{167}} + \expandafter\def\csname simpleicon@h3icon\endcsname {\simpleiconsmapfive\symbol{168}} + \expandafter\def\csname simpleicon@habricon\endcsname {\simpleiconsmapfive\symbol{169}} + \expandafter\def\csname simpleicon@hackadayicon\endcsname {\simpleiconsmapfive\symbol{170}} + \expandafter\def\csname simpleicon@hackclubicon\endcsname {\simpleiconsmapfive\symbol{171}} + \expandafter\def\csname simpleicon@hackerearthicon\endcsname {\simpleiconsmapfive\symbol{172}} + \expandafter\def\csname simpleicon@hackernoonicon\endcsname {\simpleiconsmapfive\symbol{173}} + \expandafter\def\csname simpleicon@hackeroneicon\endcsname {\simpleiconsmapfive\symbol{174}} + \expandafter\def\csname simpleicon@hackerrankicon\endcsname {\simpleiconsmapfive\symbol{175}} + \expandafter\def\csname simpleicon@hackstericon\endcsname {\simpleiconsmapfive\symbol{176}} + \expandafter\def\csname simpleicon@hacktheboxicon\endcsname {\simpleiconsmapfive\symbol{177}} + \expandafter\def\csname simpleicon@halicon\endcsname {\simpleiconsmapfive\symbol{178}} + \expandafter\def\csname simpleicon@handlebarsdotjsicon\endcsname {\simpleiconsmapfive\symbol{179}} + \expandafter\def\csname simpleicon@handmicon\endcsname {\simpleiconsmapfive\symbol{180}} + \expandafter\def\csname simpleicon@handshakeicon\endcsname {\simpleiconsmapfive\symbol{181}} + \expandafter\def\csname simpleicon@handshakeprotocolicon\endcsname {\simpleiconsmapfive\symbol{182}} + \expandafter\def\csname simpleicon@happycowicon\endcsname {\simpleiconsmapfive\symbol{183}} + \expandafter\def\csname simpleicon@harboricon\endcsname {\simpleiconsmapfive\symbol{184}} + \expandafter\def\csname simpleicon@harmonyosicon\endcsname {\simpleiconsmapfive\symbol{185}} + \expandafter\def\csname simpleicon@hashicorpicon\endcsname {\simpleiconsmapfive\symbol{186}} + \expandafter\def\csname simpleicon@hashnodeicon\endcsname {\simpleiconsmapfive\symbol{187}} + \expandafter\def\csname simpleicon@haskellicon\endcsname {\simpleiconsmapfive\symbol{188}} + \expandafter\def\csname simpleicon@hasuraicon\endcsname {\simpleiconsmapfive\symbol{189}} + \expandafter\def\csname simpleicon@hatenabookmarkicon\endcsname {\simpleiconsmapfive\symbol{190}} + \expandafter\def\csname simpleicon@haveibeenpwnedicon\endcsname {\simpleiconsmapfive\symbol{191}} + \expandafter\def\csname simpleicon@haxeicon\endcsname {\simpleiconsmapfive\symbol{192}} + \expandafter\def\csname simpleicon@hboicon\endcsname {\simpleiconsmapfive\symbol{193}} + \expandafter\def\csname simpleicon@hclicon\endcsname {\simpleiconsmapfive\symbol{194}} + \expandafter\def\csname simpleicon@hdfcbankicon\endcsname {\simpleiconsmapfive\symbol{195}} + \expandafter\def\csname simpleicon@headlessuiicon\endcsname {\simpleiconsmapfive\symbol{196}} + \expandafter\def\csname simpleicon@headphonezoneicon\endcsname {\simpleiconsmapfive\symbol{197}} + \expandafter\def\csname simpleicon@headspaceicon\endcsname {\simpleiconsmapfive\symbol{198}} + \expandafter\def\csname simpleicon@hearthicon\endcsname {\simpleiconsmapfive\symbol{199}} + \expandafter\def\csname simpleicon@hearthisdotaticon\endcsname {\simpleiconsmapfive\symbol{200}} + \expandafter\def\csname simpleicon@hederaicon\endcsname {\simpleiconsmapfive\symbol{201}} + \expandafter\def\csname simpleicon@heliumicon\endcsname {\simpleiconsmapfive\symbol{202}} + \expandafter\def\csname simpleicon@hellofreshicon\endcsname {\simpleiconsmapfive\symbol{203}} + \expandafter\def\csname simpleicon@hellyhansenicon\endcsname {\simpleiconsmapfive\symbol{204}} + \expandafter\def\csname simpleicon@helmicon\endcsname {\simpleiconsmapfive\symbol{205}} + \expandafter\def\csname simpleicon@helpdeskicon\endcsname {\simpleiconsmapfive\symbol{206}} + \expandafter\def\csname simpleicon@helpscouticon\endcsname {\simpleiconsmapfive\symbol{207}} + \expandafter\def\csname simpleicon@hepsiemlakicon\endcsname {\simpleiconsmapfive\symbol{208}} + \expandafter\def\csname simpleicon@hereicon\endcsname {\simpleiconsmapfive\symbol{209}} + \expandafter\def\csname simpleicon@herokuicon\endcsname {\simpleiconsmapfive\symbol{210}} + \expandafter\def\csname simpleicon@hetznericon\endcsname {\simpleiconsmapfive\symbol{211}} + \expandafter\def\csname simpleicon@hevyicon\endcsname {\simpleiconsmapfive\symbol{212}} + \expandafter\def\csname simpleicon@hexleticon\endcsname {\simpleiconsmapfive\symbol{213}} + \expandafter\def\csname simpleicon@hexoicon\endcsname {\simpleiconsmapfive\symbol{214}} + \expandafter\def\csname simpleicon@heyicon\endcsname {\simpleiconsmapfive\symbol{215}} + \expandafter\def\csname simpleicon@hibernateicon\endcsname {\simpleiconsmapfive\symbol{216}} + \expandafter\def\csname simpleicon@hibobicon\endcsname {\simpleiconsmapfive\symbol{217}} + \expandafter\def\csname simpleicon@hiltonicon\endcsname {\simpleiconsmapfive\symbol{218}} + \expandafter\def\csname simpleicon@hiltonhotelsandresortsicon\endcsname {\simpleiconsmapfive\symbol{219}} + \expandafter\def\csname simpleicon@hitachiicon\endcsname {\simpleiconsmapfive\symbol{220}} + \expandafter\def\csname simpleicon@hiveicon\endcsname {\simpleiconsmapfive\symbol{221}} + \expandafter\def\csname simpleicon@hiveblockchainicon\endcsname {\simpleiconsmapfive\symbol{222}} + \expandafter\def\csname simpleicon@hivemqicon\endcsname {\simpleiconsmapfive\symbol{223}} + \expandafter\def\csname simpleicon@homarricon\endcsname {\simpleiconsmapfive\symbol{224}} + \expandafter\def\csname simpleicon@homeadvisoricon\endcsname {\simpleiconsmapfive\symbol{225}} + \expandafter\def\csname simpleicon@homeassistanticon\endcsname {\simpleiconsmapfive\symbol{226}} + \expandafter\def\csname simpleicon@homeassistantcommunitystoreicon\endcsname {\simpleiconsmapfive\symbol{227}} + \expandafter\def\csname simpleicon@homebrewicon\endcsname {\simpleiconsmapfive\symbol{228}} + \expandafter\def\csname simpleicon@homebridgeicon\endcsname {\simpleiconsmapfive\symbol{229}} + \expandafter\def\csname simpleicon@homepageicon\endcsname {\simpleiconsmapfive\symbol{230}} + \expandafter\def\csname simpleicon@homifyicon\endcsname {\simpleiconsmapfive\symbol{231}} + \expandafter\def\csname simpleicon@hondaicon\endcsname {\simpleiconsmapfive\symbol{232}} + \expandafter\def\csname simpleicon@honeyicon\endcsname {\simpleiconsmapfive\symbol{233}} + \expandafter\def\csname simpleicon@honoicon\endcsname {\simpleiconsmapfive\symbol{234}} + \expandafter\def\csname simpleicon@honoricon\endcsname {\simpleiconsmapfive\symbol{235}} + \expandafter\def\csname simpleicon@hootsuiteicon\endcsname {\simpleiconsmapfive\symbol{236}} + \expandafter\def\csname simpleicon@hoppscotchicon\endcsname {\simpleiconsmapfive\symbol{237}} + \expandafter\def\csname simpleicon@hostingericon\endcsname {\simpleiconsmapfive\symbol{238}} + \expandafter\def\csname simpleicon@hotelsdotcomicon\endcsname {\simpleiconsmapfive\symbol{239}} + \expandafter\def\csname simpleicon@hotjaricon\endcsname {\simpleiconsmapfive\symbol{240}} + \expandafter\def\csname simpleicon@hotwireicon\endcsname {\simpleiconsmapfive\symbol{241}} + \expandafter\def\csname simpleicon@houdiniicon\endcsname {\simpleiconsmapfive\symbol{242}} + \expandafter\def\csname simpleicon@houzzicon\endcsname {\simpleiconsmapfive\symbol{243}} + \expandafter\def\csname simpleicon@hpicon\endcsname {\simpleiconsmapfive\symbol{244}} + \expandafter\def\csname simpleicon@hsbcicon\endcsname {\simpleiconsmapfive\symbol{245}} + \expandafter\def\csname simpleicon@html5icon\endcsname {\simpleiconsmapfive\symbol{246}} + \expandafter\def\csname simpleicon@htmlacademyicon\endcsname {\simpleiconsmapfive\symbol{247}} + \expandafter\def\csname simpleicon@htmxicon\endcsname {\simpleiconsmapfive\symbol{248}} + \expandafter\def\csname simpleicon@htopicon\endcsname {\simpleiconsmapfive\symbol{249}} + \expandafter\def\csname simpleicon@httpieicon\endcsname {\simpleiconsmapfive\symbol{250}} + \expandafter\def\csname simpleicon@huaweiicon\endcsname {\simpleiconsmapfive\symbol{251}} + \expandafter\def\csname simpleicon@hubspoticon\endcsname {\simpleiconsmapfive\symbol{252}} + \expandafter\def\csname simpleicon@huggingfaceicon\endcsname {\simpleiconsmapfive\symbol{253}} + \expandafter\def\csname simpleicon@hugoicon\endcsname {\simpleiconsmapfive\symbol{254}} + \expandafter\def\csname simpleicon@humblebundleicon\endcsname {\simpleiconsmapfive\symbol{255}} + \expandafter\def\csname simpleicon@humhubicon\endcsname {\simpleiconsmapsix\symbol{0}} + \expandafter\def\csname simpleicon@hungryjacksicon\endcsname {\simpleiconsmapsix\symbol{1}} + \expandafter\def\csname simpleicon@husqvarnaicon\endcsname {\simpleiconsmapsix\symbol{2}} + \expandafter\def\csname simpleicon@hypericon\endcsname {\simpleiconsmapsix\symbol{3}} + \expandafter\def\csname simpleicon@hyperskillicon\endcsname {\simpleiconsmapsix\symbol{4}} + \expandafter\def\csname simpleicon@hypothesisicon\endcsname {\simpleiconsmapsix\symbol{5}} + \expandafter\def\csname simpleicon@hyprlandicon\endcsname {\simpleiconsmapsix\symbol{6}} + \expandafter\def\csname simpleicon@hyundaiicon\endcsname {\simpleiconsmapsix\symbol{7}} + \expandafter\def\csname simpleicon@i18nexticon\endcsname {\simpleiconsmapsix\symbol{8}} + \expandafter\def\csname simpleicon@i3icon\endcsname {\simpleiconsmapsix\symbol{9}} + \expandafter\def\csname simpleicon@iataicon\endcsname {\simpleiconsmapsix\symbol{10}} + \expandafter\def\csname simpleicon@ibeaconicon\endcsname {\simpleiconsmapsix\symbol{11}} + \expandafter\def\csname simpleicon@iberiaicon\endcsname {\simpleiconsmapsix\symbol{12}} + \expandafter\def\csname simpleicon@icedicon\endcsname {\simpleiconsmapsix\symbol{13}} + \expandafter\def\csname simpleicon@icelandicon\endcsname {\simpleiconsmapsix\symbol{14}} + \expandafter\def\csname simpleicon@icicibankicon\endcsname {\simpleiconsmapsix\symbol{15}} + \expandafter\def\csname simpleicon@icingaicon\endcsname {\simpleiconsmapsix\symbol{16}} + \expandafter\def\csname simpleicon@icloudicon\endcsname {\simpleiconsmapsix\symbol{17}} + \expandafter\def\csname simpleicon@icomoonicon\endcsname {\simpleiconsmapsix\symbol{18}} + \expandafter\def\csname simpleicon@iconicon\endcsname {\simpleiconsmapsix\symbol{19}} + \expandafter\def\csname simpleicon@iconfindericon\endcsname {\simpleiconsmapsix\symbol{20}} + \expandafter\def\csname simpleicon@iconifyicon\endcsname {\simpleiconsmapsix\symbol{21}} + \expandafter\def\csname simpleicon@iconjaricon\endcsname {\simpleiconsmapsix\symbol{22}} + \expandafter\def\csname simpleicon@icons8icon\endcsname {\simpleiconsmapsix\symbol{23}} + \expandafter\def\csname simpleicon@icqicon\endcsname {\simpleiconsmapsix\symbol{24}} + \expandafter\def\csname simpleicon@ieeeicon\endcsname {\simpleiconsmapsix\symbol{25}} + \expandafter\def\csname simpleicon@ifixiticon\endcsname {\simpleiconsmapsix\symbol{26}} + \expandafter\def\csname simpleicon@ifoodicon\endcsname {\simpleiconsmapsix\symbol{27}} + \expandafter\def\csname simpleicon@ifttticon\endcsname {\simpleiconsmapsix\symbol{28}} + \expandafter\def\csname simpleicon@igdbicon\endcsname {\simpleiconsmapsix\symbol{29}} + \expandafter\def\csname simpleicon@ignicon\endcsname {\simpleiconsmapsix\symbol{30}} + \expandafter\def\csname simpleicon@iheartradioicon\endcsname {\simpleiconsmapsix\symbol{31}} + \expandafter\def\csname simpleicon@ikeaicon\endcsname {\simpleiconsmapsix\symbol{32}} + \expandafter\def\csname simpleicon@iledefrancemobilitesicon\endcsname {\simpleiconsmapsix\symbol{33}} + \expandafter\def\csname simpleicon@imagedotscicon\endcsname {\simpleiconsmapsix\symbol{34}} + \expandafter\def\csname simpleicon@imagejicon\endcsname {\simpleiconsmapsix\symbol{35}} + \expandafter\def\csname simpleicon@imdbicon\endcsname {\simpleiconsmapsix\symbol{36}} + \expandafter\def\csname simpleicon@imessageicon\endcsname {\simpleiconsmapsix\symbol{37}} + \expandafter\def\csname simpleicon@imguricon\endcsname {\simpleiconsmapsix\symbol{38}} + \expandafter\def\csname simpleicon@immericon\endcsname {\simpleiconsmapsix\symbol{39}} + \expandafter\def\csname simpleicon@immichicon\endcsname {\simpleiconsmapsix\symbol{40}} + \expandafter\def\csname simpleicon@imouicon\endcsname {\simpleiconsmapsix\symbol{41}} + \expandafter\def\csname simpleicon@improvmxicon\endcsname {\simpleiconsmapsix\symbol{42}} + \expandafter\def\csname simpleicon@indeedicon\endcsname {\simpleiconsmapsix\symbol{43}} + \expandafter\def\csname simpleicon@indiansuperleagueicon\endcsname {\simpleiconsmapsix\symbol{44}} + \expandafter\def\csname simpleicon@indiehackersicon\endcsname {\simpleiconsmapsix\symbol{45}} + \expandafter\def\csname simpleicon@indigoicon\endcsname {\simpleiconsmapsix\symbol{46}} + \expandafter\def\csname simpleicon@inductiveautomationicon\endcsname {\simpleiconsmapsix\symbol{47}} + \expandafter\def\csname simpleicon@inertiaicon\endcsname {\simpleiconsmapsix\symbol{48}} + \expandafter\def\csname simpleicon@infinitiicon\endcsname {\simpleiconsmapsix\symbol{49}} + \expandafter\def\csname simpleicon@influxdbicon\endcsname {\simpleiconsmapsix\symbol{50}} + \expandafter\def\csname simpleicon@infomaniakicon\endcsname {\simpleiconsmapsix\symbol{51}} + \expandafter\def\csname simpleicon@infoqicon\endcsname {\simpleiconsmapsix\symbol{52}} + \expandafter\def\csname simpleicon@informaticaicon\endcsname {\simpleiconsmapsix\symbol{53}} + \expandafter\def\csname simpleicon@infosysicon\endcsname {\simpleiconsmapsix\symbol{54}} + \expandafter\def\csname simpleicon@infracosticon\endcsname {\simpleiconsmapsix\symbol{55}} + \expandafter\def\csname simpleicon@ingressicon\endcsname {\simpleiconsmapsix\symbol{56}} + \expandafter\def\csname simpleicon@inkdropicon\endcsname {\simpleiconsmapsix\symbol{57}} + \expandafter\def\csname simpleicon@inkscapeicon\endcsname {\simpleiconsmapsix\symbol{58}} + \expandafter\def\csname simpleicon@inoreadericon\endcsname {\simpleiconsmapsix\symbol{59}} + \expandafter\def\csname simpleicon@insomniaicon\endcsname {\simpleiconsmapsix\symbol{60}} + \expandafter\def\csname simpleicon@inspireicon\endcsname {\simpleiconsmapsix\symbol{61}} + \expandafter\def\csname simpleicon@insta360icon\endcsname {\simpleiconsmapsix\symbol{62}} + \expandafter\def\csname simpleicon@instacarticon\endcsname {\simpleiconsmapsix\symbol{63}} + \expandafter\def\csname simpleicon@instagramicon\endcsname {\simpleiconsmapsix\symbol{64}} + \expandafter\def\csname simpleicon@instapapericon\endcsname {\simpleiconsmapsix\symbol{65}} + \expandafter\def\csname simpleicon@instatusicon\endcsname {\simpleiconsmapsix\symbol{66}} + \expandafter\def\csname simpleicon@instructablesicon\endcsname {\simpleiconsmapsix\symbol{67}} + \expandafter\def\csname simpleicon@instructureicon\endcsname {\simpleiconsmapsix\symbol{68}} + \expandafter\def\csname simpleicon@intelicon\endcsname {\simpleiconsmapsix\symbol{69}} + \expandafter\def\csname simpleicon@intellijideaicon\endcsname {\simpleiconsmapsix\symbol{70}} + \expandafter\def\csname simpleicon@interactiondesignfoundationicon\endcsname {\simpleiconsmapsix\symbol{71}} + \expandafter\def\csname simpleicon@interactjsicon\endcsname {\simpleiconsmapsix\symbol{72}} + \expandafter\def\csname simpleicon@interbaseicon\endcsname {\simpleiconsmapsix\symbol{73}} + \expandafter\def\csname simpleicon@intercomicon\endcsname {\simpleiconsmapsix\symbol{74}} + \expandafter\def\csname simpleicon@intermarcheicon\endcsname {\simpleiconsmapsix\symbol{75}} + \expandafter\def\csname simpleicon@internetarchiveicon\endcsname {\simpleiconsmapsix\symbol{76}} + \expandafter\def\csname simpleicon@internetcomputericon\endcsname {\simpleiconsmapsix\symbol{77}} + \expandafter\def\csname simpleicon@intigritiicon\endcsname {\simpleiconsmapsix\symbol{78}} + \expandafter\def\csname simpleicon@intuiticon\endcsname {\simpleiconsmapsix\symbol{79}} + \expandafter\def\csname simpleicon@invisionicon\endcsname {\simpleiconsmapsix\symbol{80}} + \expandafter\def\csname simpleicon@invoiceninjaicon\endcsname {\simpleiconsmapsix\symbol{81}} + \expandafter\def\csname simpleicon@iobrokericon\endcsname {\simpleiconsmapsix\symbol{82}} + \expandafter\def\csname simpleicon@ionicicon\endcsname {\simpleiconsmapsix\symbol{83}} + \expandafter\def\csname simpleicon@ionosicon\endcsname {\simpleiconsmapsix\symbol{84}} + \expandafter\def\csname simpleicon@iosicon\endcsname {\simpleiconsmapsix\symbol{85}} + \expandafter\def\csname simpleicon@iotaicon\endcsname {\simpleiconsmapsix\symbol{86}} + \expandafter\def\csname simpleicon@ipfsicon\endcsname {\simpleiconsmapsix\symbol{87}} + \expandafter\def\csname simpleicon@irisicon\endcsname {\simpleiconsmapsix\symbol{88}} + \expandafter\def\csname simpleicon@iroboticon\endcsname {\simpleiconsmapsix\symbol{89}} + \expandafter\def\csname simpleicon@isc2icon\endcsname {\simpleiconsmapsix\symbol{90}} + \expandafter\def\csname simpleicon@issuuicon\endcsname {\simpleiconsmapsix\symbol{91}} + \expandafter\def\csname simpleicon@istioicon\endcsname {\simpleiconsmapsix\symbol{92}} + \expandafter\def\csname simpleicon@itchdotioicon\endcsname {\simpleiconsmapsix\symbol{93}} + \expandafter\def\csname simpleicon@iterm2icon\endcsname {\simpleiconsmapsix\symbol{94}} + \expandafter\def\csname simpleicon@itunesicon\endcsname {\simpleiconsmapsix\symbol{95}} + \expandafter\def\csname simpleicon@itvxicon\endcsname {\simpleiconsmapsix\symbol{96}} + \expandafter\def\csname simpleicon@ivecoicon\endcsname {\simpleiconsmapsix\symbol{97}} + \expandafter\def\csname simpleicon@jabbericon\endcsname {\simpleiconsmapsix\symbol{98}} + \expandafter\def\csname simpleicon@jaegericon\endcsname {\simpleiconsmapsix\symbol{99}} + \expandafter\def\csname simpleicon@jaguaricon\endcsname {\simpleiconsmapsix\symbol{100}} + \expandafter\def\csname simpleicon@jamboardicon\endcsname {\simpleiconsmapsix\symbol{101}} + \expandafter\def\csname simpleicon@jamesonicon\endcsname {\simpleiconsmapsix\symbol{102}} + \expandafter\def\csname simpleicon@jamstackicon\endcsname {\simpleiconsmapsix\symbol{103}} + \expandafter\def\csname simpleicon@jasmineicon\endcsname {\simpleiconsmapsix\symbol{104}} + \expandafter\def\csname simpleicon@javascripticon\endcsname {\simpleiconsmapsix\symbol{105}} + \expandafter\def\csname simpleicon@jblicon\endcsname {\simpleiconsmapsix\symbol{106}} + \expandafter\def\csname simpleicon@jcbicon\endcsname {\simpleiconsmapsix\symbol{107}} + \expandafter\def\csname simpleicon@jeepicon\endcsname {\simpleiconsmapsix\symbol{108}} + \expandafter\def\csname simpleicon@jekyllicon\endcsname {\simpleiconsmapsix\symbol{109}} + \expandafter\def\csname simpleicon@jellyfinicon\endcsname {\simpleiconsmapsix\symbol{110}} + \expandafter\def\csname simpleicon@jenkinsicon\endcsname {\simpleiconsmapsix\symbol{111}} + \expandafter\def\csname simpleicon@jesticon\endcsname {\simpleiconsmapsix\symbol{112}} + \expandafter\def\csname simpleicon@jeticon\endcsname {\simpleiconsmapsix\symbol{113}} + \expandafter\def\csname simpleicon@jetblueicon\endcsname {\simpleiconsmapsix\symbol{114}} + \expandafter\def\csname simpleicon@jetbrainsicon\endcsname {\simpleiconsmapsix\symbol{115}} + \expandafter\def\csname simpleicon@jetpackcomposeicon\endcsname {\simpleiconsmapsix\symbol{116}} + \expandafter\def\csname simpleicon@jfrogicon\endcsname {\simpleiconsmapsix\symbol{117}} + \expandafter\def\csname simpleicon@jfrogpipelinesicon\endcsname {\simpleiconsmapsix\symbol{118}} + \expandafter\def\csname simpleicon@jhipstericon\endcsname {\simpleiconsmapsix\symbol{119}} + \expandafter\def\csname simpleicon@jinjaicon\endcsname {\simpleiconsmapsix\symbol{120}} + \expandafter\def\csname simpleicon@jiraicon\endcsname {\simpleiconsmapsix\symbol{121}} + \expandafter\def\csname simpleicon@jirasoftwareicon\endcsname {\simpleiconsmapsix\symbol{122}} + \expandafter\def\csname simpleicon@jitpackicon\endcsname {\simpleiconsmapsix\symbol{123}} + \expandafter\def\csname simpleicon@jitsiicon\endcsname {\simpleiconsmapsix\symbol{124}} + \expandafter\def\csname simpleicon@johndeereicon\endcsname {\simpleiconsmapsix\symbol{125}} + \expandafter\def\csname simpleicon@joomlaicon\endcsname {\simpleiconsmapsix\symbol{126}} + \expandafter\def\csname simpleicon@joplinicon\endcsname {\simpleiconsmapsix\symbol{127}} + \expandafter\def\csname simpleicon@jordanicon\endcsname {\simpleiconsmapsix\symbol{128}} + \expandafter\def\csname simpleicon@jouavicon\endcsname {\simpleiconsmapsix\symbol{129}} + \expandafter\def\csname simpleicon@jovianicon\endcsname {\simpleiconsmapsix\symbol{130}} + \expandafter\def\csname simpleicon@jpegicon\endcsname {\simpleiconsmapsix\symbol{131}} + \expandafter\def\csname simpleicon@jqueryicon\endcsname {\simpleiconsmapsix\symbol{132}} + \expandafter\def\csname simpleicon@jrgroupicon\endcsname {\simpleiconsmapsix\symbol{133}} + \expandafter\def\csname simpleicon@jsdelivricon\endcsname {\simpleiconsmapsix\symbol{134}} + \expandafter\def\csname simpleicon@jsfiddleicon\endcsname {\simpleiconsmapsix\symbol{135}} + \expandafter\def\csname simpleicon@jsonicon\endcsname {\simpleiconsmapsix\symbol{136}} + \expandafter\def\csname simpleicon@jsonwebtokensicon\endcsname {\simpleiconsmapsix\symbol{137}} + \expandafter\def\csname simpleicon@jsricon\endcsname {\simpleiconsmapsix\symbol{138}} + \expandafter\def\csname simpleicon@jssicon\endcsname {\simpleiconsmapsix\symbol{139}} + \expandafter\def\csname simpleicon@juceicon\endcsname {\simpleiconsmapsix\symbol{140}} + \expandafter\def\csname simpleicon@juejinicon\endcsname {\simpleiconsmapsix\symbol{141}} + \expandafter\def\csname simpleicon@jukeicon\endcsname {\simpleiconsmapsix\symbol{142}} + \expandafter\def\csname simpleicon@juliaicon\endcsname {\simpleiconsmapsix\symbol{143}} + \expandafter\def\csname simpleicon@junipernetworksicon\endcsname {\simpleiconsmapsix\symbol{144}} + \expandafter\def\csname simpleicon@junit5icon\endcsname {\simpleiconsmapsix\symbol{145}} + \expandafter\def\csname simpleicon@jupytericon\endcsname {\simpleiconsmapsix\symbol{146}} + \expandafter\def\csname simpleicon@justeaticon\endcsname {\simpleiconsmapsix\symbol{147}} + \expandafter\def\csname simpleicon@justgivingicon\endcsname {\simpleiconsmapsix\symbol{148}} + \expandafter\def\csname simpleicon@k3sicon\endcsname {\simpleiconsmapsix\symbol{149}} + \expandafter\def\csname simpleicon@k6icon\endcsname {\simpleiconsmapsix\symbol{150}} + \expandafter\def\csname simpleicon@kaggleicon\endcsname {\simpleiconsmapsix\symbol{151}} + \expandafter\def\csname simpleicon@kagiicon\endcsname {\simpleiconsmapsix\symbol{152}} + \expandafter\def\csname simpleicon@kahooticon\endcsname {\simpleiconsmapsix\symbol{153}} + \expandafter\def\csname simpleicon@kaiosicon\endcsname {\simpleiconsmapsix\symbol{154}} + \expandafter\def\csname simpleicon@kakaoicon\endcsname {\simpleiconsmapsix\symbol{155}} + \expandafter\def\csname simpleicon@kakaotalkicon\endcsname {\simpleiconsmapsix\symbol{156}} + \expandafter\def\csname simpleicon@kalilinuxicon\endcsname {\simpleiconsmapsix\symbol{157}} + \expandafter\def\csname simpleicon@kamailioicon\endcsname {\simpleiconsmapsix\symbol{158}} + \expandafter\def\csname simpleicon@kanikoicon\endcsname {\simpleiconsmapsix\symbol{159}} + \expandafter\def\csname simpleicon@karlsruherverkehrsverbundicon\endcsname {\simpleiconsmapsix\symbol{160}} + \expandafter\def\csname simpleicon@kasasmarticon\endcsname {\simpleiconsmapsix\symbol{161}} + \expandafter\def\csname simpleicon@kashflowicon\endcsname {\simpleiconsmapsix\symbol{162}} + \expandafter\def\csname simpleicon@kasperskyicon\endcsname {\simpleiconsmapsix\symbol{163}} + \expandafter\def\csname simpleicon@katacodaicon\endcsname {\simpleiconsmapsix\symbol{164}} + \expandafter\def\csname simpleicon@katanaicon\endcsname {\simpleiconsmapsix\symbol{165}} + \expandafter\def\csname simpleicon@kauflandicon\endcsname {\simpleiconsmapsix\symbol{166}} + \expandafter\def\csname simpleicon@kdeicon\endcsname {\simpleiconsmapsix\symbol{167}} + \expandafter\def\csname simpleicon@kdenliveicon\endcsname {\simpleiconsmapsix\symbol{168}} + \expandafter\def\csname simpleicon@kedroicon\endcsname {\simpleiconsmapsix\symbol{169}} + \expandafter\def\csname simpleicon@keeneticicon\endcsname {\simpleiconsmapsix\symbol{170}} + \expandafter\def\csname simpleicon@keepachangelogicon\endcsname {\simpleiconsmapsix\symbol{171}} + \expandafter\def\csname simpleicon@keepassxcicon\endcsname {\simpleiconsmapsix\symbol{172}} + \expandafter\def\csname simpleicon@kenticoicon\endcsname {\simpleiconsmapsix\symbol{173}} + \expandafter\def\csname simpleicon@kerasicon\endcsname {\simpleiconsmapsix\symbol{174}} + \expandafter\def\csname simpleicon@keybaseicon\endcsname {\simpleiconsmapsix\symbol{175}} + \expandafter\def\csname simpleicon@keycdnicon\endcsname {\simpleiconsmapsix\symbol{176}} + \expandafter\def\csname simpleicon@keycloakicon\endcsname {\simpleiconsmapsix\symbol{177}} + \expandafter\def\csname simpleicon@keystoneicon\endcsname {\simpleiconsmapsix\symbol{178}} + \expandafter\def\csname simpleicon@kfcicon\endcsname {\simpleiconsmapsix\symbol{179}} + \expandafter\def\csname simpleicon@khanacademyicon\endcsname {\simpleiconsmapsix\symbol{180}} + \expandafter\def\csname simpleicon@khronosgroupicon\endcsname {\simpleiconsmapsix\symbol{181}} + \expandafter\def\csname simpleicon@kiaicon\endcsname {\simpleiconsmapsix\symbol{182}} + \expandafter\def\csname simpleicon@kibanaicon\endcsname {\simpleiconsmapsix\symbol{183}} + \expandafter\def\csname simpleicon@kicadicon\endcsname {\simpleiconsmapsix\symbol{184}} + \expandafter\def\csname simpleicon@kickicon\endcsname {\simpleiconsmapsix\symbol{185}} + \expandafter\def\csname simpleicon@kickstartericon\endcsname {\simpleiconsmapsix\symbol{186}} + \expandafter\def\csname simpleicon@kikicon\endcsname {\simpleiconsmapsix\symbol{187}} + \expandafter\def\csname simpleicon@kingstontechnologyicon\endcsname {\simpleiconsmapsix\symbol{188}} + \expandafter\def\csname simpleicon@kinopoiskicon\endcsname {\simpleiconsmapsix\symbol{189}} + \expandafter\def\csname simpleicon@kinstaicon\endcsname {\simpleiconsmapsix\symbol{190}} + \expandafter\def\csname simpleicon@kirbyicon\endcsname {\simpleiconsmapsix\symbol{191}} + \expandafter\def\csname simpleicon@kiticon\endcsname {\simpleiconsmapsix\symbol{192}} + \expandafter\def\csname simpleicon@kitsuicon\endcsname {\simpleiconsmapsix\symbol{193}} + \expandafter\def\csname simpleicon@klarnaicon\endcsname {\simpleiconsmapsix\symbol{194}} + \expandafter\def\csname simpleicon@klmicon\endcsname {\simpleiconsmapsix\symbol{195}} + \expandafter\def\csname simpleicon@klookicon\endcsname {\simpleiconsmapsix\symbol{196}} + \expandafter\def\csname simpleicon@knativeicon\endcsname {\simpleiconsmapsix\symbol{197}} + \expandafter\def\csname simpleicon@knexdotjsicon\endcsname {\simpleiconsmapsix\symbol{198}} + \expandafter\def\csname simpleicon@knimeicon\endcsname {\simpleiconsmapsix\symbol{199}} + \expandafter\def\csname simpleicon@knipicon\endcsname {\simpleiconsmapsix\symbol{200}} + \expandafter\def\csname simpleicon@knowledgebaseicon\endcsname {\simpleiconsmapsix\symbol{201}} + \expandafter\def\csname simpleicon@knownicon\endcsname {\simpleiconsmapsix\symbol{202}} + \expandafter\def\csname simpleicon@koaicon\endcsname {\simpleiconsmapsix\symbol{203}} + \expandafter\def\csname simpleicon@kocicon\endcsname {\simpleiconsmapsix\symbol{204}} + \expandafter\def\csname simpleicon@kodakicon\endcsname {\simpleiconsmapsix\symbol{205}} + \expandafter\def\csname simpleicon@kodiicon\endcsname {\simpleiconsmapsix\symbol{206}} + \expandafter\def\csname simpleicon@koenigseggicon\endcsname {\simpleiconsmapsix\symbol{207}} + \expandafter\def\csname simpleicon@kofaxicon\endcsname {\simpleiconsmapsix\symbol{208}} + \expandafter\def\csname simpleicon@kofiicon\endcsname {\simpleiconsmapsix\symbol{209}} + \expandafter\def\csname simpleicon@komooticon\endcsname {\simpleiconsmapsix\symbol{210}} + \expandafter\def\csname simpleicon@konamiicon\endcsname {\simpleiconsmapsix\symbol{211}} + \expandafter\def\csname simpleicon@kongicon\endcsname {\simpleiconsmapsix\symbol{212}} + \expandafter\def\csname simpleicon@kongregateicon\endcsname {\simpleiconsmapsix\symbol{213}} + \expandafter\def\csname simpleicon@konvaicon\endcsname {\simpleiconsmapsix\symbol{214}} + \expandafter\def\csname simpleicon@kotlinicon\endcsname {\simpleiconsmapsix\symbol{215}} + \expandafter\def\csname simpleicon@koyebicon\endcsname {\simpleiconsmapsix\symbol{216}} + \expandafter\def\csname simpleicon@kritaicon\endcsname {\simpleiconsmapsix\symbol{217}} + \expandafter\def\csname simpleicon@ktmicon\endcsname {\simpleiconsmapsix\symbol{218}} + \expandafter\def\csname simpleicon@ktoricon\endcsname {\simpleiconsmapsix\symbol{219}} + \expandafter\def\csname simpleicon@kuaishouicon\endcsname {\simpleiconsmapsix\symbol{220}} + \expandafter\def\csname simpleicon@kubernetesicon\endcsname {\simpleiconsmapsix\symbol{221}} + \expandafter\def\csname simpleicon@kubuntuicon\endcsname {\simpleiconsmapsix\symbol{222}} + \expandafter\def\csname simpleicon@kucoinicon\endcsname {\simpleiconsmapsix\symbol{223}} + \expandafter\def\csname simpleicon@kumaicon\endcsname {\simpleiconsmapsix\symbol{224}} + \expandafter\def\csname simpleicon@kununuicon\endcsname {\simpleiconsmapsix\symbol{225}} + \expandafter\def\csname simpleicon@kuulaicon\endcsname {\simpleiconsmapsix\symbol{226}} + \expandafter\def\csname simpleicon@kxicon\endcsname {\simpleiconsmapsix\symbol{227}} + \expandafter\def\csname simpleicon@kyoceraicon\endcsname {\simpleiconsmapsix\symbol{228}} + \expandafter\def\csname simpleicon@labviewicon\endcsname {\simpleiconsmapsix\symbol{229}} + \expandafter\def\csname simpleicon@ladaicon\endcsname {\simpleiconsmapsix\symbol{230}} + \expandafter\def\csname simpleicon@lamborghiniicon\endcsname {\simpleiconsmapsix\symbol{231}} + \expandafter\def\csname simpleicon@landrovericon\endcsname {\simpleiconsmapsix\symbol{232}} + \expandafter\def\csname simpleicon@langchainicon\endcsname {\simpleiconsmapsix\symbol{233}} + \expandafter\def\csname simpleicon@languagetoolicon\endcsname {\simpleiconsmapsix\symbol{234}} + \expandafter\def\csname simpleicon@lapceicon\endcsname {\simpleiconsmapsix\symbol{235}} + \expandafter\def\csname simpleicon@laragonicon\endcsname {\simpleiconsmapsix\symbol{236}} + \expandafter\def\csname simpleicon@laravelicon\endcsname {\simpleiconsmapsix\symbol{237}} + \expandafter\def\csname simpleicon@laravelhorizonicon\endcsname {\simpleiconsmapsix\symbol{238}} + \expandafter\def\csname simpleicon@laravelnovaicon\endcsname {\simpleiconsmapsix\symbol{239}} + \expandafter\def\csname simpleicon@lastdotfmicon\endcsname {\simpleiconsmapsix\symbol{240}} + \expandafter\def\csname simpleicon@lastpassicon\endcsname {\simpleiconsmapsix\symbol{241}} + \expandafter\def\csname simpleicon@latexicon\endcsname {\simpleiconsmapsix\symbol{242}} + \expandafter\def\csname simpleicon@launchpadicon\endcsname {\simpleiconsmapsix\symbol{243}} + \expandafter\def\csname simpleicon@lazarusicon\endcsname {\simpleiconsmapsix\symbol{244}} + \expandafter\def\csname simpleicon@lazyvimicon\endcsname {\simpleiconsmapsix\symbol{245}} + \expandafter\def\csname simpleicon@lbryicon\endcsname {\simpleiconsmapsix\symbol{246}} + \expandafter\def\csname simpleicon@leaderpriceicon\endcsname {\simpleiconsmapsix\symbol{247}} + \expandafter\def\csname simpleicon@leafleticon\endcsname {\simpleiconsmapsix\symbol{248}} + \expandafter\def\csname simpleicon@leagueoflegendsicon\endcsname {\simpleiconsmapsix\symbol{249}} + \expandafter\def\csname simpleicon@leanpubicon\endcsname {\simpleiconsmapsix\symbol{250}} + \expandafter\def\csname simpleicon@leetcodeicon\endcsname {\simpleiconsmapsix\symbol{251}} + \expandafter\def\csname simpleicon@lefthookicon\endcsname {\simpleiconsmapsix\symbol{252}} + \expandafter\def\csname simpleicon@legacygamesicon\endcsname {\simpleiconsmapsix\symbol{253}} + \expandafter\def\csname simpleicon@leicaicon\endcsname {\simpleiconsmapsix\symbol{254}} + \expandafter\def\csname simpleicon@lemmyicon\endcsname {\simpleiconsmapsix\symbol{255}} + \expandafter\def\csname simpleicon@lemonsqueezyicon\endcsname {\simpleiconsmapseven\symbol{0}} + \expandafter\def\csname simpleicon@lenovoicon\endcsname {\simpleiconsmapseven\symbol{1}} + \expandafter\def\csname simpleicon@lensicon\endcsname {\simpleiconsmapseven\symbol{2}} + \expandafter\def\csname simpleicon@leptosicon\endcsname {\simpleiconsmapseven\symbol{3}} + \expandafter\def\csname simpleicon@lequipeicon\endcsname {\simpleiconsmapseven\symbol{4}} + \expandafter\def\csname simpleicon@lernaicon\endcsname {\simpleiconsmapseven\symbol{5}} + \expandafter\def\csname simpleicon@leroymerlinicon\endcsname {\simpleiconsmapseven\symbol{6}} + \expandafter\def\csname simpleicon@leslibrairesicon\endcsname {\simpleiconsmapseven\symbol{7}} + \expandafter\def\csname simpleicon@lessicon\endcsname {\simpleiconsmapseven\symbol{8}} + \expandafter\def\csname simpleicon@letsencrypticon\endcsname {\simpleiconsmapseven\symbol{9}} + \expandafter\def\csname simpleicon@letterboxdicon\endcsname {\simpleiconsmapseven\symbol{10}} + \expandafter\def\csname simpleicon@levelsdotfyiicon\endcsname {\simpleiconsmapseven\symbol{11}} + \expandafter\def\csname simpleicon@lgicon\endcsname {\simpleiconsmapseven\symbol{12}} + \expandafter\def\csname simpleicon@liberadotchaticon\endcsname {\simpleiconsmapseven\symbol{13}} + \expandafter\def\csname simpleicon@liberapayicon\endcsname {\simpleiconsmapseven\symbol{14}} + \expandafter\def\csname simpleicon@librariesdotioicon\endcsname {\simpleiconsmapseven\symbol{15}} + \expandafter\def\csname simpleicon@librarythingicon\endcsname {\simpleiconsmapseven\symbol{16}} + \expandafter\def\csname simpleicon@libreofficeicon\endcsname {\simpleiconsmapseven\symbol{17}} + \expandafter\def\csname simpleicon@libreofficebaseicon\endcsname {\simpleiconsmapseven\symbol{18}} + \expandafter\def\csname simpleicon@libreofficecalcicon\endcsname {\simpleiconsmapseven\symbol{19}} + \expandafter\def\csname simpleicon@libreofficedrawicon\endcsname {\simpleiconsmapseven\symbol{20}} + \expandafter\def\csname simpleicon@libreofficeimpressicon\endcsname {\simpleiconsmapseven\symbol{21}} + \expandafter\def\csname simpleicon@libreofficemathicon\endcsname {\simpleiconsmapseven\symbol{22}} + \expandafter\def\csname simpleicon@libreofficewritericon\endcsname {\simpleiconsmapseven\symbol{23}} + \expandafter\def\csname simpleicon@librewolficon\endcsname {\simpleiconsmapseven\symbol{24}} + \expandafter\def\csname simpleicon@libuvicon\endcsname {\simpleiconsmapseven\symbol{25}} + \expandafter\def\csname simpleicon@lichessicon\endcsname {\simpleiconsmapseven\symbol{26}} + \expandafter\def\csname simpleicon@lidlicon\endcsname {\simpleiconsmapseven\symbol{27}} + \expandafter\def\csname simpleicon@lifxicon\endcsname {\simpleiconsmapseven\symbol{28}} + \expandafter\def\csname simpleicon@lightburnicon\endcsname {\simpleiconsmapseven\symbol{29}} + \expandafter\def\csname simpleicon@lighthouseicon\endcsname {\simpleiconsmapseven\symbol{30}} + \expandafter\def\csname simpleicon@lightningicon\endcsname {\simpleiconsmapseven\symbol{31}} + \expandafter\def\csname simpleicon@limesurveyicon\endcsname {\simpleiconsmapseven\symbol{32}} + \expandafter\def\csname simpleicon@lineicon\endcsname {\simpleiconsmapseven\symbol{33}} + \expandafter\def\csname simpleicon@lineageosicon\endcsname {\simpleiconsmapseven\symbol{34}} + \expandafter\def\csname simpleicon@linearicon\endcsname {\simpleiconsmapseven\symbol{35}} + \expandafter\def\csname simpleicon@liningicon\endcsname {\simpleiconsmapseven\symbol{36}} + \expandafter\def\csname simpleicon@linkedinicon\endcsname {\simpleiconsmapseven\symbol{37}} + \expandafter\def\csname simpleicon@linkerdicon\endcsname {\simpleiconsmapseven\symbol{38}} + \expandafter\def\csname simpleicon@linkfireicon\endcsname {\simpleiconsmapseven\symbol{39}} + \expandafter\def\csname simpleicon@linksysicon\endcsname {\simpleiconsmapseven\symbol{40}} + \expandafter\def\csname simpleicon@linktreeicon\endcsname {\simpleiconsmapseven\symbol{41}} + \expandafter\def\csname simpleicon@lintcodeicon\endcsname {\simpleiconsmapseven\symbol{42}} + \expandafter\def\csname simpleicon@linuxicon\endcsname {\simpleiconsmapseven\symbol{43}} + \expandafter\def\csname simpleicon@linuxcontainersicon\endcsname {\simpleiconsmapseven\symbol{44}} + \expandafter\def\csname simpleicon@linuxfoundationicon\endcsname {\simpleiconsmapseven\symbol{45}} + \expandafter\def\csname simpleicon@linuxminticon\endcsname {\simpleiconsmapseven\symbol{46}} + \expandafter\def\csname simpleicon@linuxprofessionalinstituteicon\endcsname {\simpleiconsmapseven\symbol{47}} + \expandafter\def\csname simpleicon@linuxservericon\endcsname {\simpleiconsmapseven\symbol{48}} + \expandafter\def\csname simpleicon@lionairicon\endcsname {\simpleiconsmapseven\symbol{49}} + \expandafter\def\csname simpleicon@liquibaseicon\endcsname {\simpleiconsmapseven\symbol{50}} + \expandafter\def\csname simpleicon@listmonkicon\endcsname {\simpleiconsmapseven\symbol{51}} + \expandafter\def\csname simpleicon@liticon\endcsname {\simpleiconsmapseven\symbol{52}} + \expandafter\def\csname simpleicon@litecoinicon\endcsname {\simpleiconsmapseven\symbol{53}} + \expandafter\def\csname simpleicon@literalicon\endcsname {\simpleiconsmapseven\symbol{54}} + \expandafter\def\csname simpleicon@litiengineicon\endcsname {\simpleiconsmapseven\symbol{55}} + \expandafter\def\csname simpleicon@livechaticon\endcsname {\simpleiconsmapseven\symbol{56}} + \expandafter\def\csname simpleicon@livejournalicon\endcsname {\simpleiconsmapseven\symbol{57}} + \expandafter\def\csname simpleicon@livewireicon\endcsname {\simpleiconsmapseven\symbol{58}} + \expandafter\def\csname simpleicon@llvmicon\endcsname {\simpleiconsmapseven\symbol{59}} + \expandafter\def\csname simpleicon@lmmsicon\endcsname {\simpleiconsmapseven\symbol{60}} + \expandafter\def\csname simpleicon@lobstersicon\endcsname {\simpleiconsmapseven\symbol{61}} + \expandafter\def\csname simpleicon@localicon\endcsname {\simpleiconsmapseven\symbol{62}} + \expandafter\def\csname simpleicon@lodashicon\endcsname {\simpleiconsmapseven\symbol{63}} + \expandafter\def\csname simpleicon@logitechicon\endcsname {\simpleiconsmapseven\symbol{64}} + \expandafter\def\csname simpleicon@logitechgicon\endcsname {\simpleiconsmapseven\symbol{65}} + \expandafter\def\csname simpleicon@logmeinicon\endcsname {\simpleiconsmapseven\symbol{66}} + \expandafter\def\csname simpleicon@logseqicon\endcsname {\simpleiconsmapseven\symbol{67}} + \expandafter\def\csname simpleicon@logstashicon\endcsname {\simpleiconsmapseven\symbol{68}} + \expandafter\def\csname simpleicon@lookericon\endcsname {\simpleiconsmapseven\symbol{69}} + \expandafter\def\csname simpleicon@loomicon\endcsname {\simpleiconsmapseven\symbol{70}} + \expandafter\def\csname simpleicon@loopicon\endcsname {\simpleiconsmapseven\symbol{71}} + \expandafter\def\csname simpleicon@loopbackicon\endcsname {\simpleiconsmapseven\symbol{72}} + \expandafter\def\csname simpleicon@lootcrateicon\endcsname {\simpleiconsmapseven\symbol{73}} + \expandafter\def\csname simpleicon@lospecicon\endcsname {\simpleiconsmapseven\symbol{74}} + \expandafter\def\csname simpleicon@lotpolishairlinesicon\endcsname {\simpleiconsmapseven\symbol{75}} + \expandafter\def\csname simpleicon@ltspiceicon\endcsname {\simpleiconsmapseven\symbol{76}} + \expandafter\def\csname simpleicon@luaicon\endcsname {\simpleiconsmapseven\symbol{77}} + \expandafter\def\csname simpleicon@lubuntuicon\endcsname {\simpleiconsmapseven\symbol{78}} + \expandafter\def\csname simpleicon@luciaicon\endcsname {\simpleiconsmapseven\symbol{79}} + \expandafter\def\csname simpleicon@lucidicon\endcsname {\simpleiconsmapseven\symbol{80}} + \expandafter\def\csname simpleicon@ludwigicon\endcsname {\simpleiconsmapseven\symbol{81}} + \expandafter\def\csname simpleicon@lufthansaicon\endcsname {\simpleiconsmapseven\symbol{82}} + \expandafter\def\csname simpleicon@lumenicon\endcsname {\simpleiconsmapseven\symbol{83}} + \expandafter\def\csname simpleicon@lunacyicon\endcsname {\simpleiconsmapseven\symbol{84}} + \expandafter\def\csname simpleicon@lutrisicon\endcsname {\simpleiconsmapseven\symbol{85}} + \expandafter\def\csname simpleicon@lydiaicon\endcsname {\simpleiconsmapseven\symbol{86}} + \expandafter\def\csname simpleicon@lyfticon\endcsname {\simpleiconsmapseven\symbol{87}} + \expandafter\def\csname simpleicon@maasicon\endcsname {\simpleiconsmapseven\symbol{88}} + \expandafter\def\csname simpleicon@macosicon\endcsname {\simpleiconsmapseven\symbol{89}} + \expandafter\def\csname simpleicon@macpawicon\endcsname {\simpleiconsmapseven\symbol{90}} + \expandafter\def\csname simpleicon@macysicon\endcsname {\simpleiconsmapseven\symbol{91}} + \expandafter\def\csname simpleicon@magasinsuicon\endcsname {\simpleiconsmapseven\symbol{92}} + \expandafter\def\csname simpleicon@magentoicon\endcsname {\simpleiconsmapseven\symbol{93}} + \expandafter\def\csname simpleicon@magicicon\endcsname {\simpleiconsmapseven\symbol{94}} + \expandafter\def\csname simpleicon@magiskicon\endcsname {\simpleiconsmapseven\symbol{95}} + \expandafter\def\csname simpleicon@mahindraicon\endcsname {\simpleiconsmapseven\symbol{96}} + \expandafter\def\csname simpleicon@mailchimpicon\endcsname {\simpleiconsmapseven\symbol{97}} + \expandafter\def\csname simpleicon@maildotcomicon\endcsname {\simpleiconsmapseven\symbol{98}} + \expandafter\def\csname simpleicon@maildotruicon\endcsname {\simpleiconsmapseven\symbol{99}} + \expandafter\def\csname simpleicon@mailgunicon\endcsname {\simpleiconsmapseven\symbol{100}} + \expandafter\def\csname simpleicon@mailtrapicon\endcsname {\simpleiconsmapseven\symbol{101}} + \expandafter\def\csname simpleicon@mainwpicon\endcsname {\simpleiconsmapseven\symbol{102}} + \expandafter\def\csname simpleicon@majorleaguehackingicon\endcsname {\simpleiconsmapseven\symbol{103}} + \expandafter\def\csname simpleicon@makeicon\endcsname {\simpleiconsmapseven\symbol{104}} + \expandafter\def\csname simpleicon@makerboticon\endcsname {\simpleiconsmapseven\symbol{105}} + \expandafter\def\csname simpleicon@malticon\endcsname {\simpleiconsmapseven\symbol{106}} + \expandafter\def\csname simpleicon@malwarebytesicon\endcsname {\simpleiconsmapseven\symbol{107}} + \expandafter\def\csname simpleicon@mambauiicon\endcsname {\simpleiconsmapseven\symbol{108}} + \expandafter\def\csname simpleicon@mampicon\endcsname {\simpleiconsmapseven\symbol{109}} + \expandafter\def\csname simpleicon@manicon\endcsname {\simpleiconsmapseven\symbol{110}} + \expandafter\def\csname simpleicon@manageiqicon\endcsname {\simpleiconsmapseven\symbol{111}} + \expandafter\def\csname simpleicon@manjaroicon\endcsname {\simpleiconsmapseven\symbol{112}} + \expandafter\def\csname simpleicon@mantineicon\endcsname {\simpleiconsmapseven\symbol{113}} + \expandafter\def\csname simpleicon@mapboxicon\endcsname {\simpleiconsmapseven\symbol{114}} + \expandafter\def\csname simpleicon@maplibreicon\endcsname {\simpleiconsmapseven\symbol{115}} + \expandafter\def\csname simpleicon@mariadbicon\endcsname {\simpleiconsmapseven\symbol{116}} + \expandafter\def\csname simpleicon@mariadbfoundationicon\endcsname {\simpleiconsmapseven\symbol{117}} + \expandafter\def\csname simpleicon@markdownicon\endcsname {\simpleiconsmapseven\symbol{118}} + \expandafter\def\csname simpleicon@marketoicon\endcsname {\simpleiconsmapseven\symbol{119}} + \expandafter\def\csname simpleicon@markoicon\endcsname {\simpleiconsmapseven\symbol{120}} + \expandafter\def\csname simpleicon@marriotticon\endcsname {\simpleiconsmapseven\symbol{121}} + \expandafter\def\csname simpleicon@marvelappicon\endcsname {\simpleiconsmapseven\symbol{122}} + \expandafter\def\csname simpleicon@maseratiicon\endcsname {\simpleiconsmapseven\symbol{123}} + \expandafter\def\csname simpleicon@mastercardicon\endcsname {\simpleiconsmapseven\symbol{124}} + \expandafter\def\csname simpleicon@mastercomfigicon\endcsname {\simpleiconsmapseven\symbol{125}} + \expandafter\def\csname simpleicon@mastodonicon\endcsname {\simpleiconsmapseven\symbol{126}} + \expandafter\def\csname simpleicon@materialdesignicon\endcsname {\simpleiconsmapseven\symbol{127}} + \expandafter\def\csname simpleicon@materialdesigniconsicon\endcsname {\simpleiconsmapseven\symbol{128}} + \expandafter\def\csname simpleicon@materialformkdocsicon\endcsname {\simpleiconsmapseven\symbol{129}} + \expandafter\def\csname simpleicon@matillionicon\endcsname {\simpleiconsmapseven\symbol{130}} + \expandafter\def\csname simpleicon@matomoicon\endcsname {\simpleiconsmapseven\symbol{131}} + \expandafter\def\csname simpleicon@matrixicon\endcsname {\simpleiconsmapseven\symbol{132}} + \expandafter\def\csname simpleicon@matterdotjsicon\endcsname {\simpleiconsmapseven\symbol{133}} + \expandafter\def\csname simpleicon@mattermosticon\endcsname {\simpleiconsmapseven\symbol{134}} + \expandafter\def\csname simpleicon@matterneticon\endcsname {\simpleiconsmapseven\symbol{135}} + \expandafter\def\csname simpleicon@mauticicon\endcsname {\simpleiconsmapseven\symbol{136}} + \expandafter\def\csname simpleicon@maxicon\endcsname {\simpleiconsmapseven\symbol{137}} + \expandafter\def\csname simpleicon@maxplanckgesellschafticon\endcsname {\simpleiconsmapseven\symbol{138}} + \expandafter\def\csname simpleicon@maytagicon\endcsname {\simpleiconsmapseven\symbol{139}} + \expandafter\def\csname simpleicon@mazdaicon\endcsname {\simpleiconsmapseven\symbol{140}} + \expandafter\def\csname simpleicon@mcafeeicon\endcsname {\simpleiconsmapseven\symbol{141}} + \expandafter\def\csname simpleicon@mcdonaldsicon\endcsname {\simpleiconsmapseven\symbol{142}} + \expandafter\def\csname simpleicon@mclarenicon\endcsname {\simpleiconsmapseven\symbol{143}} + \expandafter\def\csname simpleicon@mdbookicon\endcsname {\simpleiconsmapseven\symbol{144}} + \expandafter\def\csname simpleicon@mdnwebdocsicon\endcsname {\simpleiconsmapseven\symbol{145}} + \expandafter\def\csname simpleicon@mdxicon\endcsname {\simpleiconsmapseven\symbol{146}} + \expandafter\def\csname simpleicon@mediafireicon\endcsname {\simpleiconsmapseven\symbol{147}} + \expandafter\def\csname simpleicon@mediamarkticon\endcsname {\simpleiconsmapseven\symbol{148}} + \expandafter\def\csname simpleicon@mediatekicon\endcsname {\simpleiconsmapseven\symbol{149}} + \expandafter\def\csname simpleicon@medibangpainticon\endcsname {\simpleiconsmapseven\symbol{150}} + \expandafter\def\csname simpleicon@mediumicon\endcsname {\simpleiconsmapseven\symbol{151}} + \expandafter\def\csname simpleicon@medusaicon\endcsname {\simpleiconsmapseven\symbol{152}} + \expandafter\def\csname simpleicon@meetupicon\endcsname {\simpleiconsmapseven\symbol{153}} + \expandafter\def\csname simpleicon@megaicon\endcsname {\simpleiconsmapseven\symbol{154}} + \expandafter\def\csname simpleicon@meilisearchicon\endcsname {\simpleiconsmapseven\symbol{155}} + \expandafter\def\csname simpleicon@meituanicon\endcsname {\simpleiconsmapseven\symbol{156}} + \expandafter\def\csname simpleicon@meizuicon\endcsname {\simpleiconsmapseven\symbol{157}} + \expandafter\def\csname simpleicon@mendeleyicon\endcsname {\simpleiconsmapseven\symbol{158}} + \expandafter\def\csname simpleicon@mentorcruiseicon\endcsname {\simpleiconsmapseven\symbol{159}} + \expandafter\def\csname simpleicon@mercadopagoicon\endcsname {\simpleiconsmapseven\symbol{160}} + \expandafter\def\csname simpleicon@mercedesicon\endcsname {\simpleiconsmapseven\symbol{161}} + \expandafter\def\csname simpleicon@merckicon\endcsname {\simpleiconsmapseven\symbol{162}} + \expandafter\def\csname simpleicon@mercurialicon\endcsname {\simpleiconsmapseven\symbol{163}} + \expandafter\def\csname simpleicon@mermaidicon\endcsname {\simpleiconsmapseven\symbol{164}} + \expandafter\def\csname simpleicon@messengericon\endcsname {\simpleiconsmapseven\symbol{165}} + \expandafter\def\csname simpleicon@metaicon\endcsname {\simpleiconsmapseven\symbol{166}} + \expandafter\def\csname simpleicon@metabaseicon\endcsname {\simpleiconsmapseven\symbol{167}} + \expandafter\def\csname simpleicon@metacriticicon\endcsname {\simpleiconsmapseven\symbol{168}} + \expandafter\def\csname simpleicon@metafiltericon\endcsname {\simpleiconsmapseven\symbol{169}} + \expandafter\def\csname simpleicon@metasploiticon\endcsname {\simpleiconsmapseven\symbol{170}} + \expandafter\def\csname simpleicon@meteoricon\endcsname {\simpleiconsmapseven\symbol{171}} + \expandafter\def\csname simpleicon@metroicon\endcsname {\simpleiconsmapseven\symbol{172}} + \expandafter\def\csname simpleicon@metrodelaciudaddemexicoicon\endcsname {\simpleiconsmapseven\symbol{173}} + \expandafter\def\csname simpleicon@metrodemadridicon\endcsname {\simpleiconsmapseven\symbol{174}} + \expandafter\def\csname simpleicon@metrodeparisicon\endcsname {\simpleiconsmapseven\symbol{175}} + \expandafter\def\csname simpleicon@meweicon\endcsname {\simpleiconsmapseven\symbol{176}} + \expandafter\def\csname simpleicon@mgicon\endcsname {\simpleiconsmapseven\symbol{177}} + \expandafter\def\csname simpleicon@microbiticon\endcsname {\simpleiconsmapseven\symbol{178}} + \expandafter\def\csname simpleicon@microdotblogicon\endcsname {\simpleiconsmapseven\symbol{179}} + \expandafter\def\csname simpleicon@microeditoricon\endcsname {\simpleiconsmapseven\symbol{180}} + \expandafter\def\csname simpleicon@microgeneticsicon\endcsname {\simpleiconsmapseven\symbol{181}} + \expandafter\def\csname simpleicon@micropythonicon\endcsname {\simpleiconsmapseven\symbol{182}} + \expandafter\def\csname simpleicon@microstationicon\endcsname {\simpleiconsmapseven\symbol{183}} + \expandafter\def\csname simpleicon@microstrategyicon\endcsname {\simpleiconsmapseven\symbol{184}} + \expandafter\def\csname simpleicon@midiicon\endcsname {\simpleiconsmapseven\symbol{185}} + \expandafter\def\csname simpleicon@migaduicon\endcsname {\simpleiconsmapseven\symbol{186}} + \expandafter\def\csname simpleicon@mikrotikicon\endcsname {\simpleiconsmapseven\symbol{187}} + \expandafter\def\csname simpleicon@milanoteicon\endcsname {\simpleiconsmapseven\symbol{188}} + \expandafter\def\csname simpleicon@milvusicon\endcsname {\simpleiconsmapseven\symbol{189}} + \expandafter\def\csname simpleicon@mindsicon\endcsname {\simpleiconsmapseven\symbol{190}} + \expandafter\def\csname simpleicon@minetesticon\endcsname {\simpleiconsmapseven\symbol{191}} + \expandafter\def\csname simpleicon@mingww64icon\endcsname {\simpleiconsmapseven\symbol{192}} + \expandafter\def\csname simpleicon@miniicon\endcsname {\simpleiconsmapseven\symbol{193}} + \expandafter\def\csname simpleicon@minioicon\endcsname {\simpleiconsmapseven\symbol{194}} + \expandafter\def\csname simpleicon@mintlifyicon\endcsname {\simpleiconsmapseven\symbol{195}} + \expandafter\def\csname simpleicon@minutemailericon\endcsname {\simpleiconsmapseven\symbol{196}} + \expandafter\def\csname simpleicon@mirahezeicon\endcsname {\simpleiconsmapseven\symbol{197}} + \expandafter\def\csname simpleicon@miroicon\endcsname {\simpleiconsmapseven\symbol{198}} + \expandafter\def\csname simpleicon@misskeyicon\endcsname {\simpleiconsmapseven\symbol{199}} + \expandafter\def\csname simpleicon@mitsubishiicon\endcsname {\simpleiconsmapseven\symbol{200}} + \expandafter\def\csname simpleicon@mixicon\endcsname {\simpleiconsmapseven\symbol{201}} + \expandafter\def\csname simpleicon@mixcloudicon\endcsname {\simpleiconsmapseven\symbol{202}} + \expandafter\def\csname simpleicon@mixpanelicon\endcsname {\simpleiconsmapseven\symbol{203}} + \expandafter\def\csname simpleicon@mlbicon\endcsname {\simpleiconsmapseven\symbol{204}} + \expandafter\def\csname simpleicon@mlflowicon\endcsname {\simpleiconsmapseven\symbol{205}} + \expandafter\def\csname simpleicon@mobxicon\endcsname {\simpleiconsmapseven\symbol{206}} + \expandafter\def\csname simpleicon@mobxstatetreeicon\endcsname {\simpleiconsmapseven\symbol{207}} + \expandafter\def\csname simpleicon@mochaicon\endcsname {\simpleiconsmapseven\symbol{208}} + \expandafter\def\csname simpleicon@mockserviceworkericon\endcsname {\simpleiconsmapseven\symbol{209}} + \expandafter\def\csname simpleicon@modalicon\endcsname {\simpleiconsmapseven\symbol{210}} + \expandafter\def\csname simpleicon@modinicon\endcsname {\simpleiconsmapseven\symbol{211}} + \expandafter\def\csname simpleicon@modrinthicon\endcsname {\simpleiconsmapseven\symbol{212}} + \expandafter\def\csname simpleicon@modxicon\endcsname {\simpleiconsmapseven\symbol{213}} + \expandafter\def\csname simpleicon@moleculericon\endcsname {\simpleiconsmapseven\symbol{214}} + \expandafter\def\csname simpleicon@momenteoicon\endcsname {\simpleiconsmapseven\symbol{215}} + \expandafter\def\csname simpleicon@moneroicon\endcsname {\simpleiconsmapseven\symbol{216}} + \expandafter\def\csname simpleicon@moneygramicon\endcsname {\simpleiconsmapseven\symbol{217}} + \expandafter\def\csname simpleicon@mongodbicon\endcsname {\simpleiconsmapseven\symbol{218}} + \expandafter\def\csname simpleicon@mongooseicon\endcsname {\simpleiconsmapseven\symbol{219}} + \expandafter\def\csname simpleicon@mongoosedotwsicon\endcsname {\simpleiconsmapseven\symbol{220}} + \expandafter\def\csname simpleicon@monicaicon\endcsname {\simpleiconsmapseven\symbol{221}} + \expandafter\def\csname simpleicon@monkeytieicon\endcsname {\simpleiconsmapseven\symbol{222}} + \expandafter\def\csname simpleicon@monkeytypeicon\endcsname {\simpleiconsmapseven\symbol{223}} + \expandafter\def\csname simpleicon@monogameicon\endcsname {\simpleiconsmapseven\symbol{224}} + \expandafter\def\csname simpleicon@monoprixicon\endcsname {\simpleiconsmapseven\symbol{225}} + \expandafter\def\csname simpleicon@monstericon\endcsname {\simpleiconsmapseven\symbol{226}} + \expandafter\def\csname simpleicon@monzoicon\endcsname {\simpleiconsmapseven\symbol{227}} + \expandafter\def\csname simpleicon@mooicon\endcsname {\simpleiconsmapseven\symbol{228}} + \expandafter\def\csname simpleicon@moodleicon\endcsname {\simpleiconsmapseven\symbol{229}} + \expandafter\def\csname simpleicon@moonrepoicon\endcsname {\simpleiconsmapseven\symbol{230}} + \expandafter\def\csname simpleicon@moqicon\endcsname {\simpleiconsmapseven\symbol{231}} + \expandafter\def\csname simpleicon@moqupsicon\endcsname {\simpleiconsmapseven\symbol{232}} + \expandafter\def\csname simpleicon@morrisonsicon\endcsname {\simpleiconsmapseven\symbol{233}} + \expandafter\def\csname simpleicon@moscowmetroicon\endcsname {\simpleiconsmapseven\symbol{234}} + \expandafter\def\csname simpleicon@motorolaicon\endcsname {\simpleiconsmapseven\symbol{235}} + \expandafter\def\csname simpleicon@mozillaicon\endcsname {\simpleiconsmapseven\symbol{236}} + \expandafter\def\csname simpleicon@mpvicon\endcsname {\simpleiconsmapseven\symbol{237}} + \expandafter\def\csname simpleicon@mqtticon\endcsname {\simpleiconsmapseven\symbol{238}} + \expandafter\def\csname simpleicon@msiicon\endcsname {\simpleiconsmapseven\symbol{239}} + \expandafter\def\csname simpleicon@msibusinessicon\endcsname {\simpleiconsmapseven\symbol{240}} + \expandafter\def\csname simpleicon@mtaicon\endcsname {\simpleiconsmapseven\symbol{241}} + \expandafter\def\csname simpleicon@mtricon\endcsname {\simpleiconsmapseven\symbol{242}} + \expandafter\def\csname simpleicon@mubiicon\endcsname {\simpleiconsmapseven\symbol{243}} + \expandafter\def\csname simpleicon@muiicon\endcsname {\simpleiconsmapseven\symbol{244}} + \expandafter\def\csname simpleicon@mulesofticon\endcsname {\simpleiconsmapseven\symbol{245}} + \expandafter\def\csname simpleicon@mullericon\endcsname {\simpleiconsmapseven\symbol{246}} + \expandafter\def\csname simpleicon@multisimicon\endcsname {\simpleiconsmapseven\symbol{247}} + \expandafter\def\csname simpleicon@mumbleicon\endcsname {\simpleiconsmapseven\symbol{248}} + \expandafter\def\csname simpleicon@muoicon\endcsname {\simpleiconsmapseven\symbol{249}} + \expandafter\def\csname simpleicon@muralicon\endcsname {\simpleiconsmapseven\symbol{250}} + \expandafter\def\csname simpleicon@musescoreicon\endcsname {\simpleiconsmapseven\symbol{251}} + \expandafter\def\csname simpleicon@musicbrainzicon\endcsname {\simpleiconsmapseven\symbol{252}} + \expandafter\def\csname simpleicon@mxlinuxicon\endcsname {\simpleiconsmapseven\symbol{253}} + \expandafter\def\csname simpleicon@myanimelisticon\endcsname {\simpleiconsmapseven\symbol{254}} + \expandafter\def\csname simpleicon@mygeticon\endcsname {\simpleiconsmapseven\symbol{255}} + \expandafter\def\csname simpleicon@myobicon\endcsname {\simpleiconsmapeight\symbol{0}} + \expandafter\def\csname simpleicon@myspaceicon\endcsname {\simpleiconsmapeight\symbol{1}} + \expandafter\def\csname simpleicon@mysqlicon\endcsname {\simpleiconsmapeight\symbol{2}} + \expandafter\def\csname simpleicon@n26icon\endcsname {\simpleiconsmapeight\symbol{3}} + \expandafter\def\csname simpleicon@n8nicon\endcsname {\simpleiconsmapeight\symbol{4}} + \expandafter\def\csname simpleicon@namebaseicon\endcsname {\simpleiconsmapeight\symbol{5}} + \expandafter\def\csname simpleicon@namecheapicon\endcsname {\simpleiconsmapeight\symbol{6}} + \expandafter\def\csname simpleicon@namemcicon\endcsname {\simpleiconsmapeight\symbol{7}} + \expandafter\def\csname simpleicon@namesiloicon\endcsname {\simpleiconsmapeight\symbol{8}} + \expandafter\def\csname simpleicon@namuwikiicon\endcsname {\simpleiconsmapeight\symbol{9}} + \expandafter\def\csname simpleicon@nanoicon\endcsname {\simpleiconsmapeight\symbol{10}} + \expandafter\def\csname simpleicon@nasaicon\endcsname {\simpleiconsmapeight\symbol{11}} + \expandafter\def\csname simpleicon@nationalgridicon\endcsname {\simpleiconsmapeight\symbol{12}} + \expandafter\def\csname simpleicon@nationalrailicon\endcsname {\simpleiconsmapeight\symbol{13}} + \expandafter\def\csname simpleicon@nativescripticon\endcsname {\simpleiconsmapeight\symbol{14}} + \expandafter\def\csname simpleicon@natsdotioicon\endcsname {\simpleiconsmapeight\symbol{15}} + \expandafter\def\csname simpleicon@navericon\endcsname {\simpleiconsmapeight\symbol{16}} + \expandafter\def\csname simpleicon@nbaicon\endcsname {\simpleiconsmapeight\symbol{17}} + \expandafter\def\csname simpleicon@nbbicon\endcsname {\simpleiconsmapeight\symbol{18}} + \expandafter\def\csname simpleicon@nbcicon\endcsname {\simpleiconsmapeight\symbol{19}} + \expandafter\def\csname simpleicon@ndricon\endcsname {\simpleiconsmapeight\symbol{20}} + \expandafter\def\csname simpleicon@nearicon\endcsname {\simpleiconsmapeight\symbol{21}} + \expandafter\def\csname simpleicon@necicon\endcsname {\simpleiconsmapeight\symbol{22}} + \expandafter\def\csname simpleicon@neo4jicon\endcsname {\simpleiconsmapeight\symbol{23}} + \expandafter\def\csname simpleicon@neovimicon\endcsname {\simpleiconsmapeight\symbol{24}} + \expandafter\def\csname simpleicon@neptuneicon\endcsname {\simpleiconsmapeight\symbol{25}} + \expandafter\def\csname simpleicon@nestjsicon\endcsname {\simpleiconsmapeight\symbol{26}} + \expandafter\def\csname simpleicon@netappicon\endcsname {\simpleiconsmapeight\symbol{27}} + \expandafter\def\csname simpleicon@netbsdicon\endcsname {\simpleiconsmapeight\symbol{28}} + \expandafter\def\csname simpleicon@netcupicon\endcsname {\simpleiconsmapeight\symbol{29}} + \expandafter\def\csname simpleicon@netdataicon\endcsname {\simpleiconsmapeight\symbol{30}} + \expandafter\def\csname simpleicon@neteasecloudmusicicon\endcsname {\simpleiconsmapeight\symbol{31}} + \expandafter\def\csname simpleicon@netflixicon\endcsname {\simpleiconsmapeight\symbol{32}} + \expandafter\def\csname simpleicon@netgearicon\endcsname {\simpleiconsmapeight\symbol{33}} + \expandafter\def\csname simpleicon@netlifyicon\endcsname {\simpleiconsmapeight\symbol{34}} + \expandafter\def\csname simpleicon@netteicon\endcsname {\simpleiconsmapeight\symbol{35}} + \expandafter\def\csname simpleicon@nettoicon\endcsname {\simpleiconsmapeight\symbol{36}} + \expandafter\def\csname simpleicon@neutralinojsicon\endcsname {\simpleiconsmapeight\symbol{37}} + \expandafter\def\csname simpleicon@newbalanceicon\endcsname {\simpleiconsmapeight\symbol{38}} + \expandafter\def\csname simpleicon@neweggicon\endcsname {\simpleiconsmapeight\symbol{39}} + \expandafter\def\csname simpleicon@newjapanprowrestlingicon\endcsname {\simpleiconsmapeight\symbol{40}} + \expandafter\def\csname simpleicon@newrelicicon\endcsname {\simpleiconsmapeight\symbol{41}} + \expandafter\def\csname simpleicon@newyorktimesicon\endcsname {\simpleiconsmapeight\symbol{42}} + \expandafter\def\csname simpleicon@nextbilliondotaiicon\endcsname {\simpleiconsmapeight\symbol{43}} + \expandafter\def\csname simpleicon@nextcloudicon\endcsname {\simpleiconsmapeight\symbol{44}} + \expandafter\def\csname simpleicon@nextdnsicon\endcsname {\simpleiconsmapeight\symbol{45}} + \expandafter\def\csname simpleicon@nextdooricon\endcsname {\simpleiconsmapeight\symbol{46}} + \expandafter\def\csname simpleicon@nextdotjsicon\endcsname {\simpleiconsmapeight\symbol{47}} + \expandafter\def\csname simpleicon@nextraicon\endcsname {\simpleiconsmapeight\symbol{48}} + \expandafter\def\csname simpleicon@nextuiicon\endcsname {\simpleiconsmapeight\symbol{49}} + \expandafter\def\csname simpleicon@nexusmodsicon\endcsname {\simpleiconsmapeight\symbol{50}} + \expandafter\def\csname simpleicon@nfcicon\endcsname {\simpleiconsmapeight\symbol{51}} + \expandafter\def\csname simpleicon@nginxicon\endcsname {\simpleiconsmapeight\symbol{52}} + \expandafter\def\csname simpleicon@nginxproxymanagericon\endcsname {\simpleiconsmapeight\symbol{53}} + \expandafter\def\csname simpleicon@ngrokicon\endcsname {\simpleiconsmapeight\symbol{54}} + \expandafter\def\csname simpleicon@ngrxicon\endcsname {\simpleiconsmapeight\symbol{55}} + \expandafter\def\csname simpleicon@nhlicon\endcsname {\simpleiconsmapeight\symbol{56}} + \expandafter\def\csname simpleicon@nicehashicon\endcsname {\simpleiconsmapeight\symbol{57}} + \expandafter\def\csname simpleicon@niconicoicon\endcsname {\simpleiconsmapeight\symbol{58}} + \expandafter\def\csname simpleicon@nikeicon\endcsname {\simpleiconsmapeight\symbol{59}} + \expandafter\def\csname simpleicon@nikonicon\endcsname {\simpleiconsmapeight\symbol{60}} + \expandafter\def\csname simpleicon@nimicon\endcsname {\simpleiconsmapeight\symbol{61}} + \expandafter\def\csname simpleicon@nintendoicon\endcsname {\simpleiconsmapeight\symbol{62}} + \expandafter\def\csname simpleicon@nintendo3dsicon\endcsname {\simpleiconsmapeight\symbol{63}} + \expandafter\def\csname simpleicon@nintendogamecubeicon\endcsname {\simpleiconsmapeight\symbol{64}} + \expandafter\def\csname simpleicon@nintendoswitchicon\endcsname {\simpleiconsmapeight\symbol{65}} + \expandafter\def\csname simpleicon@nissanicon\endcsname {\simpleiconsmapeight\symbol{66}} + \expandafter\def\csname simpleicon@nixosicon\endcsname {\simpleiconsmapeight\symbol{67}} + \expandafter\def\csname simpleicon@nodedotjsicon\endcsname {\simpleiconsmapeight\symbol{68}} + \expandafter\def\csname simpleicon@nodemonicon\endcsname {\simpleiconsmapeight\symbol{69}} + \expandafter\def\csname simpleicon@noderedicon\endcsname {\simpleiconsmapeight\symbol{70}} + \expandafter\def\csname simpleicon@nokiaicon\endcsname {\simpleiconsmapeight\symbol{71}} + \expandafter\def\csname simpleicon@nomadicon\endcsname {\simpleiconsmapeight\symbol{72}} + \expandafter\def\csname simpleicon@norcoicon\endcsname {\simpleiconsmapeight\symbol{73}} + \expandafter\def\csname simpleicon@nordicsemiconductoricon\endcsname {\simpleiconsmapeight\symbol{74}} + \expandafter\def\csname simpleicon@nordvpnicon\endcsname {\simpleiconsmapeight\symbol{75}} + \expandafter\def\csname simpleicon@normalizedotcssicon\endcsname {\simpleiconsmapeight\symbol{76}} + \expandafter\def\csname simpleicon@nortonicon\endcsname {\simpleiconsmapeight\symbol{77}} + \expandafter\def\csname simpleicon@norwegianicon\endcsname {\simpleiconsmapeight\symbol{78}} + \expandafter\def\csname simpleicon@notepadplusplusicon\endcsname {\simpleiconsmapeight\symbol{79}} + \expandafter\def\csname simpleicon@notionicon\endcsname {\simpleiconsmapeight\symbol{80}} + \expandafter\def\csname simpleicon@notisticon\endcsname {\simpleiconsmapeight\symbol{81}} + \expandafter\def\csname simpleicon@nounprojecticon\endcsname {\simpleiconsmapeight\symbol{82}} + \expandafter\def\csname simpleicon@novuicon\endcsname {\simpleiconsmapeight\symbol{83}} + \expandafter\def\csname simpleicon@nowicon\endcsname {\simpleiconsmapeight\symbol{84}} + \expandafter\def\csname simpleicon@npmicon\endcsname {\simpleiconsmapeight\symbol{85}} + \expandafter\def\csname simpleicon@nrwlicon\endcsname {\simpleiconsmapeight\symbol{86}} + \expandafter\def\csname simpleicon@nsisicon\endcsname {\simpleiconsmapeight\symbol{87}} + \expandafter\def\csname simpleicon@ntfyicon\endcsname {\simpleiconsmapeight\symbol{88}} + \expandafter\def\csname simpleicon@nubankicon\endcsname {\simpleiconsmapeight\symbol{89}} + \expandafter\def\csname simpleicon@nucleoicon\endcsname {\simpleiconsmapeight\symbol{90}} + \expandafter\def\csname simpleicon@nugeticon\endcsname {\simpleiconsmapeight\symbol{91}} + \expandafter\def\csname simpleicon@nukeicon\endcsname {\simpleiconsmapeight\symbol{92}} + \expandafter\def\csname simpleicon@numbaicon\endcsname {\simpleiconsmapeight\symbol{93}} + \expandafter\def\csname simpleicon@numpyicon\endcsname {\simpleiconsmapeight\symbol{94}} + \expandafter\def\csname simpleicon@nunjucksicon\endcsname {\simpleiconsmapeight\symbol{95}} + \expandafter\def\csname simpleicon@nushellicon\endcsname {\simpleiconsmapeight\symbol{96}} + \expandafter\def\csname simpleicon@nutanixicon\endcsname {\simpleiconsmapeight\symbol{97}} + \expandafter\def\csname simpleicon@nuxtdotjsicon\endcsname {\simpleiconsmapeight\symbol{98}} + \expandafter\def\csname simpleicon@nvidiaicon\endcsname {\simpleiconsmapeight\symbol{99}} + \expandafter\def\csname simpleicon@nvmicon\endcsname {\simpleiconsmapeight\symbol{100}} + \expandafter\def\csname simpleicon@nxicon\endcsname {\simpleiconsmapeight\symbol{101}} + \expandafter\def\csname simpleicon@nxpicon\endcsname {\simpleiconsmapeight\symbol{102}} + \expandafter\def\csname simpleicon@nzxticon\endcsname {\simpleiconsmapeight\symbol{103}} + \expandafter\def\csname simpleicon@observableicon\endcsname {\simpleiconsmapeight\symbol{104}} + \expandafter\def\csname simpleicon@obsidianicon\endcsname {\simpleiconsmapeight\symbol{105}} + \expandafter\def\csname simpleicon@obsstudioicon\endcsname {\simpleiconsmapeight\symbol{106}} + \expandafter\def\csname simpleicon@ocamlicon\endcsname {\simpleiconsmapeight\symbol{107}} + \expandafter\def\csname simpleicon@oclificon\endcsname {\simpleiconsmapeight\symbol{108}} + \expandafter\def\csname simpleicon@octanerendericon\endcsname {\simpleiconsmapeight\symbol{109}} + \expandafter\def\csname simpleicon@octaveicon\endcsname {\simpleiconsmapeight\symbol{110}} + \expandafter\def\csname simpleicon@octobercmsicon\endcsname {\simpleiconsmapeight\symbol{111}} + \expandafter\def\csname simpleicon@octoprinticon\endcsname {\simpleiconsmapeight\symbol{112}} + \expandafter\def\csname simpleicon@octopusdeployicon\endcsname {\simpleiconsmapeight\symbol{113}} + \expandafter\def\csname simpleicon@oculusicon\endcsname {\simpleiconsmapeight\symbol{114}} + \expandafter\def\csname simpleicon@odnoklassnikiicon\endcsname {\simpleiconsmapeight\symbol{115}} + \expandafter\def\csname simpleicon@odooicon\endcsname {\simpleiconsmapeight\symbol{116}} + \expandafter\def\csname simpleicon@odyseeicon\endcsname {\simpleiconsmapeight\symbol{117}} + \expandafter\def\csname simpleicon@ohdearicon\endcsname {\simpleiconsmapeight\symbol{118}} + \expandafter\def\csname simpleicon@okcupidicon\endcsname {\simpleiconsmapeight\symbol{119}} + \expandafter\def\csname simpleicon@oktaicon\endcsname {\simpleiconsmapeight\symbol{120}} + \expandafter\def\csname simpleicon@ollamaicon\endcsname {\simpleiconsmapeight\symbol{121}} + \expandafter\def\csname simpleicon@oneplusicon\endcsname {\simpleiconsmapeight\symbol{122}} + \expandafter\def\csname simpleicon@onlyfansicon\endcsname {\simpleiconsmapeight\symbol{123}} + \expandafter\def\csname simpleicon@onlyofficeicon\endcsname {\simpleiconsmapeight\symbol{124}} + \expandafter\def\csname simpleicon@onnxicon\endcsname {\simpleiconsmapeight\symbol{125}} + \expandafter\def\csname simpleicon@onstaricon\endcsname {\simpleiconsmapeight\symbol{126}} + \expandafter\def\csname simpleicon@opelicon\endcsname {\simpleiconsmapeight\symbol{127}} + \expandafter\def\csname simpleicon@openaccessicon\endcsname {\simpleiconsmapeight\symbol{128}} + \expandafter\def\csname simpleicon@openaiicon\endcsname {\simpleiconsmapeight\symbol{129}} + \expandafter\def\csname simpleicon@openaigymicon\endcsname {\simpleiconsmapeight\symbol{130}} + \expandafter\def\csname simpleicon@openapiinitiativeicon\endcsname {\simpleiconsmapeight\symbol{131}} + \expandafter\def\csname simpleicon@openbadgesicon\endcsname {\simpleiconsmapeight\symbol{132}} + \expandafter\def\csname simpleicon@openbsdicon\endcsname {\simpleiconsmapeight\symbol{133}} + \expandafter\def\csname simpleicon@openbugbountyicon\endcsname {\simpleiconsmapeight\symbol{134}} + \expandafter\def\csname simpleicon@opencollectiveicon\endcsname {\simpleiconsmapeight\symbol{135}} + \expandafter\def\csname simpleicon@opencontainersinitiativeicon\endcsname {\simpleiconsmapeight\symbol{136}} + \expandafter\def\csname simpleicon@opencvicon\endcsname {\simpleiconsmapeight\symbol{137}} + \expandafter\def\csname simpleicon@openfaasicon\endcsname {\simpleiconsmapeight\symbol{138}} + \expandafter\def\csname simpleicon@openglicon\endcsname {\simpleiconsmapeight\symbol{139}} + \expandafter\def\csname simpleicon@openhabicon\endcsname {\simpleiconsmapeight\symbol{140}} + \expandafter\def\csname simpleicon@openidicon\endcsname {\simpleiconsmapeight\symbol{141}} + \expandafter\def\csname simpleicon@openjdkicon\endcsname {\simpleiconsmapeight\symbol{142}} + \expandafter\def\csname simpleicon@openjsfoundationicon\endcsname {\simpleiconsmapeight\symbol{143}} + \expandafter\def\csname simpleicon@openlayersicon\endcsname {\simpleiconsmapeight\symbol{144}} + \expandafter\def\csname simpleicon@openmediavaulticon\endcsname {\simpleiconsmapeight\symbol{145}} + \expandafter\def\csname simpleicon@openminedicon\endcsname {\simpleiconsmapeight\symbol{146}} + \expandafter\def\csname simpleicon@opennebulaicon\endcsname {\simpleiconsmapeight\symbol{147}} + \expandafter\def\csname simpleicon@openprojecticon\endcsname {\simpleiconsmapeight\symbol{148}} + \expandafter\def\csname simpleicon@openscadicon\endcsname {\simpleiconsmapeight\symbol{149}} + \expandafter\def\csname simpleicon@openseaicon\endcsname {\simpleiconsmapeight\symbol{150}} + \expandafter\def\csname simpleicon@opensearchicon\endcsname {\simpleiconsmapeight\symbol{151}} + \expandafter\def\csname simpleicon@opensourcehardwareicon\endcsname {\simpleiconsmapeight\symbol{152}} + \expandafter\def\csname simpleicon@opensourceinitiativeicon\endcsname {\simpleiconsmapeight\symbol{153}} + \expandafter\def\csname simpleicon@opensslicon\endcsname {\simpleiconsmapeight\symbol{154}} + \expandafter\def\csname simpleicon@openstackicon\endcsname {\simpleiconsmapeight\symbol{155}} + \expandafter\def\csname simpleicon@openstreetmapicon\endcsname {\simpleiconsmapeight\symbol{156}} + \expandafter\def\csname simpleicon@opensuseicon\endcsname {\simpleiconsmapeight\symbol{157}} + \expandafter\def\csname simpleicon@opentelemetryicon\endcsname {\simpleiconsmapeight\symbol{158}} + \expandafter\def\csname simpleicon@opentexticon\endcsname {\simpleiconsmapeight\symbol{159}} + \expandafter\def\csname simpleicon@opentofuicon\endcsname {\simpleiconsmapeight\symbol{160}} + \expandafter\def\csname simpleicon@openverseicon\endcsname {\simpleiconsmapeight\symbol{161}} + \expandafter\def\csname simpleicon@openvpnicon\endcsname {\simpleiconsmapeight\symbol{162}} + \expandafter\def\csname simpleicon@openwrticon\endcsname {\simpleiconsmapeight\symbol{163}} + \expandafter\def\csname simpleicon@openzeppelinicon\endcsname {\simpleiconsmapeight\symbol{164}} + \expandafter\def\csname simpleicon@openzfsicon\endcsname {\simpleiconsmapeight\symbol{165}} + \expandafter\def\csname simpleicon@operaicon\endcsname {\simpleiconsmapeight\symbol{166}} + \expandafter\def\csname simpleicon@operagxicon\endcsname {\simpleiconsmapeight\symbol{167}} + \expandafter\def\csname simpleicon@opnsenseicon\endcsname {\simpleiconsmapeight\symbol{168}} + \expandafter\def\csname simpleicon@oppoicon\endcsname {\simpleiconsmapeight\symbol{169}} + \expandafter\def\csname simpleicon@opsgenieicon\endcsname {\simpleiconsmapeight\symbol{170}} + \expandafter\def\csname simpleicon@opslevelicon\endcsname {\simpleiconsmapeight\symbol{171}} + \expandafter\def\csname simpleicon@optimismicon\endcsname {\simpleiconsmapeight\symbol{172}} + \expandafter\def\csname simpleicon@oracleicon\endcsname {\simpleiconsmapeight\symbol{173}} + \expandafter\def\csname simpleicon@orangeicon\endcsname {\simpleiconsmapeight\symbol{174}} + \expandafter\def\csname simpleicon@orcidicon\endcsname {\simpleiconsmapeight\symbol{175}} + \expandafter\def\csname simpleicon@oreillyicon\endcsname {\simpleiconsmapeight\symbol{176}} + \expandafter\def\csname simpleicon@orgicon\endcsname {\simpleiconsmapeight\symbol{177}} + \expandafter\def\csname simpleicon@organicmapsicon\endcsname {\simpleiconsmapeight\symbol{178}} + \expandafter\def\csname simpleicon@originicon\endcsname {\simpleiconsmapeight\symbol{179}} + \expandafter\def\csname simpleicon@osanoicon\endcsname {\simpleiconsmapeight\symbol{180}} + \expandafter\def\csname simpleicon@osficon\endcsname {\simpleiconsmapeight\symbol{181}} + \expandafter\def\csname simpleicon@osgeoicon\endcsname {\simpleiconsmapeight\symbol{182}} + \expandafter\def\csname simpleicon@oshkoshicon\endcsname {\simpleiconsmapeight\symbol{183}} + \expandafter\def\csname simpleicon@osmcicon\endcsname {\simpleiconsmapeight\symbol{184}} + \expandafter\def\csname simpleicon@osuicon\endcsname {\simpleiconsmapeight\symbol{185}} + \expandafter\def\csname simpleicon@ottoicon\endcsname {\simpleiconsmapeight\symbol{186}} + \expandafter\def\csname simpleicon@outlineicon\endcsname {\simpleiconsmapeight\symbol{187}} + \expandafter\def\csname simpleicon@overcasticon\endcsname {\simpleiconsmapeight\symbol{188}} + \expandafter\def\csname simpleicon@overleaficon\endcsname {\simpleiconsmapeight\symbol{189}} + \expandafter\def\csname simpleicon@ovhicon\endcsname {\simpleiconsmapeight\symbol{190}} + \expandafter\def\csname simpleicon@owaspicon\endcsname {\simpleiconsmapeight\symbol{191}} + \expandafter\def\csname simpleicon@owncloudicon\endcsname {\simpleiconsmapeight\symbol{192}} + \expandafter\def\csname simpleicon@oxygenicon\endcsname {\simpleiconsmapeight\symbol{193}} + \expandafter\def\csname simpleicon@oyoicon\endcsname {\simpleiconsmapeight\symbol{194}} + \expandafter\def\csname simpleicon@p5dotjsicon\endcsname {\simpleiconsmapeight\symbol{195}} + \expandafter\def\csname simpleicon@packagisticon\endcsname {\simpleiconsmapeight\symbol{196}} + \expandafter\def\csname simpleicon@packericon\endcsname {\simpleiconsmapeight\symbol{197}} + \expandafter\def\csname simpleicon@packticon\endcsname {\simpleiconsmapeight\symbol{198}} + \expandafter\def\csname simpleicon@paddleicon\endcsname {\simpleiconsmapeight\symbol{199}} + \expandafter\def\csname simpleicon@paddlepaddleicon\endcsname {\simpleiconsmapeight\symbol{200}} + \expandafter\def\csname simpleicon@paddypowericon\endcsname {\simpleiconsmapeight\symbol{201}} + \expandafter\def\csname simpleicon@pagekiticon\endcsname {\simpleiconsmapeight\symbol{202}} + \expandafter\def\csname simpleicon@pagerdutyicon\endcsname {\simpleiconsmapeight\symbol{203}} + \expandafter\def\csname simpleicon@pagespeedinsightsicon\endcsname {\simpleiconsmapeight\symbol{204}} + \expandafter\def\csname simpleicon@pagseguroicon\endcsname {\simpleiconsmapeight\symbol{205}} + \expandafter\def\csname simpleicon@palantiricon\endcsname {\simpleiconsmapeight\symbol{206}} + \expandafter\def\csname simpleicon@paloaltonetworksicon\endcsname {\simpleiconsmapeight\symbol{207}} + \expandafter\def\csname simpleicon@paloaltosoftwareicon\endcsname {\simpleiconsmapeight\symbol{208}} + \expandafter\def\csname simpleicon@panasonicicon\endcsname {\simpleiconsmapeight\symbol{209}} + \expandafter\def\csname simpleicon@pandasicon\endcsname {\simpleiconsmapeight\symbol{210}} + \expandafter\def\csname simpleicon@pandoraicon\endcsname {\simpleiconsmapeight\symbol{211}} + \expandafter\def\csname simpleicon@pantheonicon\endcsname {\simpleiconsmapeight\symbol{212}} + \expandafter\def\csname simpleicon@paperlessngxicon\endcsname {\simpleiconsmapeight\symbol{213}} + \expandafter\def\csname simpleicon@paperspaceicon\endcsname {\simpleiconsmapeight\symbol{214}} + \expandafter\def\csname simpleicon@paperswithcodeicon\endcsname {\simpleiconsmapeight\symbol{215}} + \expandafter\def\csname simpleicon@paramountplusicon\endcsname {\simpleiconsmapeight\symbol{216}} + \expandafter\def\csname simpleicon@paritysubstrateicon\endcsname {\simpleiconsmapeight\symbol{217}} + \expandafter\def\csname simpleicon@parrotsecurityicon\endcsname {\simpleiconsmapeight\symbol{218}} + \expandafter\def\csname simpleicon@parsedotlyicon\endcsname {\simpleiconsmapeight\symbol{219}} + \expandafter\def\csname simpleicon@passporticon\endcsname {\simpleiconsmapeight\symbol{220}} + \expandafter\def\csname simpleicon@pastebinicon\endcsname {\simpleiconsmapeight\symbol{221}} + \expandafter\def\csname simpleicon@patreonicon\endcsname {\simpleiconsmapeight\symbol{222}} + \expandafter\def\csname simpleicon@paychexicon\endcsname {\simpleiconsmapeight\symbol{223}} + \expandafter\def\csname simpleicon@payhipicon\endcsname {\simpleiconsmapeight\symbol{224}} + \expandafter\def\csname simpleicon@payloadcmsicon\endcsname {\simpleiconsmapeight\symbol{225}} + \expandafter\def\csname simpleicon@payoneericon\endcsname {\simpleiconsmapeight\symbol{226}} + \expandafter\def\csname simpleicon@paypalicon\endcsname {\simpleiconsmapeight\symbol{227}} + \expandafter\def\csname simpleicon@paytmicon\endcsname {\simpleiconsmapeight\symbol{228}} + \expandafter\def\csname simpleicon@pcgamingwikiicon\endcsname {\simpleiconsmapeight\symbol{229}} + \expandafter\def\csname simpleicon@pdmicon\endcsname {\simpleiconsmapeight\symbol{230}} + \expandafter\def\csname simpleicon@pdqicon\endcsname {\simpleiconsmapeight\symbol{231}} + \expandafter\def\csname simpleicon@peakdesignicon\endcsname {\simpleiconsmapeight\symbol{232}} + \expandafter\def\csname simpleicon@pearsonicon\endcsname {\simpleiconsmapeight\symbol{233}} + \expandafter\def\csname simpleicon@peerlisticon\endcsname {\simpleiconsmapeight\symbol{234}} + \expandafter\def\csname simpleicon@peertubeicon\endcsname {\simpleiconsmapeight\symbol{235}} + \expandafter\def\csname simpleicon@pegasusairlinesicon\endcsname {\simpleiconsmapeight\symbol{236}} + \expandafter\def\csname simpleicon@pelicanicon\endcsname {\simpleiconsmapeight\symbol{237}} + \expandafter\def\csname simpleicon@pelotonicon\endcsname {\simpleiconsmapeight\symbol{238}} + \expandafter\def\csname simpleicon@pennyicon\endcsname {\simpleiconsmapeight\symbol{239}} + \expandafter\def\csname simpleicon@penpoticon\endcsname {\simpleiconsmapeight\symbol{240}} + \expandafter\def\csname simpleicon@percyicon\endcsname {\simpleiconsmapeight\symbol{241}} + \expandafter\def\csname simpleicon@perforceicon\endcsname {\simpleiconsmapeight\symbol{242}} + \expandafter\def\csname simpleicon@perlicon\endcsname {\simpleiconsmapeight\symbol{243}} + \expandafter\def\csname simpleicon@perplexityicon\endcsname {\simpleiconsmapeight\symbol{244}} + \expandafter\def\csname simpleicon@persistenticon\endcsname {\simpleiconsmapeight\symbol{245}} + \expandafter\def\csname simpleicon@personioicon\endcsname {\simpleiconsmapeight\symbol{246}} + \expandafter\def\csname simpleicon@petsathomeicon\endcsname {\simpleiconsmapeight\symbol{247}} + \expandafter\def\csname simpleicon@peugeoticon\endcsname {\simpleiconsmapeight\symbol{248}} + \expandafter\def\csname simpleicon@pexelsicon\endcsname {\simpleiconsmapeight\symbol{249}} + \expandafter\def\csname simpleicon@pfsenseicon\endcsname {\simpleiconsmapeight\symbol{250}} + \expandafter\def\csname simpleicon@phabricatoricon\endcsname {\simpleiconsmapeight\symbol{251}} + \expandafter\def\csname simpleicon@philipshueicon\endcsname {\simpleiconsmapeight\symbol{252}} + \expandafter\def\csname simpleicon@phoenixframeworkicon\endcsname {\simpleiconsmapeight\symbol{253}} + \expandafter\def\csname simpleicon@phonepeicon\endcsname {\simpleiconsmapeight\symbol{254}} + \expandafter\def\csname simpleicon@phosphoriconsicon\endcsname {\simpleiconsmapeight\symbol{255}} + \expandafter\def\csname simpleicon@photobucketicon\endcsname {\simpleiconsmapnine\symbol{0}} + \expandafter\def\csname simpleicon@photocrowdicon\endcsname {\simpleiconsmapnine\symbol{1}} + \expandafter\def\csname simpleicon@photonicon\endcsname {\simpleiconsmapnine\symbol{2}} + \expandafter\def\csname simpleicon@photopeaicon\endcsname {\simpleiconsmapnine\symbol{3}} + \expandafter\def\csname simpleicon@phpicon\endcsname {\simpleiconsmapnine\symbol{4}} + \expandafter\def\csname simpleicon@phpmyadminicon\endcsname {\simpleiconsmapnine\symbol{5}} + \expandafter\def\csname simpleicon@phpstormicon\endcsname {\simpleiconsmapnine\symbol{6}} + \expandafter\def\csname simpleicon@piaggiogroupicon\endcsname {\simpleiconsmapnine\symbol{7}} + \expandafter\def\csname simpleicon@piaproicon\endcsname {\simpleiconsmapnine\symbol{8}} + \expandafter\def\csname simpleicon@picardsurgelesicon\endcsname {\simpleiconsmapnine\symbol{9}} + \expandafter\def\csname simpleicon@picartodottvicon\endcsname {\simpleiconsmapnine\symbol{10}} + \expandafter\def\csname simpleicon@picnicicon\endcsname {\simpleiconsmapnine\symbol{11}} + \expandafter\def\csname simpleicon@picpayicon\endcsname {\simpleiconsmapnine\symbol{12}} + \expandafter\def\csname simpleicon@picrewicon\endcsname {\simpleiconsmapnine\symbol{13}} + \expandafter\def\csname simpleicon@picxyicon\endcsname {\simpleiconsmapnine\symbol{14}} + \expandafter\def\csname simpleicon@piholeicon\endcsname {\simpleiconsmapnine\symbol{15}} + \expandafter\def\csname simpleicon@pimcoreicon\endcsname {\simpleiconsmapnine\symbol{16}} + \expandafter\def\csname simpleicon@pinboardicon\endcsname {\simpleiconsmapnine\symbol{17}} + \expandafter\def\csname simpleicon@pinescripticon\endcsname {\simpleiconsmapnine\symbol{18}} + \expandafter\def\csname simpleicon@pinetworkicon\endcsname {\simpleiconsmapnine\symbol{19}} + \expandafter\def\csname simpleicon@pingdomicon\endcsname {\simpleiconsmapnine\symbol{20}} + \expandafter\def\csname simpleicon@pinoicon\endcsname {\simpleiconsmapnine\symbol{21}} + \expandafter\def\csname simpleicon@pinteresticon\endcsname {\simpleiconsmapnine\symbol{22}} + \expandafter\def\csname simpleicon@pioneerdjicon\endcsname {\simpleiconsmapnine\symbol{23}} + \expandafter\def\csname simpleicon@pipedicon\endcsname {\simpleiconsmapnine\symbol{24}} + \expandafter\def\csname simpleicon@pipxicon\endcsname {\simpleiconsmapnine\symbol{25}} + \expandafter\def\csname simpleicon@pivotaltrackericon\endcsname {\simpleiconsmapnine\symbol{26}} + \expandafter\def\csname simpleicon@piwigoicon\endcsname {\simpleiconsmapnine\symbol{27}} + \expandafter\def\csname simpleicon@pixicon\endcsname {\simpleiconsmapnine\symbol{28}} + \expandafter\def\csname simpleicon@pixabayicon\endcsname {\simpleiconsmapnine\symbol{29}} + \expandafter\def\csname simpleicon@pixelfedicon\endcsname {\simpleiconsmapnine\symbol{30}} + \expandafter\def\csname simpleicon@pixivicon\endcsname {\simpleiconsmapnine\symbol{31}} + \expandafter\def\csname simpleicon@pixlricon\endcsname {\simpleiconsmapnine\symbol{32}} + \expandafter\def\csname simpleicon@pkgsrcicon\endcsname {\simpleiconsmapnine\symbol{33}} + \expandafter\def\csname simpleicon@planeticon\endcsname {\simpleiconsmapnine\symbol{34}} + \expandafter\def\csname simpleicon@planetscaleicon\endcsname {\simpleiconsmapnine\symbol{35}} + \expandafter\def\csname simpleicon@plangridicon\endcsname {\simpleiconsmapnine\symbol{36}} + \expandafter\def\csname simpleicon@platformdotshicon\endcsname {\simpleiconsmapnine\symbol{37}} + \expandafter\def\csname simpleicon@platformioicon\endcsname {\simpleiconsmapnine\symbol{38}} + \expandafter\def\csname simpleicon@platziicon\endcsname {\simpleiconsmapnine\symbol{39}} + \expandafter\def\csname simpleicon@plausibleanalyticsicon\endcsname {\simpleiconsmapnine\symbol{40}} + \expandafter\def\csname simpleicon@playcanvasicon\endcsname {\simpleiconsmapnine\symbol{41}} + \expandafter\def\csname simpleicon@playerdotmeicon\endcsname {\simpleiconsmapnine\symbol{42}} + \expandafter\def\csname simpleicon@playerfmicon\endcsname {\simpleiconsmapnine\symbol{43}} + \expandafter\def\csname simpleicon@playstationicon\endcsname {\simpleiconsmapnine\symbol{44}} + \expandafter\def\csname simpleicon@playstation2icon\endcsname {\simpleiconsmapnine\symbol{45}} + \expandafter\def\csname simpleicon@playstation3icon\endcsname {\simpleiconsmapnine\symbol{46}} + \expandafter\def\csname simpleicon@playstation4icon\endcsname {\simpleiconsmapnine\symbol{47}} + \expandafter\def\csname simpleicon@playstation5icon\endcsname {\simpleiconsmapnine\symbol{48}} + \expandafter\def\csname simpleicon@playstationportableicon\endcsname {\simpleiconsmapnine\symbol{49}} + \expandafter\def\csname simpleicon@playstationvitaicon\endcsname {\simpleiconsmapnine\symbol{50}} + \expandafter\def\csname simpleicon@pleromaicon\endcsname {\simpleiconsmapnine\symbol{51}} + \expandafter\def\csname simpleicon@pleskicon\endcsname {\simpleiconsmapnine\symbol{52}} + \expandafter\def\csname simpleicon@plexicon\endcsname {\simpleiconsmapnine\symbol{53}} + \expandafter\def\csname simpleicon@plotlyicon\endcsname {\simpleiconsmapnine\symbol{54}} + \expandafter\def\csname simpleicon@plumeicon\endcsname {\simpleiconsmapnine\symbol{55}} + \expandafter\def\csname simpleicon@pluralsighticon\endcsname {\simpleiconsmapnine\symbol{56}} + \expandafter\def\csname simpleicon@plurkicon\endcsname {\simpleiconsmapnine\symbol{57}} + \expandafter\def\csname simpleicon@pluscodesicon\endcsname {\simpleiconsmapnine\symbol{58}} + \expandafter\def\csname simpleicon@pm2icon\endcsname {\simpleiconsmapnine\symbol{59}} + \expandafter\def\csname simpleicon@pnpmicon\endcsname {\simpleiconsmapnine\symbol{60}} + \expandafter\def\csname simpleicon@pocketicon\endcsname {\simpleiconsmapnine\symbol{61}} + \expandafter\def\csname simpleicon@pocketbaseicon\endcsname {\simpleiconsmapnine\symbol{62}} + \expandafter\def\csname simpleicon@pocketcastsicon\endcsname {\simpleiconsmapnine\symbol{63}} + \expandafter\def\csname simpleicon@podcastaddicticon\endcsname {\simpleiconsmapnine\symbol{64}} + \expandafter\def\csname simpleicon@podcastindexicon\endcsname {\simpleiconsmapnine\symbol{65}} + \expandafter\def\csname simpleicon@podmanicon\endcsname {\simpleiconsmapnine\symbol{66}} + \expandafter\def\csname simpleicon@poeicon\endcsname {\simpleiconsmapnine\symbol{67}} + \expandafter\def\csname simpleicon@poetryicon\endcsname {\simpleiconsmapnine\symbol{68}} + \expandafter\def\csname simpleicon@pointyicon\endcsname {\simpleiconsmapnine\symbol{69}} + \expandafter\def\csname simpleicon@pokemonicon\endcsname {\simpleiconsmapnine\symbol{70}} + \expandafter\def\csname simpleicon@polarsicon\endcsname {\simpleiconsmapnine\symbol{71}} + \expandafter\def\csname simpleicon@polestaricon\endcsname {\simpleiconsmapnine\symbol{72}} + \expandafter\def\csname simpleicon@polkadoticon\endcsname {\simpleiconsmapnine\symbol{73}} + \expandafter\def\csname simpleicon@polyicon\endcsname {\simpleiconsmapnine\symbol{74}} + \expandafter\def\csname simpleicon@polygonicon\endcsname {\simpleiconsmapnine\symbol{75}} + \expandafter\def\csname simpleicon@polymerprojecticon\endcsname {\simpleiconsmapnine\symbol{76}} + \expandafter\def\csname simpleicon@polyworkicon\endcsname {\simpleiconsmapnine\symbol{77}} + \expandafter\def\csname simpleicon@pond5icon\endcsname {\simpleiconsmapnine\symbol{78}} + \expandafter\def\csname simpleicon@poposicon\endcsname {\simpleiconsmapnine\symbol{79}} + \expandafter\def\csname simpleicon@porkbunicon\endcsname {\simpleiconsmapnine\symbol{80}} + \expandafter\def\csname simpleicon@porscheicon\endcsname {\simpleiconsmapnine\symbol{81}} + \expandafter\def\csname simpleicon@portainericon\endcsname {\simpleiconsmapnine\symbol{82}} + \expandafter\def\csname simpleicon@portswiggericon\endcsname {\simpleiconsmapnine\symbol{83}} + \expandafter\def\csname simpleicon@positicon\endcsname {\simpleiconsmapnine\symbol{84}} + \expandafter\def\csname simpleicon@postcssicon\endcsname {\simpleiconsmapnine\symbol{85}} + \expandafter\def\csname simpleicon@postgresqlicon\endcsname {\simpleiconsmapnine\symbol{86}} + \expandafter\def\csname simpleicon@posthogicon\endcsname {\simpleiconsmapnine\symbol{87}} + \expandafter\def\csname simpleicon@postmanicon\endcsname {\simpleiconsmapnine\symbol{88}} + \expandafter\def\csname simpleicon@postmatesicon\endcsname {\simpleiconsmapnine\symbol{89}} + \expandafter\def\csname simpleicon@powersicon\endcsname {\simpleiconsmapnine\symbol{90}} + \expandafter\def\csname simpleicon@prdotcoicon\endcsname {\simpleiconsmapnine\symbol{91}} + \expandafter\def\csname simpleicon@preacticon\endcsname {\simpleiconsmapnine\symbol{92}} + \expandafter\def\csname simpleicon@precommiticon\endcsname {\simpleiconsmapnine\symbol{93}} + \expandafter\def\csname simpleicon@prefecticon\endcsname {\simpleiconsmapnine\symbol{94}} + \expandafter\def\csname simpleicon@premierleagueicon\endcsname {\simpleiconsmapnine\symbol{95}} + \expandafter\def\csname simpleicon@prepbytesicon\endcsname {\simpleiconsmapnine\symbol{96}} + \expandafter\def\csname simpleicon@prestashopicon\endcsname {\simpleiconsmapnine\symbol{97}} + \expandafter\def\csname simpleicon@prestoicon\endcsname {\simpleiconsmapnine\symbol{98}} + \expandafter\def\csname simpleicon@prettiericon\endcsname {\simpleiconsmapnine\symbol{99}} + \expandafter\def\csname simpleicon@pretzelicon\endcsname {\simpleiconsmapnine\symbol{100}} + \expandafter\def\csname simpleicon@preventionicon\endcsname {\simpleiconsmapnine\symbol{101}} + \expandafter\def\csname simpleicon@preziicon\endcsname {\simpleiconsmapnine\symbol{102}} + \expandafter\def\csname simpleicon@primeicon\endcsname {\simpleiconsmapnine\symbol{103}} + \expandafter\def\csname simpleicon@primengicon\endcsname {\simpleiconsmapnine\symbol{104}} + \expandafter\def\csname simpleicon@primereacticon\endcsname {\simpleiconsmapnine\symbol{105}} + \expandafter\def\csname simpleicon@primevideoicon\endcsname {\simpleiconsmapnine\symbol{106}} + \expandafter\def\csname simpleicon@printablesicon\endcsname {\simpleiconsmapnine\symbol{107}} + \expandafter\def\csname simpleicon@prismaicon\endcsname {\simpleiconsmapnine\symbol{108}} + \expandafter\def\csname simpleicon@prismicicon\endcsname {\simpleiconsmapnine\symbol{109}} + \expandafter\def\csname simpleicon@privatedivisionicon\endcsname {\simpleiconsmapnine\symbol{110}} + \expandafter\def\csname simpleicon@privateinternetaccessicon\endcsname {\simpleiconsmapnine\symbol{111}} + \expandafter\def\csname simpleicon@proboticon\endcsname {\simpleiconsmapnine\symbol{112}} + \expandafter\def\csname simpleicon@processingfoundationicon\endcsname {\simpleiconsmapnine\symbol{113}} + \expandafter\def\csname simpleicon@processwireicon\endcsname {\simpleiconsmapnine\symbol{114}} + \expandafter\def\csname simpleicon@producthunticon\endcsname {\simpleiconsmapnine\symbol{115}} + \expandafter\def\csname simpleicon@progateicon\endcsname {\simpleiconsmapnine\symbol{116}} + \expandafter\def\csname simpleicon@progressicon\endcsname {\simpleiconsmapnine\symbol{117}} + \expandafter\def\csname simpleicon@prometheusicon\endcsname {\simpleiconsmapnine\symbol{118}} + \expandafter\def\csname simpleicon@pronounsdotpageicon\endcsname {\simpleiconsmapnine\symbol{119}} + \expandafter\def\csname simpleicon@prosiebenicon\endcsname {\simpleiconsmapnine\symbol{120}} + \expandafter\def\csname simpleicon@proteusicon\endcsname {\simpleiconsmapnine\symbol{121}} + \expandafter\def\csname simpleicon@protocolsdotioicon\endcsname {\simpleiconsmapnine\symbol{122}} + \expandafter\def\csname simpleicon@protodotioicon\endcsname {\simpleiconsmapnine\symbol{123}} + \expandafter\def\csname simpleicon@protonicon\endcsname {\simpleiconsmapnine\symbol{124}} + \expandafter\def\csname simpleicon@protoncalendaricon\endcsname {\simpleiconsmapnine\symbol{125}} + \expandafter\def\csname simpleicon@protondbicon\endcsname {\simpleiconsmapnine\symbol{126}} + \expandafter\def\csname simpleicon@protondriveicon\endcsname {\simpleiconsmapnine\symbol{127}} + \expandafter\def\csname simpleicon@protonmailicon\endcsname {\simpleiconsmapnine\symbol{128}} + \expandafter\def\csname simpleicon@protonvpnicon\endcsname {\simpleiconsmapnine\symbol{129}} + \expandafter\def\csname simpleicon@protoolsicon\endcsname {\simpleiconsmapnine\symbol{130}} + \expandafter\def\csname simpleicon@protractoricon\endcsname {\simpleiconsmapnine\symbol{131}} + \expandafter\def\csname simpleicon@proxmoxicon\endcsname {\simpleiconsmapnine\symbol{132}} + \expandafter\def\csname simpleicon@pterodactylicon\endcsname {\simpleiconsmapnine\symbol{133}} + \expandafter\def\csname simpleicon@pubgicon\endcsname {\simpleiconsmapnine\symbol{134}} + \expandafter\def\csname simpleicon@publonsicon\endcsname {\simpleiconsmapnine\symbol{135}} + \expandafter\def\csname simpleicon@pubmedicon\endcsname {\simpleiconsmapnine\symbol{136}} + \expandafter\def\csname simpleicon@pugicon\endcsname {\simpleiconsmapnine\symbol{137}} + \expandafter\def\csname simpleicon@pulumiicon\endcsname {\simpleiconsmapnine\symbol{138}} + \expandafter\def\csname simpleicon@pumaicon\endcsname {\simpleiconsmapnine\symbol{139}} + \expandafter\def\csname simpleicon@puppeticon\endcsname {\simpleiconsmapnine\symbol{140}} + \expandafter\def\csname simpleicon@puppeteericon\endcsname {\simpleiconsmapnine\symbol{141}} + \expandafter\def\csname simpleicon@purescripticon\endcsname {\simpleiconsmapnine\symbol{142}} + \expandafter\def\csname simpleicon@purgecssicon\endcsname {\simpleiconsmapnine\symbol{143}} + \expandafter\def\csname simpleicon@purismicon\endcsname {\simpleiconsmapnine\symbol{144}} + \expandafter\def\csname simpleicon@pushbulleticon\endcsname {\simpleiconsmapnine\symbol{145}} + \expandafter\def\csname simpleicon@pushericon\endcsname {\simpleiconsmapnine\symbol{146}} + \expandafter\def\csname simpleicon@pwaicon\endcsname {\simpleiconsmapnine\symbol{147}} + \expandafter\def\csname simpleicon@pycharmicon\endcsname {\simpleiconsmapnine\symbol{148}} + \expandafter\def\csname simpleicon@pycqaicon\endcsname {\simpleiconsmapnine\symbol{149}} + \expandafter\def\csname simpleicon@pydanticicon\endcsname {\simpleiconsmapnine\symbol{150}} + \expandafter\def\csname simpleicon@pygicon\endcsname {\simpleiconsmapnine\symbol{151}} + \expandafter\def\csname simpleicon@pypiicon\endcsname {\simpleiconsmapnine\symbol{152}} + \expandafter\def\csname simpleicon@pypyicon\endcsname {\simpleiconsmapnine\symbol{153}} + \expandafter\def\csname simpleicon@pyscaffoldicon\endcsname {\simpleiconsmapnine\symbol{154}} + \expandafter\def\csname simpleicon@pysyfticon\endcsname {\simpleiconsmapnine\symbol{155}} + \expandafter\def\csname simpleicon@pytesticon\endcsname {\simpleiconsmapnine\symbol{156}} + \expandafter\def\csname simpleicon@pythonicon\endcsname {\simpleiconsmapnine\symbol{157}} + \expandafter\def\csname simpleicon@pythonanywhereicon\endcsname {\simpleiconsmapnine\symbol{158}} + \expandafter\def\csname simpleicon@pytorchicon\endcsname {\simpleiconsmapnine\symbol{159}} + \expandafter\def\csname simpleicon@pyupicon\endcsname {\simpleiconsmapnine\symbol{160}} + \expandafter\def\csname simpleicon@qantasicon\endcsname {\simpleiconsmapnine\symbol{161}} + \expandafter\def\csname simpleicon@qaseicon\endcsname {\simpleiconsmapnine\symbol{162}} + \expandafter\def\csname simpleicon@qatarairwaysicon\endcsname {\simpleiconsmapnine\symbol{163}} + \expandafter\def\csname simpleicon@qbittorrenticon\endcsname {\simpleiconsmapnine\symbol{164}} + \expandafter\def\csname simpleicon@qemuicon\endcsname {\simpleiconsmapnine\symbol{165}} + \expandafter\def\csname simpleicon@qgisicon\endcsname {\simpleiconsmapnine\symbol{166}} + \expandafter\def\csname simpleicon@qiicon\endcsname {\simpleiconsmapnine\symbol{167}} + \expandafter\def\csname simpleicon@qiitaicon\endcsname {\simpleiconsmapnine\symbol{168}} + \expandafter\def\csname simpleicon@qiskiticon\endcsname {\simpleiconsmapnine\symbol{169}} + \expandafter\def\csname simpleicon@qiwiicon\endcsname {\simpleiconsmapnine\symbol{170}} + \expandafter\def\csname simpleicon@qlikicon\endcsname {\simpleiconsmapnine\symbol{171}} + \expandafter\def\csname simpleicon@qmkicon\endcsname {\simpleiconsmapnine\symbol{172}} + \expandafter\def\csname simpleicon@qnapicon\endcsname {\simpleiconsmapnine\symbol{173}} + \expandafter\def\csname simpleicon@qticon\endcsname {\simpleiconsmapnine\symbol{174}} + \expandafter\def\csname simpleicon@qualcommicon\endcsname {\simpleiconsmapnine\symbol{175}} + \expandafter\def\csname simpleicon@qualtricsicon\endcsname {\simpleiconsmapnine\symbol{176}} + \expandafter\def\csname simpleicon@qualysicon\endcsname {\simpleiconsmapnine\symbol{177}} + \expandafter\def\csname simpleicon@quantcasticon\endcsname {\simpleiconsmapnine\symbol{178}} + \expandafter\def\csname simpleicon@quantconnecticon\endcsname {\simpleiconsmapnine\symbol{179}} + \expandafter\def\csname simpleicon@quarkusicon\endcsname {\simpleiconsmapnine\symbol{180}} + \expandafter\def\csname simpleicon@quartoicon\endcsname {\simpleiconsmapnine\symbol{181}} + \expandafter\def\csname simpleicon@quasaricon\endcsname {\simpleiconsmapnine\symbol{182}} + \expandafter\def\csname simpleicon@qubesosicon\endcsname {\simpleiconsmapnine\symbol{183}} + \expandafter\def\csname simpleicon@questicon\endcsname {\simpleiconsmapnine\symbol{184}} + \expandafter\def\csname simpleicon@quickbooksicon\endcsname {\simpleiconsmapnine\symbol{185}} + \expandafter\def\csname simpleicon@quicklookicon\endcsname {\simpleiconsmapnine\symbol{186}} + \expandafter\def\csname simpleicon@quicktimeicon\endcsname {\simpleiconsmapnine\symbol{187}} + \expandafter\def\csname simpleicon@quicktypeicon\endcsname {\simpleiconsmapnine\symbol{188}} + \expandafter\def\csname simpleicon@quipicon\endcsname {\simpleiconsmapnine\symbol{189}} + \expandafter\def\csname simpleicon@quizleticon\endcsname {\simpleiconsmapnine\symbol{190}} + \expandafter\def\csname simpleicon@quoraicon\endcsname {\simpleiconsmapnine\symbol{191}} + \expandafter\def\csname simpleicon@qwanticon\endcsname {\simpleiconsmapnine\symbol{192}} + \expandafter\def\csname simpleicon@qwikicon\endcsname {\simpleiconsmapnine\symbol{193}} + \expandafter\def\csname simpleicon@qwiklabsicon\endcsname {\simpleiconsmapnine\symbol{194}} + \expandafter\def\csname simpleicon@qzoneicon\endcsname {\simpleiconsmapnine\symbol{195}} + \expandafter\def\csname simpleicon@ricon\endcsname {\simpleiconsmapnine\symbol{196}} + \expandafter\def\csname simpleicon@r3icon\endcsname {\simpleiconsmapnine\symbol{197}} + \expandafter\def\csname simpleicon@rabbitmqicon\endcsname {\simpleiconsmapnine\symbol{198}} + \expandafter\def\csname simpleicon@racketicon\endcsname {\simpleiconsmapnine\symbol{199}} + \expandafter\def\csname simpleicon@radaricon\endcsname {\simpleiconsmapnine\symbol{200}} + \expandafter\def\csname simpleicon@radarricon\endcsname {\simpleiconsmapnine\symbol{201}} + \expandafter\def\csname simpleicon@radiopublicicon\endcsname {\simpleiconsmapnine\symbol{202}} + \expandafter\def\csname simpleicon@radixuiicon\endcsname {\simpleiconsmapnine\symbol{203}} + \expandafter\def\csname simpleicon@radstudioicon\endcsname {\simpleiconsmapnine\symbol{204}} + \expandafter\def\csname simpleicon@railwayicon\endcsname {\simpleiconsmapnine\symbol{205}} + \expandafter\def\csname simpleicon@rainmetericon\endcsname {\simpleiconsmapnine\symbol{206}} + \expandafter\def\csname simpleicon@rakutenicon\endcsname {\simpleiconsmapnine\symbol{207}} + \expandafter\def\csname simpleicon@ramicon\endcsname {\simpleiconsmapnine\symbol{208}} + \expandafter\def\csname simpleicon@ranchericon\endcsname {\simpleiconsmapnine\symbol{209}} + \expandafter\def\csname simpleicon@rapidicon\endcsname {\simpleiconsmapnine\symbol{210}} + \expandafter\def\csname simpleicon@raribleicon\endcsname {\simpleiconsmapnine\symbol{211}} + \expandafter\def\csname simpleicon@rasaicon\endcsname {\simpleiconsmapnine\symbol{212}} + \expandafter\def\csname simpleicon@raspberrypiicon\endcsname {\simpleiconsmapnine\symbol{213}} + \expandafter\def\csname simpleicon@ravelryicon\endcsname {\simpleiconsmapnine\symbol{214}} + \expandafter\def\csname simpleicon@rayicon\endcsname {\simpleiconsmapnine\symbol{215}} + \expandafter\def\csname simpleicon@raycasticon\endcsname {\simpleiconsmapnine\symbol{216}} + \expandafter\def\csname simpleicon@raylibicon\endcsname {\simpleiconsmapnine\symbol{217}} + \expandafter\def\csname simpleicon@razericon\endcsname {\simpleiconsmapnine\symbol{218}} + \expandafter\def\csname simpleicon@razorpayicon\endcsname {\simpleiconsmapnine\symbol{219}} + \expandafter\def\csname simpleicon@rcloneicon\endcsname {\simpleiconsmapnine\symbol{220}} + \expandafter\def\csname simpleicon@reacticon\endcsname {\simpleiconsmapnine\symbol{221}} + \expandafter\def\csname simpleicon@reactbootstrapicon\endcsname {\simpleiconsmapnine\symbol{222}} + \expandafter\def\csname simpleicon@reacthookformicon\endcsname {\simpleiconsmapnine\symbol{223}} + \expandafter\def\csname simpleicon@reactiveresumeicon\endcsname {\simpleiconsmapnine\symbol{224}} + \expandafter\def\csname simpleicon@reactivexicon\endcsname {\simpleiconsmapnine\symbol{225}} + \expandafter\def\csname simpleicon@reactosicon\endcsname {\simpleiconsmapnine\symbol{226}} + \expandafter\def\csname simpleicon@reactqueryicon\endcsname {\simpleiconsmapnine\symbol{227}} + \expandafter\def\csname simpleicon@reactroutericon\endcsname {\simpleiconsmapnine\symbol{228}} + \expandafter\def\csname simpleicon@reacttableicon\endcsname {\simpleiconsmapnine\symbol{229}} + \expandafter\def\csname simpleicon@readdotcvicon\endcsname {\simpleiconsmapnine\symbol{230}} + \expandafter\def\csname simpleicon@readmeicon\endcsname {\simpleiconsmapnine\symbol{231}} + \expandafter\def\csname simpleicon@readthedocsicon\endcsname {\simpleiconsmapnine\symbol{232}} + \expandafter\def\csname simpleicon@realmicon\endcsname {\simpleiconsmapnine\symbol{233}} + \expandafter\def\csname simpleicon@reasonicon\endcsname {\simpleiconsmapnine\symbol{234}} + \expandafter\def\csname simpleicon@reasonstudiosicon\endcsname {\simpleiconsmapnine\symbol{235}} + \expandafter\def\csname simpleicon@recoilicon\endcsname {\simpleiconsmapnine\symbol{236}} + \expandafter\def\csname simpleicon@redicon\endcsname {\simpleiconsmapnine\symbol{237}} + \expandafter\def\csname simpleicon@redashicon\endcsname {\simpleiconsmapnine\symbol{238}} + \expandafter\def\csname simpleicon@redbubbleicon\endcsname {\simpleiconsmapnine\symbol{239}} + \expandafter\def\csname simpleicon@redbullicon\endcsname {\simpleiconsmapnine\symbol{240}} + \expandafter\def\csname simpleicon@redditicon\endcsname {\simpleiconsmapnine\symbol{241}} + \expandafter\def\csname simpleicon@redhaticon\endcsname {\simpleiconsmapnine\symbol{242}} + \expandafter\def\csname simpleicon@redhatopenshifticon\endcsname {\simpleiconsmapnine\symbol{243}} + \expandafter\def\csname simpleicon@redisicon\endcsname {\simpleiconsmapnine\symbol{244}} + \expandafter\def\csname simpleicon@redmineicon\endcsname {\simpleiconsmapnine\symbol{245}} + \expandafter\def\csname simpleicon@redoxicon\endcsname {\simpleiconsmapnine\symbol{246}} + \expandafter\def\csname simpleicon@redragonicon\endcsname {\simpleiconsmapnine\symbol{247}} + \expandafter\def\csname simpleicon@redsysicon\endcsname {\simpleiconsmapnine\symbol{248}} + \expandafter\def\csname simpleicon@reduxicon\endcsname {\simpleiconsmapnine\symbol{249}} + \expandafter\def\csname simpleicon@reduxsagaicon\endcsname {\simpleiconsmapnine\symbol{250}} + \expandafter\def\csname simpleicon@redwoodjsicon\endcsname {\simpleiconsmapnine\symbol{251}} + \expandafter\def\csname simpleicon@reebokicon\endcsname {\simpleiconsmapnine\symbol{252}} + \expandafter\def\csname simpleicon@refineicon\endcsname {\simpleiconsmapnine\symbol{253}} + \expandafter\def\csname simpleicon@relayicon\endcsname {\simpleiconsmapnine\symbol{254}} + \expandafter\def\csname simpleicon@relianceindustrieslimitedicon\endcsname {\simpleiconsmapnine\symbol{255}} + \expandafter\def\csname simpleicon@remarkicon\endcsname {\simpleiconsmaponezero\symbol{0}} + \expandafter\def\csname simpleicon@remedyentertainmenticon\endcsname {\simpleiconsmaponezero\symbol{1}} + \expandafter\def\csname simpleicon@remixicon\endcsname {\simpleiconsmaponezero\symbol{2}} + \expandafter\def\csname simpleicon@removedotbgicon\endcsname {\simpleiconsmaponezero\symbol{3}} + \expandafter\def\csname simpleicon@renaulticon\endcsname {\simpleiconsmaponezero\symbol{4}} + \expandafter\def\csname simpleicon@rendericon\endcsname {\simpleiconsmaponezero\symbol{5}} + \expandafter\def\csname simpleicon@renovateicon\endcsname {\simpleiconsmaponezero\symbol{6}} + \expandafter\def\csname simpleicon@renpyicon\endcsname {\simpleiconsmaponezero\symbol{7}} + \expandafter\def\csname simpleicon@renrenicon\endcsname {\simpleiconsmaponezero\symbol{8}} + \expandafter\def\csname simpleicon@repliticon\endcsname {\simpleiconsmaponezero\symbol{9}} + \expandafter\def\csname simpleicon@republicofgamersicon\endcsname {\simpleiconsmaponezero\symbol{10}} + \expandafter\def\csname simpleicon@rescripticon\endcsname {\simpleiconsmaponezero\symbol{11}} + \expandafter\def\csname simpleicon@rescuetimeicon\endcsname {\simpleiconsmaponezero\symbol{12}} + \expandafter\def\csname simpleicon@researchgateicon\endcsname {\simpleiconsmaponezero\symbol{13}} + \expandafter\def\csname simpleicon@resendicon\endcsname {\simpleiconsmaponezero\symbol{14}} + \expandafter\def\csname simpleicon@resharpericon\endcsname {\simpleiconsmaponezero\symbol{15}} + \expandafter\def\csname simpleicon@resurrectionremixosicon\endcsname {\simpleiconsmaponezero\symbol{16}} + \expandafter\def\csname simpleicon@retoolicon\endcsname {\simpleiconsmaponezero\symbol{17}} + \expandafter\def\csname simpleicon@retroarchicon\endcsname {\simpleiconsmaponezero\symbol{18}} + \expandafter\def\csname simpleicon@retropieicon\endcsname {\simpleiconsmaponezero\symbol{19}} + \expandafter\def\csname simpleicon@revancedicon\endcsname {\simpleiconsmaponezero\symbol{20}} + \expandafter\def\csname simpleicon@revealdotjsicon\endcsname {\simpleiconsmaponezero\symbol{21}} + \expandafter\def\csname simpleicon@reverbnationicon\endcsname {\simpleiconsmaponezero\symbol{22}} + \expandafter\def\csname simpleicon@revoltdotchaticon\endcsname {\simpleiconsmaponezero\symbol{23}} + \expandafter\def\csname simpleicon@revoluticon\endcsname {\simpleiconsmaponezero\symbol{24}} + \expandafter\def\csname simpleicon@revueicon\endcsname {\simpleiconsmaponezero\symbol{25}} + \expandafter\def\csname simpleicon@reweicon\endcsname {\simpleiconsmaponezero\symbol{26}} + \expandafter\def\csname simpleicon@rezgoicon\endcsname {\simpleiconsmaponezero\symbol{27}} + \expandafter\def\csname simpleicon@rhinocerosicon\endcsname {\simpleiconsmaponezero\symbol{28}} + \expandafter\def\csname simpleicon@richicon\endcsname {\simpleiconsmaponezero\symbol{29}} + \expandafter\def\csname simpleicon@ridericon\endcsname {\simpleiconsmaponezero\symbol{30}} + \expandafter\def\csname simpleicon@rimacautomobiliicon\endcsname {\simpleiconsmaponezero\symbol{31}} + \expandafter\def\csname simpleicon@rimeicon\endcsname {\simpleiconsmaponezero\symbol{32}} + \expandafter\def\csname simpleicon@ringicon\endcsname {\simpleiconsmaponezero\symbol{33}} + \expandafter\def\csname simpleicon@riotgamesicon\endcsname {\simpleiconsmaponezero\symbol{34}} + \expandafter\def\csname simpleicon@rippleicon\endcsname {\simpleiconsmaponezero\symbol{35}} + \expandafter\def\csname simpleicon@riscvicon\endcsname {\simpleiconsmaponezero\symbol{36}} + \expandafter\def\csname simpleicon@riseupicon\endcsname {\simpleiconsmaponezero\symbol{37}} + \expandafter\def\csname simpleicon@ritzcarltonicon\endcsname {\simpleiconsmaponezero\symbol{38}} + \expandafter\def\csname simpleicon@riveicon\endcsname {\simpleiconsmaponezero\symbol{39}} + \expandafter\def\csname simpleicon@roadmapdotshicon\endcsname {\simpleiconsmaponezero\symbol{40}} + \expandafter\def\csname simpleicon@roamresearchicon\endcsname {\simpleiconsmaponezero\symbol{41}} + \expandafter\def\csname simpleicon@robinhoodicon\endcsname {\simpleiconsmaponezero\symbol{42}} + \expandafter\def\csname simpleicon@robloxicon\endcsname {\simpleiconsmaponezero\symbol{43}} + \expandafter\def\csname simpleicon@robloxstudioicon\endcsname {\simpleiconsmaponezero\symbol{44}} + \expandafter\def\csname simpleicon@robotframeworkicon\endcsname {\simpleiconsmaponezero\symbol{45}} + \expandafter\def\csname simpleicon@rocketicon\endcsname {\simpleiconsmaponezero\symbol{46}} + \expandafter\def\csname simpleicon@rocketdotchaticon\endcsname {\simpleiconsmaponezero\symbol{47}} + \expandafter\def\csname simpleicon@rocksdbicon\endcsname {\simpleiconsmaponezero\symbol{48}} + \expandafter\def\csname simpleicon@rockstargamesicon\endcsname {\simpleiconsmaponezero\symbol{49}} + \expandafter\def\csname simpleicon@rockwellautomationicon\endcsname {\simpleiconsmaponezero\symbol{50}} + \expandafter\def\csname simpleicon@rockylinuxicon\endcsname {\simpleiconsmaponezero\symbol{51}} + \expandafter\def\csname simpleicon@rokuicon\endcsname {\simpleiconsmaponezero\symbol{52}} + \expandafter\def\csname simpleicon@roll20icon\endcsname {\simpleiconsmaponezero\symbol{53}} + \expandafter\def\csname simpleicon@rollsroyceicon\endcsname {\simpleiconsmaponezero\symbol{54}} + \expandafter\def\csname simpleicon@rollupdotjsicon\endcsname {\simpleiconsmaponezero\symbol{55}} + \expandafter\def\csname simpleicon@roonicon\endcsname {\simpleiconsmaponezero\symbol{56}} + \expandafter\def\csname simpleicon@rootmeicon\endcsname {\simpleiconsmaponezero\symbol{57}} + \expandafter\def\csname simpleicon@rootsicon\endcsname {\simpleiconsmaponezero\symbol{58}} + \expandafter\def\csname simpleicon@rootsbedrockicon\endcsname {\simpleiconsmaponezero\symbol{59}} + \expandafter\def\csname simpleicon@rootssageicon\endcsname {\simpleiconsmaponezero\symbol{60}} + \expandafter\def\csname simpleicon@rosicon\endcsname {\simpleiconsmaponezero\symbol{61}} + \expandafter\def\csname simpleicon@rossmannicon\endcsname {\simpleiconsmaponezero\symbol{62}} + \expandafter\def\csname simpleicon@rotaryinternationalicon\endcsname {\simpleiconsmaponezero\symbol{63}} + \expandafter\def\csname simpleicon@rottentomatoesicon\endcsname {\simpleiconsmaponezero\symbol{64}} + \expandafter\def\csname simpleicon@roundcubeicon\endcsname {\simpleiconsmaponezero\symbol{65}} + \expandafter\def\csname simpleicon@rsocketicon\endcsname {\simpleiconsmaponezero\symbol{66}} + \expandafter\def\csname simpleicon@rssicon\endcsname {\simpleiconsmaponezero\symbol{67}} + \expandafter\def\csname simpleicon@rstudioideicon\endcsname {\simpleiconsmaponezero\symbol{68}} + \expandafter\def\csname simpleicon@rteicon\endcsname {\simpleiconsmaponezero\symbol{69}} + \expandafter\def\csname simpleicon@rtlicon\endcsname {\simpleiconsmaponezero\symbol{70}} + \expandafter\def\csname simpleicon@rtlzweiicon\endcsname {\simpleiconsmaponezero\symbol{71}} + \expandafter\def\csname simpleicon@rtmicon\endcsname {\simpleiconsmaponezero\symbol{72}} + \expandafter\def\csname simpleicon@rubocopicon\endcsname {\simpleiconsmaponezero\symbol{73}} + \expandafter\def\csname simpleicon@rubyicon\endcsname {\simpleiconsmaponezero\symbol{74}} + \expandafter\def\csname simpleicon@rubygemsicon\endcsname {\simpleiconsmaponezero\symbol{75}} + \expandafter\def\csname simpleicon@rubymineicon\endcsname {\simpleiconsmaponezero\symbol{76}} + \expandafter\def\csname simpleicon@rubyonrailsicon\endcsname {\simpleiconsmaponezero\symbol{77}} + \expandafter\def\csname simpleicon@rubysinatraicon\endcsname {\simpleiconsmaponezero\symbol{78}} + \expandafter\def\csname simpleicon@rufficon\endcsname {\simpleiconsmaponezero\symbol{79}} + \expandafter\def\csname simpleicon@rumahwebicon\endcsname {\simpleiconsmaponezero\symbol{80}} + \expandafter\def\csname simpleicon@rumbleicon\endcsname {\simpleiconsmaponezero\symbol{81}} + \expandafter\def\csname simpleicon@rundeckicon\endcsname {\simpleiconsmaponezero\symbol{82}} + \expandafter\def\csname simpleicon@runkeepericon\endcsname {\simpleiconsmaponezero\symbol{83}} + \expandafter\def\csname simpleicon@runkiticon\endcsname {\simpleiconsmaponezero\symbol{84}} + \expandafter\def\csname simpleicon@runrundotiticon\endcsname {\simpleiconsmaponezero\symbol{85}} + \expandafter\def\csname simpleicon@rusticon\endcsname {\simpleiconsmaponezero\symbol{86}} + \expandafter\def\csname simpleicon@rustdeskicon\endcsname {\simpleiconsmaponezero\symbol{87}} + \expandafter\def\csname simpleicon@rxdbicon\endcsname {\simpleiconsmaponezero\symbol{88}} + \expandafter\def\csname simpleicon@ryanairicon\endcsname {\simpleiconsmaponezero\symbol{89}} + \expandafter\def\csname simpleicon@ryeicon\endcsname {\simpleiconsmaponezero\symbol{90}} + \expandafter\def\csname simpleicon@s7airlinesicon\endcsname {\simpleiconsmaponezero\symbol{91}} + \expandafter\def\csname simpleicon@sabanciicon\endcsname {\simpleiconsmaponezero\symbol{92}} + \expandafter\def\csname simpleicon@safariicon\endcsname {\simpleiconsmaponezero\symbol{93}} + \expandafter\def\csname simpleicon@sageicon\endcsname {\simpleiconsmaponezero\symbol{94}} + \expandafter\def\csname simpleicon@sahibindenicon\endcsname {\simpleiconsmaponezero\symbol{95}} + \expandafter\def\csname simpleicon@sailfishosicon\endcsname {\simpleiconsmaponezero\symbol{96}} + \expandafter\def\csname simpleicon@sailsdotjsicon\endcsname {\simpleiconsmaponezero\symbol{97}} + \expandafter\def\csname simpleicon@salesforceicon\endcsname {\simpleiconsmaponezero\symbol{98}} + \expandafter\def\csname simpleicon@sallaicon\endcsname {\simpleiconsmaponezero\symbol{99}} + \expandafter\def\csname simpleicon@saltprojecticon\endcsname {\simpleiconsmaponezero\symbol{100}} + \expandafter\def\csname simpleicon@samsclubicon\endcsname {\simpleiconsmaponezero\symbol{101}} + \expandafter\def\csname simpleicon@samsungicon\endcsname {\simpleiconsmaponezero\symbol{102}} + \expandafter\def\csname simpleicon@samsungpayicon\endcsname {\simpleiconsmaponezero\symbol{103}} + \expandafter\def\csname simpleicon@sandiskicon\endcsname {\simpleiconsmaponezero\symbol{104}} + \expandafter\def\csname simpleicon@sanfranciscomunicipalrailwayicon\endcsname {\simpleiconsmaponezero\symbol{105}} + \expandafter\def\csname simpleicon@sanicicon\endcsname {\simpleiconsmaponezero\symbol{106}} + \expandafter\def\csname simpleicon@sanityicon\endcsname {\simpleiconsmaponezero\symbol{107}} + \expandafter\def\csname simpleicon@saopaulometroicon\endcsname {\simpleiconsmaponezero\symbol{108}} + \expandafter\def\csname simpleicon@sapicon\endcsname {\simpleiconsmaponezero\symbol{109}} + \expandafter\def\csname simpleicon@sartoriusicon\endcsname {\simpleiconsmaponezero\symbol{110}} + \expandafter\def\csname simpleicon@sassicon\endcsname {\simpleiconsmaponezero\symbol{111}} + \expandafter\def\csname simpleicon@sat1icon\endcsname {\simpleiconsmaponezero\symbol{112}} + \expandafter\def\csname simpleicon@satelliteicon\endcsname {\simpleiconsmaponezero\symbol{113}} + \expandafter\def\csname simpleicon@saturnicon\endcsname {\simpleiconsmaponezero\symbol{114}} + \expandafter\def\csname simpleicon@saucelabsicon\endcsname {\simpleiconsmaponezero\symbol{115}} + \expandafter\def\csname simpleicon@saudiaicon\endcsname {\simpleiconsmaponezero\symbol{116}} + \expandafter\def\csname simpleicon@scalaicon\endcsname {\simpleiconsmaponezero\symbol{117}} + \expandafter\def\csname simpleicon@scalewayicon\endcsname {\simpleiconsmaponezero\symbol{118}} + \expandafter\def\csname simpleicon@scaniaicon\endcsname {\simpleiconsmaponezero\symbol{119}} + \expandafter\def\csname simpleicon@schneiderelectricicon\endcsname {\simpleiconsmaponezero\symbol{120}} + \expandafter\def\csname simpleicon@scikitlearnicon\endcsname {\simpleiconsmaponezero\symbol{121}} + \expandafter\def\csname simpleicon@scilabicon\endcsname {\simpleiconsmaponezero\symbol{122}} + \expandafter\def\csname simpleicon@scipyicon\endcsname {\simpleiconsmaponezero\symbol{123}} + \expandafter\def\csname simpleicon@scopusicon\endcsname {\simpleiconsmaponezero\symbol{124}} + \expandafter\def\csname simpleicon@scpfoundationicon\endcsname {\simpleiconsmaponezero\symbol{125}} + \expandafter\def\csname simpleicon@scrapboxicon\endcsname {\simpleiconsmaponezero\symbol{126}} + \expandafter\def\csname simpleicon@scrapyicon\endcsname {\simpleiconsmaponezero\symbol{127}} + \expandafter\def\csname simpleicon@scratchicon\endcsname {\simpleiconsmaponezero\symbol{128}} + \expandafter\def\csname simpleicon@screencastifyicon\endcsname {\simpleiconsmaponezero\symbol{129}} + \expandafter\def\csname simpleicon@scribdicon\endcsname {\simpleiconsmaponezero\symbol{130}} + \expandafter\def\csname simpleicon@scrimbaicon\endcsname {\simpleiconsmaponezero\symbol{131}} + \expandafter\def\csname simpleicon@scrollrevealicon\endcsname {\simpleiconsmaponezero\symbol{132}} + \expandafter\def\csname simpleicon@scrumallianceicon\endcsname {\simpleiconsmaponezero\symbol{133}} + \expandafter\def\csname simpleicon@scrutinizerciicon\endcsname {\simpleiconsmaponezero\symbol{134}} + \expandafter\def\csname simpleicon@scylladbicon\endcsname {\simpleiconsmaponezero\symbol{135}} + \expandafter\def\csname simpleicon@seagateicon\endcsname {\simpleiconsmaponezero\symbol{136}} + \expandafter\def\csname simpleicon@searxngicon\endcsname {\simpleiconsmaponezero\symbol{137}} + \expandafter\def\csname simpleicon@seaticon\endcsname {\simpleiconsmaponezero\symbol{138}} + \expandafter\def\csname simpleicon@seatgeekicon\endcsname {\simpleiconsmaponezero\symbol{139}} + \expandafter\def\csname simpleicon@securityscorecardicon\endcsname {\simpleiconsmaponezero\symbol{140}} + \expandafter\def\csname simpleicon@sefariaicon\endcsname {\simpleiconsmaponezero\symbol{141}} + \expandafter\def\csname simpleicon@segaicon\endcsname {\simpleiconsmaponezero\symbol{142}} + \expandafter\def\csname simpleicon@seleniumicon\endcsname {\simpleiconsmaponezero\symbol{143}} + \expandafter\def\csname simpleicon@sellfyicon\endcsname {\simpleiconsmaponezero\symbol{144}} + \expandafter\def\csname simpleicon@semanticreleaseicon\endcsname {\simpleiconsmaponezero\symbol{145}} + \expandafter\def\csname simpleicon@semanticscholaricon\endcsname {\simpleiconsmaponezero\symbol{146}} + \expandafter\def\csname simpleicon@semanticuiicon\endcsname {\simpleiconsmaponezero\symbol{147}} + \expandafter\def\csname simpleicon@semanticuireacticon\endcsname {\simpleiconsmaponezero\symbol{148}} + \expandafter\def\csname simpleicon@semanticwebicon\endcsname {\simpleiconsmaponezero\symbol{149}} + \expandafter\def\csname simpleicon@semaphoreciicon\endcsname {\simpleiconsmaponezero\symbol{150}} + \expandafter\def\csname simpleicon@semrushicon\endcsname {\simpleiconsmaponezero\symbol{151}} + \expandafter\def\csname simpleicon@semvericon\endcsname {\simpleiconsmaponezero\symbol{152}} + \expandafter\def\csname simpleicon@senchaicon\endcsname {\simpleiconsmaponezero\symbol{153}} + \expandafter\def\csname simpleicon@sennheisericon\endcsname {\simpleiconsmaponezero\symbol{154}} + \expandafter\def\csname simpleicon@sensuicon\endcsname {\simpleiconsmaponezero\symbol{155}} + \expandafter\def\csname simpleicon@sentryicon\endcsname {\simpleiconsmaponezero\symbol{156}} + \expandafter\def\csname simpleicon@sepaicon\endcsname {\simpleiconsmaponezero\symbol{157}} + \expandafter\def\csname simpleicon@sequelizeicon\endcsname {\simpleiconsmaponezero\symbol{158}} + \expandafter\def\csname simpleicon@serverfaulticon\endcsname {\simpleiconsmaponezero\symbol{159}} + \expandafter\def\csname simpleicon@serverlessicon\endcsname {\simpleiconsmaponezero\symbol{160}} + \expandafter\def\csname simpleicon@sessionicon\endcsname {\simpleiconsmaponezero\symbol{161}} + \expandafter\def\csname simpleicon@sessionizeicon\endcsname {\simpleiconsmaponezero\symbol{162}} + \expandafter\def\csname simpleicon@setappicon\endcsname {\simpleiconsmaponezero\symbol{163}} + \expandafter\def\csname simpleicon@sfmlicon\endcsname {\simpleiconsmaponezero\symbol{164}} + \expandafter\def\csname simpleicon@shadcnuiicon\endcsname {\simpleiconsmaponezero\symbol{165}} + \expandafter\def\csname simpleicon@shadowicon\endcsname {\simpleiconsmaponezero\symbol{166}} + \expandafter\def\csname simpleicon@shanghaimetroicon\endcsname {\simpleiconsmaponezero\symbol{167}} + \expandafter\def\csname simpleicon@sharexicon\endcsname {\simpleiconsmaponezero\symbol{168}} + \expandafter\def\csname simpleicon@sharpicon\endcsname {\simpleiconsmaponezero\symbol{169}} + \expandafter\def\csname simpleicon@shazamicon\endcsname {\simpleiconsmaponezero\symbol{170}} + \expandafter\def\csname simpleicon@shellicon\endcsname {\simpleiconsmaponezero\symbol{171}} + \expandafter\def\csname simpleicon@shellyicon\endcsname {\simpleiconsmaponezero\symbol{172}} + \expandafter\def\csname simpleicon@shenzhenmetroicon\endcsname {\simpleiconsmaponezero\symbol{173}} + \expandafter\def\csname simpleicon@shieldsdotioicon\endcsname {\simpleiconsmaponezero\symbol{174}} + \expandafter\def\csname simpleicon@shikimoriicon\endcsname {\simpleiconsmaponezero\symbol{175}} + \expandafter\def\csname simpleicon@shopeeicon\endcsname {\simpleiconsmaponezero\symbol{176}} + \expandafter\def\csname simpleicon@shopifyicon\endcsname {\simpleiconsmaponezero\symbol{177}} + \expandafter\def\csname simpleicon@shopwareicon\endcsname {\simpleiconsmaponezero\symbol{178}} + \expandafter\def\csname simpleicon@shortcuticon\endcsname {\simpleiconsmaponezero\symbol{179}} + \expandafter\def\csname simpleicon@showpadicon\endcsname {\simpleiconsmaponezero\symbol{180}} + \expandafter\def\csname simpleicon@showtimeicon\endcsname {\simpleiconsmaponezero\symbol{181}} + \expandafter\def\csname simpleicon@showwcaseicon\endcsname {\simpleiconsmaponezero\symbol{182}} + \expandafter\def\csname simpleicon@shutterstockicon\endcsname {\simpleiconsmaponezero\symbol{183}} + \expandafter\def\csname simpleicon@sidekiqicon\endcsname {\simpleiconsmaponezero\symbol{184}} + \expandafter\def\csname simpleicon@sidequesticon\endcsname {\simpleiconsmaponezero\symbol{185}} + \expandafter\def\csname simpleicon@siemensicon\endcsname {\simpleiconsmaponezero\symbol{186}} + \expandafter\def\csname simpleicon@sifiveicon\endcsname {\simpleiconsmaponezero\symbol{187}} + \expandafter\def\csname simpleicon@signalicon\endcsname {\simpleiconsmaponezero\symbol{188}} + \expandafter\def\csname simpleicon@similarwebicon\endcsname {\simpleiconsmaponezero\symbol{189}} + \expandafter\def\csname simpleicon@simklicon\endcsname {\simpleiconsmaponezero\symbol{190}} + \expandafter\def\csname simpleicon@simpleanalyticsicon\endcsname {\simpleiconsmaponezero\symbol{191}} + \expandafter\def\csname simpleicon@simpleiconsicon\endcsname {\simpleiconsmaponezero\symbol{192}} + \expandafter\def\csname simpleicon@simpleloginicon\endcsname {\simpleiconsmaponezero\symbol{193}} + \expandafter\def\csname simpleicon@simplenoteicon\endcsname {\simpleiconsmaponezero\symbol{194}} + \expandafter\def\csname simpleicon@sinaweiboicon\endcsname {\simpleiconsmaponezero\symbol{195}} + \expandafter\def\csname simpleicon@singaporeairlinesicon\endcsname {\simpleiconsmaponezero\symbol{196}} + \expandafter\def\csname simpleicon@singlestoreicon\endcsname {\simpleiconsmaponezero\symbol{197}} + \expandafter\def\csname simpleicon@sitecoreicon\endcsname {\simpleiconsmaponezero\symbol{198}} + \expandafter\def\csname simpleicon@sitepointicon\endcsname {\simpleiconsmaponezero\symbol{199}} + \expandafter\def\csname simpleicon@siyuanicon\endcsname {\simpleiconsmaponezero\symbol{200}} + \expandafter\def\csname simpleicon@skaffoldicon\endcsname {\simpleiconsmaponezero\symbol{201}} + \expandafter\def\csname simpleicon@sketchicon\endcsname {\simpleiconsmaponezero\symbol{202}} + \expandafter\def\csname simpleicon@sketchfabicon\endcsname {\simpleiconsmaponezero\symbol{203}} + \expandafter\def\csname simpleicon@sketchupicon\endcsname {\simpleiconsmaponezero\symbol{204}} + \expandafter\def\csname simpleicon@skillshareicon\endcsname {\simpleiconsmaponezero\symbol{205}} + \expandafter\def\csname simpleicon@skodaicon\endcsname {\simpleiconsmaponezero\symbol{206}} + \expandafter\def\csname simpleicon@skyicon\endcsname {\simpleiconsmaponezero\symbol{207}} + \expandafter\def\csname simpleicon@skypackicon\endcsname {\simpleiconsmaponezero\symbol{208}} + \expandafter\def\csname simpleicon@skyrockicon\endcsname {\simpleiconsmaponezero\symbol{209}} + \expandafter\def\csname simpleicon@slackicon\endcsname {\simpleiconsmaponezero\symbol{210}} + \expandafter\def\csname simpleicon@slackwareicon\endcsname {\simpleiconsmaponezero\symbol{211}} + \expandafter\def\csname simpleicon@slashdoticon\endcsname {\simpleiconsmaponezero\symbol{212}} + \expandafter\def\csname simpleicon@slickpicicon\endcsname {\simpleiconsmaponezero\symbol{213}} + \expandafter\def\csname simpleicon@slidesicon\endcsname {\simpleiconsmaponezero\symbol{214}} + \expandafter\def\csname simpleicon@slideshareicon\endcsname {\simpleiconsmaponezero\symbol{215}} + \expandafter\def\csname simpleicon@slinticon\endcsname {\simpleiconsmaponezero\symbol{216}} + \expandafter\def\csname simpleicon@smarticon\endcsname {\simpleiconsmaponezero\symbol{217}} + \expandafter\def\csname simpleicon@smartthingsicon\endcsname {\simpleiconsmaponezero\symbol{218}} + \expandafter\def\csname simpleicon@smashdotggicon\endcsname {\simpleiconsmaponezero\symbol{219}} + \expandafter\def\csname simpleicon@smashingmagazineicon\endcsname {\simpleiconsmaponezero\symbol{220}} + \expandafter\def\csname simpleicon@smrticon\endcsname {\simpleiconsmaponezero\symbol{221}} + \expandafter\def\csname simpleicon@smugmugicon\endcsname {\simpleiconsmaponezero\symbol{222}} + \expandafter\def\csname simpleicon@snapchaticon\endcsname {\simpleiconsmaponezero\symbol{223}} + \expandafter\def\csname simpleicon@snapcrafticon\endcsname {\simpleiconsmaponezero\symbol{224}} + \expandafter\def\csname simpleicon@sncficon\endcsname {\simpleiconsmaponezero\symbol{225}} + \expandafter\def\csname simpleicon@snorticon\endcsname {\simpleiconsmaponezero\symbol{226}} + \expandafter\def\csname simpleicon@snowflakeicon\endcsname {\simpleiconsmaponezero\symbol{227}} + \expandafter\def\csname simpleicon@snowpackicon\endcsname {\simpleiconsmaponezero\symbol{228}} + \expandafter\def\csname simpleicon@snykicon\endcsname {\simpleiconsmaponezero\symbol{229}} + \expandafter\def\csname simpleicon@socialbladeicon\endcsname {\simpleiconsmaponezero\symbol{230}} + \expandafter\def\csname simpleicon@society6icon\endcsname {\simpleiconsmaponezero\symbol{231}} + \expandafter\def\csname simpleicon@socketdotioicon\endcsname {\simpleiconsmaponezero\symbol{232}} + \expandafter\def\csname simpleicon@softpediaicon\endcsname {\simpleiconsmaponezero\symbol{233}} + \expandafter\def\csname simpleicon@sogouicon\endcsname {\simpleiconsmaponezero\symbol{234}} + \expandafter\def\csname simpleicon@solanaicon\endcsname {\simpleiconsmaponezero\symbol{235}} + \expandafter\def\csname simpleicon@solidicon\endcsname {\simpleiconsmaponezero\symbol{236}} + \expandafter\def\csname simpleicon@solidityicon\endcsname {\simpleiconsmaponezero\symbol{237}} + \expandafter\def\csname simpleicon@sololearnicon\endcsname {\simpleiconsmaponezero\symbol{238}} + \expandafter\def\csname simpleicon@solusicon\endcsname {\simpleiconsmaponezero\symbol{239}} + \expandafter\def\csname simpleicon@sonaricon\endcsname {\simpleiconsmaponezero\symbol{240}} + \expandafter\def\csname simpleicon@sonarcloudicon\endcsname {\simpleiconsmaponezero\symbol{241}} + \expandafter\def\csname simpleicon@sonarlinticon\endcsname {\simpleiconsmaponezero\symbol{242}} + \expandafter\def\csname simpleicon@sonarqubeicon\endcsname {\simpleiconsmaponezero\symbol{243}} + \expandafter\def\csname simpleicon@sonarricon\endcsname {\simpleiconsmaponezero\symbol{244}} + \expandafter\def\csname simpleicon@sonatypeicon\endcsname {\simpleiconsmaponezero\symbol{245}} + \expandafter\def\csname simpleicon@songkickicon\endcsname {\simpleiconsmaponezero\symbol{246}} + \expandafter\def\csname simpleicon@songodaicon\endcsname {\simpleiconsmaponezero\symbol{247}} + \expandafter\def\csname simpleicon@sonicwallicon\endcsname {\simpleiconsmaponezero\symbol{248}} + \expandafter\def\csname simpleicon@sonosicon\endcsname {\simpleiconsmaponezero\symbol{249}} + \expandafter\def\csname simpleicon@sonyicon\endcsname {\simpleiconsmaponezero\symbol{250}} + \expandafter\def\csname simpleicon@sorianaicon\endcsname {\simpleiconsmaponezero\symbol{251}} + \expandafter\def\csname simpleicon@soundchartsicon\endcsname {\simpleiconsmaponezero\symbol{252}} + \expandafter\def\csname simpleicon@soundcloudicon\endcsname {\simpleiconsmaponezero\symbol{253}} + \expandafter\def\csname simpleicon@sourceengineicon\endcsname {\simpleiconsmaponezero\symbol{254}} + \expandafter\def\csname simpleicon@sourceforgeicon\endcsname {\simpleiconsmaponezero\symbol{255}} + \expandafter\def\csname simpleicon@sourcehuticon\endcsname {\simpleiconsmaponeone\symbol{0}} + \expandafter\def\csname simpleicon@sourcetreeicon\endcsname {\simpleiconsmaponeone\symbol{1}} + \expandafter\def\csname simpleicon@southwestairlinesicon\endcsname {\simpleiconsmaponeone\symbol{2}} + \expandafter\def\csname simpleicon@spacemacsicon\endcsname {\simpleiconsmaponeone\symbol{3}} + \expandafter\def\csname simpleicon@spaceshipicon\endcsname {\simpleiconsmaponeone\symbol{4}} + \expandafter\def\csname simpleicon@spacexicon\endcsname {\simpleiconsmaponeone\symbol{5}} + \expandafter\def\csname simpleicon@spacyicon\endcsname {\simpleiconsmaponeone\symbol{6}} + \expandafter\def\csname simpleicon@sparkaricon\endcsname {\simpleiconsmaponeone\symbol{7}} + \expandafter\def\csname simpleicon@sparkasseicon\endcsname {\simpleiconsmaponeone\symbol{8}} + \expandafter\def\csname simpleicon@sparkfunicon\endcsname {\simpleiconsmaponeone\symbol{9}} + \expandafter\def\csname simpleicon@sparkposticon\endcsname {\simpleiconsmaponeone\symbol{10}} + \expandafter\def\csname simpleicon@spdxicon\endcsname {\simpleiconsmaponeone\symbol{11}} + \expandafter\def\csname simpleicon@speakerdeckicon\endcsname {\simpleiconsmaponeone\symbol{12}} + \expandafter\def\csname simpleicon@spectrumicon\endcsname {\simpleiconsmaponeone\symbol{13}} + \expandafter\def\csname simpleicon@speedtesticon\endcsname {\simpleiconsmaponeone\symbol{14}} + \expandafter\def\csname simpleicon@speedypageicon\endcsname {\simpleiconsmaponeone\symbol{15}} + \expandafter\def\csname simpleicon@sphinxicon\endcsname {\simpleiconsmaponeone\symbol{16}} + \expandafter\def\csname simpleicon@spigotmcicon\endcsname {\simpleiconsmaponeone\symbol{17}} + \expandafter\def\csname simpleicon@spineicon\endcsname {\simpleiconsmaponeone\symbol{18}} + \expandafter\def\csname simpleicon@spinnakericon\endcsname {\simpleiconsmaponeone\symbol{19}} + \expandafter\def\csname simpleicon@spinrillaicon\endcsname {\simpleiconsmaponeone\symbol{20}} + \expandafter\def\csname simpleicon@splunkicon\endcsname {\simpleiconsmaponeone\symbol{21}} + \expandafter\def\csname simpleicon@spojicon\endcsname {\simpleiconsmaponeone\symbol{22}} + \expandafter\def\csname simpleicon@spondicon\endcsname {\simpleiconsmaponeone\symbol{23}} + \expandafter\def\csname simpleicon@spotifyicon\endcsname {\simpleiconsmaponeone\symbol{24}} + \expandafter\def\csname simpleicon@spotlighticon\endcsname {\simpleiconsmaponeone\symbol{25}} + \expandafter\def\csname simpleicon@spreadshirticon\endcsname {\simpleiconsmaponeone\symbol{26}} + \expandafter\def\csname simpleicon@spreakericon\endcsname {\simpleiconsmaponeone\symbol{27}} + \expandafter\def\csname simpleicon@springicon\endcsname {\simpleiconsmaponeone\symbol{28}} + \expandafter\def\csname simpleicon@springcreatorsicon\endcsname {\simpleiconsmaponeone\symbol{29}} + \expandafter\def\csname simpleicon@springbooticon\endcsname {\simpleiconsmaponeone\symbol{30}} + \expandafter\def\csname simpleicon@springsecurityicon\endcsname {\simpleiconsmaponeone\symbol{31}} + \expandafter\def\csname simpleicon@spyderideicon\endcsname {\simpleiconsmaponeone\symbol{32}} + \expandafter\def\csname simpleicon@sqlalchemyicon\endcsname {\simpleiconsmaponeone\symbol{33}} + \expandafter\def\csname simpleicon@sqliteicon\endcsname {\simpleiconsmaponeone\symbol{34}} + \expandafter\def\csname simpleicon@squareicon\endcsname {\simpleiconsmaponeone\symbol{35}} + \expandafter\def\csname simpleicon@squareenixicon\endcsname {\simpleiconsmaponeone\symbol{36}} + \expandafter\def\csname simpleicon@squarespaceicon\endcsname {\simpleiconsmaponeone\symbol{37}} + \expandafter\def\csname simpleicon@srgssricon\endcsname {\simpleiconsmaponeone\symbol{38}} + \expandafter\def\csname simpleicon@ssrnicon\endcsname {\simpleiconsmaponeone\symbol{39}} + \expandafter\def\csname simpleicon@ssticon\endcsname {\simpleiconsmaponeone\symbol{40}} + \expandafter\def\csname simpleicon@stackbiticon\endcsname {\simpleiconsmaponeone\symbol{41}} + \expandafter\def\csname simpleicon@stackblitzicon\endcsname {\simpleiconsmaponeone\symbol{42}} + \expandafter\def\csname simpleicon@stackediticon\endcsname {\simpleiconsmaponeone\symbol{43}} + \expandafter\def\csname simpleicon@stackexchangeicon\endcsname {\simpleiconsmaponeone\symbol{44}} + \expandafter\def\csname simpleicon@stackhawkicon\endcsname {\simpleiconsmaponeone\symbol{45}} + \expandafter\def\csname simpleicon@stackoverflowicon\endcsname {\simpleiconsmaponeone\symbol{46}} + \expandafter\def\csname simpleicon@stackpathicon\endcsname {\simpleiconsmaponeone\symbol{47}} + \expandafter\def\csname simpleicon@stackshareicon\endcsname {\simpleiconsmaponeone\symbol{48}} + \expandafter\def\csname simpleicon@stadiaicon\endcsname {\simpleiconsmaponeone\symbol{49}} + \expandafter\def\csname simpleicon@staffbaseicon\endcsname {\simpleiconsmaponeone\symbol{50}} + \expandafter\def\csname simpleicon@stagetimericon\endcsname {\simpleiconsmaponeone\symbol{51}} + \expandafter\def\csname simpleicon@standardjsicon\endcsname {\simpleiconsmaponeone\symbol{52}} + \expandafter\def\csname simpleicon@standardresumeicon\endcsname {\simpleiconsmaponeone\symbol{53}} + \expandafter\def\csname simpleicon@starbucksicon\endcsname {\simpleiconsmaponeone\symbol{54}} + \expandafter\def\csname simpleicon@stardockicon\endcsname {\simpleiconsmaponeone\symbol{55}} + \expandafter\def\csname simpleicon@starlingbankicon\endcsname {\simpleiconsmaponeone\symbol{56}} + \expandafter\def\csname simpleicon@starshipicon\endcsname {\simpleiconsmaponeone\symbol{57}} + \expandafter\def\csname simpleicon@startrekicon\endcsname {\simpleiconsmaponeone\symbol{58}} + \expandafter\def\csname simpleicon@starzicon\endcsname {\simpleiconsmaponeone\symbol{59}} + \expandafter\def\csname simpleicon@statamicicon\endcsname {\simpleiconsmaponeone\symbol{60}} + \expandafter\def\csname simpleicon@statistaicon\endcsname {\simpleiconsmaponeone\symbol{61}} + \expandafter\def\csname simpleicon@statuspageicon\endcsname {\simpleiconsmaponeone\symbol{62}} + \expandafter\def\csname simpleicon@statuspalicon\endcsname {\simpleiconsmaponeone\symbol{63}} + \expandafter\def\csname simpleicon@steamicon\endcsname {\simpleiconsmaponeone\symbol{64}} + \expandafter\def\csname simpleicon@steamdbicon\endcsname {\simpleiconsmaponeone\symbol{65}} + \expandafter\def\csname simpleicon@steamdeckicon\endcsname {\simpleiconsmaponeone\symbol{66}} + \expandafter\def\csname simpleicon@steamworksicon\endcsname {\simpleiconsmaponeone\symbol{67}} + \expandafter\def\csname simpleicon@steelseriesicon\endcsname {\simpleiconsmaponeone\symbol{68}} + \expandafter\def\csname simpleicon@steemicon\endcsname {\simpleiconsmaponeone\symbol{69}} + \expandafter\def\csname simpleicon@steemiticon\endcsname {\simpleiconsmaponeone\symbol{70}} + \expandafter\def\csname simpleicon@steinbergicon\endcsname {\simpleiconsmaponeone\symbol{71}} + \expandafter\def\csname simpleicon@stellaricon\endcsname {\simpleiconsmaponeone\symbol{72}} + \expandafter\def\csname simpleicon@stencilicon\endcsname {\simpleiconsmaponeone\symbol{73}} + \expandafter\def\csname simpleicon@stencylicon\endcsname {\simpleiconsmaponeone\symbol{74}} + \expandafter\def\csname simpleicon@stimulusicon\endcsname {\simpleiconsmaponeone\symbol{75}} + \expandafter\def\csname simpleicon@stitchericon\endcsname {\simpleiconsmaponeone\symbol{76}} + \expandafter\def\csname simpleicon@stmicroelectronicsicon\endcsname {\simpleiconsmaponeone\symbol{77}} + \expandafter\def\csname simpleicon@stockxicon\endcsname {\simpleiconsmaponeone\symbol{78}} + \expandafter\def\csname simpleicon@stopstalkicon\endcsname {\simpleiconsmaponeone\symbol{79}} + \expandafter\def\csname simpleicon@storyblokicon\endcsname {\simpleiconsmaponeone\symbol{80}} + \expandafter\def\csname simpleicon@storybookicon\endcsname {\simpleiconsmaponeone\symbol{81}} + \expandafter\def\csname simpleicon@strapiicon\endcsname {\simpleiconsmaponeone\symbol{82}} + \expandafter\def\csname simpleicon@stravaicon\endcsname {\simpleiconsmaponeone\symbol{83}} + \expandafter\def\csname simpleicon@streamlabsicon\endcsname {\simpleiconsmaponeone\symbol{84}} + \expandafter\def\csname simpleicon@streamliticon\endcsname {\simpleiconsmaponeone\symbol{85}} + \expandafter\def\csname simpleicon@streamrunnersicon\endcsname {\simpleiconsmaponeone\symbol{86}} + \expandafter\def\csname simpleicon@stripeicon\endcsname {\simpleiconsmaponeone\symbol{87}} + \expandafter\def\csname simpleicon@strongswanicon\endcsname {\simpleiconsmaponeone\symbol{88}} + \expandafter\def\csname simpleicon@strykericon\endcsname {\simpleiconsmaponeone\symbol{89}} + \expandafter\def\csname simpleicon@stubhubicon\endcsname {\simpleiconsmaponeone\symbol{90}} + \expandafter\def\csname simpleicon@studio3ticon\endcsname {\simpleiconsmaponeone\symbol{91}} + \expandafter\def\csname simpleicon@studyverseicon\endcsname {\simpleiconsmaponeone\symbol{92}} + \expandafter\def\csname simpleicon@styledcomponentsicon\endcsname {\simpleiconsmaponeone\symbol{93}} + \expandafter\def\csname simpleicon@stylelinticon\endcsname {\simpleiconsmaponeone\symbol{94}} + \expandafter\def\csname simpleicon@styleshareicon\endcsname {\simpleiconsmaponeone\symbol{95}} + \expandafter\def\csname simpleicon@stylusicon\endcsname {\simpleiconsmaponeone\symbol{96}} + \expandafter\def\csname simpleicon@subaruicon\endcsname {\simpleiconsmaponeone\symbol{97}} + \expandafter\def\csname simpleicon@sublimetexticon\endcsname {\simpleiconsmaponeone\symbol{98}} + \expandafter\def\csname simpleicon@substackicon\endcsname {\simpleiconsmaponeone\symbol{99}} + \expandafter\def\csname simpleicon@subtitleediticon\endcsname {\simpleiconsmaponeone\symbol{100}} + \expandafter\def\csname simpleicon@subversionicon\endcsname {\simpleiconsmaponeone\symbol{101}} + \expandafter\def\csname simpleicon@sucklessicon\endcsname {\simpleiconsmaponeone\symbol{102}} + \expandafter\def\csname simpleicon@sumologicicon\endcsname {\simpleiconsmaponeone\symbol{103}} + \expandafter\def\csname simpleicon@sunoicon\endcsname {\simpleiconsmaponeone\symbol{104}} + \expandafter\def\csname simpleicon@sunriseicon\endcsname {\simpleiconsmaponeone\symbol{105}} + \expandafter\def\csname simpleicon@supabaseicon\endcsname {\simpleiconsmaponeone\symbol{106}} + \expandafter\def\csname simpleicon@supercreaseicon\endcsname {\simpleiconsmaponeone\symbol{107}} + \expandafter\def\csname simpleicon@supermicroicon\endcsname {\simpleiconsmaponeone\symbol{108}} + \expandafter\def\csname simpleicon@superusericon\endcsname {\simpleiconsmaponeone\symbol{109}} + \expandafter\def\csname simpleicon@surrealdbicon\endcsname {\simpleiconsmaponeone\symbol{110}} + \expandafter\def\csname simpleicon@surveymonkeyicon\endcsname {\simpleiconsmaponeone\symbol{111}} + \expandafter\def\csname simpleicon@suseicon\endcsname {\simpleiconsmaponeone\symbol{112}} + \expandafter\def\csname simpleicon@suzukiicon\endcsname {\simpleiconsmaponeone\symbol{113}} + \expandafter\def\csname simpleicon@svelteicon\endcsname {\simpleiconsmaponeone\symbol{114}} + \expandafter\def\csname simpleicon@svgicon\endcsname {\simpleiconsmaponeone\symbol{115}} + \expandafter\def\csname simpleicon@svgdotjsicon\endcsname {\simpleiconsmaponeone\symbol{116}} + \expandafter\def\csname simpleicon@svgoicon\endcsname {\simpleiconsmaponeone\symbol{117}} + \expandafter\def\csname simpleicon@swaggericon\endcsname {\simpleiconsmaponeone\symbol{118}} + \expandafter\def\csname simpleicon@swarmicon\endcsname {\simpleiconsmaponeone\symbol{119}} + \expandafter\def\csname simpleicon@swcicon\endcsname {\simpleiconsmaponeone\symbol{120}} + \expandafter\def\csname simpleicon@swifticon\endcsname {\simpleiconsmaponeone\symbol{121}} + \expandafter\def\csname simpleicon@swiggyicon\endcsname {\simpleiconsmaponeone\symbol{122}} + \expandafter\def\csname simpleicon@swipericon\endcsname {\simpleiconsmaponeone\symbol{123}} + \expandafter\def\csname simpleicon@swricon\endcsname {\simpleiconsmaponeone\symbol{124}} + \expandafter\def\csname simpleicon@symantecicon\endcsname {\simpleiconsmaponeone\symbol{125}} + \expandafter\def\csname simpleicon@symbolabicon\endcsname {\simpleiconsmaponeone\symbol{126}} + \expandafter\def\csname simpleicon@symfonyicon\endcsname {\simpleiconsmaponeone\symbol{127}} + \expandafter\def\csname simpleicon@symphonyicon\endcsname {\simpleiconsmaponeone\symbol{128}} + \expandafter\def\csname simpleicon@sympyicon\endcsname {\simpleiconsmaponeone\symbol{129}} + \expandafter\def\csname simpleicon@syncthingicon\endcsname {\simpleiconsmaponeone\symbol{130}} + \expandafter\def\csname simpleicon@synologyicon\endcsname {\simpleiconsmaponeone\symbol{131}} + \expandafter\def\csname simpleicon@system76icon\endcsname {\simpleiconsmaponeone\symbol{132}} + \expandafter\def\csname simpleicon@tabelogicon\endcsname {\simpleiconsmaponeone\symbol{133}} + \expandafter\def\csname simpleicon@tableauicon\endcsname {\simpleiconsmaponeone\symbol{134}} + \expandafter\def\csname simpleicon@tablecheckicon\endcsname {\simpleiconsmaponeone\symbol{135}} + \expandafter\def\csname simpleicon@tacobellicon\endcsname {\simpleiconsmaponeone\symbol{136}} + \expandafter\def\csname simpleicon@tadoicon\endcsname {\simpleiconsmaponeone\symbol{137}} + \expandafter\def\csname simpleicon@taichigraphicsicon\endcsname {\simpleiconsmaponeone\symbol{138}} + \expandafter\def\csname simpleicon@taichilangicon\endcsname {\simpleiconsmaponeone\symbol{139}} + \expandafter\def\csname simpleicon@tailsicon\endcsname {\simpleiconsmaponeone\symbol{140}} + \expandafter\def\csname simpleicon@tailscaleicon\endcsname {\simpleiconsmaponeone\symbol{141}} + \expandafter\def\csname simpleicon@tailwindcssicon\endcsname {\simpleiconsmaponeone\symbol{142}} + \expandafter\def\csname simpleicon@taipyicon\endcsname {\simpleiconsmaponeone\symbol{143}} + \expandafter\def\csname simpleicon@taketwointeractivesoftwareicon\endcsname {\simpleiconsmaponeone\symbol{144}} + \expandafter\def\csname simpleicon@talendicon\endcsname {\simpleiconsmaponeone\symbol{145}} + \expandafter\def\csname simpleicon@talenthouseicon\endcsname {\simpleiconsmaponeone\symbol{146}} + \expandafter\def\csname simpleicon@talosicon\endcsname {\simpleiconsmaponeone\symbol{147}} + \expandafter\def\csname simpleicon@tamiyaicon\endcsname {\simpleiconsmaponeone\symbol{148}} + \expandafter\def\csname simpleicon@tampermonkeyicon\endcsname {\simpleiconsmaponeone\symbol{149}} + \expandafter\def\csname simpleicon@taobaoicon\endcsname {\simpleiconsmaponeone\symbol{150}} + \expandafter\def\csname simpleicon@tapasicon\endcsname {\simpleiconsmaponeone\symbol{151}} + \expandafter\def\csname simpleicon@targeticon\endcsname {\simpleiconsmaponeone\symbol{152}} + \expandafter\def\csname simpleicon@taskicon\endcsname {\simpleiconsmaponeone\symbol{153}} + \expandafter\def\csname simpleicon@tasmotaicon\endcsname {\simpleiconsmaponeone\symbol{154}} + \expandafter\def\csname simpleicon@tataicon\endcsname {\simpleiconsmaponeone\symbol{155}} + \expandafter\def\csname simpleicon@tauriicon\endcsname {\simpleiconsmaponeone\symbol{156}} + \expandafter\def\csname simpleicon@taxbuzzicon\endcsname {\simpleiconsmaponeone\symbol{157}} + \expandafter\def\csname simpleicon@tcsicon\endcsname {\simpleiconsmaponeone\symbol{158}} + \expandafter\def\csname simpleicon@tealicon\endcsname {\simpleiconsmaponeone\symbol{159}} + \expandafter\def\csname simpleicon@teamcityicon\endcsname {\simpleiconsmaponeone\symbol{160}} + \expandafter\def\csname simpleicon@teamspeakicon\endcsname {\simpleiconsmaponeone\symbol{161}} + \expandafter\def\csname simpleicon@teamviewericon\endcsname {\simpleiconsmaponeone\symbol{162}} + \expandafter\def\csname simpleicon@techcrunchicon\endcsname {\simpleiconsmaponeone\symbol{163}} + \expandafter\def\csname simpleicon@tedicon\endcsname {\simpleiconsmaponeone\symbol{164}} + \expandafter\def\csname simpleicon@teepublicicon\endcsname {\simpleiconsmaponeone\symbol{165}} + \expandafter\def\csname simpleicon@teespringicon\endcsname {\simpleiconsmaponeone\symbol{166}} + \expandafter\def\csname simpleicon@tektonicon\endcsname {\simpleiconsmaponeone\symbol{167}} + \expandafter\def\csname simpleicon@tele5icon\endcsname {\simpleiconsmaponeone\symbol{168}} + \expandafter\def\csname simpleicon@telegramicon\endcsname {\simpleiconsmaponeone\symbol{169}} + \expandafter\def\csname simpleicon@telegraphicon\endcsname {\simpleiconsmaponeone\symbol{170}} + \expandafter\def\csname simpleicon@telequebecicon\endcsname {\simpleiconsmaponeone\symbol{171}} + \expandafter\def\csname simpleicon@temporalicon\endcsname {\simpleiconsmaponeone\symbol{172}} + \expandafter\def\csname simpleicon@tencentqqicon\endcsname {\simpleiconsmaponeone\symbol{173}} + \expandafter\def\csname simpleicon@tensorflowicon\endcsname {\simpleiconsmaponeone\symbol{174}} + \expandafter\def\csname simpleicon@teradataicon\endcsname {\simpleiconsmaponeone\symbol{175}} + \expandafter\def\csname simpleicon@teratailicon\endcsname {\simpleiconsmaponeone\symbol{176}} + \expandafter\def\csname simpleicon@termiusicon\endcsname {\simpleiconsmaponeone\symbol{177}} + \expandafter\def\csname simpleicon@terraformicon\endcsname {\simpleiconsmaponeone\symbol{178}} + \expandafter\def\csname simpleicon@tescoicon\endcsname {\simpleiconsmaponeone\symbol{179}} + \expandafter\def\csname simpleicon@teslaicon\endcsname {\simpleiconsmaponeone\symbol{180}} + \expandafter\def\csname simpleicon@testcafeicon\endcsname {\simpleiconsmaponeone\symbol{181}} + \expandafter\def\csname simpleicon@testinicon\endcsname {\simpleiconsmaponeone\symbol{182}} + \expandafter\def\csname simpleicon@testinglibraryicon\endcsname {\simpleiconsmaponeone\symbol{183}} + \expandafter\def\csname simpleicon@testrailicon\endcsname {\simpleiconsmaponeone\symbol{184}} + \expandafter\def\csname simpleicon@tethericon\endcsname {\simpleiconsmaponeone\symbol{185}} + \expandafter\def\csname simpleicon@textpatternicon\endcsname {\simpleiconsmaponeone\symbol{186}} + \expandafter\def\csname simpleicon@tgaicon\endcsname {\simpleiconsmaponeone\symbol{187}} + \expandafter\def\csname simpleicon@thangsicon\endcsname {\simpleiconsmaponeone\symbol{188}} + \expandafter\def\csname simpleicon@thanosicon\endcsname {\simpleiconsmaponeone\symbol{189}} + \expandafter\def\csname simpleicon@thealgorithmsicon\endcsname {\simpleiconsmaponeone\symbol{190}} + \expandafter\def\csname simpleicon@theboringcompanyicon\endcsname {\simpleiconsmaponeone\symbol{191}} + \expandafter\def\csname simpleicon@theconversationicon\endcsname {\simpleiconsmaponeone\symbol{192}} + \expandafter\def\csname simpleicon@thefinalsicon\endcsname {\simpleiconsmaponeone\symbol{193}} + \expandafter\def\csname simpleicon@theirishtimesicon\endcsname {\simpleiconsmaponeone\symbol{194}} + \expandafter\def\csname simpleicon@themightyicon\endcsname {\simpleiconsmaponeone\symbol{195}} + \expandafter\def\csname simpleicon@themodelsresourceicon\endcsname {\simpleiconsmaponeone\symbol{196}} + \expandafter\def\csname simpleicon@themoviedatabaseicon\endcsname {\simpleiconsmaponeone\symbol{197}} + \expandafter\def\csname simpleicon@thenorthfaceicon\endcsname {\simpleiconsmaponeone\symbol{198}} + \expandafter\def\csname simpleicon@theodinprojecticon\endcsname {\simpleiconsmaponeone\symbol{199}} + \expandafter\def\csname simpleicon@theregistericon\endcsname {\simpleiconsmaponeone\symbol{200}} + \expandafter\def\csname simpleicon@thesoundsresourceicon\endcsname {\simpleiconsmaponeone\symbol{201}} + \expandafter\def\csname simpleicon@thespritersresourceicon\endcsname {\simpleiconsmaponeone\symbol{202}} + \expandafter\def\csname simpleicon@thewashingtonposticon\endcsname {\simpleiconsmaponeone\symbol{203}} + \expandafter\def\csname simpleicon@thingiverseicon\endcsname {\simpleiconsmaponeone\symbol{204}} + \expandafter\def\csname simpleicon@thinkpadicon\endcsname {\simpleiconsmaponeone\symbol{205}} + \expandafter\def\csname simpleicon@thirdwebicon\endcsname {\simpleiconsmaponeone\symbol{206}} + \expandafter\def\csname simpleicon@threadlessicon\endcsname {\simpleiconsmaponeone\symbol{207}} + \expandafter\def\csname simpleicon@threadsicon\endcsname {\simpleiconsmaponeone\symbol{208}} + \expandafter\def\csname simpleicon@threedotjsicon\endcsname {\simpleiconsmaponeone\symbol{209}} + \expandafter\def\csname simpleicon@threemaicon\endcsname {\simpleiconsmaponeone\symbol{210}} + \expandafter\def\csname simpleicon@thumbtackicon\endcsname {\simpleiconsmaponeone\symbol{211}} + \expandafter\def\csname simpleicon@thunderbirdicon\endcsname {\simpleiconsmaponeone\symbol{212}} + \expandafter\def\csname simpleicon@thunderstoreicon\endcsname {\simpleiconsmaponeone\symbol{213}} + \expandafter\def\csname simpleicon@thurgauerkantonalbankicon\endcsname {\simpleiconsmaponeone\symbol{214}} + \expandafter\def\csname simpleicon@thymeleaficon\endcsname {\simpleiconsmaponeone\symbol{215}} + \expandafter\def\csname simpleicon@ticketmastericon\endcsname {\simpleiconsmaponeone\symbol{216}} + \expandafter\def\csname simpleicon@ticktickicon\endcsname {\simpleiconsmaponeone\symbol{217}} + \expandafter\def\csname simpleicon@tidalicon\endcsname {\simpleiconsmaponeone\symbol{218}} + \expandafter\def\csname simpleicon@tiddlywikiicon\endcsname {\simpleiconsmaponeone\symbol{219}} + \expandafter\def\csname simpleicon@tideicon\endcsname {\simpleiconsmaponeone\symbol{220}} + \expandafter\def\csname simpleicon@tidyverseicon\endcsname {\simpleiconsmaponeone\symbol{221}} + \expandafter\def\csname simpleicon@tietoevryicon\endcsname {\simpleiconsmaponeone\symbol{222}} + \expandafter\def\csname simpleicon@tiktokicon\endcsname {\simpleiconsmaponeone\symbol{223}} + \expandafter\def\csname simpleicon@tildapublishingicon\endcsname {\simpleiconsmaponeone\symbol{224}} + \expandafter\def\csname simpleicon@tileicon\endcsname {\simpleiconsmaponeone\symbol{225}} + \expandafter\def\csname simpleicon@timescaleicon\endcsname {\simpleiconsmaponeone\symbol{226}} + \expandafter\def\csname simpleicon@tinaicon\endcsname {\simpleiconsmaponeone\symbol{227}} + \expandafter\def\csname simpleicon@tindericon\endcsname {\simpleiconsmaponeone\symbol{228}} + \expandafter\def\csname simpleicon@tindieicon\endcsname {\simpleiconsmaponeone\symbol{229}} + \expandafter\def\csname simpleicon@tinkercadicon\endcsname {\simpleiconsmaponeone\symbol{230}} + \expandafter\def\csname simpleicon@tinygradicon\endcsname {\simpleiconsmaponeone\symbol{231}} + \expandafter\def\csname simpleicon@tinylettericon\endcsname {\simpleiconsmaponeone\symbol{232}} + \expandafter\def\csname simpleicon@tistoryicon\endcsname {\simpleiconsmaponeone\symbol{233}} + \expandafter\def\csname simpleicon@tldrawicon\endcsname {\simpleiconsmaponeone\symbol{234}} + \expandafter\def\csname simpleicon@tmobileicon\endcsname {\simpleiconsmaponeone\symbol{235}} + \expandafter\def\csname simpleicon@tmuxicon\endcsname {\simpleiconsmaponeone\symbol{236}} + \expandafter\def\csname simpleicon@todoisticon\endcsname {\simpleiconsmaponeone\symbol{237}} + \expandafter\def\csname simpleicon@togglicon\endcsname {\simpleiconsmaponeone\symbol{238}} + \expandafter\def\csname simpleicon@toggltrackicon\endcsname {\simpleiconsmaponeone\symbol{239}} + \expandafter\def\csname simpleicon@tokyometroicon\endcsname {\simpleiconsmaponeone\symbol{240}} + \expandafter\def\csname simpleicon@tollicon\endcsname {\simpleiconsmaponeone\symbol{241}} + \expandafter\def\csname simpleicon@tomlicon\endcsname {\simpleiconsmaponeone\symbol{242}} + \expandafter\def\csname simpleicon@tomorrowlandicon\endcsname {\simpleiconsmaponeone\symbol{243}} + \expandafter\def\csname simpleicon@tonicon\endcsname {\simpleiconsmaponeone\symbol{244}} + \expandafter\def\csname simpleicon@topcodericon\endcsname {\simpleiconsmaponeone\symbol{245}} + \expandafter\def\csname simpleicon@topdotggicon\endcsname {\simpleiconsmaponeone\symbol{246}} + \expandafter\def\csname simpleicon@toptalicon\endcsname {\simpleiconsmaponeone\symbol{247}} + \expandafter\def\csname simpleicon@torbrowsericon\endcsname {\simpleiconsmaponeone\symbol{248}} + \expandafter\def\csname simpleicon@torprojecticon\endcsname {\simpleiconsmaponeone\symbol{249}} + \expandafter\def\csname simpleicon@toshibaicon\endcsname {\simpleiconsmaponeone\symbol{250}} + \expandafter\def\csname simpleicon@totvsicon\endcsname {\simpleiconsmaponeone\symbol{251}} + \expandafter\def\csname simpleicon@tourboxicon\endcsname {\simpleiconsmaponeone\symbol{252}} + \expandafter\def\csname simpleicon@towericon\endcsname {\simpleiconsmaponeone\symbol{253}} + \expandafter\def\csname simpleicon@toyotaicon\endcsname {\simpleiconsmaponeone\symbol{254}} + \expandafter\def\csname simpleicon@tplinkicon\endcsname {\simpleiconsmaponeone\symbol{255}} + \expandafter\def\csname simpleicon@tqdmicon\endcsname {\simpleiconsmaponetwo\symbol{0}} + \expandafter\def\csname simpleicon@traccaricon\endcsname {\simpleiconsmaponetwo\symbol{1}} + \expandafter\def\csname simpleicon@tradingviewicon\endcsname {\simpleiconsmaponetwo\symbol{2}} + \expandafter\def\csname simpleicon@traefikmeshicon\endcsname {\simpleiconsmaponetwo\symbol{3}} + \expandafter\def\csname simpleicon@traefikproxyicon\endcsname {\simpleiconsmaponetwo\symbol{4}} + \expandafter\def\csname simpleicon@trailforksicon\endcsname {\simpleiconsmaponetwo\symbol{5}} + \expandafter\def\csname simpleicon@trainerroadicon\endcsname {\simpleiconsmaponetwo\symbol{6}} + \expandafter\def\csname simpleicon@trakticon\endcsname {\simpleiconsmaponetwo\symbol{7}} + \expandafter\def\csname simpleicon@transifexicon\endcsname {\simpleiconsmaponetwo\symbol{8}} + \expandafter\def\csname simpleicon@transmissionicon\endcsname {\simpleiconsmaponetwo\symbol{9}} + \expandafter\def\csname simpleicon@transportforirelandicon\endcsname {\simpleiconsmaponetwo\symbol{10}} + \expandafter\def\csname simpleicon@transportforlondonicon\endcsname {\simpleiconsmaponetwo\symbol{11}} + \expandafter\def\csname simpleicon@travisciicon\endcsname {\simpleiconsmaponetwo\symbol{12}} + \expandafter\def\csname simpleicon@treehouseicon\endcsname {\simpleiconsmaponetwo\symbol{13}} + \expandafter\def\csname simpleicon@trelloicon\endcsname {\simpleiconsmaponetwo\symbol{14}} + \expandafter\def\csname simpleicon@trendmicroicon\endcsname {\simpleiconsmaponetwo\symbol{15}} + \expandafter\def\csname simpleicon@treyarchicon\endcsname {\simpleiconsmaponetwo\symbol{16}} + \expandafter\def\csname simpleicon@tricentisicon\endcsname {\simpleiconsmaponetwo\symbol{17}} + \expandafter\def\csname simpleicon@triliumicon\endcsname {\simpleiconsmaponetwo\symbol{18}} + \expandafter\def\csname simpleicon@trillericon\endcsname {\simpleiconsmaponetwo\symbol{19}} + \expandafter\def\csname simpleicon@trillertvicon\endcsname {\simpleiconsmaponetwo\symbol{20}} + \expandafter\def\csname simpleicon@trinoicon\endcsname {\simpleiconsmaponetwo\symbol{21}} + \expandafter\def\csname simpleicon@tripadvisoricon\endcsname {\simpleiconsmaponetwo\symbol{22}} + \expandafter\def\csname simpleicon@tripdotcomicon\endcsname {\simpleiconsmaponetwo\symbol{23}} + \expandafter\def\csname simpleicon@trivagoicon\endcsname {\simpleiconsmaponetwo\symbol{24}} + \expandafter\def\csname simpleicon@trivyicon\endcsname {\simpleiconsmaponetwo\symbol{25}} + \expandafter\def\csname simpleicon@troveicon\endcsname {\simpleiconsmaponetwo\symbol{26}} + \expandafter\def\csname simpleicon@trpcicon\endcsname {\simpleiconsmaponetwo\symbol{27}} + \expandafter\def\csname simpleicon@truenasicon\endcsname {\simpleiconsmaponetwo\symbol{28}} + \expandafter\def\csname simpleicon@trueupicon\endcsname {\simpleiconsmaponetwo\symbol{29}} + \expandafter\def\csname simpleicon@truliaicon\endcsname {\simpleiconsmaponetwo\symbol{30}} + \expandafter\def\csname simpleicon@trustedshopsicon\endcsname {\simpleiconsmaponetwo\symbol{31}} + \expandafter\def\csname simpleicon@trustpiloticon\endcsname {\simpleiconsmaponetwo\symbol{32}} + \expandafter\def\csname simpleicon@tryhackmeicon\endcsname {\simpleiconsmaponetwo\symbol{33}} + \expandafter\def\csname simpleicon@tryitonlineicon\endcsname {\simpleiconsmaponetwo\symbol{34}} + \expandafter\def\csname simpleicon@tsnodeicon\endcsname {\simpleiconsmaponetwo\symbol{35}} + \expandafter\def\csname simpleicon@tubiicon\endcsname {\simpleiconsmaponetwo\symbol{36}} + \expandafter\def\csname simpleicon@tuiicon\endcsname {\simpleiconsmaponetwo\symbol{37}} + \expandafter\def\csname simpleicon@tumblricon\endcsname {\simpleiconsmaponetwo\symbol{38}} + \expandafter\def\csname simpleicon@tuneinicon\endcsname {\simpleiconsmaponetwo\symbol{39}} + \expandafter\def\csname simpleicon@turboicon\endcsname {\simpleiconsmaponetwo\symbol{40}} + \expandafter\def\csname simpleicon@turborepoicon\endcsname {\simpleiconsmaponetwo\symbol{41}} + \expandafter\def\csname simpleicon@turbosquidicon\endcsname {\simpleiconsmaponetwo\symbol{42}} + \expandafter\def\csname simpleicon@turkishairlinesicon\endcsname {\simpleiconsmaponetwo\symbol{43}} + \expandafter\def\csname simpleicon@tursoicon\endcsname {\simpleiconsmaponetwo\symbol{44}} + \expandafter\def\csname simpleicon@tutanotaicon\endcsname {\simpleiconsmaponetwo\symbol{45}} + \expandafter\def\csname simpleicon@tv4playicon\endcsname {\simpleiconsmaponetwo\symbol{46}} + \expandafter\def\csname simpleicon@tvtimeicon\endcsname {\simpleiconsmaponetwo\symbol{47}} + \expandafter\def\csname simpleicon@twilioicon\endcsname {\simpleiconsmaponetwo\symbol{48}} + \expandafter\def\csname simpleicon@twinklyicon\endcsname {\simpleiconsmaponetwo\symbol{49}} + \expandafter\def\csname simpleicon@twinmotionicon\endcsname {\simpleiconsmaponetwo\symbol{50}} + \expandafter\def\csname simpleicon@twitchicon\endcsname {\simpleiconsmaponetwo\symbol{51}} + \expandafter\def\csname simpleicon@typeformicon\endcsname {\simpleiconsmaponetwo\symbol{52}} + \expandafter\def\csname simpleicon@typeormicon\endcsname {\simpleiconsmaponetwo\symbol{53}} + \expandafter\def\csname simpleicon@typericon\endcsname {\simpleiconsmaponetwo\symbol{54}} + \expandafter\def\csname simpleicon@typescripticon\endcsname {\simpleiconsmaponetwo\symbol{55}} + \expandafter\def\csname simpleicon@typo3icon\endcsname {\simpleiconsmaponetwo\symbol{56}} + \expandafter\def\csname simpleicon@typsticon\endcsname {\simpleiconsmaponetwo\symbol{57}} + \expandafter\def\csname simpleicon@ubericon\endcsname {\simpleiconsmaponetwo\symbol{58}} + \expandafter\def\csname simpleicon@ubereatsicon\endcsname {\simpleiconsmaponetwo\symbol{59}} + \expandafter\def\csname simpleicon@ubiquitiicon\endcsname {\simpleiconsmaponetwo\symbol{60}} + \expandafter\def\csname simpleicon@ubisofticon\endcsname {\simpleiconsmaponetwo\symbol{61}} + \expandafter\def\csname simpleicon@ublockoriginicon\endcsname {\simpleiconsmaponetwo\symbol{62}} + \expandafter\def\csname simpleicon@ubuntuicon\endcsname {\simpleiconsmaponetwo\symbol{63}} + \expandafter\def\csname simpleicon@ubuntumateicon\endcsname {\simpleiconsmaponetwo\symbol{64}} + \expandafter\def\csname simpleicon@udacityicon\endcsname {\simpleiconsmaponetwo\symbol{65}} + \expandafter\def\csname simpleicon@udemyicon\endcsname {\simpleiconsmaponetwo\symbol{66}} + \expandafter\def\csname simpleicon@ufcicon\endcsname {\simpleiconsmaponetwo\symbol{67}} + \expandafter\def\csname simpleicon@uikiticon\endcsname {\simpleiconsmaponetwo\symbol{68}} + \expandafter\def\csname simpleicon@uipathicon\endcsname {\simpleiconsmaponetwo\symbol{69}} + \expandafter\def\csname simpleicon@ululeicon\endcsname {\simpleiconsmaponetwo\symbol{70}} + \expandafter\def\csname simpleicon@umamiicon\endcsname {\simpleiconsmaponetwo\symbol{71}} + \expandafter\def\csname simpleicon@umbracoicon\endcsname {\simpleiconsmaponetwo\symbol{72}} + \expandafter\def\csname simpleicon@umlicon\endcsname {\simpleiconsmaponetwo\symbol{73}} + \expandafter\def\csname simpleicon@unacademyicon\endcsname {\simpleiconsmaponetwo\symbol{74}} + \expandafter\def\csname simpleicon@underarmouricon\endcsname {\simpleiconsmaponetwo\symbol{75}} + \expandafter\def\csname simpleicon@underscoredotjsicon\endcsname {\simpleiconsmaponetwo\symbol{76}} + \expandafter\def\csname simpleicon@undertaleicon\endcsname {\simpleiconsmaponetwo\symbol{77}} + \expandafter\def\csname simpleicon@unicodeicon\endcsname {\simpleiconsmaponetwo\symbol{78}} + \expandafter\def\csname simpleicon@unilevericon\endcsname {\simpleiconsmaponetwo\symbol{79}} + \expandafter\def\csname simpleicon@uniqloicon\endcsname {\simpleiconsmaponetwo\symbol{80}} + \expandafter\def\csname simpleicon@uniqlojaicon\endcsname {\simpleiconsmaponetwo\symbol{81}} + \expandafter\def\csname simpleicon@unitedairlinesicon\endcsname {\simpleiconsmaponetwo\symbol{82}} + \expandafter\def\csname simpleicon@unitednationsicon\endcsname {\simpleiconsmaponetwo\symbol{83}} + \expandafter\def\csname simpleicon@unityicon\endcsname {\simpleiconsmaponetwo\symbol{84}} + \expandafter\def\csname simpleicon@unjsicon\endcsname {\simpleiconsmaponetwo\symbol{85}} + \expandafter\def\csname simpleicon@unlicenseicon\endcsname {\simpleiconsmaponetwo\symbol{86}} + \expandafter\def\csname simpleicon@unocssicon\endcsname {\simpleiconsmaponetwo\symbol{87}} + \expandafter\def\csname simpleicon@unpkgicon\endcsname {\simpleiconsmaponetwo\symbol{88}} + \expandafter\def\csname simpleicon@unraidicon\endcsname {\simpleiconsmaponetwo\symbol{89}} + \expandafter\def\csname simpleicon@unrealengineicon\endcsname {\simpleiconsmaponetwo\symbol{90}} + \expandafter\def\csname simpleicon@unsplashicon\endcsname {\simpleiconsmaponetwo\symbol{91}} + \expandafter\def\csname simpleicon@untappdicon\endcsname {\simpleiconsmaponetwo\symbol{92}} + \expandafter\def\csname simpleicon@upcloudicon\endcsname {\simpleiconsmaponetwo\symbol{93}} + \expandafter\def\csname simpleicon@upholdicon\endcsname {\simpleiconsmaponetwo\symbol{94}} + \expandafter\def\csname simpleicon@uplabsicon\endcsname {\simpleiconsmaponetwo\symbol{95}} + \expandafter\def\csname simpleicon@upptimeicon\endcsname {\simpleiconsmaponetwo\symbol{96}} + \expandafter\def\csname simpleicon@upsicon\endcsname {\simpleiconsmaponetwo\symbol{97}} + \expandafter\def\csname simpleicon@upstashicon\endcsname {\simpleiconsmaponetwo\symbol{98}} + \expandafter\def\csname simpleicon@uptimekumaicon\endcsname {\simpleiconsmaponetwo\symbol{99}} + \expandafter\def\csname simpleicon@uptoboxicon\endcsname {\simpleiconsmaponetwo\symbol{100}} + \expandafter\def\csname simpleicon@upworkicon\endcsname {\simpleiconsmaponetwo\symbol{101}} + \expandafter\def\csname simpleicon@uspsicon\endcsname {\simpleiconsmaponetwo\symbol{102}} + \expandafter\def\csname simpleicon@utorrenticon\endcsname {\simpleiconsmaponetwo\symbol{103}} + \expandafter\def\csname simpleicon@vicon\endcsname {\simpleiconsmaponetwo\symbol{104}} + \expandafter\def\csname simpleicon@v2exicon\endcsname {\simpleiconsmaponetwo\symbol{105}} + \expandafter\def\csname simpleicon@v8icon\endcsname {\simpleiconsmaponetwo\symbol{106}} + \expandafter\def\csname simpleicon@vaadinicon\endcsname {\simpleiconsmaponetwo\symbol{107}} + \expandafter\def\csname simpleicon@vagranticon\endcsname {\simpleiconsmaponetwo\symbol{108}} + \expandafter\def\csname simpleicon@valaicon\endcsname {\simpleiconsmaponetwo\symbol{109}} + \expandafter\def\csname simpleicon@valoranticon\endcsname {\simpleiconsmaponetwo\symbol{110}} + \expandafter\def\csname simpleicon@valveicon\endcsname {\simpleiconsmaponetwo\symbol{111}} + \expandafter\def\csname simpleicon@vaporicon\endcsname {\simpleiconsmaponetwo\symbol{112}} + \expandafter\def\csname simpleicon@vaulticon\endcsname {\simpleiconsmaponetwo\symbol{113}} + \expandafter\def\csname simpleicon@vaultwardenicon\endcsname {\simpleiconsmaponetwo\symbol{114}} + \expandafter\def\csname simpleicon@vauxhallicon\endcsname {\simpleiconsmaponetwo\symbol{115}} + \expandafter\def\csname simpleicon@vbulletinicon\endcsname {\simpleiconsmaponetwo\symbol{116}} + \expandafter\def\csname simpleicon@vectaryicon\endcsname {\simpleiconsmaponetwo\symbol{117}} + \expandafter\def\csname simpleicon@vectorlogozoneicon\endcsname {\simpleiconsmaponetwo\symbol{118}} + \expandafter\def\csname simpleicon@vectorworksicon\endcsname {\simpleiconsmaponetwo\symbol{119}} + \expandafter\def\csname simpleicon@veeamicon\endcsname {\simpleiconsmaponetwo\symbol{120}} + \expandafter\def\csname simpleicon@veedicon\endcsname {\simpleiconsmaponetwo\symbol{121}} + \expandafter\def\csname simpleicon@veepeeicon\endcsname {\simpleiconsmaponetwo\symbol{122}} + \expandafter\def\csname simpleicon@vegaicon\endcsname {\simpleiconsmaponetwo\symbol{123}} + \expandafter\def\csname simpleicon@vegasicon\endcsname {\simpleiconsmaponetwo\symbol{124}} + \expandafter\def\csname simpleicon@velogicon\endcsname {\simpleiconsmaponetwo\symbol{125}} + \expandafter\def\csname simpleicon@venmoicon\endcsname {\simpleiconsmaponetwo\symbol{126}} + \expandafter\def\csname simpleicon@vercelicon\endcsname {\simpleiconsmaponetwo\symbol{127}} + \expandafter\def\csname simpleicon@verdaccioicon\endcsname {\simpleiconsmaponetwo\symbol{128}} + \expandafter\def\csname simpleicon@veritasicon\endcsname {\simpleiconsmaponetwo\symbol{129}} + \expandafter\def\csname simpleicon@verizonicon\endcsname {\simpleiconsmaponetwo\symbol{130}} + \expandafter\def\csname simpleicon@vespaicon\endcsname {\simpleiconsmaponetwo\symbol{131}} + \expandafter\def\csname simpleicon@vexxhosticon\endcsname {\simpleiconsmaponetwo\symbol{132}} + \expandafter\def\csname simpleicon@vfairsicon\endcsname {\simpleiconsmaponetwo\symbol{133}} + \expandafter\def\csname simpleicon@viadeoicon\endcsname {\simpleiconsmaponetwo\symbol{134}} + \expandafter\def\csname simpleicon@viaplayicon\endcsname {\simpleiconsmaponetwo\symbol{135}} + \expandafter\def\csname simpleicon@vibericon\endcsname {\simpleiconsmaponetwo\symbol{136}} + \expandafter\def\csname simpleicon@vibloicon\endcsname {\simpleiconsmaponetwo\symbol{137}} + \expandafter\def\csname simpleicon@victoriametricsicon\endcsname {\simpleiconsmaponetwo\symbol{138}} + \expandafter\def\csname simpleicon@victronenergyicon\endcsname {\simpleiconsmaponetwo\symbol{139}} + \expandafter\def\csname simpleicon@vimicon\endcsname {\simpleiconsmaponetwo\symbol{140}} + \expandafter\def\csname simpleicon@vimeoicon\endcsname {\simpleiconsmaponetwo\symbol{141}} + \expandafter\def\csname simpleicon@vimeolivestreamicon\endcsname {\simpleiconsmaponetwo\symbol{142}} + \expandafter\def\csname simpleicon@virginicon\endcsname {\simpleiconsmaponetwo\symbol{143}} + \expandafter\def\csname simpleicon@virginatlanticicon\endcsname {\simpleiconsmaponetwo\symbol{144}} + \expandafter\def\csname simpleicon@virginmediaicon\endcsname {\simpleiconsmaponetwo\symbol{145}} + \expandafter\def\csname simpleicon@virtualboxicon\endcsname {\simpleiconsmaponetwo\symbol{146}} + \expandafter\def\csname simpleicon@virustotalicon\endcsname {\simpleiconsmaponetwo\symbol{147}} + \expandafter\def\csname simpleicon@visaicon\endcsname {\simpleiconsmaponetwo\symbol{148}} + \expandafter\def\csname simpleicon@visxicon\endcsname {\simpleiconsmaponetwo\symbol{149}} + \expandafter\def\csname simpleicon@viteicon\endcsname {\simpleiconsmaponetwo\symbol{150}} + \expandafter\def\csname simpleicon@vitepressicon\endcsname {\simpleiconsmaponetwo\symbol{151}} + \expandafter\def\csname simpleicon@vitessicon\endcsname {\simpleiconsmaponetwo\symbol{152}} + \expandafter\def\csname simpleicon@vitesticon\endcsname {\simpleiconsmaponetwo\symbol{153}} + \expandafter\def\csname simpleicon@vivaldiicon\endcsname {\simpleiconsmaponetwo\symbol{154}} + \expandafter\def\csname simpleicon@vivawalleticon\endcsname {\simpleiconsmaponetwo\symbol{155}} + \expandafter\def\csname simpleicon@vivinoicon\endcsname {\simpleiconsmaponetwo\symbol{156}} + \expandafter\def\csname simpleicon@vivinticon\endcsname {\simpleiconsmaponetwo\symbol{157}} + \expandafter\def\csname simpleicon@vivoicon\endcsname {\simpleiconsmaponetwo\symbol{158}} + \expandafter\def\csname simpleicon@vkicon\endcsname {\simpleiconsmaponetwo\symbol{159}} + \expandafter\def\csname simpleicon@vlcmediaplayericon\endcsname {\simpleiconsmaponetwo\symbol{160}} + \expandafter\def\csname simpleicon@vmwareicon\endcsname {\simpleiconsmaponetwo\symbol{161}} + \expandafter\def\csname simpleicon@vodafoneicon\endcsname {\simpleiconsmaponetwo\symbol{162}} + \expandafter\def\csname simpleicon@voidlinuxicon\endcsname {\simpleiconsmaponetwo\symbol{163}} + \expandafter\def\csname simpleicon@voipdotmsicon\endcsname {\simpleiconsmaponetwo\symbol{164}} + \expandafter\def\csname simpleicon@volkswagenicon\endcsname {\simpleiconsmaponetwo\symbol{165}} + \expandafter\def\csname simpleicon@volvoicon\endcsname {\simpleiconsmaponetwo\symbol{166}} + \expandafter\def\csname simpleicon@vonageicon\endcsname {\simpleiconsmaponetwo\symbol{167}} + \expandafter\def\csname simpleicon@vorondesignicon\endcsname {\simpleiconsmaponetwo\symbol{168}} + \expandafter\def\csname simpleicon@vowpalwabbiticon\endcsname {\simpleiconsmaponetwo\symbol{169}} + \expandafter\def\csname simpleicon@voxicon\endcsname {\simpleiconsmaponetwo\symbol{170}} + \expandafter\def\csname simpleicon@vscoicon\endcsname {\simpleiconsmaponetwo\symbol{171}} + \expandafter\def\csname simpleicon@vscodiumicon\endcsname {\simpleiconsmaponetwo\symbol{172}} + \expandafter\def\csname simpleicon@vtexicon\endcsname {\simpleiconsmaponetwo\symbol{173}} + \expandafter\def\csname simpleicon@vuedotjsicon\endcsname {\simpleiconsmaponetwo\symbol{174}} + \expandafter\def\csname simpleicon@vuetifyicon\endcsname {\simpleiconsmaponetwo\symbol{175}} + \expandafter\def\csname simpleicon@vulkanicon\endcsname {\simpleiconsmaponetwo\symbol{176}} + \expandafter\def\csname simpleicon@vultricon\endcsname {\simpleiconsmaponetwo\symbol{177}} + \expandafter\def\csname simpleicon@vyondicon\endcsname {\simpleiconsmaponetwo\symbol{178}} + \expandafter\def\csname simpleicon@w3schoolsicon\endcsname {\simpleiconsmaponetwo\symbol{179}} + \expandafter\def\csname simpleicon@wacomicon\endcsname {\simpleiconsmaponetwo\symbol{180}} + \expandafter\def\csname simpleicon@wagmiicon\endcsname {\simpleiconsmaponetwo\symbol{181}} + \expandafter\def\csname simpleicon@wagtailicon\endcsname {\simpleiconsmaponetwo\symbol{182}} + \expandafter\def\csname simpleicon@wailsicon\endcsname {\simpleiconsmaponetwo\symbol{183}} + \expandafter\def\csname simpleicon@wakatimeicon\endcsname {\simpleiconsmaponetwo\symbol{184}} + \expandafter\def\csname simpleicon@walkmanicon\endcsname {\simpleiconsmaponetwo\symbol{185}} + \expandafter\def\csname simpleicon@wallabagicon\endcsname {\simpleiconsmaponetwo\symbol{186}} + \expandafter\def\csname simpleicon@walletconnecticon\endcsname {\simpleiconsmaponetwo\symbol{187}} + \expandafter\def\csname simpleicon@walmarticon\endcsname {\simpleiconsmaponetwo\symbol{188}} + \expandafter\def\csname simpleicon@wantedlyicon\endcsname {\simpleiconsmaponetwo\symbol{189}} + \expandafter\def\csname simpleicon@wappalyzericon\endcsname {\simpleiconsmaponetwo\symbol{190}} + \expandafter\def\csname simpleicon@warnerbrosicon\endcsname {\simpleiconsmaponetwo\symbol{191}} + \expandafter\def\csname simpleicon@warpicon\endcsname {\simpleiconsmaponetwo\symbol{192}} + \expandafter\def\csname simpleicon@wasabiicon\endcsname {\simpleiconsmaponetwo\symbol{193}} + \expandafter\def\csname simpleicon@wasmcloudicon\endcsname {\simpleiconsmaponetwo\symbol{194}} + \expandafter\def\csname simpleicon@wasmericon\endcsname {\simpleiconsmaponetwo\symbol{195}} + \expandafter\def\csname simpleicon@watchtowericon\endcsname {\simpleiconsmaponetwo\symbol{196}} + \expandafter\def\csname simpleicon@wattpadicon\endcsname {\simpleiconsmaponetwo\symbol{197}} + \expandafter\def\csname simpleicon@waylandicon\endcsname {\simpleiconsmaponetwo\symbol{198}} + \expandafter\def\csname simpleicon@wazeicon\endcsname {\simpleiconsmaponetwo\symbol{199}} + \expandafter\def\csname simpleicon@wazirxicon\endcsname {\simpleiconsmaponetwo\symbol{200}} + \expandafter\def\csname simpleicon@wearosicon\endcsname {\simpleiconsmaponetwo\symbol{201}} + \expandafter\def\csname simpleicon@weasylicon\endcsname {\simpleiconsmaponetwo\symbol{202}} + \expandafter\def\csname simpleicon@web3dotjsicon\endcsname {\simpleiconsmaponetwo\symbol{203}} + \expandafter\def\csname simpleicon@webassemblyicon\endcsname {\simpleiconsmaponetwo\symbol{204}} + \expandafter\def\csname simpleicon@webauthnicon\endcsname {\simpleiconsmaponetwo\symbol{205}} + \expandafter\def\csname simpleicon@webcomponentsdotorgicon\endcsname {\simpleiconsmaponetwo\symbol{206}} + \expandafter\def\csname simpleicon@webdriverioicon\endcsname {\simpleiconsmaponetwo\symbol{207}} + \expandafter\def\csname simpleicon@webexicon\endcsname {\simpleiconsmaponetwo\symbol{208}} + \expandafter\def\csname simpleicon@webflowicon\endcsname {\simpleiconsmaponetwo\symbol{209}} + \expandafter\def\csname simpleicon@webglicon\endcsname {\simpleiconsmaponetwo\symbol{210}} + \expandafter\def\csname simpleicon@webgpuicon\endcsname {\simpleiconsmaponetwo\symbol{211}} + \expandafter\def\csname simpleicon@weblateicon\endcsname {\simpleiconsmaponetwo\symbol{212}} + \expandafter\def\csname simpleicon@webminicon\endcsname {\simpleiconsmaponetwo\symbol{213}} + \expandafter\def\csname simpleicon@webmoneyicon\endcsname {\simpleiconsmaponetwo\symbol{214}} + \expandafter\def\csname simpleicon@webpackicon\endcsname {\simpleiconsmaponetwo\symbol{215}} + \expandafter\def\csname simpleicon@webrtcicon\endcsname {\simpleiconsmaponetwo\symbol{216}} + \expandafter\def\csname simpleicon@webstormicon\endcsname {\simpleiconsmaponetwo\symbol{217}} + \expandafter\def\csname simpleicon@webtoonicon\endcsname {\simpleiconsmaponetwo\symbol{218}} + \expandafter\def\csname simpleicon@webtreesicon\endcsname {\simpleiconsmaponetwo\symbol{219}} + \expandafter\def\csname simpleicon@wechaticon\endcsname {\simpleiconsmaponetwo\symbol{220}} + \expandafter\def\csname simpleicon@wegameicon\endcsname {\simpleiconsmaponetwo\symbol{221}} + \expandafter\def\csname simpleicon@weightsandbiasesicon\endcsname {\simpleiconsmaponetwo\symbol{222}} + \expandafter\def\csname simpleicon@welcometothejungleicon\endcsname {\simpleiconsmaponetwo\symbol{223}} + \expandafter\def\csname simpleicon@wellfoundicon\endcsname {\simpleiconsmaponetwo\symbol{224}} + \expandafter\def\csname simpleicon@wellsfargoicon\endcsname {\simpleiconsmaponetwo\symbol{225}} + \expandafter\def\csname simpleicon@wemoicon\endcsname {\simpleiconsmaponetwo\symbol{226}} + \expandafter\def\csname simpleicon@westerndigitalicon\endcsname {\simpleiconsmaponetwo\symbol{227}} + \expandafter\def\csname simpleicon@westernunionicon\endcsname {\simpleiconsmaponetwo\symbol{228}} + \expandafter\def\csname simpleicon@wetransfericon\endcsname {\simpleiconsmaponetwo\symbol{229}} + \expandafter\def\csname simpleicon@weztermicon\endcsname {\simpleiconsmaponetwo\symbol{230}} + \expandafter\def\csname simpleicon@wgpuicon\endcsname {\simpleiconsmaponetwo\symbol{231}} + \expandafter\def\csname simpleicon@whatsappicon\endcsname {\simpleiconsmaponetwo\symbol{232}} + \expandafter\def\csname simpleicon@wheniworkicon\endcsname {\simpleiconsmaponetwo\symbol{233}} + \expandafter\def\csname simpleicon@wiiicon\endcsname {\simpleiconsmaponetwo\symbol{234}} + \expandafter\def\csname simpleicon@wiiuicon\endcsname {\simpleiconsmaponetwo\symbol{235}} + \expandafter\def\csname simpleicon@wikidataicon\endcsname {\simpleiconsmaponetwo\symbol{236}} + \expandafter\def\csname simpleicon@wikidotggicon\endcsname {\simpleiconsmaponetwo\symbol{237}} + \expandafter\def\csname simpleicon@wikidotjsicon\endcsname {\simpleiconsmaponetwo\symbol{238}} + \expandafter\def\csname simpleicon@wikimediacommonsicon\endcsname {\simpleiconsmaponetwo\symbol{239}} + \expandafter\def\csname simpleicon@wikimediafoundationicon\endcsname {\simpleiconsmaponetwo\symbol{240}} + \expandafter\def\csname simpleicon@wikipediaicon\endcsname {\simpleiconsmaponetwo\symbol{241}} + \expandafter\def\csname simpleicon@wikiquoteicon\endcsname {\simpleiconsmaponetwo\symbol{242}} + \expandafter\def\csname simpleicon@wikivoyageicon\endcsname {\simpleiconsmaponetwo\symbol{243}} + \expandafter\def\csname simpleicon@winampicon\endcsname {\simpleiconsmaponetwo\symbol{244}} + \expandafter\def\csname simpleicon@wiproicon\endcsname {\simpleiconsmaponetwo\symbol{245}} + \expandafter\def\csname simpleicon@wireicon\endcsname {\simpleiconsmaponetwo\symbol{246}} + \expandafter\def\csname simpleicon@wireguardicon\endcsname {\simpleiconsmaponetwo\symbol{247}} + \expandafter\def\csname simpleicon@wiresharkicon\endcsname {\simpleiconsmaponetwo\symbol{248}} + \expandafter\def\csname simpleicon@wiseicon\endcsname {\simpleiconsmaponetwo\symbol{249}} + \expandafter\def\csname simpleicon@wishicon\endcsname {\simpleiconsmaponetwo\symbol{250}} + \expandafter\def\csname simpleicon@wistiaicon\endcsname {\simpleiconsmaponetwo\symbol{251}} + \expandafter\def\csname simpleicon@wixicon\endcsname {\simpleiconsmaponetwo\symbol{252}} + \expandafter\def\csname simpleicon@wizzairicon\endcsname {\simpleiconsmaponetwo\symbol{253}} + \expandafter\def\csname simpleicon@wolframicon\endcsname {\simpleiconsmaponetwo\symbol{254}} + \expandafter\def\csname simpleicon@wolframlanguageicon\endcsname {\simpleiconsmaponetwo\symbol{255}} + \expandafter\def\csname simpleicon@wolframmathematicaicon\endcsname {\simpleiconsmaponethree\symbol{0}} + \expandafter\def\csname simpleicon@wondershareicon\endcsname {\simpleiconsmaponethree\symbol{1}} + \expandafter\def\csname simpleicon@wondersharefilmoraicon\endcsname {\simpleiconsmaponethree\symbol{2}} + \expandafter\def\csname simpleicon@wooicon\endcsname {\simpleiconsmaponethree\symbol{3}} + \expandafter\def\csname simpleicon@woocommerceicon\endcsname {\simpleiconsmaponethree\symbol{4}} + \expandafter\def\csname simpleicon@wordpressicon\endcsname {\simpleiconsmaponethree\symbol{5}} + \expandafter\def\csname simpleicon@workplaceicon\endcsname {\simpleiconsmaponethree\symbol{6}} + \expandafter\def\csname simpleicon@worldhealthorganizationicon\endcsname {\simpleiconsmaponethree\symbol{7}} + \expandafter\def\csname simpleicon@wpengineicon\endcsname {\simpleiconsmaponethree\symbol{8}} + \expandafter\def\csname simpleicon@wpexplorericon\endcsname {\simpleiconsmaponethree\symbol{9}} + \expandafter\def\csname simpleicon@wprocketicon\endcsname {\simpleiconsmaponethree\symbol{10}} + \expandafter\def\csname simpleicon@writedotasicon\endcsname {\simpleiconsmaponethree\symbol{11}} + \expandafter\def\csname simpleicon@wweicon\endcsname {\simpleiconsmaponethree\symbol{12}} + \expandafter\def\csname simpleicon@wwiseicon\endcsname {\simpleiconsmaponethree\symbol{13}} + \expandafter\def\csname simpleicon@wykopicon\endcsname {\simpleiconsmaponethree\symbol{14}} + \expandafter\def\csname simpleicon@wyzeicon\endcsname {\simpleiconsmaponethree\symbol{15}} + \expandafter\def\csname simpleicon@xicon\endcsname {\simpleiconsmaponethree\symbol{16}} + \expandafter\def\csname simpleicon@xamppicon\endcsname {\simpleiconsmaponethree\symbol{17}} + \expandafter\def\csname simpleicon@xcodeicon\endcsname {\simpleiconsmaponethree\symbol{18}} + \expandafter\def\csname simpleicon@xdadevelopersicon\endcsname {\simpleiconsmaponethree\symbol{19}} + \expandafter\def\csname simpleicon@xdotorgicon\endcsname {\simpleiconsmaponethree\symbol{20}} + \expandafter\def\csname simpleicon@xenditicon\endcsname {\simpleiconsmaponethree\symbol{21}} + \expandafter\def\csname simpleicon@xeroicon\endcsname {\simpleiconsmaponethree\symbol{22}} + \expandafter\def\csname simpleicon@xfceicon\endcsname {\simpleiconsmaponethree\symbol{23}} + \expandafter\def\csname simpleicon@xiaohongshuicon\endcsname {\simpleiconsmaponethree\symbol{24}} + \expandafter\def\csname simpleicon@xiaomiicon\endcsname {\simpleiconsmaponethree\symbol{25}} + \expandafter\def\csname simpleicon@xingicon\endcsname {\simpleiconsmaponethree\symbol{26}} + \expandafter\def\csname simpleicon@xmppicon\endcsname {\simpleiconsmaponethree\symbol{27}} + \expandafter\def\csname simpleicon@xoicon\endcsname {\simpleiconsmaponethree\symbol{28}} + \expandafter\def\csname simpleicon@xrpicon\endcsname {\simpleiconsmaponethree\symbol{29}} + \expandafter\def\csname simpleicon@xspliticon\endcsname {\simpleiconsmaponethree\symbol{30}} + \expandafter\def\csname simpleicon@xstateicon\endcsname {\simpleiconsmaponethree\symbol{31}} + \expandafter\def\csname simpleicon@yabaiicon\endcsname {\simpleiconsmaponethree\symbol{32}} + \expandafter\def\csname simpleicon@yaleicon\endcsname {\simpleiconsmaponethree\symbol{33}} + \expandafter\def\csname simpleicon@yamahacorporationicon\endcsname {\simpleiconsmaponethree\symbol{34}} + \expandafter\def\csname simpleicon@yamahamotorcorporationicon\endcsname {\simpleiconsmaponethree\symbol{35}} + \expandafter\def\csname simpleicon@yamlicon\endcsname {\simpleiconsmaponethree\symbol{36}} + \expandafter\def\csname simpleicon@yandexcloudicon\endcsname {\simpleiconsmaponethree\symbol{37}} + \expandafter\def\csname simpleicon@yarnicon\endcsname {\simpleiconsmaponethree\symbol{38}} + \expandafter\def\csname simpleicon@ycombinatoricon\endcsname {\simpleiconsmaponethree\symbol{39}} + \expandafter\def\csname simpleicon@yelpicon\endcsname {\simpleiconsmaponethree\symbol{40}} + \expandafter\def\csname simpleicon@yetiicon\endcsname {\simpleiconsmaponethree\symbol{41}} + \expandafter\def\csname simpleicon@yiiicon\endcsname {\simpleiconsmaponethree\symbol{42}} + \expandafter\def\csname simpleicon@yoasticon\endcsname {\simpleiconsmaponethree\symbol{43}} + \expandafter\def\csname simpleicon@youtubeicon\endcsname {\simpleiconsmaponethree\symbol{44}} + \expandafter\def\csname simpleicon@youtubegamingicon\endcsname {\simpleiconsmaponethree\symbol{45}} + \expandafter\def\csname simpleicon@youtubekidsicon\endcsname {\simpleiconsmaponethree\symbol{46}} + \expandafter\def\csname simpleicon@youtubemusicicon\endcsname {\simpleiconsmaponethree\symbol{47}} + \expandafter\def\csname simpleicon@youtubeshortsicon\endcsname {\simpleiconsmaponethree\symbol{48}} + \expandafter\def\csname simpleicon@youtubestudioicon\endcsname {\simpleiconsmaponethree\symbol{49}} + \expandafter\def\csname simpleicon@youtubetvicon\endcsname {\simpleiconsmaponethree\symbol{50}} + \expandafter\def\csname simpleicon@yricon\endcsname {\simpleiconsmaponethree\symbol{51}} + \expandafter\def\csname simpleicon@yubicoicon\endcsname {\simpleiconsmaponethree\symbol{52}} + \expandafter\def\csname simpleicon@yunohosticon\endcsname {\simpleiconsmaponethree\symbol{53}} + \expandafter\def\csname simpleicon@zabkaicon\endcsname {\simpleiconsmaponethree\symbol{54}} + \expandafter\def\csname simpleicon@zaimicon\endcsname {\simpleiconsmaponethree\symbol{55}} + \expandafter\def\csname simpleicon@zalandoicon\endcsname {\simpleiconsmaponethree\symbol{56}} + \expandafter\def\csname simpleicon@zaloicon\endcsname {\simpleiconsmaponethree\symbol{57}} + \expandafter\def\csname simpleicon@zapicon\endcsname {\simpleiconsmaponethree\symbol{58}} + \expandafter\def\csname simpleicon@zapiericon\endcsname {\simpleiconsmaponethree\symbol{59}} + \expandafter\def\csname simpleicon@zaraicon\endcsname {\simpleiconsmaponethree\symbol{60}} + \expandafter\def\csname simpleicon@zazzleicon\endcsname {\simpleiconsmaponethree\symbol{61}} + \expandafter\def\csname simpleicon@zcashicon\endcsname {\simpleiconsmaponethree\symbol{62}} + \expandafter\def\csname simpleicon@zcoolicon\endcsname {\simpleiconsmaponethree\symbol{63}} + \expandafter\def\csname simpleicon@zdficon\endcsname {\simpleiconsmaponethree\symbol{64}} + \expandafter\def\csname simpleicon@zebpayicon\endcsname {\simpleiconsmaponethree\symbol{65}} + \expandafter\def\csname simpleicon@zebratechnologiesicon\endcsname {\simpleiconsmaponethree\symbol{66}} + \expandafter\def\csname simpleicon@zedindustriesicon\endcsname {\simpleiconsmaponethree\symbol{67}} + \expandafter\def\csname simpleicon@zelleicon\endcsname {\simpleiconsmaponethree\symbol{68}} + \expandafter\def\csname simpleicon@zendicon\endcsname {\simpleiconsmaponethree\symbol{69}} + \expandafter\def\csname simpleicon@zendeskicon\endcsname {\simpleiconsmaponethree\symbol{70}} + \expandafter\def\csname simpleicon@zennicon\endcsname {\simpleiconsmaponethree\symbol{71}} + \expandafter\def\csname simpleicon@zenodoicon\endcsname {\simpleiconsmaponethree\symbol{72}} + \expandafter\def\csname simpleicon@zensaricon\endcsname {\simpleiconsmaponethree\symbol{73}} + \expandafter\def\csname simpleicon@zerodhaicon\endcsname {\simpleiconsmaponethree\symbol{74}} + \expandafter\def\csname simpleicon@zerotiericon\endcsname {\simpleiconsmaponethree\symbol{75}} + \expandafter\def\csname simpleicon@zerplyicon\endcsname {\simpleiconsmaponethree\symbol{76}} + \expandafter\def\csname simpleicon@zettlricon\endcsname {\simpleiconsmaponethree\symbol{77}} + \expandafter\def\csname simpleicon@zhihuicon\endcsname {\simpleiconsmaponethree\symbol{78}} + \expandafter\def\csname simpleicon@zigicon\endcsname {\simpleiconsmaponethree\symbol{79}} + \expandafter\def\csname simpleicon@zigbeeicon\endcsname {\simpleiconsmaponethree\symbol{80}} + \expandafter\def\csname simpleicon@zigbee2mqtticon\endcsname {\simpleiconsmaponethree\symbol{81}} + \expandafter\def\csname simpleicon@ziggoicon\endcsname {\simpleiconsmaponethree\symbol{82}} + \expandafter\def\csname simpleicon@zilchicon\endcsname {\simpleiconsmaponethree\symbol{83}} + \expandafter\def\csname simpleicon@zillowicon\endcsname {\simpleiconsmaponethree\symbol{84}} + \expandafter\def\csname simpleicon@zincsearchicon\endcsname {\simpleiconsmaponethree\symbol{85}} + \expandafter\def\csname simpleicon@zingaticon\endcsname {\simpleiconsmaponethree\symbol{86}} + \expandafter\def\csname simpleicon@zodicon\endcsname {\simpleiconsmaponethree\symbol{87}} + \expandafter\def\csname simpleicon@zohoicon\endcsname {\simpleiconsmaponethree\symbol{88}} + \expandafter\def\csname simpleicon@zoipericon\endcsname {\simpleiconsmaponethree\symbol{89}} + \expandafter\def\csname simpleicon@zomatoicon\endcsname {\simpleiconsmaponethree\symbol{90}} + \expandafter\def\csname simpleicon@zoomicon\endcsname {\simpleiconsmaponethree\symbol{91}} + \expandafter\def\csname simpleicon@zorinicon\endcsname {\simpleiconsmaponethree\symbol{92}} + \expandafter\def\csname simpleicon@zoteroicon\endcsname {\simpleiconsmaponethree\symbol{93}} + \expandafter\def\csname simpleicon@zshicon\endcsname {\simpleiconsmaponethree\symbol{94}} + \expandafter\def\csname simpleicon@zulipicon\endcsname {\simpleiconsmaponethree\symbol{95}} + \expandafter\def\csname simpleicon@zyteicon\endcsname {\simpleiconsmaponethree\symbol{96}}
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-xeluatex.tex b/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-xeluatex.tex index d1e3f05441c..e209def4ce8 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-xeluatex.tex +++ b/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-xeluatex.tex @@ -321,2838 +321,2850 @@ \expandafter\def\csname simpleicon@baremetricsicon\endcsname {\simpleiconsmap\symbol{"EB40}} \expandafter\def\csname simpleicon@barmeniaicon\endcsname {\simpleiconsmap\symbol{"EB41}} \expandafter\def\csname simpleicon@basecampicon\endcsname {\simpleiconsmap\symbol{"EB42}} - \expandafter\def\csname simpleicon@basicattentiontokenicon\endcsname {\simpleiconsmap\symbol{"EB43}} - \expandafter\def\csname simpleicon@bastyonicon\endcsname {\simpleiconsmap\symbol{"EB44}} - \expandafter\def\csname simpleicon@baticon\endcsname {\simpleiconsmap\symbol{"EB45}} - \expandafter\def\csname simpleicon@bataicon\endcsname {\simpleiconsmap\symbol{"EB46}} - \expandafter\def\csname simpleicon@battledotneticon\endcsname {\simpleiconsmap\symbol{"EB47}} - \expandafter\def\csname simpleicon@bazelicon\endcsname {\simpleiconsmap\symbol{"EB48}} - \expandafter\def\csname simpleicon@beatporticon\endcsname {\simpleiconsmap\symbol{"EB49}} - \expandafter\def\csname simpleicon@beatsicon\endcsname {\simpleiconsmap\symbol{"EB4A}} - \expandafter\def\csname simpleicon@beatsbydreicon\endcsname {\simpleiconsmap\symbol{"EB4B}} - \expandafter\def\csname simpleicon@beatstarsicon\endcsname {\simpleiconsmap\symbol{"EB4C}} - \expandafter\def\csname simpleicon@beekeeperstudioicon\endcsname {\simpleiconsmap\symbol{"EB4D}} - \expandafter\def\csname simpleicon@behanceicon\endcsname {\simpleiconsmap\symbol{"EB4E}} - \expandafter\def\csname simpleicon@beijingsubwayicon\endcsname {\simpleiconsmap\symbol{"EB4F}} - \expandafter\def\csname simpleicon@bemicon\endcsname {\simpleiconsmap\symbol{"EB50}} - \expandafter\def\csname simpleicon@bentleyicon\endcsname {\simpleiconsmap\symbol{"EB51}} - \expandafter\def\csname simpleicon@bentoicon\endcsname {\simpleiconsmap\symbol{"EB52}} - \expandafter\def\csname simpleicon@bentoboxicon\endcsname {\simpleiconsmap\symbol{"EB53}} - \expandafter\def\csname simpleicon@bentomlicon\endcsname {\simpleiconsmap\symbol{"EB54}} - \expandafter\def\csname simpleicon@berealicon\endcsname {\simpleiconsmap\symbol{"EB55}} - \expandafter\def\csname simpleicon@betfairicon\endcsname {\simpleiconsmap\symbol{"EB56}} - \expandafter\def\csname simpleicon@betterstackicon\endcsname {\simpleiconsmap\symbol{"EB57}} - \expandafter\def\csname simpleicon@bevyicon\endcsname {\simpleiconsmap\symbol{"EB58}} - \expandafter\def\csname simpleicon@bigbasketicon\endcsname {\simpleiconsmap\symbol{"EB59}} - \expandafter\def\csname simpleicon@bigbluebuttonicon\endcsname {\simpleiconsmap\symbol{"EB5A}} - \expandafter\def\csname simpleicon@bigcartelicon\endcsname {\simpleiconsmap\symbol{"EB5B}} - \expandafter\def\csname simpleicon@bigcommerceicon\endcsname {\simpleiconsmap\symbol{"EB5C}} - \expandafter\def\csname simpleicon@bilibiliicon\endcsname {\simpleiconsmap\symbol{"EB5D}} - \expandafter\def\csname simpleicon@billboardicon\endcsname {\simpleiconsmap\symbol{"EB5E}} - \expandafter\def\csname simpleicon@bimicon\endcsname {\simpleiconsmap\symbol{"EB5F}} - \expandafter\def\csname simpleicon@binanceicon\endcsname {\simpleiconsmap\symbol{"EB60}} - \expandafter\def\csname simpleicon@biolinkicon\endcsname {\simpleiconsmap\symbol{"EB61}} - \expandafter\def\csname simpleicon@biomeicon\endcsname {\simpleiconsmap\symbol{"EB62}} - \expandafter\def\csname simpleicon@bisecthostingicon\endcsname {\simpleiconsmap\symbol{"EB63}} - \expandafter\def\csname simpleicon@biticon\endcsname {\simpleiconsmap\symbol{"EB64}} - \expandafter\def\csname simpleicon@bitbucketicon\endcsname {\simpleiconsmap\symbol{"EB65}} - \expandafter\def\csname simpleicon@bitcoinicon\endcsname {\simpleiconsmap\symbol{"EB66}} - \expandafter\def\csname simpleicon@bitcoincashicon\endcsname {\simpleiconsmap\symbol{"EB67}} - \expandafter\def\csname simpleicon@bitcoinsvicon\endcsname {\simpleiconsmap\symbol{"EB68}} - \expandafter\def\csname simpleicon@bitcometicon\endcsname {\simpleiconsmap\symbol{"EB69}} - \expandafter\def\csname simpleicon@bitdefendericon\endcsname {\simpleiconsmap\symbol{"EB6A}} - \expandafter\def\csname simpleicon@bitlyicon\endcsname {\simpleiconsmap\symbol{"EB6B}} - \expandafter\def\csname simpleicon@bitriseicon\endcsname {\simpleiconsmap\symbol{"EB6C}} - \expandafter\def\csname simpleicon@bittorrenticon\endcsname {\simpleiconsmap\symbol{"EB6D}} - \expandafter\def\csname simpleicon@bitwardenicon\endcsname {\simpleiconsmap\symbol{"EB6E}} - \expandafter\def\csname simpleicon@bitwigicon\endcsname {\simpleiconsmap\symbol{"EB6F}} - \expandafter\def\csname simpleicon@blackberryicon\endcsname {\simpleiconsmap\symbol{"EB70}} - \expandafter\def\csname simpleicon@blackmagicdesignicon\endcsname {\simpleiconsmap\symbol{"EB71}} - \expandafter\def\csname simpleicon@blazemetericon\endcsname {\simpleiconsmap\symbol{"EB72}} - \expandafter\def\csname simpleicon@blazoricon\endcsname {\simpleiconsmap\symbol{"EB73}} - \expandafter\def\csname simpleicon@blendericon\endcsname {\simpleiconsmap\symbol{"EB74}} - \expandafter\def\csname simpleicon@blockbenchicon\endcsname {\simpleiconsmap\symbol{"EB75}} - \expandafter\def\csname simpleicon@blockchaindotcomicon\endcsname {\simpleiconsmap\symbol{"EB76}} - \expandafter\def\csname simpleicon@bloggericon\endcsname {\simpleiconsmap\symbol{"EB77}} - \expandafter\def\csname simpleicon@bloglovinicon\endcsname {\simpleiconsmap\symbol{"EB78}} - \expandafter\def\csname simpleicon@blueprinticon\endcsname {\simpleiconsmap\symbol{"EB79}} - \expandafter\def\csname simpleicon@blueskyicon\endcsname {\simpleiconsmap\symbol{"EB7A}} - \expandafter\def\csname simpleicon@bluesoundicon\endcsname {\simpleiconsmap\symbol{"EB7B}} - \expandafter\def\csname simpleicon@bluetoothicon\endcsname {\simpleiconsmap\symbol{"EB7C}} - \expandafter\def\csname simpleicon@bmcsoftwareicon\endcsname {\simpleiconsmap\symbol{"EB7D}} - \expandafter\def\csname simpleicon@bmwicon\endcsname {\simpleiconsmap\symbol{"EB7E}} - \expandafter\def\csname simpleicon@bnbchainicon\endcsname {\simpleiconsmap\symbol{"EB7F}} - \expandafter\def\csname simpleicon@boardgamegeekicon\endcsname {\simpleiconsmap\symbol{"EB80}} - \expandafter\def\csname simpleicon@boaticon\endcsname {\simpleiconsmap\symbol{"EB81}} - \expandafter\def\csname simpleicon@boehringeringelheimicon\endcsname {\simpleiconsmap\symbol{"EB82}} - \expandafter\def\csname simpleicon@boeingicon\endcsname {\simpleiconsmap\symbol{"EB83}} - \expandafter\def\csname simpleicon@bombardiericon\endcsname {\simpleiconsmap\symbol{"EB84}} - \expandafter\def\csname simpleicon@bookalopeicon\endcsname {\simpleiconsmap\symbol{"EB85}} - \expandafter\def\csname simpleicon@bookbubicon\endcsname {\simpleiconsmap\symbol{"EB86}} - \expandafter\def\csname simpleicon@bookmetericon\endcsname {\simpleiconsmap\symbol{"EB87}} - \expandafter\def\csname simpleicon@bookmyshowicon\endcsname {\simpleiconsmap\symbol{"EB88}} - \expandafter\def\csname simpleicon@bookstackicon\endcsname {\simpleiconsmap\symbol{"EB89}} - \expandafter\def\csname simpleicon@boosticon\endcsname {\simpleiconsmap\symbol{"EB8A}} - \expandafter\def\csname simpleicon@boostyicon\endcsname {\simpleiconsmap\symbol{"EB8B}} - \expandafter\def\csname simpleicon@bootsicon\endcsname {\simpleiconsmap\symbol{"EB8C}} - \expandafter\def\csname simpleicon@bootstrapicon\endcsname {\simpleiconsmap\symbol{"EB8D}} - \expandafter\def\csname simpleicon@borgbackupicon\endcsname {\simpleiconsmap\symbol{"EB8E}} - \expandafter\def\csname simpleicon@boschicon\endcsname {\simpleiconsmap\symbol{"EB8F}} - \expandafter\def\csname simpleicon@boseicon\endcsname {\simpleiconsmap\symbol{"EB90}} - \expandafter\def\csname simpleicon@botblecmsicon\endcsname {\simpleiconsmap\symbol{"EB91}} - \expandafter\def\csname simpleicon@boulangericon\endcsname {\simpleiconsmap\symbol{"EB92}} - \expandafter\def\csname simpleicon@bowericon\endcsname {\simpleiconsmap\symbol{"EB93}} - \expandafter\def\csname simpleicon@boxicon\endcsname {\simpleiconsmap\symbol{"EB94}} - \expandafter\def\csname simpleicon@boxysvgicon\endcsname {\simpleiconsmap\symbol{"EB95}} - \expandafter\def\csname simpleicon@braintreeicon\endcsname {\simpleiconsmap\symbol{"EB96}} - \expandafter\def\csname simpleicon@brandfoldericon\endcsname {\simpleiconsmap\symbol{"EB97}} - \expandafter\def\csname simpleicon@braveicon\endcsname {\simpleiconsmap\symbol{"EB98}} - \expandafter\def\csname simpleicon@breakericon\endcsname {\simpleiconsmap\symbol{"EB99}} - \expandafter\def\csname simpleicon@brenntagicon\endcsname {\simpleiconsmap\symbol{"EB9A}} - \expandafter\def\csname simpleicon@brevoicon\endcsname {\simpleiconsmap\symbol{"EB9B}} - \expandafter\def\csname simpleicon@brexicon\endcsname {\simpleiconsmap\symbol{"EB9C}} - \expandafter\def\csname simpleicon@bricksicon\endcsname {\simpleiconsmap\symbol{"EB9D}} - \expandafter\def\csname simpleicon@britishairwaysicon\endcsname {\simpleiconsmap\symbol{"EB9E}} - \expandafter\def\csname simpleicon@broadcomicon\endcsname {\simpleiconsmap\symbol{"EB9F}} - \expandafter\def\csname simpleicon@brunoicon\endcsname {\simpleiconsmap\symbol{"EBA0}} - \expandafter\def\csname simpleicon@bsdicon\endcsname {\simpleiconsmap\symbol{"EBA1}} - \expandafter\def\csname simpleicon@bspwmicon\endcsname {\simpleiconsmap\symbol{"EBA2}} - \expandafter\def\csname simpleicon@bticon\endcsname {\simpleiconsmap\symbol{"EBA3}} - \expandafter\def\csname simpleicon@buddyicon\endcsname {\simpleiconsmap\symbol{"EBA4}} - \expandafter\def\csname simpleicon@budibaseicon\endcsname {\simpleiconsmap\symbol{"EBA5}} - \expandafter\def\csname simpleicon@buefyicon\endcsname {\simpleiconsmap\symbol{"EBA6}} - \expandafter\def\csname simpleicon@buffericon\endcsname {\simpleiconsmap\symbol{"EBA7}} - \expandafter\def\csname simpleicon@bugattiicon\endcsname {\simpleiconsmap\symbol{"EBA8}} - \expandafter\def\csname simpleicon@bugcrowdicon\endcsname {\simpleiconsmap\symbol{"EBA9}} - \expandafter\def\csname simpleicon@bugsnagicon\endcsname {\simpleiconsmap\symbol{"EBAA}} - \expandafter\def\csname simpleicon@buhlicon\endcsname {\simpleiconsmap\symbol{"EBAB}} - \expandafter\def\csname simpleicon@buildkiteicon\endcsname {\simpleiconsmap\symbol{"EBAC}} - \expandafter\def\csname simpleicon@bukalapakicon\endcsname {\simpleiconsmap\symbol{"EBAD}} - \expandafter\def\csname simpleicon@bulmaicon\endcsname {\simpleiconsmap\symbol{"EBAE}} - \expandafter\def\csname simpleicon@bunicon\endcsname {\simpleiconsmap\symbol{"EBAF}} - \expandafter\def\csname simpleicon@bungieicon\endcsname {\simpleiconsmap\symbol{"EBB0}} - \expandafter\def\csname simpleicon@bunqicon\endcsname {\simpleiconsmap\symbol{"EBB1}} - \expandafter\def\csname simpleicon@burgerkingicon\endcsname {\simpleiconsmap\symbol{"EBB2}} - \expandafter\def\csname simpleicon@burpsuiteicon\endcsname {\simpleiconsmap\symbol{"EBB3}} - \expandafter\def\csname simpleicon@burtonicon\endcsname {\simpleiconsmap\symbol{"EBB4}} - \expandafter\def\csname simpleicon@buymeacoffeeicon\endcsname {\simpleiconsmap\symbol{"EBB5}} - \expandafter\def\csname simpleicon@buyselladsicon\endcsname {\simpleiconsmap\symbol{"EBB6}} - \expandafter\def\csname simpleicon@buzzfeedicon\endcsname {\simpleiconsmap\symbol{"EBB7}} - \expandafter\def\csname simpleicon@bvgicon\endcsname {\simpleiconsmap\symbol{"EBB8}} - \expandafter\def\csname simpleicon@byjusicon\endcsname {\simpleiconsmap\symbol{"EBB9}} - \expandafter\def\csname simpleicon@bytedanceicon\endcsname {\simpleiconsmap\symbol{"EBBA}} - \expandafter\def\csname simpleicon@cicon\endcsname {\simpleiconsmap\symbol{"EBBB}} - \expandafter\def\csname simpleicon@cacheticon\endcsname {\simpleiconsmap\symbol{"EBBC}} - \expandafter\def\csname simpleicon@caddyicon\endcsname {\simpleiconsmap\symbol{"EBBD}} - \expandafter\def\csname simpleicon@cadillacicon\endcsname {\simpleiconsmap\symbol{"EBBE}} - \expandafter\def\csname simpleicon@cafepressicon\endcsname {\simpleiconsmap\symbol{"EBBF}} - \expandafter\def\csname simpleicon@caffeineicon\endcsname {\simpleiconsmap\symbol{"EBC0}} - \expandafter\def\csname simpleicon@cairographicsicon\endcsname {\simpleiconsmap\symbol{"EBC1}} - \expandafter\def\csname simpleicon@cairometroicon\endcsname {\simpleiconsmap\symbol{"EBC2}} - \expandafter\def\csname simpleicon@cakephpicon\endcsname {\simpleiconsmap\symbol{"EBC3}} - \expandafter\def\csname simpleicon@caldotcomicon\endcsname {\simpleiconsmap\symbol{"EBC4}} - \expandafter\def\csname simpleicon@calendlyicon\endcsname {\simpleiconsmap\symbol{"EBC5}} - \expandafter\def\csname simpleicon@calibrewebicon\endcsname {\simpleiconsmap\symbol{"EBC6}} - \expandafter\def\csname simpleicon@campaignmonitoricon\endcsname {\simpleiconsmap\symbol{"EBC7}} - \expandafter\def\csname simpleicon@camundaicon\endcsname {\simpleiconsmap\symbol{"EBC8}} - \expandafter\def\csname simpleicon@canonicalicon\endcsname {\simpleiconsmap\symbol{"EBC9}} - \expandafter\def\csname simpleicon@canvaicon\endcsname {\simpleiconsmap\symbol{"EBCA}} - \expandafter\def\csname simpleicon@canvasicon\endcsname {\simpleiconsmap\symbol{"EBCB}} - \expandafter\def\csname simpleicon@capacitoricon\endcsname {\simpleiconsmap\symbol{"EBCC}} - \expandafter\def\csname simpleicon@cardanoicon\endcsname {\simpleiconsmap\symbol{"EBCD}} - \expandafter\def\csname simpleicon@carlsberggroupicon\endcsname {\simpleiconsmap\symbol{"EBCE}} - \expandafter\def\csname simpleicon@carrdicon\endcsname {\simpleiconsmap\symbol{"EBCF}} - \expandafter\def\csname simpleicon@carrefouricon\endcsname {\simpleiconsmap\symbol{"EBD0}} - \expandafter\def\csname simpleicon@carthrottleicon\endcsname {\simpleiconsmap\symbol{"EBD1}} - \expandafter\def\csname simpleicon@cartoicon\endcsname {\simpleiconsmap\symbol{"EBD2}} - \expandafter\def\csname simpleicon@cashappicon\endcsname {\simpleiconsmap\symbol{"EBD3}} - \expandafter\def\csname simpleicon@castboxicon\endcsname {\simpleiconsmap\symbol{"EBD4}} - \expandafter\def\csname simpleicon@castoramaicon\endcsname {\simpleiconsmap\symbol{"EBD5}} - \expandafter\def\csname simpleicon@castroicon\endcsname {\simpleiconsmap\symbol{"EBD6}} - \expandafter\def\csname simpleicon@caterpillaricon\endcsname {\simpleiconsmap\symbol{"EBD7}} - \expandafter\def\csname simpleicon@cbcicon\endcsname {\simpleiconsmap\symbol{"EBD8}} - \expandafter\def\csname simpleicon@cbsicon\endcsname {\simpleiconsmap\symbol{"EBD9}} - \expandafter\def\csname simpleicon@ccleanericon\endcsname {\simpleiconsmap\symbol{"EBDA}} - \expandafter\def\csname simpleicon@cdprojekticon\endcsname {\simpleiconsmap\symbol{"EBDB}} - \expandafter\def\csname simpleicon@celeryicon\endcsname {\simpleiconsmap\symbol{"EBDC}} - \expandafter\def\csname simpleicon@celestronicon\endcsname {\simpleiconsmap\symbol{"EBDD}} - \expandafter\def\csname simpleicon@centosicon\endcsname {\simpleiconsmap\symbol{"EBDE}} - \expandafter\def\csname simpleicon@cephicon\endcsname {\simpleiconsmap\symbol{"EBDF}} - \expandafter\def\csname simpleicon@cesiumicon\endcsname {\simpleiconsmap\symbol{"EBE0}} - \expandafter\def\csname simpleicon@chaiicon\endcsname {\simpleiconsmap\symbol{"EBE1}} - \expandafter\def\csname simpleicon@chainguardicon\endcsname {\simpleiconsmap\symbol{"EBE2}} - \expandafter\def\csname simpleicon@chainlinkicon\endcsname {\simpleiconsmap\symbol{"EBE3}} - \expandafter\def\csname simpleicon@chakrauiicon\endcsname {\simpleiconsmap\symbol{"EBE4}} - \expandafter\def\csname simpleicon@channel4icon\endcsname {\simpleiconsmap\symbol{"EBE5}} - \expandafter\def\csname simpleicon@charlesicon\endcsname {\simpleiconsmap\symbol{"EBE6}} - \expandafter\def\csname simpleicon@chartdotjsicon\endcsname {\simpleiconsmap\symbol{"EBE7}} - \expandafter\def\csname simpleicon@chartmogulicon\endcsname {\simpleiconsmap\symbol{"EBE8}} - \expandafter\def\csname simpleicon@chaseicon\endcsname {\simpleiconsmap\symbol{"EBE9}} - \expandafter\def\csname simpleicon@chatboticon\endcsname {\simpleiconsmap\symbol{"EBEA}} - \expandafter\def\csname simpleicon@chatwooticon\endcsname {\simpleiconsmap\symbol{"EBEB}} - \expandafter\def\csname simpleicon@checkioicon\endcsname {\simpleiconsmap\symbol{"EBEC}} - \expandafter\def\csname simpleicon@checkmarxicon\endcsname {\simpleiconsmap\symbol{"EBED}} - \expandafter\def\csname simpleicon@checkmkicon\endcsname {\simpleiconsmap\symbol{"EBEE}} - \expandafter\def\csname simpleicon@chedrauiicon\endcsname {\simpleiconsmap\symbol{"EBEF}} - \expandafter\def\csname simpleicon@cheerioicon\endcsname {\simpleiconsmap\symbol{"EBF0}} - \expandafter\def\csname simpleicon@cheficon\endcsname {\simpleiconsmap\symbol{"EBF1}} - \expandafter\def\csname simpleicon@chemexicon\endcsname {\simpleiconsmap\symbol{"EBF2}} - \expandafter\def\csname simpleicon@chessdotcomicon\endcsname {\simpleiconsmap\symbol{"EBF3}} - \expandafter\def\csname simpleicon@chevroleticon\endcsname {\simpleiconsmap\symbol{"EBF4}} - \expandafter\def\csname simpleicon@chianetworkicon\endcsname {\simpleiconsmap\symbol{"EBF5}} - \expandafter\def\csname simpleicon@chinaeasternairlinesicon\endcsname {\simpleiconsmap\symbol{"EBF6}} - \expandafter\def\csname simpleicon@chinasouthernairlinesicon\endcsname {\simpleiconsmap\symbol{"EBF7}} - \expandafter\def\csname simpleicon@chocolateyicon\endcsname {\simpleiconsmap\symbol{"EBF8}} - \expandafter\def\csname simpleicon@chromaticicon\endcsname {\simpleiconsmap\symbol{"EBF9}} - \expandafter\def\csname simpleicon@chromecasticon\endcsname {\simpleiconsmap\symbol{"EBFA}} - \expandafter\def\csname simpleicon@chromewebstoreicon\endcsname {\simpleiconsmap\symbol{"EBFB}} - \expandafter\def\csname simpleicon@chryslericon\endcsname {\simpleiconsmap\symbol{"EBFC}} - \expandafter\def\csname simpleicon@chupachupsicon\endcsname {\simpleiconsmap\symbol{"EBFD}} - \expandafter\def\csname simpleicon@ciliumicon\endcsname {\simpleiconsmap\symbol{"EBFE}} - \expandafter\def\csname simpleicon@cinema4dicon\endcsname {\simpleiconsmap\symbol{"EBFF}} - \expandafter\def\csname simpleicon@circleicon\endcsname {\simpleiconsmap\symbol{"EC00}} - \expandafter\def\csname simpleicon@circleciicon\endcsname {\simpleiconsmap\symbol{"EC01}} - \expandafter\def\csname simpleicon@circuitverseicon\endcsname {\simpleiconsmap\symbol{"EC02}} - \expandafter\def\csname simpleicon@cirrusciicon\endcsname {\simpleiconsmap\symbol{"EC03}} - \expandafter\def\csname simpleicon@ciscoicon\endcsname {\simpleiconsmap\symbol{"EC04}} - \expandafter\def\csname simpleicon@citrixicon\endcsname {\simpleiconsmap\symbol{"EC05}} - \expandafter\def\csname simpleicon@citroenicon\endcsname {\simpleiconsmap\symbol{"EC06}} - \expandafter\def\csname simpleicon@civicrmicon\endcsname {\simpleiconsmap\symbol{"EC07}} - \expandafter\def\csname simpleicon@civoicon\endcsname {\simpleiconsmap\symbol{"EC08}} - \expandafter\def\csname simpleicon@ckeditor4icon\endcsname {\simpleiconsmap\symbol{"EC09}} - \expandafter\def\csname simpleicon@clarifaiicon\endcsname {\simpleiconsmap\symbol{"EC0A}} - \expandafter\def\csname simpleicon@clarisicon\endcsname {\simpleiconsmap\symbol{"EC0B}} - \expandafter\def\csname simpleicon@clarivateicon\endcsname {\simpleiconsmap\symbol{"EC0C}} - \expandafter\def\csname simpleicon@clerkicon\endcsname {\simpleiconsmap\symbol{"EC0D}} - \expandafter\def\csname simpleicon@clevercloudicon\endcsname {\simpleiconsmap\symbol{"EC0E}} - \expandafter\def\csname simpleicon@clickhouseicon\endcsname {\simpleiconsmap\symbol{"EC0F}} - \expandafter\def\csname simpleicon@clickupicon\endcsname {\simpleiconsmap\symbol{"EC10}} - \expandafter\def\csname simpleicon@clionicon\endcsname {\simpleiconsmap\symbol{"EC11}} - \expandafter\def\csname simpleicon@cliqzicon\endcsname {\simpleiconsmap\symbol{"EC12}} - \expandafter\def\csname simpleicon@clockifyicon\endcsname {\simpleiconsmap\symbol{"EC13}} - \expandafter\def\csname simpleicon@clojureicon\endcsname {\simpleiconsmap\symbol{"EC14}} - \expandafter\def\csname simpleicon@cloud66icon\endcsname {\simpleiconsmap\symbol{"EC15}} - \expandafter\def\csname simpleicon@cloudbeesicon\endcsname {\simpleiconsmap\symbol{"EC16}} - \expandafter\def\csname simpleicon@cloudcannonicon\endcsname {\simpleiconsmap\symbol{"EC17}} - \expandafter\def\csname simpleicon@clouderaicon\endcsname {\simpleiconsmap\symbol{"EC18}} - \expandafter\def\csname simpleicon@cloudflareicon\endcsname {\simpleiconsmap\symbol{"EC19}} - \expandafter\def\csname simpleicon@cloudflarepagesicon\endcsname {\simpleiconsmap\symbol{"EC1A}} - \expandafter\def\csname simpleicon@cloudflareworkersicon\endcsname {\simpleiconsmap\symbol{"EC1B}} - \expandafter\def\csname simpleicon@cloudfoundryicon\endcsname {\simpleiconsmap\symbol{"EC1C}} - \expandafter\def\csname simpleicon@cloudinaryicon\endcsname {\simpleiconsmap\symbol{"EC1D}} - \expandafter\def\csname simpleicon@cloudronicon\endcsname {\simpleiconsmap\symbol{"EC1E}} - \expandafter\def\csname simpleicon@cloudsmithicon\endcsname {\simpleiconsmap\symbol{"EC1F}} - \expandafter\def\csname simpleicon@cloudwaysicon\endcsname {\simpleiconsmap\symbol{"EC20}} - \expandafter\def\csname simpleicon@clubforceicon\endcsname {\simpleiconsmap\symbol{"EC21}} - \expandafter\def\csname simpleicon@clubhouseicon\endcsname {\simpleiconsmap\symbol{"EC22}} - \expandafter\def\csname simpleicon@clypicon\endcsname {\simpleiconsmap\symbol{"EC23}} - \expandafter\def\csname simpleicon@cmakeicon\endcsname {\simpleiconsmap\symbol{"EC24}} - \expandafter\def\csname simpleicon@cncficon\endcsname {\simpleiconsmap\symbol{"EC25}} - \expandafter\def\csname simpleicon@cneticon\endcsname {\simpleiconsmap\symbol{"EC26}} - \expandafter\def\csname simpleicon@cnnicon\endcsname {\simpleiconsmap\symbol{"EC27}} - \expandafter\def\csname simpleicon@cocacolaicon\endcsname {\simpleiconsmap\symbol{"EC28}} - \expandafter\def\csname simpleicon@cockpiticon\endcsname {\simpleiconsmap\symbol{"EC29}} - \expandafter\def\csname simpleicon@cockroachlabsicon\endcsname {\simpleiconsmap\symbol{"EC2A}} - \expandafter\def\csname simpleicon@cocoapodsicon\endcsname {\simpleiconsmap\symbol{"EC2B}} - \expandafter\def\csname simpleicon@cocosicon\endcsname {\simpleiconsmap\symbol{"EC2C}} - \expandafter\def\csname simpleicon@codaicon\endcsname {\simpleiconsmap\symbol{"EC2D}} - \expandafter\def\csname simpleicon@codacyicon\endcsname {\simpleiconsmap\symbol{"EC2E}} - \expandafter\def\csname simpleicon@codebergicon\endcsname {\simpleiconsmap\symbol{"EC2F}} - \expandafter\def\csname simpleicon@codeblocksicon\endcsname {\simpleiconsmap\symbol{"EC30}} - \expandafter\def\csname simpleicon@codecademyicon\endcsname {\simpleiconsmap\symbol{"EC31}} - \expandafter\def\csname simpleicon@codeceptjsicon\endcsname {\simpleiconsmap\symbol{"EC32}} - \expandafter\def\csname simpleicon@codecheficon\endcsname {\simpleiconsmap\symbol{"EC33}} - \expandafter\def\csname simpleicon@codeclimateicon\endcsname {\simpleiconsmap\symbol{"EC34}} - \expandafter\def\csname simpleicon@codecovicon\endcsname {\simpleiconsmap\symbol{"EC35}} - \expandafter\def\csname simpleicon@codefactoricon\endcsname {\simpleiconsmap\symbol{"EC36}} - \expandafter\def\csname simpleicon@codeforcesicon\endcsname {\simpleiconsmap\symbol{"EC37}} - \expandafter\def\csname simpleicon@codefreshicon\endcsname {\simpleiconsmap\symbol{"EC38}} - \expandafter\def\csname simpleicon@codeignitericon\endcsname {\simpleiconsmap\symbol{"EC39}} - \expandafter\def\csname simpleicon@codeiumicon\endcsname {\simpleiconsmap\symbol{"EC3A}} - \expandafter\def\csname simpleicon@codemagicicon\endcsname {\simpleiconsmap\symbol{"EC3B}} - \expandafter\def\csname simpleicon@codementoricon\endcsname {\simpleiconsmap\symbol{"EC3C}} - \expandafter\def\csname simpleicon@codemirroricon\endcsname {\simpleiconsmap\symbol{"EC3D}} - \expandafter\def\csname simpleicon@codenewbieicon\endcsname {\simpleiconsmap\symbol{"EC3E}} - \expandafter\def\csname simpleicon@codepenicon\endcsname {\simpleiconsmap\symbol{"EC3F}} - \expandafter\def\csname simpleicon@codeprojecticon\endcsname {\simpleiconsmap\symbol{"EC40}} - \expandafter\def\csname simpleicon@codericon\endcsname {\simpleiconsmap\symbol{"EC41}} - \expandafter\def\csname simpleicon@codersrankicon\endcsname {\simpleiconsmap\symbol{"EC42}} - \expandafter\def\csname simpleicon@coderwallicon\endcsname {\simpleiconsmap\symbol{"EC43}} - \expandafter\def\csname simpleicon@codesandboxicon\endcsname {\simpleiconsmap\symbol{"EC44}} - \expandafter\def\csname simpleicon@codeshipicon\endcsname {\simpleiconsmap\symbol{"EC45}} - \expandafter\def\csname simpleicon@codesignalicon\endcsname {\simpleiconsmap\symbol{"EC46}} - \expandafter\def\csname simpleicon@codestreamicon\endcsname {\simpleiconsmap\symbol{"EC47}} - \expandafter\def\csname simpleicon@codewarsicon\endcsname {\simpleiconsmap\symbol{"EC48}} - \expandafter\def\csname simpleicon@codingameicon\endcsname {\simpleiconsmap\symbol{"EC49}} - \expandafter\def\csname simpleicon@codingninjasicon\endcsname {\simpleiconsmap\symbol{"EC4A}} - \expandafter\def\csname simpleicon@codioicon\endcsname {\simpleiconsmap\symbol{"EC4B}} - \expandafter\def\csname simpleicon@coffeescripticon\endcsname {\simpleiconsmap\symbol{"EC4C}} - \expandafter\def\csname simpleicon@coggleicon\endcsname {\simpleiconsmap\symbol{"EC4D}} - \expandafter\def\csname simpleicon@cognizanticon\endcsname {\simpleiconsmap\symbol{"EC4E}} - \expandafter\def\csname simpleicon@coilicon\endcsname {\simpleiconsmap\symbol{"EC4F}} - \expandafter\def\csname simpleicon@coinbaseicon\endcsname {\simpleiconsmap\symbol{"EC50}} - \expandafter\def\csname simpleicon@coinmarketcapicon\endcsname {\simpleiconsmap\symbol{"EC51}} - \expandafter\def\csname simpleicon@comicfuryicon\endcsname {\simpleiconsmap\symbol{"EC52}} - \expandafter\def\csname simpleicon@commaicon\endcsname {\simpleiconsmap\symbol{"EC53}} - \expandafter\def\csname simpleicon@commerzbankicon\endcsname {\simpleiconsmap\symbol{"EC54}} - \expandafter\def\csname simpleicon@commitlinticon\endcsname {\simpleiconsmap\symbol{"EC55}} - \expandafter\def\csname simpleicon@commodoreicon\endcsname {\simpleiconsmap\symbol{"EC56}} - \expandafter\def\csname simpleicon@commonworkflowlanguageicon\endcsname {\simpleiconsmap\symbol{"EC57}} - \expandafter\def\csname simpleicon@compilerexplorericon\endcsname {\simpleiconsmap\symbol{"EC58}} - \expandafter\def\csname simpleicon@composericon\endcsname {\simpleiconsmap\symbol{"EC59}} - \expandafter\def\csname simpleicon@comptiaicon\endcsname {\simpleiconsmap\symbol{"EC5A}} - \expandafter\def\csname simpleicon@comsolicon\endcsname {\simpleiconsmap\symbol{"EC5B}} - \expandafter\def\csname simpleicon@conanicon\endcsname {\simpleiconsmap\symbol{"EC5C}} - \expandafter\def\csname simpleicon@concourseicon\endcsname {\simpleiconsmap\symbol{"EC5D}} - \expandafter\def\csname simpleicon@condaforgeicon\endcsname {\simpleiconsmap\symbol{"EC5E}} - \expandafter\def\csname simpleicon@conektaicon\endcsname {\simpleiconsmap\symbol{"EC5F}} - \expandafter\def\csname simpleicon@confluenceicon\endcsname {\simpleiconsmap\symbol{"EC60}} - \expandafter\def\csname simpleicon@construct3icon\endcsname {\simpleiconsmap\symbol{"EC61}} - \expandafter\def\csname simpleicon@consulicon\endcsname {\simpleiconsmap\symbol{"EC62}} - \expandafter\def\csname simpleicon@contactlesspaymenticon\endcsname {\simpleiconsmap\symbol{"EC63}} - \expandafter\def\csname simpleicon@containerdicon\endcsname {\simpleiconsmap\symbol{"EC64}} - \expandafter\def\csname simpleicon@contaoicon\endcsname {\simpleiconsmap\symbol{"EC65}} - \expandafter\def\csname simpleicon@contentfulicon\endcsname {\simpleiconsmap\symbol{"EC66}} - \expandafter\def\csname simpleicon@contentstackicon\endcsname {\simpleiconsmap\symbol{"EC67}} - \expandafter\def\csname simpleicon@contributorcovenanticon\endcsname {\simpleiconsmap\symbol{"EC68}} - \expandafter\def\csname simpleicon@conventionalcommitsicon\endcsname {\simpleiconsmap\symbol{"EC69}} - \expandafter\def\csname simpleicon@convertioicon\endcsname {\simpleiconsmap\symbol{"EC6A}} - \expandafter\def\csname simpleicon@cookiecuttericon\endcsname {\simpleiconsmap\symbol{"EC6B}} - \expandafter\def\csname simpleicon@coolermastericon\endcsname {\simpleiconsmap\symbol{"EC6C}} - \expandafter\def\csname simpleicon@coopicon\endcsname {\simpleiconsmap\symbol{"EC6D}} - \expandafter\def\csname simpleicon@copaairlinesicon\endcsname {\simpleiconsmap\symbol{"EC6E}} - \expandafter\def\csname simpleicon@coppelicon\endcsname {\simpleiconsmap\symbol{"EC6F}} - \expandafter\def\csname simpleicon@coraicon\endcsname {\simpleiconsmap\symbol{"EC70}} - \expandafter\def\csname simpleicon@coreldrawicon\endcsname {\simpleiconsmap\symbol{"EC71}} - \expandafter\def\csname simpleicon@coronaengineicon\endcsname {\simpleiconsmap\symbol{"EC72}} - \expandafter\def\csname simpleicon@coronarenderericon\endcsname {\simpleiconsmap\symbol{"EC73}} - \expandafter\def\csname simpleicon@corsairicon\endcsname {\simpleiconsmap\symbol{"EC74}} - \expandafter\def\csname simpleicon@couchbaseicon\endcsname {\simpleiconsmap\symbol{"EC75}} - \expandafter\def\csname simpleicon@counterstrikeicon\endcsname {\simpleiconsmap\symbol{"EC76}} - \expandafter\def\csname simpleicon@countingworksproicon\endcsname {\simpleiconsmap\symbol{"EC77}} - \expandafter\def\csname simpleicon@courseraicon\endcsname {\simpleiconsmap\symbol{"EC78}} - \expandafter\def\csname simpleicon@coverallsicon\endcsname {\simpleiconsmap\symbol{"EC79}} - \expandafter\def\csname simpleicon@cpanelicon\endcsname {\simpleiconsmap\symbol{"EC7A}} - \expandafter\def\csname simpleicon@cplusplusicon\endcsname {\simpleiconsmap\symbol{"EC7B}} - \expandafter\def\csname simpleicon@cplusplusbuildericon\endcsname {\simpleiconsmap\symbol{"EC7C}} - \expandafter\def\csname simpleicon@craftcmsicon\endcsname {\simpleiconsmap\symbol{"EC7D}} - \expandafter\def\csname simpleicon@craftsmanicon\endcsname {\simpleiconsmap\symbol{"EC7E}} - \expandafter\def\csname simpleicon@cratedbicon\endcsname {\simpleiconsmap\symbol{"EC7F}} - \expandafter\def\csname simpleicon@crayonicon\endcsname {\simpleiconsmap\symbol{"EC80}} - \expandafter\def\csname simpleicon@crealityicon\endcsname {\simpleiconsmap\symbol{"EC81}} - \expandafter\def\csname simpleicon@createreactappicon\endcsname {\simpleiconsmap\symbol{"EC82}} - \expandafter\def\csname simpleicon@creativecommonsicon\endcsname {\simpleiconsmap\symbol{"EC83}} - \expandafter\def\csname simpleicon@creativetechnologyicon\endcsname {\simpleiconsmap\symbol{"EC84}} - \expandafter\def\csname simpleicon@credlyicon\endcsname {\simpleiconsmap\symbol{"EC85}} - \expandafter\def\csname simpleicon@crehanaicon\endcsname {\simpleiconsmap\symbol{"EC86}} - \expandafter\def\csname simpleicon@crewunitedicon\endcsname {\simpleiconsmap\symbol{"EC87}} - \expandafter\def\csname simpleicon@criticalroleicon\endcsname {\simpleiconsmap\symbol{"EC88}} - \expandafter\def\csname simpleicon@crowdinicon\endcsname {\simpleiconsmap\symbol{"EC89}} - \expandafter\def\csname simpleicon@crowdsourceicon\endcsname {\simpleiconsmap\symbol{"EC8A}} - \expandafter\def\csname simpleicon@crunchbaseicon\endcsname {\simpleiconsmap\symbol{"EC8B}} - \expandafter\def\csname simpleicon@crunchyrollicon\endcsname {\simpleiconsmap\symbol{"EC8C}} - \expandafter\def\csname simpleicon@cryengineicon\endcsname {\simpleiconsmap\symbol{"EC8D}} - \expandafter\def\csname simpleicon@cryptpadicon\endcsname {\simpleiconsmap\symbol{"EC8E}} - \expandafter\def\csname simpleicon@crystalicon\endcsname {\simpleiconsmap\symbol{"EC8F}} - \expandafter\def\csname simpleicon@css3icon\endcsname {\simpleiconsmap\symbol{"EC90}} - \expandafter\def\csname simpleicon@cssdesignawardsicon\endcsname {\simpleiconsmap\symbol{"EC91}} - \expandafter\def\csname simpleicon@cssmodulesicon\endcsname {\simpleiconsmap\symbol{"EC92}} - \expandafter\def\csname simpleicon@csswizardryicon\endcsname {\simpleiconsmap\symbol{"EC93}} - \expandafter\def\csname simpleicon@ctsicon\endcsname {\simpleiconsmap\symbol{"EC94}} - \expandafter\def\csname simpleicon@cucumbericon\endcsname {\simpleiconsmap\symbol{"EC95}} - \expandafter\def\csname simpleicon@culturaicon\endcsname {\simpleiconsmap\symbol{"EC96}} - \expandafter\def\csname simpleicon@curlicon\endcsname {\simpleiconsmap\symbol{"EC97}} - \expandafter\def\csname simpleicon@curseforgeicon\endcsname {\simpleiconsmap\symbol{"EC98}} - \expandafter\def\csname simpleicon@custominkicon\endcsname {\simpleiconsmap\symbol{"EC99}} - \expandafter\def\csname simpleicon@cyberdefendersicon\endcsname {\simpleiconsmap\symbol{"EC9A}} - \expandafter\def\csname simpleicon@cycling74icon\endcsname {\simpleiconsmap\symbol{"EC9B}} - \expandafter\def\csname simpleicon@cypressicon\endcsname {\simpleiconsmap\symbol{"EC9C}} - \expandafter\def\csname simpleicon@cytoscapedotjsicon\endcsname {\simpleiconsmap\symbol{"EC9D}} - \expandafter\def\csname simpleicon@dicon\endcsname {\simpleiconsmap\symbol{"EC9E}} - \expandafter\def\csname simpleicon@d3dotjsicon\endcsname {\simpleiconsmap\symbol{"EC9F}} - \expandafter\def\csname simpleicon@daciaicon\endcsname {\simpleiconsmap\symbol{"ECA0}} - \expandafter\def\csname simpleicon@daficon\endcsname {\simpleiconsmap\symbol{"ECA1}} - \expandafter\def\csname simpleicon@dailydotdevicon\endcsname {\simpleiconsmap\symbol{"ECA2}} - \expandafter\def\csname simpleicon@dailymotionicon\endcsname {\simpleiconsmap\symbol{"ECA3}} - \expandafter\def\csname simpleicon@daisyuiicon\endcsname {\simpleiconsmap\symbol{"ECA4}} - \expandafter\def\csname simpleicon@dapricon\endcsname {\simpleiconsmap\symbol{"ECA5}} - \expandafter\def\csname simpleicon@darkreadericon\endcsname {\simpleiconsmap\symbol{"ECA6}} - \expandafter\def\csname simpleicon@darticon\endcsname {\simpleiconsmap\symbol{"ECA7}} - \expandafter\def\csname simpleicon@dartyicon\endcsname {\simpleiconsmap\symbol{"ECA8}} - \expandafter\def\csname simpleicon@dasersteicon\endcsname {\simpleiconsmap\symbol{"ECA9}} - \expandafter\def\csname simpleicon@dashicon\endcsname {\simpleiconsmap\symbol{"ECAA}} - \expandafter\def\csname simpleicon@dashlaneicon\endcsname {\simpleiconsmap\symbol{"ECAB}} - \expandafter\def\csname simpleicon@daskicon\endcsname {\simpleiconsmap\symbol{"ECAC}} - \expandafter\def\csname simpleicon@dassaultsystemesicon\endcsname {\simpleiconsmap\symbol{"ECAD}} - \expandafter\def\csname simpleicon@databricksicon\endcsname {\simpleiconsmap\symbol{"ECAE}} - \expandafter\def\csname simpleicon@datacampicon\endcsname {\simpleiconsmap\symbol{"ECAF}} - \expandafter\def\csname simpleicon@datadogicon\endcsname {\simpleiconsmap\symbol{"ECB0}} - \expandafter\def\csname simpleicon@datadotaiicon\endcsname {\simpleiconsmap\symbol{"ECB1}} - \expandafter\def\csname simpleicon@datagripicon\endcsname {\simpleiconsmap\symbol{"ECB2}} - \expandafter\def\csname simpleicon@dataikuicon\endcsname {\simpleiconsmap\symbol{"ECB3}} - \expandafter\def\csname simpleicon@datastaxicon\endcsname {\simpleiconsmap\symbol{"ECB4}} - \expandafter\def\csname simpleicon@datefnsicon\endcsname {\simpleiconsmap\symbol{"ECB5}} - \expandafter\def\csname simpleicon@datevicon\endcsname {\simpleiconsmap\symbol{"ECB6}} - \expandafter\def\csname simpleicon@datocmsicon\endcsname {\simpleiconsmap\symbol{"ECB7}} - \expandafter\def\csname simpleicon@dattoicon\endcsname {\simpleiconsmap\symbol{"ECB8}} - \expandafter\def\csname simpleicon@davinciresolveicon\endcsname {\simpleiconsmap\symbol{"ECB9}} - \expandafter\def\csname simpleicon@dazhongdianpingicon\endcsname {\simpleiconsmap\symbol{"ECBA}} - \expandafter\def\csname simpleicon@daznicon\endcsname {\simpleiconsmap\symbol{"ECBB}} - \expandafter\def\csname simpleicon@dbeavericon\endcsname {\simpleiconsmap\symbol{"ECBC}} - \expandafter\def\csname simpleicon@dblpicon\endcsname {\simpleiconsmap\symbol{"ECBD}} - \expandafter\def\csname simpleicon@dbticon\endcsname {\simpleiconsmap\symbol{"ECBE}} - \expandafter\def\csname simpleicon@dcentertainmenticon\endcsname {\simpleiconsmap\symbol{"ECBF}} - \expandafter\def\csname simpleicon@debianicon\endcsname {\simpleiconsmap\symbol{"ECC0}} - \expandafter\def\csname simpleicon@decapcmsicon\endcsname {\simpleiconsmap\symbol{"ECC1}} - \expandafter\def\csname simpleicon@decentralandicon\endcsname {\simpleiconsmap\symbol{"ECC2}} - \expandafter\def\csname simpleicon@dedgeicon\endcsname {\simpleiconsmap\symbol{"ECC3}} - \expandafter\def\csname simpleicon@deepcoolicon\endcsname {\simpleiconsmap\symbol{"ECC4}} - \expandafter\def\csname simpleicon@deepgramicon\endcsname {\simpleiconsmap\symbol{"ECC5}} - \expandafter\def\csname simpleicon@deepinicon\endcsname {\simpleiconsmap\symbol{"ECC6}} - \expandafter\def\csname simpleicon@deeplicon\endcsname {\simpleiconsmap\symbol{"ECC7}} - \expandafter\def\csname simpleicon@deepnoteicon\endcsname {\simpleiconsmap\symbol{"ECC8}} - \expandafter\def\csname simpleicon@deliciousicon\endcsname {\simpleiconsmap\symbol{"ECC9}} - \expandafter\def\csname simpleicon@deliverooicon\endcsname {\simpleiconsmap\symbol{"ECCA}} - \expandafter\def\csname simpleicon@dellicon\endcsname {\simpleiconsmap\symbol{"ECCB}} - \expandafter\def\csname simpleicon@delonghiicon\endcsname {\simpleiconsmap\symbol{"ECCC}} - \expandafter\def\csname simpleicon@delphiicon\endcsname {\simpleiconsmap\symbol{"ECCD}} - \expandafter\def\csname simpleicon@deltaicon\endcsname {\simpleiconsmap\symbol{"ECCE}} - \expandafter\def\csname simpleicon@delugeicon\endcsname {\simpleiconsmap\symbol{"ECCF}} - \expandafter\def\csname simpleicon@denoicon\endcsname {\simpleiconsmap\symbol{"ECD0}} - \expandafter\def\csname simpleicon@denonicon\endcsname {\simpleiconsmap\symbol{"ECD1}} - \expandafter\def\csname simpleicon@dependaboticon\endcsname {\simpleiconsmap\symbol{"ECD2}} - \expandafter\def\csname simpleicon@dependencycheckicon\endcsname {\simpleiconsmap\symbol{"ECD3}} - \expandafter\def\csname simpleicon@depositphotosicon\endcsname {\simpleiconsmap\symbol{"ECD4}} - \expandafter\def\csname simpleicon@derspiegelicon\endcsname {\simpleiconsmap\symbol{"ECD5}} - \expandafter\def\csname simpleicon@deutschebahnicon\endcsname {\simpleiconsmap\symbol{"ECD6}} - \expandafter\def\csname simpleicon@deutschebankicon\endcsname {\simpleiconsmap\symbol{"ECD7}} - \expandafter\def\csname simpleicon@deutscheposticon\endcsname {\simpleiconsmap\symbol{"ECD8}} - \expandafter\def\csname simpleicon@devdottoicon\endcsname {\simpleiconsmap\symbol{"ECD9}} - \expandafter\def\csname simpleicon@devexpressicon\endcsname {\simpleiconsmap\symbol{"ECDA}} - \expandafter\def\csname simpleicon@deviantarticon\endcsname {\simpleiconsmap\symbol{"ECDB}} - \expandafter\def\csname simpleicon@devposticon\endcsname {\simpleiconsmap\symbol{"ECDC}} - \expandafter\def\csname simpleicon@devranticon\endcsname {\simpleiconsmap\symbol{"ECDD}} - \expandafter\def\csname simpleicon@dgraphicon\endcsname {\simpleiconsmap\symbol{"ECDE}} - \expandafter\def\csname simpleicon@dhlicon\endcsname {\simpleiconsmap\symbol{"ECDF}} - \expandafter\def\csname simpleicon@diagramsdotneticon\endcsname {\simpleiconsmap\symbol{"ECE0}} - \expandafter\def\csname simpleicon@dialogflowicon\endcsname {\simpleiconsmap\symbol{"ECE1}} - \expandafter\def\csname simpleicon@diasporaicon\endcsname {\simpleiconsmap\symbol{"ECE2}} - \expandafter\def\csname simpleicon@dictionarydotcomicon\endcsname {\simpleiconsmap\symbol{"ECE3}} - \expandafter\def\csname simpleicon@diggicon\endcsname {\simpleiconsmap\symbol{"ECE4}} - \expandafter\def\csname simpleicon@digikeyelectronicsicon\endcsname {\simpleiconsmap\symbol{"ECE5}} - \expandafter\def\csname simpleicon@digitaloceanicon\endcsname {\simpleiconsmap\symbol{"ECE6}} - \expandafter\def\csname simpleicon@dinersclubicon\endcsname {\simpleiconsmap\symbol{"ECE7}} - \expandafter\def\csname simpleicon@dioricon\endcsname {\simpleiconsmap\symbol{"ECE8}} - \expandafter\def\csname simpleicon@directusicon\endcsname {\simpleiconsmap\symbol{"ECE9}} - \expandafter\def\csname simpleicon@discogsicon\endcsname {\simpleiconsmap\symbol{"ECEA}} - \expandafter\def\csname simpleicon@discordicon\endcsname {\simpleiconsmap\symbol{"ECEB}} - \expandafter\def\csname simpleicon@discourseicon\endcsname {\simpleiconsmap\symbol{"ECEC}} - \expandafter\def\csname simpleicon@discovericon\endcsname {\simpleiconsmap\symbol{"ECED}} - \expandafter\def\csname simpleicon@disqusicon\endcsname {\simpleiconsmap\symbol{"ECEE}} - \expandafter\def\csname simpleicon@disrooticon\endcsname {\simpleiconsmap\symbol{"ECEF}} - \expandafter\def\csname simpleicon@distrokidicon\endcsname {\simpleiconsmap\symbol{"ECF0}} - \expandafter\def\csname simpleicon@djangoicon\endcsname {\simpleiconsmap\symbol{"ECF1}} - \expandafter\def\csname simpleicon@djiicon\endcsname {\simpleiconsmap\symbol{"ECF2}} - \expandafter\def\csname simpleicon@dlibicon\endcsname {\simpleiconsmap\symbol{"ECF3}} - \expandafter\def\csname simpleicon@dlnaicon\endcsname {\simpleiconsmap\symbol{"ECF4}} - \expandafter\def\csname simpleicon@dmicon\endcsname {\simpleiconsmap\symbol{"ECF5}} - \expandafter\def\csname simpleicon@dockericon\endcsname {\simpleiconsmap\symbol{"ECF6}} - \expandafter\def\csname simpleicon@docsdotrsicon\endcsname {\simpleiconsmap\symbol{"ECF7}} - \expandafter\def\csname simpleicon@docsifyicon\endcsname {\simpleiconsmap\symbol{"ECF8}} - \expandafter\def\csname simpleicon@doctrineicon\endcsname {\simpleiconsmap\symbol{"ECF9}} - \expandafter\def\csname simpleicon@docusaurusicon\endcsname {\simpleiconsmap\symbol{"ECFA}} - \expandafter\def\csname simpleicon@dogecoinicon\endcsname {\simpleiconsmap\symbol{"ECFB}} - \expandafter\def\csname simpleicon@doiicon\endcsname {\simpleiconsmap\symbol{"ECFC}} - \expandafter\def\csname simpleicon@dolbyicon\endcsname {\simpleiconsmap\symbol{"ECFD}} - \expandafter\def\csname simpleicon@doordashicon\endcsname {\simpleiconsmap\symbol{"ECFE}} - \expandafter\def\csname simpleicon@dota2icon\endcsname {\simpleiconsmap\symbol{"ECFF}} - \expandafter\def\csname simpleicon@dotenvicon\endcsname {\simpleiconsmap\symbol{"ED00}} - \expandafter\def\csname simpleicon@dotneticon\endcsname {\simpleiconsmap\symbol{"ED01}} - \expandafter\def\csname simpleicon@doubanicon\endcsname {\simpleiconsmap\symbol{"ED02}} - \expandafter\def\csname simpleicon@doubanreadicon\endcsname {\simpleiconsmap\symbol{"ED03}} - \expandafter\def\csname simpleicon@dovecoticon\endcsname {\simpleiconsmap\symbol{"ED04}} - \expandafter\def\csname simpleicon@dovetailicon\endcsname {\simpleiconsmap\symbol{"ED05}} - \expandafter\def\csname simpleicon@doxygenicon\endcsname {\simpleiconsmap\symbol{"ED06}} - \expandafter\def\csname simpleicon@dpdicon\endcsname {\simpleiconsmap\symbol{"ED07}} - \expandafter\def\csname simpleicon@dragonframeicon\endcsname {\simpleiconsmap\symbol{"ED08}} - \expandafter\def\csname simpleicon@draugiemdotlvicon\endcsname {\simpleiconsmap\symbol{"ED09}} - \expandafter\def\csname simpleicon@dreamstimeicon\endcsname {\simpleiconsmap\symbol{"ED0A}} - \expandafter\def\csname simpleicon@dribbbleicon\endcsname {\simpleiconsmap\symbol{"ED0B}} - \expandafter\def\csname simpleicon@drizzleicon\endcsname {\simpleiconsmap\symbol{"ED0C}} - \expandafter\def\csname simpleicon@droneicon\endcsname {\simpleiconsmap\symbol{"ED0D}} - \expandafter\def\csname simpleicon@droobleicon\endcsname {\simpleiconsmap\symbol{"ED0E}} - \expandafter\def\csname simpleicon@dropboxicon\endcsname {\simpleiconsmap\symbol{"ED0F}} - \expandafter\def\csname simpleicon@drupalicon\endcsname {\simpleiconsmap\symbol{"ED10}} - \expandafter\def\csname simpleicon@dsautomobilesicon\endcsname {\simpleiconsmap\symbol{"ED11}} - \expandafter\def\csname simpleicon@dtsicon\endcsname {\simpleiconsmap\symbol{"ED12}} - \expandafter\def\csname simpleicon@dtubeicon\endcsname {\simpleiconsmap\symbol{"ED13}} - \expandafter\def\csname simpleicon@ducatiicon\endcsname {\simpleiconsmap\symbol{"ED14}} - \expandafter\def\csname simpleicon@duckdbicon\endcsname {\simpleiconsmap\symbol{"ED15}} - \expandafter\def\csname simpleicon@duckduckgoicon\endcsname {\simpleiconsmap\symbol{"ED16}} - \expandafter\def\csname simpleicon@dungeonsanddragonsicon\endcsname {\simpleiconsmap\symbol{"ED17}} - \expandafter\def\csname simpleicon@dunkedicon\endcsname {\simpleiconsmap\symbol{"ED18}} - \expandafter\def\csname simpleicon@dunzoicon\endcsname {\simpleiconsmap\symbol{"ED19}} - \expandafter\def\csname simpleicon@duolingoicon\endcsname {\simpleiconsmap\symbol{"ED1A}} - \expandafter\def\csname simpleicon@duplicatiicon\endcsname {\simpleiconsmap\symbol{"ED1B}} - \expandafter\def\csname simpleicon@dvcicon\endcsname {\simpleiconsmap\symbol{"ED1C}} - \expandafter\def\csname simpleicon@dwavesystemsicon\endcsname {\simpleiconsmap\symbol{"ED1D}} - \expandafter\def\csname simpleicon@dwmicon\endcsname {\simpleiconsmap\symbol{"ED1E}} - \expandafter\def\csname simpleicon@dynatraceicon\endcsname {\simpleiconsmap\symbol{"ED1F}} - \expandafter\def\csname simpleicon@eicon\endcsname {\simpleiconsmap\symbol{"ED20}} - \expandafter\def\csname simpleicon@e3icon\endcsname {\simpleiconsmap\symbol{"ED21}} - \expandafter\def\csname simpleicon@eaicon\endcsname {\simpleiconsmap\symbol{"ED22}} - \expandafter\def\csname simpleicon@eagleicon\endcsname {\simpleiconsmap\symbol{"ED23}} - \expandafter\def\csname simpleicon@easyedaicon\endcsname {\simpleiconsmap\symbol{"ED24}} - \expandafter\def\csname simpleicon@easyjeticon\endcsname {\simpleiconsmap\symbol{"ED25}} - \expandafter\def\csname simpleicon@ebayicon\endcsname {\simpleiconsmap\symbol{"ED26}} - \expandafter\def\csname simpleicon@eboxicon\endcsname {\simpleiconsmap\symbol{"ED27}} - \expandafter\def\csname simpleicon@eclipseadoptiumicon\endcsname {\simpleiconsmap\symbol{"ED28}} - \expandafter\def\csname simpleicon@eclipsecheicon\endcsname {\simpleiconsmap\symbol{"ED29}} - \expandafter\def\csname simpleicon@eclipseideicon\endcsname {\simpleiconsmap\symbol{"ED2A}} - \expandafter\def\csname simpleicon@eclipsejettyicon\endcsname {\simpleiconsmap\symbol{"ED2B}} - \expandafter\def\csname simpleicon@eclipsemosquittoicon\endcsname {\simpleiconsmap\symbol{"ED2C}} - \expandafter\def\csname simpleicon@eclipsevertdotxicon\endcsname {\simpleiconsmap\symbol{"ED2D}} - \expandafter\def\csname simpleicon@ecovacsicon\endcsname {\simpleiconsmap\symbol{"ED2E}} - \expandafter\def\csname simpleicon@edekaicon\endcsname {\simpleiconsmap\symbol{"ED2F}} - \expandafter\def\csname simpleicon@edgeimpulseicon\endcsname {\simpleiconsmap\symbol{"ED30}} - \expandafter\def\csname simpleicon@editorconfigicon\endcsname {\simpleiconsmap\symbol{"ED31}} - \expandafter\def\csname simpleicon@edotleclercicon\endcsname {\simpleiconsmap\symbol{"ED32}} - \expandafter\def\csname simpleicon@educativeicon\endcsname {\simpleiconsmap\symbol{"ED33}} - \expandafter\def\csname simpleicon@edxicon\endcsname {\simpleiconsmap\symbol{"ED34}} - \expandafter\def\csname simpleicon@eggheadicon\endcsname {\simpleiconsmap\symbol{"ED35}} - \expandafter\def\csname simpleicon@egnyteicon\endcsname {\simpleiconsmap\symbol{"ED36}} - \expandafter\def\csname simpleicon@eighticon\endcsname {\simpleiconsmap\symbol{"ED37}} - \expandafter\def\csname simpleicon@eightsleepicon\endcsname {\simpleiconsmap\symbol{"ED38}} - \expandafter\def\csname simpleicon@ejsicon\endcsname {\simpleiconsmap\symbol{"ED39}} - \expandafter\def\csname simpleicon@elasticicon\endcsname {\simpleiconsmap\symbol{"ED3A}} - \expandafter\def\csname simpleicon@elasticcloudicon\endcsname {\simpleiconsmap\symbol{"ED3B}} - \expandafter\def\csname simpleicon@elasticsearchicon\endcsname {\simpleiconsmap\symbol{"ED3C}} - \expandafter\def\csname simpleicon@elasticstackicon\endcsname {\simpleiconsmap\symbol{"ED3D}} - \expandafter\def\csname simpleicon@elavonicon\endcsname {\simpleiconsmap\symbol{"ED3E}} - \expandafter\def\csname simpleicon@electronicon\endcsname {\simpleiconsmap\symbol{"ED3F}} - \expandafter\def\csname simpleicon@electronbuildericon\endcsname {\simpleiconsmap\symbol{"ED40}} - \expandafter\def\csname simpleicon@electronfiddleicon\endcsname {\simpleiconsmap\symbol{"ED41}} - \expandafter\def\csname simpleicon@elegooicon\endcsname {\simpleiconsmap\symbol{"ED42}} - \expandafter\def\csname simpleicon@elementicon\endcsname {\simpleiconsmap\symbol{"ED43}} - \expandafter\def\csname simpleicon@elementaryicon\endcsname {\simpleiconsmap\symbol{"ED44}} - \expandafter\def\csname simpleicon@elementoricon\endcsname {\simpleiconsmap\symbol{"ED45}} - \expandafter\def\csname simpleicon@eleventyicon\endcsname {\simpleiconsmap\symbol{"ED46}} - \expandafter\def\csname simpleicon@elgatoicon\endcsname {\simpleiconsmap\symbol{"ED47}} - \expandafter\def\csname simpleicon@elixiricon\endcsname {\simpleiconsmap\symbol{"ED48}} - \expandafter\def\csname simpleicon@eljuevesicon\endcsname {\simpleiconsmap\symbol{"ED49}} - \expandafter\def\csname simpleicon@elloicon\endcsname {\simpleiconsmap\symbol{"ED4A}} - \expandafter\def\csname simpleicon@elmicon\endcsname {\simpleiconsmap\symbol{"ED4B}} - \expandafter\def\csname simpleicon@elseviericon\endcsname {\simpleiconsmap\symbol{"ED4C}} - \expandafter\def\csname simpleicon@embarcaderoicon\endcsname {\simpleiconsmap\symbol{"ED4D}} - \expandafter\def\csname simpleicon@embarkicon\endcsname {\simpleiconsmap\symbol{"ED4E}} - \expandafter\def\csname simpleicon@emberdotjsicon\endcsname {\simpleiconsmap\symbol{"ED4F}} - \expandafter\def\csname simpleicon@embyicon\endcsname {\simpleiconsmap\symbol{"ED50}} - \expandafter\def\csname simpleicon@emiratesicon\endcsname {\simpleiconsmap\symbol{"ED51}} - \expandafter\def\csname simpleicon@emlakjeticon\endcsname {\simpleiconsmap\symbol{"ED52}} - \expandafter\def\csname simpleicon@empirekredicon\endcsname {\simpleiconsmap\symbol{"ED53}} - \expandafter\def\csname simpleicon@endeavourosicon\endcsname {\simpleiconsmap\symbol{"ED54}} - \expandafter\def\csname simpleicon@engadgeticon\endcsname {\simpleiconsmap\symbol{"ED55}} - \expandafter\def\csname simpleicon@enpassicon\endcsname {\simpleiconsmap\symbol{"ED56}} - \expandafter\def\csname simpleicon@enterprisedbicon\endcsname {\simpleiconsmap\symbol{"ED57}} - \expandafter\def\csname simpleicon@envatoicon\endcsname {\simpleiconsmap\symbol{"ED58}} - \expandafter\def\csname simpleicon@envoyproxyicon\endcsname {\simpleiconsmap\symbol{"ED59}} - \expandafter\def\csname simpleicon@epelicon\endcsname {\simpleiconsmap\symbol{"ED5A}} - \expandafter\def\csname simpleicon@epicgamesicon\endcsname {\simpleiconsmap\symbol{"ED5B}} - \expandafter\def\csname simpleicon@epsonicon\endcsname {\simpleiconsmap\symbol{"ED5C}} - \expandafter\def\csname simpleicon@equinixmetalicon\endcsname {\simpleiconsmap\symbol{"ED5D}} - \expandafter\def\csname simpleicon@erasericon\endcsname {\simpleiconsmap\symbol{"ED5E}} - \expandafter\def\csname simpleicon@ericssonicon\endcsname {\simpleiconsmap\symbol{"ED5F}} - \expandafter\def\csname simpleicon@erlangicon\endcsname {\simpleiconsmap\symbol{"ED60}} - \expandafter\def\csname simpleicon@erpnexticon\endcsname {\simpleiconsmap\symbol{"ED61}} - \expandafter\def\csname simpleicon@esbuildicon\endcsname {\simpleiconsmap\symbol{"ED62}} - \expandafter\def\csname simpleicon@eseaicon\endcsname {\simpleiconsmap\symbol{"ED63}} - \expandafter\def\csname simpleicon@eslgamingicon\endcsname {\simpleiconsmap\symbol{"ED64}} - \expandafter\def\csname simpleicon@eslinticon\endcsname {\simpleiconsmap\symbol{"ED65}} - \expandafter\def\csname simpleicon@esotericsoftwareicon\endcsname {\simpleiconsmap\symbol{"ED66}} - \expandafter\def\csname simpleicon@esphomeicon\endcsname {\simpleiconsmap\symbol{"ED67}} - \expandafter\def\csname simpleicon@espressificon\endcsname {\simpleiconsmap\symbol{"ED68}} - \expandafter\def\csname simpleicon@esriicon\endcsname {\simpleiconsmap\symbol{"ED69}} - \expandafter\def\csname simpleicon@etcdicon\endcsname {\simpleiconsmap\symbol{"ED6A}} - \expandafter\def\csname simpleicon@ethereumicon\endcsname {\simpleiconsmap\symbol{"ED6B}} - \expandafter\def\csname simpleicon@ethersicon\endcsname {\simpleiconsmap\symbol{"ED6C}} - \expandafter\def\csname simpleicon@ethiopianairlinesicon\endcsname {\simpleiconsmap\symbol{"ED6D}} - \expandafter\def\csname simpleicon@etihadairwaysicon\endcsname {\simpleiconsmap\symbol{"ED6E}} - \expandafter\def\csname simpleicon@etsyicon\endcsname {\simpleiconsmap\symbol{"ED6F}} - \expandafter\def\csname simpleicon@eventbriteicon\endcsname {\simpleiconsmap\symbol{"ED70}} - \expandafter\def\csname simpleicon@eventstoreicon\endcsname {\simpleiconsmap\symbol{"ED71}} - \expandafter\def\csname simpleicon@evernoteicon\endcsname {\simpleiconsmap\symbol{"ED72}} - \expandafter\def\csname simpleicon@excalidrawicon\endcsname {\simpleiconsmap\symbol{"ED73}} - \expandafter\def\csname simpleicon@exercismicon\endcsname {\simpleiconsmap\symbol{"ED74}} - \expandafter\def\csname simpleicon@exordoicon\endcsname {\simpleiconsmap\symbol{"ED75}} - \expandafter\def\csname simpleicon@exoscaleicon\endcsname {\simpleiconsmap\symbol{"ED76}} - \expandafter\def\csname simpleicon@expediaicon\endcsname {\simpleiconsmap\symbol{"ED77}} - \expandafter\def\csname simpleicon@expensifyicon\endcsname {\simpleiconsmap\symbol{"ED78}} - \expandafter\def\csname simpleicon@expertsexchangeicon\endcsname {\simpleiconsmap\symbol{"ED79}} - \expandafter\def\csname simpleicon@expoicon\endcsname {\simpleiconsmap\symbol{"ED7A}} - \expandafter\def\csname simpleicon@expressicon\endcsname {\simpleiconsmap\symbol{"ED7B}} - \expandafter\def\csname simpleicon@expressvpnicon\endcsname {\simpleiconsmap\symbol{"ED7C}} - \expandafter\def\csname simpleicon@eyeemicon\endcsname {\simpleiconsmap\symbol{"ED7D}} - \expandafter\def\csname simpleicon@f1icon\endcsname {\simpleiconsmap\symbol{"ED7E}} - \expandafter\def\csname simpleicon@f5icon\endcsname {\simpleiconsmap\symbol{"ED7F}} - \expandafter\def\csname simpleicon@facebookicon\endcsname {\simpleiconsmap\symbol{"ED80}} - \expandafter\def\csname simpleicon@facebookgamingicon\endcsname {\simpleiconsmap\symbol{"ED81}} - \expandafter\def\csname simpleicon@facebookliveicon\endcsname {\simpleiconsmap\symbol{"ED82}} - \expandafter\def\csname simpleicon@faceiticon\endcsname {\simpleiconsmap\symbol{"ED83}} - \expandafter\def\csname simpleicon@facepunchicon\endcsname {\simpleiconsmap\symbol{"ED84}} - \expandafter\def\csname simpleicon@fairphoneicon\endcsname {\simpleiconsmap\symbol{"ED85}} - \expandafter\def\csname simpleicon@falcoicon\endcsname {\simpleiconsmap\symbol{"ED86}} - \expandafter\def\csname simpleicon@falconicon\endcsname {\simpleiconsmap\symbol{"ED87}} - \expandafter\def\csname simpleicon@fampayicon\endcsname {\simpleiconsmap\symbol{"ED88}} - \expandafter\def\csname simpleicon@fandangoicon\endcsname {\simpleiconsmap\symbol{"ED89}} - \expandafter\def\csname simpleicon@fandomicon\endcsname {\simpleiconsmap\symbol{"ED8A}} - \expandafter\def\csname simpleicon@fanfouicon\endcsname {\simpleiconsmap\symbol{"ED8B}} - \expandafter\def\csname simpleicon@fantomicon\endcsname {\simpleiconsmap\symbol{"ED8C}} - \expandafter\def\csname simpleicon@farcastericon\endcsname {\simpleiconsmap\symbol{"ED8D}} - \expandafter\def\csname simpleicon@fareharboricon\endcsname {\simpleiconsmap\symbol{"ED8E}} - \expandafter\def\csname simpleicon@farfetchicon\endcsname {\simpleiconsmap\symbol{"ED8F}} - \expandafter\def\csname simpleicon@fastapiicon\endcsname {\simpleiconsmap\symbol{"ED90}} - \expandafter\def\csname simpleicon@fastifyicon\endcsname {\simpleiconsmap\symbol{"ED91}} - \expandafter\def\csname simpleicon@fastlaneicon\endcsname {\simpleiconsmap\symbol{"ED92}} - \expandafter\def\csname simpleicon@fastlyicon\endcsname {\simpleiconsmap\symbol{"ED93}} - \expandafter\def\csname simpleicon@fathomicon\endcsname {\simpleiconsmap\symbol{"ED94}} - \expandafter\def\csname simpleicon@faunaicon\endcsname {\simpleiconsmap\symbol{"ED95}} - \expandafter\def\csname simpleicon@favroicon\endcsname {\simpleiconsmap\symbol{"ED96}} - \expandafter\def\csname simpleicon@fdroidicon\endcsname {\simpleiconsmap\symbol{"ED97}} - \expandafter\def\csname simpleicon@feathubicon\endcsname {\simpleiconsmap\symbol{"ED98}} - \expandafter\def\csname simpleicon@fedexicon\endcsname {\simpleiconsmap\symbol{"ED99}} - \expandafter\def\csname simpleicon@fedoraicon\endcsname {\simpleiconsmap\symbol{"ED9A}} - \expandafter\def\csname simpleicon@feedlyicon\endcsname {\simpleiconsmap\symbol{"ED9B}} - \expandafter\def\csname simpleicon@ferrariicon\endcsname {\simpleiconsmap\symbol{"ED9C}} - \expandafter\def\csname simpleicon@ferrarinvicon\endcsname {\simpleiconsmap\symbol{"ED9D}} - \expandafter\def\csname simpleicon@ferretdbicon\endcsname {\simpleiconsmap\symbol{"ED9E}} - \expandafter\def\csname simpleicon@ffmpegicon\endcsname {\simpleiconsmap\symbol{"ED9F}} - \expandafter\def\csname simpleicon@fiicon\endcsname {\simpleiconsmap\symbol{"EDA0}} - \expandafter\def\csname simpleicon@fiaticon\endcsname {\simpleiconsmap\symbol{"EDA1}} - \expandafter\def\csname simpleicon@fidoallianceicon\endcsname {\simpleiconsmap\symbol{"EDA2}} - \expandafter\def\csname simpleicon@fifaicon\endcsname {\simpleiconsmap\symbol{"EDA3}} - \expandafter\def\csname simpleicon@figicon\endcsname {\simpleiconsmap\symbol{"EDA4}} - \expandafter\def\csname simpleicon@figmaicon\endcsname {\simpleiconsmap\symbol{"EDA5}} - \expandafter\def\csname simpleicon@figshareicon\endcsname {\simpleiconsmap\symbol{"EDA6}} - \expandafter\def\csname simpleicon@filaicon\endcsname {\simpleiconsmap\symbol{"EDA7}} - \expandafter\def\csname simpleicon@filedotioicon\endcsname {\simpleiconsmap\symbol{"EDA8}} - \expandafter\def\csname simpleicon@filesicon\endcsname {\simpleiconsmap\symbol{"EDA9}} - \expandafter\def\csname simpleicon@filezillaicon\endcsname {\simpleiconsmap\symbol{"EDAA}} - \expandafter\def\csname simpleicon@finecoicon\endcsname {\simpleiconsmap\symbol{"EDAB}} - \expandafter\def\csname simpleicon@fingicon\endcsname {\simpleiconsmap\symbol{"EDAC}} - \expandafter\def\csname simpleicon@firebaseicon\endcsname {\simpleiconsmap\symbol{"EDAD}} - \expandafter\def\csname simpleicon@firefishicon\endcsname {\simpleiconsmap\symbol{"EDAE}} - \expandafter\def\csname simpleicon@fireflyiiiicon\endcsname {\simpleiconsmap\symbol{"EDAF}} - \expandafter\def\csname simpleicon@firefoxicon\endcsname {\simpleiconsmap\symbol{"EDB0}} - \expandafter\def\csname simpleicon@firefoxbrowsericon\endcsname {\simpleiconsmap\symbol{"EDB1}} - \expandafter\def\csname simpleicon@fireshipicon\endcsname {\simpleiconsmap\symbol{"EDB2}} - \expandafter\def\csname simpleicon@firewallaicon\endcsname {\simpleiconsmap\symbol{"EDB3}} - \expandafter\def\csname simpleicon@firsticon\endcsname {\simpleiconsmap\symbol{"EDB4}} - \expandafter\def\csname simpleicon@fishshellicon\endcsname {\simpleiconsmap\symbol{"EDB5}} - \expandafter\def\csname simpleicon@fitbiticon\endcsname {\simpleiconsmap\symbol{"EDB6}} - \expandafter\def\csname simpleicon@fivemicon\endcsname {\simpleiconsmap\symbol{"EDB7}} - \expandafter\def\csname simpleicon@fiverricon\endcsname {\simpleiconsmap\symbol{"EDB8}} - \expandafter\def\csname simpleicon@fizzicon\endcsname {\simpleiconsmap\symbol{"EDB9}} - \expandafter\def\csname simpleicon@flashforgeicon\endcsname {\simpleiconsmap\symbol{"EDBA}} - \expandafter\def\csname simpleicon@flaskicon\endcsname {\simpleiconsmap\symbol{"EDBB}} - \expandafter\def\csname simpleicon@flaticon\endcsname {\simpleiconsmap\symbol{"EDBC}} - \expandafter\def\csname simpleicon@flathubicon\endcsname {\simpleiconsmap\symbol{"EDBD}} - \expandafter\def\csname simpleicon@flatpakicon\endcsname {\simpleiconsmap\symbol{"EDBE}} - \expandafter\def\csname simpleicon@flickricon\endcsname {\simpleiconsmap\symbol{"EDBF}} - \expandafter\def\csname simpleicon@flightawareicon\endcsname {\simpleiconsmap\symbol{"EDC0}} - \expandafter\def\csname simpleicon@flipboardicon\endcsname {\simpleiconsmap\symbol{"EDC1}} - \expandafter\def\csname simpleicon@flipkarticon\endcsname {\simpleiconsmap\symbol{"EDC2}} - \expandafter\def\csname simpleicon@floatplaneicon\endcsname {\simpleiconsmap\symbol{"EDC3}} - \expandafter\def\csname simpleicon@floodicon\endcsname {\simpleiconsmap\symbol{"EDC4}} - \expandafter\def\csname simpleicon@fluentbiticon\endcsname {\simpleiconsmap\symbol{"EDC5}} - \expandafter\def\csname simpleicon@fluentdicon\endcsname {\simpleiconsmap\symbol{"EDC6}} - \expandafter\def\csname simpleicon@flukeicon\endcsname {\simpleiconsmap\symbol{"EDC7}} - \expandafter\def\csname simpleicon@fluttericon\endcsname {\simpleiconsmap\symbol{"EDC8}} - \expandafter\def\csname simpleicon@fluxicon\endcsname {\simpleiconsmap\symbol{"EDC9}} - \expandafter\def\csname simpleicon@fluxusicon\endcsname {\simpleiconsmap\symbol{"EDCA}} - \expandafter\def\csname simpleicon@flywayicon\endcsname {\simpleiconsmap\symbol{"EDCB}} - \expandafter\def\csname simpleicon@fmodicon\endcsname {\simpleiconsmap\symbol{"EDCC}} - \expandafter\def\csname simpleicon@fnacicon\endcsname {\simpleiconsmap\symbol{"EDCD}} - \expandafter\def\csname simpleicon@foliumicon\endcsname {\simpleiconsmap\symbol{"EDCE}} - \expandafter\def\csname simpleicon@fonomaicon\endcsname {\simpleiconsmap\symbol{"EDCF}} - \expandafter\def\csname simpleicon@fontawesomeicon\endcsname {\simpleiconsmap\symbol{"EDD0}} - \expandafter\def\csname simpleicon@fontbaseicon\endcsname {\simpleiconsmap\symbol{"EDD1}} - \expandafter\def\csname simpleicon@fontforgeicon\endcsname {\simpleiconsmap\symbol{"EDD2}} - \expandafter\def\csname simpleicon@foobar2000icon\endcsname {\simpleiconsmap\symbol{"EDD3}} - \expandafter\def\csname simpleicon@foodpandaicon\endcsname {\simpleiconsmap\symbol{"EDD4}} - \expandafter\def\csname simpleicon@fordicon\endcsname {\simpleiconsmap\symbol{"EDD5}} - \expandafter\def\csname simpleicon@forgejoicon\endcsname {\simpleiconsmap\symbol{"EDD6}} - \expandafter\def\csname simpleicon@formikicon\endcsname {\simpleiconsmap\symbol{"EDD7}} - \expandafter\def\csname simpleicon@formspreeicon\endcsname {\simpleiconsmap\symbol{"EDD8}} - \expandafter\def\csname simpleicon@formstackicon\endcsname {\simpleiconsmap\symbol{"EDD9}} - \expandafter\def\csname simpleicon@fortineticon\endcsname {\simpleiconsmap\symbol{"EDDA}} - \expandafter\def\csname simpleicon@fortranicon\endcsname {\simpleiconsmap\symbol{"EDDB}} - \expandafter\def\csname simpleicon@fossaicon\endcsname {\simpleiconsmap\symbol{"EDDC}} - \expandafter\def\csname simpleicon@fossilscmicon\endcsname {\simpleiconsmap\symbol{"EDDD}} - \expandafter\def\csname simpleicon@foundryvirtualtabletopicon\endcsname {\simpleiconsmap\symbol{"EDDE}} - \expandafter\def\csname simpleicon@foursquareicon\endcsname {\simpleiconsmap\symbol{"EDDF}} - \expandafter\def\csname simpleicon@foursquarecityguideicon\endcsname {\simpleiconsmap\symbol{"EDE0}} - \expandafter\def\csname simpleicon@foxicon\endcsname {\simpleiconsmap\symbol{"EDE1}} - \expandafter\def\csname simpleicon@foxtelicon\endcsname {\simpleiconsmap\symbol{"EDE2}} - \expandafter\def\csname simpleicon@fozzyicon\endcsname {\simpleiconsmap\symbol{"EDE3}} - \expandafter\def\csname simpleicon@framericon\endcsname {\simpleiconsmap\symbol{"EDE4}} - \expandafter\def\csname simpleicon@frameworkicon\endcsname {\simpleiconsmap\symbol{"EDE5}} - \expandafter\def\csname simpleicon@framework7icon\endcsname {\simpleiconsmap\symbol{"EDE6}} - \expandafter\def\csname simpleicon@franprixicon\endcsname {\simpleiconsmap\symbol{"EDE7}} - \expandafter\def\csname simpleicon@frappeicon\endcsname {\simpleiconsmap\symbol{"EDE8}} - \expandafter\def\csname simpleicon@fraunhofergesellschafticon\endcsname {\simpleiconsmap\symbol{"EDE9}} - \expandafter\def\csname simpleicon@freebsdicon\endcsname {\simpleiconsmap\symbol{"EDEA}} - \expandafter\def\csname simpleicon@freecadicon\endcsname {\simpleiconsmap\symbol{"EDEB}} - \expandafter\def\csname simpleicon@freecodecampicon\endcsname {\simpleiconsmap\symbol{"EDEC}} - \expandafter\def\csname simpleicon@freedesktopdotorgicon\endcsname {\simpleiconsmap\symbol{"EDED}} - \expandafter\def\csname simpleicon@freelancericon\endcsname {\simpleiconsmap\symbol{"EDEE}} - \expandafter\def\csname simpleicon@freelancermapicon\endcsname {\simpleiconsmap\symbol{"EDEF}} - \expandafter\def\csname simpleicon@freenasicon\endcsname {\simpleiconsmap\symbol{"EDF0}} - \expandafter\def\csname simpleicon@freepikicon\endcsname {\simpleiconsmap\symbol{"EDF1}} - \expandafter\def\csname simpleicon@frontendmentoricon\endcsname {\simpleiconsmap\symbol{"EDF2}} - \expandafter\def\csname simpleicon@frontifyicon\endcsname {\simpleiconsmap\symbol{"EDF3}} - \expandafter\def\csname simpleicon@fsecureicon\endcsname {\simpleiconsmap\symbol{"EDF4}} - \expandafter\def\csname simpleicon@fsharpicon\endcsname {\simpleiconsmap\symbol{"EDF5}} - \expandafter\def\csname simpleicon@fuboicon\endcsname {\simpleiconsmap\symbol{"EDF6}} - \expandafter\def\csname simpleicon@fuelericon\endcsname {\simpleiconsmap\symbol{"EDF7}} - \expandafter\def\csname simpleicon@fugacloudicon\endcsname {\simpleiconsmap\symbol{"EDF8}} - \expandafter\def\csname simpleicon@fujifilmicon\endcsname {\simpleiconsmap\symbol{"EDF9}} - \expandafter\def\csname simpleicon@fujitsuicon\endcsname {\simpleiconsmap\symbol{"EDFA}} - \expandafter\def\csname simpleicon@funimationicon\endcsname {\simpleiconsmap\symbol{"EDFB}} - \expandafter\def\csname simpleicon@furaffinityicon\endcsname {\simpleiconsmap\symbol{"EDFC}} - \expandafter\def\csname simpleicon@furrynetworkicon\endcsname {\simpleiconsmap\symbol{"EDFD}} - \expandafter\def\csname simpleicon@fusionauthicon\endcsname {\simpleiconsmap\symbol{"EDFE}} - \expandafter\def\csname simpleicon@futurelearnicon\endcsname {\simpleiconsmap\symbol{"EDFF}} - \expandafter\def\csname simpleicon@g2icon\endcsname {\simpleiconsmap\symbol{"EE00}} - \expandafter\def\csname simpleicon@g2aicon\endcsname {\simpleiconsmap\symbol{"EE01}} - \expandafter\def\csname simpleicon@g2gicon\endcsname {\simpleiconsmap\symbol{"EE02}} - \expandafter\def\csname simpleicon@galaxusicon\endcsname {\simpleiconsmap\symbol{"EE03}} - \expandafter\def\csname simpleicon@gameandwatchicon\endcsname {\simpleiconsmap\symbol{"EE04}} - \expandafter\def\csname simpleicon@gamebananaicon\endcsname {\simpleiconsmap\symbol{"EE05}} - \expandafter\def\csname simpleicon@gamedevelopericon\endcsname {\simpleiconsmap\symbol{"EE06}} - \expandafter\def\csname simpleicon@gamejolticon\endcsname {\simpleiconsmap\symbol{"EE07}} - \expandafter\def\csname simpleicon@gamelofticon\endcsname {\simpleiconsmap\symbol{"EE08}} - \expandafter\def\csname simpleicon@gamemakericon\endcsname {\simpleiconsmap\symbol{"EE09}} - \expandafter\def\csname simpleicon@garminicon\endcsname {\simpleiconsmap\symbol{"EE0A}} - \expandafter\def\csname simpleicon@gatlingicon\endcsname {\simpleiconsmap\symbol{"EE0B}} - \expandafter\def\csname simpleicon@gatsbyicon\endcsname {\simpleiconsmap\symbol{"EE0C}} - \expandafter\def\csname simpleicon@gcoreicon\endcsname {\simpleiconsmap\symbol{"EE0D}} - \expandafter\def\csname simpleicon@gdalicon\endcsname {\simpleiconsmap\symbol{"EE0E}} - \expandafter\def\csname simpleicon@geanticon\endcsname {\simpleiconsmap\symbol{"EE0F}} - \expandafter\def\csname simpleicon@geeksforgeeksicon\endcsname {\simpleiconsmap\symbol{"EE10}} - \expandafter\def\csname simpleicon@generalelectricicon\endcsname {\simpleiconsmap\symbol{"EE11}} - \expandafter\def\csname simpleicon@generalmotorsicon\endcsname {\simpleiconsmap\symbol{"EE12}} - \expandafter\def\csname simpleicon@geniusicon\endcsname {\simpleiconsmap\symbol{"EE13}} - \expandafter\def\csname simpleicon@gentooicon\endcsname {\simpleiconsmap\symbol{"EE14}} - \expandafter\def\csname simpleicon@geocachingicon\endcsname {\simpleiconsmap\symbol{"EE15}} - \expandafter\def\csname simpleicon@geodeicon\endcsname {\simpleiconsmap\symbol{"EE16}} - \expandafter\def\csname simpleicon@geopandasicon\endcsname {\simpleiconsmap\symbol{"EE17}} - \expandafter\def\csname simpleicon@gerriticon\endcsname {\simpleiconsmap\symbol{"EE18}} - \expandafter\def\csname simpleicon@getxicon\endcsname {\simpleiconsmap\symbol{"EE19}} - \expandafter\def\csname simpleicon@ghosticon\endcsname {\simpleiconsmap\symbol{"EE1A}} - \expandafter\def\csname simpleicon@ghosteryicon\endcsname {\simpleiconsmap\symbol{"EE1B}} - \expandafter\def\csname simpleicon@gimpicon\endcsname {\simpleiconsmap\symbol{"EE1C}} - \expandafter\def\csname simpleicon@ginicon\endcsname {\simpleiconsmap\symbol{"EE1D}} - \expandafter\def\csname simpleicon@giphyicon\endcsname {\simpleiconsmap\symbol{"EE1E}} - \expandafter\def\csname simpleicon@giticon\endcsname {\simpleiconsmap\symbol{"EE1F}} - \expandafter\def\csname simpleicon@gitbookicon\endcsname {\simpleiconsmap\symbol{"EE20}} - \expandafter\def\csname simpleicon@gitconnectedicon\endcsname {\simpleiconsmap\symbol{"EE21}} - \expandafter\def\csname simpleicon@giteaicon\endcsname {\simpleiconsmap\symbol{"EE22}} - \expandafter\def\csname simpleicon@giteeicon\endcsname {\simpleiconsmap\symbol{"EE23}} - \expandafter\def\csname simpleicon@gitextensionsicon\endcsname {\simpleiconsmap\symbol{"EE24}} - \expandafter\def\csname simpleicon@gitforwindowsicon\endcsname {\simpleiconsmap\symbol{"EE25}} - \expandafter\def\csname simpleicon@githubicon\endcsname {\simpleiconsmap\symbol{"EE26}} - \expandafter\def\csname simpleicon@githubactionsicon\endcsname {\simpleiconsmap\symbol{"EE27}} - \expandafter\def\csname simpleicon@githubcopiloticon\endcsname {\simpleiconsmap\symbol{"EE28}} - \expandafter\def\csname simpleicon@githubpagesicon\endcsname {\simpleiconsmap\symbol{"EE29}} - \expandafter\def\csname simpleicon@githubsponsorsicon\endcsname {\simpleiconsmap\symbol{"EE2A}} - \expandafter\def\csname simpleicon@gitignoredotioicon\endcsname {\simpleiconsmap\symbol{"EE2B}} - \expandafter\def\csname simpleicon@gitkrakenicon\endcsname {\simpleiconsmap\symbol{"EE2C}} - \expandafter\def\csname simpleicon@gitlabicon\endcsname {\simpleiconsmap\symbol{"EE2D}} - \expandafter\def\csname simpleicon@gitlfsicon\endcsname {\simpleiconsmap\symbol{"EE2E}} - \expandafter\def\csname simpleicon@gitpodicon\endcsname {\simpleiconsmap\symbol{"EE2F}} - \expandafter\def\csname simpleicon@gittericon\endcsname {\simpleiconsmap\symbol{"EE30}} - \expandafter\def\csname simpleicon@glassdooricon\endcsname {\simpleiconsmap\symbol{"EE31}} - \expandafter\def\csname simpleicon@glideicon\endcsname {\simpleiconsmap\symbol{"EE32}} - \expandafter\def\csname simpleicon@glitchicon\endcsname {\simpleiconsmap\symbol{"EE33}} - \expandafter\def\csname simpleicon@globusicon\endcsname {\simpleiconsmap\symbol{"EE34}} - \expandafter\def\csname simpleicon@glovoicon\endcsname {\simpleiconsmap\symbol{"EE35}} - \expandafter\def\csname simpleicon@gltficon\endcsname {\simpleiconsmap\symbol{"EE36}} - \expandafter\def\csname simpleicon@gmailicon\endcsname {\simpleiconsmap\symbol{"EE37}} - \expandafter\def\csname simpleicon@gnomeicon\endcsname {\simpleiconsmap\symbol{"EE38}} - \expandafter\def\csname simpleicon@gnometerminalicon\endcsname {\simpleiconsmap\symbol{"EE39}} - \expandafter\def\csname simpleicon@gnuicon\endcsname {\simpleiconsmap\symbol{"EE3A}} - \expandafter\def\csname simpleicon@gnubashicon\endcsname {\simpleiconsmap\symbol{"EE3B}} - \expandafter\def\csname simpleicon@gnuemacsicon\endcsname {\simpleiconsmap\symbol{"EE3C}} - \expandafter\def\csname simpleicon@gnuicecaticon\endcsname {\simpleiconsmap\symbol{"EE3D}} - \expandafter\def\csname simpleicon@gnuprivacyguardicon\endcsname {\simpleiconsmap\symbol{"EE3E}} - \expandafter\def\csname simpleicon@gnusocialicon\endcsname {\simpleiconsmap\symbol{"EE3F}} - \expandafter\def\csname simpleicon@goicon\endcsname {\simpleiconsmap\symbol{"EE40}} - \expandafter\def\csname simpleicon@gocdicon\endcsname {\simpleiconsmap\symbol{"EE41}} - \expandafter\def\csname simpleicon@godaddyicon\endcsname {\simpleiconsmap\symbol{"EE42}} - \expandafter\def\csname simpleicon@godotengineicon\endcsname {\simpleiconsmap\symbol{"EE43}} - \expandafter\def\csname simpleicon@gofundmeicon\endcsname {\simpleiconsmap\symbol{"EE44}} - \expandafter\def\csname simpleicon@gogdotcomicon\endcsname {\simpleiconsmap\symbol{"EE45}} - \expandafter\def\csname simpleicon@gojekicon\endcsname {\simpleiconsmap\symbol{"EE46}} - \expandafter\def\csname simpleicon@golandicon\endcsname {\simpleiconsmap\symbol{"EE47}} - \expandafter\def\csname simpleicon@goldenlineicon\endcsname {\simpleiconsmap\symbol{"EE48}} - \expandafter\def\csname simpleicon@goldmansachsicon\endcsname {\simpleiconsmap\symbol{"EE49}} - \expandafter\def\csname simpleicon@goodreadsicon\endcsname {\simpleiconsmap\symbol{"EE4A}} - \expandafter\def\csname simpleicon@googleicon\endcsname {\simpleiconsmap\symbol{"EE4B}} - \expandafter\def\csname simpleicon@googleadmobicon\endcsname {\simpleiconsmap\symbol{"EE4C}} - \expandafter\def\csname simpleicon@googleadsicon\endcsname {\simpleiconsmap\symbol{"EE4D}} - \expandafter\def\csname simpleicon@googleadsenseicon\endcsname {\simpleiconsmap\symbol{"EE4E}} - \expandafter\def\csname simpleicon@googleanalyticsicon\endcsname {\simpleiconsmap\symbol{"EE4F}} - \expandafter\def\csname simpleicon@googleappsscripticon\endcsname {\simpleiconsmap\symbol{"EE50}} - \expandafter\def\csname simpleicon@googleassistanticon\endcsname {\simpleiconsmap\symbol{"EE51}} - \expandafter\def\csname simpleicon@googleauthenticatoricon\endcsname {\simpleiconsmap\symbol{"EE52}} - \expandafter\def\csname simpleicon@googlebigqueryicon\endcsname {\simpleiconsmap\symbol{"EE53}} - \expandafter\def\csname simpleicon@googlebigtableicon\endcsname {\simpleiconsmap\symbol{"EE54}} - \expandafter\def\csname simpleicon@googlecalendaricon\endcsname {\simpleiconsmap\symbol{"EE55}} - \expandafter\def\csname simpleicon@googlecampaignmanager360icon\endcsname {\simpleiconsmap\symbol{"EE56}} - \expandafter\def\csname simpleicon@googlecardboardicon\endcsname {\simpleiconsmap\symbol{"EE57}} - \expandafter\def\csname simpleicon@googlechaticon\endcsname {\simpleiconsmap\symbol{"EE58}} - \expandafter\def\csname simpleicon@googlechromeicon\endcsname {\simpleiconsmap\symbol{"EE59}} - \expandafter\def\csname simpleicon@googlechronicleicon\endcsname {\simpleiconsmap\symbol{"EE5A}} - \expandafter\def\csname simpleicon@googleclassroomicon\endcsname {\simpleiconsmap\symbol{"EE5B}} - \expandafter\def\csname simpleicon@googlecloudicon\endcsname {\simpleiconsmap\symbol{"EE5C}} - \expandafter\def\csname simpleicon@googlecloudcomposericon\endcsname {\simpleiconsmap\symbol{"EE5D}} - \expandafter\def\csname simpleicon@googlecloudspannericon\endcsname {\simpleiconsmap\symbol{"EE5E}} - \expandafter\def\csname simpleicon@googlecloudstorageicon\endcsname {\simpleiconsmap\symbol{"EE5F}} - \expandafter\def\csname simpleicon@googlecolabicon\endcsname {\simpleiconsmap\symbol{"EE60}} - \expandafter\def\csname simpleicon@googlecontaineroptimizedosicon\endcsname {\simpleiconsmap\symbol{"EE61}} - \expandafter\def\csname simpleicon@googledataflowicon\endcsname {\simpleiconsmap\symbol{"EE62}} - \expandafter\def\csname simpleicon@googledataprocicon\endcsname {\simpleiconsmap\symbol{"EE63}} - \expandafter\def\csname simpleicon@googledatastudioicon\endcsname {\simpleiconsmap\symbol{"EE64}} - \expandafter\def\csname simpleicon@googledisplayandvideo360icon\endcsname {\simpleiconsmap\symbol{"EE65}} - \expandafter\def\csname simpleicon@googledocsicon\endcsname {\simpleiconsmap\symbol{"EE66}} - \expandafter\def\csname simpleicon@googledriveicon\endcsname {\simpleiconsmap\symbol{"EE67}} - \expandafter\def\csname simpleicon@googleearthicon\endcsname {\simpleiconsmap\symbol{"EE68}} - \expandafter\def\csname simpleicon@googleearthengineicon\endcsname {\simpleiconsmap\symbol{"EE69}} - \expandafter\def\csname simpleicon@googlefiticon\endcsname {\simpleiconsmap\symbol{"EE6A}} - \expandafter\def\csname simpleicon@googlefontsicon\endcsname {\simpleiconsmap\symbol{"EE6B}} - \expandafter\def\csname simpleicon@googleformsicon\endcsname {\simpleiconsmap\symbol{"EE6C}} - \expandafter\def\csname simpleicon@googlegeminiicon\endcsname {\simpleiconsmap\symbol{"EE6D}} - \expandafter\def\csname simpleicon@googlehomeicon\endcsname {\simpleiconsmap\symbol{"EE6E}} - \expandafter\def\csname simpleicon@googlekeepicon\endcsname {\simpleiconsmap\symbol{"EE6F}} - \expandafter\def\csname simpleicon@googlelensicon\endcsname {\simpleiconsmap\symbol{"EE70}} - \expandafter\def\csname simpleicon@googlemapsicon\endcsname {\simpleiconsmap\symbol{"EE71}} - \expandafter\def\csname simpleicon@googlemarketingplatformicon\endcsname {\simpleiconsmap\symbol{"EE72}} - \expandafter\def\csname simpleicon@googlemeeticon\endcsname {\simpleiconsmap\symbol{"EE73}} - \expandafter\def\csname simpleicon@googlemessagesicon\endcsname {\simpleiconsmap\symbol{"EE74}} - \expandafter\def\csname simpleicon@googlenearbyicon\endcsname {\simpleiconsmap\symbol{"EE75}} - \expandafter\def\csname simpleicon@googlenewsicon\endcsname {\simpleiconsmap\symbol{"EE76}} - \expandafter\def\csname simpleicon@googlepayicon\endcsname {\simpleiconsmap\symbol{"EE77}} - \expandafter\def\csname simpleicon@googlephotosicon\endcsname {\simpleiconsmap\symbol{"EE78}} - \expandafter\def\csname simpleicon@googleplayicon\endcsname {\simpleiconsmap\symbol{"EE79}} - \expandafter\def\csname simpleicon@googlepubsubicon\endcsname {\simpleiconsmap\symbol{"EE7A}} - \expandafter\def\csname simpleicon@googlescholaricon\endcsname {\simpleiconsmap\symbol{"EE7B}} - \expandafter\def\csname simpleicon@googlesearchconsoleicon\endcsname {\simpleiconsmap\symbol{"EE7C}} - \expandafter\def\csname simpleicon@googlesheetsicon\endcsname {\simpleiconsmap\symbol{"EE7D}} - \expandafter\def\csname simpleicon@googleslidesicon\endcsname {\simpleiconsmap\symbol{"EE7E}} - \expandafter\def\csname simpleicon@googlestreetviewicon\endcsname {\simpleiconsmap\symbol{"EE7F}} - \expandafter\def\csname simpleicon@googletagmanagericon\endcsname {\simpleiconsmap\symbol{"EE80}} - \expandafter\def\csname simpleicon@googletasksicon\endcsname {\simpleiconsmap\symbol{"EE81}} - \expandafter\def\csname simpleicon@googletranslateicon\endcsname {\simpleiconsmap\symbol{"EE82}} - \expandafter\def\csname simpleicon@gotomeetingicon\endcsname {\simpleiconsmap\symbol{"EE83}} - \expandafter\def\csname simpleicon@grabicon\endcsname {\simpleiconsmap\symbol{"EE84}} - \expandafter\def\csname simpleicon@gradleicon\endcsname {\simpleiconsmap\symbol{"EE85}} - \expandafter\def\csname simpleicon@gradleplaypublishericon\endcsname {\simpleiconsmap\symbol{"EE86}} - \expandafter\def\csname simpleicon@grafanaicon\endcsname {\simpleiconsmap\symbol{"EE87}} - \expandafter\def\csname simpleicon@grammarlyicon\endcsname {\simpleiconsmap\symbol{"EE88}} - \expandafter\def\csname simpleicon@grandfraisicon\endcsname {\simpleiconsmap\symbol{"EE89}} - \expandafter\def\csname simpleicon@grapheneosicon\endcsname {\simpleiconsmap\symbol{"EE8A}} - \expandafter\def\csname simpleicon@graphiteicon\endcsname {\simpleiconsmap\symbol{"EE8B}} - \expandafter\def\csname simpleicon@graphqlicon\endcsname {\simpleiconsmap\symbol{"EE8C}} - \expandafter\def\csname simpleicon@gravicon\endcsname {\simpleiconsmap\symbol{"EE8D}} - \expandafter\def\csname simpleicon@gravataricon\endcsname {\simpleiconsmap\symbol{"EE8E}} - \expandafter\def\csname simpleicon@graylogicon\endcsname {\simpleiconsmap\symbol{"EE8F}} - \expandafter\def\csname simpleicon@greasyforkicon\endcsname {\simpleiconsmap\symbol{"EE90}} - \expandafter\def\csname simpleicon@greatlearningicon\endcsname {\simpleiconsmap\symbol{"EE91}} - \expandafter\def\csname simpleicon@greenhouseicon\endcsname {\simpleiconsmap\symbol{"EE92}} - \expandafter\def\csname simpleicon@greensockicon\endcsname {\simpleiconsmap\symbol{"EE93}} - \expandafter\def\csname simpleicon@griddotaiicon\endcsname {\simpleiconsmap\symbol{"EE94}} - \expandafter\def\csname simpleicon@gridsomeicon\endcsname {\simpleiconsmap\symbol{"EE95}} - \expandafter\def\csname simpleicon@groupmeicon\endcsname {\simpleiconsmap\symbol{"EE96}} - \expandafter\def\csname simpleicon@grouponicon\endcsname {\simpleiconsmap\symbol{"EE97}} - \expandafter\def\csname simpleicon@grubhubicon\endcsname {\simpleiconsmap\symbol{"EE98}} - \expandafter\def\csname simpleicon@grunticon\endcsname {\simpleiconsmap\symbol{"EE99}} - \expandafter\def\csname simpleicon@gskicon\endcsname {\simpleiconsmap\symbol{"EE9A}} - \expandafter\def\csname simpleicon@gsmarenadotcomicon\endcsname {\simpleiconsmap\symbol{"EE9B}} - \expandafter\def\csname simpleicon@gstreamericon\endcsname {\simpleiconsmap\symbol{"EE9C}} - \expandafter\def\csname simpleicon@gtkicon\endcsname {\simpleiconsmap\symbol{"EE9D}} - \expandafter\def\csname simpleicon@guangzhoumetroicon\endcsname {\simpleiconsmap\symbol{"EE9E}} - \expandafter\def\csname simpleicon@guildedicon\endcsname {\simpleiconsmap\symbol{"EE9F}} - \expandafter\def\csname simpleicon@gulpicon\endcsname {\simpleiconsmap\symbol{"EEA0}} - \expandafter\def\csname simpleicon@gumroadicon\endcsname {\simpleiconsmap\symbol{"EEA1}} - \expandafter\def\csname simpleicon@gumtreeicon\endcsname {\simpleiconsmap\symbol{"EEA2}} - \expandafter\def\csname simpleicon@gunicornicon\endcsname {\simpleiconsmap\symbol{"EEA3}} - \expandafter\def\csname simpleicon@gurobiicon\endcsname {\simpleiconsmap\symbol{"EEA4}} - \expandafter\def\csname simpleicon@gustoicon\endcsname {\simpleiconsmap\symbol{"EEA5}} - \expandafter\def\csname simpleicon@gutenbergicon\endcsname {\simpleiconsmap\symbol{"EEA6}} - \expandafter\def\csname simpleicon@h3icon\endcsname {\simpleiconsmap\symbol{"EEA7}} - \expandafter\def\csname simpleicon@habricon\endcsname {\simpleiconsmap\symbol{"EEA8}} - \expandafter\def\csname simpleicon@hackadayicon\endcsname {\simpleiconsmap\symbol{"EEA9}} - \expandafter\def\csname simpleicon@hackclubicon\endcsname {\simpleiconsmap\symbol{"EEAA}} - \expandafter\def\csname simpleicon@hackerearthicon\endcsname {\simpleiconsmap\symbol{"EEAB}} - \expandafter\def\csname simpleicon@hackernoonicon\endcsname {\simpleiconsmap\symbol{"EEAC}} - \expandafter\def\csname simpleicon@hackeroneicon\endcsname {\simpleiconsmap\symbol{"EEAD}} - \expandafter\def\csname simpleicon@hackerrankicon\endcsname {\simpleiconsmap\symbol{"EEAE}} - \expandafter\def\csname simpleicon@hackstericon\endcsname {\simpleiconsmap\symbol{"EEAF}} - \expandafter\def\csname simpleicon@hacktheboxicon\endcsname {\simpleiconsmap\symbol{"EEB0}} - \expandafter\def\csname simpleicon@halicon\endcsname {\simpleiconsmap\symbol{"EEB1}} - \expandafter\def\csname simpleicon@handlebarsdotjsicon\endcsname {\simpleiconsmap\symbol{"EEB2}} - \expandafter\def\csname simpleicon@handmicon\endcsname {\simpleiconsmap\symbol{"EEB3}} - \expandafter\def\csname simpleicon@handshakeicon\endcsname {\simpleiconsmap\symbol{"EEB4}} - \expandafter\def\csname simpleicon@handshakeprotocolicon\endcsname {\simpleiconsmap\symbol{"EEB5}} - \expandafter\def\csname simpleicon@happycowicon\endcsname {\simpleiconsmap\symbol{"EEB6}} - \expandafter\def\csname simpleicon@harboricon\endcsname {\simpleiconsmap\symbol{"EEB7}} - \expandafter\def\csname simpleicon@harmonyosicon\endcsname {\simpleiconsmap\symbol{"EEB8}} - \expandafter\def\csname simpleicon@hashicorpicon\endcsname {\simpleiconsmap\symbol{"EEB9}} - \expandafter\def\csname simpleicon@hashnodeicon\endcsname {\simpleiconsmap\symbol{"EEBA}} - \expandafter\def\csname simpleicon@haskellicon\endcsname {\simpleiconsmap\symbol{"EEBB}} - \expandafter\def\csname simpleicon@hasuraicon\endcsname {\simpleiconsmap\symbol{"EEBC}} - \expandafter\def\csname simpleicon@hatenabookmarkicon\endcsname {\simpleiconsmap\symbol{"EEBD}} - \expandafter\def\csname simpleicon@haveibeenpwnedicon\endcsname {\simpleiconsmap\symbol{"EEBE}} - \expandafter\def\csname simpleicon@haxeicon\endcsname {\simpleiconsmap\symbol{"EEBF}} - \expandafter\def\csname simpleicon@hboicon\endcsname {\simpleiconsmap\symbol{"EEC0}} - \expandafter\def\csname simpleicon@hclicon\endcsname {\simpleiconsmap\symbol{"EEC1}} - \expandafter\def\csname simpleicon@hdfcbankicon\endcsname {\simpleiconsmap\symbol{"EEC2}} - \expandafter\def\csname simpleicon@headlessuiicon\endcsname {\simpleiconsmap\symbol{"EEC3}} - \expandafter\def\csname simpleicon@headphonezoneicon\endcsname {\simpleiconsmap\symbol{"EEC4}} - \expandafter\def\csname simpleicon@headspaceicon\endcsname {\simpleiconsmap\symbol{"EEC5}} - \expandafter\def\csname simpleicon@hearthicon\endcsname {\simpleiconsmap\symbol{"EEC6}} - \expandafter\def\csname simpleicon@hearthisdotaticon\endcsname {\simpleiconsmap\symbol{"EEC7}} - \expandafter\def\csname simpleicon@hederaicon\endcsname {\simpleiconsmap\symbol{"EEC8}} - \expandafter\def\csname simpleicon@heliumicon\endcsname {\simpleiconsmap\symbol{"EEC9}} - \expandafter\def\csname simpleicon@hellofreshicon\endcsname {\simpleiconsmap\symbol{"EECA}} - \expandafter\def\csname simpleicon@hellyhansenicon\endcsname {\simpleiconsmap\symbol{"EECB}} - \expandafter\def\csname simpleicon@helmicon\endcsname {\simpleiconsmap\symbol{"EECC}} - \expandafter\def\csname simpleicon@helpdeskicon\endcsname {\simpleiconsmap\symbol{"EECD}} - \expandafter\def\csname simpleicon@helpscouticon\endcsname {\simpleiconsmap\symbol{"EECE}} - \expandafter\def\csname simpleicon@hepsiemlakicon\endcsname {\simpleiconsmap\symbol{"EECF}} - \expandafter\def\csname simpleicon@hereicon\endcsname {\simpleiconsmap\symbol{"EED0}} - \expandafter\def\csname simpleicon@herokuicon\endcsname {\simpleiconsmap\symbol{"EED1}} - \expandafter\def\csname simpleicon@hetznericon\endcsname {\simpleiconsmap\symbol{"EED2}} - \expandafter\def\csname simpleicon@hevyicon\endcsname {\simpleiconsmap\symbol{"EED3}} - \expandafter\def\csname simpleicon@hexleticon\endcsname {\simpleiconsmap\symbol{"EED4}} - \expandafter\def\csname simpleicon@hexoicon\endcsname {\simpleiconsmap\symbol{"EED5}} - \expandafter\def\csname simpleicon@heyicon\endcsname {\simpleiconsmap\symbol{"EED6}} - \expandafter\def\csname simpleicon@hibernateicon\endcsname {\simpleiconsmap\symbol{"EED7}} - \expandafter\def\csname simpleicon@hibobicon\endcsname {\simpleiconsmap\symbol{"EED8}} - \expandafter\def\csname simpleicon@hiltonicon\endcsname {\simpleiconsmap\symbol{"EED9}} - \expandafter\def\csname simpleicon@hiltonhotelsandresortsicon\endcsname {\simpleiconsmap\symbol{"EEDA}} - \expandafter\def\csname simpleicon@hitachiicon\endcsname {\simpleiconsmap\symbol{"EEDB}} - \expandafter\def\csname simpleicon@hiveicon\endcsname {\simpleiconsmap\symbol{"EEDC}} - \expandafter\def\csname simpleicon@hiveblockchainicon\endcsname {\simpleiconsmap\symbol{"EEDD}} - \expandafter\def\csname simpleicon@hivemqicon\endcsname {\simpleiconsmap\symbol{"EEDE}} - \expandafter\def\csname simpleicon@homarricon\endcsname {\simpleiconsmap\symbol{"EEDF}} - \expandafter\def\csname simpleicon@homeadvisoricon\endcsname {\simpleiconsmap\symbol{"EEE0}} - \expandafter\def\csname simpleicon@homeassistanticon\endcsname {\simpleiconsmap\symbol{"EEE1}} - \expandafter\def\csname simpleicon@homeassistantcommunitystoreicon\endcsname {\simpleiconsmap\symbol{"EEE2}} - \expandafter\def\csname simpleicon@homebrewicon\endcsname {\simpleiconsmap\symbol{"EEE3}} - \expandafter\def\csname simpleicon@homebridgeicon\endcsname {\simpleiconsmap\symbol{"EEE4}} - \expandafter\def\csname simpleicon@homepageicon\endcsname {\simpleiconsmap\symbol{"EEE5}} - \expandafter\def\csname simpleicon@homifyicon\endcsname {\simpleiconsmap\symbol{"EEE6}} - \expandafter\def\csname simpleicon@hondaicon\endcsname {\simpleiconsmap\symbol{"EEE7}} - \expandafter\def\csname simpleicon@honeyicon\endcsname {\simpleiconsmap\symbol{"EEE8}} - \expandafter\def\csname simpleicon@honoicon\endcsname {\simpleiconsmap\symbol{"EEE9}} - \expandafter\def\csname simpleicon@honoricon\endcsname {\simpleiconsmap\symbol{"EEEA}} - \expandafter\def\csname simpleicon@hootsuiteicon\endcsname {\simpleiconsmap\symbol{"EEEB}} - \expandafter\def\csname simpleicon@hoppscotchicon\endcsname {\simpleiconsmap\symbol{"EEEC}} - \expandafter\def\csname simpleicon@hostingericon\endcsname {\simpleiconsmap\symbol{"EEED}} - \expandafter\def\csname simpleicon@hotelsdotcomicon\endcsname {\simpleiconsmap\symbol{"EEEE}} - \expandafter\def\csname simpleicon@hotjaricon\endcsname {\simpleiconsmap\symbol{"EEEF}} - \expandafter\def\csname simpleicon@hotwireicon\endcsname {\simpleiconsmap\symbol{"EEF0}} - \expandafter\def\csname simpleicon@houdiniicon\endcsname {\simpleiconsmap\symbol{"EEF1}} - \expandafter\def\csname simpleicon@houzzicon\endcsname {\simpleiconsmap\symbol{"EEF2}} - \expandafter\def\csname simpleicon@hpicon\endcsname {\simpleiconsmap\symbol{"EEF3}} - \expandafter\def\csname simpleicon@hsbcicon\endcsname {\simpleiconsmap\symbol{"EEF4}} - \expandafter\def\csname simpleicon@html5icon\endcsname {\simpleiconsmap\symbol{"EEF5}} - \expandafter\def\csname simpleicon@htmlacademyicon\endcsname {\simpleiconsmap\symbol{"EEF6}} - \expandafter\def\csname simpleicon@htmxicon\endcsname {\simpleiconsmap\symbol{"EEF7}} - \expandafter\def\csname simpleicon@htopicon\endcsname {\simpleiconsmap\symbol{"EEF8}} - \expandafter\def\csname simpleicon@httpieicon\endcsname {\simpleiconsmap\symbol{"EEF9}} - \expandafter\def\csname simpleicon@huaweiicon\endcsname {\simpleiconsmap\symbol{"EEFA}} - \expandafter\def\csname simpleicon@hubspoticon\endcsname {\simpleiconsmap\symbol{"EEFB}} - \expandafter\def\csname simpleicon@huggingfaceicon\endcsname {\simpleiconsmap\symbol{"EEFC}} - \expandafter\def\csname simpleicon@hugoicon\endcsname {\simpleiconsmap\symbol{"EEFD}} - \expandafter\def\csname simpleicon@humblebundleicon\endcsname {\simpleiconsmap\symbol{"EEFE}} - \expandafter\def\csname simpleicon@hungryjacksicon\endcsname {\simpleiconsmap\symbol{"EEFF}} - \expandafter\def\csname simpleicon@husqvarnaicon\endcsname {\simpleiconsmap\symbol{"EF00}} - \expandafter\def\csname simpleicon@hypericon\endcsname {\simpleiconsmap\symbol{"EF01}} - \expandafter\def\csname simpleicon@hyperskillicon\endcsname {\simpleiconsmap\symbol{"EF02}} - \expandafter\def\csname simpleicon@hypothesisicon\endcsname {\simpleiconsmap\symbol{"EF03}} - \expandafter\def\csname simpleicon@hyprlandicon\endcsname {\simpleiconsmap\symbol{"EF04}} - \expandafter\def\csname simpleicon@hyundaiicon\endcsname {\simpleiconsmap\symbol{"EF05}} - \expandafter\def\csname simpleicon@i18nexticon\endcsname {\simpleiconsmap\symbol{"EF06}} - \expandafter\def\csname simpleicon@i3icon\endcsname {\simpleiconsmap\symbol{"EF07}} - \expandafter\def\csname simpleicon@iataicon\endcsname {\simpleiconsmap\symbol{"EF08}} - \expandafter\def\csname simpleicon@ibeaconicon\endcsname {\simpleiconsmap\symbol{"EF09}} - \expandafter\def\csname simpleicon@iberiaicon\endcsname {\simpleiconsmap\symbol{"EF0A}} - \expandafter\def\csname simpleicon@icedicon\endcsname {\simpleiconsmap\symbol{"EF0B}} - \expandafter\def\csname simpleicon@icelandicon\endcsname {\simpleiconsmap\symbol{"EF0C}} - \expandafter\def\csname simpleicon@icicibankicon\endcsname {\simpleiconsmap\symbol{"EF0D}} - \expandafter\def\csname simpleicon@icingaicon\endcsname {\simpleiconsmap\symbol{"EF0E}} - \expandafter\def\csname simpleicon@icloudicon\endcsname {\simpleiconsmap\symbol{"EF0F}} - \expandafter\def\csname simpleicon@icomoonicon\endcsname {\simpleiconsmap\symbol{"EF10}} - \expandafter\def\csname simpleicon@iconicon\endcsname {\simpleiconsmap\symbol{"EF11}} - \expandafter\def\csname simpleicon@iconfindericon\endcsname {\simpleiconsmap\symbol{"EF12}} - \expandafter\def\csname simpleicon@iconifyicon\endcsname {\simpleiconsmap\symbol{"EF13}} - \expandafter\def\csname simpleicon@iconjaricon\endcsname {\simpleiconsmap\symbol{"EF14}} - \expandafter\def\csname simpleicon@icons8icon\endcsname {\simpleiconsmap\symbol{"EF15}} - \expandafter\def\csname simpleicon@icqicon\endcsname {\simpleiconsmap\symbol{"EF16}} - \expandafter\def\csname simpleicon@ieeeicon\endcsname {\simpleiconsmap\symbol{"EF17}} - \expandafter\def\csname simpleicon@ifixiticon\endcsname {\simpleiconsmap\symbol{"EF18}} - \expandafter\def\csname simpleicon@ifoodicon\endcsname {\simpleiconsmap\symbol{"EF19}} - \expandafter\def\csname simpleicon@ifttticon\endcsname {\simpleiconsmap\symbol{"EF1A}} - \expandafter\def\csname simpleicon@igdbicon\endcsname {\simpleiconsmap\symbol{"EF1B}} - \expandafter\def\csname simpleicon@ignicon\endcsname {\simpleiconsmap\symbol{"EF1C}} - \expandafter\def\csname simpleicon@iheartradioicon\endcsname {\simpleiconsmap\symbol{"EF1D}} - \expandafter\def\csname simpleicon@ikeaicon\endcsname {\simpleiconsmap\symbol{"EF1E}} - \expandafter\def\csname simpleicon@iledefrancemobilitesicon\endcsname {\simpleiconsmap\symbol{"EF1F}} - \expandafter\def\csname simpleicon@imagedotscicon\endcsname {\simpleiconsmap\symbol{"EF20}} - \expandafter\def\csname simpleicon@imagejicon\endcsname {\simpleiconsmap\symbol{"EF21}} - \expandafter\def\csname simpleicon@imdbicon\endcsname {\simpleiconsmap\symbol{"EF22}} - \expandafter\def\csname simpleicon@imessageicon\endcsname {\simpleiconsmap\symbol{"EF23}} - \expandafter\def\csname simpleicon@imguricon\endcsname {\simpleiconsmap\symbol{"EF24}} - \expandafter\def\csname simpleicon@immericon\endcsname {\simpleiconsmap\symbol{"EF25}} - \expandafter\def\csname simpleicon@immichicon\endcsname {\simpleiconsmap\symbol{"EF26}} - \expandafter\def\csname simpleicon@imouicon\endcsname {\simpleiconsmap\symbol{"EF27}} - \expandafter\def\csname simpleicon@improvmxicon\endcsname {\simpleiconsmap\symbol{"EF28}} - \expandafter\def\csname simpleicon@indeedicon\endcsname {\simpleiconsmap\symbol{"EF29}} - \expandafter\def\csname simpleicon@indiansuperleagueicon\endcsname {\simpleiconsmap\symbol{"EF2A}} - \expandafter\def\csname simpleicon@indiehackersicon\endcsname {\simpleiconsmap\symbol{"EF2B}} - \expandafter\def\csname simpleicon@indigoicon\endcsname {\simpleiconsmap\symbol{"EF2C}} - \expandafter\def\csname simpleicon@inertiaicon\endcsname {\simpleiconsmap\symbol{"EF2D}} - \expandafter\def\csname simpleicon@infinitiicon\endcsname {\simpleiconsmap\symbol{"EF2E}} - \expandafter\def\csname simpleicon@influxdbicon\endcsname {\simpleiconsmap\symbol{"EF2F}} - \expandafter\def\csname simpleicon@infomaniakicon\endcsname {\simpleiconsmap\symbol{"EF30}} - \expandafter\def\csname simpleicon@infoqicon\endcsname {\simpleiconsmap\symbol{"EF31}} - \expandafter\def\csname simpleicon@informaticaicon\endcsname {\simpleiconsmap\symbol{"EF32}} - \expandafter\def\csname simpleicon@infosysicon\endcsname {\simpleiconsmap\symbol{"EF33}} - \expandafter\def\csname simpleicon@infracosticon\endcsname {\simpleiconsmap\symbol{"EF34}} - \expandafter\def\csname simpleicon@ingressicon\endcsname {\simpleiconsmap\symbol{"EF35}} - \expandafter\def\csname simpleicon@inkdropicon\endcsname {\simpleiconsmap\symbol{"EF36}} - \expandafter\def\csname simpleicon@inkscapeicon\endcsname {\simpleiconsmap\symbol{"EF37}} - \expandafter\def\csname simpleicon@inoreadericon\endcsname {\simpleiconsmap\symbol{"EF38}} - \expandafter\def\csname simpleicon@insomniaicon\endcsname {\simpleiconsmap\symbol{"EF39}} - \expandafter\def\csname simpleicon@inspireicon\endcsname {\simpleiconsmap\symbol{"EF3A}} - \expandafter\def\csname simpleicon@insta360icon\endcsname {\simpleiconsmap\symbol{"EF3B}} - \expandafter\def\csname simpleicon@instacarticon\endcsname {\simpleiconsmap\symbol{"EF3C}} - \expandafter\def\csname simpleicon@instagramicon\endcsname {\simpleiconsmap\symbol{"EF3D}} - \expandafter\def\csname simpleicon@instapapericon\endcsname {\simpleiconsmap\symbol{"EF3E}} - \expandafter\def\csname simpleicon@instatusicon\endcsname {\simpleiconsmap\symbol{"EF3F}} - \expandafter\def\csname simpleicon@instructablesicon\endcsname {\simpleiconsmap\symbol{"EF40}} - \expandafter\def\csname simpleicon@instructureicon\endcsname {\simpleiconsmap\symbol{"EF41}} - \expandafter\def\csname simpleicon@intelicon\endcsname {\simpleiconsmap\symbol{"EF42}} - \expandafter\def\csname simpleicon@intellijideaicon\endcsname {\simpleiconsmap\symbol{"EF43}} - \expandafter\def\csname simpleicon@interactiondesignfoundationicon\endcsname {\simpleiconsmap\symbol{"EF44}} - \expandafter\def\csname simpleicon@interactjsicon\endcsname {\simpleiconsmap\symbol{"EF45}} - \expandafter\def\csname simpleicon@interbaseicon\endcsname {\simpleiconsmap\symbol{"EF46}} - \expandafter\def\csname simpleicon@intercomicon\endcsname {\simpleiconsmap\symbol{"EF47}} - \expandafter\def\csname simpleicon@intermarcheicon\endcsname {\simpleiconsmap\symbol{"EF48}} - \expandafter\def\csname simpleicon@internetarchiveicon\endcsname {\simpleiconsmap\symbol{"EF49}} - \expandafter\def\csname simpleicon@internetcomputericon\endcsname {\simpleiconsmap\symbol{"EF4A}} - \expandafter\def\csname simpleicon@intigritiicon\endcsname {\simpleiconsmap\symbol{"EF4B}} - \expandafter\def\csname simpleicon@intuiticon\endcsname {\simpleiconsmap\symbol{"EF4C}} - \expandafter\def\csname simpleicon@invisionicon\endcsname {\simpleiconsmap\symbol{"EF4D}} - \expandafter\def\csname simpleicon@invoiceninjaicon\endcsname {\simpleiconsmap\symbol{"EF4E}} - \expandafter\def\csname simpleicon@iobrokericon\endcsname {\simpleiconsmap\symbol{"EF4F}} - \expandafter\def\csname simpleicon@ionicicon\endcsname {\simpleiconsmap\symbol{"EF50}} - \expandafter\def\csname simpleicon@ionosicon\endcsname {\simpleiconsmap\symbol{"EF51}} - \expandafter\def\csname simpleicon@iosicon\endcsname {\simpleiconsmap\symbol{"EF52}} - \expandafter\def\csname simpleicon@iotaicon\endcsname {\simpleiconsmap\symbol{"EF53}} - \expandafter\def\csname simpleicon@ipfsicon\endcsname {\simpleiconsmap\symbol{"EF54}} - \expandafter\def\csname simpleicon@irisicon\endcsname {\simpleiconsmap\symbol{"EF55}} - \expandafter\def\csname simpleicon@iroboticon\endcsname {\simpleiconsmap\symbol{"EF56}} - \expandafter\def\csname simpleicon@isc2icon\endcsname {\simpleiconsmap\symbol{"EF57}} - \expandafter\def\csname simpleicon@issuuicon\endcsname {\simpleiconsmap\symbol{"EF58}} - \expandafter\def\csname simpleicon@istioicon\endcsname {\simpleiconsmap\symbol{"EF59}} - \expandafter\def\csname simpleicon@itchdotioicon\endcsname {\simpleiconsmap\symbol{"EF5A}} - \expandafter\def\csname simpleicon@iterm2icon\endcsname {\simpleiconsmap\symbol{"EF5B}} - \expandafter\def\csname simpleicon@itunesicon\endcsname {\simpleiconsmap\symbol{"EF5C}} - \expandafter\def\csname simpleicon@itvxicon\endcsname {\simpleiconsmap\symbol{"EF5D}} - \expandafter\def\csname simpleicon@ivecoicon\endcsname {\simpleiconsmap\symbol{"EF5E}} - \expandafter\def\csname simpleicon@jabbericon\endcsname {\simpleiconsmap\symbol{"EF5F}} - \expandafter\def\csname simpleicon@jaegericon\endcsname {\simpleiconsmap\symbol{"EF60}} - \expandafter\def\csname simpleicon@jaguaricon\endcsname {\simpleiconsmap\symbol{"EF61}} - \expandafter\def\csname simpleicon@jamboardicon\endcsname {\simpleiconsmap\symbol{"EF62}} - \expandafter\def\csname simpleicon@jamesonicon\endcsname {\simpleiconsmap\symbol{"EF63}} - \expandafter\def\csname simpleicon@jamstackicon\endcsname {\simpleiconsmap\symbol{"EF64}} - \expandafter\def\csname simpleicon@jasmineicon\endcsname {\simpleiconsmap\symbol{"EF65}} - \expandafter\def\csname simpleicon@javascripticon\endcsname {\simpleiconsmap\symbol{"EF66}} - \expandafter\def\csname simpleicon@jblicon\endcsname {\simpleiconsmap\symbol{"EF67}} - \expandafter\def\csname simpleicon@jcbicon\endcsname {\simpleiconsmap\symbol{"EF68}} - \expandafter\def\csname simpleicon@jeepicon\endcsname {\simpleiconsmap\symbol{"EF69}} - \expandafter\def\csname simpleicon@jekyllicon\endcsname {\simpleiconsmap\symbol{"EF6A}} - \expandafter\def\csname simpleicon@jellyfinicon\endcsname {\simpleiconsmap\symbol{"EF6B}} - \expandafter\def\csname simpleicon@jenkinsicon\endcsname {\simpleiconsmap\symbol{"EF6C}} - \expandafter\def\csname simpleicon@jesticon\endcsname {\simpleiconsmap\symbol{"EF6D}} - \expandafter\def\csname simpleicon@jeticon\endcsname {\simpleiconsmap\symbol{"EF6E}} - \expandafter\def\csname simpleicon@jetblueicon\endcsname {\simpleiconsmap\symbol{"EF6F}} - \expandafter\def\csname simpleicon@jetbrainsicon\endcsname {\simpleiconsmap\symbol{"EF70}} - \expandafter\def\csname simpleicon@jetpackcomposeicon\endcsname {\simpleiconsmap\symbol{"EF71}} - \expandafter\def\csname simpleicon@jfrogicon\endcsname {\simpleiconsmap\symbol{"EF72}} - \expandafter\def\csname simpleicon@jfrogpipelinesicon\endcsname {\simpleiconsmap\symbol{"EF73}} - \expandafter\def\csname simpleicon@jhipstericon\endcsname {\simpleiconsmap\symbol{"EF74}} - \expandafter\def\csname simpleicon@jinjaicon\endcsname {\simpleiconsmap\symbol{"EF75}} - \expandafter\def\csname simpleicon@jiraicon\endcsname {\simpleiconsmap\symbol{"EF76}} - \expandafter\def\csname simpleicon@jirasoftwareicon\endcsname {\simpleiconsmap\symbol{"EF77}} - \expandafter\def\csname simpleicon@jitpackicon\endcsname {\simpleiconsmap\symbol{"EF78}} - \expandafter\def\csname simpleicon@jitsiicon\endcsname {\simpleiconsmap\symbol{"EF79}} - \expandafter\def\csname simpleicon@johndeereicon\endcsname {\simpleiconsmap\symbol{"EF7A}} - \expandafter\def\csname simpleicon@joomlaicon\endcsname {\simpleiconsmap\symbol{"EF7B}} - \expandafter\def\csname simpleicon@joplinicon\endcsname {\simpleiconsmap\symbol{"EF7C}} - \expandafter\def\csname simpleicon@jordanicon\endcsname {\simpleiconsmap\symbol{"EF7D}} - \expandafter\def\csname simpleicon@jouavicon\endcsname {\simpleiconsmap\symbol{"EF7E}} - \expandafter\def\csname simpleicon@jovianicon\endcsname {\simpleiconsmap\symbol{"EF7F}} - \expandafter\def\csname simpleicon@jpegicon\endcsname {\simpleiconsmap\symbol{"EF80}} - \expandafter\def\csname simpleicon@jqueryicon\endcsname {\simpleiconsmap\symbol{"EF81}} - \expandafter\def\csname simpleicon@jrgroupicon\endcsname {\simpleiconsmap\symbol{"EF82}} - \expandafter\def\csname simpleicon@jsdelivricon\endcsname {\simpleiconsmap\symbol{"EF83}} - \expandafter\def\csname simpleicon@jsfiddleicon\endcsname {\simpleiconsmap\symbol{"EF84}} - \expandafter\def\csname simpleicon@jsonicon\endcsname {\simpleiconsmap\symbol{"EF85}} - \expandafter\def\csname simpleicon@jsonwebtokensicon\endcsname {\simpleiconsmap\symbol{"EF86}} - \expandafter\def\csname simpleicon@jsricon\endcsname {\simpleiconsmap\symbol{"EF87}} - \expandafter\def\csname simpleicon@jssicon\endcsname {\simpleiconsmap\symbol{"EF88}} - \expandafter\def\csname simpleicon@juceicon\endcsname {\simpleiconsmap\symbol{"EF89}} - \expandafter\def\csname simpleicon@juejinicon\endcsname {\simpleiconsmap\symbol{"EF8A}} - \expandafter\def\csname simpleicon@jukeicon\endcsname {\simpleiconsmap\symbol{"EF8B}} - \expandafter\def\csname simpleicon@juliaicon\endcsname {\simpleiconsmap\symbol{"EF8C}} - \expandafter\def\csname simpleicon@junipernetworksicon\endcsname {\simpleiconsmap\symbol{"EF8D}} - \expandafter\def\csname simpleicon@junit5icon\endcsname {\simpleiconsmap\symbol{"EF8E}} - \expandafter\def\csname simpleicon@jupytericon\endcsname {\simpleiconsmap\symbol{"EF8F}} - \expandafter\def\csname simpleicon@justeaticon\endcsname {\simpleiconsmap\symbol{"EF90}} - \expandafter\def\csname simpleicon@justgivingicon\endcsname {\simpleiconsmap\symbol{"EF91}} - \expandafter\def\csname simpleicon@k3sicon\endcsname {\simpleiconsmap\symbol{"EF92}} - \expandafter\def\csname simpleicon@k6icon\endcsname {\simpleiconsmap\symbol{"EF93}} - \expandafter\def\csname simpleicon@kaggleicon\endcsname {\simpleiconsmap\symbol{"EF94}} - \expandafter\def\csname simpleicon@kagiicon\endcsname {\simpleiconsmap\symbol{"EF95}} - \expandafter\def\csname simpleicon@kahooticon\endcsname {\simpleiconsmap\symbol{"EF96}} - \expandafter\def\csname simpleicon@kaiosicon\endcsname {\simpleiconsmap\symbol{"EF97}} - \expandafter\def\csname simpleicon@kakaoicon\endcsname {\simpleiconsmap\symbol{"EF98}} - \expandafter\def\csname simpleicon@kakaotalkicon\endcsname {\simpleiconsmap\symbol{"EF99}} - \expandafter\def\csname simpleicon@kalilinuxicon\endcsname {\simpleiconsmap\symbol{"EF9A}} - \expandafter\def\csname simpleicon@kamailioicon\endcsname {\simpleiconsmap\symbol{"EF9B}} - \expandafter\def\csname simpleicon@kanikoicon\endcsname {\simpleiconsmap\symbol{"EF9C}} - \expandafter\def\csname simpleicon@karlsruherverkehrsverbundicon\endcsname {\simpleiconsmap\symbol{"EF9D}} - \expandafter\def\csname simpleicon@kasasmarticon\endcsname {\simpleiconsmap\symbol{"EF9E}} - \expandafter\def\csname simpleicon@kashflowicon\endcsname {\simpleiconsmap\symbol{"EF9F}} - \expandafter\def\csname simpleicon@kasperskyicon\endcsname {\simpleiconsmap\symbol{"EFA0}} - \expandafter\def\csname simpleicon@katacodaicon\endcsname {\simpleiconsmap\symbol{"EFA1}} - \expandafter\def\csname simpleicon@katanaicon\endcsname {\simpleiconsmap\symbol{"EFA2}} - \expandafter\def\csname simpleicon@kauflandicon\endcsname {\simpleiconsmap\symbol{"EFA3}} - \expandafter\def\csname simpleicon@kdeicon\endcsname {\simpleiconsmap\symbol{"EFA4}} - \expandafter\def\csname simpleicon@kdenliveicon\endcsname {\simpleiconsmap\symbol{"EFA5}} - \expandafter\def\csname simpleicon@kedroicon\endcsname {\simpleiconsmap\symbol{"EFA6}} - \expandafter\def\csname simpleicon@keeneticicon\endcsname {\simpleiconsmap\symbol{"EFA7}} - \expandafter\def\csname simpleicon@keepachangelogicon\endcsname {\simpleiconsmap\symbol{"EFA8}} - \expandafter\def\csname simpleicon@keepassxcicon\endcsname {\simpleiconsmap\symbol{"EFA9}} - \expandafter\def\csname simpleicon@kenticoicon\endcsname {\simpleiconsmap\symbol{"EFAA}} - \expandafter\def\csname simpleicon@kerasicon\endcsname {\simpleiconsmap\symbol{"EFAB}} - \expandafter\def\csname simpleicon@keybaseicon\endcsname {\simpleiconsmap\symbol{"EFAC}} - \expandafter\def\csname simpleicon@keycdnicon\endcsname {\simpleiconsmap\symbol{"EFAD}} - \expandafter\def\csname simpleicon@keycloakicon\endcsname {\simpleiconsmap\symbol{"EFAE}} - \expandafter\def\csname simpleicon@keystoneicon\endcsname {\simpleiconsmap\symbol{"EFAF}} - \expandafter\def\csname simpleicon@kfcicon\endcsname {\simpleiconsmap\symbol{"EFB0}} - \expandafter\def\csname simpleicon@khanacademyicon\endcsname {\simpleiconsmap\symbol{"EFB1}} - \expandafter\def\csname simpleicon@khronosgroupicon\endcsname {\simpleiconsmap\symbol{"EFB2}} - \expandafter\def\csname simpleicon@kiaicon\endcsname {\simpleiconsmap\symbol{"EFB3}} - \expandafter\def\csname simpleicon@kibanaicon\endcsname {\simpleiconsmap\symbol{"EFB4}} - \expandafter\def\csname simpleicon@kicadicon\endcsname {\simpleiconsmap\symbol{"EFB5}} - \expandafter\def\csname simpleicon@kickicon\endcsname {\simpleiconsmap\symbol{"EFB6}} - \expandafter\def\csname simpleicon@kickstartericon\endcsname {\simpleiconsmap\symbol{"EFB7}} - \expandafter\def\csname simpleicon@kikicon\endcsname {\simpleiconsmap\symbol{"EFB8}} - \expandafter\def\csname simpleicon@kingstontechnologyicon\endcsname {\simpleiconsmap\symbol{"EFB9}} - \expandafter\def\csname simpleicon@kinopoiskicon\endcsname {\simpleiconsmap\symbol{"EFBA}} - \expandafter\def\csname simpleicon@kinstaicon\endcsname {\simpleiconsmap\symbol{"EFBB}} - \expandafter\def\csname simpleicon@kirbyicon\endcsname {\simpleiconsmap\symbol{"EFBC}} - \expandafter\def\csname simpleicon@kiticon\endcsname {\simpleiconsmap\symbol{"EFBD}} - \expandafter\def\csname simpleicon@kitsuicon\endcsname {\simpleiconsmap\symbol{"EFBE}} - \expandafter\def\csname simpleicon@klarnaicon\endcsname {\simpleiconsmap\symbol{"EFBF}} - \expandafter\def\csname simpleicon@klmicon\endcsname {\simpleiconsmap\symbol{"EFC0}} - \expandafter\def\csname simpleicon@klookicon\endcsname {\simpleiconsmap\symbol{"EFC1}} - \expandafter\def\csname simpleicon@knativeicon\endcsname {\simpleiconsmap\symbol{"EFC2}} - \expandafter\def\csname simpleicon@knexdotjsicon\endcsname {\simpleiconsmap\symbol{"EFC3}} - \expandafter\def\csname simpleicon@knimeicon\endcsname {\simpleiconsmap\symbol{"EFC4}} - \expandafter\def\csname simpleicon@knipicon\endcsname {\simpleiconsmap\symbol{"EFC5}} - \expandafter\def\csname simpleicon@knowledgebaseicon\endcsname {\simpleiconsmap\symbol{"EFC6}} - \expandafter\def\csname simpleicon@knownicon\endcsname {\simpleiconsmap\symbol{"EFC7}} - \expandafter\def\csname simpleicon@koaicon\endcsname {\simpleiconsmap\symbol{"EFC8}} - \expandafter\def\csname simpleicon@kocicon\endcsname {\simpleiconsmap\symbol{"EFC9}} - \expandafter\def\csname simpleicon@kodakicon\endcsname {\simpleiconsmap\symbol{"EFCA}} - \expandafter\def\csname simpleicon@kodiicon\endcsname {\simpleiconsmap\symbol{"EFCB}} - \expandafter\def\csname simpleicon@koenigseggicon\endcsname {\simpleiconsmap\symbol{"EFCC}} - \expandafter\def\csname simpleicon@kofaxicon\endcsname {\simpleiconsmap\symbol{"EFCD}} - \expandafter\def\csname simpleicon@kofiicon\endcsname {\simpleiconsmap\symbol{"EFCE}} - \expandafter\def\csname simpleicon@komooticon\endcsname {\simpleiconsmap\symbol{"EFCF}} - \expandafter\def\csname simpleicon@konamiicon\endcsname {\simpleiconsmap\symbol{"EFD0}} - \expandafter\def\csname simpleicon@kongicon\endcsname {\simpleiconsmap\symbol{"EFD1}} - \expandafter\def\csname simpleicon@kongregateicon\endcsname {\simpleiconsmap\symbol{"EFD2}} - \expandafter\def\csname simpleicon@konvaicon\endcsname {\simpleiconsmap\symbol{"EFD3}} - \expandafter\def\csname simpleicon@kotlinicon\endcsname {\simpleiconsmap\symbol{"EFD4}} - \expandafter\def\csname simpleicon@koyebicon\endcsname {\simpleiconsmap\symbol{"EFD5}} - \expandafter\def\csname simpleicon@kritaicon\endcsname {\simpleiconsmap\symbol{"EFD6}} - \expandafter\def\csname simpleicon@ktmicon\endcsname {\simpleiconsmap\symbol{"EFD7}} - \expandafter\def\csname simpleicon@ktoricon\endcsname {\simpleiconsmap\symbol{"EFD8}} - \expandafter\def\csname simpleicon@kuaishouicon\endcsname {\simpleiconsmap\symbol{"EFD9}} - \expandafter\def\csname simpleicon@kubernetesicon\endcsname {\simpleiconsmap\symbol{"EFDA}} - \expandafter\def\csname simpleicon@kubuntuicon\endcsname {\simpleiconsmap\symbol{"EFDB}} - \expandafter\def\csname simpleicon@kucoinicon\endcsname {\simpleiconsmap\symbol{"EFDC}} - \expandafter\def\csname simpleicon@kumaicon\endcsname {\simpleiconsmap\symbol{"EFDD}} - \expandafter\def\csname simpleicon@kununuicon\endcsname {\simpleiconsmap\symbol{"EFDE}} - \expandafter\def\csname simpleicon@kuulaicon\endcsname {\simpleiconsmap\symbol{"EFDF}} - \expandafter\def\csname simpleicon@kxicon\endcsname {\simpleiconsmap\symbol{"EFE0}} - \expandafter\def\csname simpleicon@kyoceraicon\endcsname {\simpleiconsmap\symbol{"EFE1}} - \expandafter\def\csname simpleicon@labviewicon\endcsname {\simpleiconsmap\symbol{"EFE2}} - \expandafter\def\csname simpleicon@ladaicon\endcsname {\simpleiconsmap\symbol{"EFE3}} - \expandafter\def\csname simpleicon@lamborghiniicon\endcsname {\simpleiconsmap\symbol{"EFE4}} - \expandafter\def\csname simpleicon@landrovericon\endcsname {\simpleiconsmap\symbol{"EFE5}} - \expandafter\def\csname simpleicon@langchainicon\endcsname {\simpleiconsmap\symbol{"EFE6}} - \expandafter\def\csname simpleicon@lapceicon\endcsname {\simpleiconsmap\symbol{"EFE7}} - \expandafter\def\csname simpleicon@laragonicon\endcsname {\simpleiconsmap\symbol{"EFE8}} - \expandafter\def\csname simpleicon@laravelicon\endcsname {\simpleiconsmap\symbol{"EFE9}} - \expandafter\def\csname simpleicon@laravelhorizonicon\endcsname {\simpleiconsmap\symbol{"EFEA}} - \expandafter\def\csname simpleicon@laravelnovaicon\endcsname {\simpleiconsmap\symbol{"EFEB}} - \expandafter\def\csname simpleicon@lastdotfmicon\endcsname {\simpleiconsmap\symbol{"EFEC}} - \expandafter\def\csname simpleicon@lastpassicon\endcsname {\simpleiconsmap\symbol{"EFED}} - \expandafter\def\csname simpleicon@latexicon\endcsname {\simpleiconsmap\symbol{"EFEE}} - \expandafter\def\csname simpleicon@launchpadicon\endcsname {\simpleiconsmap\symbol{"EFEF}} - \expandafter\def\csname simpleicon@lazarusicon\endcsname {\simpleiconsmap\symbol{"EFF0}} - \expandafter\def\csname simpleicon@lazyvimicon\endcsname {\simpleiconsmap\symbol{"EFF1}} - \expandafter\def\csname simpleicon@lbryicon\endcsname {\simpleiconsmap\symbol{"EFF2}} - \expandafter\def\csname simpleicon@leaderpriceicon\endcsname {\simpleiconsmap\symbol{"EFF3}} - \expandafter\def\csname simpleicon@leafleticon\endcsname {\simpleiconsmap\symbol{"EFF4}} - \expandafter\def\csname simpleicon@leagueoflegendsicon\endcsname {\simpleiconsmap\symbol{"EFF5}} - \expandafter\def\csname simpleicon@leanpubicon\endcsname {\simpleiconsmap\symbol{"EFF6}} - \expandafter\def\csname simpleicon@leetcodeicon\endcsname {\simpleiconsmap\symbol{"EFF7}} - \expandafter\def\csname simpleicon@legacygamesicon\endcsname {\simpleiconsmap\symbol{"EFF8}} - \expandafter\def\csname simpleicon@leicaicon\endcsname {\simpleiconsmap\symbol{"EFF9}} - \expandafter\def\csname simpleicon@lemmyicon\endcsname {\simpleiconsmap\symbol{"EFFA}} - \expandafter\def\csname simpleicon@lemonsqueezyicon\endcsname {\simpleiconsmap\symbol{"EFFB}} - \expandafter\def\csname simpleicon@lenovoicon\endcsname {\simpleiconsmap\symbol{"EFFC}} - \expandafter\def\csname simpleicon@lensicon\endcsname {\simpleiconsmap\symbol{"EFFD}} - \expandafter\def\csname simpleicon@leptosicon\endcsname {\simpleiconsmap\symbol{"EFFE}} - \expandafter\def\csname simpleicon@lequipeicon\endcsname {\simpleiconsmap\symbol{"EFFF}} - \expandafter\def\csname simpleicon@lernaicon\endcsname {\simpleiconsmap\symbol{"F000}} - \expandafter\def\csname simpleicon@leroymerlinicon\endcsname {\simpleiconsmap\symbol{"F001}} - \expandafter\def\csname simpleicon@leslibrairesicon\endcsname {\simpleiconsmap\symbol{"F002}} - \expandafter\def\csname simpleicon@lessicon\endcsname {\simpleiconsmap\symbol{"F003}} - \expandafter\def\csname simpleicon@letsencrypticon\endcsname {\simpleiconsmap\symbol{"F004}} - \expandafter\def\csname simpleicon@letterboxdicon\endcsname {\simpleiconsmap\symbol{"F005}} - \expandafter\def\csname simpleicon@levelsdotfyiicon\endcsname {\simpleiconsmap\symbol{"F006}} - \expandafter\def\csname simpleicon@lgicon\endcsname {\simpleiconsmap\symbol{"F007}} - \expandafter\def\csname simpleicon@liberadotchaticon\endcsname {\simpleiconsmap\symbol{"F008}} - \expandafter\def\csname simpleicon@liberapayicon\endcsname {\simpleiconsmap\symbol{"F009}} - \expandafter\def\csname simpleicon@librariesdotioicon\endcsname {\simpleiconsmap\symbol{"F00A}} - \expandafter\def\csname simpleicon@librarythingicon\endcsname {\simpleiconsmap\symbol{"F00B}} - \expandafter\def\csname simpleicon@libreofficeicon\endcsname {\simpleiconsmap\symbol{"F00C}} - \expandafter\def\csname simpleicon@libreofficebaseicon\endcsname {\simpleiconsmap\symbol{"F00D}} - \expandafter\def\csname simpleicon@libreofficecalcicon\endcsname {\simpleiconsmap\symbol{"F00E}} - \expandafter\def\csname simpleicon@libreofficedrawicon\endcsname {\simpleiconsmap\symbol{"F00F}} - \expandafter\def\csname simpleicon@libreofficeimpressicon\endcsname {\simpleiconsmap\symbol{"F010}} - \expandafter\def\csname simpleicon@libreofficemathicon\endcsname {\simpleiconsmap\symbol{"F011}} - \expandafter\def\csname simpleicon@libreofficewritericon\endcsname {\simpleiconsmap\symbol{"F012}} - \expandafter\def\csname simpleicon@librewolficon\endcsname {\simpleiconsmap\symbol{"F013}} - \expandafter\def\csname simpleicon@libuvicon\endcsname {\simpleiconsmap\symbol{"F014}} - \expandafter\def\csname simpleicon@lichessicon\endcsname {\simpleiconsmap\symbol{"F015}} - \expandafter\def\csname simpleicon@lidlicon\endcsname {\simpleiconsmap\symbol{"F016}} - \expandafter\def\csname simpleicon@lifxicon\endcsname {\simpleiconsmap\symbol{"F017}} - \expandafter\def\csname simpleicon@lightburnicon\endcsname {\simpleiconsmap\symbol{"F018}} - \expandafter\def\csname simpleicon@lighthouseicon\endcsname {\simpleiconsmap\symbol{"F019}} - \expandafter\def\csname simpleicon@lightningicon\endcsname {\simpleiconsmap\symbol{"F01A}} - \expandafter\def\csname simpleicon@limesurveyicon\endcsname {\simpleiconsmap\symbol{"F01B}} - \expandafter\def\csname simpleicon@lineicon\endcsname {\simpleiconsmap\symbol{"F01C}} - \expandafter\def\csname simpleicon@lineageosicon\endcsname {\simpleiconsmap\symbol{"F01D}} - \expandafter\def\csname simpleicon@linearicon\endcsname {\simpleiconsmap\symbol{"F01E}} - \expandafter\def\csname simpleicon@liningicon\endcsname {\simpleiconsmap\symbol{"F01F}} - \expandafter\def\csname simpleicon@linkedinicon\endcsname {\simpleiconsmap\symbol{"F020}} - \expandafter\def\csname simpleicon@linkerdicon\endcsname {\simpleiconsmap\symbol{"F021}} - \expandafter\def\csname simpleicon@linkfireicon\endcsname {\simpleiconsmap\symbol{"F022}} - \expandafter\def\csname simpleicon@linksysicon\endcsname {\simpleiconsmap\symbol{"F023}} - \expandafter\def\csname simpleicon@linktreeicon\endcsname {\simpleiconsmap\symbol{"F024}} - \expandafter\def\csname simpleicon@lintcodeicon\endcsname {\simpleiconsmap\symbol{"F025}} - \expandafter\def\csname simpleicon@linuxicon\endcsname {\simpleiconsmap\symbol{"F026}} - \expandafter\def\csname simpleicon@linuxcontainersicon\endcsname {\simpleiconsmap\symbol{"F027}} - \expandafter\def\csname simpleicon@linuxfoundationicon\endcsname {\simpleiconsmap\symbol{"F028}} - \expandafter\def\csname simpleicon@linuxminticon\endcsname {\simpleiconsmap\symbol{"F029}} - \expandafter\def\csname simpleicon@linuxprofessionalinstituteicon\endcsname {\simpleiconsmap\symbol{"F02A}} - \expandafter\def\csname simpleicon@linuxservericon\endcsname {\simpleiconsmap\symbol{"F02B}} - \expandafter\def\csname simpleicon@lionairicon\endcsname {\simpleiconsmap\symbol{"F02C}} - \expandafter\def\csname simpleicon@liquibaseicon\endcsname {\simpleiconsmap\symbol{"F02D}} - \expandafter\def\csname simpleicon@listmonkicon\endcsname {\simpleiconsmap\symbol{"F02E}} - \expandafter\def\csname simpleicon@liticon\endcsname {\simpleiconsmap\symbol{"F02F}} - \expandafter\def\csname simpleicon@litecoinicon\endcsname {\simpleiconsmap\symbol{"F030}} - \expandafter\def\csname simpleicon@literalicon\endcsname {\simpleiconsmap\symbol{"F031}} - \expandafter\def\csname simpleicon@litiengineicon\endcsname {\simpleiconsmap\symbol{"F032}} - \expandafter\def\csname simpleicon@livechaticon\endcsname {\simpleiconsmap\symbol{"F033}} - \expandafter\def\csname simpleicon@livejournalicon\endcsname {\simpleiconsmap\symbol{"F034}} - \expandafter\def\csname simpleicon@livewireicon\endcsname {\simpleiconsmap\symbol{"F035}} - \expandafter\def\csname simpleicon@llvmicon\endcsname {\simpleiconsmap\symbol{"F036}} - \expandafter\def\csname simpleicon@lmmsicon\endcsname {\simpleiconsmap\symbol{"F037}} - \expandafter\def\csname simpleicon@lobstersicon\endcsname {\simpleiconsmap\symbol{"F038}} - \expandafter\def\csname simpleicon@localicon\endcsname {\simpleiconsmap\symbol{"F039}} - \expandafter\def\csname simpleicon@lodashicon\endcsname {\simpleiconsmap\symbol{"F03A}} - \expandafter\def\csname simpleicon@logitechicon\endcsname {\simpleiconsmap\symbol{"F03B}} - \expandafter\def\csname simpleicon@logitechgicon\endcsname {\simpleiconsmap\symbol{"F03C}} - \expandafter\def\csname simpleicon@logmeinicon\endcsname {\simpleiconsmap\symbol{"F03D}} - \expandafter\def\csname simpleicon@logseqicon\endcsname {\simpleiconsmap\symbol{"F03E}} - \expandafter\def\csname simpleicon@logstashicon\endcsname {\simpleiconsmap\symbol{"F03F}} - \expandafter\def\csname simpleicon@lookericon\endcsname {\simpleiconsmap\symbol{"F040}} - \expandafter\def\csname simpleicon@loomicon\endcsname {\simpleiconsmap\symbol{"F041}} - \expandafter\def\csname simpleicon@loopicon\endcsname {\simpleiconsmap\symbol{"F042}} - \expandafter\def\csname simpleicon@loopbackicon\endcsname {\simpleiconsmap\symbol{"F043}} - \expandafter\def\csname simpleicon@lootcrateicon\endcsname {\simpleiconsmap\symbol{"F044}} - \expandafter\def\csname simpleicon@lospecicon\endcsname {\simpleiconsmap\symbol{"F045}} - \expandafter\def\csname simpleicon@lotpolishairlinesicon\endcsname {\simpleiconsmap\symbol{"F046}} - \expandafter\def\csname simpleicon@ltspiceicon\endcsname {\simpleiconsmap\symbol{"F047}} - \expandafter\def\csname simpleicon@luaicon\endcsname {\simpleiconsmap\symbol{"F048}} - \expandafter\def\csname simpleicon@lubuntuicon\endcsname {\simpleiconsmap\symbol{"F049}} - \expandafter\def\csname simpleicon@luciaicon\endcsname {\simpleiconsmap\symbol{"F04A}} - \expandafter\def\csname simpleicon@lucidicon\endcsname {\simpleiconsmap\symbol{"F04B}} - \expandafter\def\csname simpleicon@ludwigicon\endcsname {\simpleiconsmap\symbol{"F04C}} - \expandafter\def\csname simpleicon@lufthansaicon\endcsname {\simpleiconsmap\symbol{"F04D}} - \expandafter\def\csname simpleicon@lumenicon\endcsname {\simpleiconsmap\symbol{"F04E}} - \expandafter\def\csname simpleicon@lunacyicon\endcsname {\simpleiconsmap\symbol{"F04F}} - \expandafter\def\csname simpleicon@lutrisicon\endcsname {\simpleiconsmap\symbol{"F050}} - \expandafter\def\csname simpleicon@lydiaicon\endcsname {\simpleiconsmap\symbol{"F051}} - \expandafter\def\csname simpleicon@lyfticon\endcsname {\simpleiconsmap\symbol{"F052}} - \expandafter\def\csname simpleicon@maasicon\endcsname {\simpleiconsmap\symbol{"F053}} - \expandafter\def\csname simpleicon@macosicon\endcsname {\simpleiconsmap\symbol{"F054}} - \expandafter\def\csname simpleicon@macpawicon\endcsname {\simpleiconsmap\symbol{"F055}} - \expandafter\def\csname simpleicon@macysicon\endcsname {\simpleiconsmap\symbol{"F056}} - \expandafter\def\csname simpleicon@magasinsuicon\endcsname {\simpleiconsmap\symbol{"F057}} - \expandafter\def\csname simpleicon@magentoicon\endcsname {\simpleiconsmap\symbol{"F058}} - \expandafter\def\csname simpleicon@magicicon\endcsname {\simpleiconsmap\symbol{"F059}} - \expandafter\def\csname simpleicon@magiskicon\endcsname {\simpleiconsmap\symbol{"F05A}} - \expandafter\def\csname simpleicon@mahindraicon\endcsname {\simpleiconsmap\symbol{"F05B}} - \expandafter\def\csname simpleicon@mailchimpicon\endcsname {\simpleiconsmap\symbol{"F05C}} - \expandafter\def\csname simpleicon@maildotcomicon\endcsname {\simpleiconsmap\symbol{"F05D}} - \expandafter\def\csname simpleicon@maildotruicon\endcsname {\simpleiconsmap\symbol{"F05E}} - \expandafter\def\csname simpleicon@mailgunicon\endcsname {\simpleiconsmap\symbol{"F05F}} - \expandafter\def\csname simpleicon@mailtrapicon\endcsname {\simpleiconsmap\symbol{"F060}} - \expandafter\def\csname simpleicon@mainwpicon\endcsname {\simpleiconsmap\symbol{"F061}} - \expandafter\def\csname simpleicon@majorleaguehackingicon\endcsname {\simpleiconsmap\symbol{"F062}} - \expandafter\def\csname simpleicon@makeicon\endcsname {\simpleiconsmap\symbol{"F063}} - \expandafter\def\csname simpleicon@makerboticon\endcsname {\simpleiconsmap\symbol{"F064}} - \expandafter\def\csname simpleicon@malticon\endcsname {\simpleiconsmap\symbol{"F065}} - \expandafter\def\csname simpleicon@malwarebytesicon\endcsname {\simpleiconsmap\symbol{"F066}} - \expandafter\def\csname simpleicon@mambauiicon\endcsname {\simpleiconsmap\symbol{"F067}} - \expandafter\def\csname simpleicon@mampicon\endcsname {\simpleiconsmap\symbol{"F068}} - \expandafter\def\csname simpleicon@manicon\endcsname {\simpleiconsmap\symbol{"F069}} - \expandafter\def\csname simpleicon@manageiqicon\endcsname {\simpleiconsmap\symbol{"F06A}} - \expandafter\def\csname simpleicon@manjaroicon\endcsname {\simpleiconsmap\symbol{"F06B}} - \expandafter\def\csname simpleicon@mantineicon\endcsname {\simpleiconsmap\symbol{"F06C}} - \expandafter\def\csname simpleicon@mapboxicon\endcsname {\simpleiconsmap\symbol{"F06D}} - \expandafter\def\csname simpleicon@maplibreicon\endcsname {\simpleiconsmap\symbol{"F06E}} - \expandafter\def\csname simpleicon@mariadbicon\endcsname {\simpleiconsmap\symbol{"F06F}} - \expandafter\def\csname simpleicon@mariadbfoundationicon\endcsname {\simpleiconsmap\symbol{"F070}} - \expandafter\def\csname simpleicon@markdownicon\endcsname {\simpleiconsmap\symbol{"F071}} - \expandafter\def\csname simpleicon@marketoicon\endcsname {\simpleiconsmap\symbol{"F072}} - \expandafter\def\csname simpleicon@markoicon\endcsname {\simpleiconsmap\symbol{"F073}} - \expandafter\def\csname simpleicon@marriotticon\endcsname {\simpleiconsmap\symbol{"F074}} - \expandafter\def\csname simpleicon@marvelappicon\endcsname {\simpleiconsmap\symbol{"F075}} - \expandafter\def\csname simpleicon@maseratiicon\endcsname {\simpleiconsmap\symbol{"F076}} - \expandafter\def\csname simpleicon@mastercardicon\endcsname {\simpleiconsmap\symbol{"F077}} - \expandafter\def\csname simpleicon@mastercomfigicon\endcsname {\simpleiconsmap\symbol{"F078}} - \expandafter\def\csname simpleicon@mastodonicon\endcsname {\simpleiconsmap\symbol{"F079}} - \expandafter\def\csname simpleicon@materialdesignicon\endcsname {\simpleiconsmap\symbol{"F07A}} - \expandafter\def\csname simpleicon@materialdesigniconsicon\endcsname {\simpleiconsmap\symbol{"F07B}} - \expandafter\def\csname simpleicon@materialformkdocsicon\endcsname {\simpleiconsmap\symbol{"F07C}} - \expandafter\def\csname simpleicon@matillionicon\endcsname {\simpleiconsmap\symbol{"F07D}} - \expandafter\def\csname simpleicon@matomoicon\endcsname {\simpleiconsmap\symbol{"F07E}} - \expandafter\def\csname simpleicon@matrixicon\endcsname {\simpleiconsmap\symbol{"F07F}} - \expandafter\def\csname simpleicon@matterdotjsicon\endcsname {\simpleiconsmap\symbol{"F080}} - \expandafter\def\csname simpleicon@mattermosticon\endcsname {\simpleiconsmap\symbol{"F081}} - \expandafter\def\csname simpleicon@matterneticon\endcsname {\simpleiconsmap\symbol{"F082}} - \expandafter\def\csname simpleicon@mauticicon\endcsname {\simpleiconsmap\symbol{"F083}} - \expandafter\def\csname simpleicon@maxicon\endcsname {\simpleiconsmap\symbol{"F084}} - \expandafter\def\csname simpleicon@maxplanckgesellschafticon\endcsname {\simpleiconsmap\symbol{"F085}} - \expandafter\def\csname simpleicon@maytagicon\endcsname {\simpleiconsmap\symbol{"F086}} - \expandafter\def\csname simpleicon@mazdaicon\endcsname {\simpleiconsmap\symbol{"F087}} - \expandafter\def\csname simpleicon@mcafeeicon\endcsname {\simpleiconsmap\symbol{"F088}} - \expandafter\def\csname simpleicon@mcdonaldsicon\endcsname {\simpleiconsmap\symbol{"F089}} - \expandafter\def\csname simpleicon@mclarenicon\endcsname {\simpleiconsmap\symbol{"F08A}} - \expandafter\def\csname simpleicon@mdbookicon\endcsname {\simpleiconsmap\symbol{"F08B}} - \expandafter\def\csname simpleicon@mdnwebdocsicon\endcsname {\simpleiconsmap\symbol{"F08C}} - \expandafter\def\csname simpleicon@mdxicon\endcsname {\simpleiconsmap\symbol{"F08D}} - \expandafter\def\csname simpleicon@mediafireicon\endcsname {\simpleiconsmap\symbol{"F08E}} - \expandafter\def\csname simpleicon@mediamarkticon\endcsname {\simpleiconsmap\symbol{"F08F}} - \expandafter\def\csname simpleicon@mediatekicon\endcsname {\simpleiconsmap\symbol{"F090}} - \expandafter\def\csname simpleicon@medibangpainticon\endcsname {\simpleiconsmap\symbol{"F091}} - \expandafter\def\csname simpleicon@mediumicon\endcsname {\simpleiconsmap\symbol{"F092}} - \expandafter\def\csname simpleicon@medusaicon\endcsname {\simpleiconsmap\symbol{"F093}} - \expandafter\def\csname simpleicon@meetupicon\endcsname {\simpleiconsmap\symbol{"F094}} - \expandafter\def\csname simpleicon@megaicon\endcsname {\simpleiconsmap\symbol{"F095}} - \expandafter\def\csname simpleicon@meilisearchicon\endcsname {\simpleiconsmap\symbol{"F096}} - \expandafter\def\csname simpleicon@meituanicon\endcsname {\simpleiconsmap\symbol{"F097}} - \expandafter\def\csname simpleicon@meizuicon\endcsname {\simpleiconsmap\symbol{"F098}} - \expandafter\def\csname simpleicon@mendeleyicon\endcsname {\simpleiconsmap\symbol{"F099}} - \expandafter\def\csname simpleicon@mentorcruiseicon\endcsname {\simpleiconsmap\symbol{"F09A}} - \expandafter\def\csname simpleicon@mercadopagoicon\endcsname {\simpleiconsmap\symbol{"F09B}} - \expandafter\def\csname simpleicon@mercedesicon\endcsname {\simpleiconsmap\symbol{"F09C}} - \expandafter\def\csname simpleicon@merckicon\endcsname {\simpleiconsmap\symbol{"F09D}} - \expandafter\def\csname simpleicon@mercurialicon\endcsname {\simpleiconsmap\symbol{"F09E}} - \expandafter\def\csname simpleicon@mermaidicon\endcsname {\simpleiconsmap\symbol{"F09F}} - \expandafter\def\csname simpleicon@messengericon\endcsname {\simpleiconsmap\symbol{"F0A0}} - \expandafter\def\csname simpleicon@metaicon\endcsname {\simpleiconsmap\symbol{"F0A1}} - \expandafter\def\csname simpleicon@metabaseicon\endcsname {\simpleiconsmap\symbol{"F0A2}} - \expandafter\def\csname simpleicon@metacriticicon\endcsname {\simpleiconsmap\symbol{"F0A3}} - \expandafter\def\csname simpleicon@metafiltericon\endcsname {\simpleiconsmap\symbol{"F0A4}} - \expandafter\def\csname simpleicon@metasploiticon\endcsname {\simpleiconsmap\symbol{"F0A5}} - \expandafter\def\csname simpleicon@meteoricon\endcsname {\simpleiconsmap\symbol{"F0A6}} - \expandafter\def\csname simpleicon@metroicon\endcsname {\simpleiconsmap\symbol{"F0A7}} - \expandafter\def\csname simpleicon@metrodelaciudaddemexicoicon\endcsname {\simpleiconsmap\symbol{"F0A8}} - \expandafter\def\csname simpleicon@metrodemadridicon\endcsname {\simpleiconsmap\symbol{"F0A9}} - \expandafter\def\csname simpleicon@metrodeparisicon\endcsname {\simpleiconsmap\symbol{"F0AA}} - \expandafter\def\csname simpleicon@meweicon\endcsname {\simpleiconsmap\symbol{"F0AB}} - \expandafter\def\csname simpleicon@mgicon\endcsname {\simpleiconsmap\symbol{"F0AC}} - \expandafter\def\csname simpleicon@microbiticon\endcsname {\simpleiconsmap\symbol{"F0AD}} - \expandafter\def\csname simpleicon@microdotblogicon\endcsname {\simpleiconsmap\symbol{"F0AE}} - \expandafter\def\csname simpleicon@microeditoricon\endcsname {\simpleiconsmap\symbol{"F0AF}} - \expandafter\def\csname simpleicon@microgeneticsicon\endcsname {\simpleiconsmap\symbol{"F0B0}} - \expandafter\def\csname simpleicon@micropythonicon\endcsname {\simpleiconsmap\symbol{"F0B1}} - \expandafter\def\csname simpleicon@microstationicon\endcsname {\simpleiconsmap\symbol{"F0B2}} - \expandafter\def\csname simpleicon@microstrategyicon\endcsname {\simpleiconsmap\symbol{"F0B3}} - \expandafter\def\csname simpleicon@midiicon\endcsname {\simpleiconsmap\symbol{"F0B4}} - \expandafter\def\csname simpleicon@migaduicon\endcsname {\simpleiconsmap\symbol{"F0B5}} - \expandafter\def\csname simpleicon@mikrotikicon\endcsname {\simpleiconsmap\symbol{"F0B6}} - \expandafter\def\csname simpleicon@milanoteicon\endcsname {\simpleiconsmap\symbol{"F0B7}} - \expandafter\def\csname simpleicon@milvusicon\endcsname {\simpleiconsmap\symbol{"F0B8}} - \expandafter\def\csname simpleicon@mindsicon\endcsname {\simpleiconsmap\symbol{"F0B9}} - \expandafter\def\csname simpleicon@minetesticon\endcsname {\simpleiconsmap\symbol{"F0BA}} - \expandafter\def\csname simpleicon@miniicon\endcsname {\simpleiconsmap\symbol{"F0BB}} - \expandafter\def\csname simpleicon@minioicon\endcsname {\simpleiconsmap\symbol{"F0BC}} - \expandafter\def\csname simpleicon@mintlifyicon\endcsname {\simpleiconsmap\symbol{"F0BD}} - \expandafter\def\csname simpleicon@minutemailericon\endcsname {\simpleiconsmap\symbol{"F0BE}} - \expandafter\def\csname simpleicon@mirahezeicon\endcsname {\simpleiconsmap\symbol{"F0BF}} - \expandafter\def\csname simpleicon@miroicon\endcsname {\simpleiconsmap\symbol{"F0C0}} - \expandafter\def\csname simpleicon@misskeyicon\endcsname {\simpleiconsmap\symbol{"F0C1}} - \expandafter\def\csname simpleicon@mitsubishiicon\endcsname {\simpleiconsmap\symbol{"F0C2}} - \expandafter\def\csname simpleicon@mixicon\endcsname {\simpleiconsmap\symbol{"F0C3}} - \expandafter\def\csname simpleicon@mixcloudicon\endcsname {\simpleiconsmap\symbol{"F0C4}} - \expandafter\def\csname simpleicon@mixpanelicon\endcsname {\simpleiconsmap\symbol{"F0C5}} - \expandafter\def\csname simpleicon@mlbicon\endcsname {\simpleiconsmap\symbol{"F0C6}} - \expandafter\def\csname simpleicon@mlflowicon\endcsname {\simpleiconsmap\symbol{"F0C7}} - \expandafter\def\csname simpleicon@mobxicon\endcsname {\simpleiconsmap\symbol{"F0C8}} - \expandafter\def\csname simpleicon@mobxstatetreeicon\endcsname {\simpleiconsmap\symbol{"F0C9}} - \expandafter\def\csname simpleicon@mochaicon\endcsname {\simpleiconsmap\symbol{"F0CA}} - \expandafter\def\csname simpleicon@mockserviceworkericon\endcsname {\simpleiconsmap\symbol{"F0CB}} - \expandafter\def\csname simpleicon@modalicon\endcsname {\simpleiconsmap\symbol{"F0CC}} - \expandafter\def\csname simpleicon@modinicon\endcsname {\simpleiconsmap\symbol{"F0CD}} - \expandafter\def\csname simpleicon@modrinthicon\endcsname {\simpleiconsmap\symbol{"F0CE}} - \expandafter\def\csname simpleicon@modxicon\endcsname {\simpleiconsmap\symbol{"F0CF}} - \expandafter\def\csname simpleicon@moleculericon\endcsname {\simpleiconsmap\symbol{"F0D0}} - \expandafter\def\csname simpleicon@momenteoicon\endcsname {\simpleiconsmap\symbol{"F0D1}} - \expandafter\def\csname simpleicon@moneroicon\endcsname {\simpleiconsmap\symbol{"F0D2}} - \expandafter\def\csname simpleicon@moneygramicon\endcsname {\simpleiconsmap\symbol{"F0D3}} - \expandafter\def\csname simpleicon@mongodbicon\endcsname {\simpleiconsmap\symbol{"F0D4}} - \expandafter\def\csname simpleicon@mongooseicon\endcsname {\simpleiconsmap\symbol{"F0D5}} - \expandafter\def\csname simpleicon@mongoosedotwsicon\endcsname {\simpleiconsmap\symbol{"F0D6}} - \expandafter\def\csname simpleicon@monicaicon\endcsname {\simpleiconsmap\symbol{"F0D7}} - \expandafter\def\csname simpleicon@monkeytieicon\endcsname {\simpleiconsmap\symbol{"F0D8}} - \expandafter\def\csname simpleicon@monkeytypeicon\endcsname {\simpleiconsmap\symbol{"F0D9}} - \expandafter\def\csname simpleicon@monogameicon\endcsname {\simpleiconsmap\symbol{"F0DA}} - \expandafter\def\csname simpleicon@monoprixicon\endcsname {\simpleiconsmap\symbol{"F0DB}} - \expandafter\def\csname simpleicon@monstericon\endcsname {\simpleiconsmap\symbol{"F0DC}} - \expandafter\def\csname simpleicon@monzoicon\endcsname {\simpleiconsmap\symbol{"F0DD}} - \expandafter\def\csname simpleicon@mooicon\endcsname {\simpleiconsmap\symbol{"F0DE}} - \expandafter\def\csname simpleicon@moodleicon\endcsname {\simpleiconsmap\symbol{"F0DF}} - \expandafter\def\csname simpleicon@moonrepoicon\endcsname {\simpleiconsmap\symbol{"F0E0}} - \expandafter\def\csname simpleicon@moqicon\endcsname {\simpleiconsmap\symbol{"F0E1}} - \expandafter\def\csname simpleicon@moqupsicon\endcsname {\simpleiconsmap\symbol{"F0E2}} - \expandafter\def\csname simpleicon@morrisonsicon\endcsname {\simpleiconsmap\symbol{"F0E3}} - \expandafter\def\csname simpleicon@moscowmetroicon\endcsname {\simpleiconsmap\symbol{"F0E4}} - \expandafter\def\csname simpleicon@motorolaicon\endcsname {\simpleiconsmap\symbol{"F0E5}} - \expandafter\def\csname simpleicon@mozillaicon\endcsname {\simpleiconsmap\symbol{"F0E6}} - \expandafter\def\csname simpleicon@mpvicon\endcsname {\simpleiconsmap\symbol{"F0E7}} - \expandafter\def\csname simpleicon@mqtticon\endcsname {\simpleiconsmap\symbol{"F0E8}} - \expandafter\def\csname simpleicon@msiicon\endcsname {\simpleiconsmap\symbol{"F0E9}} - \expandafter\def\csname simpleicon@msibusinessicon\endcsname {\simpleiconsmap\symbol{"F0EA}} - \expandafter\def\csname simpleicon@mtaicon\endcsname {\simpleiconsmap\symbol{"F0EB}} - \expandafter\def\csname simpleicon@mtricon\endcsname {\simpleiconsmap\symbol{"F0EC}} - \expandafter\def\csname simpleicon@mubiicon\endcsname {\simpleiconsmap\symbol{"F0ED}} - \expandafter\def\csname simpleicon@muiicon\endcsname {\simpleiconsmap\symbol{"F0EE}} - \expandafter\def\csname simpleicon@mulesofticon\endcsname {\simpleiconsmap\symbol{"F0EF}} - \expandafter\def\csname simpleicon@mullericon\endcsname {\simpleiconsmap\symbol{"F0F0}} - \expandafter\def\csname simpleicon@multisimicon\endcsname {\simpleiconsmap\symbol{"F0F1}} - \expandafter\def\csname simpleicon@mumbleicon\endcsname {\simpleiconsmap\symbol{"F0F2}} - \expandafter\def\csname simpleicon@muoicon\endcsname {\simpleiconsmap\symbol{"F0F3}} - \expandafter\def\csname simpleicon@muralicon\endcsname {\simpleiconsmap\symbol{"F0F4}} - \expandafter\def\csname simpleicon@musescoreicon\endcsname {\simpleiconsmap\symbol{"F0F5}} - \expandafter\def\csname simpleicon@musicbrainzicon\endcsname {\simpleiconsmap\symbol{"F0F6}} - \expandafter\def\csname simpleicon@mxlinuxicon\endcsname {\simpleiconsmap\symbol{"F0F7}} - \expandafter\def\csname simpleicon@myanimelisticon\endcsname {\simpleiconsmap\symbol{"F0F8}} - \expandafter\def\csname simpleicon@mygeticon\endcsname {\simpleiconsmap\symbol{"F0F9}} - \expandafter\def\csname simpleicon@myobicon\endcsname {\simpleiconsmap\symbol{"F0FA}} - \expandafter\def\csname simpleicon@myspaceicon\endcsname {\simpleiconsmap\symbol{"F0FB}} - \expandafter\def\csname simpleicon@mysqlicon\endcsname {\simpleiconsmap\symbol{"F0FC}} - \expandafter\def\csname simpleicon@n26icon\endcsname {\simpleiconsmap\symbol{"F0FD}} - \expandafter\def\csname simpleicon@n8nicon\endcsname {\simpleiconsmap\symbol{"F0FE}} - \expandafter\def\csname simpleicon@namebaseicon\endcsname {\simpleiconsmap\symbol{"F0FF}} - \expandafter\def\csname simpleicon@namecheapicon\endcsname {\simpleiconsmap\symbol{"F100}} - \expandafter\def\csname simpleicon@namemcicon\endcsname {\simpleiconsmap\symbol{"F101}} - \expandafter\def\csname simpleicon@namesiloicon\endcsname {\simpleiconsmap\symbol{"F102}} - \expandafter\def\csname simpleicon@namuwikiicon\endcsname {\simpleiconsmap\symbol{"F103}} - \expandafter\def\csname simpleicon@nanoicon\endcsname {\simpleiconsmap\symbol{"F104}} - \expandafter\def\csname simpleicon@nasaicon\endcsname {\simpleiconsmap\symbol{"F105}} - \expandafter\def\csname simpleicon@nationalgridicon\endcsname {\simpleiconsmap\symbol{"F106}} - \expandafter\def\csname simpleicon@nationalrailicon\endcsname {\simpleiconsmap\symbol{"F107}} - \expandafter\def\csname simpleicon@nativescripticon\endcsname {\simpleiconsmap\symbol{"F108}} - \expandafter\def\csname simpleicon@natsdotioicon\endcsname {\simpleiconsmap\symbol{"F109}} - \expandafter\def\csname simpleicon@navericon\endcsname {\simpleiconsmap\symbol{"F10A}} - \expandafter\def\csname simpleicon@nbaicon\endcsname {\simpleiconsmap\symbol{"F10B}} - \expandafter\def\csname simpleicon@nbbicon\endcsname {\simpleiconsmap\symbol{"F10C}} - \expandafter\def\csname simpleicon@nbcicon\endcsname {\simpleiconsmap\symbol{"F10D}} - \expandafter\def\csname simpleicon@ndricon\endcsname {\simpleiconsmap\symbol{"F10E}} - \expandafter\def\csname simpleicon@nearicon\endcsname {\simpleiconsmap\symbol{"F10F}} - \expandafter\def\csname simpleicon@necicon\endcsname {\simpleiconsmap\symbol{"F110}} - \expandafter\def\csname simpleicon@neo4jicon\endcsname {\simpleiconsmap\symbol{"F111}} - \expandafter\def\csname simpleicon@neovimicon\endcsname {\simpleiconsmap\symbol{"F112}} - \expandafter\def\csname simpleicon@neptuneicon\endcsname {\simpleiconsmap\symbol{"F113}} - \expandafter\def\csname simpleicon@nestjsicon\endcsname {\simpleiconsmap\symbol{"F114}} - \expandafter\def\csname simpleicon@netappicon\endcsname {\simpleiconsmap\symbol{"F115}} - \expandafter\def\csname simpleicon@netbsdicon\endcsname {\simpleiconsmap\symbol{"F116}} - \expandafter\def\csname simpleicon@netcupicon\endcsname {\simpleiconsmap\symbol{"F117}} - \expandafter\def\csname simpleicon@netdataicon\endcsname {\simpleiconsmap\symbol{"F118}} - \expandafter\def\csname simpleicon@neteasecloudmusicicon\endcsname {\simpleiconsmap\symbol{"F119}} - \expandafter\def\csname simpleicon@netflixicon\endcsname {\simpleiconsmap\symbol{"F11A}} - \expandafter\def\csname simpleicon@netgearicon\endcsname {\simpleiconsmap\symbol{"F11B}} - \expandafter\def\csname simpleicon@netlifyicon\endcsname {\simpleiconsmap\symbol{"F11C}} - \expandafter\def\csname simpleicon@netteicon\endcsname {\simpleiconsmap\symbol{"F11D}} - \expandafter\def\csname simpleicon@nettoicon\endcsname {\simpleiconsmap\symbol{"F11E}} - \expandafter\def\csname simpleicon@neutralinojsicon\endcsname {\simpleiconsmap\symbol{"F11F}} - \expandafter\def\csname simpleicon@newbalanceicon\endcsname {\simpleiconsmap\symbol{"F120}} - \expandafter\def\csname simpleicon@neweggicon\endcsname {\simpleiconsmap\symbol{"F121}} - \expandafter\def\csname simpleicon@newjapanprowrestlingicon\endcsname {\simpleiconsmap\symbol{"F122}} - \expandafter\def\csname simpleicon@newrelicicon\endcsname {\simpleiconsmap\symbol{"F123}} - \expandafter\def\csname simpleicon@newyorktimesicon\endcsname {\simpleiconsmap\symbol{"F124}} - \expandafter\def\csname simpleicon@nextbilliondotaiicon\endcsname {\simpleiconsmap\symbol{"F125}} - \expandafter\def\csname simpleicon@nextcloudicon\endcsname {\simpleiconsmap\symbol{"F126}} - \expandafter\def\csname simpleicon@nextdnsicon\endcsname {\simpleiconsmap\symbol{"F127}} - \expandafter\def\csname simpleicon@nextdooricon\endcsname {\simpleiconsmap\symbol{"F128}} - \expandafter\def\csname simpleicon@nextdotjsicon\endcsname {\simpleiconsmap\symbol{"F129}} - \expandafter\def\csname simpleicon@nextraicon\endcsname {\simpleiconsmap\symbol{"F12A}} - \expandafter\def\csname simpleicon@nextuiicon\endcsname {\simpleiconsmap\symbol{"F12B}} - \expandafter\def\csname simpleicon@nexusmodsicon\endcsname {\simpleiconsmap\symbol{"F12C}} - \expandafter\def\csname simpleicon@nfcicon\endcsname {\simpleiconsmap\symbol{"F12D}} - \expandafter\def\csname simpleicon@nginxicon\endcsname {\simpleiconsmap\symbol{"F12E}} - \expandafter\def\csname simpleicon@nginxproxymanagericon\endcsname {\simpleiconsmap\symbol{"F12F}} - \expandafter\def\csname simpleicon@ngrokicon\endcsname {\simpleiconsmap\symbol{"F130}} - \expandafter\def\csname simpleicon@ngrxicon\endcsname {\simpleiconsmap\symbol{"F131}} - \expandafter\def\csname simpleicon@nhlicon\endcsname {\simpleiconsmap\symbol{"F132}} - \expandafter\def\csname simpleicon@nicehashicon\endcsname {\simpleiconsmap\symbol{"F133}} - \expandafter\def\csname simpleicon@niconicoicon\endcsname {\simpleiconsmap\symbol{"F134}} - \expandafter\def\csname simpleicon@nikeicon\endcsname {\simpleiconsmap\symbol{"F135}} - \expandafter\def\csname simpleicon@nikonicon\endcsname {\simpleiconsmap\symbol{"F136}} - \expandafter\def\csname simpleicon@nimicon\endcsname {\simpleiconsmap\symbol{"F137}} - \expandafter\def\csname simpleicon@nintendoicon\endcsname {\simpleiconsmap\symbol{"F138}} - \expandafter\def\csname simpleicon@nintendo3dsicon\endcsname {\simpleiconsmap\symbol{"F139}} - \expandafter\def\csname simpleicon@nintendogamecubeicon\endcsname {\simpleiconsmap\symbol{"F13A}} - \expandafter\def\csname simpleicon@nintendoswitchicon\endcsname {\simpleiconsmap\symbol{"F13B}} - \expandafter\def\csname simpleicon@nissanicon\endcsname {\simpleiconsmap\symbol{"F13C}} - \expandafter\def\csname simpleicon@nixosicon\endcsname {\simpleiconsmap\symbol{"F13D}} - \expandafter\def\csname simpleicon@nodedotjsicon\endcsname {\simpleiconsmap\symbol{"F13E}} - \expandafter\def\csname simpleicon@nodemonicon\endcsname {\simpleiconsmap\symbol{"F13F}} - \expandafter\def\csname simpleicon@noderedicon\endcsname {\simpleiconsmap\symbol{"F140}} - \expandafter\def\csname simpleicon@nokiaicon\endcsname {\simpleiconsmap\symbol{"F141}} - \expandafter\def\csname simpleicon@nomadicon\endcsname {\simpleiconsmap\symbol{"F142}} - \expandafter\def\csname simpleicon@norcoicon\endcsname {\simpleiconsmap\symbol{"F143}} - \expandafter\def\csname simpleicon@nordicsemiconductoricon\endcsname {\simpleiconsmap\symbol{"F144}} - \expandafter\def\csname simpleicon@nordvpnicon\endcsname {\simpleiconsmap\symbol{"F145}} - \expandafter\def\csname simpleicon@normalizedotcssicon\endcsname {\simpleiconsmap\symbol{"F146}} - \expandafter\def\csname simpleicon@nortonicon\endcsname {\simpleiconsmap\symbol{"F147}} - \expandafter\def\csname simpleicon@norwegianicon\endcsname {\simpleiconsmap\symbol{"F148}} - \expandafter\def\csname simpleicon@notepadplusplusicon\endcsname {\simpleiconsmap\symbol{"F149}} - \expandafter\def\csname simpleicon@notionicon\endcsname {\simpleiconsmap\symbol{"F14A}} - \expandafter\def\csname simpleicon@notisticon\endcsname {\simpleiconsmap\symbol{"F14B}} - \expandafter\def\csname simpleicon@nounprojecticon\endcsname {\simpleiconsmap\symbol{"F14C}} - \expandafter\def\csname simpleicon@novuicon\endcsname {\simpleiconsmap\symbol{"F14D}} - \expandafter\def\csname simpleicon@nowicon\endcsname {\simpleiconsmap\symbol{"F14E}} - \expandafter\def\csname simpleicon@npmicon\endcsname {\simpleiconsmap\symbol{"F14F}} - \expandafter\def\csname simpleicon@nrwlicon\endcsname {\simpleiconsmap\symbol{"F150}} - \expandafter\def\csname simpleicon@nsisicon\endcsname {\simpleiconsmap\symbol{"F151}} - \expandafter\def\csname simpleicon@ntfyicon\endcsname {\simpleiconsmap\symbol{"F152}} - \expandafter\def\csname simpleicon@nubankicon\endcsname {\simpleiconsmap\symbol{"F153}} - \expandafter\def\csname simpleicon@nucleoicon\endcsname {\simpleiconsmap\symbol{"F154}} - \expandafter\def\csname simpleicon@nugeticon\endcsname {\simpleiconsmap\symbol{"F155}} - \expandafter\def\csname simpleicon@nukeicon\endcsname {\simpleiconsmap\symbol{"F156}} - \expandafter\def\csname simpleicon@numbaicon\endcsname {\simpleiconsmap\symbol{"F157}} - \expandafter\def\csname simpleicon@numpyicon\endcsname {\simpleiconsmap\symbol{"F158}} - \expandafter\def\csname simpleicon@nunjucksicon\endcsname {\simpleiconsmap\symbol{"F159}} - \expandafter\def\csname simpleicon@nushellicon\endcsname {\simpleiconsmap\symbol{"F15A}} - \expandafter\def\csname simpleicon@nutanixicon\endcsname {\simpleiconsmap\symbol{"F15B}} - \expandafter\def\csname simpleicon@nuxtdotjsicon\endcsname {\simpleiconsmap\symbol{"F15C}} - \expandafter\def\csname simpleicon@nvidiaicon\endcsname {\simpleiconsmap\symbol{"F15D}} - \expandafter\def\csname simpleicon@nvmicon\endcsname {\simpleiconsmap\symbol{"F15E}} - \expandafter\def\csname simpleicon@nxicon\endcsname {\simpleiconsmap\symbol{"F15F}} - \expandafter\def\csname simpleicon@nxpicon\endcsname {\simpleiconsmap\symbol{"F160}} - \expandafter\def\csname simpleicon@nzxticon\endcsname {\simpleiconsmap\symbol{"F161}} - \expandafter\def\csname simpleicon@observableicon\endcsname {\simpleiconsmap\symbol{"F162}} - \expandafter\def\csname simpleicon@obsidianicon\endcsname {\simpleiconsmap\symbol{"F163}} - \expandafter\def\csname simpleicon@obsstudioicon\endcsname {\simpleiconsmap\symbol{"F164}} - \expandafter\def\csname simpleicon@ocamlicon\endcsname {\simpleiconsmap\symbol{"F165}} - \expandafter\def\csname simpleicon@oclificon\endcsname {\simpleiconsmap\symbol{"F166}} - \expandafter\def\csname simpleicon@octanerendericon\endcsname {\simpleiconsmap\symbol{"F167}} - \expandafter\def\csname simpleicon@octaveicon\endcsname {\simpleiconsmap\symbol{"F168}} - \expandafter\def\csname simpleicon@octobercmsicon\endcsname {\simpleiconsmap\symbol{"F169}} - \expandafter\def\csname simpleicon@octoprinticon\endcsname {\simpleiconsmap\symbol{"F16A}} - \expandafter\def\csname simpleicon@octopusdeployicon\endcsname {\simpleiconsmap\symbol{"F16B}} - \expandafter\def\csname simpleicon@oculusicon\endcsname {\simpleiconsmap\symbol{"F16C}} - \expandafter\def\csname simpleicon@odnoklassnikiicon\endcsname {\simpleiconsmap\symbol{"F16D}} - \expandafter\def\csname simpleicon@odooicon\endcsname {\simpleiconsmap\symbol{"F16E}} - \expandafter\def\csname simpleicon@odyseeicon\endcsname {\simpleiconsmap\symbol{"F16F}} - \expandafter\def\csname simpleicon@ohdearicon\endcsname {\simpleiconsmap\symbol{"F170}} - \expandafter\def\csname simpleicon@okcupidicon\endcsname {\simpleiconsmap\symbol{"F171}} - \expandafter\def\csname simpleicon@oktaicon\endcsname {\simpleiconsmap\symbol{"F172}} - \expandafter\def\csname simpleicon@oneplusicon\endcsname {\simpleiconsmap\symbol{"F173}} - \expandafter\def\csname simpleicon@onlyfansicon\endcsname {\simpleiconsmap\symbol{"F174}} - \expandafter\def\csname simpleicon@onlyofficeicon\endcsname {\simpleiconsmap\symbol{"F175}} - \expandafter\def\csname simpleicon@onnxicon\endcsname {\simpleiconsmap\symbol{"F176}} - \expandafter\def\csname simpleicon@onstaricon\endcsname {\simpleiconsmap\symbol{"F177}} - \expandafter\def\csname simpleicon@opelicon\endcsname {\simpleiconsmap\symbol{"F178}} - \expandafter\def\csname simpleicon@openaccessicon\endcsname {\simpleiconsmap\symbol{"F179}} - \expandafter\def\csname simpleicon@openaiicon\endcsname {\simpleiconsmap\symbol{"F17A}} - \expandafter\def\csname simpleicon@openaigymicon\endcsname {\simpleiconsmap\symbol{"F17B}} - \expandafter\def\csname simpleicon@openapiinitiativeicon\endcsname {\simpleiconsmap\symbol{"F17C}} - \expandafter\def\csname simpleicon@openbadgesicon\endcsname {\simpleiconsmap\symbol{"F17D}} - \expandafter\def\csname simpleicon@openbsdicon\endcsname {\simpleiconsmap\symbol{"F17E}} - \expandafter\def\csname simpleicon@openbugbountyicon\endcsname {\simpleiconsmap\symbol{"F17F}} - \expandafter\def\csname simpleicon@opencollectiveicon\endcsname {\simpleiconsmap\symbol{"F180}} - \expandafter\def\csname simpleicon@opencontainersinitiativeicon\endcsname {\simpleiconsmap\symbol{"F181}} - \expandafter\def\csname simpleicon@opencvicon\endcsname {\simpleiconsmap\symbol{"F182}} - \expandafter\def\csname simpleicon@openfaasicon\endcsname {\simpleiconsmap\symbol{"F183}} - \expandafter\def\csname simpleicon@openglicon\endcsname {\simpleiconsmap\symbol{"F184}} - \expandafter\def\csname simpleicon@openhabicon\endcsname {\simpleiconsmap\symbol{"F185}} - \expandafter\def\csname simpleicon@openidicon\endcsname {\simpleiconsmap\symbol{"F186}} - \expandafter\def\csname simpleicon@openjdkicon\endcsname {\simpleiconsmap\symbol{"F187}} - \expandafter\def\csname simpleicon@openjsfoundationicon\endcsname {\simpleiconsmap\symbol{"F188}} - \expandafter\def\csname simpleicon@openlayersicon\endcsname {\simpleiconsmap\symbol{"F189}} - \expandafter\def\csname simpleicon@openmediavaulticon\endcsname {\simpleiconsmap\symbol{"F18A}} - \expandafter\def\csname simpleicon@openminedicon\endcsname {\simpleiconsmap\symbol{"F18B}} - \expandafter\def\csname simpleicon@opennebulaicon\endcsname {\simpleiconsmap\symbol{"F18C}} - \expandafter\def\csname simpleicon@openprojecticon\endcsname {\simpleiconsmap\symbol{"F18D}} - \expandafter\def\csname simpleicon@openscadicon\endcsname {\simpleiconsmap\symbol{"F18E}} - \expandafter\def\csname simpleicon@openseaicon\endcsname {\simpleiconsmap\symbol{"F18F}} - \expandafter\def\csname simpleicon@opensearchicon\endcsname {\simpleiconsmap\symbol{"F190}} - \expandafter\def\csname simpleicon@opensourcehardwareicon\endcsname {\simpleiconsmap\symbol{"F191}} - \expandafter\def\csname simpleicon@opensourceinitiativeicon\endcsname {\simpleiconsmap\symbol{"F192}} - \expandafter\def\csname simpleicon@opensslicon\endcsname {\simpleiconsmap\symbol{"F193}} - \expandafter\def\csname simpleicon@openstackicon\endcsname {\simpleiconsmap\symbol{"F194}} - \expandafter\def\csname simpleicon@openstreetmapicon\endcsname {\simpleiconsmap\symbol{"F195}} - \expandafter\def\csname simpleicon@opensuseicon\endcsname {\simpleiconsmap\symbol{"F196}} - \expandafter\def\csname simpleicon@opentelemetryicon\endcsname {\simpleiconsmap\symbol{"F197}} - \expandafter\def\csname simpleicon@opentexticon\endcsname {\simpleiconsmap\symbol{"F198}} - \expandafter\def\csname simpleicon@opentofuicon\endcsname {\simpleiconsmap\symbol{"F199}} - \expandafter\def\csname simpleicon@openverseicon\endcsname {\simpleiconsmap\symbol{"F19A}} - \expandafter\def\csname simpleicon@openvpnicon\endcsname {\simpleiconsmap\symbol{"F19B}} - \expandafter\def\csname simpleicon@openwrticon\endcsname {\simpleiconsmap\symbol{"F19C}} - \expandafter\def\csname simpleicon@openzeppelinicon\endcsname {\simpleiconsmap\symbol{"F19D}} - \expandafter\def\csname simpleicon@openzfsicon\endcsname {\simpleiconsmap\symbol{"F19E}} - \expandafter\def\csname simpleicon@operaicon\endcsname {\simpleiconsmap\symbol{"F19F}} - \expandafter\def\csname simpleicon@operagxicon\endcsname {\simpleiconsmap\symbol{"F1A0}} - \expandafter\def\csname simpleicon@opnsenseicon\endcsname {\simpleiconsmap\symbol{"F1A1}} - \expandafter\def\csname simpleicon@oppoicon\endcsname {\simpleiconsmap\symbol{"F1A2}} - \expandafter\def\csname simpleicon@opsgenieicon\endcsname {\simpleiconsmap\symbol{"F1A3}} - \expandafter\def\csname simpleicon@opslevelicon\endcsname {\simpleiconsmap\symbol{"F1A4}} - \expandafter\def\csname simpleicon@optimismicon\endcsname {\simpleiconsmap\symbol{"F1A5}} - \expandafter\def\csname simpleicon@oracleicon\endcsname {\simpleiconsmap\symbol{"F1A6}} - \expandafter\def\csname simpleicon@orangeicon\endcsname {\simpleiconsmap\symbol{"F1A7}} - \expandafter\def\csname simpleicon@orcidicon\endcsname {\simpleiconsmap\symbol{"F1A8}} - \expandafter\def\csname simpleicon@oreillyicon\endcsname {\simpleiconsmap\symbol{"F1A9}} - \expandafter\def\csname simpleicon@orgicon\endcsname {\simpleiconsmap\symbol{"F1AA}} - \expandafter\def\csname simpleicon@organicmapsicon\endcsname {\simpleiconsmap\symbol{"F1AB}} - \expandafter\def\csname simpleicon@originicon\endcsname {\simpleiconsmap\symbol{"F1AC}} - \expandafter\def\csname simpleicon@osanoicon\endcsname {\simpleiconsmap\symbol{"F1AD}} - \expandafter\def\csname simpleicon@osficon\endcsname {\simpleiconsmap\symbol{"F1AE}} - \expandafter\def\csname simpleicon@osgeoicon\endcsname {\simpleiconsmap\symbol{"F1AF}} - \expandafter\def\csname simpleicon@oshkoshicon\endcsname {\simpleiconsmap\symbol{"F1B0}} - \expandafter\def\csname simpleicon@osmcicon\endcsname {\simpleiconsmap\symbol{"F1B1}} - \expandafter\def\csname simpleicon@osuicon\endcsname {\simpleiconsmap\symbol{"F1B2}} - \expandafter\def\csname simpleicon@ottoicon\endcsname {\simpleiconsmap\symbol{"F1B3}} - \expandafter\def\csname simpleicon@outlineicon\endcsname {\simpleiconsmap\symbol{"F1B4}} - \expandafter\def\csname simpleicon@overcasticon\endcsname {\simpleiconsmap\symbol{"F1B5}} - \expandafter\def\csname simpleicon@overleaficon\endcsname {\simpleiconsmap\symbol{"F1B6}} - \expandafter\def\csname simpleicon@ovhicon\endcsname {\simpleiconsmap\symbol{"F1B7}} - \expandafter\def\csname simpleicon@owaspicon\endcsname {\simpleiconsmap\symbol{"F1B8}} - \expandafter\def\csname simpleicon@owncloudicon\endcsname {\simpleiconsmap\symbol{"F1B9}} - \expandafter\def\csname simpleicon@oxygenicon\endcsname {\simpleiconsmap\symbol{"F1BA}} - \expandafter\def\csname simpleicon@oyoicon\endcsname {\simpleiconsmap\symbol{"F1BB}} - \expandafter\def\csname simpleicon@p5dotjsicon\endcsname {\simpleiconsmap\symbol{"F1BC}} - \expandafter\def\csname simpleicon@packagisticon\endcsname {\simpleiconsmap\symbol{"F1BD}} - \expandafter\def\csname simpleicon@packericon\endcsname {\simpleiconsmap\symbol{"F1BE}} - \expandafter\def\csname simpleicon@packticon\endcsname {\simpleiconsmap\symbol{"F1BF}} - \expandafter\def\csname simpleicon@paddleicon\endcsname {\simpleiconsmap\symbol{"F1C0}} - \expandafter\def\csname simpleicon@paddlepaddleicon\endcsname {\simpleiconsmap\symbol{"F1C1}} - \expandafter\def\csname simpleicon@paddypowericon\endcsname {\simpleiconsmap\symbol{"F1C2}} - \expandafter\def\csname simpleicon@pagekiticon\endcsname {\simpleiconsmap\symbol{"F1C3}} - \expandafter\def\csname simpleicon@pagerdutyicon\endcsname {\simpleiconsmap\symbol{"F1C4}} - \expandafter\def\csname simpleicon@pagespeedinsightsicon\endcsname {\simpleiconsmap\symbol{"F1C5}} - \expandafter\def\csname simpleicon@pagseguroicon\endcsname {\simpleiconsmap\symbol{"F1C6}} - \expandafter\def\csname simpleicon@palantiricon\endcsname {\simpleiconsmap\symbol{"F1C7}} - \expandafter\def\csname simpleicon@paloaltonetworksicon\endcsname {\simpleiconsmap\symbol{"F1C8}} - \expandafter\def\csname simpleicon@paloaltosoftwareicon\endcsname {\simpleiconsmap\symbol{"F1C9}} - \expandafter\def\csname simpleicon@panasonicicon\endcsname {\simpleiconsmap\symbol{"F1CA}} - \expandafter\def\csname simpleicon@pandasicon\endcsname {\simpleiconsmap\symbol{"F1CB}} - \expandafter\def\csname simpleicon@pandoraicon\endcsname {\simpleiconsmap\symbol{"F1CC}} - \expandafter\def\csname simpleicon@pantheonicon\endcsname {\simpleiconsmap\symbol{"F1CD}} - \expandafter\def\csname simpleicon@paperlessngxicon\endcsname {\simpleiconsmap\symbol{"F1CE}} - \expandafter\def\csname simpleicon@paperspaceicon\endcsname {\simpleiconsmap\symbol{"F1CF}} - \expandafter\def\csname simpleicon@paperswithcodeicon\endcsname {\simpleiconsmap\symbol{"F1D0}} - \expandafter\def\csname simpleicon@paramountplusicon\endcsname {\simpleiconsmap\symbol{"F1D1}} - \expandafter\def\csname simpleicon@paritysubstrateicon\endcsname {\simpleiconsmap\symbol{"F1D2}} - \expandafter\def\csname simpleicon@parrotsecurityicon\endcsname {\simpleiconsmap\symbol{"F1D3}} - \expandafter\def\csname simpleicon@parsedotlyicon\endcsname {\simpleiconsmap\symbol{"F1D4}} - \expandafter\def\csname simpleicon@passporticon\endcsname {\simpleiconsmap\symbol{"F1D5}} - \expandafter\def\csname simpleicon@pastebinicon\endcsname {\simpleiconsmap\symbol{"F1D6}} - \expandafter\def\csname simpleicon@patreonicon\endcsname {\simpleiconsmap\symbol{"F1D7}} - \expandafter\def\csname simpleicon@paychexicon\endcsname {\simpleiconsmap\symbol{"F1D8}} - \expandafter\def\csname simpleicon@payhipicon\endcsname {\simpleiconsmap\symbol{"F1D9}} - \expandafter\def\csname simpleicon@payloadcmsicon\endcsname {\simpleiconsmap\symbol{"F1DA}} - \expandafter\def\csname simpleicon@payoneericon\endcsname {\simpleiconsmap\symbol{"F1DB}} - \expandafter\def\csname simpleicon@paypalicon\endcsname {\simpleiconsmap\symbol{"F1DC}} - \expandafter\def\csname simpleicon@paytmicon\endcsname {\simpleiconsmap\symbol{"F1DD}} - \expandafter\def\csname simpleicon@pcgamingwikiicon\endcsname {\simpleiconsmap\symbol{"F1DE}} - \expandafter\def\csname simpleicon@pdmicon\endcsname {\simpleiconsmap\symbol{"F1DF}} - \expandafter\def\csname simpleicon@pdqicon\endcsname {\simpleiconsmap\symbol{"F1E0}} - \expandafter\def\csname simpleicon@peakdesignicon\endcsname {\simpleiconsmap\symbol{"F1E1}} - \expandafter\def\csname simpleicon@pearsonicon\endcsname {\simpleiconsmap\symbol{"F1E2}} - \expandafter\def\csname simpleicon@peerlisticon\endcsname {\simpleiconsmap\symbol{"F1E3}} - \expandafter\def\csname simpleicon@peertubeicon\endcsname {\simpleiconsmap\symbol{"F1E4}} - \expandafter\def\csname simpleicon@pegasusairlinesicon\endcsname {\simpleiconsmap\symbol{"F1E5}} - \expandafter\def\csname simpleicon@pelicanicon\endcsname {\simpleiconsmap\symbol{"F1E6}} - \expandafter\def\csname simpleicon@pelotonicon\endcsname {\simpleiconsmap\symbol{"F1E7}} - \expandafter\def\csname simpleicon@pennyicon\endcsname {\simpleiconsmap\symbol{"F1E8}} - \expandafter\def\csname simpleicon@penpoticon\endcsname {\simpleiconsmap\symbol{"F1E9}} - \expandafter\def\csname simpleicon@percyicon\endcsname {\simpleiconsmap\symbol{"F1EA}} - \expandafter\def\csname simpleicon@perforceicon\endcsname {\simpleiconsmap\symbol{"F1EB}} - \expandafter\def\csname simpleicon@perlicon\endcsname {\simpleiconsmap\symbol{"F1EC}} - \expandafter\def\csname simpleicon@perplexityicon\endcsname {\simpleiconsmap\symbol{"F1ED}} - \expandafter\def\csname simpleicon@persistenticon\endcsname {\simpleiconsmap\symbol{"F1EE}} - \expandafter\def\csname simpleicon@personioicon\endcsname {\simpleiconsmap\symbol{"F1EF}} - \expandafter\def\csname simpleicon@petsathomeicon\endcsname {\simpleiconsmap\symbol{"F1F0}} - \expandafter\def\csname simpleicon@peugeoticon\endcsname {\simpleiconsmap\symbol{"F1F1}} - \expandafter\def\csname simpleicon@pexelsicon\endcsname {\simpleiconsmap\symbol{"F1F2}} - \expandafter\def\csname simpleicon@pfsenseicon\endcsname {\simpleiconsmap\symbol{"F1F3}} - \expandafter\def\csname simpleicon@phabricatoricon\endcsname {\simpleiconsmap\symbol{"F1F4}} - \expandafter\def\csname simpleicon@philipshueicon\endcsname {\simpleiconsmap\symbol{"F1F5}} - \expandafter\def\csname simpleicon@phoenixframeworkicon\endcsname {\simpleiconsmap\symbol{"F1F6}} - \expandafter\def\csname simpleicon@phonepeicon\endcsname {\simpleiconsmap\symbol{"F1F7}} - \expandafter\def\csname simpleicon@phosphoriconsicon\endcsname {\simpleiconsmap\symbol{"F1F8}} - \expandafter\def\csname simpleicon@photobucketicon\endcsname {\simpleiconsmap\symbol{"F1F9}} - \expandafter\def\csname simpleicon@photocrowdicon\endcsname {\simpleiconsmap\symbol{"F1FA}} - \expandafter\def\csname simpleicon@photonicon\endcsname {\simpleiconsmap\symbol{"F1FB}} - \expandafter\def\csname simpleicon@photopeaicon\endcsname {\simpleiconsmap\symbol{"F1FC}} - \expandafter\def\csname simpleicon@phpicon\endcsname {\simpleiconsmap\symbol{"F1FD}} - \expandafter\def\csname simpleicon@phpmyadminicon\endcsname {\simpleiconsmap\symbol{"F1FE}} - \expandafter\def\csname simpleicon@phpstormicon\endcsname {\simpleiconsmap\symbol{"F1FF}} - \expandafter\def\csname simpleicon@piaggiogroupicon\endcsname {\simpleiconsmap\symbol{"F200}} - \expandafter\def\csname simpleicon@piaproicon\endcsname {\simpleiconsmap\symbol{"F201}} - \expandafter\def\csname simpleicon@picardsurgelesicon\endcsname {\simpleiconsmap\symbol{"F202}} - \expandafter\def\csname simpleicon@picartodottvicon\endcsname {\simpleiconsmap\symbol{"F203}} - \expandafter\def\csname simpleicon@picnicicon\endcsname {\simpleiconsmap\symbol{"F204}} - \expandafter\def\csname simpleicon@picpayicon\endcsname {\simpleiconsmap\symbol{"F205}} - \expandafter\def\csname simpleicon@picrewicon\endcsname {\simpleiconsmap\symbol{"F206}} - \expandafter\def\csname simpleicon@picxyicon\endcsname {\simpleiconsmap\symbol{"F207}} - \expandafter\def\csname simpleicon@piholeicon\endcsname {\simpleiconsmap\symbol{"F208}} - \expandafter\def\csname simpleicon@pimcoreicon\endcsname {\simpleiconsmap\symbol{"F209}} - \expandafter\def\csname simpleicon@pinboardicon\endcsname {\simpleiconsmap\symbol{"F20A}} - \expandafter\def\csname simpleicon@pinescripticon\endcsname {\simpleiconsmap\symbol{"F20B}} - \expandafter\def\csname simpleicon@pinetworkicon\endcsname {\simpleiconsmap\symbol{"F20C}} - \expandafter\def\csname simpleicon@pingdomicon\endcsname {\simpleiconsmap\symbol{"F20D}} - \expandafter\def\csname simpleicon@pinoicon\endcsname {\simpleiconsmap\symbol{"F20E}} - \expandafter\def\csname simpleicon@pinteresticon\endcsname {\simpleiconsmap\symbol{"F20F}} - \expandafter\def\csname simpleicon@pioneerdjicon\endcsname {\simpleiconsmap\symbol{"F210}} - \expandafter\def\csname simpleicon@pipedicon\endcsname {\simpleiconsmap\symbol{"F211}} - \expandafter\def\csname simpleicon@pipxicon\endcsname {\simpleiconsmap\symbol{"F212}} - \expandafter\def\csname simpleicon@pivotaltrackericon\endcsname {\simpleiconsmap\symbol{"F213}} - \expandafter\def\csname simpleicon@piwigoicon\endcsname {\simpleiconsmap\symbol{"F214}} - \expandafter\def\csname simpleicon@pixicon\endcsname {\simpleiconsmap\symbol{"F215}} - \expandafter\def\csname simpleicon@pixabayicon\endcsname {\simpleiconsmap\symbol{"F216}} - \expandafter\def\csname simpleicon@pixelfedicon\endcsname {\simpleiconsmap\symbol{"F217}} - \expandafter\def\csname simpleicon@pixivicon\endcsname {\simpleiconsmap\symbol{"F218}} - \expandafter\def\csname simpleicon@pixlricon\endcsname {\simpleiconsmap\symbol{"F219}} - \expandafter\def\csname simpleicon@pkgsrcicon\endcsname {\simpleiconsmap\symbol{"F21A}} - \expandafter\def\csname simpleicon@planeticon\endcsname {\simpleiconsmap\symbol{"F21B}} - \expandafter\def\csname simpleicon@planetscaleicon\endcsname {\simpleiconsmap\symbol{"F21C}} - \expandafter\def\csname simpleicon@plangridicon\endcsname {\simpleiconsmap\symbol{"F21D}} - \expandafter\def\csname simpleicon@platformdotshicon\endcsname {\simpleiconsmap\symbol{"F21E}} - \expandafter\def\csname simpleicon@platformioicon\endcsname {\simpleiconsmap\symbol{"F21F}} - \expandafter\def\csname simpleicon@platziicon\endcsname {\simpleiconsmap\symbol{"F220}} - \expandafter\def\csname simpleicon@plausibleanalyticsicon\endcsname {\simpleiconsmap\symbol{"F221}} - \expandafter\def\csname simpleicon@playcanvasicon\endcsname {\simpleiconsmap\symbol{"F222}} - \expandafter\def\csname simpleicon@playerdotmeicon\endcsname {\simpleiconsmap\symbol{"F223}} - \expandafter\def\csname simpleicon@playerfmicon\endcsname {\simpleiconsmap\symbol{"F224}} - \expandafter\def\csname simpleicon@playstationicon\endcsname {\simpleiconsmap\symbol{"F225}} - \expandafter\def\csname simpleicon@playstation2icon\endcsname {\simpleiconsmap\symbol{"F226}} - \expandafter\def\csname simpleicon@playstation3icon\endcsname {\simpleiconsmap\symbol{"F227}} - \expandafter\def\csname simpleicon@playstation4icon\endcsname {\simpleiconsmap\symbol{"F228}} - \expandafter\def\csname simpleicon@playstation5icon\endcsname {\simpleiconsmap\symbol{"F229}} - \expandafter\def\csname simpleicon@playstationportableicon\endcsname {\simpleiconsmap\symbol{"F22A}} - \expandafter\def\csname simpleicon@playstationvitaicon\endcsname {\simpleiconsmap\symbol{"F22B}} - \expandafter\def\csname simpleicon@pleromaicon\endcsname {\simpleiconsmap\symbol{"F22C}} - \expandafter\def\csname simpleicon@pleskicon\endcsname {\simpleiconsmap\symbol{"F22D}} - \expandafter\def\csname simpleicon@plexicon\endcsname {\simpleiconsmap\symbol{"F22E}} - \expandafter\def\csname simpleicon@plotlyicon\endcsname {\simpleiconsmap\symbol{"F22F}} - \expandafter\def\csname simpleicon@plumeicon\endcsname {\simpleiconsmap\symbol{"F230}} - \expandafter\def\csname simpleicon@pluralsighticon\endcsname {\simpleiconsmap\symbol{"F231}} - \expandafter\def\csname simpleicon@plurkicon\endcsname {\simpleiconsmap\symbol{"F232}} - \expandafter\def\csname simpleicon@pluscodesicon\endcsname {\simpleiconsmap\symbol{"F233}} - \expandafter\def\csname simpleicon@pm2icon\endcsname {\simpleiconsmap\symbol{"F234}} - \expandafter\def\csname simpleicon@pnpmicon\endcsname {\simpleiconsmap\symbol{"F235}} - \expandafter\def\csname simpleicon@pocketicon\endcsname {\simpleiconsmap\symbol{"F236}} - \expandafter\def\csname simpleicon@pocketbaseicon\endcsname {\simpleiconsmap\symbol{"F237}} - \expandafter\def\csname simpleicon@pocketcastsicon\endcsname {\simpleiconsmap\symbol{"F238}} - \expandafter\def\csname simpleicon@podcastaddicticon\endcsname {\simpleiconsmap\symbol{"F239}} - \expandafter\def\csname simpleicon@podcastindexicon\endcsname {\simpleiconsmap\symbol{"F23A}} - \expandafter\def\csname simpleicon@podmanicon\endcsname {\simpleiconsmap\symbol{"F23B}} - \expandafter\def\csname simpleicon@poeicon\endcsname {\simpleiconsmap\symbol{"F23C}} - \expandafter\def\csname simpleicon@poetryicon\endcsname {\simpleiconsmap\symbol{"F23D}} - \expandafter\def\csname simpleicon@pointyicon\endcsname {\simpleiconsmap\symbol{"F23E}} - \expandafter\def\csname simpleicon@pokemonicon\endcsname {\simpleiconsmap\symbol{"F23F}} - \expandafter\def\csname simpleicon@polarsicon\endcsname {\simpleiconsmap\symbol{"F240}} - \expandafter\def\csname simpleicon@polestaricon\endcsname {\simpleiconsmap\symbol{"F241}} - \expandafter\def\csname simpleicon@polkadoticon\endcsname {\simpleiconsmap\symbol{"F242}} - \expandafter\def\csname simpleicon@polyicon\endcsname {\simpleiconsmap\symbol{"F243}} - \expandafter\def\csname simpleicon@polygonicon\endcsname {\simpleiconsmap\symbol{"F244}} - \expandafter\def\csname simpleicon@polymerprojecticon\endcsname {\simpleiconsmap\symbol{"F245}} - \expandafter\def\csname simpleicon@polyworkicon\endcsname {\simpleiconsmap\symbol{"F246}} - \expandafter\def\csname simpleicon@pond5icon\endcsname {\simpleiconsmap\symbol{"F247}} - \expandafter\def\csname simpleicon@poposicon\endcsname {\simpleiconsmap\symbol{"F248}} - \expandafter\def\csname simpleicon@porkbunicon\endcsname {\simpleiconsmap\symbol{"F249}} - \expandafter\def\csname simpleicon@porscheicon\endcsname {\simpleiconsmap\symbol{"F24A}} - \expandafter\def\csname simpleicon@portainericon\endcsname {\simpleiconsmap\symbol{"F24B}} - \expandafter\def\csname simpleicon@portswiggericon\endcsname {\simpleiconsmap\symbol{"F24C}} - \expandafter\def\csname simpleicon@positicon\endcsname {\simpleiconsmap\symbol{"F24D}} - \expandafter\def\csname simpleicon@postcssicon\endcsname {\simpleiconsmap\symbol{"F24E}} - \expandafter\def\csname simpleicon@postgresqlicon\endcsname {\simpleiconsmap\symbol{"F24F}} - \expandafter\def\csname simpleicon@posthogicon\endcsname {\simpleiconsmap\symbol{"F250}} - \expandafter\def\csname simpleicon@postmanicon\endcsname {\simpleiconsmap\symbol{"F251}} - \expandafter\def\csname simpleicon@postmatesicon\endcsname {\simpleiconsmap\symbol{"F252}} - \expandafter\def\csname simpleicon@powersicon\endcsname {\simpleiconsmap\symbol{"F253}} - \expandafter\def\csname simpleicon@prdotcoicon\endcsname {\simpleiconsmap\symbol{"F254}} - \expandafter\def\csname simpleicon@preacticon\endcsname {\simpleiconsmap\symbol{"F255}} - \expandafter\def\csname simpleicon@precommiticon\endcsname {\simpleiconsmap\symbol{"F256}} - \expandafter\def\csname simpleicon@prefecticon\endcsname {\simpleiconsmap\symbol{"F257}} - \expandafter\def\csname simpleicon@premierleagueicon\endcsname {\simpleiconsmap\symbol{"F258}} - \expandafter\def\csname simpleicon@prepbytesicon\endcsname {\simpleiconsmap\symbol{"F259}} - \expandafter\def\csname simpleicon@prestashopicon\endcsname {\simpleiconsmap\symbol{"F25A}} - \expandafter\def\csname simpleicon@prestoicon\endcsname {\simpleiconsmap\symbol{"F25B}} - \expandafter\def\csname simpleicon@prettiericon\endcsname {\simpleiconsmap\symbol{"F25C}} - \expandafter\def\csname simpleicon@pretzelicon\endcsname {\simpleiconsmap\symbol{"F25D}} - \expandafter\def\csname simpleicon@preventionicon\endcsname {\simpleiconsmap\symbol{"F25E}} - \expandafter\def\csname simpleicon@preziicon\endcsname {\simpleiconsmap\symbol{"F25F}} - \expandafter\def\csname simpleicon@primeicon\endcsname {\simpleiconsmap\symbol{"F260}} - \expandafter\def\csname simpleicon@primengicon\endcsname {\simpleiconsmap\symbol{"F261}} - \expandafter\def\csname simpleicon@primereacticon\endcsname {\simpleiconsmap\symbol{"F262}} - \expandafter\def\csname simpleicon@primevideoicon\endcsname {\simpleiconsmap\symbol{"F263}} - \expandafter\def\csname simpleicon@printablesicon\endcsname {\simpleiconsmap\symbol{"F264}} - \expandafter\def\csname simpleicon@prismaicon\endcsname {\simpleiconsmap\symbol{"F265}} - \expandafter\def\csname simpleicon@prismicicon\endcsname {\simpleiconsmap\symbol{"F266}} - \expandafter\def\csname simpleicon@privatedivisionicon\endcsname {\simpleiconsmap\symbol{"F267}} - \expandafter\def\csname simpleicon@privateinternetaccessicon\endcsname {\simpleiconsmap\symbol{"F268}} - \expandafter\def\csname simpleicon@proboticon\endcsname {\simpleiconsmap\symbol{"F269}} - \expandafter\def\csname simpleicon@processingfoundationicon\endcsname {\simpleiconsmap\symbol{"F26A}} - \expandafter\def\csname simpleicon@processwireicon\endcsname {\simpleiconsmap\symbol{"F26B}} - \expandafter\def\csname simpleicon@producthunticon\endcsname {\simpleiconsmap\symbol{"F26C}} - \expandafter\def\csname simpleicon@progateicon\endcsname {\simpleiconsmap\symbol{"F26D}} - \expandafter\def\csname simpleicon@progressicon\endcsname {\simpleiconsmap\symbol{"F26E}} - \expandafter\def\csname simpleicon@prometheusicon\endcsname {\simpleiconsmap\symbol{"F26F}} - \expandafter\def\csname simpleicon@pronounsdotpageicon\endcsname {\simpleiconsmap\symbol{"F270}} - \expandafter\def\csname simpleicon@prosiebenicon\endcsname {\simpleiconsmap\symbol{"F271}} - \expandafter\def\csname simpleicon@proteusicon\endcsname {\simpleiconsmap\symbol{"F272}} - \expandafter\def\csname simpleicon@protocolsdotioicon\endcsname {\simpleiconsmap\symbol{"F273}} - \expandafter\def\csname simpleicon@protodotioicon\endcsname {\simpleiconsmap\symbol{"F274}} - \expandafter\def\csname simpleicon@protonicon\endcsname {\simpleiconsmap\symbol{"F275}} - \expandafter\def\csname simpleicon@protoncalendaricon\endcsname {\simpleiconsmap\symbol{"F276}} - \expandafter\def\csname simpleicon@protondbicon\endcsname {\simpleiconsmap\symbol{"F277}} - \expandafter\def\csname simpleicon@protondriveicon\endcsname {\simpleiconsmap\symbol{"F278}} - \expandafter\def\csname simpleicon@protonmailicon\endcsname {\simpleiconsmap\symbol{"F279}} - \expandafter\def\csname simpleicon@protonvpnicon\endcsname {\simpleiconsmap\symbol{"F27A}} - \expandafter\def\csname simpleicon@protoolsicon\endcsname {\simpleiconsmap\symbol{"F27B}} - \expandafter\def\csname simpleicon@protractoricon\endcsname {\simpleiconsmap\symbol{"F27C}} - \expandafter\def\csname simpleicon@proxmoxicon\endcsname {\simpleiconsmap\symbol{"F27D}} - \expandafter\def\csname simpleicon@pterodactylicon\endcsname {\simpleiconsmap\symbol{"F27E}} - \expandafter\def\csname simpleicon@pubgicon\endcsname {\simpleiconsmap\symbol{"F27F}} - \expandafter\def\csname simpleicon@publonsicon\endcsname {\simpleiconsmap\symbol{"F280}} - \expandafter\def\csname simpleicon@pubmedicon\endcsname {\simpleiconsmap\symbol{"F281}} - \expandafter\def\csname simpleicon@pugicon\endcsname {\simpleiconsmap\symbol{"F282}} - \expandafter\def\csname simpleicon@pulumiicon\endcsname {\simpleiconsmap\symbol{"F283}} - \expandafter\def\csname simpleicon@pumaicon\endcsname {\simpleiconsmap\symbol{"F284}} - \expandafter\def\csname simpleicon@puppeticon\endcsname {\simpleiconsmap\symbol{"F285}} - \expandafter\def\csname simpleicon@puppeteericon\endcsname {\simpleiconsmap\symbol{"F286}} - \expandafter\def\csname simpleicon@purescripticon\endcsname {\simpleiconsmap\symbol{"F287}} - \expandafter\def\csname simpleicon@purgecssicon\endcsname {\simpleiconsmap\symbol{"F288}} - \expandafter\def\csname simpleicon@purismicon\endcsname {\simpleiconsmap\symbol{"F289}} - \expandafter\def\csname simpleicon@pushbulleticon\endcsname {\simpleiconsmap\symbol{"F28A}} - \expandafter\def\csname simpleicon@pushericon\endcsname {\simpleiconsmap\symbol{"F28B}} - \expandafter\def\csname simpleicon@pwaicon\endcsname {\simpleiconsmap\symbol{"F28C}} - \expandafter\def\csname simpleicon@pycharmicon\endcsname {\simpleiconsmap\symbol{"F28D}} - \expandafter\def\csname simpleicon@pycqaicon\endcsname {\simpleiconsmap\symbol{"F28E}} - \expandafter\def\csname simpleicon@pydanticicon\endcsname {\simpleiconsmap\symbol{"F28F}} - \expandafter\def\csname simpleicon@pygicon\endcsname {\simpleiconsmap\symbol{"F290}} - \expandafter\def\csname simpleicon@pypiicon\endcsname {\simpleiconsmap\symbol{"F291}} - \expandafter\def\csname simpleicon@pypyicon\endcsname {\simpleiconsmap\symbol{"F292}} - \expandafter\def\csname simpleicon@pyscaffoldicon\endcsname {\simpleiconsmap\symbol{"F293}} - \expandafter\def\csname simpleicon@pysyfticon\endcsname {\simpleiconsmap\symbol{"F294}} - \expandafter\def\csname simpleicon@pytesticon\endcsname {\simpleiconsmap\symbol{"F295}} - \expandafter\def\csname simpleicon@pythonicon\endcsname {\simpleiconsmap\symbol{"F296}} - \expandafter\def\csname simpleicon@pythonanywhereicon\endcsname {\simpleiconsmap\symbol{"F297}} - \expandafter\def\csname simpleicon@pytorchicon\endcsname {\simpleiconsmap\symbol{"F298}} - \expandafter\def\csname simpleicon@pyupicon\endcsname {\simpleiconsmap\symbol{"F299}} - \expandafter\def\csname simpleicon@qantasicon\endcsname {\simpleiconsmap\symbol{"F29A}} - \expandafter\def\csname simpleicon@qaseicon\endcsname {\simpleiconsmap\symbol{"F29B}} - \expandafter\def\csname simpleicon@qatarairwaysicon\endcsname {\simpleiconsmap\symbol{"F29C}} - \expandafter\def\csname simpleicon@qbittorrenticon\endcsname {\simpleiconsmap\symbol{"F29D}} - \expandafter\def\csname simpleicon@qemuicon\endcsname {\simpleiconsmap\symbol{"F29E}} - \expandafter\def\csname simpleicon@qgisicon\endcsname {\simpleiconsmap\symbol{"F29F}} - \expandafter\def\csname simpleicon@qiicon\endcsname {\simpleiconsmap\symbol{"F2A0}} - \expandafter\def\csname simpleicon@qiitaicon\endcsname {\simpleiconsmap\symbol{"F2A1}} - \expandafter\def\csname simpleicon@qiskiticon\endcsname {\simpleiconsmap\symbol{"F2A2}} - \expandafter\def\csname simpleicon@qiwiicon\endcsname {\simpleiconsmap\symbol{"F2A3}} - \expandafter\def\csname simpleicon@qlikicon\endcsname {\simpleiconsmap\symbol{"F2A4}} - \expandafter\def\csname simpleicon@qmkicon\endcsname {\simpleiconsmap\symbol{"F2A5}} - \expandafter\def\csname simpleicon@qnapicon\endcsname {\simpleiconsmap\symbol{"F2A6}} - \expandafter\def\csname simpleicon@qticon\endcsname {\simpleiconsmap\symbol{"F2A7}} - \expandafter\def\csname simpleicon@qualcommicon\endcsname {\simpleiconsmap\symbol{"F2A8}} - \expandafter\def\csname simpleicon@qualtricsicon\endcsname {\simpleiconsmap\symbol{"F2A9}} - \expandafter\def\csname simpleicon@qualysicon\endcsname {\simpleiconsmap\symbol{"F2AA}} - \expandafter\def\csname simpleicon@quantcasticon\endcsname {\simpleiconsmap\symbol{"F2AB}} - \expandafter\def\csname simpleicon@quantconnecticon\endcsname {\simpleiconsmap\symbol{"F2AC}} - \expandafter\def\csname simpleicon@quarkusicon\endcsname {\simpleiconsmap\symbol{"F2AD}} - \expandafter\def\csname simpleicon@quartoicon\endcsname {\simpleiconsmap\symbol{"F2AE}} - \expandafter\def\csname simpleicon@quasaricon\endcsname {\simpleiconsmap\symbol{"F2AF}} - \expandafter\def\csname simpleicon@qubesosicon\endcsname {\simpleiconsmap\symbol{"F2B0}} - \expandafter\def\csname simpleicon@questicon\endcsname {\simpleiconsmap\symbol{"F2B1}} - \expandafter\def\csname simpleicon@quickbooksicon\endcsname {\simpleiconsmap\symbol{"F2B2}} - \expandafter\def\csname simpleicon@quicklookicon\endcsname {\simpleiconsmap\symbol{"F2B3}} - \expandafter\def\csname simpleicon@quicktimeicon\endcsname {\simpleiconsmap\symbol{"F2B4}} - \expandafter\def\csname simpleicon@quicktypeicon\endcsname {\simpleiconsmap\symbol{"F2B5}} - \expandafter\def\csname simpleicon@quipicon\endcsname {\simpleiconsmap\symbol{"F2B6}} - \expandafter\def\csname simpleicon@quizleticon\endcsname {\simpleiconsmap\symbol{"F2B7}} - \expandafter\def\csname simpleicon@quoraicon\endcsname {\simpleiconsmap\symbol{"F2B8}} - \expandafter\def\csname simpleicon@qwanticon\endcsname {\simpleiconsmap\symbol{"F2B9}} - \expandafter\def\csname simpleicon@qwikicon\endcsname {\simpleiconsmap\symbol{"F2BA}} - \expandafter\def\csname simpleicon@qwiklabsicon\endcsname {\simpleiconsmap\symbol{"F2BB}} - \expandafter\def\csname simpleicon@qzoneicon\endcsname {\simpleiconsmap\symbol{"F2BC}} - \expandafter\def\csname simpleicon@ricon\endcsname {\simpleiconsmap\symbol{"F2BD}} - \expandafter\def\csname simpleicon@r3icon\endcsname {\simpleiconsmap\symbol{"F2BE}} - \expandafter\def\csname simpleicon@rabbitmqicon\endcsname {\simpleiconsmap\symbol{"F2BF}} - \expandafter\def\csname simpleicon@racketicon\endcsname {\simpleiconsmap\symbol{"F2C0}} - \expandafter\def\csname simpleicon@radaricon\endcsname {\simpleiconsmap\symbol{"F2C1}} - \expandafter\def\csname simpleicon@radarricon\endcsname {\simpleiconsmap\symbol{"F2C2}} - \expandafter\def\csname simpleicon@radiopublicicon\endcsname {\simpleiconsmap\symbol{"F2C3}} - \expandafter\def\csname simpleicon@radixuiicon\endcsname {\simpleiconsmap\symbol{"F2C4}} - \expandafter\def\csname simpleicon@radstudioicon\endcsname {\simpleiconsmap\symbol{"F2C5}} - \expandafter\def\csname simpleicon@railwayicon\endcsname {\simpleiconsmap\symbol{"F2C6}} - \expandafter\def\csname simpleicon@rainmetericon\endcsname {\simpleiconsmap\symbol{"F2C7}} - \expandafter\def\csname simpleicon@rakutenicon\endcsname {\simpleiconsmap\symbol{"F2C8}} - \expandafter\def\csname simpleicon@ramicon\endcsname {\simpleiconsmap\symbol{"F2C9}} - \expandafter\def\csname simpleicon@ranchericon\endcsname {\simpleiconsmap\symbol{"F2CA}} - \expandafter\def\csname simpleicon@rapidicon\endcsname {\simpleiconsmap\symbol{"F2CB}} - \expandafter\def\csname simpleicon@raribleicon\endcsname {\simpleiconsmap\symbol{"F2CC}} - \expandafter\def\csname simpleicon@rasaicon\endcsname {\simpleiconsmap\symbol{"F2CD}} - \expandafter\def\csname simpleicon@raspberrypiicon\endcsname {\simpleiconsmap\symbol{"F2CE}} - \expandafter\def\csname simpleicon@ravelryicon\endcsname {\simpleiconsmap\symbol{"F2CF}} - \expandafter\def\csname simpleicon@rayicon\endcsname {\simpleiconsmap\symbol{"F2D0}} - \expandafter\def\csname simpleicon@raycasticon\endcsname {\simpleiconsmap\symbol{"F2D1}} - \expandafter\def\csname simpleicon@raylibicon\endcsname {\simpleiconsmap\symbol{"F2D2}} - \expandafter\def\csname simpleicon@razericon\endcsname {\simpleiconsmap\symbol{"F2D3}} - \expandafter\def\csname simpleicon@razorpayicon\endcsname {\simpleiconsmap\symbol{"F2D4}} - \expandafter\def\csname simpleicon@rcloneicon\endcsname {\simpleiconsmap\symbol{"F2D5}} - \expandafter\def\csname simpleicon@reacticon\endcsname {\simpleiconsmap\symbol{"F2D6}} - \expandafter\def\csname simpleicon@reactbootstrapicon\endcsname {\simpleiconsmap\symbol{"F2D7}} - \expandafter\def\csname simpleicon@reacthookformicon\endcsname {\simpleiconsmap\symbol{"F2D8}} - \expandafter\def\csname simpleicon@reactiveresumeicon\endcsname {\simpleiconsmap\symbol{"F2D9}} - \expandafter\def\csname simpleicon@reactivexicon\endcsname {\simpleiconsmap\symbol{"F2DA}} - \expandafter\def\csname simpleicon@reactosicon\endcsname {\simpleiconsmap\symbol{"F2DB}} - \expandafter\def\csname simpleicon@reactqueryicon\endcsname {\simpleiconsmap\symbol{"F2DC}} - \expandafter\def\csname simpleicon@reactroutericon\endcsname {\simpleiconsmap\symbol{"F2DD}} - \expandafter\def\csname simpleicon@reacttableicon\endcsname {\simpleiconsmap\symbol{"F2DE}} - \expandafter\def\csname simpleicon@readdotcvicon\endcsname {\simpleiconsmap\symbol{"F2DF}} - \expandafter\def\csname simpleicon@readmeicon\endcsname {\simpleiconsmap\symbol{"F2E0}} - \expandafter\def\csname simpleicon@readthedocsicon\endcsname {\simpleiconsmap\symbol{"F2E1}} - \expandafter\def\csname simpleicon@realmicon\endcsname {\simpleiconsmap\symbol{"F2E2}} - \expandafter\def\csname simpleicon@reasonicon\endcsname {\simpleiconsmap\symbol{"F2E3}} - \expandafter\def\csname simpleicon@reasonstudiosicon\endcsname {\simpleiconsmap\symbol{"F2E4}} - \expandafter\def\csname simpleicon@recoilicon\endcsname {\simpleiconsmap\symbol{"F2E5}} - \expandafter\def\csname simpleicon@redicon\endcsname {\simpleiconsmap\symbol{"F2E6}} - \expandafter\def\csname simpleicon@redashicon\endcsname {\simpleiconsmap\symbol{"F2E7}} - \expandafter\def\csname simpleicon@redbubbleicon\endcsname {\simpleiconsmap\symbol{"F2E8}} - \expandafter\def\csname simpleicon@redbullicon\endcsname {\simpleiconsmap\symbol{"F2E9}} - \expandafter\def\csname simpleicon@redditicon\endcsname {\simpleiconsmap\symbol{"F2EA}} - \expandafter\def\csname simpleicon@redhaticon\endcsname {\simpleiconsmap\symbol{"F2EB}} - \expandafter\def\csname simpleicon@redhatopenshifticon\endcsname {\simpleiconsmap\symbol{"F2EC}} - \expandafter\def\csname simpleicon@redisicon\endcsname {\simpleiconsmap\symbol{"F2ED}} - \expandafter\def\csname simpleicon@redmineicon\endcsname {\simpleiconsmap\symbol{"F2EE}} - \expandafter\def\csname simpleicon@redoxicon\endcsname {\simpleiconsmap\symbol{"F2EF}} - \expandafter\def\csname simpleicon@redsysicon\endcsname {\simpleiconsmap\symbol{"F2F0}} - \expandafter\def\csname simpleicon@reduxicon\endcsname {\simpleiconsmap\symbol{"F2F1}} - \expandafter\def\csname simpleicon@reduxsagaicon\endcsname {\simpleiconsmap\symbol{"F2F2}} - \expandafter\def\csname simpleicon@redwoodjsicon\endcsname {\simpleiconsmap\symbol{"F2F3}} - \expandafter\def\csname simpleicon@reebokicon\endcsname {\simpleiconsmap\symbol{"F2F4}} - \expandafter\def\csname simpleicon@refineicon\endcsname {\simpleiconsmap\symbol{"F2F5}} - \expandafter\def\csname simpleicon@relayicon\endcsname {\simpleiconsmap\symbol{"F2F6}} - \expandafter\def\csname simpleicon@relianceindustrieslimitedicon\endcsname {\simpleiconsmap\symbol{"F2F7}} - \expandafter\def\csname simpleicon@remarkicon\endcsname {\simpleiconsmap\symbol{"F2F8}} - \expandafter\def\csname simpleicon@remedyentertainmenticon\endcsname {\simpleiconsmap\symbol{"F2F9}} - \expandafter\def\csname simpleicon@remixicon\endcsname {\simpleiconsmap\symbol{"F2FA}} - \expandafter\def\csname simpleicon@removedotbgicon\endcsname {\simpleiconsmap\symbol{"F2FB}} - \expandafter\def\csname simpleicon@renaulticon\endcsname {\simpleiconsmap\symbol{"F2FC}} - \expandafter\def\csname simpleicon@rendericon\endcsname {\simpleiconsmap\symbol{"F2FD}} - \expandafter\def\csname simpleicon@renovateicon\endcsname {\simpleiconsmap\symbol{"F2FE}} - \expandafter\def\csname simpleicon@renpyicon\endcsname {\simpleiconsmap\symbol{"F2FF}} - \expandafter\def\csname simpleicon@renrenicon\endcsname {\simpleiconsmap\symbol{"F300}} - \expandafter\def\csname simpleicon@repliticon\endcsname {\simpleiconsmap\symbol{"F301}} - \expandafter\def\csname simpleicon@republicofgamersicon\endcsname {\simpleiconsmap\symbol{"F302}} - \expandafter\def\csname simpleicon@rescripticon\endcsname {\simpleiconsmap\symbol{"F303}} - \expandafter\def\csname simpleicon@rescuetimeicon\endcsname {\simpleiconsmap\symbol{"F304}} - \expandafter\def\csname simpleicon@researchgateicon\endcsname {\simpleiconsmap\symbol{"F305}} - \expandafter\def\csname simpleicon@resendicon\endcsname {\simpleiconsmap\symbol{"F306}} - \expandafter\def\csname simpleicon@resharpericon\endcsname {\simpleiconsmap\symbol{"F307}} - \expandafter\def\csname simpleicon@resurrectionremixosicon\endcsname {\simpleiconsmap\symbol{"F308}} - \expandafter\def\csname simpleicon@retoolicon\endcsname {\simpleiconsmap\symbol{"F309}} - \expandafter\def\csname simpleicon@retroarchicon\endcsname {\simpleiconsmap\symbol{"F30A}} - \expandafter\def\csname simpleicon@retropieicon\endcsname {\simpleiconsmap\symbol{"F30B}} - \expandafter\def\csname simpleicon@revancedicon\endcsname {\simpleiconsmap\symbol{"F30C}} - \expandafter\def\csname simpleicon@revealdotjsicon\endcsname {\simpleiconsmap\symbol{"F30D}} - \expandafter\def\csname simpleicon@reverbnationicon\endcsname {\simpleiconsmap\symbol{"F30E}} - \expandafter\def\csname simpleicon@revoltdotchaticon\endcsname {\simpleiconsmap\symbol{"F30F}} - \expandafter\def\csname simpleicon@revoluticon\endcsname {\simpleiconsmap\symbol{"F310}} - \expandafter\def\csname simpleicon@revueicon\endcsname {\simpleiconsmap\symbol{"F311}} - \expandafter\def\csname simpleicon@reweicon\endcsname {\simpleiconsmap\symbol{"F312}} - \expandafter\def\csname simpleicon@rezgoicon\endcsname {\simpleiconsmap\symbol{"F313}} - \expandafter\def\csname simpleicon@rhinocerosicon\endcsname {\simpleiconsmap\symbol{"F314}} - \expandafter\def\csname simpleicon@richicon\endcsname {\simpleiconsmap\symbol{"F315}} - \expandafter\def\csname simpleicon@ridericon\endcsname {\simpleiconsmap\symbol{"F316}} - \expandafter\def\csname simpleicon@rimacautomobiliicon\endcsname {\simpleiconsmap\symbol{"F317}} - \expandafter\def\csname simpleicon@rimeicon\endcsname {\simpleiconsmap\symbol{"F318}} - \expandafter\def\csname simpleicon@ringicon\endcsname {\simpleiconsmap\symbol{"F319}} - \expandafter\def\csname simpleicon@riotgamesicon\endcsname {\simpleiconsmap\symbol{"F31A}} - \expandafter\def\csname simpleicon@rippleicon\endcsname {\simpleiconsmap\symbol{"F31B}} - \expandafter\def\csname simpleicon@riscvicon\endcsname {\simpleiconsmap\symbol{"F31C}} - \expandafter\def\csname simpleicon@riseupicon\endcsname {\simpleiconsmap\symbol{"F31D}} - \expandafter\def\csname simpleicon@ritzcarltonicon\endcsname {\simpleiconsmap\symbol{"F31E}} - \expandafter\def\csname simpleicon@riveicon\endcsname {\simpleiconsmap\symbol{"F31F}} - \expandafter\def\csname simpleicon@roadmapdotshicon\endcsname {\simpleiconsmap\symbol{"F320}} - \expandafter\def\csname simpleicon@roamresearchicon\endcsname {\simpleiconsmap\symbol{"F321}} - \expandafter\def\csname simpleicon@robinhoodicon\endcsname {\simpleiconsmap\symbol{"F322}} - \expandafter\def\csname simpleicon@robloxicon\endcsname {\simpleiconsmap\symbol{"F323}} - \expandafter\def\csname simpleicon@robloxstudioicon\endcsname {\simpleiconsmap\symbol{"F324}} - \expandafter\def\csname simpleicon@robotframeworkicon\endcsname {\simpleiconsmap\symbol{"F325}} - \expandafter\def\csname simpleicon@rocketicon\endcsname {\simpleiconsmap\symbol{"F326}} - \expandafter\def\csname simpleicon@rocketdotchaticon\endcsname {\simpleiconsmap\symbol{"F327}} - \expandafter\def\csname simpleicon@rocksdbicon\endcsname {\simpleiconsmap\symbol{"F328}} - \expandafter\def\csname simpleicon@rockstargamesicon\endcsname {\simpleiconsmap\symbol{"F329}} - \expandafter\def\csname simpleicon@rockwellautomationicon\endcsname {\simpleiconsmap\symbol{"F32A}} - \expandafter\def\csname simpleicon@rockylinuxicon\endcsname {\simpleiconsmap\symbol{"F32B}} - \expandafter\def\csname simpleicon@rokuicon\endcsname {\simpleiconsmap\symbol{"F32C}} - \expandafter\def\csname simpleicon@roll20icon\endcsname {\simpleiconsmap\symbol{"F32D}} - \expandafter\def\csname simpleicon@rollsroyceicon\endcsname {\simpleiconsmap\symbol{"F32E}} - \expandafter\def\csname simpleicon@rollupdotjsicon\endcsname {\simpleiconsmap\symbol{"F32F}} - \expandafter\def\csname simpleicon@roonicon\endcsname {\simpleiconsmap\symbol{"F330}} - \expandafter\def\csname simpleicon@rootmeicon\endcsname {\simpleiconsmap\symbol{"F331}} - \expandafter\def\csname simpleicon@rootsicon\endcsname {\simpleiconsmap\symbol{"F332}} - \expandafter\def\csname simpleicon@rootsbedrockicon\endcsname {\simpleiconsmap\symbol{"F333}} - \expandafter\def\csname simpleicon@rootssageicon\endcsname {\simpleiconsmap\symbol{"F334}} - \expandafter\def\csname simpleicon@rosicon\endcsname {\simpleiconsmap\symbol{"F335}} - \expandafter\def\csname simpleicon@rossmannicon\endcsname {\simpleiconsmap\symbol{"F336}} - \expandafter\def\csname simpleicon@rotaryinternationalicon\endcsname {\simpleiconsmap\symbol{"F337}} - \expandafter\def\csname simpleicon@rottentomatoesicon\endcsname {\simpleiconsmap\symbol{"F338}} - \expandafter\def\csname simpleicon@roundcubeicon\endcsname {\simpleiconsmap\symbol{"F339}} - \expandafter\def\csname simpleicon@rsocketicon\endcsname {\simpleiconsmap\symbol{"F33A}} - \expandafter\def\csname simpleicon@rssicon\endcsname {\simpleiconsmap\symbol{"F33B}} - \expandafter\def\csname simpleicon@rstudioideicon\endcsname {\simpleiconsmap\symbol{"F33C}} - \expandafter\def\csname simpleicon@rteicon\endcsname {\simpleiconsmap\symbol{"F33D}} - \expandafter\def\csname simpleicon@rtlicon\endcsname {\simpleiconsmap\symbol{"F33E}} - \expandafter\def\csname simpleicon@rtlzweiicon\endcsname {\simpleiconsmap\symbol{"F33F}} - \expandafter\def\csname simpleicon@rtmicon\endcsname {\simpleiconsmap\symbol{"F340}} - \expandafter\def\csname simpleicon@rubocopicon\endcsname {\simpleiconsmap\symbol{"F341}} - \expandafter\def\csname simpleicon@rubyicon\endcsname {\simpleiconsmap\symbol{"F342}} - \expandafter\def\csname simpleicon@rubygemsicon\endcsname {\simpleiconsmap\symbol{"F343}} - \expandafter\def\csname simpleicon@rubymineicon\endcsname {\simpleiconsmap\symbol{"F344}} - \expandafter\def\csname simpleicon@rubyonrailsicon\endcsname {\simpleiconsmap\symbol{"F345}} - \expandafter\def\csname simpleicon@rubysinatraicon\endcsname {\simpleiconsmap\symbol{"F346}} - \expandafter\def\csname simpleicon@rufficon\endcsname {\simpleiconsmap\symbol{"F347}} - \expandafter\def\csname simpleicon@rumahwebicon\endcsname {\simpleiconsmap\symbol{"F348}} - \expandafter\def\csname simpleicon@rumbleicon\endcsname {\simpleiconsmap\symbol{"F349}} - \expandafter\def\csname simpleicon@rundeckicon\endcsname {\simpleiconsmap\symbol{"F34A}} - \expandafter\def\csname simpleicon@runkeepericon\endcsname {\simpleiconsmap\symbol{"F34B}} - \expandafter\def\csname simpleicon@runkiticon\endcsname {\simpleiconsmap\symbol{"F34C}} - \expandafter\def\csname simpleicon@runrundotiticon\endcsname {\simpleiconsmap\symbol{"F34D}} - \expandafter\def\csname simpleicon@rusticon\endcsname {\simpleiconsmap\symbol{"F34E}} - \expandafter\def\csname simpleicon@rustdeskicon\endcsname {\simpleiconsmap\symbol{"F34F}} - \expandafter\def\csname simpleicon@rxdbicon\endcsname {\simpleiconsmap\symbol{"F350}} - \expandafter\def\csname simpleicon@ryanairicon\endcsname {\simpleiconsmap\symbol{"F351}} - \expandafter\def\csname simpleicon@ryeicon\endcsname {\simpleiconsmap\symbol{"F352}} - \expandafter\def\csname simpleicon@s7airlinesicon\endcsname {\simpleiconsmap\symbol{"F353}} - \expandafter\def\csname simpleicon@sabanciicon\endcsname {\simpleiconsmap\symbol{"F354}} - \expandafter\def\csname simpleicon@safariicon\endcsname {\simpleiconsmap\symbol{"F355}} - \expandafter\def\csname simpleicon@sageicon\endcsname {\simpleiconsmap\symbol{"F356}} - \expandafter\def\csname simpleicon@sahibindenicon\endcsname {\simpleiconsmap\symbol{"F357}} - \expandafter\def\csname simpleicon@sailfishosicon\endcsname {\simpleiconsmap\symbol{"F358}} - \expandafter\def\csname simpleicon@sailsdotjsicon\endcsname {\simpleiconsmap\symbol{"F359}} - \expandafter\def\csname simpleicon@salesforceicon\endcsname {\simpleiconsmap\symbol{"F35A}} - \expandafter\def\csname simpleicon@sallaicon\endcsname {\simpleiconsmap\symbol{"F35B}} - \expandafter\def\csname simpleicon@saltprojecticon\endcsname {\simpleiconsmap\symbol{"F35C}} - \expandafter\def\csname simpleicon@samsclubicon\endcsname {\simpleiconsmap\symbol{"F35D}} - \expandafter\def\csname simpleicon@samsungicon\endcsname {\simpleiconsmap\symbol{"F35E}} - \expandafter\def\csname simpleicon@samsungpayicon\endcsname {\simpleiconsmap\symbol{"F35F}} - \expandafter\def\csname simpleicon@sandiskicon\endcsname {\simpleiconsmap\symbol{"F360}} - \expandafter\def\csname simpleicon@sanfranciscomunicipalrailwayicon\endcsname {\simpleiconsmap\symbol{"F361}} - \expandafter\def\csname simpleicon@sanicicon\endcsname {\simpleiconsmap\symbol{"F362}} - \expandafter\def\csname simpleicon@sanityicon\endcsname {\simpleiconsmap\symbol{"F363}} - \expandafter\def\csname simpleicon@saopaulometroicon\endcsname {\simpleiconsmap\symbol{"F364}} - \expandafter\def\csname simpleicon@sapicon\endcsname {\simpleiconsmap\symbol{"F365}} - \expandafter\def\csname simpleicon@sartoriusicon\endcsname {\simpleiconsmap\symbol{"F366}} - \expandafter\def\csname simpleicon@sassicon\endcsname {\simpleiconsmap\symbol{"F367}} - \expandafter\def\csname simpleicon@sat1icon\endcsname {\simpleiconsmap\symbol{"F368}} - \expandafter\def\csname simpleicon@satelliteicon\endcsname {\simpleiconsmap\symbol{"F369}} - \expandafter\def\csname simpleicon@saturnicon\endcsname {\simpleiconsmap\symbol{"F36A}} - \expandafter\def\csname simpleicon@saucelabsicon\endcsname {\simpleiconsmap\symbol{"F36B}} - \expandafter\def\csname simpleicon@saudiaicon\endcsname {\simpleiconsmap\symbol{"F36C}} - \expandafter\def\csname simpleicon@scalaicon\endcsname {\simpleiconsmap\symbol{"F36D}} - \expandafter\def\csname simpleicon@scalewayicon\endcsname {\simpleiconsmap\symbol{"F36E}} - \expandafter\def\csname simpleicon@scaniaicon\endcsname {\simpleiconsmap\symbol{"F36F}} - \expandafter\def\csname simpleicon@schneiderelectricicon\endcsname {\simpleiconsmap\symbol{"F370}} - \expandafter\def\csname simpleicon@scikitlearnicon\endcsname {\simpleiconsmap\symbol{"F371}} - \expandafter\def\csname simpleicon@scilabicon\endcsname {\simpleiconsmap\symbol{"F372}} - \expandafter\def\csname simpleicon@scipyicon\endcsname {\simpleiconsmap\symbol{"F373}} - \expandafter\def\csname simpleicon@scopusicon\endcsname {\simpleiconsmap\symbol{"F374}} - \expandafter\def\csname simpleicon@scpfoundationicon\endcsname {\simpleiconsmap\symbol{"F375}} - \expandafter\def\csname simpleicon@scrapboxicon\endcsname {\simpleiconsmap\symbol{"F376}} - \expandafter\def\csname simpleicon@scrapyicon\endcsname {\simpleiconsmap\symbol{"F377}} - \expandafter\def\csname simpleicon@scratchicon\endcsname {\simpleiconsmap\symbol{"F378}} - \expandafter\def\csname simpleicon@screencastifyicon\endcsname {\simpleiconsmap\symbol{"F379}} - \expandafter\def\csname simpleicon@scribdicon\endcsname {\simpleiconsmap\symbol{"F37A}} - \expandafter\def\csname simpleicon@scrimbaicon\endcsname {\simpleiconsmap\symbol{"F37B}} - \expandafter\def\csname simpleicon@scrollrevealicon\endcsname {\simpleiconsmap\symbol{"F37C}} - \expandafter\def\csname simpleicon@scrumallianceicon\endcsname {\simpleiconsmap\symbol{"F37D}} - \expandafter\def\csname simpleicon@scrutinizerciicon\endcsname {\simpleiconsmap\symbol{"F37E}} - \expandafter\def\csname simpleicon@scylladbicon\endcsname {\simpleiconsmap\symbol{"F37F}} - \expandafter\def\csname simpleicon@seagateicon\endcsname {\simpleiconsmap\symbol{"F380}} - \expandafter\def\csname simpleicon@searxngicon\endcsname {\simpleiconsmap\symbol{"F381}} - \expandafter\def\csname simpleicon@seaticon\endcsname {\simpleiconsmap\symbol{"F382}} - \expandafter\def\csname simpleicon@seatgeekicon\endcsname {\simpleiconsmap\symbol{"F383}} - \expandafter\def\csname simpleicon@securityscorecardicon\endcsname {\simpleiconsmap\symbol{"F384}} - \expandafter\def\csname simpleicon@sefariaicon\endcsname {\simpleiconsmap\symbol{"F385}} - \expandafter\def\csname simpleicon@segaicon\endcsname {\simpleiconsmap\symbol{"F386}} - \expandafter\def\csname simpleicon@seleniumicon\endcsname {\simpleiconsmap\symbol{"F387}} - \expandafter\def\csname simpleicon@sellfyicon\endcsname {\simpleiconsmap\symbol{"F388}} - \expandafter\def\csname simpleicon@semanticreleaseicon\endcsname {\simpleiconsmap\symbol{"F389}} - \expandafter\def\csname simpleicon@semanticscholaricon\endcsname {\simpleiconsmap\symbol{"F38A}} - \expandafter\def\csname simpleicon@semanticuiicon\endcsname {\simpleiconsmap\symbol{"F38B}} - \expandafter\def\csname simpleicon@semanticuireacticon\endcsname {\simpleiconsmap\symbol{"F38C}} - \expandafter\def\csname simpleicon@semanticwebicon\endcsname {\simpleiconsmap\symbol{"F38D}} - \expandafter\def\csname simpleicon@semaphoreciicon\endcsname {\simpleiconsmap\symbol{"F38E}} - \expandafter\def\csname simpleicon@semrushicon\endcsname {\simpleiconsmap\symbol{"F38F}} - \expandafter\def\csname simpleicon@semvericon\endcsname {\simpleiconsmap\symbol{"F390}} - \expandafter\def\csname simpleicon@senchaicon\endcsname {\simpleiconsmap\symbol{"F391}} - \expandafter\def\csname simpleicon@sennheisericon\endcsname {\simpleiconsmap\symbol{"F392}} - \expandafter\def\csname simpleicon@sensuicon\endcsname {\simpleiconsmap\symbol{"F393}} - \expandafter\def\csname simpleicon@sentryicon\endcsname {\simpleiconsmap\symbol{"F394}} - \expandafter\def\csname simpleicon@sepaicon\endcsname {\simpleiconsmap\symbol{"F395}} - \expandafter\def\csname simpleicon@sequelizeicon\endcsname {\simpleiconsmap\symbol{"F396}} - \expandafter\def\csname simpleicon@serverfaulticon\endcsname {\simpleiconsmap\symbol{"F397}} - \expandafter\def\csname simpleicon@serverlessicon\endcsname {\simpleiconsmap\symbol{"F398}} - \expandafter\def\csname simpleicon@sessionicon\endcsname {\simpleiconsmap\symbol{"F399}} - \expandafter\def\csname simpleicon@sessionizeicon\endcsname {\simpleiconsmap\symbol{"F39A}} - \expandafter\def\csname simpleicon@setappicon\endcsname {\simpleiconsmap\symbol{"F39B}} - \expandafter\def\csname simpleicon@sfmlicon\endcsname {\simpleiconsmap\symbol{"F39C}} - \expandafter\def\csname simpleicon@shadcnuiicon\endcsname {\simpleiconsmap\symbol{"F39D}} - \expandafter\def\csname simpleicon@shadowicon\endcsname {\simpleiconsmap\symbol{"F39E}} - \expandafter\def\csname simpleicon@shanghaimetroicon\endcsname {\simpleiconsmap\symbol{"F39F}} - \expandafter\def\csname simpleicon@sharexicon\endcsname {\simpleiconsmap\symbol{"F3A0}} - \expandafter\def\csname simpleicon@sharpicon\endcsname {\simpleiconsmap\symbol{"F3A1}} - \expandafter\def\csname simpleicon@shazamicon\endcsname {\simpleiconsmap\symbol{"F3A2}} - \expandafter\def\csname simpleicon@shellicon\endcsname {\simpleiconsmap\symbol{"F3A3}} - \expandafter\def\csname simpleicon@shellyicon\endcsname {\simpleiconsmap\symbol{"F3A4}} - \expandafter\def\csname simpleicon@shenzhenmetroicon\endcsname {\simpleiconsmap\symbol{"F3A5}} - \expandafter\def\csname simpleicon@shieldsdotioicon\endcsname {\simpleiconsmap\symbol{"F3A6}} - \expandafter\def\csname simpleicon@shikimoriicon\endcsname {\simpleiconsmap\symbol{"F3A7}} - \expandafter\def\csname simpleicon@shopeeicon\endcsname {\simpleiconsmap\symbol{"F3A8}} - \expandafter\def\csname simpleicon@shopifyicon\endcsname {\simpleiconsmap\symbol{"F3A9}} - \expandafter\def\csname simpleicon@shopwareicon\endcsname {\simpleiconsmap\symbol{"F3AA}} - \expandafter\def\csname simpleicon@shortcuticon\endcsname {\simpleiconsmap\symbol{"F3AB}} - \expandafter\def\csname simpleicon@showpadicon\endcsname {\simpleiconsmap\symbol{"F3AC}} - \expandafter\def\csname simpleicon@showtimeicon\endcsname {\simpleiconsmap\symbol{"F3AD}} - \expandafter\def\csname simpleicon@showwcaseicon\endcsname {\simpleiconsmap\symbol{"F3AE}} - \expandafter\def\csname simpleicon@shutterstockicon\endcsname {\simpleiconsmap\symbol{"F3AF}} - \expandafter\def\csname simpleicon@sidekiqicon\endcsname {\simpleiconsmap\symbol{"F3B0}} - \expandafter\def\csname simpleicon@sidequesticon\endcsname {\simpleiconsmap\symbol{"F3B1}} - \expandafter\def\csname simpleicon@siemensicon\endcsname {\simpleiconsmap\symbol{"F3B2}} - \expandafter\def\csname simpleicon@sifiveicon\endcsname {\simpleiconsmap\symbol{"F3B3}} - \expandafter\def\csname simpleicon@signalicon\endcsname {\simpleiconsmap\symbol{"F3B4}} - \expandafter\def\csname simpleicon@similarwebicon\endcsname {\simpleiconsmap\symbol{"F3B5}} - \expandafter\def\csname simpleicon@simklicon\endcsname {\simpleiconsmap\symbol{"F3B6}} - \expandafter\def\csname simpleicon@simpleanalyticsicon\endcsname {\simpleiconsmap\symbol{"F3B7}} - \expandafter\def\csname simpleicon@simpleiconsicon\endcsname {\simpleiconsmap\symbol{"F3B8}} - \expandafter\def\csname simpleicon@simpleloginicon\endcsname {\simpleiconsmap\symbol{"F3B9}} - \expandafter\def\csname simpleicon@simplenoteicon\endcsname {\simpleiconsmap\symbol{"F3BA}} - \expandafter\def\csname simpleicon@sinaweiboicon\endcsname {\simpleiconsmap\symbol{"F3BB}} - \expandafter\def\csname simpleicon@singaporeairlinesicon\endcsname {\simpleiconsmap\symbol{"F3BC}} - \expandafter\def\csname simpleicon@singlestoreicon\endcsname {\simpleiconsmap\symbol{"F3BD}} - \expandafter\def\csname simpleicon@sitecoreicon\endcsname {\simpleiconsmap\symbol{"F3BE}} - \expandafter\def\csname simpleicon@sitepointicon\endcsname {\simpleiconsmap\symbol{"F3BF}} - \expandafter\def\csname simpleicon@siyuanicon\endcsname {\simpleiconsmap\symbol{"F3C0}} - \expandafter\def\csname simpleicon@skaffoldicon\endcsname {\simpleiconsmap\symbol{"F3C1}} - \expandafter\def\csname simpleicon@sketchicon\endcsname {\simpleiconsmap\symbol{"F3C2}} - \expandafter\def\csname simpleicon@sketchfabicon\endcsname {\simpleiconsmap\symbol{"F3C3}} - \expandafter\def\csname simpleicon@sketchupicon\endcsname {\simpleiconsmap\symbol{"F3C4}} - \expandafter\def\csname simpleicon@skillshareicon\endcsname {\simpleiconsmap\symbol{"F3C5}} - \expandafter\def\csname simpleicon@skodaicon\endcsname {\simpleiconsmap\symbol{"F3C6}} - \expandafter\def\csname simpleicon@skyicon\endcsname {\simpleiconsmap\symbol{"F3C7}} - \expandafter\def\csname simpleicon@skypackicon\endcsname {\simpleiconsmap\symbol{"F3C8}} - \expandafter\def\csname simpleicon@skyrockicon\endcsname {\simpleiconsmap\symbol{"F3C9}} - \expandafter\def\csname simpleicon@slackicon\endcsname {\simpleiconsmap\symbol{"F3CA}} - \expandafter\def\csname simpleicon@slackwareicon\endcsname {\simpleiconsmap\symbol{"F3CB}} - \expandafter\def\csname simpleicon@slashdoticon\endcsname {\simpleiconsmap\symbol{"F3CC}} - \expandafter\def\csname simpleicon@slickpicicon\endcsname {\simpleiconsmap\symbol{"F3CD}} - \expandafter\def\csname simpleicon@slidesicon\endcsname {\simpleiconsmap\symbol{"F3CE}} - \expandafter\def\csname simpleicon@slideshareicon\endcsname {\simpleiconsmap\symbol{"F3CF}} - \expandafter\def\csname simpleicon@slinticon\endcsname {\simpleiconsmap\symbol{"F3D0}} - \expandafter\def\csname simpleicon@smarticon\endcsname {\simpleiconsmap\symbol{"F3D1}} - \expandafter\def\csname simpleicon@smartthingsicon\endcsname {\simpleiconsmap\symbol{"F3D2}} - \expandafter\def\csname simpleicon@smashdotggicon\endcsname {\simpleiconsmap\symbol{"F3D3}} - \expandafter\def\csname simpleicon@smashingmagazineicon\endcsname {\simpleiconsmap\symbol{"F3D4}} - \expandafter\def\csname simpleicon@smrticon\endcsname {\simpleiconsmap\symbol{"F3D5}} - \expandafter\def\csname simpleicon@smugmugicon\endcsname {\simpleiconsmap\symbol{"F3D6}} - \expandafter\def\csname simpleicon@snapchaticon\endcsname {\simpleiconsmap\symbol{"F3D7}} - \expandafter\def\csname simpleicon@snapcrafticon\endcsname {\simpleiconsmap\symbol{"F3D8}} - \expandafter\def\csname simpleicon@sncficon\endcsname {\simpleiconsmap\symbol{"F3D9}} - \expandafter\def\csname simpleicon@snorticon\endcsname {\simpleiconsmap\symbol{"F3DA}} - \expandafter\def\csname simpleicon@snowflakeicon\endcsname {\simpleiconsmap\symbol{"F3DB}} - \expandafter\def\csname simpleicon@snowpackicon\endcsname {\simpleiconsmap\symbol{"F3DC}} - \expandafter\def\csname simpleicon@snykicon\endcsname {\simpleiconsmap\symbol{"F3DD}} - \expandafter\def\csname simpleicon@socialbladeicon\endcsname {\simpleiconsmap\symbol{"F3DE}} - \expandafter\def\csname simpleicon@society6icon\endcsname {\simpleiconsmap\symbol{"F3DF}} - \expandafter\def\csname simpleicon@socketdotioicon\endcsname {\simpleiconsmap\symbol{"F3E0}} - \expandafter\def\csname simpleicon@softpediaicon\endcsname {\simpleiconsmap\symbol{"F3E1}} - \expandafter\def\csname simpleicon@sogouicon\endcsname {\simpleiconsmap\symbol{"F3E2}} - \expandafter\def\csname simpleicon@solanaicon\endcsname {\simpleiconsmap\symbol{"F3E3}} - \expandafter\def\csname simpleicon@solidicon\endcsname {\simpleiconsmap\symbol{"F3E4}} - \expandafter\def\csname simpleicon@solidityicon\endcsname {\simpleiconsmap\symbol{"F3E5}} - \expandafter\def\csname simpleicon@sololearnicon\endcsname {\simpleiconsmap\symbol{"F3E6}} - \expandafter\def\csname simpleicon@solusicon\endcsname {\simpleiconsmap\symbol{"F3E7}} - \expandafter\def\csname simpleicon@sonaricon\endcsname {\simpleiconsmap\symbol{"F3E8}} - \expandafter\def\csname simpleicon@sonarcloudicon\endcsname {\simpleiconsmap\symbol{"F3E9}} - \expandafter\def\csname simpleicon@sonarlinticon\endcsname {\simpleiconsmap\symbol{"F3EA}} - \expandafter\def\csname simpleicon@sonarqubeicon\endcsname {\simpleiconsmap\symbol{"F3EB}} - \expandafter\def\csname simpleicon@sonarricon\endcsname {\simpleiconsmap\symbol{"F3EC}} - \expandafter\def\csname simpleicon@sonatypeicon\endcsname {\simpleiconsmap\symbol{"F3ED}} - \expandafter\def\csname simpleicon@songkickicon\endcsname {\simpleiconsmap\symbol{"F3EE}} - \expandafter\def\csname simpleicon@songodaicon\endcsname {\simpleiconsmap\symbol{"F3EF}} - \expandafter\def\csname simpleicon@sonicwallicon\endcsname {\simpleiconsmap\symbol{"F3F0}} - \expandafter\def\csname simpleicon@sonosicon\endcsname {\simpleiconsmap\symbol{"F3F1}} - \expandafter\def\csname simpleicon@sonyicon\endcsname {\simpleiconsmap\symbol{"F3F2}} - \expandafter\def\csname simpleicon@sorianaicon\endcsname {\simpleiconsmap\symbol{"F3F3}} - \expandafter\def\csname simpleicon@soundchartsicon\endcsname {\simpleiconsmap\symbol{"F3F4}} - \expandafter\def\csname simpleicon@soundcloudicon\endcsname {\simpleiconsmap\symbol{"F3F5}} - \expandafter\def\csname simpleicon@sourceengineicon\endcsname {\simpleiconsmap\symbol{"F3F6}} - \expandafter\def\csname simpleicon@sourceforgeicon\endcsname {\simpleiconsmap\symbol{"F3F7}} - \expandafter\def\csname simpleicon@sourcehuticon\endcsname {\simpleiconsmap\symbol{"F3F8}} - \expandafter\def\csname simpleicon@sourcetreeicon\endcsname {\simpleiconsmap\symbol{"F3F9}} - \expandafter\def\csname simpleicon@southwestairlinesicon\endcsname {\simpleiconsmap\symbol{"F3FA}} - \expandafter\def\csname simpleicon@spacemacsicon\endcsname {\simpleiconsmap\symbol{"F3FB}} - \expandafter\def\csname simpleicon@spaceshipicon\endcsname {\simpleiconsmap\symbol{"F3FC}} - \expandafter\def\csname simpleicon@spacexicon\endcsname {\simpleiconsmap\symbol{"F3FD}} - \expandafter\def\csname simpleicon@spacyicon\endcsname {\simpleiconsmap\symbol{"F3FE}} - \expandafter\def\csname simpleicon@sparkaricon\endcsname {\simpleiconsmap\symbol{"F3FF}} - \expandafter\def\csname simpleicon@sparkasseicon\endcsname {\simpleiconsmap\symbol{"F400}} - \expandafter\def\csname simpleicon@sparkfunicon\endcsname {\simpleiconsmap\symbol{"F401}} - \expandafter\def\csname simpleicon@sparkposticon\endcsname {\simpleiconsmap\symbol{"F402}} - \expandafter\def\csname simpleicon@spdxicon\endcsname {\simpleiconsmap\symbol{"F403}} - \expandafter\def\csname simpleicon@speakerdeckicon\endcsname {\simpleiconsmap\symbol{"F404}} - \expandafter\def\csname simpleicon@spectrumicon\endcsname {\simpleiconsmap\symbol{"F405}} - \expandafter\def\csname simpleicon@speedtesticon\endcsname {\simpleiconsmap\symbol{"F406}} - \expandafter\def\csname simpleicon@speedypageicon\endcsname {\simpleiconsmap\symbol{"F407}} - \expandafter\def\csname simpleicon@sphinxicon\endcsname {\simpleiconsmap\symbol{"F408}} - \expandafter\def\csname simpleicon@spigotmcicon\endcsname {\simpleiconsmap\symbol{"F409}} - \expandafter\def\csname simpleicon@spineicon\endcsname {\simpleiconsmap\symbol{"F40A}} - \expandafter\def\csname simpleicon@spinnakericon\endcsname {\simpleiconsmap\symbol{"F40B}} - \expandafter\def\csname simpleicon@spinrillaicon\endcsname {\simpleiconsmap\symbol{"F40C}} - \expandafter\def\csname simpleicon@splunkicon\endcsname {\simpleiconsmap\symbol{"F40D}} - \expandafter\def\csname simpleicon@spojicon\endcsname {\simpleiconsmap\symbol{"F40E}} - \expandafter\def\csname simpleicon@spondicon\endcsname {\simpleiconsmap\symbol{"F40F}} - \expandafter\def\csname simpleicon@spotifyicon\endcsname {\simpleiconsmap\symbol{"F410}} - \expandafter\def\csname simpleicon@spotlighticon\endcsname {\simpleiconsmap\symbol{"F411}} - \expandafter\def\csname simpleicon@spreadshirticon\endcsname {\simpleiconsmap\symbol{"F412}} - \expandafter\def\csname simpleicon@spreakericon\endcsname {\simpleiconsmap\symbol{"F413}} - \expandafter\def\csname simpleicon@springicon\endcsname {\simpleiconsmap\symbol{"F414}} - \expandafter\def\csname simpleicon@springcreatorsicon\endcsname {\simpleiconsmap\symbol{"F415}} - \expandafter\def\csname simpleicon@springbooticon\endcsname {\simpleiconsmap\symbol{"F416}} - \expandafter\def\csname simpleicon@springsecurityicon\endcsname {\simpleiconsmap\symbol{"F417}} - \expandafter\def\csname simpleicon@spyderideicon\endcsname {\simpleiconsmap\symbol{"F418}} - \expandafter\def\csname simpleicon@sqlalchemyicon\endcsname {\simpleiconsmap\symbol{"F419}} - \expandafter\def\csname simpleicon@sqliteicon\endcsname {\simpleiconsmap\symbol{"F41A}} - \expandafter\def\csname simpleicon@squareicon\endcsname {\simpleiconsmap\symbol{"F41B}} - \expandafter\def\csname simpleicon@squareenixicon\endcsname {\simpleiconsmap\symbol{"F41C}} - \expandafter\def\csname simpleicon@squarespaceicon\endcsname {\simpleiconsmap\symbol{"F41D}} - \expandafter\def\csname simpleicon@srgssricon\endcsname {\simpleiconsmap\symbol{"F41E}} - \expandafter\def\csname simpleicon@ssrnicon\endcsname {\simpleiconsmap\symbol{"F41F}} - \expandafter\def\csname simpleicon@ssticon\endcsname {\simpleiconsmap\symbol{"F420}} - \expandafter\def\csname simpleicon@stackbiticon\endcsname {\simpleiconsmap\symbol{"F421}} - \expandafter\def\csname simpleicon@stackblitzicon\endcsname {\simpleiconsmap\symbol{"F422}} - \expandafter\def\csname simpleicon@stackediticon\endcsname {\simpleiconsmap\symbol{"F423}} - \expandafter\def\csname simpleicon@stackexchangeicon\endcsname {\simpleiconsmap\symbol{"F424}} - \expandafter\def\csname simpleicon@stackhawkicon\endcsname {\simpleiconsmap\symbol{"F425}} - \expandafter\def\csname simpleicon@stackoverflowicon\endcsname {\simpleiconsmap\symbol{"F426}} - \expandafter\def\csname simpleicon@stackpathicon\endcsname {\simpleiconsmap\symbol{"F427}} - \expandafter\def\csname simpleicon@stackshareicon\endcsname {\simpleiconsmap\symbol{"F428}} - \expandafter\def\csname simpleicon@stadiaicon\endcsname {\simpleiconsmap\symbol{"F429}} - \expandafter\def\csname simpleicon@staffbaseicon\endcsname {\simpleiconsmap\symbol{"F42A}} - \expandafter\def\csname simpleicon@stagetimericon\endcsname {\simpleiconsmap\symbol{"F42B}} - \expandafter\def\csname simpleicon@standardjsicon\endcsname {\simpleiconsmap\symbol{"F42C}} - \expandafter\def\csname simpleicon@standardresumeicon\endcsname {\simpleiconsmap\symbol{"F42D}} - \expandafter\def\csname simpleicon@starbucksicon\endcsname {\simpleiconsmap\symbol{"F42E}} - \expandafter\def\csname simpleicon@stardockicon\endcsname {\simpleiconsmap\symbol{"F42F}} - \expandafter\def\csname simpleicon@starlingbankicon\endcsname {\simpleiconsmap\symbol{"F430}} - \expandafter\def\csname simpleicon@starshipicon\endcsname {\simpleiconsmap\symbol{"F431}} - \expandafter\def\csname simpleicon@startrekicon\endcsname {\simpleiconsmap\symbol{"F432}} - \expandafter\def\csname simpleicon@starzicon\endcsname {\simpleiconsmap\symbol{"F433}} - \expandafter\def\csname simpleicon@statamicicon\endcsname {\simpleiconsmap\symbol{"F434}} - \expandafter\def\csname simpleicon@statistaicon\endcsname {\simpleiconsmap\symbol{"F435}} - \expandafter\def\csname simpleicon@statuspageicon\endcsname {\simpleiconsmap\symbol{"F436}} - \expandafter\def\csname simpleicon@statuspalicon\endcsname {\simpleiconsmap\symbol{"F437}} - \expandafter\def\csname simpleicon@steamicon\endcsname {\simpleiconsmap\symbol{"F438}} - \expandafter\def\csname simpleicon@steamdbicon\endcsname {\simpleiconsmap\symbol{"F439}} - \expandafter\def\csname simpleicon@steamdeckicon\endcsname {\simpleiconsmap\symbol{"F43A}} - \expandafter\def\csname simpleicon@steamworksicon\endcsname {\simpleiconsmap\symbol{"F43B}} - \expandafter\def\csname simpleicon@steelseriesicon\endcsname {\simpleiconsmap\symbol{"F43C}} - \expandafter\def\csname simpleicon@steemicon\endcsname {\simpleiconsmap\symbol{"F43D}} - \expandafter\def\csname simpleicon@steemiticon\endcsname {\simpleiconsmap\symbol{"F43E}} - \expandafter\def\csname simpleicon@steinbergicon\endcsname {\simpleiconsmap\symbol{"F43F}} - \expandafter\def\csname simpleicon@stellaricon\endcsname {\simpleiconsmap\symbol{"F440}} - \expandafter\def\csname simpleicon@stencilicon\endcsname {\simpleiconsmap\symbol{"F441}} - \expandafter\def\csname simpleicon@stencylicon\endcsname {\simpleiconsmap\symbol{"F442}} - \expandafter\def\csname simpleicon@stimulusicon\endcsname {\simpleiconsmap\symbol{"F443}} - \expandafter\def\csname simpleicon@stitchericon\endcsname {\simpleiconsmap\symbol{"F444}} - \expandafter\def\csname simpleicon@stmicroelectronicsicon\endcsname {\simpleiconsmap\symbol{"F445}} - \expandafter\def\csname simpleicon@stockxicon\endcsname {\simpleiconsmap\symbol{"F446}} - \expandafter\def\csname simpleicon@stopstalkicon\endcsname {\simpleiconsmap\symbol{"F447}} - \expandafter\def\csname simpleicon@storyblokicon\endcsname {\simpleiconsmap\symbol{"F448}} - \expandafter\def\csname simpleicon@storybookicon\endcsname {\simpleiconsmap\symbol{"F449}} - \expandafter\def\csname simpleicon@strapiicon\endcsname {\simpleiconsmap\symbol{"F44A}} - \expandafter\def\csname simpleicon@stravaicon\endcsname {\simpleiconsmap\symbol{"F44B}} - \expandafter\def\csname simpleicon@streamlabsicon\endcsname {\simpleiconsmap\symbol{"F44C}} - \expandafter\def\csname simpleicon@streamliticon\endcsname {\simpleiconsmap\symbol{"F44D}} - \expandafter\def\csname simpleicon@streamrunnersicon\endcsname {\simpleiconsmap\symbol{"F44E}} - \expandafter\def\csname simpleicon@stripeicon\endcsname {\simpleiconsmap\symbol{"F44F}} - \expandafter\def\csname simpleicon@strongswanicon\endcsname {\simpleiconsmap\symbol{"F450}} - \expandafter\def\csname simpleicon@strykericon\endcsname {\simpleiconsmap\symbol{"F451}} - \expandafter\def\csname simpleicon@stubhubicon\endcsname {\simpleiconsmap\symbol{"F452}} - \expandafter\def\csname simpleicon@studio3ticon\endcsname {\simpleiconsmap\symbol{"F453}} - \expandafter\def\csname simpleicon@studyverseicon\endcsname {\simpleiconsmap\symbol{"F454}} - \expandafter\def\csname simpleicon@styledcomponentsicon\endcsname {\simpleiconsmap\symbol{"F455}} - \expandafter\def\csname simpleicon@stylelinticon\endcsname {\simpleiconsmap\symbol{"F456}} - \expandafter\def\csname simpleicon@styleshareicon\endcsname {\simpleiconsmap\symbol{"F457}} - \expandafter\def\csname simpleicon@stylusicon\endcsname {\simpleiconsmap\symbol{"F458}} - \expandafter\def\csname simpleicon@subaruicon\endcsname {\simpleiconsmap\symbol{"F459}} - \expandafter\def\csname simpleicon@sublimetexticon\endcsname {\simpleiconsmap\symbol{"F45A}} - \expandafter\def\csname simpleicon@substackicon\endcsname {\simpleiconsmap\symbol{"F45B}} - \expandafter\def\csname simpleicon@subtitleediticon\endcsname {\simpleiconsmap\symbol{"F45C}} - \expandafter\def\csname simpleicon@subversionicon\endcsname {\simpleiconsmap\symbol{"F45D}} - \expandafter\def\csname simpleicon@sucklessicon\endcsname {\simpleiconsmap\symbol{"F45E}} - \expandafter\def\csname simpleicon@sumologicicon\endcsname {\simpleiconsmap\symbol{"F45F}} - \expandafter\def\csname simpleicon@sunoicon\endcsname {\simpleiconsmap\symbol{"F460}} - \expandafter\def\csname simpleicon@sunriseicon\endcsname {\simpleiconsmap\symbol{"F461}} - \expandafter\def\csname simpleicon@supabaseicon\endcsname {\simpleiconsmap\symbol{"F462}} - \expandafter\def\csname simpleicon@supercreaseicon\endcsname {\simpleiconsmap\symbol{"F463}} - \expandafter\def\csname simpleicon@supermicroicon\endcsname {\simpleiconsmap\symbol{"F464}} - \expandafter\def\csname simpleicon@superusericon\endcsname {\simpleiconsmap\symbol{"F465}} - \expandafter\def\csname simpleicon@surrealdbicon\endcsname {\simpleiconsmap\symbol{"F466}} - \expandafter\def\csname simpleicon@surveymonkeyicon\endcsname {\simpleiconsmap\symbol{"F467}} - \expandafter\def\csname simpleicon@suseicon\endcsname {\simpleiconsmap\symbol{"F468}} - \expandafter\def\csname simpleicon@suzukiicon\endcsname {\simpleiconsmap\symbol{"F469}} - \expandafter\def\csname simpleicon@svelteicon\endcsname {\simpleiconsmap\symbol{"F46A}} - \expandafter\def\csname simpleicon@svgicon\endcsname {\simpleiconsmap\symbol{"F46B}} - \expandafter\def\csname simpleicon@svgdotjsicon\endcsname {\simpleiconsmap\symbol{"F46C}} - \expandafter\def\csname simpleicon@svgoicon\endcsname {\simpleiconsmap\symbol{"F46D}} - \expandafter\def\csname simpleicon@swaggericon\endcsname {\simpleiconsmap\symbol{"F46E}} - \expandafter\def\csname simpleicon@swarmicon\endcsname {\simpleiconsmap\symbol{"F46F}} - \expandafter\def\csname simpleicon@swcicon\endcsname {\simpleiconsmap\symbol{"F470}} - \expandafter\def\csname simpleicon@swifticon\endcsname {\simpleiconsmap\symbol{"F471}} - \expandafter\def\csname simpleicon@swiggyicon\endcsname {\simpleiconsmap\symbol{"F472}} - \expandafter\def\csname simpleicon@swipericon\endcsname {\simpleiconsmap\symbol{"F473}} - \expandafter\def\csname simpleicon@swricon\endcsname {\simpleiconsmap\symbol{"F474}} - \expandafter\def\csname simpleicon@symantecicon\endcsname {\simpleiconsmap\symbol{"F475}} - \expandafter\def\csname simpleicon@symbolabicon\endcsname {\simpleiconsmap\symbol{"F476}} - \expandafter\def\csname simpleicon@symfonyicon\endcsname {\simpleiconsmap\symbol{"F477}} - \expandafter\def\csname simpleicon@symphonyicon\endcsname {\simpleiconsmap\symbol{"F478}} - \expandafter\def\csname simpleicon@sympyicon\endcsname {\simpleiconsmap\symbol{"F479}} - \expandafter\def\csname simpleicon@syncthingicon\endcsname {\simpleiconsmap\symbol{"F47A}} - \expandafter\def\csname simpleicon@synologyicon\endcsname {\simpleiconsmap\symbol{"F47B}} - \expandafter\def\csname simpleicon@system76icon\endcsname {\simpleiconsmap\symbol{"F47C}} - \expandafter\def\csname simpleicon@tabelogicon\endcsname {\simpleiconsmap\symbol{"F47D}} - \expandafter\def\csname simpleicon@tableauicon\endcsname {\simpleiconsmap\symbol{"F47E}} - \expandafter\def\csname simpleicon@tablecheckicon\endcsname {\simpleiconsmap\symbol{"F47F}} - \expandafter\def\csname simpleicon@tacobellicon\endcsname {\simpleiconsmap\symbol{"F480}} - \expandafter\def\csname simpleicon@tadoicon\endcsname {\simpleiconsmap\symbol{"F481}} - \expandafter\def\csname simpleicon@taichigraphicsicon\endcsname {\simpleiconsmap\symbol{"F482}} - \expandafter\def\csname simpleicon@taichilangicon\endcsname {\simpleiconsmap\symbol{"F483}} - \expandafter\def\csname simpleicon@tailsicon\endcsname {\simpleiconsmap\symbol{"F484}} - \expandafter\def\csname simpleicon@tailscaleicon\endcsname {\simpleiconsmap\symbol{"F485}} - \expandafter\def\csname simpleicon@tailwindcssicon\endcsname {\simpleiconsmap\symbol{"F486}} - \expandafter\def\csname simpleicon@taipyicon\endcsname {\simpleiconsmap\symbol{"F487}} - \expandafter\def\csname simpleicon@taketwointeractivesoftwareicon\endcsname {\simpleiconsmap\symbol{"F488}} - \expandafter\def\csname simpleicon@talendicon\endcsname {\simpleiconsmap\symbol{"F489}} - \expandafter\def\csname simpleicon@talenthouseicon\endcsname {\simpleiconsmap\symbol{"F48A}} - \expandafter\def\csname simpleicon@talosicon\endcsname {\simpleiconsmap\symbol{"F48B}} - \expandafter\def\csname simpleicon@tamiyaicon\endcsname {\simpleiconsmap\symbol{"F48C}} - \expandafter\def\csname simpleicon@tampermonkeyicon\endcsname {\simpleiconsmap\symbol{"F48D}} - \expandafter\def\csname simpleicon@taobaoicon\endcsname {\simpleiconsmap\symbol{"F48E}} - \expandafter\def\csname simpleicon@tapasicon\endcsname {\simpleiconsmap\symbol{"F48F}} - \expandafter\def\csname simpleicon@targeticon\endcsname {\simpleiconsmap\symbol{"F490}} - \expandafter\def\csname simpleicon@taskicon\endcsname {\simpleiconsmap\symbol{"F491}} - \expandafter\def\csname simpleicon@tasmotaicon\endcsname {\simpleiconsmap\symbol{"F492}} - \expandafter\def\csname simpleicon@tataicon\endcsname {\simpleiconsmap\symbol{"F493}} - \expandafter\def\csname simpleicon@tauriicon\endcsname {\simpleiconsmap\symbol{"F494}} - \expandafter\def\csname simpleicon@taxbuzzicon\endcsname {\simpleiconsmap\symbol{"F495}} - \expandafter\def\csname simpleicon@tcsicon\endcsname {\simpleiconsmap\symbol{"F496}} - \expandafter\def\csname simpleicon@tealicon\endcsname {\simpleiconsmap\symbol{"F497}} - \expandafter\def\csname simpleicon@teamcityicon\endcsname {\simpleiconsmap\symbol{"F498}} - \expandafter\def\csname simpleicon@teamspeakicon\endcsname {\simpleiconsmap\symbol{"F499}} - \expandafter\def\csname simpleicon@teamviewericon\endcsname {\simpleiconsmap\symbol{"F49A}} - \expandafter\def\csname simpleicon@techcrunchicon\endcsname {\simpleiconsmap\symbol{"F49B}} - \expandafter\def\csname simpleicon@tedicon\endcsname {\simpleiconsmap\symbol{"F49C}} - \expandafter\def\csname simpleicon@teepublicicon\endcsname {\simpleiconsmap\symbol{"F49D}} - \expandafter\def\csname simpleicon@teespringicon\endcsname {\simpleiconsmap\symbol{"F49E}} - \expandafter\def\csname simpleicon@tektonicon\endcsname {\simpleiconsmap\symbol{"F49F}} - \expandafter\def\csname simpleicon@tele5icon\endcsname {\simpleiconsmap\symbol{"F4A0}} - \expandafter\def\csname simpleicon@telegramicon\endcsname {\simpleiconsmap\symbol{"F4A1}} - \expandafter\def\csname simpleicon@telegraphicon\endcsname {\simpleiconsmap\symbol{"F4A2}} - \expandafter\def\csname simpleicon@telequebecicon\endcsname {\simpleiconsmap\symbol{"F4A3}} - \expandafter\def\csname simpleicon@temporalicon\endcsname {\simpleiconsmap\symbol{"F4A4}} - \expandafter\def\csname simpleicon@tencentqqicon\endcsname {\simpleiconsmap\symbol{"F4A5}} - \expandafter\def\csname simpleicon@tensorflowicon\endcsname {\simpleiconsmap\symbol{"F4A6}} - \expandafter\def\csname simpleicon@teradataicon\endcsname {\simpleiconsmap\symbol{"F4A7}} - \expandafter\def\csname simpleicon@teratailicon\endcsname {\simpleiconsmap\symbol{"F4A8}} - \expandafter\def\csname simpleicon@termiusicon\endcsname {\simpleiconsmap\symbol{"F4A9}} - \expandafter\def\csname simpleicon@terraformicon\endcsname {\simpleiconsmap\symbol{"F4AA}} - \expandafter\def\csname simpleicon@tescoicon\endcsname {\simpleiconsmap\symbol{"F4AB}} - \expandafter\def\csname simpleicon@teslaicon\endcsname {\simpleiconsmap\symbol{"F4AC}} - \expandafter\def\csname simpleicon@testcafeicon\endcsname {\simpleiconsmap\symbol{"F4AD}} - \expandafter\def\csname simpleicon@testinicon\endcsname {\simpleiconsmap\symbol{"F4AE}} - \expandafter\def\csname simpleicon@testinglibraryicon\endcsname {\simpleiconsmap\symbol{"F4AF}} - \expandafter\def\csname simpleicon@testrailicon\endcsname {\simpleiconsmap\symbol{"F4B0}} - \expandafter\def\csname simpleicon@tethericon\endcsname {\simpleiconsmap\symbol{"F4B1}} - \expandafter\def\csname simpleicon@textpatternicon\endcsname {\simpleiconsmap\symbol{"F4B2}} - \expandafter\def\csname simpleicon@tgaicon\endcsname {\simpleiconsmap\symbol{"F4B3}} - \expandafter\def\csname simpleicon@thangsicon\endcsname {\simpleiconsmap\symbol{"F4B4}} - \expandafter\def\csname simpleicon@thealgorithmsicon\endcsname {\simpleiconsmap\symbol{"F4B5}} - \expandafter\def\csname simpleicon@theboringcompanyicon\endcsname {\simpleiconsmap\symbol{"F4B6}} - \expandafter\def\csname simpleicon@theconversationicon\endcsname {\simpleiconsmap\symbol{"F4B7}} - \expandafter\def\csname simpleicon@thefinalsicon\endcsname {\simpleiconsmap\symbol{"F4B8}} - \expandafter\def\csname simpleicon@theirishtimesicon\endcsname {\simpleiconsmap\symbol{"F4B9}} - \expandafter\def\csname simpleicon@themightyicon\endcsname {\simpleiconsmap\symbol{"F4BA}} - \expandafter\def\csname simpleicon@themodelsresourceicon\endcsname {\simpleiconsmap\symbol{"F4BB}} - \expandafter\def\csname simpleicon@themoviedatabaseicon\endcsname {\simpleiconsmap\symbol{"F4BC}} - \expandafter\def\csname simpleicon@thenorthfaceicon\endcsname {\simpleiconsmap\symbol{"F4BD}} - \expandafter\def\csname simpleicon@theodinprojecticon\endcsname {\simpleiconsmap\symbol{"F4BE}} - \expandafter\def\csname simpleicon@theregistericon\endcsname {\simpleiconsmap\symbol{"F4BF}} - \expandafter\def\csname simpleicon@thesoundsresourceicon\endcsname {\simpleiconsmap\symbol{"F4C0}} - \expandafter\def\csname simpleicon@thespritersresourceicon\endcsname {\simpleiconsmap\symbol{"F4C1}} - \expandafter\def\csname simpleicon@thewashingtonposticon\endcsname {\simpleiconsmap\symbol{"F4C2}} - \expandafter\def\csname simpleicon@thingiverseicon\endcsname {\simpleiconsmap\symbol{"F4C3}} - \expandafter\def\csname simpleicon@thinkpadicon\endcsname {\simpleiconsmap\symbol{"F4C4}} - \expandafter\def\csname simpleicon@thirdwebicon\endcsname {\simpleiconsmap\symbol{"F4C5}} - \expandafter\def\csname simpleicon@threadlessicon\endcsname {\simpleiconsmap\symbol{"F4C6}} - \expandafter\def\csname simpleicon@threadsicon\endcsname {\simpleiconsmap\symbol{"F4C7}} - \expandafter\def\csname simpleicon@threedotjsicon\endcsname {\simpleiconsmap\symbol{"F4C8}} - \expandafter\def\csname simpleicon@threemaicon\endcsname {\simpleiconsmap\symbol{"F4C9}} - \expandafter\def\csname simpleicon@thumbtackicon\endcsname {\simpleiconsmap\symbol{"F4CA}} - \expandafter\def\csname simpleicon@thunderbirdicon\endcsname {\simpleiconsmap\symbol{"F4CB}} - \expandafter\def\csname simpleicon@thunderstoreicon\endcsname {\simpleiconsmap\symbol{"F4CC}} - \expandafter\def\csname simpleicon@thurgauerkantonalbankicon\endcsname {\simpleiconsmap\symbol{"F4CD}} - \expandafter\def\csname simpleicon@thymeleaficon\endcsname {\simpleiconsmap\symbol{"F4CE}} - \expandafter\def\csname simpleicon@ticketmastericon\endcsname {\simpleiconsmap\symbol{"F4CF}} - \expandafter\def\csname simpleicon@ticktickicon\endcsname {\simpleiconsmap\symbol{"F4D0}} - \expandafter\def\csname simpleicon@tidalicon\endcsname {\simpleiconsmap\symbol{"F4D1}} - \expandafter\def\csname simpleicon@tiddlywikiicon\endcsname {\simpleiconsmap\symbol{"F4D2}} - \expandafter\def\csname simpleicon@tideicon\endcsname {\simpleiconsmap\symbol{"F4D3}} - \expandafter\def\csname simpleicon@tidyverseicon\endcsname {\simpleiconsmap\symbol{"F4D4}} - \expandafter\def\csname simpleicon@tietoevryicon\endcsname {\simpleiconsmap\symbol{"F4D5}} - \expandafter\def\csname simpleicon@tiktokicon\endcsname {\simpleiconsmap\symbol{"F4D6}} - \expandafter\def\csname simpleicon@tildapublishingicon\endcsname {\simpleiconsmap\symbol{"F4D7}} - \expandafter\def\csname simpleicon@tileicon\endcsname {\simpleiconsmap\symbol{"F4D8}} - \expandafter\def\csname simpleicon@timescaleicon\endcsname {\simpleiconsmap\symbol{"F4D9}} - \expandafter\def\csname simpleicon@tinaicon\endcsname {\simpleiconsmap\symbol{"F4DA}} - \expandafter\def\csname simpleicon@tindericon\endcsname {\simpleiconsmap\symbol{"F4DB}} - \expandafter\def\csname simpleicon@tindieicon\endcsname {\simpleiconsmap\symbol{"F4DC}} - \expandafter\def\csname simpleicon@tinkercadicon\endcsname {\simpleiconsmap\symbol{"F4DD}} - \expandafter\def\csname simpleicon@tinygradicon\endcsname {\simpleiconsmap\symbol{"F4DE}} - \expandafter\def\csname simpleicon@tinylettericon\endcsname {\simpleiconsmap\symbol{"F4DF}} - \expandafter\def\csname simpleicon@tistoryicon\endcsname {\simpleiconsmap\symbol{"F4E0}} - \expandafter\def\csname simpleicon@tldrawicon\endcsname {\simpleiconsmap\symbol{"F4E1}} - \expandafter\def\csname simpleicon@tmobileicon\endcsname {\simpleiconsmap\symbol{"F4E2}} - \expandafter\def\csname simpleicon@tmuxicon\endcsname {\simpleiconsmap\symbol{"F4E3}} - \expandafter\def\csname simpleicon@todoisticon\endcsname {\simpleiconsmap\symbol{"F4E4}} - \expandafter\def\csname simpleicon@togglicon\endcsname {\simpleiconsmap\symbol{"F4E5}} - \expandafter\def\csname simpleicon@toggltrackicon\endcsname {\simpleiconsmap\symbol{"F4E6}} - \expandafter\def\csname simpleicon@tokyometroicon\endcsname {\simpleiconsmap\symbol{"F4E7}} - \expandafter\def\csname simpleicon@tollicon\endcsname {\simpleiconsmap\symbol{"F4E8}} - \expandafter\def\csname simpleicon@tomlicon\endcsname {\simpleiconsmap\symbol{"F4E9}} - \expandafter\def\csname simpleicon@tomorrowlandicon\endcsname {\simpleiconsmap\symbol{"F4EA}} - \expandafter\def\csname simpleicon@tonicon\endcsname {\simpleiconsmap\symbol{"F4EB}} - \expandafter\def\csname simpleicon@topcodericon\endcsname {\simpleiconsmap\symbol{"F4EC}} - \expandafter\def\csname simpleicon@topdotggicon\endcsname {\simpleiconsmap\symbol{"F4ED}} - \expandafter\def\csname simpleicon@toptalicon\endcsname {\simpleiconsmap\symbol{"F4EE}} - \expandafter\def\csname simpleicon@torbrowsericon\endcsname {\simpleiconsmap\symbol{"F4EF}} - \expandafter\def\csname simpleicon@torprojecticon\endcsname {\simpleiconsmap\symbol{"F4F0}} - \expandafter\def\csname simpleicon@toshibaicon\endcsname {\simpleiconsmap\symbol{"F4F1}} - \expandafter\def\csname simpleicon@totvsicon\endcsname {\simpleiconsmap\symbol{"F4F2}} - \expandafter\def\csname simpleicon@tourboxicon\endcsname {\simpleiconsmap\symbol{"F4F3}} - \expandafter\def\csname simpleicon@towericon\endcsname {\simpleiconsmap\symbol{"F4F4}} - \expandafter\def\csname simpleicon@toyotaicon\endcsname {\simpleiconsmap\symbol{"F4F5}} - \expandafter\def\csname simpleicon@tplinkicon\endcsname {\simpleiconsmap\symbol{"F4F6}} - \expandafter\def\csname simpleicon@tqdmicon\endcsname {\simpleiconsmap\symbol{"F4F7}} - \expandafter\def\csname simpleicon@traccaricon\endcsname {\simpleiconsmap\symbol{"F4F8}} - \expandafter\def\csname simpleicon@tradingviewicon\endcsname {\simpleiconsmap\symbol{"F4F9}} - \expandafter\def\csname simpleicon@traefikmeshicon\endcsname {\simpleiconsmap\symbol{"F4FA}} - \expandafter\def\csname simpleicon@traefikproxyicon\endcsname {\simpleiconsmap\symbol{"F4FB}} - \expandafter\def\csname simpleicon@trailforksicon\endcsname {\simpleiconsmap\symbol{"F4FC}} - \expandafter\def\csname simpleicon@trainerroadicon\endcsname {\simpleiconsmap\symbol{"F4FD}} - \expandafter\def\csname simpleicon@trakticon\endcsname {\simpleiconsmap\symbol{"F4FE}} - \expandafter\def\csname simpleicon@transifexicon\endcsname {\simpleiconsmap\symbol{"F4FF}} - \expandafter\def\csname simpleicon@transmissionicon\endcsname {\simpleiconsmap\symbol{"F500}} - \expandafter\def\csname simpleicon@transportforirelandicon\endcsname {\simpleiconsmap\symbol{"F501}} - \expandafter\def\csname simpleicon@transportforlondonicon\endcsname {\simpleiconsmap\symbol{"F502}} - \expandafter\def\csname simpleicon@travisciicon\endcsname {\simpleiconsmap\symbol{"F503}} - \expandafter\def\csname simpleicon@treehouseicon\endcsname {\simpleiconsmap\symbol{"F504}} - \expandafter\def\csname simpleicon@trelloicon\endcsname {\simpleiconsmap\symbol{"F505}} - \expandafter\def\csname simpleicon@trendmicroicon\endcsname {\simpleiconsmap\symbol{"F506}} - \expandafter\def\csname simpleicon@treyarchicon\endcsname {\simpleiconsmap\symbol{"F507}} - \expandafter\def\csname simpleicon@tricentisicon\endcsname {\simpleiconsmap\symbol{"F508}} - \expandafter\def\csname simpleicon@triliumicon\endcsname {\simpleiconsmap\symbol{"F509}} - \expandafter\def\csname simpleicon@trillericon\endcsname {\simpleiconsmap\symbol{"F50A}} - \expandafter\def\csname simpleicon@trillertvicon\endcsname {\simpleiconsmap\symbol{"F50B}} - \expandafter\def\csname simpleicon@trinoicon\endcsname {\simpleiconsmap\symbol{"F50C}} - \expandafter\def\csname simpleicon@tripadvisoricon\endcsname {\simpleiconsmap\symbol{"F50D}} - \expandafter\def\csname simpleicon@tripdotcomicon\endcsname {\simpleiconsmap\symbol{"F50E}} - \expandafter\def\csname simpleicon@trivagoicon\endcsname {\simpleiconsmap\symbol{"F50F}} - \expandafter\def\csname simpleicon@trivyicon\endcsname {\simpleiconsmap\symbol{"F510}} - \expandafter\def\csname simpleicon@troveicon\endcsname {\simpleiconsmap\symbol{"F511}} - \expandafter\def\csname simpleicon@trpcicon\endcsname {\simpleiconsmap\symbol{"F512}} - \expandafter\def\csname simpleicon@truenasicon\endcsname {\simpleiconsmap\symbol{"F513}} - \expandafter\def\csname simpleicon@trueupicon\endcsname {\simpleiconsmap\symbol{"F514}} - \expandafter\def\csname simpleicon@truliaicon\endcsname {\simpleiconsmap\symbol{"F515}} - \expandafter\def\csname simpleicon@trustedshopsicon\endcsname {\simpleiconsmap\symbol{"F516}} - \expandafter\def\csname simpleicon@trustpiloticon\endcsname {\simpleiconsmap\symbol{"F517}} - \expandafter\def\csname simpleicon@tryhackmeicon\endcsname {\simpleiconsmap\symbol{"F518}} - \expandafter\def\csname simpleicon@tryitonlineicon\endcsname {\simpleiconsmap\symbol{"F519}} - \expandafter\def\csname simpleicon@tsnodeicon\endcsname {\simpleiconsmap\symbol{"F51A}} - \expandafter\def\csname simpleicon@tubiicon\endcsname {\simpleiconsmap\symbol{"F51B}} - \expandafter\def\csname simpleicon@tuiicon\endcsname {\simpleiconsmap\symbol{"F51C}} - \expandafter\def\csname simpleicon@tumblricon\endcsname {\simpleiconsmap\symbol{"F51D}} - \expandafter\def\csname simpleicon@tuneinicon\endcsname {\simpleiconsmap\symbol{"F51E}} - \expandafter\def\csname simpleicon@turboicon\endcsname {\simpleiconsmap\symbol{"F51F}} - \expandafter\def\csname simpleicon@turborepoicon\endcsname {\simpleiconsmap\symbol{"F520}} - \expandafter\def\csname simpleicon@turbosquidicon\endcsname {\simpleiconsmap\symbol{"F521}} - \expandafter\def\csname simpleicon@turkishairlinesicon\endcsname {\simpleiconsmap\symbol{"F522}} - \expandafter\def\csname simpleicon@tursoicon\endcsname {\simpleiconsmap\symbol{"F523}} - \expandafter\def\csname simpleicon@tutanotaicon\endcsname {\simpleiconsmap\symbol{"F524}} - \expandafter\def\csname simpleicon@tv4playicon\endcsname {\simpleiconsmap\symbol{"F525}} - \expandafter\def\csname simpleicon@tvtimeicon\endcsname {\simpleiconsmap\symbol{"F526}} - \expandafter\def\csname simpleicon@twilioicon\endcsname {\simpleiconsmap\symbol{"F527}} - \expandafter\def\csname simpleicon@twinklyicon\endcsname {\simpleiconsmap\symbol{"F528}} - \expandafter\def\csname simpleicon@twinmotionicon\endcsname {\simpleiconsmap\symbol{"F529}} - \expandafter\def\csname simpleicon@twitchicon\endcsname {\simpleiconsmap\symbol{"F52A}} - \expandafter\def\csname simpleicon@typeformicon\endcsname {\simpleiconsmap\symbol{"F52B}} - \expandafter\def\csname simpleicon@typeormicon\endcsname {\simpleiconsmap\symbol{"F52C}} - \expandafter\def\csname simpleicon@typericon\endcsname {\simpleiconsmap\symbol{"F52D}} - \expandafter\def\csname simpleicon@typescripticon\endcsname {\simpleiconsmap\symbol{"F52E}} - \expandafter\def\csname simpleicon@typo3icon\endcsname {\simpleiconsmap\symbol{"F52F}} - \expandafter\def\csname simpleicon@typsticon\endcsname {\simpleiconsmap\symbol{"F530}} - \expandafter\def\csname simpleicon@ubericon\endcsname {\simpleiconsmap\symbol{"F531}} - \expandafter\def\csname simpleicon@ubereatsicon\endcsname {\simpleiconsmap\symbol{"F532}} - \expandafter\def\csname simpleicon@ubiquitiicon\endcsname {\simpleiconsmap\symbol{"F533}} - \expandafter\def\csname simpleicon@ubisofticon\endcsname {\simpleiconsmap\symbol{"F534}} - \expandafter\def\csname simpleicon@ublockoriginicon\endcsname {\simpleiconsmap\symbol{"F535}} - \expandafter\def\csname simpleicon@ubuntuicon\endcsname {\simpleiconsmap\symbol{"F536}} - \expandafter\def\csname simpleicon@ubuntumateicon\endcsname {\simpleiconsmap\symbol{"F537}} - \expandafter\def\csname simpleicon@udacityicon\endcsname {\simpleiconsmap\symbol{"F538}} - \expandafter\def\csname simpleicon@udemyicon\endcsname {\simpleiconsmap\symbol{"F539}} - \expandafter\def\csname simpleicon@ufcicon\endcsname {\simpleiconsmap\symbol{"F53A}} - \expandafter\def\csname simpleicon@uikiticon\endcsname {\simpleiconsmap\symbol{"F53B}} - \expandafter\def\csname simpleicon@uipathicon\endcsname {\simpleiconsmap\symbol{"F53C}} - \expandafter\def\csname simpleicon@ululeicon\endcsname {\simpleiconsmap\symbol{"F53D}} - \expandafter\def\csname simpleicon@umamiicon\endcsname {\simpleiconsmap\symbol{"F53E}} - \expandafter\def\csname simpleicon@umbracoicon\endcsname {\simpleiconsmap\symbol{"F53F}} - \expandafter\def\csname simpleicon@umlicon\endcsname {\simpleiconsmap\symbol{"F540}} - \expandafter\def\csname simpleicon@unacademyicon\endcsname {\simpleiconsmap\symbol{"F541}} - \expandafter\def\csname simpleicon@underarmouricon\endcsname {\simpleiconsmap\symbol{"F542}} - \expandafter\def\csname simpleicon@underscoredotjsicon\endcsname {\simpleiconsmap\symbol{"F543}} - \expandafter\def\csname simpleicon@undertaleicon\endcsname {\simpleiconsmap\symbol{"F544}} - \expandafter\def\csname simpleicon@unicodeicon\endcsname {\simpleiconsmap\symbol{"F545}} - \expandafter\def\csname simpleicon@unilevericon\endcsname {\simpleiconsmap\symbol{"F546}} - \expandafter\def\csname simpleicon@uniqloicon\endcsname {\simpleiconsmap\symbol{"F547}} - \expandafter\def\csname simpleicon@uniqlojaicon\endcsname {\simpleiconsmap\symbol{"F548}} - \expandafter\def\csname simpleicon@unitedairlinesicon\endcsname {\simpleiconsmap\symbol{"F549}} - \expandafter\def\csname simpleicon@unitednationsicon\endcsname {\simpleiconsmap\symbol{"F54A}} - \expandafter\def\csname simpleicon@unityicon\endcsname {\simpleiconsmap\symbol{"F54B}} - \expandafter\def\csname simpleicon@unjsicon\endcsname {\simpleiconsmap\symbol{"F54C}} - \expandafter\def\csname simpleicon@unlicenseicon\endcsname {\simpleiconsmap\symbol{"F54D}} - \expandafter\def\csname simpleicon@unocssicon\endcsname {\simpleiconsmap\symbol{"F54E}} - \expandafter\def\csname simpleicon@unpkgicon\endcsname {\simpleiconsmap\symbol{"F54F}} - \expandafter\def\csname simpleicon@unraidicon\endcsname {\simpleiconsmap\symbol{"F550}} - \expandafter\def\csname simpleicon@unrealengineicon\endcsname {\simpleiconsmap\symbol{"F551}} - \expandafter\def\csname simpleicon@unsplashicon\endcsname {\simpleiconsmap\symbol{"F552}} - \expandafter\def\csname simpleicon@untappdicon\endcsname {\simpleiconsmap\symbol{"F553}} - \expandafter\def\csname simpleicon@upcloudicon\endcsname {\simpleiconsmap\symbol{"F554}} - \expandafter\def\csname simpleicon@upholdicon\endcsname {\simpleiconsmap\symbol{"F555}} - \expandafter\def\csname simpleicon@uplabsicon\endcsname {\simpleiconsmap\symbol{"F556}} - \expandafter\def\csname simpleicon@upptimeicon\endcsname {\simpleiconsmap\symbol{"F557}} - \expandafter\def\csname simpleicon@upsicon\endcsname {\simpleiconsmap\symbol{"F558}} - \expandafter\def\csname simpleicon@upstashicon\endcsname {\simpleiconsmap\symbol{"F559}} - \expandafter\def\csname simpleicon@uptimekumaicon\endcsname {\simpleiconsmap\symbol{"F55A}} - \expandafter\def\csname simpleicon@uptoboxicon\endcsname {\simpleiconsmap\symbol{"F55B}} - \expandafter\def\csname simpleicon@upworkicon\endcsname {\simpleiconsmap\symbol{"F55C}} - \expandafter\def\csname simpleicon@uspsicon\endcsname {\simpleiconsmap\symbol{"F55D}} - \expandafter\def\csname simpleicon@utorrenticon\endcsname {\simpleiconsmap\symbol{"F55E}} - \expandafter\def\csname simpleicon@vicon\endcsname {\simpleiconsmap\symbol{"F55F}} - \expandafter\def\csname simpleicon@v2exicon\endcsname {\simpleiconsmap\symbol{"F560}} - \expandafter\def\csname simpleicon@v8icon\endcsname {\simpleiconsmap\symbol{"F561}} - \expandafter\def\csname simpleicon@vaadinicon\endcsname {\simpleiconsmap\symbol{"F562}} - \expandafter\def\csname simpleicon@vagranticon\endcsname {\simpleiconsmap\symbol{"F563}} - \expandafter\def\csname simpleicon@valaicon\endcsname {\simpleiconsmap\symbol{"F564}} - \expandafter\def\csname simpleicon@valoranticon\endcsname {\simpleiconsmap\symbol{"F565}} - \expandafter\def\csname simpleicon@valveicon\endcsname {\simpleiconsmap\symbol{"F566}} - \expandafter\def\csname simpleicon@vaporicon\endcsname {\simpleiconsmap\symbol{"F567}} - \expandafter\def\csname simpleicon@vaulticon\endcsname {\simpleiconsmap\symbol{"F568}} - \expandafter\def\csname simpleicon@vaultwardenicon\endcsname {\simpleiconsmap\symbol{"F569}} - \expandafter\def\csname simpleicon@vauxhallicon\endcsname {\simpleiconsmap\symbol{"F56A}} - \expandafter\def\csname simpleicon@vbulletinicon\endcsname {\simpleiconsmap\symbol{"F56B}} - \expandafter\def\csname simpleicon@vectaryicon\endcsname {\simpleiconsmap\symbol{"F56C}} - \expandafter\def\csname simpleicon@vectorlogozoneicon\endcsname {\simpleiconsmap\symbol{"F56D}} - \expandafter\def\csname simpleicon@vectorworksicon\endcsname {\simpleiconsmap\symbol{"F56E}} - \expandafter\def\csname simpleicon@veeamicon\endcsname {\simpleiconsmap\symbol{"F56F}} - \expandafter\def\csname simpleicon@veedicon\endcsname {\simpleiconsmap\symbol{"F570}} - \expandafter\def\csname simpleicon@veepeeicon\endcsname {\simpleiconsmap\symbol{"F571}} - \expandafter\def\csname simpleicon@vegaicon\endcsname {\simpleiconsmap\symbol{"F572}} - \expandafter\def\csname simpleicon@vegasicon\endcsname {\simpleiconsmap\symbol{"F573}} - \expandafter\def\csname simpleicon@velogicon\endcsname {\simpleiconsmap\symbol{"F574}} - \expandafter\def\csname simpleicon@venmoicon\endcsname {\simpleiconsmap\symbol{"F575}} - \expandafter\def\csname simpleicon@vercelicon\endcsname {\simpleiconsmap\symbol{"F576}} - \expandafter\def\csname simpleicon@verdaccioicon\endcsname {\simpleiconsmap\symbol{"F577}} - \expandafter\def\csname simpleicon@veritasicon\endcsname {\simpleiconsmap\symbol{"F578}} - \expandafter\def\csname simpleicon@verizonicon\endcsname {\simpleiconsmap\symbol{"F579}} - \expandafter\def\csname simpleicon@vespaicon\endcsname {\simpleiconsmap\symbol{"F57A}} - \expandafter\def\csname simpleicon@vexxhosticon\endcsname {\simpleiconsmap\symbol{"F57B}} - \expandafter\def\csname simpleicon@vfairsicon\endcsname {\simpleiconsmap\symbol{"F57C}} - \expandafter\def\csname simpleicon@viadeoicon\endcsname {\simpleiconsmap\symbol{"F57D}} - \expandafter\def\csname simpleicon@viaplayicon\endcsname {\simpleiconsmap\symbol{"F57E}} - \expandafter\def\csname simpleicon@vibericon\endcsname {\simpleiconsmap\symbol{"F57F}} - \expandafter\def\csname simpleicon@vibloicon\endcsname {\simpleiconsmap\symbol{"F580}} - \expandafter\def\csname simpleicon@victoriametricsicon\endcsname {\simpleiconsmap\symbol{"F581}} - \expandafter\def\csname simpleicon@victronenergyicon\endcsname {\simpleiconsmap\symbol{"F582}} - \expandafter\def\csname simpleicon@vimicon\endcsname {\simpleiconsmap\symbol{"F583}} - \expandafter\def\csname simpleicon@vimeoicon\endcsname {\simpleiconsmap\symbol{"F584}} - \expandafter\def\csname simpleicon@vimeolivestreamicon\endcsname {\simpleiconsmap\symbol{"F585}} - \expandafter\def\csname simpleicon@virginicon\endcsname {\simpleiconsmap\symbol{"F586}} - \expandafter\def\csname simpleicon@virginatlanticicon\endcsname {\simpleiconsmap\symbol{"F587}} - \expandafter\def\csname simpleicon@virginmediaicon\endcsname {\simpleiconsmap\symbol{"F588}} - \expandafter\def\csname simpleicon@virtualboxicon\endcsname {\simpleiconsmap\symbol{"F589}} - \expandafter\def\csname simpleicon@virustotalicon\endcsname {\simpleiconsmap\symbol{"F58A}} - \expandafter\def\csname simpleicon@visaicon\endcsname {\simpleiconsmap\symbol{"F58B}} - \expandafter\def\csname simpleicon@visxicon\endcsname {\simpleiconsmap\symbol{"F58C}} - \expandafter\def\csname simpleicon@viteicon\endcsname {\simpleiconsmap\symbol{"F58D}} - \expandafter\def\csname simpleicon@vitepressicon\endcsname {\simpleiconsmap\symbol{"F58E}} - \expandafter\def\csname simpleicon@vitessicon\endcsname {\simpleiconsmap\symbol{"F58F}} - \expandafter\def\csname simpleicon@vitesticon\endcsname {\simpleiconsmap\symbol{"F590}} - \expandafter\def\csname simpleicon@vivaldiicon\endcsname {\simpleiconsmap\symbol{"F591}} - \expandafter\def\csname simpleicon@vivawalleticon\endcsname {\simpleiconsmap\symbol{"F592}} - \expandafter\def\csname simpleicon@vivinoicon\endcsname {\simpleiconsmap\symbol{"F593}} - \expandafter\def\csname simpleicon@vivinticon\endcsname {\simpleiconsmap\symbol{"F594}} - \expandafter\def\csname simpleicon@vivoicon\endcsname {\simpleiconsmap\symbol{"F595}} - \expandafter\def\csname simpleicon@vkicon\endcsname {\simpleiconsmap\symbol{"F596}} - \expandafter\def\csname simpleicon@vlcmediaplayericon\endcsname {\simpleiconsmap\symbol{"F597}} - \expandafter\def\csname simpleicon@vmwareicon\endcsname {\simpleiconsmap\symbol{"F598}} - \expandafter\def\csname simpleicon@vodafoneicon\endcsname {\simpleiconsmap\symbol{"F599}} - \expandafter\def\csname simpleicon@voidlinuxicon\endcsname {\simpleiconsmap\symbol{"F59A}} - \expandafter\def\csname simpleicon@voipdotmsicon\endcsname {\simpleiconsmap\symbol{"F59B}} - \expandafter\def\csname simpleicon@volkswagenicon\endcsname {\simpleiconsmap\symbol{"F59C}} - \expandafter\def\csname simpleicon@volvoicon\endcsname {\simpleiconsmap\symbol{"F59D}} - \expandafter\def\csname simpleicon@vonageicon\endcsname {\simpleiconsmap\symbol{"F59E}} - \expandafter\def\csname simpleicon@vorondesignicon\endcsname {\simpleiconsmap\symbol{"F59F}} - \expandafter\def\csname simpleicon@vowpalwabbiticon\endcsname {\simpleiconsmap\symbol{"F5A0}} - \expandafter\def\csname simpleicon@voxicon\endcsname {\simpleiconsmap\symbol{"F5A1}} - \expandafter\def\csname simpleicon@vscoicon\endcsname {\simpleiconsmap\symbol{"F5A2}} - \expandafter\def\csname simpleicon@vscodiumicon\endcsname {\simpleiconsmap\symbol{"F5A3}} - \expandafter\def\csname simpleicon@vtexicon\endcsname {\simpleiconsmap\symbol{"F5A4}} - \expandafter\def\csname simpleicon@vuedotjsicon\endcsname {\simpleiconsmap\symbol{"F5A5}} - \expandafter\def\csname simpleicon@vuetifyicon\endcsname {\simpleiconsmap\symbol{"F5A6}} - \expandafter\def\csname simpleicon@vulkanicon\endcsname {\simpleiconsmap\symbol{"F5A7}} - \expandafter\def\csname simpleicon@vultricon\endcsname {\simpleiconsmap\symbol{"F5A8}} - \expandafter\def\csname simpleicon@vyondicon\endcsname {\simpleiconsmap\symbol{"F5A9}} - \expandafter\def\csname simpleicon@w3schoolsicon\endcsname {\simpleiconsmap\symbol{"F5AA}} - \expandafter\def\csname simpleicon@wacomicon\endcsname {\simpleiconsmap\symbol{"F5AB}} - \expandafter\def\csname simpleicon@wagmiicon\endcsname {\simpleiconsmap\symbol{"F5AC}} - \expandafter\def\csname simpleicon@wagtailicon\endcsname {\simpleiconsmap\symbol{"F5AD}} - \expandafter\def\csname simpleicon@wailsicon\endcsname {\simpleiconsmap\symbol{"F5AE}} - \expandafter\def\csname simpleicon@wakatimeicon\endcsname {\simpleiconsmap\symbol{"F5AF}} - \expandafter\def\csname simpleicon@walkmanicon\endcsname {\simpleiconsmap\symbol{"F5B0}} - \expandafter\def\csname simpleicon@wallabagicon\endcsname {\simpleiconsmap\symbol{"F5B1}} - \expandafter\def\csname simpleicon@walletconnecticon\endcsname {\simpleiconsmap\symbol{"F5B2}} - \expandafter\def\csname simpleicon@walmarticon\endcsname {\simpleiconsmap\symbol{"F5B3}} - \expandafter\def\csname simpleicon@wantedlyicon\endcsname {\simpleiconsmap\symbol{"F5B4}} - \expandafter\def\csname simpleicon@wappalyzericon\endcsname {\simpleiconsmap\symbol{"F5B5}} - \expandafter\def\csname simpleicon@warnerbrosicon\endcsname {\simpleiconsmap\symbol{"F5B6}} - \expandafter\def\csname simpleicon@warpicon\endcsname {\simpleiconsmap\symbol{"F5B7}} - \expandafter\def\csname simpleicon@wasabiicon\endcsname {\simpleiconsmap\symbol{"F5B8}} - \expandafter\def\csname simpleicon@wasmcloudicon\endcsname {\simpleiconsmap\symbol{"F5B9}} - \expandafter\def\csname simpleicon@wasmericon\endcsname {\simpleiconsmap\symbol{"F5BA}} - \expandafter\def\csname simpleicon@watchtowericon\endcsname {\simpleiconsmap\symbol{"F5BB}} - \expandafter\def\csname simpleicon@wattpadicon\endcsname {\simpleiconsmap\symbol{"F5BC}} - \expandafter\def\csname simpleicon@waylandicon\endcsname {\simpleiconsmap\symbol{"F5BD}} - \expandafter\def\csname simpleicon@wazeicon\endcsname {\simpleiconsmap\symbol{"F5BE}} - \expandafter\def\csname simpleicon@wazirxicon\endcsname {\simpleiconsmap\symbol{"F5BF}} - \expandafter\def\csname simpleicon@wearosicon\endcsname {\simpleiconsmap\symbol{"F5C0}} - \expandafter\def\csname simpleicon@weasylicon\endcsname {\simpleiconsmap\symbol{"F5C1}} - \expandafter\def\csname simpleicon@web3dotjsicon\endcsname {\simpleiconsmap\symbol{"F5C2}} - \expandafter\def\csname simpleicon@webassemblyicon\endcsname {\simpleiconsmap\symbol{"F5C3}} - \expandafter\def\csname simpleicon@webauthnicon\endcsname {\simpleiconsmap\symbol{"F5C4}} - \expandafter\def\csname simpleicon@webcomponentsdotorgicon\endcsname {\simpleiconsmap\symbol{"F5C5}} - \expandafter\def\csname simpleicon@webdriverioicon\endcsname {\simpleiconsmap\symbol{"F5C6}} - \expandafter\def\csname simpleicon@webexicon\endcsname {\simpleiconsmap\symbol{"F5C7}} - \expandafter\def\csname simpleicon@webflowicon\endcsname {\simpleiconsmap\symbol{"F5C8}} - \expandafter\def\csname simpleicon@webglicon\endcsname {\simpleiconsmap\symbol{"F5C9}} - \expandafter\def\csname simpleicon@webgpuicon\endcsname {\simpleiconsmap\symbol{"F5CA}} - \expandafter\def\csname simpleicon@weblateicon\endcsname {\simpleiconsmap\symbol{"F5CB}} - \expandafter\def\csname simpleicon@webminicon\endcsname {\simpleiconsmap\symbol{"F5CC}} - \expandafter\def\csname simpleicon@webmoneyicon\endcsname {\simpleiconsmap\symbol{"F5CD}} - \expandafter\def\csname simpleicon@webpackicon\endcsname {\simpleiconsmap\symbol{"F5CE}} - \expandafter\def\csname simpleicon@webrtcicon\endcsname {\simpleiconsmap\symbol{"F5CF}} - \expandafter\def\csname simpleicon@webstormicon\endcsname {\simpleiconsmap\symbol{"F5D0}} - \expandafter\def\csname simpleicon@webtoonicon\endcsname {\simpleiconsmap\symbol{"F5D1}} - \expandafter\def\csname simpleicon@webtreesicon\endcsname {\simpleiconsmap\symbol{"F5D2}} - \expandafter\def\csname simpleicon@wechaticon\endcsname {\simpleiconsmap\symbol{"F5D3}} - \expandafter\def\csname simpleicon@wegameicon\endcsname {\simpleiconsmap\symbol{"F5D4}} - \expandafter\def\csname simpleicon@weightsandbiasesicon\endcsname {\simpleiconsmap\symbol{"F5D5}} - \expandafter\def\csname simpleicon@welcometothejungleicon\endcsname {\simpleiconsmap\symbol{"F5D6}} - \expandafter\def\csname simpleicon@wellfoundicon\endcsname {\simpleiconsmap\symbol{"F5D7}} - \expandafter\def\csname simpleicon@wellsfargoicon\endcsname {\simpleiconsmap\symbol{"F5D8}} - \expandafter\def\csname simpleicon@wemoicon\endcsname {\simpleiconsmap\symbol{"F5D9}} - \expandafter\def\csname simpleicon@westerndigitalicon\endcsname {\simpleiconsmap\symbol{"F5DA}} - \expandafter\def\csname simpleicon@westernunionicon\endcsname {\simpleiconsmap\symbol{"F5DB}} - \expandafter\def\csname simpleicon@wetransfericon\endcsname {\simpleiconsmap\symbol{"F5DC}} - \expandafter\def\csname simpleicon@weztermicon\endcsname {\simpleiconsmap\symbol{"F5DD}} - \expandafter\def\csname simpleicon@wgpuicon\endcsname {\simpleiconsmap\symbol{"F5DE}} - \expandafter\def\csname simpleicon@whatsappicon\endcsname {\simpleiconsmap\symbol{"F5DF}} - \expandafter\def\csname simpleicon@wheniworkicon\endcsname {\simpleiconsmap\symbol{"F5E0}} - \expandafter\def\csname simpleicon@wiiicon\endcsname {\simpleiconsmap\symbol{"F5E1}} - \expandafter\def\csname simpleicon@wiiuicon\endcsname {\simpleiconsmap\symbol{"F5E2}} - \expandafter\def\csname simpleicon@wikidataicon\endcsname {\simpleiconsmap\symbol{"F5E3}} - \expandafter\def\csname simpleicon@wikidotggicon\endcsname {\simpleiconsmap\symbol{"F5E4}} - \expandafter\def\csname simpleicon@wikidotjsicon\endcsname {\simpleiconsmap\symbol{"F5E5}} - \expandafter\def\csname simpleicon@wikimediacommonsicon\endcsname {\simpleiconsmap\symbol{"F5E6}} - \expandafter\def\csname simpleicon@wikimediafoundationicon\endcsname {\simpleiconsmap\symbol{"F5E7}} - \expandafter\def\csname simpleicon@wikipediaicon\endcsname {\simpleiconsmap\symbol{"F5E8}} - \expandafter\def\csname simpleicon@wikiquoteicon\endcsname {\simpleiconsmap\symbol{"F5E9}} - \expandafter\def\csname simpleicon@wikivoyageicon\endcsname {\simpleiconsmap\symbol{"F5EA}} - \expandafter\def\csname simpleicon@winampicon\endcsname {\simpleiconsmap\symbol{"F5EB}} - \expandafter\def\csname simpleicon@wiproicon\endcsname {\simpleiconsmap\symbol{"F5EC}} - \expandafter\def\csname simpleicon@wireicon\endcsname {\simpleiconsmap\symbol{"F5ED}} - \expandafter\def\csname simpleicon@wireguardicon\endcsname {\simpleiconsmap\symbol{"F5EE}} - \expandafter\def\csname simpleicon@wiresharkicon\endcsname {\simpleiconsmap\symbol{"F5EF}} - \expandafter\def\csname simpleicon@wiseicon\endcsname {\simpleiconsmap\symbol{"F5F0}} - \expandafter\def\csname simpleicon@wishicon\endcsname {\simpleiconsmap\symbol{"F5F1}} - \expandafter\def\csname simpleicon@wistiaicon\endcsname {\simpleiconsmap\symbol{"F5F2}} - \expandafter\def\csname simpleicon@wixicon\endcsname {\simpleiconsmap\symbol{"F5F3}} - \expandafter\def\csname simpleicon@wizzairicon\endcsname {\simpleiconsmap\symbol{"F5F4}} - \expandafter\def\csname simpleicon@wolframicon\endcsname {\simpleiconsmap\symbol{"F5F5}} - \expandafter\def\csname simpleicon@wolframlanguageicon\endcsname {\simpleiconsmap\symbol{"F5F6}} - \expandafter\def\csname simpleicon@wolframmathematicaicon\endcsname {\simpleiconsmap\symbol{"F5F7}} - \expandafter\def\csname simpleicon@wondershareicon\endcsname {\simpleiconsmap\symbol{"F5F8}} - \expandafter\def\csname simpleicon@wondersharefilmoraicon\endcsname {\simpleiconsmap\symbol{"F5F9}} - \expandafter\def\csname simpleicon@wooicon\endcsname {\simpleiconsmap\symbol{"F5FA}} - \expandafter\def\csname simpleicon@woocommerceicon\endcsname {\simpleiconsmap\symbol{"F5FB}} - \expandafter\def\csname simpleicon@wordpressicon\endcsname {\simpleiconsmap\symbol{"F5FC}} - \expandafter\def\csname simpleicon@workplaceicon\endcsname {\simpleiconsmap\symbol{"F5FD}} - \expandafter\def\csname simpleicon@worldhealthorganizationicon\endcsname {\simpleiconsmap\symbol{"F5FE}} - \expandafter\def\csname simpleicon@wpengineicon\endcsname {\simpleiconsmap\symbol{"F5FF}} - \expandafter\def\csname simpleicon@wpexplorericon\endcsname {\simpleiconsmap\symbol{"F600}} - \expandafter\def\csname simpleicon@wprocketicon\endcsname {\simpleiconsmap\symbol{"F601}} - \expandafter\def\csname simpleicon@writedotasicon\endcsname {\simpleiconsmap\symbol{"F602}} - \expandafter\def\csname simpleicon@wweicon\endcsname {\simpleiconsmap\symbol{"F603}} - \expandafter\def\csname simpleicon@wwiseicon\endcsname {\simpleiconsmap\symbol{"F604}} - \expandafter\def\csname simpleicon@wykopicon\endcsname {\simpleiconsmap\symbol{"F605}} - \expandafter\def\csname simpleicon@wyzeicon\endcsname {\simpleiconsmap\symbol{"F606}} - \expandafter\def\csname simpleicon@xicon\endcsname {\simpleiconsmap\symbol{"F607}} - \expandafter\def\csname simpleicon@xamppicon\endcsname {\simpleiconsmap\symbol{"F608}} - \expandafter\def\csname simpleicon@xcodeicon\endcsname {\simpleiconsmap\symbol{"F609}} - \expandafter\def\csname simpleicon@xdadevelopersicon\endcsname {\simpleiconsmap\symbol{"F60A}} - \expandafter\def\csname simpleicon@xdotorgicon\endcsname {\simpleiconsmap\symbol{"F60B}} - \expandafter\def\csname simpleicon@xenditicon\endcsname {\simpleiconsmap\symbol{"F60C}} - \expandafter\def\csname simpleicon@xeroicon\endcsname {\simpleiconsmap\symbol{"F60D}} - \expandafter\def\csname simpleicon@xfceicon\endcsname {\simpleiconsmap\symbol{"F60E}} - \expandafter\def\csname simpleicon@xiaohongshuicon\endcsname {\simpleiconsmap\symbol{"F60F}} - \expandafter\def\csname simpleicon@xiaomiicon\endcsname {\simpleiconsmap\symbol{"F610}} - \expandafter\def\csname simpleicon@xingicon\endcsname {\simpleiconsmap\symbol{"F611}} - \expandafter\def\csname simpleicon@xmppicon\endcsname {\simpleiconsmap\symbol{"F612}} - \expandafter\def\csname simpleicon@xoicon\endcsname {\simpleiconsmap\symbol{"F613}} - \expandafter\def\csname simpleicon@xrpicon\endcsname {\simpleiconsmap\symbol{"F614}} - \expandafter\def\csname simpleicon@xspliticon\endcsname {\simpleiconsmap\symbol{"F615}} - \expandafter\def\csname simpleicon@xstateicon\endcsname {\simpleiconsmap\symbol{"F616}} - \expandafter\def\csname simpleicon@yabaiicon\endcsname {\simpleiconsmap\symbol{"F617}} - \expandafter\def\csname simpleicon@yaleicon\endcsname {\simpleiconsmap\symbol{"F618}} - \expandafter\def\csname simpleicon@yamahacorporationicon\endcsname {\simpleiconsmap\symbol{"F619}} - \expandafter\def\csname simpleicon@yamahamotorcorporationicon\endcsname {\simpleiconsmap\symbol{"F61A}} - \expandafter\def\csname simpleicon@yamlicon\endcsname {\simpleiconsmap\symbol{"F61B}} - \expandafter\def\csname simpleicon@yandexcloudicon\endcsname {\simpleiconsmap\symbol{"F61C}} - \expandafter\def\csname simpleicon@yarnicon\endcsname {\simpleiconsmap\symbol{"F61D}} - \expandafter\def\csname simpleicon@ycombinatoricon\endcsname {\simpleiconsmap\symbol{"F61E}} - \expandafter\def\csname simpleicon@yelpicon\endcsname {\simpleiconsmap\symbol{"F61F}} - \expandafter\def\csname simpleicon@yetiicon\endcsname {\simpleiconsmap\symbol{"F620}} - \expandafter\def\csname simpleicon@yoasticon\endcsname {\simpleiconsmap\symbol{"F621}} - \expandafter\def\csname simpleicon@youtubeicon\endcsname {\simpleiconsmap\symbol{"F622}} - \expandafter\def\csname simpleicon@youtubegamingicon\endcsname {\simpleiconsmap\symbol{"F623}} - \expandafter\def\csname simpleicon@youtubekidsicon\endcsname {\simpleiconsmap\symbol{"F624}} - \expandafter\def\csname simpleicon@youtubemusicicon\endcsname {\simpleiconsmap\symbol{"F625}} - \expandafter\def\csname simpleicon@youtubeshortsicon\endcsname {\simpleiconsmap\symbol{"F626}} - \expandafter\def\csname simpleicon@youtubestudioicon\endcsname {\simpleiconsmap\symbol{"F627}} - \expandafter\def\csname simpleicon@youtubetvicon\endcsname {\simpleiconsmap\symbol{"F628}} - \expandafter\def\csname simpleicon@yricon\endcsname {\simpleiconsmap\symbol{"F629}} - \expandafter\def\csname simpleicon@yubicoicon\endcsname {\simpleiconsmap\symbol{"F62A}} - \expandafter\def\csname simpleicon@yunohosticon\endcsname {\simpleiconsmap\symbol{"F62B}} - \expandafter\def\csname simpleicon@zabkaicon\endcsname {\simpleiconsmap\symbol{"F62C}} - \expandafter\def\csname simpleicon@zaimicon\endcsname {\simpleiconsmap\symbol{"F62D}} - \expandafter\def\csname simpleicon@zalandoicon\endcsname {\simpleiconsmap\symbol{"F62E}} - \expandafter\def\csname simpleicon@zaloicon\endcsname {\simpleiconsmap\symbol{"F62F}} - \expandafter\def\csname simpleicon@zapicon\endcsname {\simpleiconsmap\symbol{"F630}} - \expandafter\def\csname simpleicon@zapiericon\endcsname {\simpleiconsmap\symbol{"F631}} - \expandafter\def\csname simpleicon@zaraicon\endcsname {\simpleiconsmap\symbol{"F632}} - \expandafter\def\csname simpleicon@zazzleicon\endcsname {\simpleiconsmap\symbol{"F633}} - \expandafter\def\csname simpleicon@zcashicon\endcsname {\simpleiconsmap\symbol{"F634}} - \expandafter\def\csname simpleicon@zcoolicon\endcsname {\simpleiconsmap\symbol{"F635}} - \expandafter\def\csname simpleicon@zdficon\endcsname {\simpleiconsmap\symbol{"F636}} - \expandafter\def\csname simpleicon@zebpayicon\endcsname {\simpleiconsmap\symbol{"F637}} - \expandafter\def\csname simpleicon@zebratechnologiesicon\endcsname {\simpleiconsmap\symbol{"F638}} - \expandafter\def\csname simpleicon@zedindustriesicon\endcsname {\simpleiconsmap\symbol{"F639}} - \expandafter\def\csname simpleicon@zelleicon\endcsname {\simpleiconsmap\symbol{"F63A}} - \expandafter\def\csname simpleicon@zendicon\endcsname {\simpleiconsmap\symbol{"F63B}} - \expandafter\def\csname simpleicon@zendeskicon\endcsname {\simpleiconsmap\symbol{"F63C}} - \expandafter\def\csname simpleicon@zennicon\endcsname {\simpleiconsmap\symbol{"F63D}} - \expandafter\def\csname simpleicon@zenodoicon\endcsname {\simpleiconsmap\symbol{"F63E}} - \expandafter\def\csname simpleicon@zensaricon\endcsname {\simpleiconsmap\symbol{"F63F}} - \expandafter\def\csname simpleicon@zerodhaicon\endcsname {\simpleiconsmap\symbol{"F640}} - \expandafter\def\csname simpleicon@zerplyicon\endcsname {\simpleiconsmap\symbol{"F641}} - \expandafter\def\csname simpleicon@zettlricon\endcsname {\simpleiconsmap\symbol{"F642}} - \expandafter\def\csname simpleicon@zhihuicon\endcsname {\simpleiconsmap\symbol{"F643}} - \expandafter\def\csname simpleicon@zigicon\endcsname {\simpleiconsmap\symbol{"F644}} - \expandafter\def\csname simpleicon@zigbeeicon\endcsname {\simpleiconsmap\symbol{"F645}} - \expandafter\def\csname simpleicon@zigbee2mqtticon\endcsname {\simpleiconsmap\symbol{"F646}} - \expandafter\def\csname simpleicon@ziggoicon\endcsname {\simpleiconsmap\symbol{"F647}} - \expandafter\def\csname simpleicon@zilchicon\endcsname {\simpleiconsmap\symbol{"F648}} - \expandafter\def\csname simpleicon@zillowicon\endcsname {\simpleiconsmap\symbol{"F649}} - \expandafter\def\csname simpleicon@zincsearchicon\endcsname {\simpleiconsmap\symbol{"F64A}} - \expandafter\def\csname simpleicon@zingaticon\endcsname {\simpleiconsmap\symbol{"F64B}} - \expandafter\def\csname simpleicon@zodicon\endcsname {\simpleiconsmap\symbol{"F64C}} - \expandafter\def\csname simpleicon@zohoicon\endcsname {\simpleiconsmap\symbol{"F64D}} - \expandafter\def\csname simpleicon@zoipericon\endcsname {\simpleiconsmap\symbol{"F64E}} - \expandafter\def\csname simpleicon@zomatoicon\endcsname {\simpleiconsmap\symbol{"F64F}} - \expandafter\def\csname simpleicon@zoomicon\endcsname {\simpleiconsmap\symbol{"F650}} - \expandafter\def\csname simpleicon@zorinicon\endcsname {\simpleiconsmap\symbol{"F651}} - \expandafter\def\csname simpleicon@zoteroicon\endcsname {\simpleiconsmap\symbol{"F652}} - \expandafter\def\csname simpleicon@zshicon\endcsname {\simpleiconsmap\symbol{"F653}} - \expandafter\def\csname simpleicon@zulipicon\endcsname {\simpleiconsmap\symbol{"F654}} - \expandafter\def\csname simpleicon@zyteicon\endcsname {\simpleiconsmap\symbol{"F655}}
\ No newline at end of file + \expandafter\def\csname simpleicon@baserowicon\endcsname {\simpleiconsmap\symbol{"EB43}} + \expandafter\def\csname simpleicon@basicattentiontokenicon\endcsname {\simpleiconsmap\symbol{"EB44}} + \expandafter\def\csname simpleicon@bastyonicon\endcsname {\simpleiconsmap\symbol{"EB45}} + \expandafter\def\csname simpleicon@baticon\endcsname {\simpleiconsmap\symbol{"EB46}} + \expandafter\def\csname simpleicon@bataicon\endcsname {\simpleiconsmap\symbol{"EB47}} + \expandafter\def\csname simpleicon@battledotneticon\endcsname {\simpleiconsmap\symbol{"EB48}} + \expandafter\def\csname simpleicon@bazelicon\endcsname {\simpleiconsmap\symbol{"EB49}} + \expandafter\def\csname simpleicon@beatporticon\endcsname {\simpleiconsmap\symbol{"EB4A}} + \expandafter\def\csname simpleicon@beatsicon\endcsname {\simpleiconsmap\symbol{"EB4B}} + \expandafter\def\csname simpleicon@beatsbydreicon\endcsname {\simpleiconsmap\symbol{"EB4C}} + \expandafter\def\csname simpleicon@beatstarsicon\endcsname {\simpleiconsmap\symbol{"EB4D}} + \expandafter\def\csname simpleicon@beekeeperstudioicon\endcsname {\simpleiconsmap\symbol{"EB4E}} + \expandafter\def\csname simpleicon@behanceicon\endcsname {\simpleiconsmap\symbol{"EB4F}} + \expandafter\def\csname simpleicon@beijingsubwayicon\endcsname {\simpleiconsmap\symbol{"EB50}} + \expandafter\def\csname simpleicon@bemicon\endcsname {\simpleiconsmap\symbol{"EB51}} + \expandafter\def\csname simpleicon@bentleyicon\endcsname {\simpleiconsmap\symbol{"EB52}} + \expandafter\def\csname simpleicon@bentoicon\endcsname {\simpleiconsmap\symbol{"EB53}} + \expandafter\def\csname simpleicon@bentoboxicon\endcsname {\simpleiconsmap\symbol{"EB54}} + \expandafter\def\csname simpleicon@bentomlicon\endcsname {\simpleiconsmap\symbol{"EB55}} + \expandafter\def\csname simpleicon@berealicon\endcsname {\simpleiconsmap\symbol{"EB56}} + \expandafter\def\csname simpleicon@betfairicon\endcsname {\simpleiconsmap\symbol{"EB57}} + \expandafter\def\csname simpleicon@betterstackicon\endcsname {\simpleiconsmap\symbol{"EB58}} + \expandafter\def\csname simpleicon@bevyicon\endcsname {\simpleiconsmap\symbol{"EB59}} + \expandafter\def\csname simpleicon@bigbasketicon\endcsname {\simpleiconsmap\symbol{"EB5A}} + \expandafter\def\csname simpleicon@bigbluebuttonicon\endcsname {\simpleiconsmap\symbol{"EB5B}} + \expandafter\def\csname simpleicon@bigcartelicon\endcsname {\simpleiconsmap\symbol{"EB5C}} + \expandafter\def\csname simpleicon@bigcommerceicon\endcsname {\simpleiconsmap\symbol{"EB5D}} + \expandafter\def\csname simpleicon@bilibiliicon\endcsname {\simpleiconsmap\symbol{"EB5E}} + \expandafter\def\csname simpleicon@billboardicon\endcsname {\simpleiconsmap\symbol{"EB5F}} + \expandafter\def\csname simpleicon@bimicon\endcsname {\simpleiconsmap\symbol{"EB60}} + \expandafter\def\csname simpleicon@binanceicon\endcsname {\simpleiconsmap\symbol{"EB61}} + \expandafter\def\csname simpleicon@biolinkicon\endcsname {\simpleiconsmap\symbol{"EB62}} + \expandafter\def\csname simpleicon@biomeicon\endcsname {\simpleiconsmap\symbol{"EB63}} + \expandafter\def\csname simpleicon@bisecthostingicon\endcsname {\simpleiconsmap\symbol{"EB64}} + \expandafter\def\csname simpleicon@biticon\endcsname {\simpleiconsmap\symbol{"EB65}} + \expandafter\def\csname simpleicon@bitbucketicon\endcsname {\simpleiconsmap\symbol{"EB66}} + \expandafter\def\csname simpleicon@bitcoinicon\endcsname {\simpleiconsmap\symbol{"EB67}} + \expandafter\def\csname simpleicon@bitcoincashicon\endcsname {\simpleiconsmap\symbol{"EB68}} + \expandafter\def\csname simpleicon@bitcoinsvicon\endcsname {\simpleiconsmap\symbol{"EB69}} + \expandafter\def\csname simpleicon@bitcometicon\endcsname {\simpleiconsmap\symbol{"EB6A}} + \expandafter\def\csname simpleicon@bitdefendericon\endcsname {\simpleiconsmap\symbol{"EB6B}} + \expandafter\def\csname simpleicon@bitlyicon\endcsname {\simpleiconsmap\symbol{"EB6C}} + \expandafter\def\csname simpleicon@bitriseicon\endcsname {\simpleiconsmap\symbol{"EB6D}} + \expandafter\def\csname simpleicon@bittorrenticon\endcsname {\simpleiconsmap\symbol{"EB6E}} + \expandafter\def\csname simpleicon@bitwardenicon\endcsname {\simpleiconsmap\symbol{"EB6F}} + \expandafter\def\csname simpleicon@bitwigicon\endcsname {\simpleiconsmap\symbol{"EB70}} + \expandafter\def\csname simpleicon@blackberryicon\endcsname {\simpleiconsmap\symbol{"EB71}} + \expandafter\def\csname simpleicon@blackmagicdesignicon\endcsname {\simpleiconsmap\symbol{"EB72}} + \expandafter\def\csname simpleicon@blazemetericon\endcsname {\simpleiconsmap\symbol{"EB73}} + \expandafter\def\csname simpleicon@blazoricon\endcsname {\simpleiconsmap\symbol{"EB74}} + \expandafter\def\csname simpleicon@blendericon\endcsname {\simpleiconsmap\symbol{"EB75}} + \expandafter\def\csname simpleicon@blockbenchicon\endcsname {\simpleiconsmap\symbol{"EB76}} + \expandafter\def\csname simpleicon@blockchaindotcomicon\endcsname {\simpleiconsmap\symbol{"EB77}} + \expandafter\def\csname simpleicon@bloggericon\endcsname {\simpleiconsmap\symbol{"EB78}} + \expandafter\def\csname simpleicon@bloglovinicon\endcsname {\simpleiconsmap\symbol{"EB79}} + \expandafter\def\csname simpleicon@blueprinticon\endcsname {\simpleiconsmap\symbol{"EB7A}} + \expandafter\def\csname simpleicon@blueskyicon\endcsname {\simpleiconsmap\symbol{"EB7B}} + \expandafter\def\csname simpleicon@bluesoundicon\endcsname {\simpleiconsmap\symbol{"EB7C}} + \expandafter\def\csname simpleicon@bluetoothicon\endcsname {\simpleiconsmap\symbol{"EB7D}} + \expandafter\def\csname simpleicon@bmcsoftwareicon\endcsname {\simpleiconsmap\symbol{"EB7E}} + \expandafter\def\csname simpleicon@bmwicon\endcsname {\simpleiconsmap\symbol{"EB7F}} + \expandafter\def\csname simpleicon@bnbchainicon\endcsname {\simpleiconsmap\symbol{"EB80}} + \expandafter\def\csname simpleicon@boardgamegeekicon\endcsname {\simpleiconsmap\symbol{"EB81}} + \expandafter\def\csname simpleicon@boaticon\endcsname {\simpleiconsmap\symbol{"EB82}} + \expandafter\def\csname simpleicon@boehringeringelheimicon\endcsname {\simpleiconsmap\symbol{"EB83}} + \expandafter\def\csname simpleicon@boeingicon\endcsname {\simpleiconsmap\symbol{"EB84}} + \expandafter\def\csname simpleicon@bombardiericon\endcsname {\simpleiconsmap\symbol{"EB85}} + \expandafter\def\csname simpleicon@bookalopeicon\endcsname {\simpleiconsmap\symbol{"EB86}} + \expandafter\def\csname simpleicon@bookbubicon\endcsname {\simpleiconsmap\symbol{"EB87}} + \expandafter\def\csname simpleicon@bookmetericon\endcsname {\simpleiconsmap\symbol{"EB88}} + \expandafter\def\csname simpleicon@bookmyshowicon\endcsname {\simpleiconsmap\symbol{"EB89}} + \expandafter\def\csname simpleicon@bookstackicon\endcsname {\simpleiconsmap\symbol{"EB8A}} + \expandafter\def\csname simpleicon@boosticon\endcsname {\simpleiconsmap\symbol{"EB8B}} + \expandafter\def\csname simpleicon@boostyicon\endcsname {\simpleiconsmap\symbol{"EB8C}} + \expandafter\def\csname simpleicon@bootsicon\endcsname {\simpleiconsmap\symbol{"EB8D}} + \expandafter\def\csname simpleicon@bootstrapicon\endcsname {\simpleiconsmap\symbol{"EB8E}} + \expandafter\def\csname simpleicon@borgbackupicon\endcsname {\simpleiconsmap\symbol{"EB8F}} + \expandafter\def\csname simpleicon@boschicon\endcsname {\simpleiconsmap\symbol{"EB90}} + \expandafter\def\csname simpleicon@boseicon\endcsname {\simpleiconsmap\symbol{"EB91}} + \expandafter\def\csname simpleicon@botblecmsicon\endcsname {\simpleiconsmap\symbol{"EB92}} + \expandafter\def\csname simpleicon@boulangericon\endcsname {\simpleiconsmap\symbol{"EB93}} + \expandafter\def\csname simpleicon@bowericon\endcsname {\simpleiconsmap\symbol{"EB94}} + \expandafter\def\csname simpleicon@boxicon\endcsname {\simpleiconsmap\symbol{"EB95}} + \expandafter\def\csname simpleicon@boxysvgicon\endcsname {\simpleiconsmap\symbol{"EB96}} + \expandafter\def\csname simpleicon@braintreeicon\endcsname {\simpleiconsmap\symbol{"EB97}} + \expandafter\def\csname simpleicon@brandfoldericon\endcsname {\simpleiconsmap\symbol{"EB98}} + \expandafter\def\csname simpleicon@braveicon\endcsname {\simpleiconsmap\symbol{"EB99}} + \expandafter\def\csname simpleicon@breakericon\endcsname {\simpleiconsmap\symbol{"EB9A}} + \expandafter\def\csname simpleicon@brenntagicon\endcsname {\simpleiconsmap\symbol{"EB9B}} + \expandafter\def\csname simpleicon@brevoicon\endcsname {\simpleiconsmap\symbol{"EB9C}} + \expandafter\def\csname simpleicon@brexicon\endcsname {\simpleiconsmap\symbol{"EB9D}} + \expandafter\def\csname simpleicon@bricksicon\endcsname {\simpleiconsmap\symbol{"EB9E}} + \expandafter\def\csname simpleicon@britishairwaysicon\endcsname {\simpleiconsmap\symbol{"EB9F}} + \expandafter\def\csname simpleicon@broadcomicon\endcsname {\simpleiconsmap\symbol{"EBA0}} + \expandafter\def\csname simpleicon@brunoicon\endcsname {\simpleiconsmap\symbol{"EBA1}} + \expandafter\def\csname simpleicon@bsdicon\endcsname {\simpleiconsmap\symbol{"EBA2}} + \expandafter\def\csname simpleicon@bspwmicon\endcsname {\simpleiconsmap\symbol{"EBA3}} + \expandafter\def\csname simpleicon@bticon\endcsname {\simpleiconsmap\symbol{"EBA4}} + \expandafter\def\csname simpleicon@buddyicon\endcsname {\simpleiconsmap\symbol{"EBA5}} + \expandafter\def\csname simpleicon@budibaseicon\endcsname {\simpleiconsmap\symbol{"EBA6}} + \expandafter\def\csname simpleicon@buefyicon\endcsname {\simpleiconsmap\symbol{"EBA7}} + \expandafter\def\csname simpleicon@buffericon\endcsname {\simpleiconsmap\symbol{"EBA8}} + \expandafter\def\csname simpleicon@bugattiicon\endcsname {\simpleiconsmap\symbol{"EBA9}} + \expandafter\def\csname simpleicon@bugcrowdicon\endcsname {\simpleiconsmap\symbol{"EBAA}} + \expandafter\def\csname simpleicon@bugsnagicon\endcsname {\simpleiconsmap\symbol{"EBAB}} + \expandafter\def\csname simpleicon@buhlicon\endcsname {\simpleiconsmap\symbol{"EBAC}} + \expandafter\def\csname simpleicon@buildkiteicon\endcsname {\simpleiconsmap\symbol{"EBAD}} + \expandafter\def\csname simpleicon@bukalapakicon\endcsname {\simpleiconsmap\symbol{"EBAE}} + \expandafter\def\csname simpleicon@bulmaicon\endcsname {\simpleiconsmap\symbol{"EBAF}} + \expandafter\def\csname simpleicon@bunicon\endcsname {\simpleiconsmap\symbol{"EBB0}} + \expandafter\def\csname simpleicon@bungieicon\endcsname {\simpleiconsmap\symbol{"EBB1}} + \expandafter\def\csname simpleicon@bunqicon\endcsname {\simpleiconsmap\symbol{"EBB2}} + \expandafter\def\csname simpleicon@burgerkingicon\endcsname {\simpleiconsmap\symbol{"EBB3}} + \expandafter\def\csname simpleicon@burpsuiteicon\endcsname {\simpleiconsmap\symbol{"EBB4}} + \expandafter\def\csname simpleicon@burtonicon\endcsname {\simpleiconsmap\symbol{"EBB5}} + \expandafter\def\csname simpleicon@buymeacoffeeicon\endcsname {\simpleiconsmap\symbol{"EBB6}} + \expandafter\def\csname simpleicon@buyselladsicon\endcsname {\simpleiconsmap\symbol{"EBB7}} + \expandafter\def\csname simpleicon@buzzfeedicon\endcsname {\simpleiconsmap\symbol{"EBB8}} + \expandafter\def\csname simpleicon@bvgicon\endcsname {\simpleiconsmap\symbol{"EBB9}} + \expandafter\def\csname simpleicon@byjusicon\endcsname {\simpleiconsmap\symbol{"EBBA}} + \expandafter\def\csname simpleicon@bytedanceicon\endcsname {\simpleiconsmap\symbol{"EBBB}} + \expandafter\def\csname simpleicon@cicon\endcsname {\simpleiconsmap\symbol{"EBBC}} + \expandafter\def\csname simpleicon@cacheticon\endcsname {\simpleiconsmap\symbol{"EBBD}} + \expandafter\def\csname simpleicon@caddyicon\endcsname {\simpleiconsmap\symbol{"EBBE}} + \expandafter\def\csname simpleicon@cadillacicon\endcsname {\simpleiconsmap\symbol{"EBBF}} + \expandafter\def\csname simpleicon@cafepressicon\endcsname {\simpleiconsmap\symbol{"EBC0}} + \expandafter\def\csname simpleicon@caffeineicon\endcsname {\simpleiconsmap\symbol{"EBC1}} + \expandafter\def\csname simpleicon@cairographicsicon\endcsname {\simpleiconsmap\symbol{"EBC2}} + \expandafter\def\csname simpleicon@cairometroicon\endcsname {\simpleiconsmap\symbol{"EBC3}} + \expandafter\def\csname simpleicon@cakephpicon\endcsname {\simpleiconsmap\symbol{"EBC4}} + \expandafter\def\csname simpleicon@caldotcomicon\endcsname {\simpleiconsmap\symbol{"EBC5}} + \expandafter\def\csname simpleicon@calendlyicon\endcsname {\simpleiconsmap\symbol{"EBC6}} + \expandafter\def\csname simpleicon@calibrewebicon\endcsname {\simpleiconsmap\symbol{"EBC7}} + \expandafter\def\csname simpleicon@campaignmonitoricon\endcsname {\simpleiconsmap\symbol{"EBC8}} + \expandafter\def\csname simpleicon@camundaicon\endcsname {\simpleiconsmap\symbol{"EBC9}} + \expandafter\def\csname simpleicon@canonicalicon\endcsname {\simpleiconsmap\symbol{"EBCA}} + \expandafter\def\csname simpleicon@canvaicon\endcsname {\simpleiconsmap\symbol{"EBCB}} + \expandafter\def\csname simpleicon@canvasicon\endcsname {\simpleiconsmap\symbol{"EBCC}} + \expandafter\def\csname simpleicon@capacitoricon\endcsname {\simpleiconsmap\symbol{"EBCD}} + \expandafter\def\csname simpleicon@cardanoicon\endcsname {\simpleiconsmap\symbol{"EBCE}} + \expandafter\def\csname simpleicon@carlsberggroupicon\endcsname {\simpleiconsmap\symbol{"EBCF}} + \expandafter\def\csname simpleicon@carrdicon\endcsname {\simpleiconsmap\symbol{"EBD0}} + \expandafter\def\csname simpleicon@carrefouricon\endcsname {\simpleiconsmap\symbol{"EBD1}} + \expandafter\def\csname simpleicon@carthrottleicon\endcsname {\simpleiconsmap\symbol{"EBD2}} + \expandafter\def\csname simpleicon@cartoicon\endcsname {\simpleiconsmap\symbol{"EBD3}} + \expandafter\def\csname simpleicon@cashappicon\endcsname {\simpleiconsmap\symbol{"EBD4}} + \expandafter\def\csname simpleicon@castboxicon\endcsname {\simpleiconsmap\symbol{"EBD5}} + \expandafter\def\csname simpleicon@castoramaicon\endcsname {\simpleiconsmap\symbol{"EBD6}} + \expandafter\def\csname simpleicon@castroicon\endcsname {\simpleiconsmap\symbol{"EBD7}} + \expandafter\def\csname simpleicon@caterpillaricon\endcsname {\simpleiconsmap\symbol{"EBD8}} + \expandafter\def\csname simpleicon@cbcicon\endcsname {\simpleiconsmap\symbol{"EBD9}} + \expandafter\def\csname simpleicon@cbsicon\endcsname {\simpleiconsmap\symbol{"EBDA}} + \expandafter\def\csname simpleicon@ccleanericon\endcsname {\simpleiconsmap\symbol{"EBDB}} + \expandafter\def\csname simpleicon@cdprojekticon\endcsname {\simpleiconsmap\symbol{"EBDC}} + \expandafter\def\csname simpleicon@celeryicon\endcsname {\simpleiconsmap\symbol{"EBDD}} + \expandafter\def\csname simpleicon@celestronicon\endcsname {\simpleiconsmap\symbol{"EBDE}} + \expandafter\def\csname simpleicon@centosicon\endcsname {\simpleiconsmap\symbol{"EBDF}} + \expandafter\def\csname simpleicon@cephicon\endcsname {\simpleiconsmap\symbol{"EBE0}} + \expandafter\def\csname simpleicon@cesiumicon\endcsname {\simpleiconsmap\symbol{"EBE1}} + \expandafter\def\csname simpleicon@chaiicon\endcsname {\simpleiconsmap\symbol{"EBE2}} + \expandafter\def\csname simpleicon@chainguardicon\endcsname {\simpleiconsmap\symbol{"EBE3}} + \expandafter\def\csname simpleicon@chainlinkicon\endcsname {\simpleiconsmap\symbol{"EBE4}} + \expandafter\def\csname simpleicon@chakrauiicon\endcsname {\simpleiconsmap\symbol{"EBE5}} + \expandafter\def\csname simpleicon@channel4icon\endcsname {\simpleiconsmap\symbol{"EBE6}} + \expandafter\def\csname simpleicon@charlesicon\endcsname {\simpleiconsmap\symbol{"EBE7}} + \expandafter\def\csname simpleicon@chartdotjsicon\endcsname {\simpleiconsmap\symbol{"EBE8}} + \expandafter\def\csname simpleicon@chartmogulicon\endcsname {\simpleiconsmap\symbol{"EBE9}} + \expandafter\def\csname simpleicon@chaseicon\endcsname {\simpleiconsmap\symbol{"EBEA}} + \expandafter\def\csname simpleicon@chatboticon\endcsname {\simpleiconsmap\symbol{"EBEB}} + \expandafter\def\csname simpleicon@chatwooticon\endcsname {\simpleiconsmap\symbol{"EBEC}} + \expandafter\def\csname simpleicon@checkioicon\endcsname {\simpleiconsmap\symbol{"EBED}} + \expandafter\def\csname simpleicon@checkmarxicon\endcsname {\simpleiconsmap\symbol{"EBEE}} + \expandafter\def\csname simpleicon@checkmkicon\endcsname {\simpleiconsmap\symbol{"EBEF}} + \expandafter\def\csname simpleicon@chedrauiicon\endcsname {\simpleiconsmap\symbol{"EBF0}} + \expandafter\def\csname simpleicon@cheerioicon\endcsname {\simpleiconsmap\symbol{"EBF1}} + \expandafter\def\csname simpleicon@cheficon\endcsname {\simpleiconsmap\symbol{"EBF2}} + \expandafter\def\csname simpleicon@chemexicon\endcsname {\simpleiconsmap\symbol{"EBF3}} + \expandafter\def\csname simpleicon@chessdotcomicon\endcsname {\simpleiconsmap\symbol{"EBF4}} + \expandafter\def\csname simpleicon@chevroleticon\endcsname {\simpleiconsmap\symbol{"EBF5}} + \expandafter\def\csname simpleicon@chianetworkicon\endcsname {\simpleiconsmap\symbol{"EBF6}} + \expandafter\def\csname simpleicon@chinaeasternairlinesicon\endcsname {\simpleiconsmap\symbol{"EBF7}} + \expandafter\def\csname simpleicon@chinasouthernairlinesicon\endcsname {\simpleiconsmap\symbol{"EBF8}} + \expandafter\def\csname simpleicon@chocolateyicon\endcsname {\simpleiconsmap\symbol{"EBF9}} + \expandafter\def\csname simpleicon@chromaticicon\endcsname {\simpleiconsmap\symbol{"EBFA}} + \expandafter\def\csname simpleicon@chromecasticon\endcsname {\simpleiconsmap\symbol{"EBFB}} + \expandafter\def\csname simpleicon@chromewebstoreicon\endcsname {\simpleiconsmap\symbol{"EBFC}} + \expandafter\def\csname simpleicon@chryslericon\endcsname {\simpleiconsmap\symbol{"EBFD}} + \expandafter\def\csname simpleicon@chupachupsicon\endcsname {\simpleiconsmap\symbol{"EBFE}} + \expandafter\def\csname simpleicon@ciliumicon\endcsname {\simpleiconsmap\symbol{"EBFF}} + \expandafter\def\csname simpleicon@cinema4dicon\endcsname {\simpleiconsmap\symbol{"EC00}} + \expandafter\def\csname simpleicon@circleicon\endcsname {\simpleiconsmap\symbol{"EC01}} + \expandafter\def\csname simpleicon@circleciicon\endcsname {\simpleiconsmap\symbol{"EC02}} + \expandafter\def\csname simpleicon@circuitverseicon\endcsname {\simpleiconsmap\symbol{"EC03}} + \expandafter\def\csname simpleicon@cirrusciicon\endcsname {\simpleiconsmap\symbol{"EC04}} + \expandafter\def\csname simpleicon@ciscoicon\endcsname {\simpleiconsmap\symbol{"EC05}} + \expandafter\def\csname simpleicon@citrixicon\endcsname {\simpleiconsmap\symbol{"EC06}} + \expandafter\def\csname simpleicon@citroenicon\endcsname {\simpleiconsmap\symbol{"EC07}} + \expandafter\def\csname simpleicon@civicrmicon\endcsname {\simpleiconsmap\symbol{"EC08}} + \expandafter\def\csname simpleicon@civoicon\endcsname {\simpleiconsmap\symbol{"EC09}} + \expandafter\def\csname simpleicon@ckeditor4icon\endcsname {\simpleiconsmap\symbol{"EC0A}} + \expandafter\def\csname simpleicon@clarifaiicon\endcsname {\simpleiconsmap\symbol{"EC0B}} + \expandafter\def\csname simpleicon@clarisicon\endcsname {\simpleiconsmap\symbol{"EC0C}} + \expandafter\def\csname simpleicon@clarivateicon\endcsname {\simpleiconsmap\symbol{"EC0D}} + \expandafter\def\csname simpleicon@clerkicon\endcsname {\simpleiconsmap\symbol{"EC0E}} + \expandafter\def\csname simpleicon@clevercloudicon\endcsname {\simpleiconsmap\symbol{"EC0F}} + \expandafter\def\csname simpleicon@clickhouseicon\endcsname {\simpleiconsmap\symbol{"EC10}} + \expandafter\def\csname simpleicon@clickupicon\endcsname {\simpleiconsmap\symbol{"EC11}} + \expandafter\def\csname simpleicon@clionicon\endcsname {\simpleiconsmap\symbol{"EC12}} + \expandafter\def\csname simpleicon@cliqzicon\endcsname {\simpleiconsmap\symbol{"EC13}} + \expandafter\def\csname simpleicon@clockifyicon\endcsname {\simpleiconsmap\symbol{"EC14}} + \expandafter\def\csname simpleicon@clojureicon\endcsname {\simpleiconsmap\symbol{"EC15}} + \expandafter\def\csname simpleicon@cloud66icon\endcsname {\simpleiconsmap\symbol{"EC16}} + \expandafter\def\csname simpleicon@cloudbeesicon\endcsname {\simpleiconsmap\symbol{"EC17}} + \expandafter\def\csname simpleicon@cloudcannonicon\endcsname {\simpleiconsmap\symbol{"EC18}} + \expandafter\def\csname simpleicon@clouderaicon\endcsname {\simpleiconsmap\symbol{"EC19}} + \expandafter\def\csname simpleicon@cloudflareicon\endcsname {\simpleiconsmap\symbol{"EC1A}} + \expandafter\def\csname simpleicon@cloudflarepagesicon\endcsname {\simpleiconsmap\symbol{"EC1B}} + \expandafter\def\csname simpleicon@cloudflareworkersicon\endcsname {\simpleiconsmap\symbol{"EC1C}} + \expandafter\def\csname simpleicon@cloudfoundryicon\endcsname {\simpleiconsmap\symbol{"EC1D}} + \expandafter\def\csname simpleicon@cloudinaryicon\endcsname {\simpleiconsmap\symbol{"EC1E}} + \expandafter\def\csname simpleicon@cloudronicon\endcsname {\simpleiconsmap\symbol{"EC1F}} + \expandafter\def\csname simpleicon@cloudsmithicon\endcsname {\simpleiconsmap\symbol{"EC20}} + \expandafter\def\csname simpleicon@cloudwaysicon\endcsname {\simpleiconsmap\symbol{"EC21}} + \expandafter\def\csname simpleicon@clubforceicon\endcsname {\simpleiconsmap\symbol{"EC22}} + \expandafter\def\csname simpleicon@clubhouseicon\endcsname {\simpleiconsmap\symbol{"EC23}} + \expandafter\def\csname simpleicon@clypicon\endcsname {\simpleiconsmap\symbol{"EC24}} + \expandafter\def\csname simpleicon@cmakeicon\endcsname {\simpleiconsmap\symbol{"EC25}} + \expandafter\def\csname simpleicon@cncficon\endcsname {\simpleiconsmap\symbol{"EC26}} + \expandafter\def\csname simpleicon@cneticon\endcsname {\simpleiconsmap\symbol{"EC27}} + \expandafter\def\csname simpleicon@cnnicon\endcsname {\simpleiconsmap\symbol{"EC28}} + \expandafter\def\csname simpleicon@cocacolaicon\endcsname {\simpleiconsmap\symbol{"EC29}} + \expandafter\def\csname simpleicon@cockpiticon\endcsname {\simpleiconsmap\symbol{"EC2A}} + \expandafter\def\csname simpleicon@cockroachlabsicon\endcsname {\simpleiconsmap\symbol{"EC2B}} + \expandafter\def\csname simpleicon@cocoapodsicon\endcsname {\simpleiconsmap\symbol{"EC2C}} + \expandafter\def\csname simpleicon@cocosicon\endcsname {\simpleiconsmap\symbol{"EC2D}} + \expandafter\def\csname simpleicon@codaicon\endcsname {\simpleiconsmap\symbol{"EC2E}} + \expandafter\def\csname simpleicon@codacyicon\endcsname {\simpleiconsmap\symbol{"EC2F}} + \expandafter\def\csname simpleicon@codebergicon\endcsname {\simpleiconsmap\symbol{"EC30}} + \expandafter\def\csname simpleicon@codeblocksicon\endcsname {\simpleiconsmap\symbol{"EC31}} + \expandafter\def\csname simpleicon@codecademyicon\endcsname {\simpleiconsmap\symbol{"EC32}} + \expandafter\def\csname simpleicon@codeceptjsicon\endcsname {\simpleiconsmap\symbol{"EC33}} + \expandafter\def\csname simpleicon@codecheficon\endcsname {\simpleiconsmap\symbol{"EC34}} + \expandafter\def\csname simpleicon@codeclimateicon\endcsname {\simpleiconsmap\symbol{"EC35}} + \expandafter\def\csname simpleicon@codecovicon\endcsname {\simpleiconsmap\symbol{"EC36}} + \expandafter\def\csname simpleicon@codefactoricon\endcsname {\simpleiconsmap\symbol{"EC37}} + \expandafter\def\csname simpleicon@codeforcesicon\endcsname {\simpleiconsmap\symbol{"EC38}} + \expandafter\def\csname simpleicon@codefreshicon\endcsname {\simpleiconsmap\symbol{"EC39}} + \expandafter\def\csname simpleicon@codeignitericon\endcsname {\simpleiconsmap\symbol{"EC3A}} + \expandafter\def\csname simpleicon@codeiumicon\endcsname {\simpleiconsmap\symbol{"EC3B}} + \expandafter\def\csname simpleicon@codemagicicon\endcsname {\simpleiconsmap\symbol{"EC3C}} + \expandafter\def\csname simpleicon@codementoricon\endcsname {\simpleiconsmap\symbol{"EC3D}} + \expandafter\def\csname simpleicon@codemirroricon\endcsname {\simpleiconsmap\symbol{"EC3E}} + \expandafter\def\csname simpleicon@codenewbieicon\endcsname {\simpleiconsmap\symbol{"EC3F}} + \expandafter\def\csname simpleicon@codepenicon\endcsname {\simpleiconsmap\symbol{"EC40}} + \expandafter\def\csname simpleicon@codeprojecticon\endcsname {\simpleiconsmap\symbol{"EC41}} + \expandafter\def\csname simpleicon@codericon\endcsname {\simpleiconsmap\symbol{"EC42}} + \expandafter\def\csname simpleicon@codersrankicon\endcsname {\simpleiconsmap\symbol{"EC43}} + \expandafter\def\csname simpleicon@coderwallicon\endcsname {\simpleiconsmap\symbol{"EC44}} + \expandafter\def\csname simpleicon@codesandboxicon\endcsname {\simpleiconsmap\symbol{"EC45}} + \expandafter\def\csname simpleicon@codeshipicon\endcsname {\simpleiconsmap\symbol{"EC46}} + \expandafter\def\csname simpleicon@codesignalicon\endcsname {\simpleiconsmap\symbol{"EC47}} + \expandafter\def\csname simpleicon@codestreamicon\endcsname {\simpleiconsmap\symbol{"EC48}} + \expandafter\def\csname simpleicon@codewarsicon\endcsname {\simpleiconsmap\symbol{"EC49}} + \expandafter\def\csname simpleicon@codingameicon\endcsname {\simpleiconsmap\symbol{"EC4A}} + \expandafter\def\csname simpleicon@codingninjasicon\endcsname {\simpleiconsmap\symbol{"EC4B}} + \expandafter\def\csname simpleicon@codioicon\endcsname {\simpleiconsmap\symbol{"EC4C}} + \expandafter\def\csname simpleicon@coffeescripticon\endcsname {\simpleiconsmap\symbol{"EC4D}} + \expandafter\def\csname simpleicon@coggleicon\endcsname {\simpleiconsmap\symbol{"EC4E}} + \expandafter\def\csname simpleicon@cognizanticon\endcsname {\simpleiconsmap\symbol{"EC4F}} + \expandafter\def\csname simpleicon@coilicon\endcsname {\simpleiconsmap\symbol{"EC50}} + \expandafter\def\csname simpleicon@coinbaseicon\endcsname {\simpleiconsmap\symbol{"EC51}} + \expandafter\def\csname simpleicon@coinmarketcapicon\endcsname {\simpleiconsmap\symbol{"EC52}} + \expandafter\def\csname simpleicon@comicfuryicon\endcsname {\simpleiconsmap\symbol{"EC53}} + \expandafter\def\csname simpleicon@commaicon\endcsname {\simpleiconsmap\symbol{"EC54}} + \expandafter\def\csname simpleicon@commerzbankicon\endcsname {\simpleiconsmap\symbol{"EC55}} + \expandafter\def\csname simpleicon@commitlinticon\endcsname {\simpleiconsmap\symbol{"EC56}} + \expandafter\def\csname simpleicon@commodoreicon\endcsname {\simpleiconsmap\symbol{"EC57}} + \expandafter\def\csname simpleicon@commonworkflowlanguageicon\endcsname {\simpleiconsmap\symbol{"EC58}} + \expandafter\def\csname simpleicon@compilerexplorericon\endcsname {\simpleiconsmap\symbol{"EC59}} + \expandafter\def\csname simpleicon@composericon\endcsname {\simpleiconsmap\symbol{"EC5A}} + \expandafter\def\csname simpleicon@comptiaicon\endcsname {\simpleiconsmap\symbol{"EC5B}} + \expandafter\def\csname simpleicon@comsolicon\endcsname {\simpleiconsmap\symbol{"EC5C}} + \expandafter\def\csname simpleicon@conanicon\endcsname {\simpleiconsmap\symbol{"EC5D}} + \expandafter\def\csname simpleicon@concourseicon\endcsname {\simpleiconsmap\symbol{"EC5E}} + \expandafter\def\csname simpleicon@condaforgeicon\endcsname {\simpleiconsmap\symbol{"EC5F}} + \expandafter\def\csname simpleicon@conektaicon\endcsname {\simpleiconsmap\symbol{"EC60}} + \expandafter\def\csname simpleicon@confluenceicon\endcsname {\simpleiconsmap\symbol{"EC61}} + \expandafter\def\csname simpleicon@construct3icon\endcsname {\simpleiconsmap\symbol{"EC62}} + \expandafter\def\csname simpleicon@consulicon\endcsname {\simpleiconsmap\symbol{"EC63}} + \expandafter\def\csname simpleicon@contactlesspaymenticon\endcsname {\simpleiconsmap\symbol{"EC64}} + \expandafter\def\csname simpleicon@containerdicon\endcsname {\simpleiconsmap\symbol{"EC65}} + \expandafter\def\csname simpleicon@contaoicon\endcsname {\simpleiconsmap\symbol{"EC66}} + \expandafter\def\csname simpleicon@contentfulicon\endcsname {\simpleiconsmap\symbol{"EC67}} + \expandafter\def\csname simpleicon@contentstackicon\endcsname {\simpleiconsmap\symbol{"EC68}} + \expandafter\def\csname simpleicon@contributorcovenanticon\endcsname {\simpleiconsmap\symbol{"EC69}} + \expandafter\def\csname simpleicon@conventionalcommitsicon\endcsname {\simpleiconsmap\symbol{"EC6A}} + \expandafter\def\csname simpleicon@convertioicon\endcsname {\simpleiconsmap\symbol{"EC6B}} + \expandafter\def\csname simpleicon@cookiecuttericon\endcsname {\simpleiconsmap\symbol{"EC6C}} + \expandafter\def\csname simpleicon@coolermastericon\endcsname {\simpleiconsmap\symbol{"EC6D}} + \expandafter\def\csname simpleicon@coopicon\endcsname {\simpleiconsmap\symbol{"EC6E}} + \expandafter\def\csname simpleicon@copaairlinesicon\endcsname {\simpleiconsmap\symbol{"EC6F}} + \expandafter\def\csname simpleicon@coppelicon\endcsname {\simpleiconsmap\symbol{"EC70}} + \expandafter\def\csname simpleicon@coraicon\endcsname {\simpleiconsmap\symbol{"EC71}} + \expandafter\def\csname simpleicon@coreldrawicon\endcsname {\simpleiconsmap\symbol{"EC72}} + \expandafter\def\csname simpleicon@coronaengineicon\endcsname {\simpleiconsmap\symbol{"EC73}} + \expandafter\def\csname simpleicon@coronarenderericon\endcsname {\simpleiconsmap\symbol{"EC74}} + \expandafter\def\csname simpleicon@corsairicon\endcsname {\simpleiconsmap\symbol{"EC75}} + \expandafter\def\csname simpleicon@couchbaseicon\endcsname {\simpleiconsmap\symbol{"EC76}} + \expandafter\def\csname simpleicon@counterstrikeicon\endcsname {\simpleiconsmap\symbol{"EC77}} + \expandafter\def\csname simpleicon@countingworksproicon\endcsname {\simpleiconsmap\symbol{"EC78}} + \expandafter\def\csname simpleicon@courseraicon\endcsname {\simpleiconsmap\symbol{"EC79}} + \expandafter\def\csname simpleicon@coverallsicon\endcsname {\simpleiconsmap\symbol{"EC7A}} + \expandafter\def\csname simpleicon@cpanelicon\endcsname {\simpleiconsmap\symbol{"EC7B}} + \expandafter\def\csname simpleicon@cplusplusicon\endcsname {\simpleiconsmap\symbol{"EC7C}} + \expandafter\def\csname simpleicon@cplusplusbuildericon\endcsname {\simpleiconsmap\symbol{"EC7D}} + \expandafter\def\csname simpleicon@craftcmsicon\endcsname {\simpleiconsmap\symbol{"EC7E}} + \expandafter\def\csname simpleicon@craftsmanicon\endcsname {\simpleiconsmap\symbol{"EC7F}} + \expandafter\def\csname simpleicon@cratedbicon\endcsname {\simpleiconsmap\symbol{"EC80}} + \expandafter\def\csname simpleicon@crayonicon\endcsname {\simpleiconsmap\symbol{"EC81}} + \expandafter\def\csname simpleicon@crealityicon\endcsname {\simpleiconsmap\symbol{"EC82}} + \expandafter\def\csname simpleicon@createreactappicon\endcsname {\simpleiconsmap\symbol{"EC83}} + \expandafter\def\csname simpleicon@creativecommonsicon\endcsname {\simpleiconsmap\symbol{"EC84}} + \expandafter\def\csname simpleicon@creativetechnologyicon\endcsname {\simpleiconsmap\symbol{"EC85}} + \expandafter\def\csname simpleicon@credlyicon\endcsname {\simpleiconsmap\symbol{"EC86}} + \expandafter\def\csname simpleicon@crehanaicon\endcsname {\simpleiconsmap\symbol{"EC87}} + \expandafter\def\csname simpleicon@crewunitedicon\endcsname {\simpleiconsmap\symbol{"EC88}} + \expandafter\def\csname simpleicon@criticalroleicon\endcsname {\simpleiconsmap\symbol{"EC89}} + \expandafter\def\csname simpleicon@crowdinicon\endcsname {\simpleiconsmap\symbol{"EC8A}} + \expandafter\def\csname simpleicon@crowdsourceicon\endcsname {\simpleiconsmap\symbol{"EC8B}} + \expandafter\def\csname simpleicon@crunchbaseicon\endcsname {\simpleiconsmap\symbol{"EC8C}} + \expandafter\def\csname simpleicon@crunchyrollicon\endcsname {\simpleiconsmap\symbol{"EC8D}} + \expandafter\def\csname simpleicon@cryengineicon\endcsname {\simpleiconsmap\symbol{"EC8E}} + \expandafter\def\csname simpleicon@cryptpadicon\endcsname {\simpleiconsmap\symbol{"EC8F}} + \expandafter\def\csname simpleicon@crystalicon\endcsname {\simpleiconsmap\symbol{"EC90}} + \expandafter\def\csname simpleicon@css3icon\endcsname {\simpleiconsmap\symbol{"EC91}} + \expandafter\def\csname simpleicon@cssdesignawardsicon\endcsname {\simpleiconsmap\symbol{"EC92}} + \expandafter\def\csname simpleicon@cssmodulesicon\endcsname {\simpleiconsmap\symbol{"EC93}} + \expandafter\def\csname simpleicon@csswizardryicon\endcsname {\simpleiconsmap\symbol{"EC94}} + \expandafter\def\csname simpleicon@ctsicon\endcsname {\simpleiconsmap\symbol{"EC95}} + \expandafter\def\csname simpleicon@cucumbericon\endcsname {\simpleiconsmap\symbol{"EC96}} + \expandafter\def\csname simpleicon@culturaicon\endcsname {\simpleiconsmap\symbol{"EC97}} + \expandafter\def\csname simpleicon@curlicon\endcsname {\simpleiconsmap\symbol{"EC98}} + \expandafter\def\csname simpleicon@curseforgeicon\endcsname {\simpleiconsmap\symbol{"EC99}} + \expandafter\def\csname simpleicon@custominkicon\endcsname {\simpleiconsmap\symbol{"EC9A}} + \expandafter\def\csname simpleicon@cyberdefendersicon\endcsname {\simpleiconsmap\symbol{"EC9B}} + \expandafter\def\csname simpleicon@cycling74icon\endcsname {\simpleiconsmap\symbol{"EC9C}} + \expandafter\def\csname simpleicon@cypressicon\endcsname {\simpleiconsmap\symbol{"EC9D}} + \expandafter\def\csname simpleicon@cytoscapedotjsicon\endcsname {\simpleiconsmap\symbol{"EC9E}} + \expandafter\def\csname simpleicon@dicon\endcsname {\simpleiconsmap\symbol{"EC9F}} + \expandafter\def\csname simpleicon@d3dotjsicon\endcsname {\simpleiconsmap\symbol{"ECA0}} + \expandafter\def\csname simpleicon@daciaicon\endcsname {\simpleiconsmap\symbol{"ECA1}} + \expandafter\def\csname simpleicon@daficon\endcsname {\simpleiconsmap\symbol{"ECA2}} + \expandafter\def\csname simpleicon@dailydotdevicon\endcsname {\simpleiconsmap\symbol{"ECA3}} + \expandafter\def\csname simpleicon@dailymotionicon\endcsname {\simpleiconsmap\symbol{"ECA4}} + \expandafter\def\csname simpleicon@daisyuiicon\endcsname {\simpleiconsmap\symbol{"ECA5}} + \expandafter\def\csname simpleicon@dapricon\endcsname {\simpleiconsmap\symbol{"ECA6}} + \expandafter\def\csname simpleicon@darkreadericon\endcsname {\simpleiconsmap\symbol{"ECA7}} + \expandafter\def\csname simpleicon@darticon\endcsname {\simpleiconsmap\symbol{"ECA8}} + \expandafter\def\csname simpleicon@dartyicon\endcsname {\simpleiconsmap\symbol{"ECA9}} + \expandafter\def\csname simpleicon@dasersteicon\endcsname {\simpleiconsmap\symbol{"ECAA}} + \expandafter\def\csname simpleicon@dashicon\endcsname {\simpleiconsmap\symbol{"ECAB}} + \expandafter\def\csname simpleicon@dashlaneicon\endcsname {\simpleiconsmap\symbol{"ECAC}} + \expandafter\def\csname simpleicon@daskicon\endcsname {\simpleiconsmap\symbol{"ECAD}} + \expandafter\def\csname simpleicon@dassaultsystemesicon\endcsname {\simpleiconsmap\symbol{"ECAE}} + \expandafter\def\csname simpleicon@databricksicon\endcsname {\simpleiconsmap\symbol{"ECAF}} + \expandafter\def\csname simpleicon@datacampicon\endcsname {\simpleiconsmap\symbol{"ECB0}} + \expandafter\def\csname simpleicon@datadogicon\endcsname {\simpleiconsmap\symbol{"ECB1}} + \expandafter\def\csname simpleicon@datadotaiicon\endcsname {\simpleiconsmap\symbol{"ECB2}} + \expandafter\def\csname simpleicon@datagripicon\endcsname {\simpleiconsmap\symbol{"ECB3}} + \expandafter\def\csname simpleicon@dataikuicon\endcsname {\simpleiconsmap\symbol{"ECB4}} + \expandafter\def\csname simpleicon@datastaxicon\endcsname {\simpleiconsmap\symbol{"ECB5}} + \expandafter\def\csname simpleicon@datefnsicon\endcsname {\simpleiconsmap\symbol{"ECB6}} + \expandafter\def\csname simpleicon@datevicon\endcsname {\simpleiconsmap\symbol{"ECB7}} + \expandafter\def\csname simpleicon@datocmsicon\endcsname {\simpleiconsmap\symbol{"ECB8}} + \expandafter\def\csname simpleicon@dattoicon\endcsname {\simpleiconsmap\symbol{"ECB9}} + \expandafter\def\csname simpleicon@davinciresolveicon\endcsname {\simpleiconsmap\symbol{"ECBA}} + \expandafter\def\csname simpleicon@dazhongdianpingicon\endcsname {\simpleiconsmap\symbol{"ECBB}} + \expandafter\def\csname simpleicon@daznicon\endcsname {\simpleiconsmap\symbol{"ECBC}} + \expandafter\def\csname simpleicon@dbeavericon\endcsname {\simpleiconsmap\symbol{"ECBD}} + \expandafter\def\csname simpleicon@dblpicon\endcsname {\simpleiconsmap\symbol{"ECBE}} + \expandafter\def\csname simpleicon@dbticon\endcsname {\simpleiconsmap\symbol{"ECBF}} + \expandafter\def\csname simpleicon@dcentertainmenticon\endcsname {\simpleiconsmap\symbol{"ECC0}} + \expandafter\def\csname simpleicon@debianicon\endcsname {\simpleiconsmap\symbol{"ECC1}} + \expandafter\def\csname simpleicon@decapcmsicon\endcsname {\simpleiconsmap\symbol{"ECC2}} + \expandafter\def\csname simpleicon@decentralandicon\endcsname {\simpleiconsmap\symbol{"ECC3}} + \expandafter\def\csname simpleicon@dedgeicon\endcsname {\simpleiconsmap\symbol{"ECC4}} + \expandafter\def\csname simpleicon@deepcoolicon\endcsname {\simpleiconsmap\symbol{"ECC5}} + \expandafter\def\csname simpleicon@deepgramicon\endcsname {\simpleiconsmap\symbol{"ECC6}} + \expandafter\def\csname simpleicon@deepinicon\endcsname {\simpleiconsmap\symbol{"ECC7}} + \expandafter\def\csname simpleicon@deeplicon\endcsname {\simpleiconsmap\symbol{"ECC8}} + \expandafter\def\csname simpleicon@deepnoteicon\endcsname {\simpleiconsmap\symbol{"ECC9}} + \expandafter\def\csname simpleicon@deliciousicon\endcsname {\simpleiconsmap\symbol{"ECCA}} + \expandafter\def\csname simpleicon@deliverooicon\endcsname {\simpleiconsmap\symbol{"ECCB}} + \expandafter\def\csname simpleicon@dellicon\endcsname {\simpleiconsmap\symbol{"ECCC}} + \expandafter\def\csname simpleicon@delonghiicon\endcsname {\simpleiconsmap\symbol{"ECCD}} + \expandafter\def\csname simpleicon@delphiicon\endcsname {\simpleiconsmap\symbol{"ECCE}} + \expandafter\def\csname simpleicon@deltaicon\endcsname {\simpleiconsmap\symbol{"ECCF}} + \expandafter\def\csname simpleicon@delugeicon\endcsname {\simpleiconsmap\symbol{"ECD0}} + \expandafter\def\csname simpleicon@denoicon\endcsname {\simpleiconsmap\symbol{"ECD1}} + \expandafter\def\csname simpleicon@denonicon\endcsname {\simpleiconsmap\symbol{"ECD2}} + \expandafter\def\csname simpleicon@dependaboticon\endcsname {\simpleiconsmap\symbol{"ECD3}} + \expandafter\def\csname simpleicon@dependencycheckicon\endcsname {\simpleiconsmap\symbol{"ECD4}} + \expandafter\def\csname simpleicon@depositphotosicon\endcsname {\simpleiconsmap\symbol{"ECD5}} + \expandafter\def\csname simpleicon@derspiegelicon\endcsname {\simpleiconsmap\symbol{"ECD6}} + \expandafter\def\csname simpleicon@deutschebahnicon\endcsname {\simpleiconsmap\symbol{"ECD7}} + \expandafter\def\csname simpleicon@deutschebankicon\endcsname {\simpleiconsmap\symbol{"ECD8}} + \expandafter\def\csname simpleicon@deutscheposticon\endcsname {\simpleiconsmap\symbol{"ECD9}} + \expandafter\def\csname simpleicon@devdottoicon\endcsname {\simpleiconsmap\symbol{"ECDA}} + \expandafter\def\csname simpleicon@devexpressicon\endcsname {\simpleiconsmap\symbol{"ECDB}} + \expandafter\def\csname simpleicon@deviantarticon\endcsname {\simpleiconsmap\symbol{"ECDC}} + \expandafter\def\csname simpleicon@devposticon\endcsname {\simpleiconsmap\symbol{"ECDD}} + \expandafter\def\csname simpleicon@devranticon\endcsname {\simpleiconsmap\symbol{"ECDE}} + \expandafter\def\csname simpleicon@dgraphicon\endcsname {\simpleiconsmap\symbol{"ECDF}} + \expandafter\def\csname simpleicon@dhlicon\endcsname {\simpleiconsmap\symbol{"ECE0}} + \expandafter\def\csname simpleicon@diagramsdotneticon\endcsname {\simpleiconsmap\symbol{"ECE1}} + \expandafter\def\csname simpleicon@dialogflowicon\endcsname {\simpleiconsmap\symbol{"ECE2}} + \expandafter\def\csname simpleicon@diasporaicon\endcsname {\simpleiconsmap\symbol{"ECE3}} + \expandafter\def\csname simpleicon@dictionarydotcomicon\endcsname {\simpleiconsmap\symbol{"ECE4}} + \expandafter\def\csname simpleicon@diggicon\endcsname {\simpleiconsmap\symbol{"ECE5}} + \expandafter\def\csname simpleicon@digikeyelectronicsicon\endcsname {\simpleiconsmap\symbol{"ECE6}} + \expandafter\def\csname simpleicon@digitaloceanicon\endcsname {\simpleiconsmap\symbol{"ECE7}} + \expandafter\def\csname simpleicon@dinersclubicon\endcsname {\simpleiconsmap\symbol{"ECE8}} + \expandafter\def\csname simpleicon@dioricon\endcsname {\simpleiconsmap\symbol{"ECE9}} + \expandafter\def\csname simpleicon@directusicon\endcsname {\simpleiconsmap\symbol{"ECEA}} + \expandafter\def\csname simpleicon@discogsicon\endcsname {\simpleiconsmap\symbol{"ECEB}} + \expandafter\def\csname simpleicon@discordicon\endcsname {\simpleiconsmap\symbol{"ECEC}} + \expandafter\def\csname simpleicon@discourseicon\endcsname {\simpleiconsmap\symbol{"ECED}} + \expandafter\def\csname simpleicon@discovericon\endcsname {\simpleiconsmap\symbol{"ECEE}} + \expandafter\def\csname simpleicon@disqusicon\endcsname {\simpleiconsmap\symbol{"ECEF}} + \expandafter\def\csname simpleicon@disrooticon\endcsname {\simpleiconsmap\symbol{"ECF0}} + \expandafter\def\csname simpleicon@distrokidicon\endcsname {\simpleiconsmap\symbol{"ECF1}} + \expandafter\def\csname simpleicon@djangoicon\endcsname {\simpleiconsmap\symbol{"ECF2}} + \expandafter\def\csname simpleicon@djiicon\endcsname {\simpleiconsmap\symbol{"ECF3}} + \expandafter\def\csname simpleicon@dlibicon\endcsname {\simpleiconsmap\symbol{"ECF4}} + \expandafter\def\csname simpleicon@dlnaicon\endcsname {\simpleiconsmap\symbol{"ECF5}} + \expandafter\def\csname simpleicon@dmicon\endcsname {\simpleiconsmap\symbol{"ECF6}} + \expandafter\def\csname simpleicon@dockericon\endcsname {\simpleiconsmap\symbol{"ECF7}} + \expandafter\def\csname simpleicon@docsdotrsicon\endcsname {\simpleiconsmap\symbol{"ECF8}} + \expandafter\def\csname simpleicon@docsifyicon\endcsname {\simpleiconsmap\symbol{"ECF9}} + \expandafter\def\csname simpleicon@doctrineicon\endcsname {\simpleiconsmap\symbol{"ECFA}} + \expandafter\def\csname simpleicon@docusaurusicon\endcsname {\simpleiconsmap\symbol{"ECFB}} + \expandafter\def\csname simpleicon@dogecoinicon\endcsname {\simpleiconsmap\symbol{"ECFC}} + \expandafter\def\csname simpleicon@doiicon\endcsname {\simpleiconsmap\symbol{"ECFD}} + \expandafter\def\csname simpleicon@dolbyicon\endcsname {\simpleiconsmap\symbol{"ECFE}} + \expandafter\def\csname simpleicon@doordashicon\endcsname {\simpleiconsmap\symbol{"ECFF}} + \expandafter\def\csname simpleicon@dota2icon\endcsname {\simpleiconsmap\symbol{"ED00}} + \expandafter\def\csname simpleicon@dotenvicon\endcsname {\simpleiconsmap\symbol{"ED01}} + \expandafter\def\csname simpleicon@dotneticon\endcsname {\simpleiconsmap\symbol{"ED02}} + \expandafter\def\csname simpleicon@doubanicon\endcsname {\simpleiconsmap\symbol{"ED03}} + \expandafter\def\csname simpleicon@doubanreadicon\endcsname {\simpleiconsmap\symbol{"ED04}} + \expandafter\def\csname simpleicon@dovecoticon\endcsname {\simpleiconsmap\symbol{"ED05}} + \expandafter\def\csname simpleicon@dovetailicon\endcsname {\simpleiconsmap\symbol{"ED06}} + \expandafter\def\csname simpleicon@doxygenicon\endcsname {\simpleiconsmap\symbol{"ED07}} + \expandafter\def\csname simpleicon@dpdicon\endcsname {\simpleiconsmap\symbol{"ED08}} + \expandafter\def\csname simpleicon@dragonframeicon\endcsname {\simpleiconsmap\symbol{"ED09}} + \expandafter\def\csname simpleicon@draugiemdotlvicon\endcsname {\simpleiconsmap\symbol{"ED0A}} + \expandafter\def\csname simpleicon@dreamstimeicon\endcsname {\simpleiconsmap\symbol{"ED0B}} + \expandafter\def\csname simpleicon@dribbbleicon\endcsname {\simpleiconsmap\symbol{"ED0C}} + \expandafter\def\csname simpleicon@drizzleicon\endcsname {\simpleiconsmap\symbol{"ED0D}} + \expandafter\def\csname simpleicon@droneicon\endcsname {\simpleiconsmap\symbol{"ED0E}} + \expandafter\def\csname simpleicon@droobleicon\endcsname {\simpleiconsmap\symbol{"ED0F}} + \expandafter\def\csname simpleicon@dropboxicon\endcsname {\simpleiconsmap\symbol{"ED10}} + \expandafter\def\csname simpleicon@drupalicon\endcsname {\simpleiconsmap\symbol{"ED11}} + \expandafter\def\csname simpleicon@dsautomobilesicon\endcsname {\simpleiconsmap\symbol{"ED12}} + \expandafter\def\csname simpleicon@dtsicon\endcsname {\simpleiconsmap\symbol{"ED13}} + \expandafter\def\csname simpleicon@dtubeicon\endcsname {\simpleiconsmap\symbol{"ED14}} + \expandafter\def\csname simpleicon@ducatiicon\endcsname {\simpleiconsmap\symbol{"ED15}} + \expandafter\def\csname simpleicon@duckdbicon\endcsname {\simpleiconsmap\symbol{"ED16}} + \expandafter\def\csname simpleicon@duckduckgoicon\endcsname {\simpleiconsmap\symbol{"ED17}} + \expandafter\def\csname simpleicon@dungeonsanddragonsicon\endcsname {\simpleiconsmap\symbol{"ED18}} + \expandafter\def\csname simpleicon@dunkedicon\endcsname {\simpleiconsmap\symbol{"ED19}} + \expandafter\def\csname simpleicon@dunzoicon\endcsname {\simpleiconsmap\symbol{"ED1A}} + \expandafter\def\csname simpleicon@duolingoicon\endcsname {\simpleiconsmap\symbol{"ED1B}} + \expandafter\def\csname simpleicon@duplicatiicon\endcsname {\simpleiconsmap\symbol{"ED1C}} + \expandafter\def\csname simpleicon@dvcicon\endcsname {\simpleiconsmap\symbol{"ED1D}} + \expandafter\def\csname simpleicon@dwavesystemsicon\endcsname {\simpleiconsmap\symbol{"ED1E}} + \expandafter\def\csname simpleicon@dwmicon\endcsname {\simpleiconsmap\symbol{"ED1F}} + \expandafter\def\csname simpleicon@dynatraceicon\endcsname {\simpleiconsmap\symbol{"ED20}} + \expandafter\def\csname simpleicon@eicon\endcsname {\simpleiconsmap\symbol{"ED21}} + \expandafter\def\csname simpleicon@e3icon\endcsname {\simpleiconsmap\symbol{"ED22}} + \expandafter\def\csname simpleicon@eaicon\endcsname {\simpleiconsmap\symbol{"ED23}} + \expandafter\def\csname simpleicon@eagleicon\endcsname {\simpleiconsmap\symbol{"ED24}} + \expandafter\def\csname simpleicon@easyedaicon\endcsname {\simpleiconsmap\symbol{"ED25}} + \expandafter\def\csname simpleicon@easyjeticon\endcsname {\simpleiconsmap\symbol{"ED26}} + \expandafter\def\csname simpleicon@ebayicon\endcsname {\simpleiconsmap\symbol{"ED27}} + \expandafter\def\csname simpleicon@eboxicon\endcsname {\simpleiconsmap\symbol{"ED28}} + \expandafter\def\csname simpleicon@eclipseadoptiumicon\endcsname {\simpleiconsmap\symbol{"ED29}} + \expandafter\def\csname simpleicon@eclipsecheicon\endcsname {\simpleiconsmap\symbol{"ED2A}} + \expandafter\def\csname simpleicon@eclipseideicon\endcsname {\simpleiconsmap\symbol{"ED2B}} + \expandafter\def\csname simpleicon@eclipsejettyicon\endcsname {\simpleiconsmap\symbol{"ED2C}} + \expandafter\def\csname simpleicon@eclipsemosquittoicon\endcsname {\simpleiconsmap\symbol{"ED2D}} + \expandafter\def\csname simpleicon@eclipsevertdotxicon\endcsname {\simpleiconsmap\symbol{"ED2E}} + \expandafter\def\csname simpleicon@ecovacsicon\endcsname {\simpleiconsmap\symbol{"ED2F}} + \expandafter\def\csname simpleicon@edekaicon\endcsname {\simpleiconsmap\symbol{"ED30}} + \expandafter\def\csname simpleicon@edgeimpulseicon\endcsname {\simpleiconsmap\symbol{"ED31}} + \expandafter\def\csname simpleicon@editorconfigicon\endcsname {\simpleiconsmap\symbol{"ED32}} + \expandafter\def\csname simpleicon@edotleclercicon\endcsname {\simpleiconsmap\symbol{"ED33}} + \expandafter\def\csname simpleicon@educativeicon\endcsname {\simpleiconsmap\symbol{"ED34}} + \expandafter\def\csname simpleicon@edxicon\endcsname {\simpleiconsmap\symbol{"ED35}} + \expandafter\def\csname simpleicon@eggheadicon\endcsname {\simpleiconsmap\symbol{"ED36}} + \expandafter\def\csname simpleicon@egnyteicon\endcsname {\simpleiconsmap\symbol{"ED37}} + \expandafter\def\csname simpleicon@eighticon\endcsname {\simpleiconsmap\symbol{"ED38}} + \expandafter\def\csname simpleicon@eightsleepicon\endcsname {\simpleiconsmap\symbol{"ED39}} + \expandafter\def\csname simpleicon@ejsicon\endcsname {\simpleiconsmap\symbol{"ED3A}} + \expandafter\def\csname simpleicon@elasticicon\endcsname {\simpleiconsmap\symbol{"ED3B}} + \expandafter\def\csname simpleicon@elasticcloudicon\endcsname {\simpleiconsmap\symbol{"ED3C}} + \expandafter\def\csname simpleicon@elasticsearchicon\endcsname {\simpleiconsmap\symbol{"ED3D}} + \expandafter\def\csname simpleicon@elasticstackicon\endcsname {\simpleiconsmap\symbol{"ED3E}} + \expandafter\def\csname simpleicon@elavonicon\endcsname {\simpleiconsmap\symbol{"ED3F}} + \expandafter\def\csname simpleicon@electronicon\endcsname {\simpleiconsmap\symbol{"ED40}} + \expandafter\def\csname simpleicon@electronbuildericon\endcsname {\simpleiconsmap\symbol{"ED41}} + \expandafter\def\csname simpleicon@electronfiddleicon\endcsname {\simpleiconsmap\symbol{"ED42}} + \expandafter\def\csname simpleicon@elegooicon\endcsname {\simpleiconsmap\symbol{"ED43}} + \expandafter\def\csname simpleicon@elementicon\endcsname {\simpleiconsmap\symbol{"ED44}} + \expandafter\def\csname simpleicon@elementaryicon\endcsname {\simpleiconsmap\symbol{"ED45}} + \expandafter\def\csname simpleicon@elementoricon\endcsname {\simpleiconsmap\symbol{"ED46}} + \expandafter\def\csname simpleicon@eleventyicon\endcsname {\simpleiconsmap\symbol{"ED47}} + \expandafter\def\csname simpleicon@elgatoicon\endcsname {\simpleiconsmap\symbol{"ED48}} + \expandafter\def\csname simpleicon@elixiricon\endcsname {\simpleiconsmap\symbol{"ED49}} + \expandafter\def\csname simpleicon@eljuevesicon\endcsname {\simpleiconsmap\symbol{"ED4A}} + \expandafter\def\csname simpleicon@elloicon\endcsname {\simpleiconsmap\symbol{"ED4B}} + \expandafter\def\csname simpleicon@elmicon\endcsname {\simpleiconsmap\symbol{"ED4C}} + \expandafter\def\csname simpleicon@elseviericon\endcsname {\simpleiconsmap\symbol{"ED4D}} + \expandafter\def\csname simpleicon@embarcaderoicon\endcsname {\simpleiconsmap\symbol{"ED4E}} + \expandafter\def\csname simpleicon@embarkicon\endcsname {\simpleiconsmap\symbol{"ED4F}} + \expandafter\def\csname simpleicon@emberdotjsicon\endcsname {\simpleiconsmap\symbol{"ED50}} + \expandafter\def\csname simpleicon@embyicon\endcsname {\simpleiconsmap\symbol{"ED51}} + \expandafter\def\csname simpleicon@emiratesicon\endcsname {\simpleiconsmap\symbol{"ED52}} + \expandafter\def\csname simpleicon@emlakjeticon\endcsname {\simpleiconsmap\symbol{"ED53}} + \expandafter\def\csname simpleicon@empirekredicon\endcsname {\simpleiconsmap\symbol{"ED54}} + \expandafter\def\csname simpleicon@endeavourosicon\endcsname {\simpleiconsmap\symbol{"ED55}} + \expandafter\def\csname simpleicon@engadgeticon\endcsname {\simpleiconsmap\symbol{"ED56}} + \expandafter\def\csname simpleicon@enpassicon\endcsname {\simpleiconsmap\symbol{"ED57}} + \expandafter\def\csname simpleicon@enterprisedbicon\endcsname {\simpleiconsmap\symbol{"ED58}} + \expandafter\def\csname simpleicon@envatoicon\endcsname {\simpleiconsmap\symbol{"ED59}} + \expandafter\def\csname simpleicon@envoyproxyicon\endcsname {\simpleiconsmap\symbol{"ED5A}} + \expandafter\def\csname simpleicon@epelicon\endcsname {\simpleiconsmap\symbol{"ED5B}} + \expandafter\def\csname simpleicon@epicgamesicon\endcsname {\simpleiconsmap\symbol{"ED5C}} + \expandafter\def\csname simpleicon@epsonicon\endcsname {\simpleiconsmap\symbol{"ED5D}} + \expandafter\def\csname simpleicon@equinixmetalicon\endcsname {\simpleiconsmap\symbol{"ED5E}} + \expandafter\def\csname simpleicon@erasericon\endcsname {\simpleiconsmap\symbol{"ED5F}} + \expandafter\def\csname simpleicon@ericssonicon\endcsname {\simpleiconsmap\symbol{"ED60}} + \expandafter\def\csname simpleicon@erlangicon\endcsname {\simpleiconsmap\symbol{"ED61}} + \expandafter\def\csname simpleicon@erpnexticon\endcsname {\simpleiconsmap\symbol{"ED62}} + \expandafter\def\csname simpleicon@esbuildicon\endcsname {\simpleiconsmap\symbol{"ED63}} + \expandafter\def\csname simpleicon@eseaicon\endcsname {\simpleiconsmap\symbol{"ED64}} + \expandafter\def\csname simpleicon@eslgamingicon\endcsname {\simpleiconsmap\symbol{"ED65}} + \expandafter\def\csname simpleicon@eslinticon\endcsname {\simpleiconsmap\symbol{"ED66}} + \expandafter\def\csname simpleicon@esotericsoftwareicon\endcsname {\simpleiconsmap\symbol{"ED67}} + \expandafter\def\csname simpleicon@esphomeicon\endcsname {\simpleiconsmap\symbol{"ED68}} + \expandafter\def\csname simpleicon@espressificon\endcsname {\simpleiconsmap\symbol{"ED69}} + \expandafter\def\csname simpleicon@esriicon\endcsname {\simpleiconsmap\symbol{"ED6A}} + \expandafter\def\csname simpleicon@etcdicon\endcsname {\simpleiconsmap\symbol{"ED6B}} + \expandafter\def\csname simpleicon@ethereumicon\endcsname {\simpleiconsmap\symbol{"ED6C}} + \expandafter\def\csname simpleicon@ethersicon\endcsname {\simpleiconsmap\symbol{"ED6D}} + \expandafter\def\csname simpleicon@ethiopianairlinesicon\endcsname {\simpleiconsmap\symbol{"ED6E}} + \expandafter\def\csname simpleicon@etihadairwaysicon\endcsname {\simpleiconsmap\symbol{"ED6F}} + \expandafter\def\csname simpleicon@etsyicon\endcsname {\simpleiconsmap\symbol{"ED70}} + \expandafter\def\csname simpleicon@eventbriteicon\endcsname {\simpleiconsmap\symbol{"ED71}} + \expandafter\def\csname simpleicon@eventstoreicon\endcsname {\simpleiconsmap\symbol{"ED72}} + \expandafter\def\csname simpleicon@evernoteicon\endcsname {\simpleiconsmap\symbol{"ED73}} + \expandafter\def\csname simpleicon@excalidrawicon\endcsname {\simpleiconsmap\symbol{"ED74}} + \expandafter\def\csname simpleicon@exercismicon\endcsname {\simpleiconsmap\symbol{"ED75}} + \expandafter\def\csname simpleicon@exordoicon\endcsname {\simpleiconsmap\symbol{"ED76}} + \expandafter\def\csname simpleicon@exoscaleicon\endcsname {\simpleiconsmap\symbol{"ED77}} + \expandafter\def\csname simpleicon@expediaicon\endcsname {\simpleiconsmap\symbol{"ED78}} + \expandafter\def\csname simpleicon@expensifyicon\endcsname {\simpleiconsmap\symbol{"ED79}} + \expandafter\def\csname simpleicon@expertsexchangeicon\endcsname {\simpleiconsmap\symbol{"ED7A}} + \expandafter\def\csname simpleicon@expoicon\endcsname {\simpleiconsmap\symbol{"ED7B}} + \expandafter\def\csname simpleicon@expressicon\endcsname {\simpleiconsmap\symbol{"ED7C}} + \expandafter\def\csname simpleicon@expressvpnicon\endcsname {\simpleiconsmap\symbol{"ED7D}} + \expandafter\def\csname simpleicon@eyeemicon\endcsname {\simpleiconsmap\symbol{"ED7E}} + \expandafter\def\csname simpleicon@f1icon\endcsname {\simpleiconsmap\symbol{"ED7F}} + \expandafter\def\csname simpleicon@f5icon\endcsname {\simpleiconsmap\symbol{"ED80}} + \expandafter\def\csname simpleicon@facebookicon\endcsname {\simpleiconsmap\symbol{"ED81}} + \expandafter\def\csname simpleicon@facebookgamingicon\endcsname {\simpleiconsmap\symbol{"ED82}} + \expandafter\def\csname simpleicon@facebookliveicon\endcsname {\simpleiconsmap\symbol{"ED83}} + \expandafter\def\csname simpleicon@faceiticon\endcsname {\simpleiconsmap\symbol{"ED84}} + \expandafter\def\csname simpleicon@facepunchicon\endcsname {\simpleiconsmap\symbol{"ED85}} + \expandafter\def\csname simpleicon@fairphoneicon\endcsname {\simpleiconsmap\symbol{"ED86}} + \expandafter\def\csname simpleicon@falcoicon\endcsname {\simpleiconsmap\symbol{"ED87}} + \expandafter\def\csname simpleicon@falconicon\endcsname {\simpleiconsmap\symbol{"ED88}} + \expandafter\def\csname simpleicon@fampayicon\endcsname {\simpleiconsmap\symbol{"ED89}} + \expandafter\def\csname simpleicon@fandangoicon\endcsname {\simpleiconsmap\symbol{"ED8A}} + \expandafter\def\csname simpleicon@fandomicon\endcsname {\simpleiconsmap\symbol{"ED8B}} + \expandafter\def\csname simpleicon@fanfouicon\endcsname {\simpleiconsmap\symbol{"ED8C}} + \expandafter\def\csname simpleicon@fantomicon\endcsname {\simpleiconsmap\symbol{"ED8D}} + \expandafter\def\csname simpleicon@farcastericon\endcsname {\simpleiconsmap\symbol{"ED8E}} + \expandafter\def\csname simpleicon@fareharboricon\endcsname {\simpleiconsmap\symbol{"ED8F}} + \expandafter\def\csname simpleicon@farfetchicon\endcsname {\simpleiconsmap\symbol{"ED90}} + \expandafter\def\csname simpleicon@fastapiicon\endcsname {\simpleiconsmap\symbol{"ED91}} + \expandafter\def\csname simpleicon@fastifyicon\endcsname {\simpleiconsmap\symbol{"ED92}} + \expandafter\def\csname simpleicon@fastlaneicon\endcsname {\simpleiconsmap\symbol{"ED93}} + \expandafter\def\csname simpleicon@fastlyicon\endcsname {\simpleiconsmap\symbol{"ED94}} + \expandafter\def\csname simpleicon@fathomicon\endcsname {\simpleiconsmap\symbol{"ED95}} + \expandafter\def\csname simpleicon@faunaicon\endcsname {\simpleiconsmap\symbol{"ED96}} + \expandafter\def\csname simpleicon@favroicon\endcsname {\simpleiconsmap\symbol{"ED97}} + \expandafter\def\csname simpleicon@fdroidicon\endcsname {\simpleiconsmap\symbol{"ED98}} + \expandafter\def\csname simpleicon@feathubicon\endcsname {\simpleiconsmap\symbol{"ED99}} + \expandafter\def\csname simpleicon@fedexicon\endcsname {\simpleiconsmap\symbol{"ED9A}} + \expandafter\def\csname simpleicon@fedoraicon\endcsname {\simpleiconsmap\symbol{"ED9B}} + \expandafter\def\csname simpleicon@feedlyicon\endcsname {\simpleiconsmap\symbol{"ED9C}} + \expandafter\def\csname simpleicon@ferrariicon\endcsname {\simpleiconsmap\symbol{"ED9D}} + \expandafter\def\csname simpleicon@ferrarinvicon\endcsname {\simpleiconsmap\symbol{"ED9E}} + \expandafter\def\csname simpleicon@ferretdbicon\endcsname {\simpleiconsmap\symbol{"ED9F}} + \expandafter\def\csname simpleicon@ffmpegicon\endcsname {\simpleiconsmap\symbol{"EDA0}} + \expandafter\def\csname simpleicon@fiicon\endcsname {\simpleiconsmap\symbol{"EDA1}} + \expandafter\def\csname simpleicon@fiaticon\endcsname {\simpleiconsmap\symbol{"EDA2}} + \expandafter\def\csname simpleicon@fidoallianceicon\endcsname {\simpleiconsmap\symbol{"EDA3}} + \expandafter\def\csname simpleicon@fifaicon\endcsname {\simpleiconsmap\symbol{"EDA4}} + \expandafter\def\csname simpleicon@figicon\endcsname {\simpleiconsmap\symbol{"EDA5}} + \expandafter\def\csname simpleicon@figmaicon\endcsname {\simpleiconsmap\symbol{"EDA6}} + \expandafter\def\csname simpleicon@figshareicon\endcsname {\simpleiconsmap\symbol{"EDA7}} + \expandafter\def\csname simpleicon@filaicon\endcsname {\simpleiconsmap\symbol{"EDA8}} + \expandafter\def\csname simpleicon@filedotioicon\endcsname {\simpleiconsmap\symbol{"EDA9}} + \expandafter\def\csname simpleicon@filesicon\endcsname {\simpleiconsmap\symbol{"EDAA}} + \expandafter\def\csname simpleicon@filezillaicon\endcsname {\simpleiconsmap\symbol{"EDAB}} + \expandafter\def\csname simpleicon@finecoicon\endcsname {\simpleiconsmap\symbol{"EDAC}} + \expandafter\def\csname simpleicon@fingicon\endcsname {\simpleiconsmap\symbol{"EDAD}} + \expandafter\def\csname simpleicon@firebaseicon\endcsname {\simpleiconsmap\symbol{"EDAE}} + \expandafter\def\csname simpleicon@firefishicon\endcsname {\simpleiconsmap\symbol{"EDAF}} + \expandafter\def\csname simpleicon@fireflyiiiicon\endcsname {\simpleiconsmap\symbol{"EDB0}} + \expandafter\def\csname simpleicon@firefoxicon\endcsname {\simpleiconsmap\symbol{"EDB1}} + \expandafter\def\csname simpleicon@firefoxbrowsericon\endcsname {\simpleiconsmap\symbol{"EDB2}} + \expandafter\def\csname simpleicon@fireshipicon\endcsname {\simpleiconsmap\symbol{"EDB3}} + \expandafter\def\csname simpleicon@firewallaicon\endcsname {\simpleiconsmap\symbol{"EDB4}} + \expandafter\def\csname simpleicon@firsticon\endcsname {\simpleiconsmap\symbol{"EDB5}} + \expandafter\def\csname simpleicon@fishshellicon\endcsname {\simpleiconsmap\symbol{"EDB6}} + \expandafter\def\csname simpleicon@fitbiticon\endcsname {\simpleiconsmap\symbol{"EDB7}} + \expandafter\def\csname simpleicon@fivemicon\endcsname {\simpleiconsmap\symbol{"EDB8}} + \expandafter\def\csname simpleicon@fiverricon\endcsname {\simpleiconsmap\symbol{"EDB9}} + \expandafter\def\csname simpleicon@fizzicon\endcsname {\simpleiconsmap\symbol{"EDBA}} + \expandafter\def\csname simpleicon@flashforgeicon\endcsname {\simpleiconsmap\symbol{"EDBB}} + \expandafter\def\csname simpleicon@flaskicon\endcsname {\simpleiconsmap\symbol{"EDBC}} + \expandafter\def\csname simpleicon@flaticon\endcsname {\simpleiconsmap\symbol{"EDBD}} + \expandafter\def\csname simpleicon@flathubicon\endcsname {\simpleiconsmap\symbol{"EDBE}} + \expandafter\def\csname simpleicon@flatpakicon\endcsname {\simpleiconsmap\symbol{"EDBF}} + \expandafter\def\csname simpleicon@flickricon\endcsname {\simpleiconsmap\symbol{"EDC0}} + \expandafter\def\csname simpleicon@flightawareicon\endcsname {\simpleiconsmap\symbol{"EDC1}} + \expandafter\def\csname simpleicon@flipboardicon\endcsname {\simpleiconsmap\symbol{"EDC2}} + \expandafter\def\csname simpleicon@flipkarticon\endcsname {\simpleiconsmap\symbol{"EDC3}} + \expandafter\def\csname simpleicon@floatplaneicon\endcsname {\simpleiconsmap\symbol{"EDC4}} + \expandafter\def\csname simpleicon@floodicon\endcsname {\simpleiconsmap\symbol{"EDC5}} + \expandafter\def\csname simpleicon@fluentbiticon\endcsname {\simpleiconsmap\symbol{"EDC6}} + \expandafter\def\csname simpleicon@fluentdicon\endcsname {\simpleiconsmap\symbol{"EDC7}} + \expandafter\def\csname simpleicon@flukeicon\endcsname {\simpleiconsmap\symbol{"EDC8}} + \expandafter\def\csname simpleicon@fluttericon\endcsname {\simpleiconsmap\symbol{"EDC9}} + \expandafter\def\csname simpleicon@fluxicon\endcsname {\simpleiconsmap\symbol{"EDCA}} + \expandafter\def\csname simpleicon@fluxusicon\endcsname {\simpleiconsmap\symbol{"EDCB}} + \expandafter\def\csname simpleicon@flydotioicon\endcsname {\simpleiconsmap\symbol{"EDCC}} + \expandafter\def\csname simpleicon@flywayicon\endcsname {\simpleiconsmap\symbol{"EDCD}} + \expandafter\def\csname simpleicon@fmodicon\endcsname {\simpleiconsmap\symbol{"EDCE}} + \expandafter\def\csname simpleicon@fnacicon\endcsname {\simpleiconsmap\symbol{"EDCF}} + \expandafter\def\csname simpleicon@foliumicon\endcsname {\simpleiconsmap\symbol{"EDD0}} + \expandafter\def\csname simpleicon@fonomaicon\endcsname {\simpleiconsmap\symbol{"EDD1}} + \expandafter\def\csname simpleicon@fontawesomeicon\endcsname {\simpleiconsmap\symbol{"EDD2}} + \expandafter\def\csname simpleicon@fontbaseicon\endcsname {\simpleiconsmap\symbol{"EDD3}} + \expandafter\def\csname simpleicon@fontforgeicon\endcsname {\simpleiconsmap\symbol{"EDD4}} + \expandafter\def\csname simpleicon@foobar2000icon\endcsname {\simpleiconsmap\symbol{"EDD5}} + \expandafter\def\csname simpleicon@foodpandaicon\endcsname {\simpleiconsmap\symbol{"EDD6}} + \expandafter\def\csname simpleicon@fordicon\endcsname {\simpleiconsmap\symbol{"EDD7}} + \expandafter\def\csname simpleicon@forgejoicon\endcsname {\simpleiconsmap\symbol{"EDD8}} + \expandafter\def\csname simpleicon@formikicon\endcsname {\simpleiconsmap\symbol{"EDD9}} + \expandafter\def\csname simpleicon@formspreeicon\endcsname {\simpleiconsmap\symbol{"EDDA}} + \expandafter\def\csname simpleicon@formstackicon\endcsname {\simpleiconsmap\symbol{"EDDB}} + \expandafter\def\csname simpleicon@fortineticon\endcsname {\simpleiconsmap\symbol{"EDDC}} + \expandafter\def\csname simpleicon@fortranicon\endcsname {\simpleiconsmap\symbol{"EDDD}} + \expandafter\def\csname simpleicon@fossaicon\endcsname {\simpleiconsmap\symbol{"EDDE}} + \expandafter\def\csname simpleicon@fossilscmicon\endcsname {\simpleiconsmap\symbol{"EDDF}} + \expandafter\def\csname simpleicon@foundryvirtualtabletopicon\endcsname {\simpleiconsmap\symbol{"EDE0}} + \expandafter\def\csname simpleicon@foursquareicon\endcsname {\simpleiconsmap\symbol{"EDE1}} + \expandafter\def\csname simpleicon@foursquarecityguideicon\endcsname {\simpleiconsmap\symbol{"EDE2}} + \expandafter\def\csname simpleicon@foxicon\endcsname {\simpleiconsmap\symbol{"EDE3}} + \expandafter\def\csname simpleicon@foxtelicon\endcsname {\simpleiconsmap\symbol{"EDE4}} + \expandafter\def\csname simpleicon@fozzyicon\endcsname {\simpleiconsmap\symbol{"EDE5}} + \expandafter\def\csname simpleicon@framericon\endcsname {\simpleiconsmap\symbol{"EDE6}} + \expandafter\def\csname simpleicon@frameworkicon\endcsname {\simpleiconsmap\symbol{"EDE7}} + \expandafter\def\csname simpleicon@framework7icon\endcsname {\simpleiconsmap\symbol{"EDE8}} + \expandafter\def\csname simpleicon@franprixicon\endcsname {\simpleiconsmap\symbol{"EDE9}} + \expandafter\def\csname simpleicon@frappeicon\endcsname {\simpleiconsmap\symbol{"EDEA}} + \expandafter\def\csname simpleicon@fraunhofergesellschafticon\endcsname {\simpleiconsmap\symbol{"EDEB}} + \expandafter\def\csname simpleicon@freebsdicon\endcsname {\simpleiconsmap\symbol{"EDEC}} + \expandafter\def\csname simpleicon@freecadicon\endcsname {\simpleiconsmap\symbol{"EDED}} + \expandafter\def\csname simpleicon@freecodecampicon\endcsname {\simpleiconsmap\symbol{"EDEE}} + \expandafter\def\csname simpleicon@freedesktopdotorgicon\endcsname {\simpleiconsmap\symbol{"EDEF}} + \expandafter\def\csname simpleicon@freelancericon\endcsname {\simpleiconsmap\symbol{"EDF0}} + \expandafter\def\csname simpleicon@freelancermapicon\endcsname {\simpleiconsmap\symbol{"EDF1}} + \expandafter\def\csname simpleicon@freenasicon\endcsname {\simpleiconsmap\symbol{"EDF2}} + \expandafter\def\csname simpleicon@freepikicon\endcsname {\simpleiconsmap\symbol{"EDF3}} + \expandafter\def\csname simpleicon@frontendmentoricon\endcsname {\simpleiconsmap\symbol{"EDF4}} + \expandafter\def\csname simpleicon@frontifyicon\endcsname {\simpleiconsmap\symbol{"EDF5}} + \expandafter\def\csname simpleicon@fsecureicon\endcsname {\simpleiconsmap\symbol{"EDF6}} + \expandafter\def\csname simpleicon@fsharpicon\endcsname {\simpleiconsmap\symbol{"EDF7}} + \expandafter\def\csname simpleicon@fuboicon\endcsname {\simpleiconsmap\symbol{"EDF8}} + \expandafter\def\csname simpleicon@fuelericon\endcsname {\simpleiconsmap\symbol{"EDF9}} + \expandafter\def\csname simpleicon@fugacloudicon\endcsname {\simpleiconsmap\symbol{"EDFA}} + \expandafter\def\csname simpleicon@fujifilmicon\endcsname {\simpleiconsmap\symbol{"EDFB}} + \expandafter\def\csname simpleicon@fujitsuicon\endcsname {\simpleiconsmap\symbol{"EDFC}} + \expandafter\def\csname simpleicon@funimationicon\endcsname {\simpleiconsmap\symbol{"EDFD}} + \expandafter\def\csname simpleicon@furaffinityicon\endcsname {\simpleiconsmap\symbol{"EDFE}} + \expandafter\def\csname simpleicon@furrynetworkicon\endcsname {\simpleiconsmap\symbol{"EDFF}} + \expandafter\def\csname simpleicon@fusionauthicon\endcsname {\simpleiconsmap\symbol{"EE00}} + \expandafter\def\csname simpleicon@futurelearnicon\endcsname {\simpleiconsmap\symbol{"EE01}} + \expandafter\def\csname simpleicon@g2icon\endcsname {\simpleiconsmap\symbol{"EE02}} + \expandafter\def\csname simpleicon@g2aicon\endcsname {\simpleiconsmap\symbol{"EE03}} + \expandafter\def\csname simpleicon@g2gicon\endcsname {\simpleiconsmap\symbol{"EE04}} + \expandafter\def\csname simpleicon@galaxusicon\endcsname {\simpleiconsmap\symbol{"EE05}} + \expandafter\def\csname simpleicon@gameandwatchicon\endcsname {\simpleiconsmap\symbol{"EE06}} + \expandafter\def\csname simpleicon@gamebananaicon\endcsname {\simpleiconsmap\symbol{"EE07}} + \expandafter\def\csname simpleicon@gamedevelopericon\endcsname {\simpleiconsmap\symbol{"EE08}} + \expandafter\def\csname simpleicon@gamejolticon\endcsname {\simpleiconsmap\symbol{"EE09}} + \expandafter\def\csname simpleicon@gamelofticon\endcsname {\simpleiconsmap\symbol{"EE0A}} + \expandafter\def\csname simpleicon@gamemakericon\endcsname {\simpleiconsmap\symbol{"EE0B}} + \expandafter\def\csname simpleicon@garminicon\endcsname {\simpleiconsmap\symbol{"EE0C}} + \expandafter\def\csname simpleicon@gatlingicon\endcsname {\simpleiconsmap\symbol{"EE0D}} + \expandafter\def\csname simpleicon@gatsbyicon\endcsname {\simpleiconsmap\symbol{"EE0E}} + \expandafter\def\csname simpleicon@gcoreicon\endcsname {\simpleiconsmap\symbol{"EE0F}} + \expandafter\def\csname simpleicon@gdalicon\endcsname {\simpleiconsmap\symbol{"EE10}} + \expandafter\def\csname simpleicon@geanticon\endcsname {\simpleiconsmap\symbol{"EE11}} + \expandafter\def\csname simpleicon@geeksforgeeksicon\endcsname {\simpleiconsmap\symbol{"EE12}} + \expandafter\def\csname simpleicon@generalelectricicon\endcsname {\simpleiconsmap\symbol{"EE13}} + \expandafter\def\csname simpleicon@generalmotorsicon\endcsname {\simpleiconsmap\symbol{"EE14}} + \expandafter\def\csname simpleicon@geniusicon\endcsname {\simpleiconsmap\symbol{"EE15}} + \expandafter\def\csname simpleicon@gentooicon\endcsname {\simpleiconsmap\symbol{"EE16}} + \expandafter\def\csname simpleicon@geocachingicon\endcsname {\simpleiconsmap\symbol{"EE17}} + \expandafter\def\csname simpleicon@geodeicon\endcsname {\simpleiconsmap\symbol{"EE18}} + \expandafter\def\csname simpleicon@geopandasicon\endcsname {\simpleiconsmap\symbol{"EE19}} + \expandafter\def\csname simpleicon@gerriticon\endcsname {\simpleiconsmap\symbol{"EE1A}} + \expandafter\def\csname simpleicon@getxicon\endcsname {\simpleiconsmap\symbol{"EE1B}} + \expandafter\def\csname simpleicon@ghosticon\endcsname {\simpleiconsmap\symbol{"EE1C}} + \expandafter\def\csname simpleicon@ghosteryicon\endcsname {\simpleiconsmap\symbol{"EE1D}} + \expandafter\def\csname simpleicon@gimpicon\endcsname {\simpleiconsmap\symbol{"EE1E}} + \expandafter\def\csname simpleicon@ginicon\endcsname {\simpleiconsmap\symbol{"EE1F}} + \expandafter\def\csname simpleicon@giphyicon\endcsname {\simpleiconsmap\symbol{"EE20}} + \expandafter\def\csname simpleicon@giticon\endcsname {\simpleiconsmap\symbol{"EE21}} + \expandafter\def\csname simpleicon@gitbookicon\endcsname {\simpleiconsmap\symbol{"EE22}} + \expandafter\def\csname simpleicon@gitconnectedicon\endcsname {\simpleiconsmap\symbol{"EE23}} + \expandafter\def\csname simpleicon@giteaicon\endcsname {\simpleiconsmap\symbol{"EE24}} + \expandafter\def\csname simpleicon@giteeicon\endcsname {\simpleiconsmap\symbol{"EE25}} + \expandafter\def\csname simpleicon@gitextensionsicon\endcsname {\simpleiconsmap\symbol{"EE26}} + \expandafter\def\csname simpleicon@gitforwindowsicon\endcsname {\simpleiconsmap\symbol{"EE27}} + \expandafter\def\csname simpleicon@githubicon\endcsname {\simpleiconsmap\symbol{"EE28}} + \expandafter\def\csname simpleicon@githubactionsicon\endcsname {\simpleiconsmap\symbol{"EE29}} + \expandafter\def\csname simpleicon@githubcopiloticon\endcsname {\simpleiconsmap\symbol{"EE2A}} + \expandafter\def\csname simpleicon@githubpagesicon\endcsname {\simpleiconsmap\symbol{"EE2B}} + \expandafter\def\csname simpleicon@githubsponsorsicon\endcsname {\simpleiconsmap\symbol{"EE2C}} + \expandafter\def\csname simpleicon@gitignoredotioicon\endcsname {\simpleiconsmap\symbol{"EE2D}} + \expandafter\def\csname simpleicon@gitkrakenicon\endcsname {\simpleiconsmap\symbol{"EE2E}} + \expandafter\def\csname simpleicon@gitlabicon\endcsname {\simpleiconsmap\symbol{"EE2F}} + \expandafter\def\csname simpleicon@gitlfsicon\endcsname {\simpleiconsmap\symbol{"EE30}} + \expandafter\def\csname simpleicon@gitpodicon\endcsname {\simpleiconsmap\symbol{"EE31}} + \expandafter\def\csname simpleicon@gittericon\endcsname {\simpleiconsmap\symbol{"EE32}} + \expandafter\def\csname simpleicon@glassdooricon\endcsname {\simpleiconsmap\symbol{"EE33}} + \expandafter\def\csname simpleicon@glideicon\endcsname {\simpleiconsmap\symbol{"EE34}} + \expandafter\def\csname simpleicon@glitchicon\endcsname {\simpleiconsmap\symbol{"EE35}} + \expandafter\def\csname simpleicon@globusicon\endcsname {\simpleiconsmap\symbol{"EE36}} + \expandafter\def\csname simpleicon@glovoicon\endcsname {\simpleiconsmap\symbol{"EE37}} + \expandafter\def\csname simpleicon@gltficon\endcsname {\simpleiconsmap\symbol{"EE38}} + \expandafter\def\csname simpleicon@gmailicon\endcsname {\simpleiconsmap\symbol{"EE39}} + \expandafter\def\csname simpleicon@gnomeicon\endcsname {\simpleiconsmap\symbol{"EE3A}} + \expandafter\def\csname simpleicon@gnometerminalicon\endcsname {\simpleiconsmap\symbol{"EE3B}} + \expandafter\def\csname simpleicon@gnuicon\endcsname {\simpleiconsmap\symbol{"EE3C}} + \expandafter\def\csname simpleicon@gnubashicon\endcsname {\simpleiconsmap\symbol{"EE3D}} + \expandafter\def\csname simpleicon@gnuemacsicon\endcsname {\simpleiconsmap\symbol{"EE3E}} + \expandafter\def\csname simpleicon@gnuicecaticon\endcsname {\simpleiconsmap\symbol{"EE3F}} + \expandafter\def\csname simpleicon@gnuprivacyguardicon\endcsname {\simpleiconsmap\symbol{"EE40}} + \expandafter\def\csname simpleicon@gnusocialicon\endcsname {\simpleiconsmap\symbol{"EE41}} + \expandafter\def\csname simpleicon@goicon\endcsname {\simpleiconsmap\symbol{"EE42}} + \expandafter\def\csname simpleicon@gocdicon\endcsname {\simpleiconsmap\symbol{"EE43}} + \expandafter\def\csname simpleicon@godaddyicon\endcsname {\simpleiconsmap\symbol{"EE44}} + \expandafter\def\csname simpleicon@godotengineicon\endcsname {\simpleiconsmap\symbol{"EE45}} + \expandafter\def\csname simpleicon@gofundmeicon\endcsname {\simpleiconsmap\symbol{"EE46}} + \expandafter\def\csname simpleicon@gogdotcomicon\endcsname {\simpleiconsmap\symbol{"EE47}} + \expandafter\def\csname simpleicon@gojekicon\endcsname {\simpleiconsmap\symbol{"EE48}} + \expandafter\def\csname simpleicon@golandicon\endcsname {\simpleiconsmap\symbol{"EE49}} + \expandafter\def\csname simpleicon@goldenlineicon\endcsname {\simpleiconsmap\symbol{"EE4A}} + \expandafter\def\csname simpleicon@goldmansachsicon\endcsname {\simpleiconsmap\symbol{"EE4B}} + \expandafter\def\csname simpleicon@goodreadsicon\endcsname {\simpleiconsmap\symbol{"EE4C}} + \expandafter\def\csname simpleicon@googleicon\endcsname {\simpleiconsmap\symbol{"EE4D}} + \expandafter\def\csname simpleicon@googleadmobicon\endcsname {\simpleiconsmap\symbol{"EE4E}} + \expandafter\def\csname simpleicon@googleadsicon\endcsname {\simpleiconsmap\symbol{"EE4F}} + \expandafter\def\csname simpleicon@googleadsenseicon\endcsname {\simpleiconsmap\symbol{"EE50}} + \expandafter\def\csname simpleicon@googleanalyticsicon\endcsname {\simpleiconsmap\symbol{"EE51}} + \expandafter\def\csname simpleicon@googleappsscripticon\endcsname {\simpleiconsmap\symbol{"EE52}} + \expandafter\def\csname simpleicon@googleassistanticon\endcsname {\simpleiconsmap\symbol{"EE53}} + \expandafter\def\csname simpleicon@googleauthenticatoricon\endcsname {\simpleiconsmap\symbol{"EE54}} + \expandafter\def\csname simpleicon@googlebigqueryicon\endcsname {\simpleiconsmap\symbol{"EE55}} + \expandafter\def\csname simpleicon@googlebigtableicon\endcsname {\simpleiconsmap\symbol{"EE56}} + \expandafter\def\csname simpleicon@googlecalendaricon\endcsname {\simpleiconsmap\symbol{"EE57}} + \expandafter\def\csname simpleicon@googlecampaignmanager360icon\endcsname {\simpleiconsmap\symbol{"EE58}} + \expandafter\def\csname simpleicon@googlecardboardicon\endcsname {\simpleiconsmap\symbol{"EE59}} + \expandafter\def\csname simpleicon@googlechaticon\endcsname {\simpleiconsmap\symbol{"EE5A}} + \expandafter\def\csname simpleicon@googlechromeicon\endcsname {\simpleiconsmap\symbol{"EE5B}} + \expandafter\def\csname simpleicon@googlechronicleicon\endcsname {\simpleiconsmap\symbol{"EE5C}} + \expandafter\def\csname simpleicon@googleclassroomicon\endcsname {\simpleiconsmap\symbol{"EE5D}} + \expandafter\def\csname simpleicon@googlecloudicon\endcsname {\simpleiconsmap\symbol{"EE5E}} + \expandafter\def\csname simpleicon@googlecloudcomposericon\endcsname {\simpleiconsmap\symbol{"EE5F}} + \expandafter\def\csname simpleicon@googlecloudspannericon\endcsname {\simpleiconsmap\symbol{"EE60}} + \expandafter\def\csname simpleicon@googlecloudstorageicon\endcsname {\simpleiconsmap\symbol{"EE61}} + \expandafter\def\csname simpleicon@googlecolabicon\endcsname {\simpleiconsmap\symbol{"EE62}} + \expandafter\def\csname simpleicon@googlecontaineroptimizedosicon\endcsname {\simpleiconsmap\symbol{"EE63}} + \expandafter\def\csname simpleicon@googledataflowicon\endcsname {\simpleiconsmap\symbol{"EE64}} + \expandafter\def\csname simpleicon@googledataprocicon\endcsname {\simpleiconsmap\symbol{"EE65}} + \expandafter\def\csname simpleicon@googledatastudioicon\endcsname {\simpleiconsmap\symbol{"EE66}} + \expandafter\def\csname simpleicon@googledisplayandvideo360icon\endcsname {\simpleiconsmap\symbol{"EE67}} + \expandafter\def\csname simpleicon@googledocsicon\endcsname {\simpleiconsmap\symbol{"EE68}} + \expandafter\def\csname simpleicon@googledriveicon\endcsname {\simpleiconsmap\symbol{"EE69}} + \expandafter\def\csname simpleicon@googleearthicon\endcsname {\simpleiconsmap\symbol{"EE6A}} + \expandafter\def\csname simpleicon@googleearthengineicon\endcsname {\simpleiconsmap\symbol{"EE6B}} + \expandafter\def\csname simpleicon@googlefiticon\endcsname {\simpleiconsmap\symbol{"EE6C}} + \expandafter\def\csname simpleicon@googlefontsicon\endcsname {\simpleiconsmap\symbol{"EE6D}} + \expandafter\def\csname simpleicon@googleformsicon\endcsname {\simpleiconsmap\symbol{"EE6E}} + \expandafter\def\csname simpleicon@googlegeminiicon\endcsname {\simpleiconsmap\symbol{"EE6F}} + \expandafter\def\csname simpleicon@googlehomeicon\endcsname {\simpleiconsmap\symbol{"EE70}} + \expandafter\def\csname simpleicon@googlekeepicon\endcsname {\simpleiconsmap\symbol{"EE71}} + \expandafter\def\csname simpleicon@googlelensicon\endcsname {\simpleiconsmap\symbol{"EE72}} + \expandafter\def\csname simpleicon@googlemapsicon\endcsname {\simpleiconsmap\symbol{"EE73}} + \expandafter\def\csname simpleicon@googlemarketingplatformicon\endcsname {\simpleiconsmap\symbol{"EE74}} + \expandafter\def\csname simpleicon@googlemeeticon\endcsname {\simpleiconsmap\symbol{"EE75}} + \expandafter\def\csname simpleicon@googlemessagesicon\endcsname {\simpleiconsmap\symbol{"EE76}} + \expandafter\def\csname simpleicon@googlenearbyicon\endcsname {\simpleiconsmap\symbol{"EE77}} + \expandafter\def\csname simpleicon@googlenewsicon\endcsname {\simpleiconsmap\symbol{"EE78}} + \expandafter\def\csname simpleicon@googlepayicon\endcsname {\simpleiconsmap\symbol{"EE79}} + \expandafter\def\csname simpleicon@googlephotosicon\endcsname {\simpleiconsmap\symbol{"EE7A}} + \expandafter\def\csname simpleicon@googleplayicon\endcsname {\simpleiconsmap\symbol{"EE7B}} + \expandafter\def\csname simpleicon@googlepubsubicon\endcsname {\simpleiconsmap\symbol{"EE7C}} + \expandafter\def\csname simpleicon@googlescholaricon\endcsname {\simpleiconsmap\symbol{"EE7D}} + \expandafter\def\csname simpleicon@googlesearchconsoleicon\endcsname {\simpleiconsmap\symbol{"EE7E}} + \expandafter\def\csname simpleicon@googlesheetsicon\endcsname {\simpleiconsmap\symbol{"EE7F}} + \expandafter\def\csname simpleicon@googleslidesicon\endcsname {\simpleiconsmap\symbol{"EE80}} + \expandafter\def\csname simpleicon@googlestreetviewicon\endcsname {\simpleiconsmap\symbol{"EE81}} + \expandafter\def\csname simpleicon@googletagmanagericon\endcsname {\simpleiconsmap\symbol{"EE82}} + \expandafter\def\csname simpleicon@googletasksicon\endcsname {\simpleiconsmap\symbol{"EE83}} + \expandafter\def\csname simpleicon@googletranslateicon\endcsname {\simpleiconsmap\symbol{"EE84}} + \expandafter\def\csname simpleicon@gotomeetingicon\endcsname {\simpleiconsmap\symbol{"EE85}} + \expandafter\def\csname simpleicon@grabicon\endcsname {\simpleiconsmap\symbol{"EE86}} + \expandafter\def\csname simpleicon@gradleicon\endcsname {\simpleiconsmap\symbol{"EE87}} + \expandafter\def\csname simpleicon@gradleplaypublishericon\endcsname {\simpleiconsmap\symbol{"EE88}} + \expandafter\def\csname simpleicon@grafanaicon\endcsname {\simpleiconsmap\symbol{"EE89}} + \expandafter\def\csname simpleicon@grammarlyicon\endcsname {\simpleiconsmap\symbol{"EE8A}} + \expandafter\def\csname simpleicon@grandfraisicon\endcsname {\simpleiconsmap\symbol{"EE8B}} + \expandafter\def\csname simpleicon@grapheneosicon\endcsname {\simpleiconsmap\symbol{"EE8C}} + \expandafter\def\csname simpleicon@graphiteicon\endcsname {\simpleiconsmap\symbol{"EE8D}} + \expandafter\def\csname simpleicon@graphqlicon\endcsname {\simpleiconsmap\symbol{"EE8E}} + \expandafter\def\csname simpleicon@gravicon\endcsname {\simpleiconsmap\symbol{"EE8F}} + \expandafter\def\csname simpleicon@gravataricon\endcsname {\simpleiconsmap\symbol{"EE90}} + \expandafter\def\csname simpleicon@graylogicon\endcsname {\simpleiconsmap\symbol{"EE91}} + \expandafter\def\csname simpleicon@greasyforkicon\endcsname {\simpleiconsmap\symbol{"EE92}} + \expandafter\def\csname simpleicon@greatlearningicon\endcsname {\simpleiconsmap\symbol{"EE93}} + \expandafter\def\csname simpleicon@greenhouseicon\endcsname {\simpleiconsmap\symbol{"EE94}} + \expandafter\def\csname simpleicon@greensockicon\endcsname {\simpleiconsmap\symbol{"EE95}} + \expandafter\def\csname simpleicon@griddotaiicon\endcsname {\simpleiconsmap\symbol{"EE96}} + \expandafter\def\csname simpleicon@gridsomeicon\endcsname {\simpleiconsmap\symbol{"EE97}} + \expandafter\def\csname simpleicon@groupmeicon\endcsname {\simpleiconsmap\symbol{"EE98}} + \expandafter\def\csname simpleicon@grouponicon\endcsname {\simpleiconsmap\symbol{"EE99}} + \expandafter\def\csname simpleicon@grubhubicon\endcsname {\simpleiconsmap\symbol{"EE9A}} + \expandafter\def\csname simpleicon@grunticon\endcsname {\simpleiconsmap\symbol{"EE9B}} + \expandafter\def\csname simpleicon@gskicon\endcsname {\simpleiconsmap\symbol{"EE9C}} + \expandafter\def\csname simpleicon@gsmarenadotcomicon\endcsname {\simpleiconsmap\symbol{"EE9D}} + \expandafter\def\csname simpleicon@gstreamericon\endcsname {\simpleiconsmap\symbol{"EE9E}} + \expandafter\def\csname simpleicon@gtkicon\endcsname {\simpleiconsmap\symbol{"EE9F}} + \expandafter\def\csname simpleicon@guangzhoumetroicon\endcsname {\simpleiconsmap\symbol{"EEA0}} + \expandafter\def\csname simpleicon@guildedicon\endcsname {\simpleiconsmap\symbol{"EEA1}} + \expandafter\def\csname simpleicon@gulpicon\endcsname {\simpleiconsmap\symbol{"EEA2}} + \expandafter\def\csname simpleicon@gumroadicon\endcsname {\simpleiconsmap\symbol{"EEA3}} + \expandafter\def\csname simpleicon@gumtreeicon\endcsname {\simpleiconsmap\symbol{"EEA4}} + \expandafter\def\csname simpleicon@gunicornicon\endcsname {\simpleiconsmap\symbol{"EEA5}} + \expandafter\def\csname simpleicon@gurobiicon\endcsname {\simpleiconsmap\symbol{"EEA6}} + \expandafter\def\csname simpleicon@gustoicon\endcsname {\simpleiconsmap\symbol{"EEA7}} + \expandafter\def\csname simpleicon@gutenbergicon\endcsname {\simpleiconsmap\symbol{"EEA8}} + \expandafter\def\csname simpleicon@h3icon\endcsname {\simpleiconsmap\symbol{"EEA9}} + \expandafter\def\csname simpleicon@habricon\endcsname {\simpleiconsmap\symbol{"EEAA}} + \expandafter\def\csname simpleicon@hackadayicon\endcsname {\simpleiconsmap\symbol{"EEAB}} + \expandafter\def\csname simpleicon@hackclubicon\endcsname {\simpleiconsmap\symbol{"EEAC}} + \expandafter\def\csname simpleicon@hackerearthicon\endcsname {\simpleiconsmap\symbol{"EEAD}} + \expandafter\def\csname simpleicon@hackernoonicon\endcsname {\simpleiconsmap\symbol{"EEAE}} + \expandafter\def\csname simpleicon@hackeroneicon\endcsname {\simpleiconsmap\symbol{"EEAF}} + \expandafter\def\csname simpleicon@hackerrankicon\endcsname {\simpleiconsmap\symbol{"EEB0}} + \expandafter\def\csname simpleicon@hackstericon\endcsname {\simpleiconsmap\symbol{"EEB1}} + \expandafter\def\csname simpleicon@hacktheboxicon\endcsname {\simpleiconsmap\symbol{"EEB2}} + \expandafter\def\csname simpleicon@halicon\endcsname {\simpleiconsmap\symbol{"EEB3}} + \expandafter\def\csname simpleicon@handlebarsdotjsicon\endcsname {\simpleiconsmap\symbol{"EEB4}} + \expandafter\def\csname simpleicon@handmicon\endcsname {\simpleiconsmap\symbol{"EEB5}} + \expandafter\def\csname simpleicon@handshakeicon\endcsname {\simpleiconsmap\symbol{"EEB6}} + \expandafter\def\csname simpleicon@handshakeprotocolicon\endcsname {\simpleiconsmap\symbol{"EEB7}} + \expandafter\def\csname simpleicon@happycowicon\endcsname {\simpleiconsmap\symbol{"EEB8}} + \expandafter\def\csname simpleicon@harboricon\endcsname {\simpleiconsmap\symbol{"EEB9}} + \expandafter\def\csname simpleicon@harmonyosicon\endcsname {\simpleiconsmap\symbol{"EEBA}} + \expandafter\def\csname simpleicon@hashicorpicon\endcsname {\simpleiconsmap\symbol{"EEBB}} + \expandafter\def\csname simpleicon@hashnodeicon\endcsname {\simpleiconsmap\symbol{"EEBC}} + \expandafter\def\csname simpleicon@haskellicon\endcsname {\simpleiconsmap\symbol{"EEBD}} + \expandafter\def\csname simpleicon@hasuraicon\endcsname {\simpleiconsmap\symbol{"EEBE}} + \expandafter\def\csname simpleicon@hatenabookmarkicon\endcsname {\simpleiconsmap\symbol{"EEBF}} + \expandafter\def\csname simpleicon@haveibeenpwnedicon\endcsname {\simpleiconsmap\symbol{"EEC0}} + \expandafter\def\csname simpleicon@haxeicon\endcsname {\simpleiconsmap\symbol{"EEC1}} + \expandafter\def\csname simpleicon@hboicon\endcsname {\simpleiconsmap\symbol{"EEC2}} + \expandafter\def\csname simpleicon@hclicon\endcsname {\simpleiconsmap\symbol{"EEC3}} + \expandafter\def\csname simpleicon@hdfcbankicon\endcsname {\simpleiconsmap\symbol{"EEC4}} + \expandafter\def\csname simpleicon@headlessuiicon\endcsname {\simpleiconsmap\symbol{"EEC5}} + \expandafter\def\csname simpleicon@headphonezoneicon\endcsname {\simpleiconsmap\symbol{"EEC6}} + \expandafter\def\csname simpleicon@headspaceicon\endcsname {\simpleiconsmap\symbol{"EEC7}} + \expandafter\def\csname simpleicon@hearthicon\endcsname {\simpleiconsmap\symbol{"EEC8}} + \expandafter\def\csname simpleicon@hearthisdotaticon\endcsname {\simpleiconsmap\symbol{"EEC9}} + \expandafter\def\csname simpleicon@hederaicon\endcsname {\simpleiconsmap\symbol{"EECA}} + \expandafter\def\csname simpleicon@heliumicon\endcsname {\simpleiconsmap\symbol{"EECB}} + \expandafter\def\csname simpleicon@hellofreshicon\endcsname {\simpleiconsmap\symbol{"EECC}} + \expandafter\def\csname simpleicon@hellyhansenicon\endcsname {\simpleiconsmap\symbol{"EECD}} + \expandafter\def\csname simpleicon@helmicon\endcsname {\simpleiconsmap\symbol{"EECE}} + \expandafter\def\csname simpleicon@helpdeskicon\endcsname {\simpleiconsmap\symbol{"EECF}} + \expandafter\def\csname simpleicon@helpscouticon\endcsname {\simpleiconsmap\symbol{"EED0}} + \expandafter\def\csname simpleicon@hepsiemlakicon\endcsname {\simpleiconsmap\symbol{"EED1}} + \expandafter\def\csname simpleicon@hereicon\endcsname {\simpleiconsmap\symbol{"EED2}} + \expandafter\def\csname simpleicon@herokuicon\endcsname {\simpleiconsmap\symbol{"EED3}} + \expandafter\def\csname simpleicon@hetznericon\endcsname {\simpleiconsmap\symbol{"EED4}} + \expandafter\def\csname simpleicon@hevyicon\endcsname {\simpleiconsmap\symbol{"EED5}} + \expandafter\def\csname simpleicon@hexleticon\endcsname {\simpleiconsmap\symbol{"EED6}} + \expandafter\def\csname simpleicon@hexoicon\endcsname {\simpleiconsmap\symbol{"EED7}} + \expandafter\def\csname simpleicon@heyicon\endcsname {\simpleiconsmap\symbol{"EED8}} + \expandafter\def\csname simpleicon@hibernateicon\endcsname {\simpleiconsmap\symbol{"EED9}} + \expandafter\def\csname simpleicon@hibobicon\endcsname {\simpleiconsmap\symbol{"EEDA}} + \expandafter\def\csname simpleicon@hiltonicon\endcsname {\simpleiconsmap\symbol{"EEDB}} + \expandafter\def\csname simpleicon@hiltonhotelsandresortsicon\endcsname {\simpleiconsmap\symbol{"EEDC}} + \expandafter\def\csname simpleicon@hitachiicon\endcsname {\simpleiconsmap\symbol{"EEDD}} + \expandafter\def\csname simpleicon@hiveicon\endcsname {\simpleiconsmap\symbol{"EEDE}} + \expandafter\def\csname simpleicon@hiveblockchainicon\endcsname {\simpleiconsmap\symbol{"EEDF}} + \expandafter\def\csname simpleicon@hivemqicon\endcsname {\simpleiconsmap\symbol{"EEE0}} + \expandafter\def\csname simpleicon@homarricon\endcsname {\simpleiconsmap\symbol{"EEE1}} + \expandafter\def\csname simpleicon@homeadvisoricon\endcsname {\simpleiconsmap\symbol{"EEE2}} + \expandafter\def\csname simpleicon@homeassistanticon\endcsname {\simpleiconsmap\symbol{"EEE3}} + \expandafter\def\csname simpleicon@homeassistantcommunitystoreicon\endcsname {\simpleiconsmap\symbol{"EEE4}} + \expandafter\def\csname simpleicon@homebrewicon\endcsname {\simpleiconsmap\symbol{"EEE5}} + \expandafter\def\csname simpleicon@homebridgeicon\endcsname {\simpleiconsmap\symbol{"EEE6}} + \expandafter\def\csname simpleicon@homepageicon\endcsname {\simpleiconsmap\symbol{"EEE7}} + \expandafter\def\csname simpleicon@homifyicon\endcsname {\simpleiconsmap\symbol{"EEE8}} + \expandafter\def\csname simpleicon@hondaicon\endcsname {\simpleiconsmap\symbol{"EEE9}} + \expandafter\def\csname simpleicon@honeyicon\endcsname {\simpleiconsmap\symbol{"EEEA}} + \expandafter\def\csname simpleicon@honoicon\endcsname {\simpleiconsmap\symbol{"EEEB}} + \expandafter\def\csname simpleicon@honoricon\endcsname {\simpleiconsmap\symbol{"EEEC}} + \expandafter\def\csname simpleicon@hootsuiteicon\endcsname {\simpleiconsmap\symbol{"EEED}} + \expandafter\def\csname simpleicon@hoppscotchicon\endcsname {\simpleiconsmap\symbol{"EEEE}} + \expandafter\def\csname simpleicon@hostingericon\endcsname {\simpleiconsmap\symbol{"EEEF}} + \expandafter\def\csname simpleicon@hotelsdotcomicon\endcsname {\simpleiconsmap\symbol{"EEF0}} + \expandafter\def\csname simpleicon@hotjaricon\endcsname {\simpleiconsmap\symbol{"EEF1}} + \expandafter\def\csname simpleicon@hotwireicon\endcsname {\simpleiconsmap\symbol{"EEF2}} + \expandafter\def\csname simpleicon@houdiniicon\endcsname {\simpleiconsmap\symbol{"EEF3}} + \expandafter\def\csname simpleicon@houzzicon\endcsname {\simpleiconsmap\symbol{"EEF4}} + \expandafter\def\csname simpleicon@hpicon\endcsname {\simpleiconsmap\symbol{"EEF5}} + \expandafter\def\csname simpleicon@hsbcicon\endcsname {\simpleiconsmap\symbol{"EEF6}} + \expandafter\def\csname simpleicon@html5icon\endcsname {\simpleiconsmap\symbol{"EEF7}} + \expandafter\def\csname simpleicon@htmlacademyicon\endcsname {\simpleiconsmap\symbol{"EEF8}} + \expandafter\def\csname simpleicon@htmxicon\endcsname {\simpleiconsmap\symbol{"EEF9}} + \expandafter\def\csname simpleicon@htopicon\endcsname {\simpleiconsmap\symbol{"EEFA}} + \expandafter\def\csname simpleicon@httpieicon\endcsname {\simpleiconsmap\symbol{"EEFB}} + \expandafter\def\csname simpleicon@huaweiicon\endcsname {\simpleiconsmap\symbol{"EEFC}} + \expandafter\def\csname simpleicon@hubspoticon\endcsname {\simpleiconsmap\symbol{"EEFD}} + \expandafter\def\csname simpleicon@huggingfaceicon\endcsname {\simpleiconsmap\symbol{"EEFE}} + \expandafter\def\csname simpleicon@hugoicon\endcsname {\simpleiconsmap\symbol{"EEFF}} + \expandafter\def\csname simpleicon@humblebundleicon\endcsname {\simpleiconsmap\symbol{"EF00}} + \expandafter\def\csname simpleicon@humhubicon\endcsname {\simpleiconsmap\symbol{"EF01}} + \expandafter\def\csname simpleicon@hungryjacksicon\endcsname {\simpleiconsmap\symbol{"EF02}} + \expandafter\def\csname simpleicon@husqvarnaicon\endcsname {\simpleiconsmap\symbol{"EF03}} + \expandafter\def\csname simpleicon@hypericon\endcsname {\simpleiconsmap\symbol{"EF04}} + \expandafter\def\csname simpleicon@hyperskillicon\endcsname {\simpleiconsmap\symbol{"EF05}} + \expandafter\def\csname simpleicon@hypothesisicon\endcsname {\simpleiconsmap\symbol{"EF06}} + \expandafter\def\csname simpleicon@hyprlandicon\endcsname {\simpleiconsmap\symbol{"EF07}} + \expandafter\def\csname simpleicon@hyundaiicon\endcsname {\simpleiconsmap\symbol{"EF08}} + \expandafter\def\csname simpleicon@i18nexticon\endcsname {\simpleiconsmap\symbol{"EF09}} + \expandafter\def\csname simpleicon@i3icon\endcsname {\simpleiconsmap\symbol{"EF0A}} + \expandafter\def\csname simpleicon@iataicon\endcsname {\simpleiconsmap\symbol{"EF0B}} + \expandafter\def\csname simpleicon@ibeaconicon\endcsname {\simpleiconsmap\symbol{"EF0C}} + \expandafter\def\csname simpleicon@iberiaicon\endcsname {\simpleiconsmap\symbol{"EF0D}} + \expandafter\def\csname simpleicon@icedicon\endcsname {\simpleiconsmap\symbol{"EF0E}} + \expandafter\def\csname simpleicon@icelandicon\endcsname {\simpleiconsmap\symbol{"EF0F}} + \expandafter\def\csname simpleicon@icicibankicon\endcsname {\simpleiconsmap\symbol{"EF10}} + \expandafter\def\csname simpleicon@icingaicon\endcsname {\simpleiconsmap\symbol{"EF11}} + \expandafter\def\csname simpleicon@icloudicon\endcsname {\simpleiconsmap\symbol{"EF12}} + \expandafter\def\csname simpleicon@icomoonicon\endcsname {\simpleiconsmap\symbol{"EF13}} + \expandafter\def\csname simpleicon@iconicon\endcsname {\simpleiconsmap\symbol{"EF14}} + \expandafter\def\csname simpleicon@iconfindericon\endcsname {\simpleiconsmap\symbol{"EF15}} + \expandafter\def\csname simpleicon@iconifyicon\endcsname {\simpleiconsmap\symbol{"EF16}} + \expandafter\def\csname simpleicon@iconjaricon\endcsname {\simpleiconsmap\symbol{"EF17}} + \expandafter\def\csname simpleicon@icons8icon\endcsname {\simpleiconsmap\symbol{"EF18}} + \expandafter\def\csname simpleicon@icqicon\endcsname {\simpleiconsmap\symbol{"EF19}} + \expandafter\def\csname simpleicon@ieeeicon\endcsname {\simpleiconsmap\symbol{"EF1A}} + \expandafter\def\csname simpleicon@ifixiticon\endcsname {\simpleiconsmap\symbol{"EF1B}} + \expandafter\def\csname simpleicon@ifoodicon\endcsname {\simpleiconsmap\symbol{"EF1C}} + \expandafter\def\csname simpleicon@ifttticon\endcsname {\simpleiconsmap\symbol{"EF1D}} + \expandafter\def\csname simpleicon@igdbicon\endcsname {\simpleiconsmap\symbol{"EF1E}} + \expandafter\def\csname simpleicon@ignicon\endcsname {\simpleiconsmap\symbol{"EF1F}} + \expandafter\def\csname simpleicon@iheartradioicon\endcsname {\simpleiconsmap\symbol{"EF20}} + \expandafter\def\csname simpleicon@ikeaicon\endcsname {\simpleiconsmap\symbol{"EF21}} + \expandafter\def\csname simpleicon@iledefrancemobilitesicon\endcsname {\simpleiconsmap\symbol{"EF22}} + \expandafter\def\csname simpleicon@imagedotscicon\endcsname {\simpleiconsmap\symbol{"EF23}} + \expandafter\def\csname simpleicon@imagejicon\endcsname {\simpleiconsmap\symbol{"EF24}} + \expandafter\def\csname simpleicon@imdbicon\endcsname {\simpleiconsmap\symbol{"EF25}} + \expandafter\def\csname simpleicon@imessageicon\endcsname {\simpleiconsmap\symbol{"EF26}} + \expandafter\def\csname simpleicon@imguricon\endcsname {\simpleiconsmap\symbol{"EF27}} + \expandafter\def\csname simpleicon@immericon\endcsname {\simpleiconsmap\symbol{"EF28}} + \expandafter\def\csname simpleicon@immichicon\endcsname {\simpleiconsmap\symbol{"EF29}} + \expandafter\def\csname simpleicon@imouicon\endcsname {\simpleiconsmap\symbol{"EF2A}} + \expandafter\def\csname simpleicon@improvmxicon\endcsname {\simpleiconsmap\symbol{"EF2B}} + \expandafter\def\csname simpleicon@indeedicon\endcsname {\simpleiconsmap\symbol{"EF2C}} + \expandafter\def\csname simpleicon@indiansuperleagueicon\endcsname {\simpleiconsmap\symbol{"EF2D}} + \expandafter\def\csname simpleicon@indiehackersicon\endcsname {\simpleiconsmap\symbol{"EF2E}} + \expandafter\def\csname simpleicon@indigoicon\endcsname {\simpleiconsmap\symbol{"EF2F}} + \expandafter\def\csname simpleicon@inductiveautomationicon\endcsname {\simpleiconsmap\symbol{"EF30}} + \expandafter\def\csname simpleicon@inertiaicon\endcsname {\simpleiconsmap\symbol{"EF31}} + \expandafter\def\csname simpleicon@infinitiicon\endcsname {\simpleiconsmap\symbol{"EF32}} + \expandafter\def\csname simpleicon@influxdbicon\endcsname {\simpleiconsmap\symbol{"EF33}} + \expandafter\def\csname simpleicon@infomaniakicon\endcsname {\simpleiconsmap\symbol{"EF34}} + \expandafter\def\csname simpleicon@infoqicon\endcsname {\simpleiconsmap\symbol{"EF35}} + \expandafter\def\csname simpleicon@informaticaicon\endcsname {\simpleiconsmap\symbol{"EF36}} + \expandafter\def\csname simpleicon@infosysicon\endcsname {\simpleiconsmap\symbol{"EF37}} + \expandafter\def\csname simpleicon@infracosticon\endcsname {\simpleiconsmap\symbol{"EF38}} + \expandafter\def\csname simpleicon@ingressicon\endcsname {\simpleiconsmap\symbol{"EF39}} + \expandafter\def\csname simpleicon@inkdropicon\endcsname {\simpleiconsmap\symbol{"EF3A}} + \expandafter\def\csname simpleicon@inkscapeicon\endcsname {\simpleiconsmap\symbol{"EF3B}} + \expandafter\def\csname simpleicon@inoreadericon\endcsname {\simpleiconsmap\symbol{"EF3C}} + \expandafter\def\csname simpleicon@insomniaicon\endcsname {\simpleiconsmap\symbol{"EF3D}} + \expandafter\def\csname simpleicon@inspireicon\endcsname {\simpleiconsmap\symbol{"EF3E}} + \expandafter\def\csname simpleicon@insta360icon\endcsname {\simpleiconsmap\symbol{"EF3F}} + \expandafter\def\csname simpleicon@instacarticon\endcsname {\simpleiconsmap\symbol{"EF40}} + \expandafter\def\csname simpleicon@instagramicon\endcsname {\simpleiconsmap\symbol{"EF41}} + \expandafter\def\csname simpleicon@instapapericon\endcsname {\simpleiconsmap\symbol{"EF42}} + \expandafter\def\csname simpleicon@instatusicon\endcsname {\simpleiconsmap\symbol{"EF43}} + \expandafter\def\csname simpleicon@instructablesicon\endcsname {\simpleiconsmap\symbol{"EF44}} + \expandafter\def\csname simpleicon@instructureicon\endcsname {\simpleiconsmap\symbol{"EF45}} + \expandafter\def\csname simpleicon@intelicon\endcsname {\simpleiconsmap\symbol{"EF46}} + \expandafter\def\csname simpleicon@intellijideaicon\endcsname {\simpleiconsmap\symbol{"EF47}} + \expandafter\def\csname simpleicon@interactiondesignfoundationicon\endcsname {\simpleiconsmap\symbol{"EF48}} + \expandafter\def\csname simpleicon@interactjsicon\endcsname {\simpleiconsmap\symbol{"EF49}} + \expandafter\def\csname simpleicon@interbaseicon\endcsname {\simpleiconsmap\symbol{"EF4A}} + \expandafter\def\csname simpleicon@intercomicon\endcsname {\simpleiconsmap\symbol{"EF4B}} + \expandafter\def\csname simpleicon@intermarcheicon\endcsname {\simpleiconsmap\symbol{"EF4C}} + \expandafter\def\csname simpleicon@internetarchiveicon\endcsname {\simpleiconsmap\symbol{"EF4D}} + \expandafter\def\csname simpleicon@internetcomputericon\endcsname {\simpleiconsmap\symbol{"EF4E}} + \expandafter\def\csname simpleicon@intigritiicon\endcsname {\simpleiconsmap\symbol{"EF4F}} + \expandafter\def\csname simpleicon@intuiticon\endcsname {\simpleiconsmap\symbol{"EF50}} + \expandafter\def\csname simpleicon@invisionicon\endcsname {\simpleiconsmap\symbol{"EF51}} + \expandafter\def\csname simpleicon@invoiceninjaicon\endcsname {\simpleiconsmap\symbol{"EF52}} + \expandafter\def\csname simpleicon@iobrokericon\endcsname {\simpleiconsmap\symbol{"EF53}} + \expandafter\def\csname simpleicon@ionicicon\endcsname {\simpleiconsmap\symbol{"EF54}} + \expandafter\def\csname simpleicon@ionosicon\endcsname {\simpleiconsmap\symbol{"EF55}} + \expandafter\def\csname simpleicon@iosicon\endcsname {\simpleiconsmap\symbol{"EF56}} + \expandafter\def\csname simpleicon@iotaicon\endcsname {\simpleiconsmap\symbol{"EF57}} + \expandafter\def\csname simpleicon@ipfsicon\endcsname {\simpleiconsmap\symbol{"EF58}} + \expandafter\def\csname simpleicon@irisicon\endcsname {\simpleiconsmap\symbol{"EF59}} + \expandafter\def\csname simpleicon@iroboticon\endcsname {\simpleiconsmap\symbol{"EF5A}} + \expandafter\def\csname simpleicon@isc2icon\endcsname {\simpleiconsmap\symbol{"EF5B}} + \expandafter\def\csname simpleicon@issuuicon\endcsname {\simpleiconsmap\symbol{"EF5C}} + \expandafter\def\csname simpleicon@istioicon\endcsname {\simpleiconsmap\symbol{"EF5D}} + \expandafter\def\csname simpleicon@itchdotioicon\endcsname {\simpleiconsmap\symbol{"EF5E}} + \expandafter\def\csname simpleicon@iterm2icon\endcsname {\simpleiconsmap\symbol{"EF5F}} + \expandafter\def\csname simpleicon@itunesicon\endcsname {\simpleiconsmap\symbol{"EF60}} + \expandafter\def\csname simpleicon@itvxicon\endcsname {\simpleiconsmap\symbol{"EF61}} + \expandafter\def\csname simpleicon@ivecoicon\endcsname {\simpleiconsmap\symbol{"EF62}} + \expandafter\def\csname simpleicon@jabbericon\endcsname {\simpleiconsmap\symbol{"EF63}} + \expandafter\def\csname simpleicon@jaegericon\endcsname {\simpleiconsmap\symbol{"EF64}} + \expandafter\def\csname simpleicon@jaguaricon\endcsname {\simpleiconsmap\symbol{"EF65}} + \expandafter\def\csname simpleicon@jamboardicon\endcsname {\simpleiconsmap\symbol{"EF66}} + \expandafter\def\csname simpleicon@jamesonicon\endcsname {\simpleiconsmap\symbol{"EF67}} + \expandafter\def\csname simpleicon@jamstackicon\endcsname {\simpleiconsmap\symbol{"EF68}} + \expandafter\def\csname simpleicon@jasmineicon\endcsname {\simpleiconsmap\symbol{"EF69}} + \expandafter\def\csname simpleicon@javascripticon\endcsname {\simpleiconsmap\symbol{"EF6A}} + \expandafter\def\csname simpleicon@jblicon\endcsname {\simpleiconsmap\symbol{"EF6B}} + \expandafter\def\csname simpleicon@jcbicon\endcsname {\simpleiconsmap\symbol{"EF6C}} + \expandafter\def\csname simpleicon@jeepicon\endcsname {\simpleiconsmap\symbol{"EF6D}} + \expandafter\def\csname simpleicon@jekyllicon\endcsname {\simpleiconsmap\symbol{"EF6E}} + \expandafter\def\csname simpleicon@jellyfinicon\endcsname {\simpleiconsmap\symbol{"EF6F}} + \expandafter\def\csname simpleicon@jenkinsicon\endcsname {\simpleiconsmap\symbol{"EF70}} + \expandafter\def\csname simpleicon@jesticon\endcsname {\simpleiconsmap\symbol{"EF71}} + \expandafter\def\csname simpleicon@jeticon\endcsname {\simpleiconsmap\symbol{"EF72}} + \expandafter\def\csname simpleicon@jetblueicon\endcsname {\simpleiconsmap\symbol{"EF73}} + \expandafter\def\csname simpleicon@jetbrainsicon\endcsname {\simpleiconsmap\symbol{"EF74}} + \expandafter\def\csname simpleicon@jetpackcomposeicon\endcsname {\simpleiconsmap\symbol{"EF75}} + \expandafter\def\csname simpleicon@jfrogicon\endcsname {\simpleiconsmap\symbol{"EF76}} + \expandafter\def\csname simpleicon@jfrogpipelinesicon\endcsname {\simpleiconsmap\symbol{"EF77}} + \expandafter\def\csname simpleicon@jhipstericon\endcsname {\simpleiconsmap\symbol{"EF78}} + \expandafter\def\csname simpleicon@jinjaicon\endcsname {\simpleiconsmap\symbol{"EF79}} + \expandafter\def\csname simpleicon@jiraicon\endcsname {\simpleiconsmap\symbol{"EF7A}} + \expandafter\def\csname simpleicon@jirasoftwareicon\endcsname {\simpleiconsmap\symbol{"EF7B}} + \expandafter\def\csname simpleicon@jitpackicon\endcsname {\simpleiconsmap\symbol{"EF7C}} + \expandafter\def\csname simpleicon@jitsiicon\endcsname {\simpleiconsmap\symbol{"EF7D}} + \expandafter\def\csname simpleicon@johndeereicon\endcsname {\simpleiconsmap\symbol{"EF7E}} + \expandafter\def\csname simpleicon@joomlaicon\endcsname {\simpleiconsmap\symbol{"EF7F}} + \expandafter\def\csname simpleicon@joplinicon\endcsname {\simpleiconsmap\symbol{"EF80}} + \expandafter\def\csname simpleicon@jordanicon\endcsname {\simpleiconsmap\symbol{"EF81}} + \expandafter\def\csname simpleicon@jouavicon\endcsname {\simpleiconsmap\symbol{"EF82}} + \expandafter\def\csname simpleicon@jovianicon\endcsname {\simpleiconsmap\symbol{"EF83}} + \expandafter\def\csname simpleicon@jpegicon\endcsname {\simpleiconsmap\symbol{"EF84}} + \expandafter\def\csname simpleicon@jqueryicon\endcsname {\simpleiconsmap\symbol{"EF85}} + \expandafter\def\csname simpleicon@jrgroupicon\endcsname {\simpleiconsmap\symbol{"EF86}} + \expandafter\def\csname simpleicon@jsdelivricon\endcsname {\simpleiconsmap\symbol{"EF87}} + \expandafter\def\csname simpleicon@jsfiddleicon\endcsname {\simpleiconsmap\symbol{"EF88}} + \expandafter\def\csname simpleicon@jsonicon\endcsname {\simpleiconsmap\symbol{"EF89}} + \expandafter\def\csname simpleicon@jsonwebtokensicon\endcsname {\simpleiconsmap\symbol{"EF8A}} + \expandafter\def\csname simpleicon@jsricon\endcsname {\simpleiconsmap\symbol{"EF8B}} + \expandafter\def\csname simpleicon@jssicon\endcsname {\simpleiconsmap\symbol{"EF8C}} + \expandafter\def\csname simpleicon@juceicon\endcsname {\simpleiconsmap\symbol{"EF8D}} + \expandafter\def\csname simpleicon@juejinicon\endcsname {\simpleiconsmap\symbol{"EF8E}} + \expandafter\def\csname simpleicon@jukeicon\endcsname {\simpleiconsmap\symbol{"EF8F}} + \expandafter\def\csname simpleicon@juliaicon\endcsname {\simpleiconsmap\symbol{"EF90}} + \expandafter\def\csname simpleicon@junipernetworksicon\endcsname {\simpleiconsmap\symbol{"EF91}} + \expandafter\def\csname simpleicon@junit5icon\endcsname {\simpleiconsmap\symbol{"EF92}} + \expandafter\def\csname simpleicon@jupytericon\endcsname {\simpleiconsmap\symbol{"EF93}} + \expandafter\def\csname simpleicon@justeaticon\endcsname {\simpleiconsmap\symbol{"EF94}} + \expandafter\def\csname simpleicon@justgivingicon\endcsname {\simpleiconsmap\symbol{"EF95}} + \expandafter\def\csname simpleicon@k3sicon\endcsname {\simpleiconsmap\symbol{"EF96}} + \expandafter\def\csname simpleicon@k6icon\endcsname {\simpleiconsmap\symbol{"EF97}} + \expandafter\def\csname simpleicon@kaggleicon\endcsname {\simpleiconsmap\symbol{"EF98}} + \expandafter\def\csname simpleicon@kagiicon\endcsname {\simpleiconsmap\symbol{"EF99}} + \expandafter\def\csname simpleicon@kahooticon\endcsname {\simpleiconsmap\symbol{"EF9A}} + \expandafter\def\csname simpleicon@kaiosicon\endcsname {\simpleiconsmap\symbol{"EF9B}} + \expandafter\def\csname simpleicon@kakaoicon\endcsname {\simpleiconsmap\symbol{"EF9C}} + \expandafter\def\csname simpleicon@kakaotalkicon\endcsname {\simpleiconsmap\symbol{"EF9D}} + \expandafter\def\csname simpleicon@kalilinuxicon\endcsname {\simpleiconsmap\symbol{"EF9E}} + \expandafter\def\csname simpleicon@kamailioicon\endcsname {\simpleiconsmap\symbol{"EF9F}} + \expandafter\def\csname simpleicon@kanikoicon\endcsname {\simpleiconsmap\symbol{"EFA0}} + \expandafter\def\csname simpleicon@karlsruherverkehrsverbundicon\endcsname {\simpleiconsmap\symbol{"EFA1}} + \expandafter\def\csname simpleicon@kasasmarticon\endcsname {\simpleiconsmap\symbol{"EFA2}} + \expandafter\def\csname simpleicon@kashflowicon\endcsname {\simpleiconsmap\symbol{"EFA3}} + \expandafter\def\csname simpleicon@kasperskyicon\endcsname {\simpleiconsmap\symbol{"EFA4}} + \expandafter\def\csname simpleicon@katacodaicon\endcsname {\simpleiconsmap\symbol{"EFA5}} + \expandafter\def\csname simpleicon@katanaicon\endcsname {\simpleiconsmap\symbol{"EFA6}} + \expandafter\def\csname simpleicon@kauflandicon\endcsname {\simpleiconsmap\symbol{"EFA7}} + \expandafter\def\csname simpleicon@kdeicon\endcsname {\simpleiconsmap\symbol{"EFA8}} + \expandafter\def\csname simpleicon@kdenliveicon\endcsname {\simpleiconsmap\symbol{"EFA9}} + \expandafter\def\csname simpleicon@kedroicon\endcsname {\simpleiconsmap\symbol{"EFAA}} + \expandafter\def\csname simpleicon@keeneticicon\endcsname {\simpleiconsmap\symbol{"EFAB}} + \expandafter\def\csname simpleicon@keepachangelogicon\endcsname {\simpleiconsmap\symbol{"EFAC}} + \expandafter\def\csname simpleicon@keepassxcicon\endcsname {\simpleiconsmap\symbol{"EFAD}} + \expandafter\def\csname simpleicon@kenticoicon\endcsname {\simpleiconsmap\symbol{"EFAE}} + \expandafter\def\csname simpleicon@kerasicon\endcsname {\simpleiconsmap\symbol{"EFAF}} + \expandafter\def\csname simpleicon@keybaseicon\endcsname {\simpleiconsmap\symbol{"EFB0}} + \expandafter\def\csname simpleicon@keycdnicon\endcsname {\simpleiconsmap\symbol{"EFB1}} + \expandafter\def\csname simpleicon@keycloakicon\endcsname {\simpleiconsmap\symbol{"EFB2}} + \expandafter\def\csname simpleicon@keystoneicon\endcsname {\simpleiconsmap\symbol{"EFB3}} + \expandafter\def\csname simpleicon@kfcicon\endcsname {\simpleiconsmap\symbol{"EFB4}} + \expandafter\def\csname simpleicon@khanacademyicon\endcsname {\simpleiconsmap\symbol{"EFB5}} + \expandafter\def\csname simpleicon@khronosgroupicon\endcsname {\simpleiconsmap\symbol{"EFB6}} + \expandafter\def\csname simpleicon@kiaicon\endcsname {\simpleiconsmap\symbol{"EFB7}} + \expandafter\def\csname simpleicon@kibanaicon\endcsname {\simpleiconsmap\symbol{"EFB8}} + \expandafter\def\csname simpleicon@kicadicon\endcsname {\simpleiconsmap\symbol{"EFB9}} + \expandafter\def\csname simpleicon@kickicon\endcsname {\simpleiconsmap\symbol{"EFBA}} + \expandafter\def\csname simpleicon@kickstartericon\endcsname {\simpleiconsmap\symbol{"EFBB}} + \expandafter\def\csname simpleicon@kikicon\endcsname {\simpleiconsmap\symbol{"EFBC}} + \expandafter\def\csname simpleicon@kingstontechnologyicon\endcsname {\simpleiconsmap\symbol{"EFBD}} + \expandafter\def\csname simpleicon@kinopoiskicon\endcsname {\simpleiconsmap\symbol{"EFBE}} + \expandafter\def\csname simpleicon@kinstaicon\endcsname {\simpleiconsmap\symbol{"EFBF}} + \expandafter\def\csname simpleicon@kirbyicon\endcsname {\simpleiconsmap\symbol{"EFC0}} + \expandafter\def\csname simpleicon@kiticon\endcsname {\simpleiconsmap\symbol{"EFC1}} + \expandafter\def\csname simpleicon@kitsuicon\endcsname {\simpleiconsmap\symbol{"EFC2}} + \expandafter\def\csname simpleicon@klarnaicon\endcsname {\simpleiconsmap\symbol{"EFC3}} + \expandafter\def\csname simpleicon@klmicon\endcsname {\simpleiconsmap\symbol{"EFC4}} + \expandafter\def\csname simpleicon@klookicon\endcsname {\simpleiconsmap\symbol{"EFC5}} + \expandafter\def\csname simpleicon@knativeicon\endcsname {\simpleiconsmap\symbol{"EFC6}} + \expandafter\def\csname simpleicon@knexdotjsicon\endcsname {\simpleiconsmap\symbol{"EFC7}} + \expandafter\def\csname simpleicon@knimeicon\endcsname {\simpleiconsmap\symbol{"EFC8}} + \expandafter\def\csname simpleicon@knipicon\endcsname {\simpleiconsmap\symbol{"EFC9}} + \expandafter\def\csname simpleicon@knowledgebaseicon\endcsname {\simpleiconsmap\symbol{"EFCA}} + \expandafter\def\csname simpleicon@knownicon\endcsname {\simpleiconsmap\symbol{"EFCB}} + \expandafter\def\csname simpleicon@koaicon\endcsname {\simpleiconsmap\symbol{"EFCC}} + \expandafter\def\csname simpleicon@kocicon\endcsname {\simpleiconsmap\symbol{"EFCD}} + \expandafter\def\csname simpleicon@kodakicon\endcsname {\simpleiconsmap\symbol{"EFCE}} + \expandafter\def\csname simpleicon@kodiicon\endcsname {\simpleiconsmap\symbol{"EFCF}} + \expandafter\def\csname simpleicon@koenigseggicon\endcsname {\simpleiconsmap\symbol{"EFD0}} + \expandafter\def\csname simpleicon@kofaxicon\endcsname {\simpleiconsmap\symbol{"EFD1}} + \expandafter\def\csname simpleicon@kofiicon\endcsname {\simpleiconsmap\symbol{"EFD2}} + \expandafter\def\csname simpleicon@komooticon\endcsname {\simpleiconsmap\symbol{"EFD3}} + \expandafter\def\csname simpleicon@konamiicon\endcsname {\simpleiconsmap\symbol{"EFD4}} + \expandafter\def\csname simpleicon@kongicon\endcsname {\simpleiconsmap\symbol{"EFD5}} + \expandafter\def\csname simpleicon@kongregateicon\endcsname {\simpleiconsmap\symbol{"EFD6}} + \expandafter\def\csname simpleicon@konvaicon\endcsname {\simpleiconsmap\symbol{"EFD7}} + \expandafter\def\csname simpleicon@kotlinicon\endcsname {\simpleiconsmap\symbol{"EFD8}} + \expandafter\def\csname simpleicon@koyebicon\endcsname {\simpleiconsmap\symbol{"EFD9}} + \expandafter\def\csname simpleicon@kritaicon\endcsname {\simpleiconsmap\symbol{"EFDA}} + \expandafter\def\csname simpleicon@ktmicon\endcsname {\simpleiconsmap\symbol{"EFDB}} + \expandafter\def\csname simpleicon@ktoricon\endcsname {\simpleiconsmap\symbol{"EFDC}} + \expandafter\def\csname simpleicon@kuaishouicon\endcsname {\simpleiconsmap\symbol{"EFDD}} + \expandafter\def\csname simpleicon@kubernetesicon\endcsname {\simpleiconsmap\symbol{"EFDE}} + \expandafter\def\csname simpleicon@kubuntuicon\endcsname {\simpleiconsmap\symbol{"EFDF}} + \expandafter\def\csname simpleicon@kucoinicon\endcsname {\simpleiconsmap\symbol{"EFE0}} + \expandafter\def\csname simpleicon@kumaicon\endcsname {\simpleiconsmap\symbol{"EFE1}} + \expandafter\def\csname simpleicon@kununuicon\endcsname {\simpleiconsmap\symbol{"EFE2}} + \expandafter\def\csname simpleicon@kuulaicon\endcsname {\simpleiconsmap\symbol{"EFE3}} + \expandafter\def\csname simpleicon@kxicon\endcsname {\simpleiconsmap\symbol{"EFE4}} + \expandafter\def\csname simpleicon@kyoceraicon\endcsname {\simpleiconsmap\symbol{"EFE5}} + \expandafter\def\csname simpleicon@labviewicon\endcsname {\simpleiconsmap\symbol{"EFE6}} + \expandafter\def\csname simpleicon@ladaicon\endcsname {\simpleiconsmap\symbol{"EFE7}} + \expandafter\def\csname simpleicon@lamborghiniicon\endcsname {\simpleiconsmap\symbol{"EFE8}} + \expandafter\def\csname simpleicon@landrovericon\endcsname {\simpleiconsmap\symbol{"EFE9}} + \expandafter\def\csname simpleicon@langchainicon\endcsname {\simpleiconsmap\symbol{"EFEA}} + \expandafter\def\csname simpleicon@languagetoolicon\endcsname {\simpleiconsmap\symbol{"EFEB}} + \expandafter\def\csname simpleicon@lapceicon\endcsname {\simpleiconsmap\symbol{"EFEC}} + \expandafter\def\csname simpleicon@laragonicon\endcsname {\simpleiconsmap\symbol{"EFED}} + \expandafter\def\csname simpleicon@laravelicon\endcsname {\simpleiconsmap\symbol{"EFEE}} + \expandafter\def\csname simpleicon@laravelhorizonicon\endcsname {\simpleiconsmap\symbol{"EFEF}} + \expandafter\def\csname simpleicon@laravelnovaicon\endcsname {\simpleiconsmap\symbol{"EFF0}} + \expandafter\def\csname simpleicon@lastdotfmicon\endcsname {\simpleiconsmap\symbol{"EFF1}} + \expandafter\def\csname simpleicon@lastpassicon\endcsname {\simpleiconsmap\symbol{"EFF2}} + \expandafter\def\csname simpleicon@latexicon\endcsname {\simpleiconsmap\symbol{"EFF3}} + \expandafter\def\csname simpleicon@launchpadicon\endcsname {\simpleiconsmap\symbol{"EFF4}} + \expandafter\def\csname simpleicon@lazarusicon\endcsname {\simpleiconsmap\symbol{"EFF5}} + \expandafter\def\csname simpleicon@lazyvimicon\endcsname {\simpleiconsmap\symbol{"EFF6}} + \expandafter\def\csname simpleicon@lbryicon\endcsname {\simpleiconsmap\symbol{"EFF7}} + \expandafter\def\csname simpleicon@leaderpriceicon\endcsname {\simpleiconsmap\symbol{"EFF8}} + \expandafter\def\csname simpleicon@leafleticon\endcsname {\simpleiconsmap\symbol{"EFF9}} + \expandafter\def\csname simpleicon@leagueoflegendsicon\endcsname {\simpleiconsmap\symbol{"EFFA}} + \expandafter\def\csname simpleicon@leanpubicon\endcsname {\simpleiconsmap\symbol{"EFFB}} + \expandafter\def\csname simpleicon@leetcodeicon\endcsname {\simpleiconsmap\symbol{"EFFC}} + \expandafter\def\csname simpleicon@lefthookicon\endcsname {\simpleiconsmap\symbol{"EFFD}} + \expandafter\def\csname simpleicon@legacygamesicon\endcsname {\simpleiconsmap\symbol{"EFFE}} + \expandafter\def\csname simpleicon@leicaicon\endcsname {\simpleiconsmap\symbol{"EFFF}} + \expandafter\def\csname simpleicon@lemmyicon\endcsname {\simpleiconsmap\symbol{"F000}} + \expandafter\def\csname simpleicon@lemonsqueezyicon\endcsname {\simpleiconsmap\symbol{"F001}} + \expandafter\def\csname simpleicon@lenovoicon\endcsname {\simpleiconsmap\symbol{"F002}} + \expandafter\def\csname simpleicon@lensicon\endcsname {\simpleiconsmap\symbol{"F003}} + \expandafter\def\csname simpleicon@leptosicon\endcsname {\simpleiconsmap\symbol{"F004}} + \expandafter\def\csname simpleicon@lequipeicon\endcsname {\simpleiconsmap\symbol{"F005}} + \expandafter\def\csname simpleicon@lernaicon\endcsname {\simpleiconsmap\symbol{"F006}} + \expandafter\def\csname simpleicon@leroymerlinicon\endcsname {\simpleiconsmap\symbol{"F007}} + \expandafter\def\csname simpleicon@leslibrairesicon\endcsname {\simpleiconsmap\symbol{"F008}} + \expandafter\def\csname simpleicon@lessicon\endcsname {\simpleiconsmap\symbol{"F009}} + \expandafter\def\csname simpleicon@letsencrypticon\endcsname {\simpleiconsmap\symbol{"F00A}} + \expandafter\def\csname simpleicon@letterboxdicon\endcsname {\simpleiconsmap\symbol{"F00B}} + \expandafter\def\csname simpleicon@levelsdotfyiicon\endcsname {\simpleiconsmap\symbol{"F00C}} + \expandafter\def\csname simpleicon@lgicon\endcsname {\simpleiconsmap\symbol{"F00D}} + \expandafter\def\csname simpleicon@liberadotchaticon\endcsname {\simpleiconsmap\symbol{"F00E}} + \expandafter\def\csname simpleicon@liberapayicon\endcsname {\simpleiconsmap\symbol{"F00F}} + \expandafter\def\csname simpleicon@librariesdotioicon\endcsname {\simpleiconsmap\symbol{"F010}} + \expandafter\def\csname simpleicon@librarythingicon\endcsname {\simpleiconsmap\symbol{"F011}} + \expandafter\def\csname simpleicon@libreofficeicon\endcsname {\simpleiconsmap\symbol{"F012}} + \expandafter\def\csname simpleicon@libreofficebaseicon\endcsname {\simpleiconsmap\symbol{"F013}} + \expandafter\def\csname simpleicon@libreofficecalcicon\endcsname {\simpleiconsmap\symbol{"F014}} + \expandafter\def\csname simpleicon@libreofficedrawicon\endcsname {\simpleiconsmap\symbol{"F015}} + \expandafter\def\csname simpleicon@libreofficeimpressicon\endcsname {\simpleiconsmap\symbol{"F016}} + \expandafter\def\csname simpleicon@libreofficemathicon\endcsname {\simpleiconsmap\symbol{"F017}} + \expandafter\def\csname simpleicon@libreofficewritericon\endcsname {\simpleiconsmap\symbol{"F018}} + \expandafter\def\csname simpleicon@librewolficon\endcsname {\simpleiconsmap\symbol{"F019}} + \expandafter\def\csname simpleicon@libuvicon\endcsname {\simpleiconsmap\symbol{"F01A}} + \expandafter\def\csname simpleicon@lichessicon\endcsname {\simpleiconsmap\symbol{"F01B}} + \expandafter\def\csname simpleicon@lidlicon\endcsname {\simpleiconsmap\symbol{"F01C}} + \expandafter\def\csname simpleicon@lifxicon\endcsname {\simpleiconsmap\symbol{"F01D}} + \expandafter\def\csname simpleicon@lightburnicon\endcsname {\simpleiconsmap\symbol{"F01E}} + \expandafter\def\csname simpleicon@lighthouseicon\endcsname {\simpleiconsmap\symbol{"F01F}} + \expandafter\def\csname simpleicon@lightningicon\endcsname {\simpleiconsmap\symbol{"F020}} + \expandafter\def\csname simpleicon@limesurveyicon\endcsname {\simpleiconsmap\symbol{"F021}} + \expandafter\def\csname simpleicon@lineicon\endcsname {\simpleiconsmap\symbol{"F022}} + \expandafter\def\csname simpleicon@lineageosicon\endcsname {\simpleiconsmap\symbol{"F023}} + \expandafter\def\csname simpleicon@linearicon\endcsname {\simpleiconsmap\symbol{"F024}} + \expandafter\def\csname simpleicon@liningicon\endcsname {\simpleiconsmap\symbol{"F025}} + \expandafter\def\csname simpleicon@linkedinicon\endcsname {\simpleiconsmap\symbol{"F026}} + \expandafter\def\csname simpleicon@linkerdicon\endcsname {\simpleiconsmap\symbol{"F027}} + \expandafter\def\csname simpleicon@linkfireicon\endcsname {\simpleiconsmap\symbol{"F028}} + \expandafter\def\csname simpleicon@linksysicon\endcsname {\simpleiconsmap\symbol{"F029}} + \expandafter\def\csname simpleicon@linktreeicon\endcsname {\simpleiconsmap\symbol{"F02A}} + \expandafter\def\csname simpleicon@lintcodeicon\endcsname {\simpleiconsmap\symbol{"F02B}} + \expandafter\def\csname simpleicon@linuxicon\endcsname {\simpleiconsmap\symbol{"F02C}} + \expandafter\def\csname simpleicon@linuxcontainersicon\endcsname {\simpleiconsmap\symbol{"F02D}} + \expandafter\def\csname simpleicon@linuxfoundationicon\endcsname {\simpleiconsmap\symbol{"F02E}} + \expandafter\def\csname simpleicon@linuxminticon\endcsname {\simpleiconsmap\symbol{"F02F}} + \expandafter\def\csname simpleicon@linuxprofessionalinstituteicon\endcsname {\simpleiconsmap\symbol{"F030}} + \expandafter\def\csname simpleicon@linuxservericon\endcsname {\simpleiconsmap\symbol{"F031}} + \expandafter\def\csname simpleicon@lionairicon\endcsname {\simpleiconsmap\symbol{"F032}} + \expandafter\def\csname simpleicon@liquibaseicon\endcsname {\simpleiconsmap\symbol{"F033}} + \expandafter\def\csname simpleicon@listmonkicon\endcsname {\simpleiconsmap\symbol{"F034}} + \expandafter\def\csname simpleicon@liticon\endcsname {\simpleiconsmap\symbol{"F035}} + \expandafter\def\csname simpleicon@litecoinicon\endcsname {\simpleiconsmap\symbol{"F036}} + \expandafter\def\csname simpleicon@literalicon\endcsname {\simpleiconsmap\symbol{"F037}} + \expandafter\def\csname simpleicon@litiengineicon\endcsname {\simpleiconsmap\symbol{"F038}} + \expandafter\def\csname simpleicon@livechaticon\endcsname {\simpleiconsmap\symbol{"F039}} + \expandafter\def\csname simpleicon@livejournalicon\endcsname {\simpleiconsmap\symbol{"F03A}} + \expandafter\def\csname simpleicon@livewireicon\endcsname {\simpleiconsmap\symbol{"F03B}} + \expandafter\def\csname simpleicon@llvmicon\endcsname {\simpleiconsmap\symbol{"F03C}} + \expandafter\def\csname simpleicon@lmmsicon\endcsname {\simpleiconsmap\symbol{"F03D}} + \expandafter\def\csname simpleicon@lobstersicon\endcsname {\simpleiconsmap\symbol{"F03E}} + \expandafter\def\csname simpleicon@localicon\endcsname {\simpleiconsmap\symbol{"F03F}} + \expandafter\def\csname simpleicon@lodashicon\endcsname {\simpleiconsmap\symbol{"F040}} + \expandafter\def\csname simpleicon@logitechicon\endcsname {\simpleiconsmap\symbol{"F041}} + \expandafter\def\csname simpleicon@logitechgicon\endcsname {\simpleiconsmap\symbol{"F042}} + \expandafter\def\csname simpleicon@logmeinicon\endcsname {\simpleiconsmap\symbol{"F043}} + \expandafter\def\csname simpleicon@logseqicon\endcsname {\simpleiconsmap\symbol{"F044}} + \expandafter\def\csname simpleicon@logstashicon\endcsname {\simpleiconsmap\symbol{"F045}} + \expandafter\def\csname simpleicon@lookericon\endcsname {\simpleiconsmap\symbol{"F046}} + \expandafter\def\csname simpleicon@loomicon\endcsname {\simpleiconsmap\symbol{"F047}} + \expandafter\def\csname simpleicon@loopicon\endcsname {\simpleiconsmap\symbol{"F048}} + \expandafter\def\csname simpleicon@loopbackicon\endcsname {\simpleiconsmap\symbol{"F049}} + \expandafter\def\csname simpleicon@lootcrateicon\endcsname {\simpleiconsmap\symbol{"F04A}} + \expandafter\def\csname simpleicon@lospecicon\endcsname {\simpleiconsmap\symbol{"F04B}} + \expandafter\def\csname simpleicon@lotpolishairlinesicon\endcsname {\simpleiconsmap\symbol{"F04C}} + \expandafter\def\csname simpleicon@ltspiceicon\endcsname {\simpleiconsmap\symbol{"F04D}} + \expandafter\def\csname simpleicon@luaicon\endcsname {\simpleiconsmap\symbol{"F04E}} + \expandafter\def\csname simpleicon@lubuntuicon\endcsname {\simpleiconsmap\symbol{"F04F}} + \expandafter\def\csname simpleicon@luciaicon\endcsname {\simpleiconsmap\symbol{"F050}} + \expandafter\def\csname simpleicon@lucidicon\endcsname {\simpleiconsmap\symbol{"F051}} + \expandafter\def\csname simpleicon@ludwigicon\endcsname {\simpleiconsmap\symbol{"F052}} + \expandafter\def\csname simpleicon@lufthansaicon\endcsname {\simpleiconsmap\symbol{"F053}} + \expandafter\def\csname simpleicon@lumenicon\endcsname {\simpleiconsmap\symbol{"F054}} + \expandafter\def\csname simpleicon@lunacyicon\endcsname {\simpleiconsmap\symbol{"F055}} + \expandafter\def\csname simpleicon@lutrisicon\endcsname {\simpleiconsmap\symbol{"F056}} + \expandafter\def\csname simpleicon@lydiaicon\endcsname {\simpleiconsmap\symbol{"F057}} + \expandafter\def\csname simpleicon@lyfticon\endcsname {\simpleiconsmap\symbol{"F058}} + \expandafter\def\csname simpleicon@maasicon\endcsname {\simpleiconsmap\symbol{"F059}} + \expandafter\def\csname simpleicon@macosicon\endcsname {\simpleiconsmap\symbol{"F05A}} + \expandafter\def\csname simpleicon@macpawicon\endcsname {\simpleiconsmap\symbol{"F05B}} + \expandafter\def\csname simpleicon@macysicon\endcsname {\simpleiconsmap\symbol{"F05C}} + \expandafter\def\csname simpleicon@magasinsuicon\endcsname {\simpleiconsmap\symbol{"F05D}} + \expandafter\def\csname simpleicon@magentoicon\endcsname {\simpleiconsmap\symbol{"F05E}} + \expandafter\def\csname simpleicon@magicicon\endcsname {\simpleiconsmap\symbol{"F05F}} + \expandafter\def\csname simpleicon@magiskicon\endcsname {\simpleiconsmap\symbol{"F060}} + \expandafter\def\csname simpleicon@mahindraicon\endcsname {\simpleiconsmap\symbol{"F061}} + \expandafter\def\csname simpleicon@mailchimpicon\endcsname {\simpleiconsmap\symbol{"F062}} + \expandafter\def\csname simpleicon@maildotcomicon\endcsname {\simpleiconsmap\symbol{"F063}} + \expandafter\def\csname simpleicon@maildotruicon\endcsname {\simpleiconsmap\symbol{"F064}} + \expandafter\def\csname simpleicon@mailgunicon\endcsname {\simpleiconsmap\symbol{"F065}} + \expandafter\def\csname simpleicon@mailtrapicon\endcsname {\simpleiconsmap\symbol{"F066}} + \expandafter\def\csname simpleicon@mainwpicon\endcsname {\simpleiconsmap\symbol{"F067}} + \expandafter\def\csname simpleicon@majorleaguehackingicon\endcsname {\simpleiconsmap\symbol{"F068}} + \expandafter\def\csname simpleicon@makeicon\endcsname {\simpleiconsmap\symbol{"F069}} + \expandafter\def\csname simpleicon@makerboticon\endcsname {\simpleiconsmap\symbol{"F06A}} + \expandafter\def\csname simpleicon@malticon\endcsname {\simpleiconsmap\symbol{"F06B}} + \expandafter\def\csname simpleicon@malwarebytesicon\endcsname {\simpleiconsmap\symbol{"F06C}} + \expandafter\def\csname simpleicon@mambauiicon\endcsname {\simpleiconsmap\symbol{"F06D}} + \expandafter\def\csname simpleicon@mampicon\endcsname {\simpleiconsmap\symbol{"F06E}} + \expandafter\def\csname simpleicon@manicon\endcsname {\simpleiconsmap\symbol{"F06F}} + \expandafter\def\csname simpleicon@manageiqicon\endcsname {\simpleiconsmap\symbol{"F070}} + \expandafter\def\csname simpleicon@manjaroicon\endcsname {\simpleiconsmap\symbol{"F071}} + \expandafter\def\csname simpleicon@mantineicon\endcsname {\simpleiconsmap\symbol{"F072}} + \expandafter\def\csname simpleicon@mapboxicon\endcsname {\simpleiconsmap\symbol{"F073}} + \expandafter\def\csname simpleicon@maplibreicon\endcsname {\simpleiconsmap\symbol{"F074}} + \expandafter\def\csname simpleicon@mariadbicon\endcsname {\simpleiconsmap\symbol{"F075}} + \expandafter\def\csname simpleicon@mariadbfoundationicon\endcsname {\simpleiconsmap\symbol{"F076}} + \expandafter\def\csname simpleicon@markdownicon\endcsname {\simpleiconsmap\symbol{"F077}} + \expandafter\def\csname simpleicon@marketoicon\endcsname {\simpleiconsmap\symbol{"F078}} + \expandafter\def\csname simpleicon@markoicon\endcsname {\simpleiconsmap\symbol{"F079}} + \expandafter\def\csname simpleicon@marriotticon\endcsname {\simpleiconsmap\symbol{"F07A}} + \expandafter\def\csname simpleicon@marvelappicon\endcsname {\simpleiconsmap\symbol{"F07B}} + \expandafter\def\csname simpleicon@maseratiicon\endcsname {\simpleiconsmap\symbol{"F07C}} + \expandafter\def\csname simpleicon@mastercardicon\endcsname {\simpleiconsmap\symbol{"F07D}} + \expandafter\def\csname simpleicon@mastercomfigicon\endcsname {\simpleiconsmap\symbol{"F07E}} + \expandafter\def\csname simpleicon@mastodonicon\endcsname {\simpleiconsmap\symbol{"F07F}} + \expandafter\def\csname simpleicon@materialdesignicon\endcsname {\simpleiconsmap\symbol{"F080}} + \expandafter\def\csname simpleicon@materialdesigniconsicon\endcsname {\simpleiconsmap\symbol{"F081}} + \expandafter\def\csname simpleicon@materialformkdocsicon\endcsname {\simpleiconsmap\symbol{"F082}} + \expandafter\def\csname simpleicon@matillionicon\endcsname {\simpleiconsmap\symbol{"F083}} + \expandafter\def\csname simpleicon@matomoicon\endcsname {\simpleiconsmap\symbol{"F084}} + \expandafter\def\csname simpleicon@matrixicon\endcsname {\simpleiconsmap\symbol{"F085}} + \expandafter\def\csname simpleicon@matterdotjsicon\endcsname {\simpleiconsmap\symbol{"F086}} + \expandafter\def\csname simpleicon@mattermosticon\endcsname {\simpleiconsmap\symbol{"F087}} + \expandafter\def\csname simpleicon@matterneticon\endcsname {\simpleiconsmap\symbol{"F088}} + \expandafter\def\csname simpleicon@mauticicon\endcsname {\simpleiconsmap\symbol{"F089}} + \expandafter\def\csname simpleicon@maxicon\endcsname {\simpleiconsmap\symbol{"F08A}} + \expandafter\def\csname simpleicon@maxplanckgesellschafticon\endcsname {\simpleiconsmap\symbol{"F08B}} + \expandafter\def\csname simpleicon@maytagicon\endcsname {\simpleiconsmap\symbol{"F08C}} + \expandafter\def\csname simpleicon@mazdaicon\endcsname {\simpleiconsmap\symbol{"F08D}} + \expandafter\def\csname simpleicon@mcafeeicon\endcsname {\simpleiconsmap\symbol{"F08E}} + \expandafter\def\csname simpleicon@mcdonaldsicon\endcsname {\simpleiconsmap\symbol{"F08F}} + \expandafter\def\csname simpleicon@mclarenicon\endcsname {\simpleiconsmap\symbol{"F090}} + \expandafter\def\csname simpleicon@mdbookicon\endcsname {\simpleiconsmap\symbol{"F091}} + \expandafter\def\csname simpleicon@mdnwebdocsicon\endcsname {\simpleiconsmap\symbol{"F092}} + \expandafter\def\csname simpleicon@mdxicon\endcsname {\simpleiconsmap\symbol{"F093}} + \expandafter\def\csname simpleicon@mediafireicon\endcsname {\simpleiconsmap\symbol{"F094}} + \expandafter\def\csname simpleicon@mediamarkticon\endcsname {\simpleiconsmap\symbol{"F095}} + \expandafter\def\csname simpleicon@mediatekicon\endcsname {\simpleiconsmap\symbol{"F096}} + \expandafter\def\csname simpleicon@medibangpainticon\endcsname {\simpleiconsmap\symbol{"F097}} + \expandafter\def\csname simpleicon@mediumicon\endcsname {\simpleiconsmap\symbol{"F098}} + \expandafter\def\csname simpleicon@medusaicon\endcsname {\simpleiconsmap\symbol{"F099}} + \expandafter\def\csname simpleicon@meetupicon\endcsname {\simpleiconsmap\symbol{"F09A}} + \expandafter\def\csname simpleicon@megaicon\endcsname {\simpleiconsmap\symbol{"F09B}} + \expandafter\def\csname simpleicon@meilisearchicon\endcsname {\simpleiconsmap\symbol{"F09C}} + \expandafter\def\csname simpleicon@meituanicon\endcsname {\simpleiconsmap\symbol{"F09D}} + \expandafter\def\csname simpleicon@meizuicon\endcsname {\simpleiconsmap\symbol{"F09E}} + \expandafter\def\csname simpleicon@mendeleyicon\endcsname {\simpleiconsmap\symbol{"F09F}} + \expandafter\def\csname simpleicon@mentorcruiseicon\endcsname {\simpleiconsmap\symbol{"F0A0}} + \expandafter\def\csname simpleicon@mercadopagoicon\endcsname {\simpleiconsmap\symbol{"F0A1}} + \expandafter\def\csname simpleicon@mercedesicon\endcsname {\simpleiconsmap\symbol{"F0A2}} + \expandafter\def\csname simpleicon@merckicon\endcsname {\simpleiconsmap\symbol{"F0A3}} + \expandafter\def\csname simpleicon@mercurialicon\endcsname {\simpleiconsmap\symbol{"F0A4}} + \expandafter\def\csname simpleicon@mermaidicon\endcsname {\simpleiconsmap\symbol{"F0A5}} + \expandafter\def\csname simpleicon@messengericon\endcsname {\simpleiconsmap\symbol{"F0A6}} + \expandafter\def\csname simpleicon@metaicon\endcsname {\simpleiconsmap\symbol{"F0A7}} + \expandafter\def\csname simpleicon@metabaseicon\endcsname {\simpleiconsmap\symbol{"F0A8}} + \expandafter\def\csname simpleicon@metacriticicon\endcsname {\simpleiconsmap\symbol{"F0A9}} + \expandafter\def\csname simpleicon@metafiltericon\endcsname {\simpleiconsmap\symbol{"F0AA}} + \expandafter\def\csname simpleicon@metasploiticon\endcsname {\simpleiconsmap\symbol{"F0AB}} + \expandafter\def\csname simpleicon@meteoricon\endcsname {\simpleiconsmap\symbol{"F0AC}} + \expandafter\def\csname simpleicon@metroicon\endcsname {\simpleiconsmap\symbol{"F0AD}} + \expandafter\def\csname simpleicon@metrodelaciudaddemexicoicon\endcsname {\simpleiconsmap\symbol{"F0AE}} + \expandafter\def\csname simpleicon@metrodemadridicon\endcsname {\simpleiconsmap\symbol{"F0AF}} + \expandafter\def\csname simpleicon@metrodeparisicon\endcsname {\simpleiconsmap\symbol{"F0B0}} + \expandafter\def\csname simpleicon@meweicon\endcsname {\simpleiconsmap\symbol{"F0B1}} + \expandafter\def\csname simpleicon@mgicon\endcsname {\simpleiconsmap\symbol{"F0B2}} + \expandafter\def\csname simpleicon@microbiticon\endcsname {\simpleiconsmap\symbol{"F0B3}} + \expandafter\def\csname simpleicon@microdotblogicon\endcsname {\simpleiconsmap\symbol{"F0B4}} + \expandafter\def\csname simpleicon@microeditoricon\endcsname {\simpleiconsmap\symbol{"F0B5}} + \expandafter\def\csname simpleicon@microgeneticsicon\endcsname {\simpleiconsmap\symbol{"F0B6}} + \expandafter\def\csname simpleicon@micropythonicon\endcsname {\simpleiconsmap\symbol{"F0B7}} + \expandafter\def\csname simpleicon@microstationicon\endcsname {\simpleiconsmap\symbol{"F0B8}} + \expandafter\def\csname simpleicon@microstrategyicon\endcsname {\simpleiconsmap\symbol{"F0B9}} + \expandafter\def\csname simpleicon@midiicon\endcsname {\simpleiconsmap\symbol{"F0BA}} + \expandafter\def\csname simpleicon@migaduicon\endcsname {\simpleiconsmap\symbol{"F0BB}} + \expandafter\def\csname simpleicon@mikrotikicon\endcsname {\simpleiconsmap\symbol{"F0BC}} + \expandafter\def\csname simpleicon@milanoteicon\endcsname {\simpleiconsmap\symbol{"F0BD}} + \expandafter\def\csname simpleicon@milvusicon\endcsname {\simpleiconsmap\symbol{"F0BE}} + \expandafter\def\csname simpleicon@mindsicon\endcsname {\simpleiconsmap\symbol{"F0BF}} + \expandafter\def\csname simpleicon@minetesticon\endcsname {\simpleiconsmap\symbol{"F0C0}} + \expandafter\def\csname simpleicon@mingww64icon\endcsname {\simpleiconsmap\symbol{"F0C1}} + \expandafter\def\csname simpleicon@miniicon\endcsname {\simpleiconsmap\symbol{"F0C2}} + \expandafter\def\csname simpleicon@minioicon\endcsname {\simpleiconsmap\symbol{"F0C3}} + \expandafter\def\csname simpleicon@mintlifyicon\endcsname {\simpleiconsmap\symbol{"F0C4}} + \expandafter\def\csname simpleicon@minutemailericon\endcsname {\simpleiconsmap\symbol{"F0C5}} + \expandafter\def\csname simpleicon@mirahezeicon\endcsname {\simpleiconsmap\symbol{"F0C6}} + \expandafter\def\csname simpleicon@miroicon\endcsname {\simpleiconsmap\symbol{"F0C7}} + \expandafter\def\csname simpleicon@misskeyicon\endcsname {\simpleiconsmap\symbol{"F0C8}} + \expandafter\def\csname simpleicon@mitsubishiicon\endcsname {\simpleiconsmap\symbol{"F0C9}} + \expandafter\def\csname simpleicon@mixicon\endcsname {\simpleiconsmap\symbol{"F0CA}} + \expandafter\def\csname simpleicon@mixcloudicon\endcsname {\simpleiconsmap\symbol{"F0CB}} + \expandafter\def\csname simpleicon@mixpanelicon\endcsname {\simpleiconsmap\symbol{"F0CC}} + \expandafter\def\csname simpleicon@mlbicon\endcsname {\simpleiconsmap\symbol{"F0CD}} + \expandafter\def\csname simpleicon@mlflowicon\endcsname {\simpleiconsmap\symbol{"F0CE}} + \expandafter\def\csname simpleicon@mobxicon\endcsname {\simpleiconsmap\symbol{"F0CF}} + \expandafter\def\csname simpleicon@mobxstatetreeicon\endcsname {\simpleiconsmap\symbol{"F0D0}} + \expandafter\def\csname simpleicon@mochaicon\endcsname {\simpleiconsmap\symbol{"F0D1}} + \expandafter\def\csname simpleicon@mockserviceworkericon\endcsname {\simpleiconsmap\symbol{"F0D2}} + \expandafter\def\csname simpleicon@modalicon\endcsname {\simpleiconsmap\symbol{"F0D3}} + \expandafter\def\csname simpleicon@modinicon\endcsname {\simpleiconsmap\symbol{"F0D4}} + \expandafter\def\csname simpleicon@modrinthicon\endcsname {\simpleiconsmap\symbol{"F0D5}} + \expandafter\def\csname simpleicon@modxicon\endcsname {\simpleiconsmap\symbol{"F0D6}} + \expandafter\def\csname simpleicon@moleculericon\endcsname {\simpleiconsmap\symbol{"F0D7}} + \expandafter\def\csname simpleicon@momenteoicon\endcsname {\simpleiconsmap\symbol{"F0D8}} + \expandafter\def\csname simpleicon@moneroicon\endcsname {\simpleiconsmap\symbol{"F0D9}} + \expandafter\def\csname simpleicon@moneygramicon\endcsname {\simpleiconsmap\symbol{"F0DA}} + \expandafter\def\csname simpleicon@mongodbicon\endcsname {\simpleiconsmap\symbol{"F0DB}} + \expandafter\def\csname simpleicon@mongooseicon\endcsname {\simpleiconsmap\symbol{"F0DC}} + \expandafter\def\csname simpleicon@mongoosedotwsicon\endcsname {\simpleiconsmap\symbol{"F0DD}} + \expandafter\def\csname simpleicon@monicaicon\endcsname {\simpleiconsmap\symbol{"F0DE}} + \expandafter\def\csname simpleicon@monkeytieicon\endcsname {\simpleiconsmap\symbol{"F0DF}} + \expandafter\def\csname simpleicon@monkeytypeicon\endcsname {\simpleiconsmap\symbol{"F0E0}} + \expandafter\def\csname simpleicon@monogameicon\endcsname {\simpleiconsmap\symbol{"F0E1}} + \expandafter\def\csname simpleicon@monoprixicon\endcsname {\simpleiconsmap\symbol{"F0E2}} + \expandafter\def\csname simpleicon@monstericon\endcsname {\simpleiconsmap\symbol{"F0E3}} + \expandafter\def\csname simpleicon@monzoicon\endcsname {\simpleiconsmap\symbol{"F0E4}} + \expandafter\def\csname simpleicon@mooicon\endcsname {\simpleiconsmap\symbol{"F0E5}} + \expandafter\def\csname simpleicon@moodleicon\endcsname {\simpleiconsmap\symbol{"F0E6}} + \expandafter\def\csname simpleicon@moonrepoicon\endcsname {\simpleiconsmap\symbol{"F0E7}} + \expandafter\def\csname simpleicon@moqicon\endcsname {\simpleiconsmap\symbol{"F0E8}} + \expandafter\def\csname simpleicon@moqupsicon\endcsname {\simpleiconsmap\symbol{"F0E9}} + \expandafter\def\csname simpleicon@morrisonsicon\endcsname {\simpleiconsmap\symbol{"F0EA}} + \expandafter\def\csname simpleicon@moscowmetroicon\endcsname {\simpleiconsmap\symbol{"F0EB}} + \expandafter\def\csname simpleicon@motorolaicon\endcsname {\simpleiconsmap\symbol{"F0EC}} + \expandafter\def\csname simpleicon@mozillaicon\endcsname {\simpleiconsmap\symbol{"F0ED}} + \expandafter\def\csname simpleicon@mpvicon\endcsname {\simpleiconsmap\symbol{"F0EE}} + \expandafter\def\csname simpleicon@mqtticon\endcsname {\simpleiconsmap\symbol{"F0EF}} + \expandafter\def\csname simpleicon@msiicon\endcsname {\simpleiconsmap\symbol{"F0F0}} + \expandafter\def\csname simpleicon@msibusinessicon\endcsname {\simpleiconsmap\symbol{"F0F1}} + \expandafter\def\csname simpleicon@mtaicon\endcsname {\simpleiconsmap\symbol{"F0F2}} + \expandafter\def\csname simpleicon@mtricon\endcsname {\simpleiconsmap\symbol{"F0F3}} + \expandafter\def\csname simpleicon@mubiicon\endcsname {\simpleiconsmap\symbol{"F0F4}} + \expandafter\def\csname simpleicon@muiicon\endcsname {\simpleiconsmap\symbol{"F0F5}} + \expandafter\def\csname simpleicon@mulesofticon\endcsname {\simpleiconsmap\symbol{"F0F6}} + \expandafter\def\csname simpleicon@mullericon\endcsname {\simpleiconsmap\symbol{"F0F7}} + \expandafter\def\csname simpleicon@multisimicon\endcsname {\simpleiconsmap\symbol{"F0F8}} + \expandafter\def\csname simpleicon@mumbleicon\endcsname {\simpleiconsmap\symbol{"F0F9}} + \expandafter\def\csname simpleicon@muoicon\endcsname {\simpleiconsmap\symbol{"F0FA}} + \expandafter\def\csname simpleicon@muralicon\endcsname {\simpleiconsmap\symbol{"F0FB}} + \expandafter\def\csname simpleicon@musescoreicon\endcsname {\simpleiconsmap\symbol{"F0FC}} + \expandafter\def\csname simpleicon@musicbrainzicon\endcsname {\simpleiconsmap\symbol{"F0FD}} + \expandafter\def\csname simpleicon@mxlinuxicon\endcsname {\simpleiconsmap\symbol{"F0FE}} + \expandafter\def\csname simpleicon@myanimelisticon\endcsname {\simpleiconsmap\symbol{"F0FF}} + \expandafter\def\csname simpleicon@mygeticon\endcsname {\simpleiconsmap\symbol{"F100}} + \expandafter\def\csname simpleicon@myobicon\endcsname {\simpleiconsmap\symbol{"F101}} + \expandafter\def\csname simpleicon@myspaceicon\endcsname {\simpleiconsmap\symbol{"F102}} + \expandafter\def\csname simpleicon@mysqlicon\endcsname {\simpleiconsmap\symbol{"F103}} + \expandafter\def\csname simpleicon@n26icon\endcsname {\simpleiconsmap\symbol{"F104}} + \expandafter\def\csname simpleicon@n8nicon\endcsname {\simpleiconsmap\symbol{"F105}} + \expandafter\def\csname simpleicon@namebaseicon\endcsname {\simpleiconsmap\symbol{"F106}} + \expandafter\def\csname simpleicon@namecheapicon\endcsname {\simpleiconsmap\symbol{"F107}} + \expandafter\def\csname simpleicon@namemcicon\endcsname {\simpleiconsmap\symbol{"F108}} + \expandafter\def\csname simpleicon@namesiloicon\endcsname {\simpleiconsmap\symbol{"F109}} + \expandafter\def\csname simpleicon@namuwikiicon\endcsname {\simpleiconsmap\symbol{"F10A}} + \expandafter\def\csname simpleicon@nanoicon\endcsname {\simpleiconsmap\symbol{"F10B}} + \expandafter\def\csname simpleicon@nasaicon\endcsname {\simpleiconsmap\symbol{"F10C}} + \expandafter\def\csname simpleicon@nationalgridicon\endcsname {\simpleiconsmap\symbol{"F10D}} + \expandafter\def\csname simpleicon@nationalrailicon\endcsname {\simpleiconsmap\symbol{"F10E}} + \expandafter\def\csname simpleicon@nativescripticon\endcsname {\simpleiconsmap\symbol{"F10F}} + \expandafter\def\csname simpleicon@natsdotioicon\endcsname {\simpleiconsmap\symbol{"F110}} + \expandafter\def\csname simpleicon@navericon\endcsname {\simpleiconsmap\symbol{"F111}} + \expandafter\def\csname simpleicon@nbaicon\endcsname {\simpleiconsmap\symbol{"F112}} + \expandafter\def\csname simpleicon@nbbicon\endcsname {\simpleiconsmap\symbol{"F113}} + \expandafter\def\csname simpleicon@nbcicon\endcsname {\simpleiconsmap\symbol{"F114}} + \expandafter\def\csname simpleicon@ndricon\endcsname {\simpleiconsmap\symbol{"F115}} + \expandafter\def\csname simpleicon@nearicon\endcsname {\simpleiconsmap\symbol{"F116}} + \expandafter\def\csname simpleicon@necicon\endcsname {\simpleiconsmap\symbol{"F117}} + \expandafter\def\csname simpleicon@neo4jicon\endcsname {\simpleiconsmap\symbol{"F118}} + \expandafter\def\csname simpleicon@neovimicon\endcsname {\simpleiconsmap\symbol{"F119}} + \expandafter\def\csname simpleicon@neptuneicon\endcsname {\simpleiconsmap\symbol{"F11A}} + \expandafter\def\csname simpleicon@nestjsicon\endcsname {\simpleiconsmap\symbol{"F11B}} + \expandafter\def\csname simpleicon@netappicon\endcsname {\simpleiconsmap\symbol{"F11C}} + \expandafter\def\csname simpleicon@netbsdicon\endcsname {\simpleiconsmap\symbol{"F11D}} + \expandafter\def\csname simpleicon@netcupicon\endcsname {\simpleiconsmap\symbol{"F11E}} + \expandafter\def\csname simpleicon@netdataicon\endcsname {\simpleiconsmap\symbol{"F11F}} + \expandafter\def\csname simpleicon@neteasecloudmusicicon\endcsname {\simpleiconsmap\symbol{"F120}} + \expandafter\def\csname simpleicon@netflixicon\endcsname {\simpleiconsmap\symbol{"F121}} + \expandafter\def\csname simpleicon@netgearicon\endcsname {\simpleiconsmap\symbol{"F122}} + \expandafter\def\csname simpleicon@netlifyicon\endcsname {\simpleiconsmap\symbol{"F123}} + \expandafter\def\csname simpleicon@netteicon\endcsname {\simpleiconsmap\symbol{"F124}} + \expandafter\def\csname simpleicon@nettoicon\endcsname {\simpleiconsmap\symbol{"F125}} + \expandafter\def\csname simpleicon@neutralinojsicon\endcsname {\simpleiconsmap\symbol{"F126}} + \expandafter\def\csname simpleicon@newbalanceicon\endcsname {\simpleiconsmap\symbol{"F127}} + \expandafter\def\csname simpleicon@neweggicon\endcsname {\simpleiconsmap\symbol{"F128}} + \expandafter\def\csname simpleicon@newjapanprowrestlingicon\endcsname {\simpleiconsmap\symbol{"F129}} + \expandafter\def\csname simpleicon@newrelicicon\endcsname {\simpleiconsmap\symbol{"F12A}} + \expandafter\def\csname simpleicon@newyorktimesicon\endcsname {\simpleiconsmap\symbol{"F12B}} + \expandafter\def\csname simpleicon@nextbilliondotaiicon\endcsname {\simpleiconsmap\symbol{"F12C}} + \expandafter\def\csname simpleicon@nextcloudicon\endcsname {\simpleiconsmap\symbol{"F12D}} + \expandafter\def\csname simpleicon@nextdnsicon\endcsname {\simpleiconsmap\symbol{"F12E}} + \expandafter\def\csname simpleicon@nextdooricon\endcsname {\simpleiconsmap\symbol{"F12F}} + \expandafter\def\csname simpleicon@nextdotjsicon\endcsname {\simpleiconsmap\symbol{"F130}} + \expandafter\def\csname simpleicon@nextraicon\endcsname {\simpleiconsmap\symbol{"F131}} + \expandafter\def\csname simpleicon@nextuiicon\endcsname {\simpleiconsmap\symbol{"F132}} + \expandafter\def\csname simpleicon@nexusmodsicon\endcsname {\simpleiconsmap\symbol{"F133}} + \expandafter\def\csname simpleicon@nfcicon\endcsname {\simpleiconsmap\symbol{"F134}} + \expandafter\def\csname simpleicon@nginxicon\endcsname {\simpleiconsmap\symbol{"F135}} + \expandafter\def\csname simpleicon@nginxproxymanagericon\endcsname {\simpleiconsmap\symbol{"F136}} + \expandafter\def\csname simpleicon@ngrokicon\endcsname {\simpleiconsmap\symbol{"F137}} + \expandafter\def\csname simpleicon@ngrxicon\endcsname {\simpleiconsmap\symbol{"F138}} + \expandafter\def\csname simpleicon@nhlicon\endcsname {\simpleiconsmap\symbol{"F139}} + \expandafter\def\csname simpleicon@nicehashicon\endcsname {\simpleiconsmap\symbol{"F13A}} + \expandafter\def\csname simpleicon@niconicoicon\endcsname {\simpleiconsmap\symbol{"F13B}} + \expandafter\def\csname simpleicon@nikeicon\endcsname {\simpleiconsmap\symbol{"F13C}} + \expandafter\def\csname simpleicon@nikonicon\endcsname {\simpleiconsmap\symbol{"F13D}} + \expandafter\def\csname simpleicon@nimicon\endcsname {\simpleiconsmap\symbol{"F13E}} + \expandafter\def\csname simpleicon@nintendoicon\endcsname {\simpleiconsmap\symbol{"F13F}} + \expandafter\def\csname simpleicon@nintendo3dsicon\endcsname {\simpleiconsmap\symbol{"F140}} + \expandafter\def\csname simpleicon@nintendogamecubeicon\endcsname {\simpleiconsmap\symbol{"F141}} + \expandafter\def\csname simpleicon@nintendoswitchicon\endcsname {\simpleiconsmap\symbol{"F142}} + \expandafter\def\csname simpleicon@nissanicon\endcsname {\simpleiconsmap\symbol{"F143}} + \expandafter\def\csname simpleicon@nixosicon\endcsname {\simpleiconsmap\symbol{"F144}} + \expandafter\def\csname simpleicon@nodedotjsicon\endcsname {\simpleiconsmap\symbol{"F145}} + \expandafter\def\csname simpleicon@nodemonicon\endcsname {\simpleiconsmap\symbol{"F146}} + \expandafter\def\csname simpleicon@noderedicon\endcsname {\simpleiconsmap\symbol{"F147}} + \expandafter\def\csname simpleicon@nokiaicon\endcsname {\simpleiconsmap\symbol{"F148}} + \expandafter\def\csname simpleicon@nomadicon\endcsname {\simpleiconsmap\symbol{"F149}} + \expandafter\def\csname simpleicon@norcoicon\endcsname {\simpleiconsmap\symbol{"F14A}} + \expandafter\def\csname simpleicon@nordicsemiconductoricon\endcsname {\simpleiconsmap\symbol{"F14B}} + \expandafter\def\csname simpleicon@nordvpnicon\endcsname {\simpleiconsmap\symbol{"F14C}} + \expandafter\def\csname simpleicon@normalizedotcssicon\endcsname {\simpleiconsmap\symbol{"F14D}} + \expandafter\def\csname simpleicon@nortonicon\endcsname {\simpleiconsmap\symbol{"F14E}} + \expandafter\def\csname simpleicon@norwegianicon\endcsname {\simpleiconsmap\symbol{"F14F}} + \expandafter\def\csname simpleicon@notepadplusplusicon\endcsname {\simpleiconsmap\symbol{"F150}} + \expandafter\def\csname simpleicon@notionicon\endcsname {\simpleiconsmap\symbol{"F151}} + \expandafter\def\csname simpleicon@notisticon\endcsname {\simpleiconsmap\symbol{"F152}} + \expandafter\def\csname simpleicon@nounprojecticon\endcsname {\simpleiconsmap\symbol{"F153}} + \expandafter\def\csname simpleicon@novuicon\endcsname {\simpleiconsmap\symbol{"F154}} + \expandafter\def\csname simpleicon@nowicon\endcsname {\simpleiconsmap\symbol{"F155}} + \expandafter\def\csname simpleicon@npmicon\endcsname {\simpleiconsmap\symbol{"F156}} + \expandafter\def\csname simpleicon@nrwlicon\endcsname {\simpleiconsmap\symbol{"F157}} + \expandafter\def\csname simpleicon@nsisicon\endcsname {\simpleiconsmap\symbol{"F158}} + \expandafter\def\csname simpleicon@ntfyicon\endcsname {\simpleiconsmap\symbol{"F159}} + \expandafter\def\csname simpleicon@nubankicon\endcsname {\simpleiconsmap\symbol{"F15A}} + \expandafter\def\csname simpleicon@nucleoicon\endcsname {\simpleiconsmap\symbol{"F15B}} + \expandafter\def\csname simpleicon@nugeticon\endcsname {\simpleiconsmap\symbol{"F15C}} + \expandafter\def\csname simpleicon@nukeicon\endcsname {\simpleiconsmap\symbol{"F15D}} + \expandafter\def\csname simpleicon@numbaicon\endcsname {\simpleiconsmap\symbol{"F15E}} + \expandafter\def\csname simpleicon@numpyicon\endcsname {\simpleiconsmap\symbol{"F15F}} + \expandafter\def\csname simpleicon@nunjucksicon\endcsname {\simpleiconsmap\symbol{"F160}} + \expandafter\def\csname simpleicon@nushellicon\endcsname {\simpleiconsmap\symbol{"F161}} + \expandafter\def\csname simpleicon@nutanixicon\endcsname {\simpleiconsmap\symbol{"F162}} + \expandafter\def\csname simpleicon@nuxtdotjsicon\endcsname {\simpleiconsmap\symbol{"F163}} + \expandafter\def\csname simpleicon@nvidiaicon\endcsname {\simpleiconsmap\symbol{"F164}} + \expandafter\def\csname simpleicon@nvmicon\endcsname {\simpleiconsmap\symbol{"F165}} + \expandafter\def\csname simpleicon@nxicon\endcsname {\simpleiconsmap\symbol{"F166}} + \expandafter\def\csname simpleicon@nxpicon\endcsname {\simpleiconsmap\symbol{"F167}} + \expandafter\def\csname simpleicon@nzxticon\endcsname {\simpleiconsmap\symbol{"F168}} + \expandafter\def\csname simpleicon@observableicon\endcsname {\simpleiconsmap\symbol{"F169}} + \expandafter\def\csname simpleicon@obsidianicon\endcsname {\simpleiconsmap\symbol{"F16A}} + \expandafter\def\csname simpleicon@obsstudioicon\endcsname {\simpleiconsmap\symbol{"F16B}} + \expandafter\def\csname simpleicon@ocamlicon\endcsname {\simpleiconsmap\symbol{"F16C}} + \expandafter\def\csname simpleicon@oclificon\endcsname {\simpleiconsmap\symbol{"F16D}} + \expandafter\def\csname simpleicon@octanerendericon\endcsname {\simpleiconsmap\symbol{"F16E}} + \expandafter\def\csname simpleicon@octaveicon\endcsname {\simpleiconsmap\symbol{"F16F}} + \expandafter\def\csname simpleicon@octobercmsicon\endcsname {\simpleiconsmap\symbol{"F170}} + \expandafter\def\csname simpleicon@octoprinticon\endcsname {\simpleiconsmap\symbol{"F171}} + \expandafter\def\csname simpleicon@octopusdeployicon\endcsname {\simpleiconsmap\symbol{"F172}} + \expandafter\def\csname simpleicon@oculusicon\endcsname {\simpleiconsmap\symbol{"F173}} + \expandafter\def\csname simpleicon@odnoklassnikiicon\endcsname {\simpleiconsmap\symbol{"F174}} + \expandafter\def\csname simpleicon@odooicon\endcsname {\simpleiconsmap\symbol{"F175}} + \expandafter\def\csname simpleicon@odyseeicon\endcsname {\simpleiconsmap\symbol{"F176}} + \expandafter\def\csname simpleicon@ohdearicon\endcsname {\simpleiconsmap\symbol{"F177}} + \expandafter\def\csname simpleicon@okcupidicon\endcsname {\simpleiconsmap\symbol{"F178}} + \expandafter\def\csname simpleicon@oktaicon\endcsname {\simpleiconsmap\symbol{"F179}} + \expandafter\def\csname simpleicon@ollamaicon\endcsname {\simpleiconsmap\symbol{"F17A}} + \expandafter\def\csname simpleicon@oneplusicon\endcsname {\simpleiconsmap\symbol{"F17B}} + \expandafter\def\csname simpleicon@onlyfansicon\endcsname {\simpleiconsmap\symbol{"F17C}} + \expandafter\def\csname simpleicon@onlyofficeicon\endcsname {\simpleiconsmap\symbol{"F17D}} + \expandafter\def\csname simpleicon@onnxicon\endcsname {\simpleiconsmap\symbol{"F17E}} + \expandafter\def\csname simpleicon@onstaricon\endcsname {\simpleiconsmap\symbol{"F17F}} + \expandafter\def\csname simpleicon@opelicon\endcsname {\simpleiconsmap\symbol{"F180}} + \expandafter\def\csname simpleicon@openaccessicon\endcsname {\simpleiconsmap\symbol{"F181}} + \expandafter\def\csname simpleicon@openaiicon\endcsname {\simpleiconsmap\symbol{"F182}} + \expandafter\def\csname simpleicon@openaigymicon\endcsname {\simpleiconsmap\symbol{"F183}} + \expandafter\def\csname simpleicon@openapiinitiativeicon\endcsname {\simpleiconsmap\symbol{"F184}} + \expandafter\def\csname simpleicon@openbadgesicon\endcsname {\simpleiconsmap\symbol{"F185}} + \expandafter\def\csname simpleicon@openbsdicon\endcsname {\simpleiconsmap\symbol{"F186}} + \expandafter\def\csname simpleicon@openbugbountyicon\endcsname {\simpleiconsmap\symbol{"F187}} + \expandafter\def\csname simpleicon@opencollectiveicon\endcsname {\simpleiconsmap\symbol{"F188}} + \expandafter\def\csname simpleicon@opencontainersinitiativeicon\endcsname {\simpleiconsmap\symbol{"F189}} + \expandafter\def\csname simpleicon@opencvicon\endcsname {\simpleiconsmap\symbol{"F18A}} + \expandafter\def\csname simpleicon@openfaasicon\endcsname {\simpleiconsmap\symbol{"F18B}} + \expandafter\def\csname simpleicon@openglicon\endcsname {\simpleiconsmap\symbol{"F18C}} + \expandafter\def\csname simpleicon@openhabicon\endcsname {\simpleiconsmap\symbol{"F18D}} + \expandafter\def\csname simpleicon@openidicon\endcsname {\simpleiconsmap\symbol{"F18E}} + \expandafter\def\csname simpleicon@openjdkicon\endcsname {\simpleiconsmap\symbol{"F18F}} + \expandafter\def\csname simpleicon@openjsfoundationicon\endcsname {\simpleiconsmap\symbol{"F190}} + \expandafter\def\csname simpleicon@openlayersicon\endcsname {\simpleiconsmap\symbol{"F191}} + \expandafter\def\csname simpleicon@openmediavaulticon\endcsname {\simpleiconsmap\symbol{"F192}} + \expandafter\def\csname simpleicon@openminedicon\endcsname {\simpleiconsmap\symbol{"F193}} + \expandafter\def\csname simpleicon@opennebulaicon\endcsname {\simpleiconsmap\symbol{"F194}} + \expandafter\def\csname simpleicon@openprojecticon\endcsname {\simpleiconsmap\symbol{"F195}} + \expandafter\def\csname simpleicon@openscadicon\endcsname {\simpleiconsmap\symbol{"F196}} + \expandafter\def\csname simpleicon@openseaicon\endcsname {\simpleiconsmap\symbol{"F197}} + \expandafter\def\csname simpleicon@opensearchicon\endcsname {\simpleiconsmap\symbol{"F198}} + \expandafter\def\csname simpleicon@opensourcehardwareicon\endcsname {\simpleiconsmap\symbol{"F199}} + \expandafter\def\csname simpleicon@opensourceinitiativeicon\endcsname {\simpleiconsmap\symbol{"F19A}} + \expandafter\def\csname simpleicon@opensslicon\endcsname {\simpleiconsmap\symbol{"F19B}} + \expandafter\def\csname simpleicon@openstackicon\endcsname {\simpleiconsmap\symbol{"F19C}} + \expandafter\def\csname simpleicon@openstreetmapicon\endcsname {\simpleiconsmap\symbol{"F19D}} + \expandafter\def\csname simpleicon@opensuseicon\endcsname {\simpleiconsmap\symbol{"F19E}} + \expandafter\def\csname simpleicon@opentelemetryicon\endcsname {\simpleiconsmap\symbol{"F19F}} + \expandafter\def\csname simpleicon@opentexticon\endcsname {\simpleiconsmap\symbol{"F1A0}} + \expandafter\def\csname simpleicon@opentofuicon\endcsname {\simpleiconsmap\symbol{"F1A1}} + \expandafter\def\csname simpleicon@openverseicon\endcsname {\simpleiconsmap\symbol{"F1A2}} + \expandafter\def\csname simpleicon@openvpnicon\endcsname {\simpleiconsmap\symbol{"F1A3}} + \expandafter\def\csname simpleicon@openwrticon\endcsname {\simpleiconsmap\symbol{"F1A4}} + \expandafter\def\csname simpleicon@openzeppelinicon\endcsname {\simpleiconsmap\symbol{"F1A5}} + \expandafter\def\csname simpleicon@openzfsicon\endcsname {\simpleiconsmap\symbol{"F1A6}} + \expandafter\def\csname simpleicon@operaicon\endcsname {\simpleiconsmap\symbol{"F1A7}} + \expandafter\def\csname simpleicon@operagxicon\endcsname {\simpleiconsmap\symbol{"F1A8}} + \expandafter\def\csname simpleicon@opnsenseicon\endcsname {\simpleiconsmap\symbol{"F1A9}} + \expandafter\def\csname simpleicon@oppoicon\endcsname {\simpleiconsmap\symbol{"F1AA}} + \expandafter\def\csname simpleicon@opsgenieicon\endcsname {\simpleiconsmap\symbol{"F1AB}} + \expandafter\def\csname simpleicon@opslevelicon\endcsname {\simpleiconsmap\symbol{"F1AC}} + \expandafter\def\csname simpleicon@optimismicon\endcsname {\simpleiconsmap\symbol{"F1AD}} + \expandafter\def\csname simpleicon@oracleicon\endcsname {\simpleiconsmap\symbol{"F1AE}} + \expandafter\def\csname simpleicon@orangeicon\endcsname {\simpleiconsmap\symbol{"F1AF}} + \expandafter\def\csname simpleicon@orcidicon\endcsname {\simpleiconsmap\symbol{"F1B0}} + \expandafter\def\csname simpleicon@oreillyicon\endcsname {\simpleiconsmap\symbol{"F1B1}} + \expandafter\def\csname simpleicon@orgicon\endcsname {\simpleiconsmap\symbol{"F1B2}} + \expandafter\def\csname simpleicon@organicmapsicon\endcsname {\simpleiconsmap\symbol{"F1B3}} + \expandafter\def\csname simpleicon@originicon\endcsname {\simpleiconsmap\symbol{"F1B4}} + \expandafter\def\csname simpleicon@osanoicon\endcsname {\simpleiconsmap\symbol{"F1B5}} + \expandafter\def\csname simpleicon@osficon\endcsname {\simpleiconsmap\symbol{"F1B6}} + \expandafter\def\csname simpleicon@osgeoicon\endcsname {\simpleiconsmap\symbol{"F1B7}} + \expandafter\def\csname simpleicon@oshkoshicon\endcsname {\simpleiconsmap\symbol{"F1B8}} + \expandafter\def\csname simpleicon@osmcicon\endcsname {\simpleiconsmap\symbol{"F1B9}} + \expandafter\def\csname simpleicon@osuicon\endcsname {\simpleiconsmap\symbol{"F1BA}} + \expandafter\def\csname simpleicon@ottoicon\endcsname {\simpleiconsmap\symbol{"F1BB}} + \expandafter\def\csname simpleicon@outlineicon\endcsname {\simpleiconsmap\symbol{"F1BC}} + \expandafter\def\csname simpleicon@overcasticon\endcsname {\simpleiconsmap\symbol{"F1BD}} + \expandafter\def\csname simpleicon@overleaficon\endcsname {\simpleiconsmap\symbol{"F1BE}} + \expandafter\def\csname simpleicon@ovhicon\endcsname {\simpleiconsmap\symbol{"F1BF}} + \expandafter\def\csname simpleicon@owaspicon\endcsname {\simpleiconsmap\symbol{"F1C0}} + \expandafter\def\csname simpleicon@owncloudicon\endcsname {\simpleiconsmap\symbol{"F1C1}} + \expandafter\def\csname simpleicon@oxygenicon\endcsname {\simpleiconsmap\symbol{"F1C2}} + \expandafter\def\csname simpleicon@oyoicon\endcsname {\simpleiconsmap\symbol{"F1C3}} + \expandafter\def\csname simpleicon@p5dotjsicon\endcsname {\simpleiconsmap\symbol{"F1C4}} + \expandafter\def\csname simpleicon@packagisticon\endcsname {\simpleiconsmap\symbol{"F1C5}} + \expandafter\def\csname simpleicon@packericon\endcsname {\simpleiconsmap\symbol{"F1C6}} + \expandafter\def\csname simpleicon@packticon\endcsname {\simpleiconsmap\symbol{"F1C7}} + \expandafter\def\csname simpleicon@paddleicon\endcsname {\simpleiconsmap\symbol{"F1C8}} + \expandafter\def\csname simpleicon@paddlepaddleicon\endcsname {\simpleiconsmap\symbol{"F1C9}} + \expandafter\def\csname simpleicon@paddypowericon\endcsname {\simpleiconsmap\symbol{"F1CA}} + \expandafter\def\csname simpleicon@pagekiticon\endcsname {\simpleiconsmap\symbol{"F1CB}} + \expandafter\def\csname simpleicon@pagerdutyicon\endcsname {\simpleiconsmap\symbol{"F1CC}} + \expandafter\def\csname simpleicon@pagespeedinsightsicon\endcsname {\simpleiconsmap\symbol{"F1CD}} + \expandafter\def\csname simpleicon@pagseguroicon\endcsname {\simpleiconsmap\symbol{"F1CE}} + \expandafter\def\csname simpleicon@palantiricon\endcsname {\simpleiconsmap\symbol{"F1CF}} + \expandafter\def\csname simpleicon@paloaltonetworksicon\endcsname {\simpleiconsmap\symbol{"F1D0}} + \expandafter\def\csname simpleicon@paloaltosoftwareicon\endcsname {\simpleiconsmap\symbol{"F1D1}} + \expandafter\def\csname simpleicon@panasonicicon\endcsname {\simpleiconsmap\symbol{"F1D2}} + \expandafter\def\csname simpleicon@pandasicon\endcsname {\simpleiconsmap\symbol{"F1D3}} + \expandafter\def\csname simpleicon@pandoraicon\endcsname {\simpleiconsmap\symbol{"F1D4}} + \expandafter\def\csname simpleicon@pantheonicon\endcsname {\simpleiconsmap\symbol{"F1D5}} + \expandafter\def\csname simpleicon@paperlessngxicon\endcsname {\simpleiconsmap\symbol{"F1D6}} + \expandafter\def\csname simpleicon@paperspaceicon\endcsname {\simpleiconsmap\symbol{"F1D7}} + \expandafter\def\csname simpleicon@paperswithcodeicon\endcsname {\simpleiconsmap\symbol{"F1D8}} + \expandafter\def\csname simpleicon@paramountplusicon\endcsname {\simpleiconsmap\symbol{"F1D9}} + \expandafter\def\csname simpleicon@paritysubstrateicon\endcsname {\simpleiconsmap\symbol{"F1DA}} + \expandafter\def\csname simpleicon@parrotsecurityicon\endcsname {\simpleiconsmap\symbol{"F1DB}} + \expandafter\def\csname simpleicon@parsedotlyicon\endcsname {\simpleiconsmap\symbol{"F1DC}} + \expandafter\def\csname simpleicon@passporticon\endcsname {\simpleiconsmap\symbol{"F1DD}} + \expandafter\def\csname simpleicon@pastebinicon\endcsname {\simpleiconsmap\symbol{"F1DE}} + \expandafter\def\csname simpleicon@patreonicon\endcsname {\simpleiconsmap\symbol{"F1DF}} + \expandafter\def\csname simpleicon@paychexicon\endcsname {\simpleiconsmap\symbol{"F1E0}} + \expandafter\def\csname simpleicon@payhipicon\endcsname {\simpleiconsmap\symbol{"F1E1}} + \expandafter\def\csname simpleicon@payloadcmsicon\endcsname {\simpleiconsmap\symbol{"F1E2}} + \expandafter\def\csname simpleicon@payoneericon\endcsname {\simpleiconsmap\symbol{"F1E3}} + \expandafter\def\csname simpleicon@paypalicon\endcsname {\simpleiconsmap\symbol{"F1E4}} + \expandafter\def\csname simpleicon@paytmicon\endcsname {\simpleiconsmap\symbol{"F1E5}} + \expandafter\def\csname simpleicon@pcgamingwikiicon\endcsname {\simpleiconsmap\symbol{"F1E6}} + \expandafter\def\csname simpleicon@pdmicon\endcsname {\simpleiconsmap\symbol{"F1E7}} + \expandafter\def\csname simpleicon@pdqicon\endcsname {\simpleiconsmap\symbol{"F1E8}} + \expandafter\def\csname simpleicon@peakdesignicon\endcsname {\simpleiconsmap\symbol{"F1E9}} + \expandafter\def\csname simpleicon@pearsonicon\endcsname {\simpleiconsmap\symbol{"F1EA}} + \expandafter\def\csname simpleicon@peerlisticon\endcsname {\simpleiconsmap\symbol{"F1EB}} + \expandafter\def\csname simpleicon@peertubeicon\endcsname {\simpleiconsmap\symbol{"F1EC}} + \expandafter\def\csname simpleicon@pegasusairlinesicon\endcsname {\simpleiconsmap\symbol{"F1ED}} + \expandafter\def\csname simpleicon@pelicanicon\endcsname {\simpleiconsmap\symbol{"F1EE}} + \expandafter\def\csname simpleicon@pelotonicon\endcsname {\simpleiconsmap\symbol{"F1EF}} + \expandafter\def\csname simpleicon@pennyicon\endcsname {\simpleiconsmap\symbol{"F1F0}} + \expandafter\def\csname simpleicon@penpoticon\endcsname {\simpleiconsmap\symbol{"F1F1}} + \expandafter\def\csname simpleicon@percyicon\endcsname {\simpleiconsmap\symbol{"F1F2}} + \expandafter\def\csname simpleicon@perforceicon\endcsname {\simpleiconsmap\symbol{"F1F3}} + \expandafter\def\csname simpleicon@perlicon\endcsname {\simpleiconsmap\symbol{"F1F4}} + \expandafter\def\csname simpleicon@perplexityicon\endcsname {\simpleiconsmap\symbol{"F1F5}} + \expandafter\def\csname simpleicon@persistenticon\endcsname {\simpleiconsmap\symbol{"F1F6}} + \expandafter\def\csname simpleicon@personioicon\endcsname {\simpleiconsmap\symbol{"F1F7}} + \expandafter\def\csname simpleicon@petsathomeicon\endcsname {\simpleiconsmap\symbol{"F1F8}} + \expandafter\def\csname simpleicon@peugeoticon\endcsname {\simpleiconsmap\symbol{"F1F9}} + \expandafter\def\csname simpleicon@pexelsicon\endcsname {\simpleiconsmap\symbol{"F1FA}} + \expandafter\def\csname simpleicon@pfsenseicon\endcsname {\simpleiconsmap\symbol{"F1FB}} + \expandafter\def\csname simpleicon@phabricatoricon\endcsname {\simpleiconsmap\symbol{"F1FC}} + \expandafter\def\csname simpleicon@philipshueicon\endcsname {\simpleiconsmap\symbol{"F1FD}} + \expandafter\def\csname simpleicon@phoenixframeworkicon\endcsname {\simpleiconsmap\symbol{"F1FE}} + \expandafter\def\csname simpleicon@phonepeicon\endcsname {\simpleiconsmap\symbol{"F1FF}} + \expandafter\def\csname simpleicon@phosphoriconsicon\endcsname {\simpleiconsmap\symbol{"F200}} + \expandafter\def\csname simpleicon@photobucketicon\endcsname {\simpleiconsmap\symbol{"F201}} + \expandafter\def\csname simpleicon@photocrowdicon\endcsname {\simpleiconsmap\symbol{"F202}} + \expandafter\def\csname simpleicon@photonicon\endcsname {\simpleiconsmap\symbol{"F203}} + \expandafter\def\csname simpleicon@photopeaicon\endcsname {\simpleiconsmap\symbol{"F204}} + \expandafter\def\csname simpleicon@phpicon\endcsname {\simpleiconsmap\symbol{"F205}} + \expandafter\def\csname simpleicon@phpmyadminicon\endcsname {\simpleiconsmap\symbol{"F206}} + \expandafter\def\csname simpleicon@phpstormicon\endcsname {\simpleiconsmap\symbol{"F207}} + \expandafter\def\csname simpleicon@piaggiogroupicon\endcsname {\simpleiconsmap\symbol{"F208}} + \expandafter\def\csname simpleicon@piaproicon\endcsname {\simpleiconsmap\symbol{"F209}} + \expandafter\def\csname simpleicon@picardsurgelesicon\endcsname {\simpleiconsmap\symbol{"F20A}} + \expandafter\def\csname simpleicon@picartodottvicon\endcsname {\simpleiconsmap\symbol{"F20B}} + \expandafter\def\csname simpleicon@picnicicon\endcsname {\simpleiconsmap\symbol{"F20C}} + \expandafter\def\csname simpleicon@picpayicon\endcsname {\simpleiconsmap\symbol{"F20D}} + \expandafter\def\csname simpleicon@picrewicon\endcsname {\simpleiconsmap\symbol{"F20E}} + \expandafter\def\csname simpleicon@picxyicon\endcsname {\simpleiconsmap\symbol{"F20F}} + \expandafter\def\csname simpleicon@piholeicon\endcsname {\simpleiconsmap\symbol{"F210}} + \expandafter\def\csname simpleicon@pimcoreicon\endcsname {\simpleiconsmap\symbol{"F211}} + \expandafter\def\csname simpleicon@pinboardicon\endcsname {\simpleiconsmap\symbol{"F212}} + \expandafter\def\csname simpleicon@pinescripticon\endcsname {\simpleiconsmap\symbol{"F213}} + \expandafter\def\csname simpleicon@pinetworkicon\endcsname {\simpleiconsmap\symbol{"F214}} + \expandafter\def\csname simpleicon@pingdomicon\endcsname {\simpleiconsmap\symbol{"F215}} + \expandafter\def\csname simpleicon@pinoicon\endcsname {\simpleiconsmap\symbol{"F216}} + \expandafter\def\csname simpleicon@pinteresticon\endcsname {\simpleiconsmap\symbol{"F217}} + \expandafter\def\csname simpleicon@pioneerdjicon\endcsname {\simpleiconsmap\symbol{"F218}} + \expandafter\def\csname simpleicon@pipedicon\endcsname {\simpleiconsmap\symbol{"F219}} + \expandafter\def\csname simpleicon@pipxicon\endcsname {\simpleiconsmap\symbol{"F21A}} + \expandafter\def\csname simpleicon@pivotaltrackericon\endcsname {\simpleiconsmap\symbol{"F21B}} + \expandafter\def\csname simpleicon@piwigoicon\endcsname {\simpleiconsmap\symbol{"F21C}} + \expandafter\def\csname simpleicon@pixicon\endcsname {\simpleiconsmap\symbol{"F21D}} + \expandafter\def\csname simpleicon@pixabayicon\endcsname {\simpleiconsmap\symbol{"F21E}} + \expandafter\def\csname simpleicon@pixelfedicon\endcsname {\simpleiconsmap\symbol{"F21F}} + \expandafter\def\csname simpleicon@pixivicon\endcsname {\simpleiconsmap\symbol{"F220}} + \expandafter\def\csname simpleicon@pixlricon\endcsname {\simpleiconsmap\symbol{"F221}} + \expandafter\def\csname simpleicon@pkgsrcicon\endcsname {\simpleiconsmap\symbol{"F222}} + \expandafter\def\csname simpleicon@planeticon\endcsname {\simpleiconsmap\symbol{"F223}} + \expandafter\def\csname simpleicon@planetscaleicon\endcsname {\simpleiconsmap\symbol{"F224}} + \expandafter\def\csname simpleicon@plangridicon\endcsname {\simpleiconsmap\symbol{"F225}} + \expandafter\def\csname simpleicon@platformdotshicon\endcsname {\simpleiconsmap\symbol{"F226}} + \expandafter\def\csname simpleicon@platformioicon\endcsname {\simpleiconsmap\symbol{"F227}} + \expandafter\def\csname simpleicon@platziicon\endcsname {\simpleiconsmap\symbol{"F228}} + \expandafter\def\csname simpleicon@plausibleanalyticsicon\endcsname {\simpleiconsmap\symbol{"F229}} + \expandafter\def\csname simpleicon@playcanvasicon\endcsname {\simpleiconsmap\symbol{"F22A}} + \expandafter\def\csname simpleicon@playerdotmeicon\endcsname {\simpleiconsmap\symbol{"F22B}} + \expandafter\def\csname simpleicon@playerfmicon\endcsname {\simpleiconsmap\symbol{"F22C}} + \expandafter\def\csname simpleicon@playstationicon\endcsname {\simpleiconsmap\symbol{"F22D}} + \expandafter\def\csname simpleicon@playstation2icon\endcsname {\simpleiconsmap\symbol{"F22E}} + \expandafter\def\csname simpleicon@playstation3icon\endcsname {\simpleiconsmap\symbol{"F22F}} + \expandafter\def\csname simpleicon@playstation4icon\endcsname {\simpleiconsmap\symbol{"F230}} + \expandafter\def\csname simpleicon@playstation5icon\endcsname {\simpleiconsmap\symbol{"F231}} + \expandafter\def\csname simpleicon@playstationportableicon\endcsname {\simpleiconsmap\symbol{"F232}} + \expandafter\def\csname simpleicon@playstationvitaicon\endcsname {\simpleiconsmap\symbol{"F233}} + \expandafter\def\csname simpleicon@pleromaicon\endcsname {\simpleiconsmap\symbol{"F234}} + \expandafter\def\csname simpleicon@pleskicon\endcsname {\simpleiconsmap\symbol{"F235}} + \expandafter\def\csname simpleicon@plexicon\endcsname {\simpleiconsmap\symbol{"F236}} + \expandafter\def\csname simpleicon@plotlyicon\endcsname {\simpleiconsmap\symbol{"F237}} + \expandafter\def\csname simpleicon@plumeicon\endcsname {\simpleiconsmap\symbol{"F238}} + \expandafter\def\csname simpleicon@pluralsighticon\endcsname {\simpleiconsmap\symbol{"F239}} + \expandafter\def\csname simpleicon@plurkicon\endcsname {\simpleiconsmap\symbol{"F23A}} + \expandafter\def\csname simpleicon@pluscodesicon\endcsname {\simpleiconsmap\symbol{"F23B}} + \expandafter\def\csname simpleicon@pm2icon\endcsname {\simpleiconsmap\symbol{"F23C}} + \expandafter\def\csname simpleicon@pnpmicon\endcsname {\simpleiconsmap\symbol{"F23D}} + \expandafter\def\csname simpleicon@pocketicon\endcsname {\simpleiconsmap\symbol{"F23E}} + \expandafter\def\csname simpleicon@pocketbaseicon\endcsname {\simpleiconsmap\symbol{"F23F}} + \expandafter\def\csname simpleicon@pocketcastsicon\endcsname {\simpleiconsmap\symbol{"F240}} + \expandafter\def\csname simpleicon@podcastaddicticon\endcsname {\simpleiconsmap\symbol{"F241}} + \expandafter\def\csname simpleicon@podcastindexicon\endcsname {\simpleiconsmap\symbol{"F242}} + \expandafter\def\csname simpleicon@podmanicon\endcsname {\simpleiconsmap\symbol{"F243}} + \expandafter\def\csname simpleicon@poeicon\endcsname {\simpleiconsmap\symbol{"F244}} + \expandafter\def\csname simpleicon@poetryicon\endcsname {\simpleiconsmap\symbol{"F245}} + \expandafter\def\csname simpleicon@pointyicon\endcsname {\simpleiconsmap\symbol{"F246}} + \expandafter\def\csname simpleicon@pokemonicon\endcsname {\simpleiconsmap\symbol{"F247}} + \expandafter\def\csname simpleicon@polarsicon\endcsname {\simpleiconsmap\symbol{"F248}} + \expandafter\def\csname simpleicon@polestaricon\endcsname {\simpleiconsmap\symbol{"F249}} + \expandafter\def\csname simpleicon@polkadoticon\endcsname {\simpleiconsmap\symbol{"F24A}} + \expandafter\def\csname simpleicon@polyicon\endcsname {\simpleiconsmap\symbol{"F24B}} + \expandafter\def\csname simpleicon@polygonicon\endcsname {\simpleiconsmap\symbol{"F24C}} + \expandafter\def\csname simpleicon@polymerprojecticon\endcsname {\simpleiconsmap\symbol{"F24D}} + \expandafter\def\csname simpleicon@polyworkicon\endcsname {\simpleiconsmap\symbol{"F24E}} + \expandafter\def\csname simpleicon@pond5icon\endcsname {\simpleiconsmap\symbol{"F24F}} + \expandafter\def\csname simpleicon@poposicon\endcsname {\simpleiconsmap\symbol{"F250}} + \expandafter\def\csname simpleicon@porkbunicon\endcsname {\simpleiconsmap\symbol{"F251}} + \expandafter\def\csname simpleicon@porscheicon\endcsname {\simpleiconsmap\symbol{"F252}} + \expandafter\def\csname simpleicon@portainericon\endcsname {\simpleiconsmap\symbol{"F253}} + \expandafter\def\csname simpleicon@portswiggericon\endcsname {\simpleiconsmap\symbol{"F254}} + \expandafter\def\csname simpleicon@positicon\endcsname {\simpleiconsmap\symbol{"F255}} + \expandafter\def\csname simpleicon@postcssicon\endcsname {\simpleiconsmap\symbol{"F256}} + \expandafter\def\csname simpleicon@postgresqlicon\endcsname {\simpleiconsmap\symbol{"F257}} + \expandafter\def\csname simpleicon@posthogicon\endcsname {\simpleiconsmap\symbol{"F258}} + \expandafter\def\csname simpleicon@postmanicon\endcsname {\simpleiconsmap\symbol{"F259}} + \expandafter\def\csname simpleicon@postmatesicon\endcsname {\simpleiconsmap\symbol{"F25A}} + \expandafter\def\csname simpleicon@powersicon\endcsname {\simpleiconsmap\symbol{"F25B}} + \expandafter\def\csname simpleicon@prdotcoicon\endcsname {\simpleiconsmap\symbol{"F25C}} + \expandafter\def\csname simpleicon@preacticon\endcsname {\simpleiconsmap\symbol{"F25D}} + \expandafter\def\csname simpleicon@precommiticon\endcsname {\simpleiconsmap\symbol{"F25E}} + \expandafter\def\csname simpleicon@prefecticon\endcsname {\simpleiconsmap\symbol{"F25F}} + \expandafter\def\csname simpleicon@premierleagueicon\endcsname {\simpleiconsmap\symbol{"F260}} + \expandafter\def\csname simpleicon@prepbytesicon\endcsname {\simpleiconsmap\symbol{"F261}} + \expandafter\def\csname simpleicon@prestashopicon\endcsname {\simpleiconsmap\symbol{"F262}} + \expandafter\def\csname simpleicon@prestoicon\endcsname {\simpleiconsmap\symbol{"F263}} + \expandafter\def\csname simpleicon@prettiericon\endcsname {\simpleiconsmap\symbol{"F264}} + \expandafter\def\csname simpleicon@pretzelicon\endcsname {\simpleiconsmap\symbol{"F265}} + \expandafter\def\csname simpleicon@preventionicon\endcsname {\simpleiconsmap\symbol{"F266}} + \expandafter\def\csname simpleicon@preziicon\endcsname {\simpleiconsmap\symbol{"F267}} + \expandafter\def\csname simpleicon@primeicon\endcsname {\simpleiconsmap\symbol{"F268}} + \expandafter\def\csname simpleicon@primengicon\endcsname {\simpleiconsmap\symbol{"F269}} + \expandafter\def\csname simpleicon@primereacticon\endcsname {\simpleiconsmap\symbol{"F26A}} + \expandafter\def\csname simpleicon@primevideoicon\endcsname {\simpleiconsmap\symbol{"F26B}} + \expandafter\def\csname simpleicon@printablesicon\endcsname {\simpleiconsmap\symbol{"F26C}} + \expandafter\def\csname simpleicon@prismaicon\endcsname {\simpleiconsmap\symbol{"F26D}} + \expandafter\def\csname simpleicon@prismicicon\endcsname {\simpleiconsmap\symbol{"F26E}} + \expandafter\def\csname simpleicon@privatedivisionicon\endcsname {\simpleiconsmap\symbol{"F26F}} + \expandafter\def\csname simpleicon@privateinternetaccessicon\endcsname {\simpleiconsmap\symbol{"F270}} + \expandafter\def\csname simpleicon@proboticon\endcsname {\simpleiconsmap\symbol{"F271}} + \expandafter\def\csname simpleicon@processingfoundationicon\endcsname {\simpleiconsmap\symbol{"F272}} + \expandafter\def\csname simpleicon@processwireicon\endcsname {\simpleiconsmap\symbol{"F273}} + \expandafter\def\csname simpleicon@producthunticon\endcsname {\simpleiconsmap\symbol{"F274}} + \expandafter\def\csname simpleicon@progateicon\endcsname {\simpleiconsmap\symbol{"F275}} + \expandafter\def\csname simpleicon@progressicon\endcsname {\simpleiconsmap\symbol{"F276}} + \expandafter\def\csname simpleicon@prometheusicon\endcsname {\simpleiconsmap\symbol{"F277}} + \expandafter\def\csname simpleicon@pronounsdotpageicon\endcsname {\simpleiconsmap\symbol{"F278}} + \expandafter\def\csname simpleicon@prosiebenicon\endcsname {\simpleiconsmap\symbol{"F279}} + \expandafter\def\csname simpleicon@proteusicon\endcsname {\simpleiconsmap\symbol{"F27A}} + \expandafter\def\csname simpleicon@protocolsdotioicon\endcsname {\simpleiconsmap\symbol{"F27B}} + \expandafter\def\csname simpleicon@protodotioicon\endcsname {\simpleiconsmap\symbol{"F27C}} + \expandafter\def\csname simpleicon@protonicon\endcsname {\simpleiconsmap\symbol{"F27D}} + \expandafter\def\csname simpleicon@protoncalendaricon\endcsname {\simpleiconsmap\symbol{"F27E}} + \expandafter\def\csname simpleicon@protondbicon\endcsname {\simpleiconsmap\symbol{"F27F}} + \expandafter\def\csname simpleicon@protondriveicon\endcsname {\simpleiconsmap\symbol{"F280}} + \expandafter\def\csname simpleicon@protonmailicon\endcsname {\simpleiconsmap\symbol{"F281}} + \expandafter\def\csname simpleicon@protonvpnicon\endcsname {\simpleiconsmap\symbol{"F282}} + \expandafter\def\csname simpleicon@protoolsicon\endcsname {\simpleiconsmap\symbol{"F283}} + \expandafter\def\csname simpleicon@protractoricon\endcsname {\simpleiconsmap\symbol{"F284}} + \expandafter\def\csname simpleicon@proxmoxicon\endcsname {\simpleiconsmap\symbol{"F285}} + \expandafter\def\csname simpleicon@pterodactylicon\endcsname {\simpleiconsmap\symbol{"F286}} + \expandafter\def\csname simpleicon@pubgicon\endcsname {\simpleiconsmap\symbol{"F287}} + \expandafter\def\csname simpleicon@publonsicon\endcsname {\simpleiconsmap\symbol{"F288}} + \expandafter\def\csname simpleicon@pubmedicon\endcsname {\simpleiconsmap\symbol{"F289}} + \expandafter\def\csname simpleicon@pugicon\endcsname {\simpleiconsmap\symbol{"F28A}} + \expandafter\def\csname simpleicon@pulumiicon\endcsname {\simpleiconsmap\symbol{"F28B}} + \expandafter\def\csname simpleicon@pumaicon\endcsname {\simpleiconsmap\symbol{"F28C}} + \expandafter\def\csname simpleicon@puppeticon\endcsname {\simpleiconsmap\symbol{"F28D}} + \expandafter\def\csname simpleicon@puppeteericon\endcsname {\simpleiconsmap\symbol{"F28E}} + \expandafter\def\csname simpleicon@purescripticon\endcsname {\simpleiconsmap\symbol{"F28F}} + \expandafter\def\csname simpleicon@purgecssicon\endcsname {\simpleiconsmap\symbol{"F290}} + \expandafter\def\csname simpleicon@purismicon\endcsname {\simpleiconsmap\symbol{"F291}} + \expandafter\def\csname simpleicon@pushbulleticon\endcsname {\simpleiconsmap\symbol{"F292}} + \expandafter\def\csname simpleicon@pushericon\endcsname {\simpleiconsmap\symbol{"F293}} + \expandafter\def\csname simpleicon@pwaicon\endcsname {\simpleiconsmap\symbol{"F294}} + \expandafter\def\csname simpleicon@pycharmicon\endcsname {\simpleiconsmap\symbol{"F295}} + \expandafter\def\csname simpleicon@pycqaicon\endcsname {\simpleiconsmap\symbol{"F296}} + \expandafter\def\csname simpleicon@pydanticicon\endcsname {\simpleiconsmap\symbol{"F297}} + \expandafter\def\csname simpleicon@pygicon\endcsname {\simpleiconsmap\symbol{"F298}} + \expandafter\def\csname simpleicon@pypiicon\endcsname {\simpleiconsmap\symbol{"F299}} + \expandafter\def\csname simpleicon@pypyicon\endcsname {\simpleiconsmap\symbol{"F29A}} + \expandafter\def\csname simpleicon@pyscaffoldicon\endcsname {\simpleiconsmap\symbol{"F29B}} + \expandafter\def\csname simpleicon@pysyfticon\endcsname {\simpleiconsmap\symbol{"F29C}} + \expandafter\def\csname simpleicon@pytesticon\endcsname {\simpleiconsmap\symbol{"F29D}} + \expandafter\def\csname simpleicon@pythonicon\endcsname {\simpleiconsmap\symbol{"F29E}} + \expandafter\def\csname simpleicon@pythonanywhereicon\endcsname {\simpleiconsmap\symbol{"F29F}} + \expandafter\def\csname simpleicon@pytorchicon\endcsname {\simpleiconsmap\symbol{"F2A0}} + \expandafter\def\csname simpleicon@pyupicon\endcsname {\simpleiconsmap\symbol{"F2A1}} + \expandafter\def\csname simpleicon@qantasicon\endcsname {\simpleiconsmap\symbol{"F2A2}} + \expandafter\def\csname simpleicon@qaseicon\endcsname {\simpleiconsmap\symbol{"F2A3}} + \expandafter\def\csname simpleicon@qatarairwaysicon\endcsname {\simpleiconsmap\symbol{"F2A4}} + \expandafter\def\csname simpleicon@qbittorrenticon\endcsname {\simpleiconsmap\symbol{"F2A5}} + \expandafter\def\csname simpleicon@qemuicon\endcsname {\simpleiconsmap\symbol{"F2A6}} + \expandafter\def\csname simpleicon@qgisicon\endcsname {\simpleiconsmap\symbol{"F2A7}} + \expandafter\def\csname simpleicon@qiicon\endcsname {\simpleiconsmap\symbol{"F2A8}} + \expandafter\def\csname simpleicon@qiitaicon\endcsname {\simpleiconsmap\symbol{"F2A9}} + \expandafter\def\csname simpleicon@qiskiticon\endcsname {\simpleiconsmap\symbol{"F2AA}} + \expandafter\def\csname simpleicon@qiwiicon\endcsname {\simpleiconsmap\symbol{"F2AB}} + \expandafter\def\csname simpleicon@qlikicon\endcsname {\simpleiconsmap\symbol{"F2AC}} + \expandafter\def\csname simpleicon@qmkicon\endcsname {\simpleiconsmap\symbol{"F2AD}} + \expandafter\def\csname simpleicon@qnapicon\endcsname {\simpleiconsmap\symbol{"F2AE}} + \expandafter\def\csname simpleicon@qticon\endcsname {\simpleiconsmap\symbol{"F2AF}} + \expandafter\def\csname simpleicon@qualcommicon\endcsname {\simpleiconsmap\symbol{"F2B0}} + \expandafter\def\csname simpleicon@qualtricsicon\endcsname {\simpleiconsmap\symbol{"F2B1}} + \expandafter\def\csname simpleicon@qualysicon\endcsname {\simpleiconsmap\symbol{"F2B2}} + \expandafter\def\csname simpleicon@quantcasticon\endcsname {\simpleiconsmap\symbol{"F2B3}} + \expandafter\def\csname simpleicon@quantconnecticon\endcsname {\simpleiconsmap\symbol{"F2B4}} + \expandafter\def\csname simpleicon@quarkusicon\endcsname {\simpleiconsmap\symbol{"F2B5}} + \expandafter\def\csname simpleicon@quartoicon\endcsname {\simpleiconsmap\symbol{"F2B6}} + \expandafter\def\csname simpleicon@quasaricon\endcsname {\simpleiconsmap\symbol{"F2B7}} + \expandafter\def\csname simpleicon@qubesosicon\endcsname {\simpleiconsmap\symbol{"F2B8}} + \expandafter\def\csname simpleicon@questicon\endcsname {\simpleiconsmap\symbol{"F2B9}} + \expandafter\def\csname simpleicon@quickbooksicon\endcsname {\simpleiconsmap\symbol{"F2BA}} + \expandafter\def\csname simpleicon@quicklookicon\endcsname {\simpleiconsmap\symbol{"F2BB}} + \expandafter\def\csname simpleicon@quicktimeicon\endcsname {\simpleiconsmap\symbol{"F2BC}} + \expandafter\def\csname simpleicon@quicktypeicon\endcsname {\simpleiconsmap\symbol{"F2BD}} + \expandafter\def\csname simpleicon@quipicon\endcsname {\simpleiconsmap\symbol{"F2BE}} + \expandafter\def\csname simpleicon@quizleticon\endcsname {\simpleiconsmap\symbol{"F2BF}} + \expandafter\def\csname simpleicon@quoraicon\endcsname {\simpleiconsmap\symbol{"F2C0}} + \expandafter\def\csname simpleicon@qwanticon\endcsname {\simpleiconsmap\symbol{"F2C1}} + \expandafter\def\csname simpleicon@qwikicon\endcsname {\simpleiconsmap\symbol{"F2C2}} + \expandafter\def\csname simpleicon@qwiklabsicon\endcsname {\simpleiconsmap\symbol{"F2C3}} + \expandafter\def\csname simpleicon@qzoneicon\endcsname {\simpleiconsmap\symbol{"F2C4}} + \expandafter\def\csname simpleicon@ricon\endcsname {\simpleiconsmap\symbol{"F2C5}} + \expandafter\def\csname simpleicon@r3icon\endcsname {\simpleiconsmap\symbol{"F2C6}} + \expandafter\def\csname simpleicon@rabbitmqicon\endcsname {\simpleiconsmap\symbol{"F2C7}} + \expandafter\def\csname simpleicon@racketicon\endcsname {\simpleiconsmap\symbol{"F2C8}} + \expandafter\def\csname simpleicon@radaricon\endcsname {\simpleiconsmap\symbol{"F2C9}} + \expandafter\def\csname simpleicon@radarricon\endcsname {\simpleiconsmap\symbol{"F2CA}} + \expandafter\def\csname simpleicon@radiopublicicon\endcsname {\simpleiconsmap\symbol{"F2CB}} + \expandafter\def\csname simpleicon@radixuiicon\endcsname {\simpleiconsmap\symbol{"F2CC}} + \expandafter\def\csname simpleicon@radstudioicon\endcsname {\simpleiconsmap\symbol{"F2CD}} + \expandafter\def\csname simpleicon@railwayicon\endcsname {\simpleiconsmap\symbol{"F2CE}} + \expandafter\def\csname simpleicon@rainmetericon\endcsname {\simpleiconsmap\symbol{"F2CF}} + \expandafter\def\csname simpleicon@rakutenicon\endcsname {\simpleiconsmap\symbol{"F2D0}} + \expandafter\def\csname simpleicon@ramicon\endcsname {\simpleiconsmap\symbol{"F2D1}} + \expandafter\def\csname simpleicon@ranchericon\endcsname {\simpleiconsmap\symbol{"F2D2}} + \expandafter\def\csname simpleicon@rapidicon\endcsname {\simpleiconsmap\symbol{"F2D3}} + \expandafter\def\csname simpleicon@raribleicon\endcsname {\simpleiconsmap\symbol{"F2D4}} + \expandafter\def\csname simpleicon@rasaicon\endcsname {\simpleiconsmap\symbol{"F2D5}} + \expandafter\def\csname simpleicon@raspberrypiicon\endcsname {\simpleiconsmap\symbol{"F2D6}} + \expandafter\def\csname simpleicon@ravelryicon\endcsname {\simpleiconsmap\symbol{"F2D7}} + \expandafter\def\csname simpleicon@rayicon\endcsname {\simpleiconsmap\symbol{"F2D8}} + \expandafter\def\csname simpleicon@raycasticon\endcsname {\simpleiconsmap\symbol{"F2D9}} + \expandafter\def\csname simpleicon@raylibicon\endcsname {\simpleiconsmap\symbol{"F2DA}} + \expandafter\def\csname simpleicon@razericon\endcsname {\simpleiconsmap\symbol{"F2DB}} + \expandafter\def\csname simpleicon@razorpayicon\endcsname {\simpleiconsmap\symbol{"F2DC}} + \expandafter\def\csname simpleicon@rcloneicon\endcsname {\simpleiconsmap\symbol{"F2DD}} + \expandafter\def\csname simpleicon@reacticon\endcsname {\simpleiconsmap\symbol{"F2DE}} + \expandafter\def\csname simpleicon@reactbootstrapicon\endcsname {\simpleiconsmap\symbol{"F2DF}} + \expandafter\def\csname simpleicon@reacthookformicon\endcsname {\simpleiconsmap\symbol{"F2E0}} + \expandafter\def\csname simpleicon@reactiveresumeicon\endcsname {\simpleiconsmap\symbol{"F2E1}} + \expandafter\def\csname simpleicon@reactivexicon\endcsname {\simpleiconsmap\symbol{"F2E2}} + \expandafter\def\csname simpleicon@reactosicon\endcsname {\simpleiconsmap\symbol{"F2E3}} + \expandafter\def\csname simpleicon@reactqueryicon\endcsname {\simpleiconsmap\symbol{"F2E4}} + \expandafter\def\csname simpleicon@reactroutericon\endcsname {\simpleiconsmap\symbol{"F2E5}} + \expandafter\def\csname simpleicon@reacttableicon\endcsname {\simpleiconsmap\symbol{"F2E6}} + \expandafter\def\csname simpleicon@readdotcvicon\endcsname {\simpleiconsmap\symbol{"F2E7}} + \expandafter\def\csname simpleicon@readmeicon\endcsname {\simpleiconsmap\symbol{"F2E8}} + \expandafter\def\csname simpleicon@readthedocsicon\endcsname {\simpleiconsmap\symbol{"F2E9}} + \expandafter\def\csname simpleicon@realmicon\endcsname {\simpleiconsmap\symbol{"F2EA}} + \expandafter\def\csname simpleicon@reasonicon\endcsname {\simpleiconsmap\symbol{"F2EB}} + \expandafter\def\csname simpleicon@reasonstudiosicon\endcsname {\simpleiconsmap\symbol{"F2EC}} + \expandafter\def\csname simpleicon@recoilicon\endcsname {\simpleiconsmap\symbol{"F2ED}} + \expandafter\def\csname simpleicon@redicon\endcsname {\simpleiconsmap\symbol{"F2EE}} + \expandafter\def\csname simpleicon@redashicon\endcsname {\simpleiconsmap\symbol{"F2EF}} + \expandafter\def\csname simpleicon@redbubbleicon\endcsname {\simpleiconsmap\symbol{"F2F0}} + \expandafter\def\csname simpleicon@redbullicon\endcsname {\simpleiconsmap\symbol{"F2F1}} + \expandafter\def\csname simpleicon@redditicon\endcsname {\simpleiconsmap\symbol{"F2F2}} + \expandafter\def\csname simpleicon@redhaticon\endcsname {\simpleiconsmap\symbol{"F2F3}} + \expandafter\def\csname simpleicon@redhatopenshifticon\endcsname {\simpleiconsmap\symbol{"F2F4}} + \expandafter\def\csname simpleicon@redisicon\endcsname {\simpleiconsmap\symbol{"F2F5}} + \expandafter\def\csname simpleicon@redmineicon\endcsname {\simpleiconsmap\symbol{"F2F6}} + \expandafter\def\csname simpleicon@redoxicon\endcsname {\simpleiconsmap\symbol{"F2F7}} + \expandafter\def\csname simpleicon@redragonicon\endcsname {\simpleiconsmap\symbol{"F2F8}} + \expandafter\def\csname simpleicon@redsysicon\endcsname {\simpleiconsmap\symbol{"F2F9}} + \expandafter\def\csname simpleicon@reduxicon\endcsname {\simpleiconsmap\symbol{"F2FA}} + \expandafter\def\csname simpleicon@reduxsagaicon\endcsname {\simpleiconsmap\symbol{"F2FB}} + \expandafter\def\csname simpleicon@redwoodjsicon\endcsname {\simpleiconsmap\symbol{"F2FC}} + \expandafter\def\csname simpleicon@reebokicon\endcsname {\simpleiconsmap\symbol{"F2FD}} + \expandafter\def\csname simpleicon@refineicon\endcsname {\simpleiconsmap\symbol{"F2FE}} + \expandafter\def\csname simpleicon@relayicon\endcsname {\simpleiconsmap\symbol{"F2FF}} + \expandafter\def\csname simpleicon@relianceindustrieslimitedicon\endcsname {\simpleiconsmap\symbol{"F300}} + \expandafter\def\csname simpleicon@remarkicon\endcsname {\simpleiconsmap\symbol{"F301}} + \expandafter\def\csname simpleicon@remedyentertainmenticon\endcsname {\simpleiconsmap\symbol{"F302}} + \expandafter\def\csname simpleicon@remixicon\endcsname {\simpleiconsmap\symbol{"F303}} + \expandafter\def\csname simpleicon@removedotbgicon\endcsname {\simpleiconsmap\symbol{"F304}} + \expandafter\def\csname simpleicon@renaulticon\endcsname {\simpleiconsmap\symbol{"F305}} + \expandafter\def\csname simpleicon@rendericon\endcsname {\simpleiconsmap\symbol{"F306}} + \expandafter\def\csname simpleicon@renovateicon\endcsname {\simpleiconsmap\symbol{"F307}} + \expandafter\def\csname simpleicon@renpyicon\endcsname {\simpleiconsmap\symbol{"F308}} + \expandafter\def\csname simpleicon@renrenicon\endcsname {\simpleiconsmap\symbol{"F309}} + \expandafter\def\csname simpleicon@repliticon\endcsname {\simpleiconsmap\symbol{"F30A}} + \expandafter\def\csname simpleicon@republicofgamersicon\endcsname {\simpleiconsmap\symbol{"F30B}} + \expandafter\def\csname simpleicon@rescripticon\endcsname {\simpleiconsmap\symbol{"F30C}} + \expandafter\def\csname simpleicon@rescuetimeicon\endcsname {\simpleiconsmap\symbol{"F30D}} + \expandafter\def\csname simpleicon@researchgateicon\endcsname {\simpleiconsmap\symbol{"F30E}} + \expandafter\def\csname simpleicon@resendicon\endcsname {\simpleiconsmap\symbol{"F30F}} + \expandafter\def\csname simpleicon@resharpericon\endcsname {\simpleiconsmap\symbol{"F310}} + \expandafter\def\csname simpleicon@resurrectionremixosicon\endcsname {\simpleiconsmap\symbol{"F311}} + \expandafter\def\csname simpleicon@retoolicon\endcsname {\simpleiconsmap\symbol{"F312}} + \expandafter\def\csname simpleicon@retroarchicon\endcsname {\simpleiconsmap\symbol{"F313}} + \expandafter\def\csname simpleicon@retropieicon\endcsname {\simpleiconsmap\symbol{"F314}} + \expandafter\def\csname simpleicon@revancedicon\endcsname {\simpleiconsmap\symbol{"F315}} + \expandafter\def\csname simpleicon@revealdotjsicon\endcsname {\simpleiconsmap\symbol{"F316}} + \expandafter\def\csname simpleicon@reverbnationicon\endcsname {\simpleiconsmap\symbol{"F317}} + \expandafter\def\csname simpleicon@revoltdotchaticon\endcsname {\simpleiconsmap\symbol{"F318}} + \expandafter\def\csname simpleicon@revoluticon\endcsname {\simpleiconsmap\symbol{"F319}} + \expandafter\def\csname simpleicon@revueicon\endcsname {\simpleiconsmap\symbol{"F31A}} + \expandafter\def\csname simpleicon@reweicon\endcsname {\simpleiconsmap\symbol{"F31B}} + \expandafter\def\csname simpleicon@rezgoicon\endcsname {\simpleiconsmap\symbol{"F31C}} + \expandafter\def\csname simpleicon@rhinocerosicon\endcsname {\simpleiconsmap\symbol{"F31D}} + \expandafter\def\csname simpleicon@richicon\endcsname {\simpleiconsmap\symbol{"F31E}} + \expandafter\def\csname simpleicon@ridericon\endcsname {\simpleiconsmap\symbol{"F31F}} + \expandafter\def\csname simpleicon@rimacautomobiliicon\endcsname {\simpleiconsmap\symbol{"F320}} + \expandafter\def\csname simpleicon@rimeicon\endcsname {\simpleiconsmap\symbol{"F321}} + \expandafter\def\csname simpleicon@ringicon\endcsname {\simpleiconsmap\symbol{"F322}} + \expandafter\def\csname simpleicon@riotgamesicon\endcsname {\simpleiconsmap\symbol{"F323}} + \expandafter\def\csname simpleicon@rippleicon\endcsname {\simpleiconsmap\symbol{"F324}} + \expandafter\def\csname simpleicon@riscvicon\endcsname {\simpleiconsmap\symbol{"F325}} + \expandafter\def\csname simpleicon@riseupicon\endcsname {\simpleiconsmap\symbol{"F326}} + \expandafter\def\csname simpleicon@ritzcarltonicon\endcsname {\simpleiconsmap\symbol{"F327}} + \expandafter\def\csname simpleicon@riveicon\endcsname {\simpleiconsmap\symbol{"F328}} + \expandafter\def\csname simpleicon@roadmapdotshicon\endcsname {\simpleiconsmap\symbol{"F329}} + \expandafter\def\csname simpleicon@roamresearchicon\endcsname {\simpleiconsmap\symbol{"F32A}} + \expandafter\def\csname simpleicon@robinhoodicon\endcsname {\simpleiconsmap\symbol{"F32B}} + \expandafter\def\csname simpleicon@robloxicon\endcsname {\simpleiconsmap\symbol{"F32C}} + \expandafter\def\csname simpleicon@robloxstudioicon\endcsname {\simpleiconsmap\symbol{"F32D}} + \expandafter\def\csname simpleicon@robotframeworkicon\endcsname {\simpleiconsmap\symbol{"F32E}} + \expandafter\def\csname simpleicon@rocketicon\endcsname {\simpleiconsmap\symbol{"F32F}} + \expandafter\def\csname simpleicon@rocketdotchaticon\endcsname {\simpleiconsmap\symbol{"F330}} + \expandafter\def\csname simpleicon@rocksdbicon\endcsname {\simpleiconsmap\symbol{"F331}} + \expandafter\def\csname simpleicon@rockstargamesicon\endcsname {\simpleiconsmap\symbol{"F332}} + \expandafter\def\csname simpleicon@rockwellautomationicon\endcsname {\simpleiconsmap\symbol{"F333}} + \expandafter\def\csname simpleicon@rockylinuxicon\endcsname {\simpleiconsmap\symbol{"F334}} + \expandafter\def\csname simpleicon@rokuicon\endcsname {\simpleiconsmap\symbol{"F335}} + \expandafter\def\csname simpleicon@roll20icon\endcsname {\simpleiconsmap\symbol{"F336}} + \expandafter\def\csname simpleicon@rollsroyceicon\endcsname {\simpleiconsmap\symbol{"F337}} + \expandafter\def\csname simpleicon@rollupdotjsicon\endcsname {\simpleiconsmap\symbol{"F338}} + \expandafter\def\csname simpleicon@roonicon\endcsname {\simpleiconsmap\symbol{"F339}} + \expandafter\def\csname simpleicon@rootmeicon\endcsname {\simpleiconsmap\symbol{"F33A}} + \expandafter\def\csname simpleicon@rootsicon\endcsname {\simpleiconsmap\symbol{"F33B}} + \expandafter\def\csname simpleicon@rootsbedrockicon\endcsname {\simpleiconsmap\symbol{"F33C}} + \expandafter\def\csname simpleicon@rootssageicon\endcsname {\simpleiconsmap\symbol{"F33D}} + \expandafter\def\csname simpleicon@rosicon\endcsname {\simpleiconsmap\symbol{"F33E}} + \expandafter\def\csname simpleicon@rossmannicon\endcsname {\simpleiconsmap\symbol{"F33F}} + \expandafter\def\csname simpleicon@rotaryinternationalicon\endcsname {\simpleiconsmap\symbol{"F340}} + \expandafter\def\csname simpleicon@rottentomatoesicon\endcsname {\simpleiconsmap\symbol{"F341}} + \expandafter\def\csname simpleicon@roundcubeicon\endcsname {\simpleiconsmap\symbol{"F342}} + \expandafter\def\csname simpleicon@rsocketicon\endcsname {\simpleiconsmap\symbol{"F343}} + \expandafter\def\csname simpleicon@rssicon\endcsname {\simpleiconsmap\symbol{"F344}} + \expandafter\def\csname simpleicon@rstudioideicon\endcsname {\simpleiconsmap\symbol{"F345}} + \expandafter\def\csname simpleicon@rteicon\endcsname {\simpleiconsmap\symbol{"F346}} + \expandafter\def\csname simpleicon@rtlicon\endcsname {\simpleiconsmap\symbol{"F347}} + \expandafter\def\csname simpleicon@rtlzweiicon\endcsname {\simpleiconsmap\symbol{"F348}} + \expandafter\def\csname simpleicon@rtmicon\endcsname {\simpleiconsmap\symbol{"F349}} + \expandafter\def\csname simpleicon@rubocopicon\endcsname {\simpleiconsmap\symbol{"F34A}} + \expandafter\def\csname simpleicon@rubyicon\endcsname {\simpleiconsmap\symbol{"F34B}} + \expandafter\def\csname simpleicon@rubygemsicon\endcsname {\simpleiconsmap\symbol{"F34C}} + \expandafter\def\csname simpleicon@rubymineicon\endcsname {\simpleiconsmap\symbol{"F34D}} + \expandafter\def\csname simpleicon@rubyonrailsicon\endcsname {\simpleiconsmap\symbol{"F34E}} + \expandafter\def\csname simpleicon@rubysinatraicon\endcsname {\simpleiconsmap\symbol{"F34F}} + \expandafter\def\csname simpleicon@rufficon\endcsname {\simpleiconsmap\symbol{"F350}} + \expandafter\def\csname simpleicon@rumahwebicon\endcsname {\simpleiconsmap\symbol{"F351}} + \expandafter\def\csname simpleicon@rumbleicon\endcsname {\simpleiconsmap\symbol{"F352}} + \expandafter\def\csname simpleicon@rundeckicon\endcsname {\simpleiconsmap\symbol{"F353}} + \expandafter\def\csname simpleicon@runkeepericon\endcsname {\simpleiconsmap\symbol{"F354}} + \expandafter\def\csname simpleicon@runkiticon\endcsname {\simpleiconsmap\symbol{"F355}} + \expandafter\def\csname simpleicon@runrundotiticon\endcsname {\simpleiconsmap\symbol{"F356}} + \expandafter\def\csname simpleicon@rusticon\endcsname {\simpleiconsmap\symbol{"F357}} + \expandafter\def\csname simpleicon@rustdeskicon\endcsname {\simpleiconsmap\symbol{"F358}} + \expandafter\def\csname simpleicon@rxdbicon\endcsname {\simpleiconsmap\symbol{"F359}} + \expandafter\def\csname simpleicon@ryanairicon\endcsname {\simpleiconsmap\symbol{"F35A}} + \expandafter\def\csname simpleicon@ryeicon\endcsname {\simpleiconsmap\symbol{"F35B}} + \expandafter\def\csname simpleicon@s7airlinesicon\endcsname {\simpleiconsmap\symbol{"F35C}} + \expandafter\def\csname simpleicon@sabanciicon\endcsname {\simpleiconsmap\symbol{"F35D}} + \expandafter\def\csname simpleicon@safariicon\endcsname {\simpleiconsmap\symbol{"F35E}} + \expandafter\def\csname simpleicon@sageicon\endcsname {\simpleiconsmap\symbol{"F35F}} + \expandafter\def\csname simpleicon@sahibindenicon\endcsname {\simpleiconsmap\symbol{"F360}} + \expandafter\def\csname simpleicon@sailfishosicon\endcsname {\simpleiconsmap\symbol{"F361}} + \expandafter\def\csname simpleicon@sailsdotjsicon\endcsname {\simpleiconsmap\symbol{"F362}} + \expandafter\def\csname simpleicon@salesforceicon\endcsname {\simpleiconsmap\symbol{"F363}} + \expandafter\def\csname simpleicon@sallaicon\endcsname {\simpleiconsmap\symbol{"F364}} + \expandafter\def\csname simpleicon@saltprojecticon\endcsname {\simpleiconsmap\symbol{"F365}} + \expandafter\def\csname simpleicon@samsclubicon\endcsname {\simpleiconsmap\symbol{"F366}} + \expandafter\def\csname simpleicon@samsungicon\endcsname {\simpleiconsmap\symbol{"F367}} + \expandafter\def\csname simpleicon@samsungpayicon\endcsname {\simpleiconsmap\symbol{"F368}} + \expandafter\def\csname simpleicon@sandiskicon\endcsname {\simpleiconsmap\symbol{"F369}} + \expandafter\def\csname simpleicon@sanfranciscomunicipalrailwayicon\endcsname {\simpleiconsmap\symbol{"F36A}} + \expandafter\def\csname simpleicon@sanicicon\endcsname {\simpleiconsmap\symbol{"F36B}} + \expandafter\def\csname simpleicon@sanityicon\endcsname {\simpleiconsmap\symbol{"F36C}} + \expandafter\def\csname simpleicon@saopaulometroicon\endcsname {\simpleiconsmap\symbol{"F36D}} + \expandafter\def\csname simpleicon@sapicon\endcsname {\simpleiconsmap\symbol{"F36E}} + \expandafter\def\csname simpleicon@sartoriusicon\endcsname {\simpleiconsmap\symbol{"F36F}} + \expandafter\def\csname simpleicon@sassicon\endcsname {\simpleiconsmap\symbol{"F370}} + \expandafter\def\csname simpleicon@sat1icon\endcsname {\simpleiconsmap\symbol{"F371}} + \expandafter\def\csname simpleicon@satelliteicon\endcsname {\simpleiconsmap\symbol{"F372}} + \expandafter\def\csname simpleicon@saturnicon\endcsname {\simpleiconsmap\symbol{"F373}} + \expandafter\def\csname simpleicon@saucelabsicon\endcsname {\simpleiconsmap\symbol{"F374}} + \expandafter\def\csname simpleicon@saudiaicon\endcsname {\simpleiconsmap\symbol{"F375}} + \expandafter\def\csname simpleicon@scalaicon\endcsname {\simpleiconsmap\symbol{"F376}} + \expandafter\def\csname simpleicon@scalewayicon\endcsname {\simpleiconsmap\symbol{"F377}} + \expandafter\def\csname simpleicon@scaniaicon\endcsname {\simpleiconsmap\symbol{"F378}} + \expandafter\def\csname simpleicon@schneiderelectricicon\endcsname {\simpleiconsmap\symbol{"F379}} + \expandafter\def\csname simpleicon@scikitlearnicon\endcsname {\simpleiconsmap\symbol{"F37A}} + \expandafter\def\csname simpleicon@scilabicon\endcsname {\simpleiconsmap\symbol{"F37B}} + \expandafter\def\csname simpleicon@scipyicon\endcsname {\simpleiconsmap\symbol{"F37C}} + \expandafter\def\csname simpleicon@scopusicon\endcsname {\simpleiconsmap\symbol{"F37D}} + \expandafter\def\csname simpleicon@scpfoundationicon\endcsname {\simpleiconsmap\symbol{"F37E}} + \expandafter\def\csname simpleicon@scrapboxicon\endcsname {\simpleiconsmap\symbol{"F37F}} + \expandafter\def\csname simpleicon@scrapyicon\endcsname {\simpleiconsmap\symbol{"F380}} + \expandafter\def\csname simpleicon@scratchicon\endcsname {\simpleiconsmap\symbol{"F381}} + \expandafter\def\csname simpleicon@screencastifyicon\endcsname {\simpleiconsmap\symbol{"F382}} + \expandafter\def\csname simpleicon@scribdicon\endcsname {\simpleiconsmap\symbol{"F383}} + \expandafter\def\csname simpleicon@scrimbaicon\endcsname {\simpleiconsmap\symbol{"F384}} + \expandafter\def\csname simpleicon@scrollrevealicon\endcsname {\simpleiconsmap\symbol{"F385}} + \expandafter\def\csname simpleicon@scrumallianceicon\endcsname {\simpleiconsmap\symbol{"F386}} + \expandafter\def\csname simpleicon@scrutinizerciicon\endcsname {\simpleiconsmap\symbol{"F387}} + \expandafter\def\csname simpleicon@scylladbicon\endcsname {\simpleiconsmap\symbol{"F388}} + \expandafter\def\csname simpleicon@seagateicon\endcsname {\simpleiconsmap\symbol{"F389}} + \expandafter\def\csname simpleicon@searxngicon\endcsname {\simpleiconsmap\symbol{"F38A}} + \expandafter\def\csname simpleicon@seaticon\endcsname {\simpleiconsmap\symbol{"F38B}} + \expandafter\def\csname simpleicon@seatgeekicon\endcsname {\simpleiconsmap\symbol{"F38C}} + \expandafter\def\csname simpleicon@securityscorecardicon\endcsname {\simpleiconsmap\symbol{"F38D}} + \expandafter\def\csname simpleicon@sefariaicon\endcsname {\simpleiconsmap\symbol{"F38E}} + \expandafter\def\csname simpleicon@segaicon\endcsname {\simpleiconsmap\symbol{"F38F}} + \expandafter\def\csname simpleicon@seleniumicon\endcsname {\simpleiconsmap\symbol{"F390}} + \expandafter\def\csname simpleicon@sellfyicon\endcsname {\simpleiconsmap\symbol{"F391}} + \expandafter\def\csname simpleicon@semanticreleaseicon\endcsname {\simpleiconsmap\symbol{"F392}} + \expandafter\def\csname simpleicon@semanticscholaricon\endcsname {\simpleiconsmap\symbol{"F393}} + \expandafter\def\csname simpleicon@semanticuiicon\endcsname {\simpleiconsmap\symbol{"F394}} + \expandafter\def\csname simpleicon@semanticuireacticon\endcsname {\simpleiconsmap\symbol{"F395}} + \expandafter\def\csname simpleicon@semanticwebicon\endcsname {\simpleiconsmap\symbol{"F396}} + \expandafter\def\csname simpleicon@semaphoreciicon\endcsname {\simpleiconsmap\symbol{"F397}} + \expandafter\def\csname simpleicon@semrushicon\endcsname {\simpleiconsmap\symbol{"F398}} + \expandafter\def\csname simpleicon@semvericon\endcsname {\simpleiconsmap\symbol{"F399}} + \expandafter\def\csname simpleicon@senchaicon\endcsname {\simpleiconsmap\symbol{"F39A}} + \expandafter\def\csname simpleicon@sennheisericon\endcsname {\simpleiconsmap\symbol{"F39B}} + \expandafter\def\csname simpleicon@sensuicon\endcsname {\simpleiconsmap\symbol{"F39C}} + \expandafter\def\csname simpleicon@sentryicon\endcsname {\simpleiconsmap\symbol{"F39D}} + \expandafter\def\csname simpleicon@sepaicon\endcsname {\simpleiconsmap\symbol{"F39E}} + \expandafter\def\csname simpleicon@sequelizeicon\endcsname {\simpleiconsmap\symbol{"F39F}} + \expandafter\def\csname simpleicon@serverfaulticon\endcsname {\simpleiconsmap\symbol{"F3A0}} + \expandafter\def\csname simpleicon@serverlessicon\endcsname {\simpleiconsmap\symbol{"F3A1}} + \expandafter\def\csname simpleicon@sessionicon\endcsname {\simpleiconsmap\symbol{"F3A2}} + \expandafter\def\csname simpleicon@sessionizeicon\endcsname {\simpleiconsmap\symbol{"F3A3}} + \expandafter\def\csname simpleicon@setappicon\endcsname {\simpleiconsmap\symbol{"F3A4}} + \expandafter\def\csname simpleicon@sfmlicon\endcsname {\simpleiconsmap\symbol{"F3A5}} + \expandafter\def\csname simpleicon@shadcnuiicon\endcsname {\simpleiconsmap\symbol{"F3A6}} + \expandafter\def\csname simpleicon@shadowicon\endcsname {\simpleiconsmap\symbol{"F3A7}} + \expandafter\def\csname simpleicon@shanghaimetroicon\endcsname {\simpleiconsmap\symbol{"F3A8}} + \expandafter\def\csname simpleicon@sharexicon\endcsname {\simpleiconsmap\symbol{"F3A9}} + \expandafter\def\csname simpleicon@sharpicon\endcsname {\simpleiconsmap\symbol{"F3AA}} + \expandafter\def\csname simpleicon@shazamicon\endcsname {\simpleiconsmap\symbol{"F3AB}} + \expandafter\def\csname simpleicon@shellicon\endcsname {\simpleiconsmap\symbol{"F3AC}} + \expandafter\def\csname simpleicon@shellyicon\endcsname {\simpleiconsmap\symbol{"F3AD}} + \expandafter\def\csname simpleicon@shenzhenmetroicon\endcsname {\simpleiconsmap\symbol{"F3AE}} + \expandafter\def\csname simpleicon@shieldsdotioicon\endcsname {\simpleiconsmap\symbol{"F3AF}} + \expandafter\def\csname simpleicon@shikimoriicon\endcsname {\simpleiconsmap\symbol{"F3B0}} + \expandafter\def\csname simpleicon@shopeeicon\endcsname {\simpleiconsmap\symbol{"F3B1}} + \expandafter\def\csname simpleicon@shopifyicon\endcsname {\simpleiconsmap\symbol{"F3B2}} + \expandafter\def\csname simpleicon@shopwareicon\endcsname {\simpleiconsmap\symbol{"F3B3}} + \expandafter\def\csname simpleicon@shortcuticon\endcsname {\simpleiconsmap\symbol{"F3B4}} + \expandafter\def\csname simpleicon@showpadicon\endcsname {\simpleiconsmap\symbol{"F3B5}} + \expandafter\def\csname simpleicon@showtimeicon\endcsname {\simpleiconsmap\symbol{"F3B6}} + \expandafter\def\csname simpleicon@showwcaseicon\endcsname {\simpleiconsmap\symbol{"F3B7}} + \expandafter\def\csname simpleicon@shutterstockicon\endcsname {\simpleiconsmap\symbol{"F3B8}} + \expandafter\def\csname simpleicon@sidekiqicon\endcsname {\simpleiconsmap\symbol{"F3B9}} + \expandafter\def\csname simpleicon@sidequesticon\endcsname {\simpleiconsmap\symbol{"F3BA}} + \expandafter\def\csname simpleicon@siemensicon\endcsname {\simpleiconsmap\symbol{"F3BB}} + \expandafter\def\csname simpleicon@sifiveicon\endcsname {\simpleiconsmap\symbol{"F3BC}} + \expandafter\def\csname simpleicon@signalicon\endcsname {\simpleiconsmap\symbol{"F3BD}} + \expandafter\def\csname simpleicon@similarwebicon\endcsname {\simpleiconsmap\symbol{"F3BE}} + \expandafter\def\csname simpleicon@simklicon\endcsname {\simpleiconsmap\symbol{"F3BF}} + \expandafter\def\csname simpleicon@simpleanalyticsicon\endcsname {\simpleiconsmap\symbol{"F3C0}} + \expandafter\def\csname simpleicon@simpleiconsicon\endcsname {\simpleiconsmap\symbol{"F3C1}} + \expandafter\def\csname simpleicon@simpleloginicon\endcsname {\simpleiconsmap\symbol{"F3C2}} + \expandafter\def\csname simpleicon@simplenoteicon\endcsname {\simpleiconsmap\symbol{"F3C3}} + \expandafter\def\csname simpleicon@sinaweiboicon\endcsname {\simpleiconsmap\symbol{"F3C4}} + \expandafter\def\csname simpleicon@singaporeairlinesicon\endcsname {\simpleiconsmap\symbol{"F3C5}} + \expandafter\def\csname simpleicon@singlestoreicon\endcsname {\simpleiconsmap\symbol{"F3C6}} + \expandafter\def\csname simpleicon@sitecoreicon\endcsname {\simpleiconsmap\symbol{"F3C7}} + \expandafter\def\csname simpleicon@sitepointicon\endcsname {\simpleiconsmap\symbol{"F3C8}} + \expandafter\def\csname simpleicon@siyuanicon\endcsname {\simpleiconsmap\symbol{"F3C9}} + \expandafter\def\csname simpleicon@skaffoldicon\endcsname {\simpleiconsmap\symbol{"F3CA}} + \expandafter\def\csname simpleicon@sketchicon\endcsname {\simpleiconsmap\symbol{"F3CB}} + \expandafter\def\csname simpleicon@sketchfabicon\endcsname {\simpleiconsmap\symbol{"F3CC}} + \expandafter\def\csname simpleicon@sketchupicon\endcsname {\simpleiconsmap\symbol{"F3CD}} + \expandafter\def\csname simpleicon@skillshareicon\endcsname {\simpleiconsmap\symbol{"F3CE}} + \expandafter\def\csname simpleicon@skodaicon\endcsname {\simpleiconsmap\symbol{"F3CF}} + \expandafter\def\csname simpleicon@skyicon\endcsname {\simpleiconsmap\symbol{"F3D0}} + \expandafter\def\csname simpleicon@skypackicon\endcsname {\simpleiconsmap\symbol{"F3D1}} + \expandafter\def\csname simpleicon@skyrockicon\endcsname {\simpleiconsmap\symbol{"F3D2}} + \expandafter\def\csname simpleicon@slackicon\endcsname {\simpleiconsmap\symbol{"F3D3}} + \expandafter\def\csname simpleicon@slackwareicon\endcsname {\simpleiconsmap\symbol{"F3D4}} + \expandafter\def\csname simpleicon@slashdoticon\endcsname {\simpleiconsmap\symbol{"F3D5}} + \expandafter\def\csname simpleicon@slickpicicon\endcsname {\simpleiconsmap\symbol{"F3D6}} + \expandafter\def\csname simpleicon@slidesicon\endcsname {\simpleiconsmap\symbol{"F3D7}} + \expandafter\def\csname simpleicon@slideshareicon\endcsname {\simpleiconsmap\symbol{"F3D8}} + \expandafter\def\csname simpleicon@slinticon\endcsname {\simpleiconsmap\symbol{"F3D9}} + \expandafter\def\csname simpleicon@smarticon\endcsname {\simpleiconsmap\symbol{"F3DA}} + \expandafter\def\csname simpleicon@smartthingsicon\endcsname {\simpleiconsmap\symbol{"F3DB}} + \expandafter\def\csname simpleicon@smashdotggicon\endcsname {\simpleiconsmap\symbol{"F3DC}} + \expandafter\def\csname simpleicon@smashingmagazineicon\endcsname {\simpleiconsmap\symbol{"F3DD}} + \expandafter\def\csname simpleicon@smrticon\endcsname {\simpleiconsmap\symbol{"F3DE}} + \expandafter\def\csname simpleicon@smugmugicon\endcsname {\simpleiconsmap\symbol{"F3DF}} + \expandafter\def\csname simpleicon@snapchaticon\endcsname {\simpleiconsmap\symbol{"F3E0}} + \expandafter\def\csname simpleicon@snapcrafticon\endcsname {\simpleiconsmap\symbol{"F3E1}} + \expandafter\def\csname simpleicon@sncficon\endcsname {\simpleiconsmap\symbol{"F3E2}} + \expandafter\def\csname simpleicon@snorticon\endcsname {\simpleiconsmap\symbol{"F3E3}} + \expandafter\def\csname simpleicon@snowflakeicon\endcsname {\simpleiconsmap\symbol{"F3E4}} + \expandafter\def\csname simpleicon@snowpackicon\endcsname {\simpleiconsmap\symbol{"F3E5}} + \expandafter\def\csname simpleicon@snykicon\endcsname {\simpleiconsmap\symbol{"F3E6}} + \expandafter\def\csname simpleicon@socialbladeicon\endcsname {\simpleiconsmap\symbol{"F3E7}} + \expandafter\def\csname simpleicon@society6icon\endcsname {\simpleiconsmap\symbol{"F3E8}} + \expandafter\def\csname simpleicon@socketdotioicon\endcsname {\simpleiconsmap\symbol{"F3E9}} + \expandafter\def\csname simpleicon@softpediaicon\endcsname {\simpleiconsmap\symbol{"F3EA}} + \expandafter\def\csname simpleicon@sogouicon\endcsname {\simpleiconsmap\symbol{"F3EB}} + \expandafter\def\csname simpleicon@solanaicon\endcsname {\simpleiconsmap\symbol{"F3EC}} + \expandafter\def\csname simpleicon@solidicon\endcsname {\simpleiconsmap\symbol{"F3ED}} + \expandafter\def\csname simpleicon@solidityicon\endcsname {\simpleiconsmap\symbol{"F3EE}} + \expandafter\def\csname simpleicon@sololearnicon\endcsname {\simpleiconsmap\symbol{"F3EF}} + \expandafter\def\csname simpleicon@solusicon\endcsname {\simpleiconsmap\symbol{"F3F0}} + \expandafter\def\csname simpleicon@sonaricon\endcsname {\simpleiconsmap\symbol{"F3F1}} + \expandafter\def\csname simpleicon@sonarcloudicon\endcsname {\simpleiconsmap\symbol{"F3F2}} + \expandafter\def\csname simpleicon@sonarlinticon\endcsname {\simpleiconsmap\symbol{"F3F3}} + \expandafter\def\csname simpleicon@sonarqubeicon\endcsname {\simpleiconsmap\symbol{"F3F4}} + \expandafter\def\csname simpleicon@sonarricon\endcsname {\simpleiconsmap\symbol{"F3F5}} + \expandafter\def\csname simpleicon@sonatypeicon\endcsname {\simpleiconsmap\symbol{"F3F6}} + \expandafter\def\csname simpleicon@songkickicon\endcsname {\simpleiconsmap\symbol{"F3F7}} + \expandafter\def\csname simpleicon@songodaicon\endcsname {\simpleiconsmap\symbol{"F3F8}} + \expandafter\def\csname simpleicon@sonicwallicon\endcsname {\simpleiconsmap\symbol{"F3F9}} + \expandafter\def\csname simpleicon@sonosicon\endcsname {\simpleiconsmap\symbol{"F3FA}} + \expandafter\def\csname simpleicon@sonyicon\endcsname {\simpleiconsmap\symbol{"F3FB}} + \expandafter\def\csname simpleicon@sorianaicon\endcsname {\simpleiconsmap\symbol{"F3FC}} + \expandafter\def\csname simpleicon@soundchartsicon\endcsname {\simpleiconsmap\symbol{"F3FD}} + \expandafter\def\csname simpleicon@soundcloudicon\endcsname {\simpleiconsmap\symbol{"F3FE}} + \expandafter\def\csname simpleicon@sourceengineicon\endcsname {\simpleiconsmap\symbol{"F3FF}} + \expandafter\def\csname simpleicon@sourceforgeicon\endcsname {\simpleiconsmap\symbol{"F400}} + \expandafter\def\csname simpleicon@sourcehuticon\endcsname {\simpleiconsmap\symbol{"F401}} + \expandafter\def\csname simpleicon@sourcetreeicon\endcsname {\simpleiconsmap\symbol{"F402}} + \expandafter\def\csname simpleicon@southwestairlinesicon\endcsname {\simpleiconsmap\symbol{"F403}} + \expandafter\def\csname simpleicon@spacemacsicon\endcsname {\simpleiconsmap\symbol{"F404}} + \expandafter\def\csname simpleicon@spaceshipicon\endcsname {\simpleiconsmap\symbol{"F405}} + \expandafter\def\csname simpleicon@spacexicon\endcsname {\simpleiconsmap\symbol{"F406}} + \expandafter\def\csname simpleicon@spacyicon\endcsname {\simpleiconsmap\symbol{"F407}} + \expandafter\def\csname simpleicon@sparkaricon\endcsname {\simpleiconsmap\symbol{"F408}} + \expandafter\def\csname simpleicon@sparkasseicon\endcsname {\simpleiconsmap\symbol{"F409}} + \expandafter\def\csname simpleicon@sparkfunicon\endcsname {\simpleiconsmap\symbol{"F40A}} + \expandafter\def\csname simpleicon@sparkposticon\endcsname {\simpleiconsmap\symbol{"F40B}} + \expandafter\def\csname simpleicon@spdxicon\endcsname {\simpleiconsmap\symbol{"F40C}} + \expandafter\def\csname simpleicon@speakerdeckicon\endcsname {\simpleiconsmap\symbol{"F40D}} + \expandafter\def\csname simpleicon@spectrumicon\endcsname {\simpleiconsmap\symbol{"F40E}} + \expandafter\def\csname simpleicon@speedtesticon\endcsname {\simpleiconsmap\symbol{"F40F}} + \expandafter\def\csname simpleicon@speedypageicon\endcsname {\simpleiconsmap\symbol{"F410}} + \expandafter\def\csname simpleicon@sphinxicon\endcsname {\simpleiconsmap\symbol{"F411}} + \expandafter\def\csname simpleicon@spigotmcicon\endcsname {\simpleiconsmap\symbol{"F412}} + \expandafter\def\csname simpleicon@spineicon\endcsname {\simpleiconsmap\symbol{"F413}} + \expandafter\def\csname simpleicon@spinnakericon\endcsname {\simpleiconsmap\symbol{"F414}} + \expandafter\def\csname simpleicon@spinrillaicon\endcsname {\simpleiconsmap\symbol{"F415}} + \expandafter\def\csname simpleicon@splunkicon\endcsname {\simpleiconsmap\symbol{"F416}} + \expandafter\def\csname simpleicon@spojicon\endcsname {\simpleiconsmap\symbol{"F417}} + \expandafter\def\csname simpleicon@spondicon\endcsname {\simpleiconsmap\symbol{"F418}} + \expandafter\def\csname simpleicon@spotifyicon\endcsname {\simpleiconsmap\symbol{"F419}} + \expandafter\def\csname simpleicon@spotlighticon\endcsname {\simpleiconsmap\symbol{"F41A}} + \expandafter\def\csname simpleicon@spreadshirticon\endcsname {\simpleiconsmap\symbol{"F41B}} + \expandafter\def\csname simpleicon@spreakericon\endcsname {\simpleiconsmap\symbol{"F41C}} + \expandafter\def\csname simpleicon@springicon\endcsname {\simpleiconsmap\symbol{"F41D}} + \expandafter\def\csname simpleicon@springcreatorsicon\endcsname {\simpleiconsmap\symbol{"F41E}} + \expandafter\def\csname simpleicon@springbooticon\endcsname {\simpleiconsmap\symbol{"F41F}} + \expandafter\def\csname simpleicon@springsecurityicon\endcsname {\simpleiconsmap\symbol{"F420}} + \expandafter\def\csname simpleicon@spyderideicon\endcsname {\simpleiconsmap\symbol{"F421}} + \expandafter\def\csname simpleicon@sqlalchemyicon\endcsname {\simpleiconsmap\symbol{"F422}} + \expandafter\def\csname simpleicon@sqliteicon\endcsname {\simpleiconsmap\symbol{"F423}} + \expandafter\def\csname simpleicon@squareicon\endcsname {\simpleiconsmap\symbol{"F424}} + \expandafter\def\csname simpleicon@squareenixicon\endcsname {\simpleiconsmap\symbol{"F425}} + \expandafter\def\csname simpleicon@squarespaceicon\endcsname {\simpleiconsmap\symbol{"F426}} + \expandafter\def\csname simpleicon@srgssricon\endcsname {\simpleiconsmap\symbol{"F427}} + \expandafter\def\csname simpleicon@ssrnicon\endcsname {\simpleiconsmap\symbol{"F428}} + \expandafter\def\csname simpleicon@ssticon\endcsname {\simpleiconsmap\symbol{"F429}} + \expandafter\def\csname simpleicon@stackbiticon\endcsname {\simpleiconsmap\symbol{"F42A}} + \expandafter\def\csname simpleicon@stackblitzicon\endcsname {\simpleiconsmap\symbol{"F42B}} + \expandafter\def\csname simpleicon@stackediticon\endcsname {\simpleiconsmap\symbol{"F42C}} + \expandafter\def\csname simpleicon@stackexchangeicon\endcsname {\simpleiconsmap\symbol{"F42D}} + \expandafter\def\csname simpleicon@stackhawkicon\endcsname {\simpleiconsmap\symbol{"F42E}} + \expandafter\def\csname simpleicon@stackoverflowicon\endcsname {\simpleiconsmap\symbol{"F42F}} + \expandafter\def\csname simpleicon@stackpathicon\endcsname {\simpleiconsmap\symbol{"F430}} + \expandafter\def\csname simpleicon@stackshareicon\endcsname {\simpleiconsmap\symbol{"F431}} + \expandafter\def\csname simpleicon@stadiaicon\endcsname {\simpleiconsmap\symbol{"F432}} + \expandafter\def\csname simpleicon@staffbaseicon\endcsname {\simpleiconsmap\symbol{"F433}} + \expandafter\def\csname simpleicon@stagetimericon\endcsname {\simpleiconsmap\symbol{"F434}} + \expandafter\def\csname simpleicon@standardjsicon\endcsname {\simpleiconsmap\symbol{"F435}} + \expandafter\def\csname simpleicon@standardresumeicon\endcsname {\simpleiconsmap\symbol{"F436}} + \expandafter\def\csname simpleicon@starbucksicon\endcsname {\simpleiconsmap\symbol{"F437}} + \expandafter\def\csname simpleicon@stardockicon\endcsname {\simpleiconsmap\symbol{"F438}} + \expandafter\def\csname simpleicon@starlingbankicon\endcsname {\simpleiconsmap\symbol{"F439}} + \expandafter\def\csname simpleicon@starshipicon\endcsname {\simpleiconsmap\symbol{"F43A}} + \expandafter\def\csname simpleicon@startrekicon\endcsname {\simpleiconsmap\symbol{"F43B}} + \expandafter\def\csname simpleicon@starzicon\endcsname {\simpleiconsmap\symbol{"F43C}} + \expandafter\def\csname simpleicon@statamicicon\endcsname {\simpleiconsmap\symbol{"F43D}} + \expandafter\def\csname simpleicon@statistaicon\endcsname {\simpleiconsmap\symbol{"F43E}} + \expandafter\def\csname simpleicon@statuspageicon\endcsname {\simpleiconsmap\symbol{"F43F}} + \expandafter\def\csname simpleicon@statuspalicon\endcsname {\simpleiconsmap\symbol{"F440}} + \expandafter\def\csname simpleicon@steamicon\endcsname {\simpleiconsmap\symbol{"F441}} + \expandafter\def\csname simpleicon@steamdbicon\endcsname {\simpleiconsmap\symbol{"F442}} + \expandafter\def\csname simpleicon@steamdeckicon\endcsname {\simpleiconsmap\symbol{"F443}} + \expandafter\def\csname simpleicon@steamworksicon\endcsname {\simpleiconsmap\symbol{"F444}} + \expandafter\def\csname simpleicon@steelseriesicon\endcsname {\simpleiconsmap\symbol{"F445}} + \expandafter\def\csname simpleicon@steemicon\endcsname {\simpleiconsmap\symbol{"F446}} + \expandafter\def\csname simpleicon@steemiticon\endcsname {\simpleiconsmap\symbol{"F447}} + \expandafter\def\csname simpleicon@steinbergicon\endcsname {\simpleiconsmap\symbol{"F448}} + \expandafter\def\csname simpleicon@stellaricon\endcsname {\simpleiconsmap\symbol{"F449}} + \expandafter\def\csname simpleicon@stencilicon\endcsname {\simpleiconsmap\symbol{"F44A}} + \expandafter\def\csname simpleicon@stencylicon\endcsname {\simpleiconsmap\symbol{"F44B}} + \expandafter\def\csname simpleicon@stimulusicon\endcsname {\simpleiconsmap\symbol{"F44C}} + \expandafter\def\csname simpleicon@stitchericon\endcsname {\simpleiconsmap\symbol{"F44D}} + \expandafter\def\csname simpleicon@stmicroelectronicsicon\endcsname {\simpleiconsmap\symbol{"F44E}} + \expandafter\def\csname simpleicon@stockxicon\endcsname {\simpleiconsmap\symbol{"F44F}} + \expandafter\def\csname simpleicon@stopstalkicon\endcsname {\simpleiconsmap\symbol{"F450}} + \expandafter\def\csname simpleicon@storyblokicon\endcsname {\simpleiconsmap\symbol{"F451}} + \expandafter\def\csname simpleicon@storybookicon\endcsname {\simpleiconsmap\symbol{"F452}} + \expandafter\def\csname simpleicon@strapiicon\endcsname {\simpleiconsmap\symbol{"F453}} + \expandafter\def\csname simpleicon@stravaicon\endcsname {\simpleiconsmap\symbol{"F454}} + \expandafter\def\csname simpleicon@streamlabsicon\endcsname {\simpleiconsmap\symbol{"F455}} + \expandafter\def\csname simpleicon@streamliticon\endcsname {\simpleiconsmap\symbol{"F456}} + \expandafter\def\csname simpleicon@streamrunnersicon\endcsname {\simpleiconsmap\symbol{"F457}} + \expandafter\def\csname simpleicon@stripeicon\endcsname {\simpleiconsmap\symbol{"F458}} + \expandafter\def\csname simpleicon@strongswanicon\endcsname {\simpleiconsmap\symbol{"F459}} + \expandafter\def\csname simpleicon@strykericon\endcsname {\simpleiconsmap\symbol{"F45A}} + \expandafter\def\csname simpleicon@stubhubicon\endcsname {\simpleiconsmap\symbol{"F45B}} + \expandafter\def\csname simpleicon@studio3ticon\endcsname {\simpleiconsmap\symbol{"F45C}} + \expandafter\def\csname simpleicon@studyverseicon\endcsname {\simpleiconsmap\symbol{"F45D}} + \expandafter\def\csname simpleicon@styledcomponentsicon\endcsname {\simpleiconsmap\symbol{"F45E}} + \expandafter\def\csname simpleicon@stylelinticon\endcsname {\simpleiconsmap\symbol{"F45F}} + \expandafter\def\csname simpleicon@styleshareicon\endcsname {\simpleiconsmap\symbol{"F460}} + \expandafter\def\csname simpleicon@stylusicon\endcsname {\simpleiconsmap\symbol{"F461}} + \expandafter\def\csname simpleicon@subaruicon\endcsname {\simpleiconsmap\symbol{"F462}} + \expandafter\def\csname simpleicon@sublimetexticon\endcsname {\simpleiconsmap\symbol{"F463}} + \expandafter\def\csname simpleicon@substackicon\endcsname {\simpleiconsmap\symbol{"F464}} + \expandafter\def\csname simpleicon@subtitleediticon\endcsname {\simpleiconsmap\symbol{"F465}} + \expandafter\def\csname simpleicon@subversionicon\endcsname {\simpleiconsmap\symbol{"F466}} + \expandafter\def\csname simpleicon@sucklessicon\endcsname {\simpleiconsmap\symbol{"F467}} + \expandafter\def\csname simpleicon@sumologicicon\endcsname {\simpleiconsmap\symbol{"F468}} + \expandafter\def\csname simpleicon@sunoicon\endcsname {\simpleiconsmap\symbol{"F469}} + \expandafter\def\csname simpleicon@sunriseicon\endcsname {\simpleiconsmap\symbol{"F46A}} + \expandafter\def\csname simpleicon@supabaseicon\endcsname {\simpleiconsmap\symbol{"F46B}} + \expandafter\def\csname simpleicon@supercreaseicon\endcsname {\simpleiconsmap\symbol{"F46C}} + \expandafter\def\csname simpleicon@supermicroicon\endcsname {\simpleiconsmap\symbol{"F46D}} + \expandafter\def\csname simpleicon@superusericon\endcsname {\simpleiconsmap\symbol{"F46E}} + \expandafter\def\csname simpleicon@surrealdbicon\endcsname {\simpleiconsmap\symbol{"F46F}} + \expandafter\def\csname simpleicon@surveymonkeyicon\endcsname {\simpleiconsmap\symbol{"F470}} + \expandafter\def\csname simpleicon@suseicon\endcsname {\simpleiconsmap\symbol{"F471}} + \expandafter\def\csname simpleicon@suzukiicon\endcsname {\simpleiconsmap\symbol{"F472}} + \expandafter\def\csname simpleicon@svelteicon\endcsname {\simpleiconsmap\symbol{"F473}} + \expandafter\def\csname simpleicon@svgicon\endcsname {\simpleiconsmap\symbol{"F474}} + \expandafter\def\csname simpleicon@svgdotjsicon\endcsname {\simpleiconsmap\symbol{"F475}} + \expandafter\def\csname simpleicon@svgoicon\endcsname {\simpleiconsmap\symbol{"F476}} + \expandafter\def\csname simpleicon@swaggericon\endcsname {\simpleiconsmap\symbol{"F477}} + \expandafter\def\csname simpleicon@swarmicon\endcsname {\simpleiconsmap\symbol{"F478}} + \expandafter\def\csname simpleicon@swcicon\endcsname {\simpleiconsmap\symbol{"F479}} + \expandafter\def\csname simpleicon@swifticon\endcsname {\simpleiconsmap\symbol{"F47A}} + \expandafter\def\csname simpleicon@swiggyicon\endcsname {\simpleiconsmap\symbol{"F47B}} + \expandafter\def\csname simpleicon@swipericon\endcsname {\simpleiconsmap\symbol{"F47C}} + \expandafter\def\csname simpleicon@swricon\endcsname {\simpleiconsmap\symbol{"F47D}} + \expandafter\def\csname simpleicon@symantecicon\endcsname {\simpleiconsmap\symbol{"F47E}} + \expandafter\def\csname simpleicon@symbolabicon\endcsname {\simpleiconsmap\symbol{"F47F}} + \expandafter\def\csname simpleicon@symfonyicon\endcsname {\simpleiconsmap\symbol{"F480}} + \expandafter\def\csname simpleicon@symphonyicon\endcsname {\simpleiconsmap\symbol{"F481}} + \expandafter\def\csname simpleicon@sympyicon\endcsname {\simpleiconsmap\symbol{"F482}} + \expandafter\def\csname simpleicon@syncthingicon\endcsname {\simpleiconsmap\symbol{"F483}} + \expandafter\def\csname simpleicon@synologyicon\endcsname {\simpleiconsmap\symbol{"F484}} + \expandafter\def\csname simpleicon@system76icon\endcsname {\simpleiconsmap\symbol{"F485}} + \expandafter\def\csname simpleicon@tabelogicon\endcsname {\simpleiconsmap\symbol{"F486}} + \expandafter\def\csname simpleicon@tableauicon\endcsname {\simpleiconsmap\symbol{"F487}} + \expandafter\def\csname simpleicon@tablecheckicon\endcsname {\simpleiconsmap\symbol{"F488}} + \expandafter\def\csname simpleicon@tacobellicon\endcsname {\simpleiconsmap\symbol{"F489}} + \expandafter\def\csname simpleicon@tadoicon\endcsname {\simpleiconsmap\symbol{"F48A}} + \expandafter\def\csname simpleicon@taichigraphicsicon\endcsname {\simpleiconsmap\symbol{"F48B}} + \expandafter\def\csname simpleicon@taichilangicon\endcsname {\simpleiconsmap\symbol{"F48C}} + \expandafter\def\csname simpleicon@tailsicon\endcsname {\simpleiconsmap\symbol{"F48D}} + \expandafter\def\csname simpleicon@tailscaleicon\endcsname {\simpleiconsmap\symbol{"F48E}} + \expandafter\def\csname simpleicon@tailwindcssicon\endcsname {\simpleiconsmap\symbol{"F48F}} + \expandafter\def\csname simpleicon@taipyicon\endcsname {\simpleiconsmap\symbol{"F490}} + \expandafter\def\csname simpleicon@taketwointeractivesoftwareicon\endcsname {\simpleiconsmap\symbol{"F491}} + \expandafter\def\csname simpleicon@talendicon\endcsname {\simpleiconsmap\symbol{"F492}} + \expandafter\def\csname simpleicon@talenthouseicon\endcsname {\simpleiconsmap\symbol{"F493}} + \expandafter\def\csname simpleicon@talosicon\endcsname {\simpleiconsmap\symbol{"F494}} + \expandafter\def\csname simpleicon@tamiyaicon\endcsname {\simpleiconsmap\symbol{"F495}} + \expandafter\def\csname simpleicon@tampermonkeyicon\endcsname {\simpleiconsmap\symbol{"F496}} + \expandafter\def\csname simpleicon@taobaoicon\endcsname {\simpleiconsmap\symbol{"F497}} + \expandafter\def\csname simpleicon@tapasicon\endcsname {\simpleiconsmap\symbol{"F498}} + \expandafter\def\csname simpleicon@targeticon\endcsname {\simpleiconsmap\symbol{"F499}} + \expandafter\def\csname simpleicon@taskicon\endcsname {\simpleiconsmap\symbol{"F49A}} + \expandafter\def\csname simpleicon@tasmotaicon\endcsname {\simpleiconsmap\symbol{"F49B}} + \expandafter\def\csname simpleicon@tataicon\endcsname {\simpleiconsmap\symbol{"F49C}} + \expandafter\def\csname simpleicon@tauriicon\endcsname {\simpleiconsmap\symbol{"F49D}} + \expandafter\def\csname simpleicon@taxbuzzicon\endcsname {\simpleiconsmap\symbol{"F49E}} + \expandafter\def\csname simpleicon@tcsicon\endcsname {\simpleiconsmap\symbol{"F49F}} + \expandafter\def\csname simpleicon@tealicon\endcsname {\simpleiconsmap\symbol{"F4A0}} + \expandafter\def\csname simpleicon@teamcityicon\endcsname {\simpleiconsmap\symbol{"F4A1}} + \expandafter\def\csname simpleicon@teamspeakicon\endcsname {\simpleiconsmap\symbol{"F4A2}} + \expandafter\def\csname simpleicon@teamviewericon\endcsname {\simpleiconsmap\symbol{"F4A3}} + \expandafter\def\csname simpleicon@techcrunchicon\endcsname {\simpleiconsmap\symbol{"F4A4}} + \expandafter\def\csname simpleicon@tedicon\endcsname {\simpleiconsmap\symbol{"F4A5}} + \expandafter\def\csname simpleicon@teepublicicon\endcsname {\simpleiconsmap\symbol{"F4A6}} + \expandafter\def\csname simpleicon@teespringicon\endcsname {\simpleiconsmap\symbol{"F4A7}} + \expandafter\def\csname simpleicon@tektonicon\endcsname {\simpleiconsmap\symbol{"F4A8}} + \expandafter\def\csname simpleicon@tele5icon\endcsname {\simpleiconsmap\symbol{"F4A9}} + \expandafter\def\csname simpleicon@telegramicon\endcsname {\simpleiconsmap\symbol{"F4AA}} + \expandafter\def\csname simpleicon@telegraphicon\endcsname {\simpleiconsmap\symbol{"F4AB}} + \expandafter\def\csname simpleicon@telequebecicon\endcsname {\simpleiconsmap\symbol{"F4AC}} + \expandafter\def\csname simpleicon@temporalicon\endcsname {\simpleiconsmap\symbol{"F4AD}} + \expandafter\def\csname simpleicon@tencentqqicon\endcsname {\simpleiconsmap\symbol{"F4AE}} + \expandafter\def\csname simpleicon@tensorflowicon\endcsname {\simpleiconsmap\symbol{"F4AF}} + \expandafter\def\csname simpleicon@teradataicon\endcsname {\simpleiconsmap\symbol{"F4B0}} + \expandafter\def\csname simpleicon@teratailicon\endcsname {\simpleiconsmap\symbol{"F4B1}} + \expandafter\def\csname simpleicon@termiusicon\endcsname {\simpleiconsmap\symbol{"F4B2}} + \expandafter\def\csname simpleicon@terraformicon\endcsname {\simpleiconsmap\symbol{"F4B3}} + \expandafter\def\csname simpleicon@tescoicon\endcsname {\simpleiconsmap\symbol{"F4B4}} + \expandafter\def\csname simpleicon@teslaicon\endcsname {\simpleiconsmap\symbol{"F4B5}} + \expandafter\def\csname simpleicon@testcafeicon\endcsname {\simpleiconsmap\symbol{"F4B6}} + \expandafter\def\csname simpleicon@testinicon\endcsname {\simpleiconsmap\symbol{"F4B7}} + \expandafter\def\csname simpleicon@testinglibraryicon\endcsname {\simpleiconsmap\symbol{"F4B8}} + \expandafter\def\csname simpleicon@testrailicon\endcsname {\simpleiconsmap\symbol{"F4B9}} + \expandafter\def\csname simpleicon@tethericon\endcsname {\simpleiconsmap\symbol{"F4BA}} + \expandafter\def\csname simpleicon@textpatternicon\endcsname {\simpleiconsmap\symbol{"F4BB}} + \expandafter\def\csname simpleicon@tgaicon\endcsname {\simpleiconsmap\symbol{"F4BC}} + \expandafter\def\csname simpleicon@thangsicon\endcsname {\simpleiconsmap\symbol{"F4BD}} + \expandafter\def\csname simpleicon@thanosicon\endcsname {\simpleiconsmap\symbol{"F4BE}} + \expandafter\def\csname simpleicon@thealgorithmsicon\endcsname {\simpleiconsmap\symbol{"F4BF}} + \expandafter\def\csname simpleicon@theboringcompanyicon\endcsname {\simpleiconsmap\symbol{"F4C0}} + \expandafter\def\csname simpleicon@theconversationicon\endcsname {\simpleiconsmap\symbol{"F4C1}} + \expandafter\def\csname simpleicon@thefinalsicon\endcsname {\simpleiconsmap\symbol{"F4C2}} + \expandafter\def\csname simpleicon@theirishtimesicon\endcsname {\simpleiconsmap\symbol{"F4C3}} + \expandafter\def\csname simpleicon@themightyicon\endcsname {\simpleiconsmap\symbol{"F4C4}} + \expandafter\def\csname simpleicon@themodelsresourceicon\endcsname {\simpleiconsmap\symbol{"F4C5}} + \expandafter\def\csname simpleicon@themoviedatabaseicon\endcsname {\simpleiconsmap\symbol{"F4C6}} + \expandafter\def\csname simpleicon@thenorthfaceicon\endcsname {\simpleiconsmap\symbol{"F4C7}} + \expandafter\def\csname simpleicon@theodinprojecticon\endcsname {\simpleiconsmap\symbol{"F4C8}} + \expandafter\def\csname simpleicon@theregistericon\endcsname {\simpleiconsmap\symbol{"F4C9}} + \expandafter\def\csname simpleicon@thesoundsresourceicon\endcsname {\simpleiconsmap\symbol{"F4CA}} + \expandafter\def\csname simpleicon@thespritersresourceicon\endcsname {\simpleiconsmap\symbol{"F4CB}} + \expandafter\def\csname simpleicon@thewashingtonposticon\endcsname {\simpleiconsmap\symbol{"F4CC}} + \expandafter\def\csname simpleicon@thingiverseicon\endcsname {\simpleiconsmap\symbol{"F4CD}} + \expandafter\def\csname simpleicon@thinkpadicon\endcsname {\simpleiconsmap\symbol{"F4CE}} + \expandafter\def\csname simpleicon@thirdwebicon\endcsname {\simpleiconsmap\symbol{"F4CF}} + \expandafter\def\csname simpleicon@threadlessicon\endcsname {\simpleiconsmap\symbol{"F4D0}} + \expandafter\def\csname simpleicon@threadsicon\endcsname {\simpleiconsmap\symbol{"F4D1}} + \expandafter\def\csname simpleicon@threedotjsicon\endcsname {\simpleiconsmap\symbol{"F4D2}} + \expandafter\def\csname simpleicon@threemaicon\endcsname {\simpleiconsmap\symbol{"F4D3}} + \expandafter\def\csname simpleicon@thumbtackicon\endcsname {\simpleiconsmap\symbol{"F4D4}} + \expandafter\def\csname simpleicon@thunderbirdicon\endcsname {\simpleiconsmap\symbol{"F4D5}} + \expandafter\def\csname simpleicon@thunderstoreicon\endcsname {\simpleiconsmap\symbol{"F4D6}} + \expandafter\def\csname simpleicon@thurgauerkantonalbankicon\endcsname {\simpleiconsmap\symbol{"F4D7}} + \expandafter\def\csname simpleicon@thymeleaficon\endcsname {\simpleiconsmap\symbol{"F4D8}} + \expandafter\def\csname simpleicon@ticketmastericon\endcsname {\simpleiconsmap\symbol{"F4D9}} + \expandafter\def\csname simpleicon@ticktickicon\endcsname {\simpleiconsmap\symbol{"F4DA}} + \expandafter\def\csname simpleicon@tidalicon\endcsname {\simpleiconsmap\symbol{"F4DB}} + \expandafter\def\csname simpleicon@tiddlywikiicon\endcsname {\simpleiconsmap\symbol{"F4DC}} + \expandafter\def\csname simpleicon@tideicon\endcsname {\simpleiconsmap\symbol{"F4DD}} + \expandafter\def\csname simpleicon@tidyverseicon\endcsname {\simpleiconsmap\symbol{"F4DE}} + \expandafter\def\csname simpleicon@tietoevryicon\endcsname {\simpleiconsmap\symbol{"F4DF}} + \expandafter\def\csname simpleicon@tiktokicon\endcsname {\simpleiconsmap\symbol{"F4E0}} + \expandafter\def\csname simpleicon@tildapublishingicon\endcsname {\simpleiconsmap\symbol{"F4E1}} + \expandafter\def\csname simpleicon@tileicon\endcsname {\simpleiconsmap\symbol{"F4E2}} + \expandafter\def\csname simpleicon@timescaleicon\endcsname {\simpleiconsmap\symbol{"F4E3}} + \expandafter\def\csname simpleicon@tinaicon\endcsname {\simpleiconsmap\symbol{"F4E4}} + \expandafter\def\csname simpleicon@tindericon\endcsname {\simpleiconsmap\symbol{"F4E5}} + \expandafter\def\csname simpleicon@tindieicon\endcsname {\simpleiconsmap\symbol{"F4E6}} + \expandafter\def\csname simpleicon@tinkercadicon\endcsname {\simpleiconsmap\symbol{"F4E7}} + \expandafter\def\csname simpleicon@tinygradicon\endcsname {\simpleiconsmap\symbol{"F4E8}} + \expandafter\def\csname simpleicon@tinylettericon\endcsname {\simpleiconsmap\symbol{"F4E9}} + \expandafter\def\csname simpleicon@tistoryicon\endcsname {\simpleiconsmap\symbol{"F4EA}} + \expandafter\def\csname simpleicon@tldrawicon\endcsname {\simpleiconsmap\symbol{"F4EB}} + \expandafter\def\csname simpleicon@tmobileicon\endcsname {\simpleiconsmap\symbol{"F4EC}} + \expandafter\def\csname simpleicon@tmuxicon\endcsname {\simpleiconsmap\symbol{"F4ED}} + \expandafter\def\csname simpleicon@todoisticon\endcsname {\simpleiconsmap\symbol{"F4EE}} + \expandafter\def\csname simpleicon@togglicon\endcsname {\simpleiconsmap\symbol{"F4EF}} + \expandafter\def\csname simpleicon@toggltrackicon\endcsname {\simpleiconsmap\symbol{"F4F0}} + \expandafter\def\csname simpleicon@tokyometroicon\endcsname {\simpleiconsmap\symbol{"F4F1}} + \expandafter\def\csname simpleicon@tollicon\endcsname {\simpleiconsmap\symbol{"F4F2}} + \expandafter\def\csname simpleicon@tomlicon\endcsname {\simpleiconsmap\symbol{"F4F3}} + \expandafter\def\csname simpleicon@tomorrowlandicon\endcsname {\simpleiconsmap\symbol{"F4F4}} + \expandafter\def\csname simpleicon@tonicon\endcsname {\simpleiconsmap\symbol{"F4F5}} + \expandafter\def\csname simpleicon@topcodericon\endcsname {\simpleiconsmap\symbol{"F4F6}} + \expandafter\def\csname simpleicon@topdotggicon\endcsname {\simpleiconsmap\symbol{"F4F7}} + \expandafter\def\csname simpleicon@toptalicon\endcsname {\simpleiconsmap\symbol{"F4F8}} + \expandafter\def\csname simpleicon@torbrowsericon\endcsname {\simpleiconsmap\symbol{"F4F9}} + \expandafter\def\csname simpleicon@torprojecticon\endcsname {\simpleiconsmap\symbol{"F4FA}} + \expandafter\def\csname simpleicon@toshibaicon\endcsname {\simpleiconsmap\symbol{"F4FB}} + \expandafter\def\csname simpleicon@totvsicon\endcsname {\simpleiconsmap\symbol{"F4FC}} + \expandafter\def\csname simpleicon@tourboxicon\endcsname {\simpleiconsmap\symbol{"F4FD}} + \expandafter\def\csname simpleicon@towericon\endcsname {\simpleiconsmap\symbol{"F4FE}} + \expandafter\def\csname simpleicon@toyotaicon\endcsname {\simpleiconsmap\symbol{"F4FF}} + \expandafter\def\csname simpleicon@tplinkicon\endcsname {\simpleiconsmap\symbol{"F500}} + \expandafter\def\csname simpleicon@tqdmicon\endcsname {\simpleiconsmap\symbol{"F501}} + \expandafter\def\csname simpleicon@traccaricon\endcsname {\simpleiconsmap\symbol{"F502}} + \expandafter\def\csname simpleicon@tradingviewicon\endcsname {\simpleiconsmap\symbol{"F503}} + \expandafter\def\csname simpleicon@traefikmeshicon\endcsname {\simpleiconsmap\symbol{"F504}} + \expandafter\def\csname simpleicon@traefikproxyicon\endcsname {\simpleiconsmap\symbol{"F505}} + \expandafter\def\csname simpleicon@trailforksicon\endcsname {\simpleiconsmap\symbol{"F506}} + \expandafter\def\csname simpleicon@trainerroadicon\endcsname {\simpleiconsmap\symbol{"F507}} + \expandafter\def\csname simpleicon@trakticon\endcsname {\simpleiconsmap\symbol{"F508}} + \expandafter\def\csname simpleicon@transifexicon\endcsname {\simpleiconsmap\symbol{"F509}} + \expandafter\def\csname simpleicon@transmissionicon\endcsname {\simpleiconsmap\symbol{"F50A}} + \expandafter\def\csname simpleicon@transportforirelandicon\endcsname {\simpleiconsmap\symbol{"F50B}} + \expandafter\def\csname simpleicon@transportforlondonicon\endcsname {\simpleiconsmap\symbol{"F50C}} + \expandafter\def\csname simpleicon@travisciicon\endcsname {\simpleiconsmap\symbol{"F50D}} + \expandafter\def\csname simpleicon@treehouseicon\endcsname {\simpleiconsmap\symbol{"F50E}} + \expandafter\def\csname simpleicon@trelloicon\endcsname {\simpleiconsmap\symbol{"F50F}} + \expandafter\def\csname simpleicon@trendmicroicon\endcsname {\simpleiconsmap\symbol{"F510}} + \expandafter\def\csname simpleicon@treyarchicon\endcsname {\simpleiconsmap\symbol{"F511}} + \expandafter\def\csname simpleicon@tricentisicon\endcsname {\simpleiconsmap\symbol{"F512}} + \expandafter\def\csname simpleicon@triliumicon\endcsname {\simpleiconsmap\symbol{"F513}} + \expandafter\def\csname simpleicon@trillericon\endcsname {\simpleiconsmap\symbol{"F514}} + \expandafter\def\csname simpleicon@trillertvicon\endcsname {\simpleiconsmap\symbol{"F515}} + \expandafter\def\csname simpleicon@trinoicon\endcsname {\simpleiconsmap\symbol{"F516}} + \expandafter\def\csname simpleicon@tripadvisoricon\endcsname {\simpleiconsmap\symbol{"F517}} + \expandafter\def\csname simpleicon@tripdotcomicon\endcsname {\simpleiconsmap\symbol{"F518}} + \expandafter\def\csname simpleicon@trivagoicon\endcsname {\simpleiconsmap\symbol{"F519}} + \expandafter\def\csname simpleicon@trivyicon\endcsname {\simpleiconsmap\symbol{"F51A}} + \expandafter\def\csname simpleicon@troveicon\endcsname {\simpleiconsmap\symbol{"F51B}} + \expandafter\def\csname simpleicon@trpcicon\endcsname {\simpleiconsmap\symbol{"F51C}} + \expandafter\def\csname simpleicon@truenasicon\endcsname {\simpleiconsmap\symbol{"F51D}} + \expandafter\def\csname simpleicon@trueupicon\endcsname {\simpleiconsmap\symbol{"F51E}} + \expandafter\def\csname simpleicon@truliaicon\endcsname {\simpleiconsmap\symbol{"F51F}} + \expandafter\def\csname simpleicon@trustedshopsicon\endcsname {\simpleiconsmap\symbol{"F520}} + \expandafter\def\csname simpleicon@trustpiloticon\endcsname {\simpleiconsmap\symbol{"F521}} + \expandafter\def\csname simpleicon@tryhackmeicon\endcsname {\simpleiconsmap\symbol{"F522}} + \expandafter\def\csname simpleicon@tryitonlineicon\endcsname {\simpleiconsmap\symbol{"F523}} + \expandafter\def\csname simpleicon@tsnodeicon\endcsname {\simpleiconsmap\symbol{"F524}} + \expandafter\def\csname simpleicon@tubiicon\endcsname {\simpleiconsmap\symbol{"F525}} + \expandafter\def\csname simpleicon@tuiicon\endcsname {\simpleiconsmap\symbol{"F526}} + \expandafter\def\csname simpleicon@tumblricon\endcsname {\simpleiconsmap\symbol{"F527}} + \expandafter\def\csname simpleicon@tuneinicon\endcsname {\simpleiconsmap\symbol{"F528}} + \expandafter\def\csname simpleicon@turboicon\endcsname {\simpleiconsmap\symbol{"F529}} + \expandafter\def\csname simpleicon@turborepoicon\endcsname {\simpleiconsmap\symbol{"F52A}} + \expandafter\def\csname simpleicon@turbosquidicon\endcsname {\simpleiconsmap\symbol{"F52B}} + \expandafter\def\csname simpleicon@turkishairlinesicon\endcsname {\simpleiconsmap\symbol{"F52C}} + \expandafter\def\csname simpleicon@tursoicon\endcsname {\simpleiconsmap\symbol{"F52D}} + \expandafter\def\csname simpleicon@tutanotaicon\endcsname {\simpleiconsmap\symbol{"F52E}} + \expandafter\def\csname simpleicon@tv4playicon\endcsname {\simpleiconsmap\symbol{"F52F}} + \expandafter\def\csname simpleicon@tvtimeicon\endcsname {\simpleiconsmap\symbol{"F530}} + \expandafter\def\csname simpleicon@twilioicon\endcsname {\simpleiconsmap\symbol{"F531}} + \expandafter\def\csname simpleicon@twinklyicon\endcsname {\simpleiconsmap\symbol{"F532}} + \expandafter\def\csname simpleicon@twinmotionicon\endcsname {\simpleiconsmap\symbol{"F533}} + \expandafter\def\csname simpleicon@twitchicon\endcsname {\simpleiconsmap\symbol{"F534}} + \expandafter\def\csname simpleicon@typeformicon\endcsname {\simpleiconsmap\symbol{"F535}} + \expandafter\def\csname simpleicon@typeormicon\endcsname {\simpleiconsmap\symbol{"F536}} + \expandafter\def\csname simpleicon@typericon\endcsname {\simpleiconsmap\symbol{"F537}} + \expandafter\def\csname simpleicon@typescripticon\endcsname {\simpleiconsmap\symbol{"F538}} + \expandafter\def\csname simpleicon@typo3icon\endcsname {\simpleiconsmap\symbol{"F539}} + \expandafter\def\csname simpleicon@typsticon\endcsname {\simpleiconsmap\symbol{"F53A}} + \expandafter\def\csname simpleicon@ubericon\endcsname {\simpleiconsmap\symbol{"F53B}} + \expandafter\def\csname simpleicon@ubereatsicon\endcsname {\simpleiconsmap\symbol{"F53C}} + \expandafter\def\csname simpleicon@ubiquitiicon\endcsname {\simpleiconsmap\symbol{"F53D}} + \expandafter\def\csname simpleicon@ubisofticon\endcsname {\simpleiconsmap\symbol{"F53E}} + \expandafter\def\csname simpleicon@ublockoriginicon\endcsname {\simpleiconsmap\symbol{"F53F}} + \expandafter\def\csname simpleicon@ubuntuicon\endcsname {\simpleiconsmap\symbol{"F540}} + \expandafter\def\csname simpleicon@ubuntumateicon\endcsname {\simpleiconsmap\symbol{"F541}} + \expandafter\def\csname simpleicon@udacityicon\endcsname {\simpleiconsmap\symbol{"F542}} + \expandafter\def\csname simpleicon@udemyicon\endcsname {\simpleiconsmap\symbol{"F543}} + \expandafter\def\csname simpleicon@ufcicon\endcsname {\simpleiconsmap\symbol{"F544}} + \expandafter\def\csname simpleicon@uikiticon\endcsname {\simpleiconsmap\symbol{"F545}} + \expandafter\def\csname simpleicon@uipathicon\endcsname {\simpleiconsmap\symbol{"F546}} + \expandafter\def\csname simpleicon@ululeicon\endcsname {\simpleiconsmap\symbol{"F547}} + \expandafter\def\csname simpleicon@umamiicon\endcsname {\simpleiconsmap\symbol{"F548}} + \expandafter\def\csname simpleicon@umbracoicon\endcsname {\simpleiconsmap\symbol{"F549}} + \expandafter\def\csname simpleicon@umlicon\endcsname {\simpleiconsmap\symbol{"F54A}} + \expandafter\def\csname simpleicon@unacademyicon\endcsname {\simpleiconsmap\symbol{"F54B}} + \expandafter\def\csname simpleicon@underarmouricon\endcsname {\simpleiconsmap\symbol{"F54C}} + \expandafter\def\csname simpleicon@underscoredotjsicon\endcsname {\simpleiconsmap\symbol{"F54D}} + \expandafter\def\csname simpleicon@undertaleicon\endcsname {\simpleiconsmap\symbol{"F54E}} + \expandafter\def\csname simpleicon@unicodeicon\endcsname {\simpleiconsmap\symbol{"F54F}} + \expandafter\def\csname simpleicon@unilevericon\endcsname {\simpleiconsmap\symbol{"F550}} + \expandafter\def\csname simpleicon@uniqloicon\endcsname {\simpleiconsmap\symbol{"F551}} + \expandafter\def\csname simpleicon@uniqlojaicon\endcsname {\simpleiconsmap\symbol{"F552}} + \expandafter\def\csname simpleicon@unitedairlinesicon\endcsname {\simpleiconsmap\symbol{"F553}} + \expandafter\def\csname simpleicon@unitednationsicon\endcsname {\simpleiconsmap\symbol{"F554}} + \expandafter\def\csname simpleicon@unityicon\endcsname {\simpleiconsmap\symbol{"F555}} + \expandafter\def\csname simpleicon@unjsicon\endcsname {\simpleiconsmap\symbol{"F556}} + \expandafter\def\csname simpleicon@unlicenseicon\endcsname {\simpleiconsmap\symbol{"F557}} + \expandafter\def\csname simpleicon@unocssicon\endcsname {\simpleiconsmap\symbol{"F558}} + \expandafter\def\csname simpleicon@unpkgicon\endcsname {\simpleiconsmap\symbol{"F559}} + \expandafter\def\csname simpleicon@unraidicon\endcsname {\simpleiconsmap\symbol{"F55A}} + \expandafter\def\csname simpleicon@unrealengineicon\endcsname {\simpleiconsmap\symbol{"F55B}} + \expandafter\def\csname simpleicon@unsplashicon\endcsname {\simpleiconsmap\symbol{"F55C}} + \expandafter\def\csname simpleicon@untappdicon\endcsname {\simpleiconsmap\symbol{"F55D}} + \expandafter\def\csname simpleicon@upcloudicon\endcsname {\simpleiconsmap\symbol{"F55E}} + \expandafter\def\csname simpleicon@upholdicon\endcsname {\simpleiconsmap\symbol{"F55F}} + \expandafter\def\csname simpleicon@uplabsicon\endcsname {\simpleiconsmap\symbol{"F560}} + \expandafter\def\csname simpleicon@upptimeicon\endcsname {\simpleiconsmap\symbol{"F561}} + \expandafter\def\csname simpleicon@upsicon\endcsname {\simpleiconsmap\symbol{"F562}} + \expandafter\def\csname simpleicon@upstashicon\endcsname {\simpleiconsmap\symbol{"F563}} + \expandafter\def\csname simpleicon@uptimekumaicon\endcsname {\simpleiconsmap\symbol{"F564}} + \expandafter\def\csname simpleicon@uptoboxicon\endcsname {\simpleiconsmap\symbol{"F565}} + \expandafter\def\csname simpleicon@upworkicon\endcsname {\simpleiconsmap\symbol{"F566}} + \expandafter\def\csname simpleicon@uspsicon\endcsname {\simpleiconsmap\symbol{"F567}} + \expandafter\def\csname simpleicon@utorrenticon\endcsname {\simpleiconsmap\symbol{"F568}} + \expandafter\def\csname simpleicon@vicon\endcsname {\simpleiconsmap\symbol{"F569}} + \expandafter\def\csname simpleicon@v2exicon\endcsname {\simpleiconsmap\symbol{"F56A}} + \expandafter\def\csname simpleicon@v8icon\endcsname {\simpleiconsmap\symbol{"F56B}} + \expandafter\def\csname simpleicon@vaadinicon\endcsname {\simpleiconsmap\symbol{"F56C}} + \expandafter\def\csname simpleicon@vagranticon\endcsname {\simpleiconsmap\symbol{"F56D}} + \expandafter\def\csname simpleicon@valaicon\endcsname {\simpleiconsmap\symbol{"F56E}} + \expandafter\def\csname simpleicon@valoranticon\endcsname {\simpleiconsmap\symbol{"F56F}} + \expandafter\def\csname simpleicon@valveicon\endcsname {\simpleiconsmap\symbol{"F570}} + \expandafter\def\csname simpleicon@vaporicon\endcsname {\simpleiconsmap\symbol{"F571}} + \expandafter\def\csname simpleicon@vaulticon\endcsname {\simpleiconsmap\symbol{"F572}} + \expandafter\def\csname simpleicon@vaultwardenicon\endcsname {\simpleiconsmap\symbol{"F573}} + \expandafter\def\csname simpleicon@vauxhallicon\endcsname {\simpleiconsmap\symbol{"F574}} + \expandafter\def\csname simpleicon@vbulletinicon\endcsname {\simpleiconsmap\symbol{"F575}} + \expandafter\def\csname simpleicon@vectaryicon\endcsname {\simpleiconsmap\symbol{"F576}} + \expandafter\def\csname simpleicon@vectorlogozoneicon\endcsname {\simpleiconsmap\symbol{"F577}} + \expandafter\def\csname simpleicon@vectorworksicon\endcsname {\simpleiconsmap\symbol{"F578}} + \expandafter\def\csname simpleicon@veeamicon\endcsname {\simpleiconsmap\symbol{"F579}} + \expandafter\def\csname simpleicon@veedicon\endcsname {\simpleiconsmap\symbol{"F57A}} + \expandafter\def\csname simpleicon@veepeeicon\endcsname {\simpleiconsmap\symbol{"F57B}} + \expandafter\def\csname simpleicon@vegaicon\endcsname {\simpleiconsmap\symbol{"F57C}} + \expandafter\def\csname simpleicon@vegasicon\endcsname {\simpleiconsmap\symbol{"F57D}} + \expandafter\def\csname simpleicon@velogicon\endcsname {\simpleiconsmap\symbol{"F57E}} + \expandafter\def\csname simpleicon@venmoicon\endcsname {\simpleiconsmap\symbol{"F57F}} + \expandafter\def\csname simpleicon@vercelicon\endcsname {\simpleiconsmap\symbol{"F580}} + \expandafter\def\csname simpleicon@verdaccioicon\endcsname {\simpleiconsmap\symbol{"F581}} + \expandafter\def\csname simpleicon@veritasicon\endcsname {\simpleiconsmap\symbol{"F582}} + \expandafter\def\csname simpleicon@verizonicon\endcsname {\simpleiconsmap\symbol{"F583}} + \expandafter\def\csname simpleicon@vespaicon\endcsname {\simpleiconsmap\symbol{"F584}} + \expandafter\def\csname simpleicon@vexxhosticon\endcsname {\simpleiconsmap\symbol{"F585}} + \expandafter\def\csname simpleicon@vfairsicon\endcsname {\simpleiconsmap\symbol{"F586}} + \expandafter\def\csname simpleicon@viadeoicon\endcsname {\simpleiconsmap\symbol{"F587}} + \expandafter\def\csname simpleicon@viaplayicon\endcsname {\simpleiconsmap\symbol{"F588}} + \expandafter\def\csname simpleicon@vibericon\endcsname {\simpleiconsmap\symbol{"F589}} + \expandafter\def\csname simpleicon@vibloicon\endcsname {\simpleiconsmap\symbol{"F58A}} + \expandafter\def\csname simpleicon@victoriametricsicon\endcsname {\simpleiconsmap\symbol{"F58B}} + \expandafter\def\csname simpleicon@victronenergyicon\endcsname {\simpleiconsmap\symbol{"F58C}} + \expandafter\def\csname simpleicon@vimicon\endcsname {\simpleiconsmap\symbol{"F58D}} + \expandafter\def\csname simpleicon@vimeoicon\endcsname {\simpleiconsmap\symbol{"F58E}} + \expandafter\def\csname simpleicon@vimeolivestreamicon\endcsname {\simpleiconsmap\symbol{"F58F}} + \expandafter\def\csname simpleicon@virginicon\endcsname {\simpleiconsmap\symbol{"F590}} + \expandafter\def\csname simpleicon@virginatlanticicon\endcsname {\simpleiconsmap\symbol{"F591}} + \expandafter\def\csname simpleicon@virginmediaicon\endcsname {\simpleiconsmap\symbol{"F592}} + \expandafter\def\csname simpleicon@virtualboxicon\endcsname {\simpleiconsmap\symbol{"F593}} + \expandafter\def\csname simpleicon@virustotalicon\endcsname {\simpleiconsmap\symbol{"F594}} + \expandafter\def\csname simpleicon@visaicon\endcsname {\simpleiconsmap\symbol{"F595}} + \expandafter\def\csname simpleicon@visxicon\endcsname {\simpleiconsmap\symbol{"F596}} + \expandafter\def\csname simpleicon@viteicon\endcsname {\simpleiconsmap\symbol{"F597}} + \expandafter\def\csname simpleicon@vitepressicon\endcsname {\simpleiconsmap\symbol{"F598}} + \expandafter\def\csname simpleicon@vitessicon\endcsname {\simpleiconsmap\symbol{"F599}} + \expandafter\def\csname simpleicon@vitesticon\endcsname {\simpleiconsmap\symbol{"F59A}} + \expandafter\def\csname simpleicon@vivaldiicon\endcsname {\simpleiconsmap\symbol{"F59B}} + \expandafter\def\csname simpleicon@vivawalleticon\endcsname {\simpleiconsmap\symbol{"F59C}} + \expandafter\def\csname simpleicon@vivinoicon\endcsname {\simpleiconsmap\symbol{"F59D}} + \expandafter\def\csname simpleicon@vivinticon\endcsname {\simpleiconsmap\symbol{"F59E}} + \expandafter\def\csname simpleicon@vivoicon\endcsname {\simpleiconsmap\symbol{"F59F}} + \expandafter\def\csname simpleicon@vkicon\endcsname {\simpleiconsmap\symbol{"F5A0}} + \expandafter\def\csname simpleicon@vlcmediaplayericon\endcsname {\simpleiconsmap\symbol{"F5A1}} + \expandafter\def\csname simpleicon@vmwareicon\endcsname {\simpleiconsmap\symbol{"F5A2}} + \expandafter\def\csname simpleicon@vodafoneicon\endcsname {\simpleiconsmap\symbol{"F5A3}} + \expandafter\def\csname simpleicon@voidlinuxicon\endcsname {\simpleiconsmap\symbol{"F5A4}} + \expandafter\def\csname simpleicon@voipdotmsicon\endcsname {\simpleiconsmap\symbol{"F5A5}} + \expandafter\def\csname simpleicon@volkswagenicon\endcsname {\simpleiconsmap\symbol{"F5A6}} + \expandafter\def\csname simpleicon@volvoicon\endcsname {\simpleiconsmap\symbol{"F5A7}} + \expandafter\def\csname simpleicon@vonageicon\endcsname {\simpleiconsmap\symbol{"F5A8}} + \expandafter\def\csname simpleicon@vorondesignicon\endcsname {\simpleiconsmap\symbol{"F5A9}} + \expandafter\def\csname simpleicon@vowpalwabbiticon\endcsname {\simpleiconsmap\symbol{"F5AA}} + \expandafter\def\csname simpleicon@voxicon\endcsname {\simpleiconsmap\symbol{"F5AB}} + \expandafter\def\csname simpleicon@vscoicon\endcsname {\simpleiconsmap\symbol{"F5AC}} + \expandafter\def\csname simpleicon@vscodiumicon\endcsname {\simpleiconsmap\symbol{"F5AD}} + \expandafter\def\csname simpleicon@vtexicon\endcsname {\simpleiconsmap\symbol{"F5AE}} + \expandafter\def\csname simpleicon@vuedotjsicon\endcsname {\simpleiconsmap\symbol{"F5AF}} + \expandafter\def\csname simpleicon@vuetifyicon\endcsname {\simpleiconsmap\symbol{"F5B0}} + \expandafter\def\csname simpleicon@vulkanicon\endcsname {\simpleiconsmap\symbol{"F5B1}} + \expandafter\def\csname simpleicon@vultricon\endcsname {\simpleiconsmap\symbol{"F5B2}} + \expandafter\def\csname simpleicon@vyondicon\endcsname {\simpleiconsmap\symbol{"F5B3}} + \expandafter\def\csname simpleicon@w3schoolsicon\endcsname {\simpleiconsmap\symbol{"F5B4}} + \expandafter\def\csname simpleicon@wacomicon\endcsname {\simpleiconsmap\symbol{"F5B5}} + \expandafter\def\csname simpleicon@wagmiicon\endcsname {\simpleiconsmap\symbol{"F5B6}} + \expandafter\def\csname simpleicon@wagtailicon\endcsname {\simpleiconsmap\symbol{"F5B7}} + \expandafter\def\csname simpleicon@wailsicon\endcsname {\simpleiconsmap\symbol{"F5B8}} + \expandafter\def\csname simpleicon@wakatimeicon\endcsname {\simpleiconsmap\symbol{"F5B9}} + \expandafter\def\csname simpleicon@walkmanicon\endcsname {\simpleiconsmap\symbol{"F5BA}} + \expandafter\def\csname simpleicon@wallabagicon\endcsname {\simpleiconsmap\symbol{"F5BB}} + \expandafter\def\csname simpleicon@walletconnecticon\endcsname {\simpleiconsmap\symbol{"F5BC}} + \expandafter\def\csname simpleicon@walmarticon\endcsname {\simpleiconsmap\symbol{"F5BD}} + \expandafter\def\csname simpleicon@wantedlyicon\endcsname {\simpleiconsmap\symbol{"F5BE}} + \expandafter\def\csname simpleicon@wappalyzericon\endcsname {\simpleiconsmap\symbol{"F5BF}} + \expandafter\def\csname simpleicon@warnerbrosicon\endcsname {\simpleiconsmap\symbol{"F5C0}} + \expandafter\def\csname simpleicon@warpicon\endcsname {\simpleiconsmap\symbol{"F5C1}} + \expandafter\def\csname simpleicon@wasabiicon\endcsname {\simpleiconsmap\symbol{"F5C2}} + \expandafter\def\csname simpleicon@wasmcloudicon\endcsname {\simpleiconsmap\symbol{"F5C3}} + \expandafter\def\csname simpleicon@wasmericon\endcsname {\simpleiconsmap\symbol{"F5C4}} + \expandafter\def\csname simpleicon@watchtowericon\endcsname {\simpleiconsmap\symbol{"F5C5}} + \expandafter\def\csname simpleicon@wattpadicon\endcsname {\simpleiconsmap\symbol{"F5C6}} + \expandafter\def\csname simpleicon@waylandicon\endcsname {\simpleiconsmap\symbol{"F5C7}} + \expandafter\def\csname simpleicon@wazeicon\endcsname {\simpleiconsmap\symbol{"F5C8}} + \expandafter\def\csname simpleicon@wazirxicon\endcsname {\simpleiconsmap\symbol{"F5C9}} + \expandafter\def\csname simpleicon@wearosicon\endcsname {\simpleiconsmap\symbol{"F5CA}} + \expandafter\def\csname simpleicon@weasylicon\endcsname {\simpleiconsmap\symbol{"F5CB}} + \expandafter\def\csname simpleicon@web3dotjsicon\endcsname {\simpleiconsmap\symbol{"F5CC}} + \expandafter\def\csname simpleicon@webassemblyicon\endcsname {\simpleiconsmap\symbol{"F5CD}} + \expandafter\def\csname simpleicon@webauthnicon\endcsname {\simpleiconsmap\symbol{"F5CE}} + \expandafter\def\csname simpleicon@webcomponentsdotorgicon\endcsname {\simpleiconsmap\symbol{"F5CF}} + \expandafter\def\csname simpleicon@webdriverioicon\endcsname {\simpleiconsmap\symbol{"F5D0}} + \expandafter\def\csname simpleicon@webexicon\endcsname {\simpleiconsmap\symbol{"F5D1}} + \expandafter\def\csname simpleicon@webflowicon\endcsname {\simpleiconsmap\symbol{"F5D2}} + \expandafter\def\csname simpleicon@webglicon\endcsname {\simpleiconsmap\symbol{"F5D3}} + \expandafter\def\csname simpleicon@webgpuicon\endcsname {\simpleiconsmap\symbol{"F5D4}} + \expandafter\def\csname simpleicon@weblateicon\endcsname {\simpleiconsmap\symbol{"F5D5}} + \expandafter\def\csname simpleicon@webminicon\endcsname {\simpleiconsmap\symbol{"F5D6}} + \expandafter\def\csname simpleicon@webmoneyicon\endcsname {\simpleiconsmap\symbol{"F5D7}} + \expandafter\def\csname simpleicon@webpackicon\endcsname {\simpleiconsmap\symbol{"F5D8}} + \expandafter\def\csname simpleicon@webrtcicon\endcsname {\simpleiconsmap\symbol{"F5D9}} + \expandafter\def\csname simpleicon@webstormicon\endcsname {\simpleiconsmap\symbol{"F5DA}} + \expandafter\def\csname simpleicon@webtoonicon\endcsname {\simpleiconsmap\symbol{"F5DB}} + \expandafter\def\csname simpleicon@webtreesicon\endcsname {\simpleiconsmap\symbol{"F5DC}} + \expandafter\def\csname simpleicon@wechaticon\endcsname {\simpleiconsmap\symbol{"F5DD}} + \expandafter\def\csname simpleicon@wegameicon\endcsname {\simpleiconsmap\symbol{"F5DE}} + \expandafter\def\csname simpleicon@weightsandbiasesicon\endcsname {\simpleiconsmap\symbol{"F5DF}} + \expandafter\def\csname simpleicon@welcometothejungleicon\endcsname {\simpleiconsmap\symbol{"F5E0}} + \expandafter\def\csname simpleicon@wellfoundicon\endcsname {\simpleiconsmap\symbol{"F5E1}} + \expandafter\def\csname simpleicon@wellsfargoicon\endcsname {\simpleiconsmap\symbol{"F5E2}} + \expandafter\def\csname simpleicon@wemoicon\endcsname {\simpleiconsmap\symbol{"F5E3}} + \expandafter\def\csname simpleicon@westerndigitalicon\endcsname {\simpleiconsmap\symbol{"F5E4}} + \expandafter\def\csname simpleicon@westernunionicon\endcsname {\simpleiconsmap\symbol{"F5E5}} + \expandafter\def\csname simpleicon@wetransfericon\endcsname {\simpleiconsmap\symbol{"F5E6}} + \expandafter\def\csname simpleicon@weztermicon\endcsname {\simpleiconsmap\symbol{"F5E7}} + \expandafter\def\csname simpleicon@wgpuicon\endcsname {\simpleiconsmap\symbol{"F5E8}} + \expandafter\def\csname simpleicon@whatsappicon\endcsname {\simpleiconsmap\symbol{"F5E9}} + \expandafter\def\csname simpleicon@wheniworkicon\endcsname {\simpleiconsmap\symbol{"F5EA}} + \expandafter\def\csname simpleicon@wiiicon\endcsname {\simpleiconsmap\symbol{"F5EB}} + \expandafter\def\csname simpleicon@wiiuicon\endcsname {\simpleiconsmap\symbol{"F5EC}} + \expandafter\def\csname simpleicon@wikidataicon\endcsname {\simpleiconsmap\symbol{"F5ED}} + \expandafter\def\csname simpleicon@wikidotggicon\endcsname {\simpleiconsmap\symbol{"F5EE}} + \expandafter\def\csname simpleicon@wikidotjsicon\endcsname {\simpleiconsmap\symbol{"F5EF}} + \expandafter\def\csname simpleicon@wikimediacommonsicon\endcsname {\simpleiconsmap\symbol{"F5F0}} + \expandafter\def\csname simpleicon@wikimediafoundationicon\endcsname {\simpleiconsmap\symbol{"F5F1}} + \expandafter\def\csname simpleicon@wikipediaicon\endcsname {\simpleiconsmap\symbol{"F5F2}} + \expandafter\def\csname simpleicon@wikiquoteicon\endcsname {\simpleiconsmap\symbol{"F5F3}} + \expandafter\def\csname simpleicon@wikivoyageicon\endcsname {\simpleiconsmap\symbol{"F5F4}} + \expandafter\def\csname simpleicon@winampicon\endcsname {\simpleiconsmap\symbol{"F5F5}} + \expandafter\def\csname simpleicon@wiproicon\endcsname {\simpleiconsmap\symbol{"F5F6}} + \expandafter\def\csname simpleicon@wireicon\endcsname {\simpleiconsmap\symbol{"F5F7}} + \expandafter\def\csname simpleicon@wireguardicon\endcsname {\simpleiconsmap\symbol{"F5F8}} + \expandafter\def\csname simpleicon@wiresharkicon\endcsname {\simpleiconsmap\symbol{"F5F9}} + \expandafter\def\csname simpleicon@wiseicon\endcsname {\simpleiconsmap\symbol{"F5FA}} + \expandafter\def\csname simpleicon@wishicon\endcsname {\simpleiconsmap\symbol{"F5FB}} + \expandafter\def\csname simpleicon@wistiaicon\endcsname {\simpleiconsmap\symbol{"F5FC}} + \expandafter\def\csname simpleicon@wixicon\endcsname {\simpleiconsmap\symbol{"F5FD}} + \expandafter\def\csname simpleicon@wizzairicon\endcsname {\simpleiconsmap\symbol{"F5FE}} + \expandafter\def\csname simpleicon@wolframicon\endcsname {\simpleiconsmap\symbol{"F5FF}} + \expandafter\def\csname simpleicon@wolframlanguageicon\endcsname {\simpleiconsmap\symbol{"F600}} + \expandafter\def\csname simpleicon@wolframmathematicaicon\endcsname {\simpleiconsmap\symbol{"F601}} + \expandafter\def\csname simpleicon@wondershareicon\endcsname {\simpleiconsmap\symbol{"F602}} + \expandafter\def\csname simpleicon@wondersharefilmoraicon\endcsname {\simpleiconsmap\symbol{"F603}} + \expandafter\def\csname simpleicon@wooicon\endcsname {\simpleiconsmap\symbol{"F604}} + \expandafter\def\csname simpleicon@woocommerceicon\endcsname {\simpleiconsmap\symbol{"F605}} + \expandafter\def\csname simpleicon@wordpressicon\endcsname {\simpleiconsmap\symbol{"F606}} + \expandafter\def\csname simpleicon@workplaceicon\endcsname {\simpleiconsmap\symbol{"F607}} + \expandafter\def\csname simpleicon@worldhealthorganizationicon\endcsname {\simpleiconsmap\symbol{"F608}} + \expandafter\def\csname simpleicon@wpengineicon\endcsname {\simpleiconsmap\symbol{"F609}} + \expandafter\def\csname simpleicon@wpexplorericon\endcsname {\simpleiconsmap\symbol{"F60A}} + \expandafter\def\csname simpleicon@wprocketicon\endcsname {\simpleiconsmap\symbol{"F60B}} + \expandafter\def\csname simpleicon@writedotasicon\endcsname {\simpleiconsmap\symbol{"F60C}} + \expandafter\def\csname simpleicon@wweicon\endcsname {\simpleiconsmap\symbol{"F60D}} + \expandafter\def\csname simpleicon@wwiseicon\endcsname {\simpleiconsmap\symbol{"F60E}} + \expandafter\def\csname simpleicon@wykopicon\endcsname {\simpleiconsmap\symbol{"F60F}} + \expandafter\def\csname simpleicon@wyzeicon\endcsname {\simpleiconsmap\symbol{"F610}} + \expandafter\def\csname simpleicon@xicon\endcsname {\simpleiconsmap\symbol{"F611}} + \expandafter\def\csname simpleicon@xamppicon\endcsname {\simpleiconsmap\symbol{"F612}} + \expandafter\def\csname simpleicon@xcodeicon\endcsname {\simpleiconsmap\symbol{"F613}} + \expandafter\def\csname simpleicon@xdadevelopersicon\endcsname {\simpleiconsmap\symbol{"F614}} + \expandafter\def\csname simpleicon@xdotorgicon\endcsname {\simpleiconsmap\symbol{"F615}} + \expandafter\def\csname simpleicon@xenditicon\endcsname {\simpleiconsmap\symbol{"F616}} + \expandafter\def\csname simpleicon@xeroicon\endcsname {\simpleiconsmap\symbol{"F617}} + \expandafter\def\csname simpleicon@xfceicon\endcsname {\simpleiconsmap\symbol{"F618}} + \expandafter\def\csname simpleicon@xiaohongshuicon\endcsname {\simpleiconsmap\symbol{"F619}} + \expandafter\def\csname simpleicon@xiaomiicon\endcsname {\simpleiconsmap\symbol{"F61A}} + \expandafter\def\csname simpleicon@xingicon\endcsname {\simpleiconsmap\symbol{"F61B}} + \expandafter\def\csname simpleicon@xmppicon\endcsname {\simpleiconsmap\symbol{"F61C}} + \expandafter\def\csname simpleicon@xoicon\endcsname {\simpleiconsmap\symbol{"F61D}} + \expandafter\def\csname simpleicon@xrpicon\endcsname {\simpleiconsmap\symbol{"F61E}} + \expandafter\def\csname simpleicon@xspliticon\endcsname {\simpleiconsmap\symbol{"F61F}} + \expandafter\def\csname simpleicon@xstateicon\endcsname {\simpleiconsmap\symbol{"F620}} + \expandafter\def\csname simpleicon@yabaiicon\endcsname {\simpleiconsmap\symbol{"F621}} + \expandafter\def\csname simpleicon@yaleicon\endcsname {\simpleiconsmap\symbol{"F622}} + \expandafter\def\csname simpleicon@yamahacorporationicon\endcsname {\simpleiconsmap\symbol{"F623}} + \expandafter\def\csname simpleicon@yamahamotorcorporationicon\endcsname {\simpleiconsmap\symbol{"F624}} + \expandafter\def\csname simpleicon@yamlicon\endcsname {\simpleiconsmap\symbol{"F625}} + \expandafter\def\csname simpleicon@yandexcloudicon\endcsname {\simpleiconsmap\symbol{"F626}} + \expandafter\def\csname simpleicon@yarnicon\endcsname {\simpleiconsmap\symbol{"F627}} + \expandafter\def\csname simpleicon@ycombinatoricon\endcsname {\simpleiconsmap\symbol{"F628}} + \expandafter\def\csname simpleicon@yelpicon\endcsname {\simpleiconsmap\symbol{"F629}} + \expandafter\def\csname simpleicon@yetiicon\endcsname {\simpleiconsmap\symbol{"F62A}} + \expandafter\def\csname simpleicon@yiiicon\endcsname {\simpleiconsmap\symbol{"F62B}} + \expandafter\def\csname simpleicon@yoasticon\endcsname {\simpleiconsmap\symbol{"F62C}} + \expandafter\def\csname simpleicon@youtubeicon\endcsname {\simpleiconsmap\symbol{"F62D}} + \expandafter\def\csname simpleicon@youtubegamingicon\endcsname {\simpleiconsmap\symbol{"F62E}} + \expandafter\def\csname simpleicon@youtubekidsicon\endcsname {\simpleiconsmap\symbol{"F62F}} + \expandafter\def\csname simpleicon@youtubemusicicon\endcsname {\simpleiconsmap\symbol{"F630}} + \expandafter\def\csname simpleicon@youtubeshortsicon\endcsname {\simpleiconsmap\symbol{"F631}} + \expandafter\def\csname simpleicon@youtubestudioicon\endcsname {\simpleiconsmap\symbol{"F632}} + \expandafter\def\csname simpleicon@youtubetvicon\endcsname {\simpleiconsmap\symbol{"F633}} + \expandafter\def\csname simpleicon@yricon\endcsname {\simpleiconsmap\symbol{"F634}} + \expandafter\def\csname simpleicon@yubicoicon\endcsname {\simpleiconsmap\symbol{"F635}} + \expandafter\def\csname simpleicon@yunohosticon\endcsname {\simpleiconsmap\symbol{"F636}} + \expandafter\def\csname simpleicon@zabkaicon\endcsname {\simpleiconsmap\symbol{"F637}} + \expandafter\def\csname simpleicon@zaimicon\endcsname {\simpleiconsmap\symbol{"F638}} + \expandafter\def\csname simpleicon@zalandoicon\endcsname {\simpleiconsmap\symbol{"F639}} + \expandafter\def\csname simpleicon@zaloicon\endcsname {\simpleiconsmap\symbol{"F63A}} + \expandafter\def\csname simpleicon@zapicon\endcsname {\simpleiconsmap\symbol{"F63B}} + \expandafter\def\csname simpleicon@zapiericon\endcsname {\simpleiconsmap\symbol{"F63C}} + \expandafter\def\csname simpleicon@zaraicon\endcsname {\simpleiconsmap\symbol{"F63D}} + \expandafter\def\csname simpleicon@zazzleicon\endcsname {\simpleiconsmap\symbol{"F63E}} + \expandafter\def\csname simpleicon@zcashicon\endcsname {\simpleiconsmap\symbol{"F63F}} + \expandafter\def\csname simpleicon@zcoolicon\endcsname {\simpleiconsmap\symbol{"F640}} + \expandafter\def\csname simpleicon@zdficon\endcsname {\simpleiconsmap\symbol{"F641}} + \expandafter\def\csname simpleicon@zebpayicon\endcsname {\simpleiconsmap\symbol{"F642}} + \expandafter\def\csname simpleicon@zebratechnologiesicon\endcsname {\simpleiconsmap\symbol{"F643}} + \expandafter\def\csname simpleicon@zedindustriesicon\endcsname {\simpleiconsmap\symbol{"F644}} + \expandafter\def\csname simpleicon@zelleicon\endcsname {\simpleiconsmap\symbol{"F645}} + \expandafter\def\csname simpleicon@zendicon\endcsname {\simpleiconsmap\symbol{"F646}} + \expandafter\def\csname simpleicon@zendeskicon\endcsname {\simpleiconsmap\symbol{"F647}} + \expandafter\def\csname simpleicon@zennicon\endcsname {\simpleiconsmap\symbol{"F648}} + \expandafter\def\csname simpleicon@zenodoicon\endcsname {\simpleiconsmap\symbol{"F649}} + \expandafter\def\csname simpleicon@zensaricon\endcsname {\simpleiconsmap\symbol{"F64A}} + \expandafter\def\csname simpleicon@zerodhaicon\endcsname {\simpleiconsmap\symbol{"F64B}} + \expandafter\def\csname simpleicon@zerotiericon\endcsname {\simpleiconsmap\symbol{"F64C}} + \expandafter\def\csname simpleicon@zerplyicon\endcsname {\simpleiconsmap\symbol{"F64D}} + \expandafter\def\csname simpleicon@zettlricon\endcsname {\simpleiconsmap\symbol{"F64E}} + \expandafter\def\csname simpleicon@zhihuicon\endcsname {\simpleiconsmap\symbol{"F64F}} + \expandafter\def\csname simpleicon@zigicon\endcsname {\simpleiconsmap\symbol{"F650}} + \expandafter\def\csname simpleicon@zigbeeicon\endcsname {\simpleiconsmap\symbol{"F651}} + \expandafter\def\csname simpleicon@zigbee2mqtticon\endcsname {\simpleiconsmap\symbol{"F652}} + \expandafter\def\csname simpleicon@ziggoicon\endcsname {\simpleiconsmap\symbol{"F653}} + \expandafter\def\csname simpleicon@zilchicon\endcsname {\simpleiconsmap\symbol{"F654}} + \expandafter\def\csname simpleicon@zillowicon\endcsname {\simpleiconsmap\symbol{"F655}} + \expandafter\def\csname simpleicon@zincsearchicon\endcsname {\simpleiconsmap\symbol{"F656}} + \expandafter\def\csname simpleicon@zingaticon\endcsname {\simpleiconsmap\symbol{"F657}} + \expandafter\def\csname simpleicon@zodicon\endcsname {\simpleiconsmap\symbol{"F658}} + \expandafter\def\csname simpleicon@zohoicon\endcsname {\simpleiconsmap\symbol{"F659}} + \expandafter\def\csname simpleicon@zoipericon\endcsname {\simpleiconsmap\symbol{"F65A}} + \expandafter\def\csname simpleicon@zomatoicon\endcsname {\simpleiconsmap\symbol{"F65B}} + \expandafter\def\csname simpleicon@zoomicon\endcsname {\simpleiconsmap\symbol{"F65C}} + \expandafter\def\csname simpleicon@zorinicon\endcsname {\simpleiconsmap\symbol{"F65D}} + \expandafter\def\csname simpleicon@zoteroicon\endcsname {\simpleiconsmap\symbol{"F65E}} + \expandafter\def\csname simpleicon@zshicon\endcsname {\simpleiconsmap\symbol{"F65F}} + \expandafter\def\csname simpleicon@zulipicon\endcsname {\simpleiconsmap\symbol{"F660}} + \expandafter\def\csname simpleicon@zyteicon\endcsname {\simpleiconsmap\symbol{"F661}}
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconseight.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconseight.fd index d5803c59e4c..856175e37f2 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconseight.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconseight.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconseight.fd}[2024/07/26 Font definitions for U/simpleiconseight.] + \ProvidesFile{usimpleiconseight.fd}[2024/09/06 Font definitions for U/simpleiconseight.] \DeclareFontFamily{U}{simpleiconseight}{} \DeclareFontShape{U}{simpleiconseight}{m}{n}{<-> SimpleIcons--simpleiconseight}{} \endinput diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfive.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfive.fd index 76038dc46f8..cda9e560ba6 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfive.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfive.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconsfive.fd}[2024/07/26 Font definitions for U/simpleiconsfive.] + \ProvidesFile{usimpleiconsfive.fd}[2024/09/06 Font definitions for U/simpleiconsfive.] \DeclareFontFamily{U}{simpleiconsfive}{} \DeclareFontShape{U}{simpleiconsfive}{m}{n}{<-> SimpleIcons--simpleiconsfive}{} \endinput diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfour.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfour.fd index c3d80dab74b..82bd9ca6dbe 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfour.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsfour.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconsfour.fd}[2024/07/26 Font definitions for U/simpleiconsfour.] + \ProvidesFile{usimpleiconsfour.fd}[2024/09/06 Font definitions for U/simpleiconsfour.] \DeclareFontFamily{U}{simpleiconsfour}{} \DeclareFontShape{U}{simpleiconsfour}{m}{n}{<-> SimpleIcons--simpleiconsfour}{} \endinput diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsnine.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsnine.fd index 382c9601981..0e3b1c375eb 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsnine.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsnine.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconsnine.fd}[2024/07/26 Font definitions for U/simpleiconsnine.] + \ProvidesFile{usimpleiconsnine.fd}[2024/09/06 Font definitions for U/simpleiconsnine.] \DeclareFontFamily{U}{simpleiconsnine}{} \DeclareFontShape{U}{simpleiconsnine}{m}{n}{<-> SimpleIcons--simpleiconsnine}{} \endinput diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsone.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsone.fd index ecaefbbd6a3..62ff3e5c637 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsone.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsone.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconsone.fd}[2024/07/26 Font definitions for U/simpleiconsone.] + \ProvidesFile{usimpleiconsone.fd}[2024/09/06 Font definitions for U/simpleiconsone.] \DeclareFontFamily{U}{simpleiconsone}{} \DeclareFontShape{U}{simpleiconsone}{m}{n}{<-> SimpleIcons--simpleiconsone}{} \endinput diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsoneone.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsoneone.fd index 507badd4ae8..fffc7318b15 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsoneone.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsoneone.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconsoneone.fd}[2024/07/26 Font definitions for U/simpleiconsoneone.] + \ProvidesFile{usimpleiconsoneone.fd}[2024/09/06 Font definitions for U/simpleiconsoneone.] \DeclareFontFamily{U}{simpleiconsoneone}{} \DeclareFontShape{U}{simpleiconsoneone}{m}{n}{<-> SimpleIcons--simpleiconsoneone}{} \endinput diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonethree.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonethree.fd index 621cd09d5ff..6ebfec5935c 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonethree.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonethree.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconsonethree.fd}[2024/07/26 Font definitions for U/simpleiconsonethree.] + \ProvidesFile{usimpleiconsonethree.fd}[2024/09/06 Font definitions for U/simpleiconsonethree.] \DeclareFontFamily{U}{simpleiconsonethree}{} \DeclareFontShape{U}{simpleiconsonethree}{m}{n}{<-> SimpleIcons--simpleiconsonethree}{} \endinput diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonetwo.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonetwo.fd index 3758f7d3eaf..15383e70271 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonetwo.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonetwo.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconsonetwo.fd}[2024/07/26 Font definitions for U/simpleiconsonetwo.] + \ProvidesFile{usimpleiconsonetwo.fd}[2024/09/06 Font definitions for U/simpleiconsonetwo.] \DeclareFontFamily{U}{simpleiconsonetwo}{} \DeclareFontShape{U}{simpleiconsonetwo}{m}{n}{<-> SimpleIcons--simpleiconsonetwo}{} \endinput diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonezero.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonezero.fd index fd81d25f069..55afcfd5317 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonezero.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsonezero.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconsonezero.fd}[2024/07/26 Font definitions for U/simpleiconsonezero.] + \ProvidesFile{usimpleiconsonezero.fd}[2024/09/06 Font definitions for U/simpleiconsonezero.] \DeclareFontFamily{U}{simpleiconsonezero}{} \DeclareFontShape{U}{simpleiconsonezero}{m}{n}{<-> SimpleIcons--simpleiconsonezero}{} \endinput diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsseven.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsseven.fd index d2d2f7d7563..ab2fee0b659 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsseven.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsseven.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconsseven.fd}[2024/07/26 Font definitions for U/simpleiconsseven.] + \ProvidesFile{usimpleiconsseven.fd}[2024/09/06 Font definitions for U/simpleiconsseven.] \DeclareFontFamily{U}{simpleiconsseven}{} \DeclareFontShape{U}{simpleiconsseven}{m}{n}{<-> SimpleIcons--simpleiconsseven}{} \endinput diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconssix.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconssix.fd index 34967b3880c..fd94f829969 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconssix.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconssix.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconssix.fd}[2024/07/26 Font definitions for U/simpleiconssix.] + \ProvidesFile{usimpleiconssix.fd}[2024/09/06 Font definitions for U/simpleiconssix.] \DeclareFontFamily{U}{simpleiconssix}{} \DeclareFontShape{U}{simpleiconssix}{m}{n}{<-> SimpleIcons--simpleiconssix}{} \endinput diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsthree.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsthree.fd index b7a62581a61..b2f34339d2a 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsthree.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconsthree.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconsthree.fd}[2024/07/26 Font definitions for U/simpleiconsthree.] + \ProvidesFile{usimpleiconsthree.fd}[2024/09/06 Font definitions for U/simpleiconsthree.] \DeclareFontFamily{U}{simpleiconsthree}{} \DeclareFontShape{U}{simpleiconsthree}{m}{n}{<-> SimpleIcons--simpleiconsthree}{} \endinput diff --git a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconstwo.fd b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconstwo.fd index 0f1e0a70cec..93cd6dcf182 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/usimpleiconstwo.fd +++ b/Master/texmf-dist/tex/latex/simpleicons/usimpleiconstwo.fd @@ -1,5 +1,5 @@ - \ProvidesFile{usimpleiconstwo.fd}[2024/07/26 Font definitions for U/simpleiconstwo.] + \ProvidesFile{usimpleiconstwo.fd}[2024/09/06 Font definitions for U/simpleiconstwo.] \DeclareFontFamily{U}{simpleiconstwo}{} \DeclareFontShape{U}{simpleiconstwo}{m}{n}{<-> SimpleIcons--simpleiconstwo}{} \endinput diff --git a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty index eec160df3fc..1c97adf20a1 100644 --- a/Master/texmf-dist/tex/latex/siunitx/siunitx.sty +++ b/Master/texmf-dist/tex/latex/siunitx/siunitx.sty @@ -41,7 +41,7 @@ }% \endinput }% -\ProvidesExplPackage {siunitx} {2024-06-24} {3.3.19} +\ProvidesExplPackage {siunitx} {2024-08-20} {3.3.21} {A comprehensive (SI) units package} \msg_new:nnnn { siunitx } { incompatible-package } { Package~'#1'~incompatible. } @@ -1479,7 +1479,13 @@ \str_case:nnF {#1} { { down } { \use_i:nn } - { up } { \use_ii:nn } + { up } + { + \str_if_eq:eeTF + {#2} { \prg_replicate:nn { \tl_count:n {#2} } { 0 } } + { \use_i:nn } + { \use_ii:nn } + } } { \bool_lazy_or:nnTF @@ -2983,23 +2989,26 @@ { \siunitx_angle:eee { \fp_eval:n { trunc(#1,0) } } - { \fp_eval:n { trunc((#1 - trunc(#1,0)) * 60,0) } } + { \fp_eval:n { abs(trunc((#1 - trunc(#1,0)) * 60,0)) } } { \fp_eval:n { - ( - (#1 - trunc(#1,0)) * 60 - - trunc((#1 - trunc(#1,0)) * 60,0) - ) + abs + ( + (#1 - trunc(#1,0)) * 60 + - trunc((#1 - trunc(#1,0)) * 60,0) + ) * 60 } } } \cs_generate_variant:Nn \__siunitx_angle_arc_convert:n { e } +\clist_const:Nn \c__siunitx_angle_parts_tl { degrees , minutes , seconds } \tl_new:N \l__siunitx_angle_degrees_tl \tl_new:N \l__siunitx_angle_minutes_tl \tl_new:N \l__siunitx_angle_seconds_tl \tl_new:N \l__siunitx_angle_sign_tl +\tl_new:N \l__siunitx_angle_signed_bool \keys_precompile:nnN { siunitx } { @@ -3013,49 +3022,32 @@ { \exp_not:V \l__siunitx_angle_tmp_tl } \keys_precompile:nnN { siunitx } - { input-comparators = , input-signs = } + { input-comparators = } \l__siunitx_angle_tmp_tl -\cs_set_protected:Npx \__siunitx_angle_suppress_comp_sign: +\cs_set_protected:Npx \__siunitx_angle_suppress_comp: { \exp_not:V \l__siunitx_angle_tmp_tl } \cs_new_protected:Npn \__siunitx_angle_arc_sign:nnn #1#2#3 { \group_begin: \__siunitx_angle_suppress_exp_uncert: \tl_clear:N \l__siunitx_angle_sign_tl - \__siunitx_angle_arc_sign:nn {#1} { degrees } + \bool_set_false:N \l__siunitx_angle_signed_bool + \str_if_eq:nnTF {#1} { -0 } + { + \__siunitx_angle_arc_sign:nn { } { degrees } + \__siunitx_angle_suppress_comp: + \tl_set:Nn \l__siunitx_angle_sign_tl { - } + \bool_set_true:N \l__siunitx_angle_signed_bool + } + { \__siunitx_angle_arc_sign:nn {#1} { degrees } } \__siunitx_angle_arc_sign:nn {#2} { minutes } \__siunitx_angle_arc_sign:nn {#3} { seconds } \tl_if_empty:NF \l__siunitx_angle_sign_tl { - \clist_map_inline:nn { degrees , minutes , seconds } - { - \tl_if_empty:cF { l__siunitx_angle_ ##1 _tl } - { - \tl_set:cx { l__siunitx_angle_ ##1 _tl } - { - { } - { \exp_not:V \l__siunitx_angle_sign_tl } - \exp_after:wN \exp_after:wN \exp_after:wN - \__siunitx_angle_sign:nnnnnnn - \cs:w l__siunitx_angle_ ##1 _tl \cs_end: - } - \clist_map_break: - } - } - } - \clist_map_inline:nn { degrees , minutes , seconds } - { - \tl_if_empty:cF { l__siunitx_angle_ ##1 _tl } - { - \siunitx_number_process:cc - { l__siunitx_angle_ ##1 _tl } { l__siunitx_angle_ ##1 _tl } - \tl_set:cx { l__siunitx_angle_ ##1 _tl } - { - \siunitx_number_output:cN - { l__siunitx_angle_ ##1 _tl } \q_nil - } - } + \clist_map_function:NN \c__siunitx_angle_parts_tl + \__siunitx_angle_arc_sign_auxi:n } + \clist_map_function:NN \c__siunitx_angle_parts_tl \__siunitx_angle_arc_sign_auxii:n \__siunitx_angle_arc_print:VVV \l__siunitx_angle_degrees_tl \l__siunitx_angle_minutes_tl @@ -3076,6 +3068,40 @@ { \siunitx_number_parse:nN {#1} \l__siunitx_angle_tmp_tl \exp_after:wN \__siunitx_angle_extract_sign:nnnnnnnn \l__siunitx_angle_tmp_tl {#2} + \bool_set_true:N \l__siunitx_angle_signed_bool + } + } +\cs_new_protected:Npn \__siunitx_angle_arc_sign_auxi:n #1 + { + \tl_if_empty:cF { l__siunitx_angle_ #1 _tl } + { + \tl_set:cx { l__siunitx_angle_ #1 _tl } + { + { } + { \exp_not:V \l__siunitx_angle_sign_tl } + \exp_after:wN \exp_after:wN \exp_after:wN + \__siunitx_angle_sign:nnnnnnn + \cs:w l__siunitx_angle_ #1 _tl \cs_end: + } + \clist_map_break: + } + } +\cs_new_protected:Npn \__siunitx_angle_arc_sign_auxii:n #1 + { + \tl_if_empty:cF { l__siunitx_angle_ #1 _tl } + { + \bool_lazy_and:nnF + { \l__siunitx_angle_force_arc_bool } + { ! \str_if_eq_p:nn {#1} { seconds } } + { + \siunitx_number_process:cc + { l__siunitx_angle_ #1 _tl } { l__siunitx_angle_ #1 _tl } + } + \tl_set:cx { l__siunitx_angle_ #1 _tl } + { + \siunitx_number_output:cN + { l__siunitx_angle_ #1 _tl } \q_nil + } } } \cs_new_protected:Npn \__siunitx_angle_extract_sign:nnnnnnnn #1#2#3#4#5#6#7#8 @@ -3083,10 +3109,12 @@ \tl_if_blank:nTF {#2} { \tl_set_eq:cN { l__siunitx_angle_ #8 _tl } \l__siunitx_angle_tmp_tl } { + \bool_if:NTF \l__siunitx_angle_signed_bool + { \msg_error:nnn { siunitx } { arc-multi-sign } } + { \tl_set:Nn \l__siunitx_angle_sign_tl {#2} } \tl_set:cn { l__siunitx_angle_ #8 _tl } { {#1} { } {#3} {#4} {#5} {#6} {#7} } - \tl_set:Nn \l__siunitx_angle_sign_tl {#2} - \__siunitx_angle_suppress_comp_sign: + \__siunitx_angle_suppress_comp: } } \cs_new:Npn \__siunitx_angle_sign:nnnnnnn #1#2#3#4#5#6#7 @@ -3206,6 +3234,12 @@ \siunitx_unit_format:nN {#1} \l__siunitx_angle_tmp_tl \siunitx_print_unit:V \l__siunitx_angle_tmp_tl } +\msg_new:nnnn { siunitx } { arc-multi-sign } + { Multiple~signs~given~for~arc~angle! } + { + An~angle~given~as~an~arc~should~have~at~most~one~sign:~ + only~the~first~sign~will~be~used. + } \keys_set:nn { siunitx } { angle-mode = input , @@ -3871,10 +3905,10 @@ \bool_lazy_or:nnTF { \str_if_eq_p:nn {#2} { i } } { \str_if_eq_p:nn {#2#3} { +i } } - { \__siunitx_complex_convert_polar_auxvi:nnn { } { 1 } {#1} } + { \__siunitx_complex_convert_polar_auxvii:nnn { } { 1 } {#1} } { \str_if_eq:nnTF {#2#3} { -i } - { \__siunitx_complex_convert_polar_auxvi:nnn { } { -1 } {#1} } + { \__siunitx_complex_convert_polar_auxvii:nnn { } { -1 } {#1} } { \__siunitx_complex_convert_polar_auxiii:nnw {#1} {#2} #3 + + \q_stop } } } @@ -3884,7 +3918,7 @@ { \__siunitx_complex_convert_polar_auxiv:nnw {#1} {#2} #3 - - \q_stop } { \str_if_eq:nnTF {#4} { i } - { \__siunitx_complex_convert_polar_auxvi:nnn {#2#3} { 1 } {#1} } + { \__siunitx_complex_convert_polar_auxvii:nnn {#2#3} { 1 } {#1} } { \__siunitx_complex_convert_polar_auxv:nnw {#2#3} {#1} #4 i \q_nil i \q_stop } } } @@ -3894,35 +3928,45 @@ { \__siunitx_complex_convert_polar_auxv:nnw { } {#1} #2#3 i \q_nil i \q_stop } { \str_if_eq:nnTF {#4} { i } - { \__siunitx_complex_convert_polar_auxvi:nnn { } { -1 } {#1} } + { \__siunitx_complex_convert_polar_auxvii:nnn { } { -1 } {#1} } { \__siunitx_complex_convert_polar_auxv:nnw {#2#3} {#1} -#4 i \q_nil i \q_stop } } } \cs_new:Npn \__siunitx_complex_convert_polar_auxv:nnw #1#2#3 i #4 i #5 \q_stop { \quark_if_nil:nTF {#4} - { { #3 \tl_if_blank:nF {#2} { e#2 } } { 0 } } - { \__siunitx_complex_convert_polar_auxvi:nnn {#1} {#3} {#2} } + { + \tl_if_head_eq_meaning:nNTF {#3} - + { \__siunitx_complex_convert_polar_auxvi:enn { \use_none:n #3 } { 180 } } + { \__siunitx_complex_convert_polar_auxvi:nnn {#3} { 0 } } + {#2} + } + { \__siunitx_complex_convert_polar_auxvii:nnn {#1} {#3} {#2} } } \cs_new:Npn \__siunitx_complex_convert_polar_auxvi:nnn #1#2#3 { - \__siunitx_complex_convert_polar_auxvii:eee + { #1 \tl_if_blank:nF {#3} { e#3 } } {#2} + } +\cs_generate_variant:Nn \__siunitx_complex_convert_polar_auxvi:nnn { e } +\cs_new:Npn \__siunitx_complex_convert_polar_auxvii:nnn #1#2#3 + { + \__siunitx_complex_convert_polar_auxviii:eee { \tl_if_blank:nTF {#1} { 0 } {#1} } { \tl_if_blank:nTF {#2} { 0 } {#2} } { \tl_if_blank:nF {#3} { e#3 } } } -\cs_new:Npn \__siunitx_complex_convert_polar_auxvii:nnn #1#2#3 +\cs_new:Npn \__siunitx_complex_convert_polar_auxviii:nnn #1#2#3 { - \__siunitx_complex_format_polar_auxviii:ee + \__siunitx_complex_format_polar_auxix:ee { \fp_eval:n { sqrt ( (#1#3)^2 + (#2#3)^2 ) } } { \fp_eval:n { atan \bool_if:NT \l__siunitx_complex_polar_degree_bool { d } (#2 , #1) } } } -\cs_generate_variant:Nn \__siunitx_complex_convert_polar_auxvii:nnn { eee } -\cs_new:Npn \__siunitx_complex_format_polar_auxviii:nn #1#2 { {#1} {#2} } -\cs_generate_variant:Nn \__siunitx_complex_format_polar_auxviii:nn { ee } +\cs_generate_variant:Nn \__siunitx_complex_convert_polar_auxviii:nnn { eee } +\cs_new:Npn \__siunitx_complex_format_polar_auxix:nn #1#2 { {#1} {#2} } +\cs_generate_variant:Nn \__siunitx_complex_format_polar_auxix:nn { ee } \msg_new:nnnn { siunitx } { invalid-polar-form } { Invalid~polar~form~"#1:#2". } { @@ -5308,13 +5352,6 @@ { \group_begin: \tl_clear:N \l__siunitx_table_collect_tl - \if_false: { \fi: - \cs_set_protected:Npn \cr - { - \__siunitx_table_collect_loop: - \tex_cr:D - } - \if_false: } \fi: \__siunitx_table_collect_begin:w } \cs_new_protected:Npn \__siunitx_table_collect_begin:w #1 \ignorespaces @@ -5339,9 +5376,9 @@ { \unskip { \__siunitx_table_collect_loop: } \textonly@unskip { \__siunitx_table_collect_loop: } - \end { \tabularnewline \end } + \end { \__siunitx_table_collect_pre_cr: \tabularnewline \end } \relax { \__siunitx_table_collect_relax:N #1 } - \tabularnewline { \tabularnewline } + \tabularnewline { \__siunitx_table_collect_pre_cr: \tabularnewline } \siunitx_cell_end: { \siunitx_cell_end: } } { \__siunitx_table_collect_token_aux:N #1 } @@ -5368,9 +5405,9 @@ \@maybe@unskip { \__siunitx_table_collect_loop: } \tab@setcr { \__siunitx_table_collect_loop: } \unskip { \__siunitx_table_collect_loop: } - \end { \tabularnewline \end } + \end { \__siunitx_table_collect_pre_cr: \tabularnewline \end } \relax { \__siunitx_table_collect_relax:N #1 } - \tabularnewline { \tabularnewline } + \tabularnewline { \__siunitx_table_collect_pre_cr: \tabularnewline } \siunitx_cell_end: { \siunitx_cell_end: } } { \__siunitx_table_collect_token_aux:N #1 } @@ -5391,6 +5428,16 @@ { \use_i_delimit_by_q_stop:nw {#3} } { \__siunitx_table_collect_search_aux:NNn #1 } } +\cs_new_protected:Npn \__siunitx_table_collect_pre_cr: + { + \if_false: { \fi: + \cs_set_protected:Npn \cr + { + \__siunitx_table_collect_loop: + \tex_cr:D + } + \if_false: } \fi: + } \tl_new:N \l__siunitx_table_before_tl \tl_new:N \l__siunitx_table_number_tl \tl_new:N \l__siunitx_table_after_tl diff --git a/Master/texmf-dist/tex/latex/suanpan-l3/suanpan-l3.sty b/Master/texmf-dist/tex/latex/suanpan-l3/suanpan-l3.sty new file mode 100644 index 00000000000..fad6395f513 --- /dev/null +++ b/Master/texmf-dist/tex/latex/suanpan-l3/suanpan-l3.sty @@ -0,0 +1,1237 @@ +%%% ---------------------------------------------------------------------------- +%%% suanpan: draw suanpan(abacus) with LaTeX3 +%%% Author : Nan Geng <nangeng@nwafu.edu.cn> +%%% Repository: https://gitee.com/nwafu_nan/suan-span +%%% License : The LaTeX Project Public License 1.3c +%%% ---------------------------------------------------------------------------- + +\NeedsTeXFormat{LaTeX2e}[2020/10/01] +\RequirePackage{expl3} +% \ProvidesExplPackage{suanpan}{2024-08-20}{v1.0.0} % 初稿 +% \ProvidesExplPackage{suanpan}{2024-08-28}{v1.1.0} % 优化(统一尺寸计算,添加空白占位) +% \ProvidesExplPackage{suanpan-l3}{2024-08-30}{v1.1.1} % 更名为suanpan-l3 +% \ProvidesExplPackage{suanpan-l3}{2024-08-31}{v1.1.2} % 添加empty不绘制空档选项 +% \ProvidesExplPackage{suanpan-l3}{2024-09-01}{v1.1.3} % 添加bid批处理及绘制颜色选项 +% % 将算珠与档杆绘制改为TikZ +\ProvidesExplPackage{suanpan-l3}{2024-09-04}{v1.2.0} % 添加\lab横梁文字标记命令 + {draw suanpan(abacus) with LaTeX3} + +\RequirePackage{l3keys2e} +\RequirePackage{xparse} +\RequirePackage{l3draw} + +\RequirePackage {tikz} + +% Expl3中载入tikz宏包库的补丁 +% \ExplSyntaxOff +% \patchcmd +% {\pgfutil@InputIfFileExists} +% {\input #1} +% {% +% \@pushfilename +% \xdef\@currname{#1}% +% \input #1 % +% \@popfilename +% } +% {}{} +% \ExplSyntaxOn +% % 添加tikz宏包的库 +% \usetikzlibrary{calc} + +\cs_new:Npn \__suanpan_error:n { \msg_error:nn { suanpan(abacus) } } + +% 盒子容器总高度计算函数 +\cs_new_nopar:Npn \__suanpan_coffin_ht_plus_dp:N #1 + { + \coffin_ht:N #1 + \coffin_dp:N #1 + } + +% =============颜色处理函数============= +% 填充色辅助函数 +\cs_new_nopar:Nn \__suanpan_aux_color_boxfill: + { } + +% 颜色命名函数 +% #1 颜色名称 +% #2 颜色表达式 +\cs_set_nopar:Npn \__suanpan_color_select:nn #1#2 + { + \color_set:nn {#1} {#2} + \colorlet { #1 } { #2 } + } +\cs_generate_variant:Nn \__suanpan_color_select:nn {nx} + +% 颜色命名函数 +% #1 颜色名称 +% #2 颜色空间 +% #3 颜色分量值 +\cs_set_nopar:Npn \__suanpan_color_select:nnn #1#2#3 + { + \color_set:nnn {#1} {#2} {#3} + \definecolor { #1 } { #2 } + } +\cs_generate_variant:Nn \__suanpan_color_select:nnn {nnx} + +% 定义变量 +% 算盘基础尺寸 +\dim_new:N \l__suanpan_bid_h_dim +\dim_new:N \l__suanpan_bid_d_dim +\dim_new:N \l__suanpan_bid_sep_dim +\dim_new:N \l__suanpan_rod_sep_dim +\dim_new:N \l__suanpan_rod_d_dim +\dim_new:N \l__suanpan_frame_b_dim + +% 算盘基础尺寸初值(参考 QBT1747-1993 算盘标准) +\dim_set:Nn \l__suanpan_bid_h_dim { 12mm } +\dim_set:Nn \l__suanpan_bid_d_dim { 23mm } +\dim_set:Nn \l__suanpan_bid_sep_dim { 1.8pt } +\dim_set:Nn \l__suanpan_rod_sep_dim { 4pt } +\dim_set:Nn \l__suanpan_rod_d_dim { 7mm } +\dim_set:Nn \l__suanpan_frame_b_dim { 13mm } + +% 半长度 +\dim_new:N \l__suanpan_bid_h_half_dim +\dim_new:N \l__suanpan_bid_d_half_dim +\dim_new:N \l__suanpan_rod_d_half_dim +\dim_new:N \l__suanpan_frame_b_half_dim + +% 上珠偏移 +\dim_new:N \l__suanpan_bid_upper_offset_dim +% 下珠偏移 +\dim_new:N \l__suanpan_bid_lower_offset_dim +% 上档杆长度 +\dim_new:N \l__suanpan_rod_upper_h_dim +% 下档杆长度 +\dim_new:N \l__suanpan_rod_lower_h_dim +% 上档杆偏移 +\dim_new:N \l__suanpan_rod_upper_offset_dim +% 下档杆偏移 +\dim_new:N \l__suanpan_rod_lower_offset_dim +% 上档杆位置 +\dim_new:N \l__suanpan_rod_upper_dim +% 下档杆位置 +\dim_new:N \l__suanpan_rod_lower_dim +% 上边框内线偏移 +\dim_new:N \l__suanpan_frame_upper_inner_offset_dim +% 下边框内线偏移 +\dim_new:N \l__suanpan_frame_lower_inner_offset_dim +% 上边框外线偏移 +\dim_new:N \l__suanpan_frame_upper_outer_offset_dim +% 下边框外线偏移 +\dim_new:N \l__suanpan_frame_lower_outer_offset_dim +% 算珠上边缘 +\dim_new:N \l__suanpan_bid_upper_dim +% 算珠下边缘 +\dim_new:N \l__suanpan_bid_lower_dim +% 算珠圆角半径 +\dim_new:N \l__suanpan_bid_arc_dim +% 横梁计位点半径 +\dim_new:N \l__suanpan_frame_unit_r_dim +% 边框外线半宽度 +\dim_new:N \l__suanpan_frame_outer_half_dim +% 档杆总成宽度 +\dim_new:N \l__suanpan_support_d_dim +% 档杆总成半宽度 +\dim_new:N \l__suanpan_support_d_half_dim +% 上档杆总成高度 +\dim_new:N \l__suanpan_support_upper_dim +% 下档杆总成高度 +\dim_new:N \l__suanpan_support_lower_dim +% 档杆总成组装垂直偏移 +\dim_new:N \l__suanpan_support_y_offset_dim + +% 上边框外线位置 +\dim_new:N \l__suanpan_frame_outer_upper_dim +% 下边框外线位置 +\dim_new:N \l__suanpan_frame_outer_lower_dim +% 上边框内线位置 +\dim_new:N \l__suanpan_frame_inner_upper_dim +% 下边框内线位置 +\dim_new:N \l__suanpan_frame_inner_lower_dim + +% 边框内线高度 +\dim_new:N \l__suanpan_frame_inner_h_dim +% 边框外线高度 +\dim_new:N \l__suanpan_frame_outer_h_dim + +% 左右边框外线偏移 +\dim_new:N \l__suanpan_frame_outer_lr_offset_dim +% 左右边框外线圆角半径 +\dim_new:N \l__suanpan_frame_outer_arc_dim + +\dim_new:N \l__suanpan_frame_inner_linewidth_dim +\dim_new:N \l__suanpan_frame_outer_linewidth_dim +\dim_new:N \l__suanpan_rod_linewidth_dim +\dim_new:N \l__suanpan_bid_linewidth_dim + +% 状态变量 +\bool_new:N \l__suanpan_support_frame_bool +\bool_set_true:N \l__suanpan_support_frame_bool +\bool_new:N \l__suanpan_support_unit_bool +\bool_set_false:N \l__suanpan_support_unit_bool +\bool_new:N \l__suanpan_draft_bool +\bool_new:N \l__suanpan_empty_rod_bool + +% 容器(盒子) +\coffin_new:N \l__suanpan_inner_bid_coffin +\coffin_new:N \l__suanpan_outer_bid_coffin +\coffin_new:N \l__suanpan_float_bid_coffin +\coffin_new:N \l__suanpan_support_coffin +\coffin_new:N \l_tmpc_coffin +\coffin_new:N \l_tmpd_coffin + +% 凭据表(Token) +\tl_new:N \l__suanpan_bid_draw_color_tl +\tl_new:N \l__suanpan_bid_fill_color_tl +\tl_new:N \l__suanpan_scale_tl + +% 档位最大值 +\int_new:N \l__suanpan_rod_max_int +\int_zero:N \l__suanpan_rod_max_int + +% 档位算珠位置列表 +\clist_new:N \l__suanpan_bids_pos_clist + +% 档位数字与算珠位置对照属性表常量(内珠和外珠) +% {x, y}==>x: 算珠位置(1-11, 1-7---下珠,8-10---上珠,11---悬珠) +% y: 算珠类型(0---外珠,1---内珠) +\prop_const_from_keyval:Nn \l__suanpan_rods_val_prop + { + 0 = {{1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}, {9, 0}, {10, 0}}, + 1 = {{1, 0}, {2, 0}, {3, 0}, {4, 0}, {7, 1}, {9, 0}, {10, 0}}, + 2 = {{1, 0}, {2, 0}, {3, 0}, {6, 1}, {7, 1}, {9, 0}, {10, 0}}, + 3 = {{1, 0}, {2, 0}, {5, 1}, {6, 1}, {7, 1}, {9, 0}, {10, 0}}, + 4 = {{1, 0}, {4, 1}, {5, 1}, {6, 1}, {7, 1}, {9, 0}, {10, 0}}, + 5 = {{1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}, {8, 1}, {10, 0}}, + 6 = {{1, 0}, {2, 0}, {3, 0}, {4, 0}, {7, 1}, {8, 1}, {10, 0}}, + 7 = {{1, 0}, {2, 0}, {3, 0}, {6, 1}, {7, 1}, {8, 1}, {10, 0}}, + 8 = {{1, 0}, {2, 0}, {5, 1}, {6, 1}, {7, 1}, {8, 1}, {10, 0}}, + 9 = {{1, 0}, {4, 1}, {5, 1}, {6, 1}, {7, 1}, {8, 1}, {10, 0}}, + 10 = {{3, 1}, {4, 1}, {5, 1}, {6, 1}, {7, 1}, {8, 1}, {10, 0}}, + 11 = {{1, 0}, {2, 0}, {3, 0}, {4, 0}, {7, 1}, {8, 1}, {9 , 1}}, + 12 = {{1, 0}, {2, 0}, {3, 0}, {6, 1}, {7, 1}, {8, 1}, {9 , 1}}, + 13 = {{1, 0}, {2, 0}, {5, 1}, {6, 1}, {7, 1}, {8, 1}, {9 , 1}}, + 14 = {{1, 0}, {4, 1}, {5, 1}, {6, 1}, {7, 1}, {8, 1}, {9 , 1}}, + 15 = {{3, 1}, {4, 1}, {5, 1}, {6, 1}, {7, 1}, {8, 1}, {9 , 1}}, + 16 = {{1, 0}, {2, 0}, {3, 0}, {4, 0}, {7, 1}, {8, 1}, {11, 1}}, + 17 = {{1, 0}, {2, 0}, {3, 0}, {6, 1}, {7, 1}, {8, 1}, {11, 1}}, + 18 = {{1, 0}, {2, 0}, {5, 1}, {6, 1}, {7, 1}, {8, 1}, {11, 1}}, + 19 = {{1, 0}, {4, 1}, {5, 1}, {6, 1}, {7, 1}, {8, 1}, {11, 1}}, + 20 = {{3, 1}, {4, 1}, {5, 1}, {6, 1}, {7, 1}, {8, 1}, {11, 1}} + } + +% 尺寸计算函数 +\cs_new:Nn \__suanpan_dim_calc: + { + % 基础尺寸半长度 + \dim_set:Nn \l__suanpan_bid_h_half_dim { \l__suanpan_bid_h_dim / 2 } + \dim_set:Nn \l__suanpan_bid_d_half_dim { \l__suanpan_bid_d_dim / 2 } + \dim_set:Nn \l__suanpan_rod_d_half_dim { \l__suanpan_rod_d_dim / 2 } + \dim_set:Nn \l__suanpan_frame_b_half_dim { \l__suanpan_frame_b_dim / 2 } + % 上珠偏移(8号算珠) + \dim_set:Nn \l__suanpan_bid_upper_offset_dim + { \l__suanpan_frame_b_half_dim + \l__suanpan_bid_h_half_dim } + % 下珠偏移(1号算珠) + \dim_set:Nn \l__suanpan_bid_lower_offset_dim + { -\l__suanpan_frame_b_half_dim - \l__suanpan_bid_h_dim * 7 + + \l__suanpan_bid_h_half_dim } + % 上档杆长度 + \dim_set:Nn \l__suanpan_rod_upper_h_dim { \l__suanpan_bid_h_dim * 3 } + % 下档杆长度 + \dim_set:Nn \l__suanpan_rod_lower_h_dim { \l__suanpan_bid_h_dim * 7 } + % 上档杆偏移 + \dim_set:Nn \l__suanpan_rod_upper_offset_dim { \l__suanpan_frame_b_half_dim } + % 下档杆偏移 + \dim_set:Nn \l__suanpan_rod_lower_offset_dim + { -\l__suanpan_frame_b_half_dim - \l__suanpan_rod_lower_h_dim } + % 上档杆位置 + \dim_set:Nn \l__suanpan_rod_upper_dim + { \l__suanpan_rod_upper_offset_dim + \l__suanpan_rod_upper_h_dim } + % 下档杆位置 + \dim_set:Nn \l__suanpan_rod_lower_dim { -\l__suanpan_frame_b_half_dim } + % 上边框内线偏移 + \dim_set:Nn \l__suanpan_frame_upper_inner_offset_dim + { \l__suanpan_frame_b_half_dim + \l__suanpan_rod_upper_h_dim } + % 下边框内线偏移 + \dim_set:Nn \l__suanpan_frame_lower_inner_offset_dim + { -\l__suanpan_frame_b_half_dim - \l__suanpan_rod_lower_h_dim } + % 上边框外线偏移 + \dim_set:Nn \l__suanpan_frame_upper_outer_offset_dim + { \l__suanpan_frame_b_dim + \l__suanpan_frame_b_half_dim + + \l__suanpan_rod_upper_h_dim } + % 下边框外线偏移 + \dim_set:Nn \l__suanpan_frame_lower_outer_offset_dim + { -\l__suanpan_frame_b_dim - \l__suanpan_frame_b_half_dim - + \l__suanpan_rod_lower_h_dim } + % 算珠上边缘 + \dim_set:Nn \l__suanpan_bid_upper_dim + { \l__suanpan_bid_h_half_dim - \l__suanpan_bid_sep_dim } + % 算珠上边缘 + \dim_set:Nn \l__suanpan_bid_lower_dim + { -\l__suanpan_bid_h_half_dim + \l__suanpan_bid_sep_dim } + % 算珠圆角半径 + \dim_set:Nn \l__suanpan_bid_arc_dim { \l__suanpan_bid_upper_dim - 1pt} + + % 横梁计位点半径 + \dim_set:Nn \l__suanpan_frame_unit_r_dim { \l__suanpan_frame_b_dim / 4 } + + % 边框外线半宽度 + \dim_set:Nn \l__suanpan_frame_outer_half_dim + { \l__suanpan_frame_outer_linewidth_dim / 2 } + % 档杆总成宽度 + \dim_set:Nn \l__suanpan_support_d_dim + { \l__suanpan_bid_d_dim + \l__suanpan_rod_sep_dim } + % 档杆总成半宽度 + \dim_set:Nn \l__suanpan_support_d_half_dim + { \l__suanpan_bid_d_half_dim + \l__suanpan_rod_sep_dim / 2 } + % 上档杆总成高度 + \dim_set:Nn \l__suanpan_support_upper_dim + { \l__suanpan_frame_upper_outer_offset_dim - + \l__suanpan_frame_outer_half_dim } + % 下档杆总成高度 + \dim_set:Nn \l__suanpan_support_lower_dim + { \l__suanpan_frame_lower_outer_offset_dim + + \l__suanpan_frame_outer_half_dim } + % 档杆总成组装垂直偏移 + \dim_set:Nn \l__suanpan_support_y_offset_dim + { ( \l__suanpan_frame_upper_outer_offset_dim - + \l__suanpan_frame_lower_outer_offset_dim + + \l__suanpan_frame_outer_linewidth_dim ) / 2 - + \l__suanpan_frame_upper_outer_offset_dim - + \l__suanpan_frame_outer_half_dim + } + + % 上边框外线位置 + \dim_set:Nn \l__suanpan_frame_outer_upper_dim + { \l__suanpan_frame_upper_inner_offset_dim + + \l__suanpan_frame_b_dim - + \l__suanpan_frame_outer_half_dim } + % 下边框外线位置 + \dim_set:Nn \l__suanpan_frame_outer_lower_dim + { \l__suanpan_frame_lower_inner_offset_dim - + \l__suanpan_frame_b_dim + + \l__suanpan_frame_outer_half_dim } + % 上边框内线位置 + \dim_set:Nn \l__suanpan_frame_inner_upper_dim + { \l__suanpan_frame_upper_inner_offset_dim + + \l__suanpan_frame_inner_linewidth_dim / 2 } + % 下边框内线位置 + \dim_set:Nn \l__suanpan_frame_inner_lower_dim + { \l__suanpan_frame_lower_inner_offset_dim - + \l__suanpan_frame_inner_linewidth_dim / 2 } + + % 边框内线高度 + \dim_set:Nn \l__suanpan_frame_inner_h_dim + { \l__suanpan_rod_upper_h_dim + + \l__suanpan_rod_lower_h_dim + + \l__suanpan_frame_b_dim } + % 边框外线高度 + \dim_set:Nn \l__suanpan_frame_outer_h_dim + { \l__suanpan_rod_upper_h_dim + + \l__suanpan_rod_lower_h_dim + + \l__suanpan_frame_b_dim * 3 } + + % 左右边框外线偏移 + \dim_set:Nn \l__suanpan_frame_outer_lr_offset_dim + { \l__suanpan_support_d_half_dim + + \l__suanpan_frame_b_dim - + \l__suanpan_frame_outer_half_dim } + + % 左右边框外线圆角半径 + \dim_set:Nn \l__suanpan_frame_outer_arc_dim + { \l__suanpan_frame_outer_linewidth_dim / 3 - 1pt } + } + +% 选项处理 +% ============宏包选项================= +\keys_define:nn { suanpan } + { + % 草稿模式 + draft .choice:, + draft / true .code:n = {% + \bool_set_true:N \l__suanpan_draft_bool + \bool_set_false:N \l__suanpan_empty_rod_bool + }, + draft / false .code:n = {% + \bool_set_false:N \l__suanpan_draft_bool + \bool_set_true:N \l__suanpan_empty_rod_bool + }, + draft .default:n = true, + draft .initial:n = false, + + % 是否绘制档的数值为0的算珠 + empty .choice:, + empty / true .code:n = { \bool_set_true:N \l__suanpan_empty_rod_bool }, + empty / false .code:n = { \bool_set_false:N \l__suanpan_empty_rod_bool }, + empty .default:n = true, + empty .initial:n = true, + + unknown .code:n = { \msg_error:nn { suanpan } { unknown-option } } + } + +% key_value选项设计 +\keys_define:nn { suanpan } + { + % 绘图线宽 + linewd .code:n = { % 算盘边框内线线宽 + \dim_set:Nn \l__suanpan_frame_inner_linewidth_dim {#1} + % 算盘边框外线线宽 + \dim_set:Nn \l__suanpan_frame_outer_linewidth_dim + { + \fp_to_dim:n + { + \fp_eval:n {% + \l__suanpan_frame_inner_linewidth_dim * 7.0 } + } + } + % 档杆线宽 + \dim_set:Nn \l__suanpan_rod_linewidth_dim + { + \fp_to_dim:n + { + \fp_eval:n {% + \l__suanpan_frame_inner_linewidth_dim * 0.2 } + } + } + % 算珠线宽 + \dim_set:Nn \l__suanpan_bid_linewidth_dim + { + \fp_to_dim:n + { + \fp_eval:n {% + \l__suanpan_frame_inner_linewidth_dim * 0.2 } + } + } + % 计算其它尺寸 + \__suanpan_dim_calc: + }, + linewd .initial:n = 2.0pt, + + % 档间间距 + rodsep .code:n = {% + \dim_set:Nn \l__suanpan_rod_sep_dim { #1 } + % 计算其它尺寸 + \__suanpan_dim_calc: + }, + rodsep .initial:n = 3.0pt, + + % 算珠间距 + bidsep .code:n = {% + \dim_set:Nn \l__suanpan_bid_sep_dim { #1 } + % 计算其它尺寸 + \__suanpan_dim_calc: + }, + bidsep .initial:n = 0.0pt, + + % 缩放参数 + scale .tl_set:N = \l__suanpan_scale_tl, + scale .initial:n = 1.0, + + % 边框绘图颜色 + framedraw .code:n = { \__suanpan_color_select:nn { framecolor } {#1} }, + framedraw .initial:n = black, + framedraw* .code:n = { \__suanpan_color_select:nnn { framecolor } #1 }, + + % 档杆绘图颜色 + roddraw .code:n = { \__suanpan_color_select:nn { roddrawcolor } {#1} }, + roddraw .initial:n = black, + roddraw* .code:n = { \__suanpan_color_select:nnn { roddrawcolor } #1 }, + % 档杆填充颜色 + rodfill .code:n = { \__suanpan_color_select:nn { rodfillcolor } {#1} }, + rodfill .initial:n = black!20, + rodfill* .code:n = { \__suanpan_color_select:nnn { rodfillcolor } #1 }, + + % 外珠绘图颜色 + outerdraw .code:n = { \__suanpan_color_select:nn { outerdrawcolor } {#1} }, + outerdraw .initial:n = black, + outerdraw* .code:n = { \__suanpan_color_select:nnn { outerdrawcolor } #1 }, + % 外珠填充颜色 + outerfill .code:n = { \__suanpan_color_select:nn { outerfillcolor } {#1} }, + outerfill .initial:n = black!40, + outerfill* .code:n = { \__suanpan_color_select:nnn { outerfillcolor } #1 }, + + % 内珠绘图颜色 + innerdraw .code:n = { \__suanpan_color_select:nn { innerdrawcolor } {#1} }, + innerdraw .initial:n = black, + innerdraw* .code:n = { \__suanpan_color_select:nnn { innerdrawcolor } #1 }, + % 内珠填充颜色 + innerfill .code:n = { \__suanpan_color_select:nn { innerfillcolor } {#1} }, + innerfill .initial:n = black, + innerfill* .code:n = { \__suanpan_color_select:nnn { innerfillcolor } #1 }, + + unknown .code:n = { \msg_error:nn { suanpan } { unknown-option } } + } + +% 出错输出信息 +\msg_new:nnn { suanpan } { unknown-option } + { package~ option~ "\l_keys_key_tl"~ is~ unknown. } + +% 选项默认值 +\keys_set:nn { suanpan } + { + linewd = 2.0pt, + rodsep = 3.0pt, + bidsep = 1.8pt, + scale = 1.0, + empty = true, + } + +% 将文档类选项传给suanpan +\ProcessKeysOptions { suanpan } + +% 构建内珠(靠近横梁,参与计数)容器(盒子) +\cs_new:Nn \__suanpan_inner_bid_construct: + { + % 判断是否为草稿模式 + \bool_if:NTF \l__suanpan_draft_bool + { + \tikzset{bid/.style ={ + inner~color=innerfillcolor!30, + outer~color=innerfillcolor, + draw = innerdrawcolor, + line~width=\l__suanpan_bid_linewidth_dim, + } + } + }{ + \tikzset{bid/.style = { + inner~color=innerfillcolor!30, + outer~color=innerfillcolor, + draw = innerdrawcolor, + line~width=\l__suanpan_bid_linewidth_dim, + rounded~corners=\l__suanpan_bid_arc_dim, + } + } + } + + \group_begin: + \hcoffin_gset:Nn \l__suanpan_inner_bid_coffin + { + \begin{tikzpicture} + \shadedraw[bid] + ( -\l__suanpan_bid_d_half_dim, \l__suanpan_bid_lower_dim) + rectangle + ( \l__suanpan_bid_d_half_dim, \l__suanpan_bid_upper_dim); + \end{tikzpicture} + } + \group_end: + } + +% 构建外珠(远离横梁,不参与计数)容器(盒子) +\cs_new:Nn \__suanpan_outer_bid_construct: + { + % 判断是否为草稿模式 + \bool_if:NTF \l__suanpan_draft_bool + { + \tikzset{bid/.style ={ + inner~color=outerfillcolor!30, + outer~color=outerfillcolor, + draw = outerdrawcolor, + line~width=\l__suanpan_bid_linewidth_dim, + } + } + }{ + \tikzset{bid/.style ={ + inner~color=outerfillcolor!30, + outer~color=outerfillcolor, + draw = outerdrawcolor, + line~width=\l__suanpan_bid_linewidth_dim, + rounded~corners=\l__suanpan_bid_arc_dim, + } + } + } + + \group_begin: + \hcoffin_gset:Nn \l__suanpan_outer_bid_coffin + { + \begin{tikzpicture} + \shadedraw[bid]% + ( -\l__suanpan_bid_d_half_dim, \l__suanpan_bid_lower_dim) + rectangle + ( \l__suanpan_bid_d_half_dim, \l__suanpan_bid_upper_dim); + \end{tikzpicture} + } + \group_end: + } + +% 构建浮珠容器(盒子) +% 浮珠指可以在算盘中任意布置的算珠 +% #1 绘制颜色 +% #2 填充颜色 +\cs_new:Npn \__suanpan_float_bid_construct:nn #1#2 + { + % 判断是否为草稿模式 + \bool_if:NTF \l__suanpan_draft_bool + { + \tikzset{bid/.style ={ + line~width=\l__suanpan_bid_linewidth_dim, + } + } + }{ + \tikzset{bid/.style ={ + line~width=\l__suanpan_bid_linewidth_dim, + rounded~corners=\l__suanpan_bid_arc_dim, + } + } + } + + \group_begin: + \hcoffin_gset:Nn \l__suanpan_float_bid_coffin + { + \begin{tikzpicture} + \shadedraw[draw = #1, + inner~color=#2!30, + outer~color=#2, + bid]% + ( -\l__suanpan_bid_d_half_dim, \l__suanpan_bid_lower_dim) + rectangle + ( \l__suanpan_bid_d_half_dim, \l__suanpan_bid_upper_dim); + \end{tikzpicture} + } + \group_end: + } + +% 构建档杆容器(盒子) +\cs_new:Nn \__suanpan_support_construct: + { + % TikZ绘图样式 + \tikzset{% + rod/.style = {% 档杆 + inner~color=rodfillcolor!30, + outer~color=rodfillcolor, + draw=roddrawcolor, + line~width=\l__suanpan_rod_linewidth_dim, + }, + beam/.style = {% 横梁 + bottom~color=framecolor!60, + top~color=framecolor!60, + middle~color = framecolor!5, + }, + frame/.style = {% 上下梁 + bottom~color=framecolor!95, + top~color=framecolor!95, + middle~color = framecolor!15, + }, + frameinner/.style = {% 内边框线 + draw=framecolor, + line~width=\l__suanpan_frame_inner_linewidth_dim, + }, + frameouter/.style = {% 外边框线 + draw=framecolor, + line~width=\l__suanpan_frame_outer_linewidth_dim, + }, + } + + \group_begin: + \hcoffin_gset:Nn \l__suanpan_support_coffin + { + \begin{tikzpicture} + % 绘制下杆 + \shadedraw[rod] + ( -\l__suanpan_rod_d_half_dim, \l__suanpan_rod_lower_offset_dim ) + rectangle + ( \l__suanpan_rod_d_half_dim, \l__suanpan_rod_lower_dim ); + % 绘制上杆 + \shadedraw[rod] + ( -\l__suanpan_rod_d_half_dim, \l__suanpan_rod_upper_offset_dim ) + rectangle + ( \l__suanpan_rod_d_half_dim, \l__suanpan_rod_upper_dim ); + + % 绘制横梁 + \shade[beam] + ( -\l__suanpan_support_d_half_dim, -\l__suanpan_frame_b_half_dim ) + rectangle + ( \l__suanpan_support_d_half_dim, \l__suanpan_frame_b_half_dim ); + \draw[frameinner] + ( -\l__suanpan_support_d_half_dim, \l__suanpan_frame_b_half_dim ) + -- + ( \l__suanpan_support_d_half_dim, \l__suanpan_frame_b_half_dim ); + \draw[frameinner] + ( -\l__suanpan_support_d_half_dim, -\l__suanpan_frame_b_half_dim ) + -- + ( \l__suanpan_support_d_half_dim, -\l__suanpan_frame_b_half_dim ); + + % 绘制上梁下边线 + \draw[frameinner] + ( -\l__suanpan_support_d_half_dim, + \l__suanpan_frame_upper_inner_offset_dim ) + -- + ( \l__suanpan_support_d_half_dim, + \l__suanpan_frame_upper_inner_offset_dim ); + % 绘制上梁上边线 + \draw[frameouter] + ( -\l__suanpan_support_d_half_dim, + \l__suanpan_frame_upper_outer_offset_dim - + \l__suanpan_frame_outer_linewidth_dim) + -- + ( \l__suanpan_support_d_half_dim, + \l__suanpan_frame_upper_outer_offset_dim - + \l__suanpan_frame_outer_linewidth_dim); + + % 绘制下梁上边线 + \draw[frameinner] + ( -\l__suanpan_support_d_half_dim, + \l__suanpan_frame_lower_inner_offset_dim ) + -- + ( \l__suanpan_support_d_half_dim, + \l__suanpan_frame_lower_inner_offset_dim ); + % 绘制下梁下边线 + \draw[frameouter] + ( -\l__suanpan_support_d_half_dim, + \l__suanpan_frame_lower_outer_offset_dim + + \l__suanpan_frame_outer_linewidth_dim ) + -- + ( \l__suanpan_support_d_half_dim, + \l__suanpan_frame_lower_outer_offset_dim + + \l__suanpan_frame_outer_linewidth_dim ); + + % 绘制计位点(黑色圆点) + \bool_if:NT \l__suanpan_support_unit_bool + { + \shade[% + inner~color=black!40, + outer~color=black!80, + ] (0pt, 0pt) circle + [radius = \l__suanpan_frame_unit_r_dim]; + } + \end{tikzpicture} + } + \group_end: + } + +% 绘制算珠 +% #1: 算珠位置编号 +% o o o o o o o | o o o +% 1 2 3 4 5 6 7 8 9 10 +% | o +% 11 +% 其中,11是悬珠位置 +% #2: 算珠类型 +% 0——外珠,1——内珠,2——浮珠 +\cs_new:Npn \__suanpan_bid_layout:nn #1#2 + { + % 算珠垂直偏移 + \int_compare:nNnTF { #1 } > { 7 } + { + \int_compare:nNnTF { #1 } < { 11 } + { + % 上珠 + \dim_set:Nn \l_tmpb_dim{ \l__suanpan_bid_upper_offset_dim + + \l__suanpan_bid_h_dim * (#1 - 8) } + }{ + % 悬珠 + \dim_set:Nn \l_tmpb_dim{ \l__suanpan_frame_b_half_dim + + \l__suanpan_bid_h_dim * 2 } + } + }{ + % 下珠 + \dim_set:Nn \l_tmpb_dim{ \l__suanpan_bid_lower_offset_dim + + \l__suanpan_bid_h_dim * (#1 - 1) } + } + + % 绘图算珠 + \draw_scope_begin: + \draw_transform_yshift:n { \l_tmpb_dim } + \int_case:nnF { #2 } + { + { 0 } { \draw_coffin_use:Nnn \l__suanpan_outer_bid_coffin { hc } { vc } } + { 1 } { \draw_coffin_use:Nnn \l__suanpan_inner_bid_coffin { hc } { vc } } + { 2 } { \draw_coffin_use:Nnn \l__suanpan_float_bid_coffin { hc } { vc } } + }{ Bid~Type~Error! } + \draw_scope_end: + } +% 函数变体 +\cs_generate_variant:Nn \__suanpan_bid_layout:nn {xx} + +% 组装一个档位 +% #1: 档位编号(基于1,从左向右计数) +% #2: 档位数字 +\cs_new:Npn \__suanpan_assemble_rod:nn #1#2 + { + \tl_set:Nn \l_tmpb_tl { #2 } + % 绘制 + \draw_scope_begin: + % 水平方向偏移 + \draw_transform_xshift:n { \l__suanpan_support_d_dim * (#1 - 1) } + + % 档杆 + \draw_coffin_use:Nnnn \l__suanpan_support_coffin + { hc } { vc } { 0pt, -\l__suanpan_support_y_offset_dim } + + % 算珠 + \int_compare:nNnTF { #2 } = { 0 } + { + % 判断0值算珠是否需要绘制 + \bool_if:NT \l__suanpan_empty_rod_bool + { + % 取得档位数字对应算珠位置及内珠/外珠编号 + \prop_get:NnN \l__suanpan_rods_val_prop { #2 } \l_tmpa_tl + \clist_clear:N \l__suanpan_bids_pos_clist + \clist_set:NV \l__suanpan_bids_pos_clist \l_tmpa_tl + + \clist_map_inline:Nn \l__suanpan_bids_pos_clist + { + \clist_set:Nn \l_tmpa_clist { ##1 } + \__suanpan_bid_layout:xx { \clist_item:Nn \l_tmpa_clist { 1 } } + { \clist_item:Nn \l_tmpa_clist { 2 } } + } + } + }{ + % 不是0值算珠,需要绘制 + % 取得档位数字对应算珠位置及内珠/外珠编号 + \prop_get:NnN \l__suanpan_rods_val_prop { #2 } \l_tmpa_tl + \clist_clear:N \l__suanpan_bids_pos_clist + \clist_set:NV \l__suanpan_bids_pos_clist \l_tmpa_tl + + \clist_map_inline:Nn \l__suanpan_bids_pos_clist + { + \clist_set:Nn \l_tmpa_clist { ##1 } + \__suanpan_bid_layout:xx { \clist_item:Nn \l_tmpa_clist { 1 } } + { \clist_item:Nn \l_tmpa_clist { 2 } } + } + } + \draw_scope_end: + } + +% 指定一个档上某个算珠的颜色 +% #1: 档位编号(从左向右) +% #2: 算珠位置([1, 11]) +\cs_new:Npn \__suanpan_float_bid:nn #1#2 + { + \draw_scope_begin: + % 水平偏移 + \draw_transform_xshift:n { \l__suanpan_support_d_dim * ( #1 - 1 ) } + + % 覆盖绘制 + \__suanpan_bid_layout:xx { #2 }{ 2 } + \draw_scope_end: + } + +% 为一个档位添加记录标记 +% #1: 档位编号(基于1,从左向右) +% #2: 标记内容 +\cs_new:Npn \__suanpan_rod_mark:nn #1#2 + { + \hcoffin_set:Nn \l_tmpa_coffin + { + \begin{tikzpicture} + \node at ( 0, 0 ) [font=\bfseries\Large] { #2 }; + \end{tikzpicture} + } + + \draw_scope_begin: + % 水平偏移 + \draw_transform_xshift:n { \l__suanpan_support_d_dim * ( #1 - 1 ) } + \draw_coffin_use:Nnn \l_tmpa_coffin { hc } { vc } + \draw_scope_end: + } + +% 绘制边框 +% #1 第一档编号(左) +% #2 最后一档编号(右) +\cs_new:Npn \__suanpan_frame_layout:nn #1#2 + { + % TikZ绘制样式 + \tikzset{% + hframe/.style ={% 上下梁 + bottom~color=framecolor!95, + top~color=framecolor!95, + middle~color = framecolor!15, + draw = framecolor, + line~width = \l__suanpan_frame_inner_linewidth_dim, + }, + vframe/.style ={% 左右梁 + left~color=framecolor!95, + right~color=framecolor!95, + middle~color = framecolor!15, + draw = framecolor, + line~width = \l__suanpan_frame_inner_linewidth_dim, + }, + mframe/.style ={% 横梁 + top~color=framecolor!60, + bottom~color=framecolor!60, + middle~color = framecolor!5, + line~width = \l__suanpan_frame_inner_linewidth_dim, + }, + frameline/.style ={% 梁连线 + draw = framecolor, + line~width = \l__suanpan_frame_inner_linewidth_dim, + }, + arcline/.style ={% 转角线 + draw = framecolor, + line~width = \l__suanpan_frame_inner_linewidth_dim, + rounded~corners = \l__suanpan_frame_inner_linewidth_dim / 2, + }, + } + + % 总宽度 + \dim_set:Nn \l_tmpa_dim { + \fp_to_dim:n { + \fp_eval:n { \l__suanpan_support_d_dim * ( #2 - #1 + 1.0) } + } + } + % 减半档宽度 + \dim_set:Nn \l_tmpb_dim { + \fp_to_dim:n { + \fp_eval:n { \l__suanpan_support_d_dim * ( #2 - #1 ) + + \l__suanpan_support_d_half_dim} + } + } + + \group_begin: + % 上下边框基础容器(盒子) + \hcoffin_set:Nn \l_tmpa_coffin + { + \begin{tikzpicture} + \shadedraw[hframe] + ( 0pt, 0pt ) -- + ++( \l_tmpa_dim, 0) -- + ++( \l__suanpan_frame_b_dim, \l__suanpan_frame_b_dim ) -- + ++( -\l__suanpan_frame_b_dim, 0 ) -- + ++( -\l_tmpa_dim, 0 ) -- + ++( -\l__suanpan_frame_b_dim, 0 ) -- + cycle; + \end{tikzpicture} + } + + % 左右边框基础容器(盒子) + \hcoffin_set:Nn \l_tmpb_coffin + { + \begin{tikzpicture} + \shadedraw[vframe] + ( 0, 0 ) -- + ++( 0, \l__suanpan_frame_inner_h_dim) -- + ++( -\l__suanpan_frame_b_dim, \l__suanpan_frame_b_dim ) -- + ++( 0, -\l__suanpan_frame_outer_h_dim ) -- + cycle; + \draw[arcline] + ( 0, 0 ) + ++( 0, \l__suanpan_frame_inner_h_dim ) + ++( 0, \l__suanpan_frame_b_dim ) + ++( 0, \l__suanpan_frame_inner_linewidth_dim * 0.9 ) + ++( -\l__suanpan_frame_b_half_dim, 0 ) -- + ++( -\l__suanpan_frame_b_half_dim, 0 ) -- + ++( -\l__suanpan_frame_inner_linewidth_dim * 0.9, 0 ) -- + ++( 0, -\l__suanpan_frame_b_half_dim ); + \draw[arcline] + ( 0, 0 ) + ++( 0, -\l__suanpan_frame_b_dim ) + ++( 0, -\l__suanpan_frame_inner_linewidth_dim * 0.9 ) + ++( -\l__suanpan_frame_b_half_dim, 0 ) -- + ++( -\l__suanpan_frame_b_half_dim, 0 ) -- + ++( -\l__suanpan_frame_inner_linewidth_dim * 0.9, 0 ) -- + ++( 0, \l__suanpan_frame_b_half_dim ); + \end{tikzpicture} + } + + % 横梁接头基础容器(盒子) + \hcoffin_set:Nn \l_tmpc_coffin + { + \begin{tikzpicture} + \shade[mframe] + ( 0pt, 0pt ) --++( 0, \l__suanpan_frame_b_dim) -- + ++(-\l__suanpan_frame_inner_linewidth_dim, 0) -- + ++(-\l__suanpan_frame_b_dim / 3, -\l__suanpan_frame_b_dim / 2) -- + ++( \l__suanpan_frame_b_dim / 3, -\l__suanpan_frame_b_dim / 2) -- + cycle; + \draw[frameline]% + ( 0, \l__suanpan_frame_b_dim) -- + ++(-\l__suanpan_frame_inner_linewidth_dim, 0) -- + ++(-\l__suanpan_frame_b_dim / 3, -\l__suanpan_frame_b_dim / 2) -- + ++( \l__suanpan_frame_b_dim / 3, -\l__suanpan_frame_b_dim / 2) -- + ++( \l__suanpan_frame_inner_linewidth_dim, 0); + \end{tikzpicture} + } + + % 布置上边框 + \draw_scope_begin: + \draw_transform_xshift:n { -\l__suanpan_support_d_half_dim - + \l__suanpan_frame_inner_linewidth_dim / 2 } + \draw_transform_yshift:n { \l__suanpan_frame_inner_upper_dim - + \l__suanpan_frame_inner_linewidth_dim } + \draw_coffin_use:Nnnn \l_tmpa_coffin { l } { b } + { -\l__suanpan_frame_b_dim, 0pt } + \draw_scope_end: + + % 布置下边框 + \draw_scope_begin: + \coffin_rotate:Nn \l_tmpa_coffin { 180 } + \draw_transform_xshift:n { \l_tmpa_dim - \l__suanpan_support_d_half_dim + + \l__suanpan_frame_inner_linewidth_dim / 2 } + + \draw_transform_yshift:n { \l__suanpan_frame_inner_lower_dim + + \l__suanpan_frame_inner_linewidth_dim } + \draw_coffin_use:Nnnn \l_tmpa_coffin { l } { b } + { \l__suanpan_frame_b_dim, 0pt } + \draw_scope_end: + + % 布置左边框 + \draw_scope_begin: + \draw_transform_xshift:n { -\l__suanpan_support_d_half_dim - + \l__suanpan_frame_b_dim - + \l__suanpan_frame_inner_linewidth_dim * 1.5 } + \draw_transform_yshift:n { \l__suanpan_frame_inner_lower_dim - + \l__suanpan_frame_inner_linewidth_dim } + + \draw_coffin_use:Nnnn \l_tmpb_coffin { l } { b } + { 0pt, -\l__suanpan_frame_b_dim } + \draw_scope_end: + + % 布置右边框 + \draw_scope_begin: + \coffin_rotate:Nn \l_tmpb_coffin { 180 } + \draw_transform_xshift:n { \l_tmpb_dim + + \l__suanpan_frame_b_dim + + \l__suanpan_frame_inner_linewidth_dim * 1.5}% - + \draw_transform_yshift:n { \l__suanpan_frame_inner_upper_dim + + \l__suanpan_frame_inner_linewidth_dim } + \draw_coffin_use:Nnnn \l_tmpb_coffin { l } { b } + { 0pt, \l__suanpan_frame_b_dim } + \draw_scope_end: + + % 布置左横梁接头 + \draw_scope_begin: + \draw_transform_xshift:n { -\l__suanpan_support_d_half_dim - + \l__suanpan_frame_b_dim / 3 - + \l__suanpan_frame_inner_linewidth_dim / 2 } + \draw_transform_yshift:n { -\l__suanpan_frame_b_dim / 2 - + \l__suanpan_frame_inner_linewidth_dim / 2 } + \draw_coffin_use:Nnnn \l_tmpc_coffin { l } { b } { 0pt, 0pt } + \draw_scope_end: + + % 布置右横梁接头 + \draw_scope_begin: + \coffin_rotate:Nn \l_tmpc_coffin { 180 } + \draw_transform_xshift:n { \l_tmpb_dim + + \l__suanpan_frame_b_dim / 3 + + \l__suanpan_frame_inner_linewidth_dim / 2 } + \draw_transform_yshift:n { \l__suanpan_frame_b_dim / 2 + + \l__suanpan_frame_inner_linewidth_dim / 2 } + \draw_coffin_use:Nnnn \l_tmpc_coffin { l } { b } { 0pt, 0pt } + \draw_scope_end: + \group_end: + } + +% 算盘排版用户接口 +% 算盘排版环境 +% #1 suanpan环境选项 +% #2 suanpan环境内容(!b参数) +\NewDocumentEnvironment{ suanpan }{ o !b } + { + \group_begin: + % 设置选项 + \IfNoValueF{ #1 } + { + \keys_set:nn { suanpan }{ #1 } + } + + % 构造基础容器(盒子) + \__suanpan_inner_bid_construct: + \__suanpan_outer_bid_construct: + \__suanpan_support_construct: + + % 删除#2(!b)参数取得的环境内容中的空白 + \str_set:Nn \l_tmpa_str { #2 } + \str_remove_all:Nn \l_tmpa_str {~} + % 将str还原为tl + \tl_set_rescan:Nno \l_tmpa_tl {}{ \l_tmpa_str } + + % 在容器(盒子)中用#2(!b)参数取得的按环境内容实现绘制 + \hcoffin_set:Nn \l_tmpa_coffin + { + \draw_begin: + \l_tmpa_tl + \draw_end: + } + + \hcoffin_set:Nn \l_tmpb_coffin + { + % 将原图缩小50% + \coffin_scale:Nnn \l_tmpa_coffin { 0.50 } { 0.50 } + \coffin_typeset:Nnnnn \l_tmpa_coffin{ l }{ b }{ 0pt }{ 0pt } + } + }{ + % 按用户指定比例缩放 + \coffin_scale:Nnn \l_tmpb_coffin + { \l__suanpan_scale_tl } { \l__suanpan_scale_tl } + + % 设置基字符盒子(排版深度) + \hbox_set:Nn \l_tmpa_box { x } + % 盒子深度 + \dim_set:Nn \l_tmpa_dim { \box_dp:N \l_tmpa_box} + + % 输出算盘容器(盒子) + \coffin_typeset:Nnnnn \l_tmpb_coffin{ l }{ b }{ 0pt }{ -\l_tmpa_dim } + \int_zero:N \l__suanpan_rod_max_int + \group_end: + } + +% 排版算盘一个档位,包括档杆和算珠 +% #1 星号命令,绘制计位点(黑色圆点) +% #2 档位编号(基于1,从左向右计数) +% #3 本档数字(0-20,10-15需用到顶珠和底珠,16-20需要用到悬珠) +% TODO: 会比加了浮珠后的水平尺寸大,未找到原因 +\NewDocumentCommand{ \rod }{ s m m } + { + % 记录原状态变量 + \bool_set_eq:NN \l_tmpa_bool \l__suanpan_support_unit_bool + % 星号命令,用于在横梁绘制计位点 + \IfBooleanTF{#1} + { + \bool_set_true:N \l__suanpan_support_unit_bool + }{ + \bool_set_false:N \l__suanpan_support_unit_bool + } + + % 如状态发生改变,则重新绘制档杆单元 + \bool_if:NTF \l_tmpa_bool + { + \bool_if:NF \l__suanpan_support_unit_bool + { + \__suanpan_support_construct: + } + }{ + \bool_if:NT \l__suanpan_support_unit_bool + { + \__suanpan_support_construct: + } + } + + % 统计档位总数 + \int_set:Nn \l__suanpan_rod_max_int + { \int_max:nn { \l__suanpan_rod_max_int }{ #2 } } + + % 组装一个档位 + \__suanpan_assemble_rod:nn { #2 }{ #3 } + } + +% 排版算盘多个档位,包括档杆和算珠 +% #1 本档数字(0-20,10-15需用到顶珠和底珠,16-20需要用到悬珠) +% 各数字之间需要用逗号分隔。 +\NewDocumentCommand{ \rods }{ m } + { + % 构造档位数字列表 + \clist_set:Nn \l_tmpa_clist { #1 } + % 初始化档位计数器 + \int_set:Nn \l_tmpa_int { 0 } + + \clist_map_inline:Nn \l_tmpa_clist + { + % 档位计数器自增1 + \int_incr:N \l_tmpa_int + + % 组装当前档位 + \__suanpan_assemble_rod:nn {\l_tmpa_int }{ ##1 } + } + + % 记录档位总数 + \int_set:Nn \l__suanpan_rod_max_int + { \int_max:nn { \l__suanpan_rod_max_int }{ \l_tmpa_int } } + } + +% 指定某档上某个算珠的颜色 +% #1 档位(基于1,从左向右计数) +% #2 算珠位置列表(1--11,11为悬珠位置) +% #3 算珠填充颜色 +% #4 算珠绘制颜色(默认为内珠绘制颜色) +\NewDocumentCommand{ \bid }{ m m m O{innerdrawcolor} } + { + % 构造浮珠 + \__suanpan_float_bid_construct:nn { #4 }{ #3 } + + % 构造算珠位置列表 + \clist_set:Nn \l_tmpa_clist { #2 } + + \clist_map_inline:Nn \l_tmpa_clist + { + % 绘制浮珠 + \__suanpan_float_bid:nn { #1 }{ ##1 } + } + } + +% 指定某档上所有内珠或外珠的颜色 +% #1 星号命令,选择内珠或外珠 +% #2 档位(基于1,从左向右计数) +% #3 该档数字 +% #4 算珠填充颜色(绘图颜色采用原内/外珠绘制颜色) +\NewDocumentCommand{ \bids }{ s m m m } + { + % 取得档位数字对应算珠位置及内珠/外珠编号 + \prop_get:NnN \l__suanpan_rods_val_prop { #3 } \l_tmpa_tl + \clist_clear:N \l__suanpan_bids_pos_clist + \clist_set:NV \l__suanpan_bids_pos_clist \l_tmpa_tl + + % 星号命令,用于选择外珠着色 + \IfBooleanTF{#1} + { + % 构造浮珠 + \__suanpan_float_bid_construct:nn { outerdrawcolor }{ #4 } + + \clist_map_inline:Nn \l__suanpan_bids_pos_clist + { + \clist_set:Nn \l_tmpa_clist { ##1 } + % 选择外珠 + \int_compare:nNnT { \clist_item:Nn \l_tmpa_clist { 2 } } = { 0 } + { + \__suanpan_float_bid:nn { #2 }{ \clist_item:Nn \l_tmpa_clist { 1 } } + } + } + }{ + % 构造浮珠 + \__suanpan_float_bid_construct:nn { innerdrawcolor }{ #4 } + + \clist_map_inline:Nn \l__suanpan_bids_pos_clist + { + \clist_set:Nn \l_tmpa_clist { ##1 } + % 选择内珠 + \int_compare:nNnT { \clist_item:Nn \l_tmpa_clist { 2 } } = { 1 } + { + \__suanpan_float_bid:nn { #2 }{ \clist_item:Nn \l_tmpa_clist { 1 } } + } + } + } + } + +% 左右边框 +\NewDocumentCommand{ \mkframe }{ } + { + \__suanpan_frame_layout:nn { 1 }{ \l__suanpan_rod_max_int } + } + +% 为各档添加计位标记 +% #1 起始档位(基于1,从左向右计数) +% #2 标记列表 +\NewDocumentCommand{ \rodmark }{ O{1} m } + { + % 标记列表 + \clist_set:Nn \l_tmpa_clist { #2 } + + % 计数器 + \int_set:Nn \l_tmpa_int { #1 } + + % 遍历列表 + \clist_map_inline:Nn \l_tmpa_clist + { + % 输出标记 + \__suanpan_rod_mark:nn { \l_tmpa_int }{ ##1 } + + % 调整计数器 + \int_incr:N \l_tmpa_int + + % 超出最大档位 + \int_compare:nNnT { \l_tmpa_int } > { \l__suanpan_rod_max_int } + { + \clist_map_break: + } + } + } + +% 选项设置用户接口 +\NewDocumentCommand{ \suanpanset } { m } + { + \IfNoValueF { #1} + { + \keys_set:nn { suanpan } { #1 } + } + } + +\endinput diff --git a/Master/texmf-dist/tex/latex/tablvar/tablvar.sty b/Master/texmf-dist/tex/latex/tablvar/tablvar.sty index 07b48703858..958d49d6e97 100644 --- a/Master/texmf-dist/tex/latex/tablvar/tablvar.sty +++ b/Master/texmf-dist/tex/latex/tablvar/tablvar.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% Copyright (C) 2018-2023 by Antoine Missier <antoine.missier@ac-toulouse.fr> +%% Copyright (C) 2018-2024 by Antoine Missier <antoine.missier@ac-toulouse.fr> %% %% This file may be distributed and/or modified under the conditions of %% the LaTeX Project Public License, either version 1.3 of this license @@ -22,13 +22,12 @@ %% \NeedsTeXFormat{LaTeX2e}[2005/12/01] \ProvidesPackage{tablvar} - [2023/12/23 v2.0 .dtx tablvar file] - + [2024/08/09 v2.1 Tables of signs and variations] \RequirePackage{array} \RequirePackage{ifthen} \RequirePackage{multido} \RequirePackage{xkeyval} -\RequirePackage{ifpdf} +\RequirePackage{iftex} \newif\iftv@tikz % false par défaut \DeclareOption{tikz}{\tv@tikztrue} @@ -38,23 +37,31 @@ \iftv@pstricks \ifpdf - \PackageError{tablvar}{Don't use the pstricks option with PDF engines}{} + \ifluatex + \PackageInfo{tablvar}{Option 'pstricks' works + with luapstricks} + \else + \PackageError{tablvar}{Don't use the 'pstricks' option with + PDF output mode}{Use 'tikz' option or change the engine} + \fi \else - \PackageInfo{tablvar}{PSTricks option is used} + \PackageInfo{tablvar}{Option 'pstricks' is used} \fi \else\iftv@tikz - \PackageInfo{tablvar}{tikz option is used. + \AtEndDocument{\PackageWarningNoLine{tablvar}{Option 'tikz' is used. \MessageBreak - Run twice to draw the arrows correctly} + Maybe rerun to draw the arrows correctly} + } \else\ifpdf - \PackageWarningNoLine{tablvar}{PDF engine is used, - I'm using the tikz option. + \AtEndDocument{\PackageWarningNoLine{tablvar}{Output is in PDF mode, + I'm using the 'tikz' option. \MessageBreak - Run twice to draw the arrows correctly} + Maybe rerun to draw the arrows correctly} + } \tv@tikztrue \else - \PackageWarningNoLine{tablvar}{PDF engines not used, - I'm using the pstricks option} + \PackageWarningNoLine{tablvar}{Output is in DVI mode, + I'm using the 'pstricks' option} \tv@pstrickstrue \fi\fi\fi @@ -120,6 +127,12 @@ \newcounter{maxdiscont} \setcounter{maxdiscont}{4} % nb max de discontinuités +\newlength{\rowtopsep} +\setlength{\rowtopsep}{2pt} + +\newlength{\rowbottomsep} +\setlength{\rowbottomsep}{2pt} + \newcommand*{\fleche}[2]{ \iftv@tikz \tikz[remember picture,overlay]{\draw[->,>=stealth, @@ -182,8 +195,8 @@ \multido{\I=1+1}{\themaxdiscont}{\newcounter{discont\I}} } -\newlength\mil@heightshift -\newcounter{mil@rowshift} +\newlength\mil@shift +\newcounter{mil@row} \newcounter{maxZI} % nb max de ZI \setcounter{maxZI}{4} @@ -225,19 +238,20 @@ \setcounter{nbvarlignes}{3} } -\newcommand\tv@saveheight{% - \tv@cellheight=0pt - \tv@celldepth=0pt - \ifdim \ht\tv@cellbox > \ht\@arstrutbox - \global\advance\tv@cellheight by \ht\tv@cellbox - \else - \global\advance\tv@cellheight by \ht\@arstrutbox +\newcommand\tv@setheight{% + \global\tv@cellheight=\ht\tv@cellbox + \ifthenelse{\value{var@ligne}=0}{ + \global\advance\tv@cellheight by \rowtopsep}{} + \ifdim \tv@cellheight < \ht\@arstrutbox + \global\tv@cellheight = \ht\@arstrutbox \fi - \ifdim \dp\tv@cellbox > \dp\@arstrutbox - \global\advance\tv@celldepth by \dp\tv@cellbox - \else - \global\advance\tv@celldepth by \dp\@arstrutbox + \global\tv@celldepth=\dp\tv@cellbox + \ifthenelse{\value{var@ligne}=0}{ + \global\advance \tv@celldepth by \rowbottomsep}{} + \ifdim \tv@celldepth < \dp\@arstrutbox + \global\tv@celldepth = \dp\@arstrutbox \fi + \vrule height \tv@cellheight depth \tv@celldepth width 0pt } \newcommand{\tvcoltypes}{ @@ -246,7 +260,7 @@ >{\setcounter{tv@icol}{0}\stepcounter{tv@row}\begin{lrbox}% \tv@cellbox $}% c% - <{$\end{lrbox}\usebox{\tv@cellbox}\tv@saveheight}} + <{$\end{lrbox}\usebox{\tv@cellbox}\tv@setheight}} % type de colonne i pour les intervalles \newcolumntype{i}{>{\stepcounter{tv@icol} \centering\arraybackslash$}p{\intervalwidth}<{$}} @@ -262,8 +276,8 @@ \setkeys*{tablvar}{#1} % fourni par xkeyval \if\XKV@rm\empty \else \setlength{\intervalwidth}{#1} \fi \tvcoltypes - \ifextleft \newcolumntype{B}{v{l}} \else \newcolumntype{B}{v{c}} \fi - \ifextright \newcolumntype{E}{v{r}} \else \newcolumntype{E}{v{c}} \fi + \ifextleft\newcolumntype{B}{v{l}}\else\newcolumntype{B}{v{c}}\fi + \ifextright\newcolumntype{E}{v{r}}\else\newcolumntype{E}{v{c}}\fi \tablvarinit{#2} \ZIinit \begin{array}{% @@ -296,7 +310,6 @@ \newcommand*{\variations}[2][3]{% #1=nblignes (3 par défaut) % (ré)initialisation des compteurs \setcounter{nbvarlignes}{#1} - \setcounter{var@ligne}{0} \setcounter{numdiscont}{0} \multido{\I=1+1}{\themaxdiscont}{\setcounter{discont\I}{0}} % boucle : on exécute le code #2 un nb de fois égal à (#1)-1 @@ -323,6 +336,7 @@ } % tracé des pointillés pour les valeurs remarquables \multido{\Ix=1+1}{\thenumvr}{\vrconnect{X\Ix}{Y\Ix}} + \setcounter{var@ligne}{0} \\ % dernier retour ligne du tableau } @@ -355,13 +369,17 @@ \newcommand*{\vdecal}[2]{\smash{\raisebox{#1}{$#2$}}} \newcommand*{\mil}[1]{% - \mil@heightshift = \ht\@arstrutbox - \advance\mil@heightshift by \dp\@arstrutbox - \divide\mil@heightshift by 2 - \setcounter{mil@rowshift}{3} - \addtocounter{mil@rowshift}{-\value{nbvarlignes}} - \multiply\mil@heightshift by \value{mil@rowshift} - \pos*{2}{\vdecal{\mil@heightshift}{#1}} + \setcounter{mil@row}{\value{nbvarlignes}} + \ifthenelse{\isodd{\value{nbvarlignes}}}{ + \addtocounter{mil@row}{1} + \divide\value{mil@row} by 2 + \pos*{\themil@row}{\smash{#1}} + }{ + \divide\value{mil@row} by 2 + \mil@shift = \dp\@arstrutbox + \advance\mil@shift by 0.5ex + \pos*{\themil@row}{\vdecal{-\mil@shift}{#1}} + } } \newcommand*{\barre}[1][]{\makebox[0pt]{$#1$}% @@ -372,8 +390,26 @@ \kern1.5pt\vrule width \bbrulewidth\kern1pt \vrule width \bbrulewidth\kern1.5pt} -\newcommand*{\limg}[3][c]{\zbox[r]{\valpos[#1]{#2}{#3\hspace{\limsep}}}} -\newcommand*{\limd}[3][c]{\zbox[l]{\valpos[#1]{#2}{\hspace{\limsep}#3}}} +\newcommand*{\@limg}[3][c]{% + \zbox[r]{\valpos[#1]{#2}{#3\hspace{\limsep}}}} +\newcommand*{\@limd}[3][c]{% + \zbox[l]{\valpos[#1]{#2}{\hspace{\limsep}#3}}} +\newcommand*{\@@limg}[1]{% + \ifthenelse{\equal{#1}{+}}{\@limg{1}{+\infty}}{ + \ifthenelse{\equal{#1}{-}}{\@limg{\value{nbvarlignes}}{-\infty}}{ + \PackageError{tablvar}{Invalid argument for \string\limg*} + {Only + or - are valid arguments for \string\limg*} + }} +} +\newcommand*{\@@limd}[1]{% + \ifthenelse{\equal{#1}{+}}{\@limd{1}{+\infty}}{ + \ifthenelse{\equal{#1}{-}}{\@limd{\value{nbvarlignes}}{-\infty}}{ + \PackageError{tablvar}{Invalid argument for \string\limd*} + {Only + or - are valid arguments for \string\limd*} + }} +} +\newcommand{\limg}{\@ifstar{\@@limg}{\@limg}} +\newcommand{\limd}{\@ifstar{\@@limd}{\@limd}} \newcommand*{\discont}{ \ifthenelse{\thevar@ligne=1}{ @@ -392,7 +428,9 @@ }{} } -\newcommand*{\bblim}[4]{\limg{#1}{#2}\bb\discont\limd{#3}{#4}} +\newcommand*{\@bblim}[4]{\limg{#1}{#2}\bb\discont\limd{#3}{#4}} +\newcommand*{\@@bblim}[2]{\limg*{#1}\bb\discont\limd*{#2}} +\newcommand*{\bblim}{\@ifstar{\@@bblim}{\@bblim}} \newcommand*{\vr}[2][2]{% ligne 2 par défaut sauf si tv@row=1 \stepcounter{numvr} diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-base.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-base.sty index 8f712c5b367..7a9a9d6d55d 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-base.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-base.sty @@ -25,7 +25,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf.dtx -\ProvidesExplPackage {tagpdf-base} {2024-06-20} {0.99c} +\ProvidesExplPackage {tagpdf-base} {2024-08-02} {0.99d} {part of tagpdf - provide base, no-op versions of the user commands } \cs_new_protected:Npn \__tag_whatsits: {} \AddToHook{begindocument} diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-generic.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-generic.sty index 0b49140d300..901c138ac94 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-generic.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-generic.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-mc-generic.dtx -\ProvidesExplPackage {tagpdf-debug-generic} {2024-06-20} {0.99c} +\ProvidesExplPackage {tagpdf-debug-generic} {2024-08-02} {0.99d} {part of tagpdf - debugging code related to marking chunks - generic mode} \cs_set_protected:Npn \tag_mc_begin:n #1 %#1 keyval { diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-lua.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-lua.sty index 4b6836ea134..5872b3cee0a 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-lua.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-lua.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-mc-luacode.dtx -\ProvidesExplPackage {tagpdf-debug-lua} {2024-06-20} {0.99c} +\ProvidesExplPackage {tagpdf-debug-lua} {2024-08-02} {0.99d} {part of tagpdf - debugging code related to marking chunks - lua mode} \cs_set_protected:Npn \__tag_mc_handle_stash:n #1 %1 mcidnum { diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug.sty index b3fd520713b..4aec29b682d 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug.sty @@ -26,7 +26,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf.dtx -\ProvidesExplPackage {tagpdf-debug} {2024-06-20} {0.99c} +\ProvidesExplPackage {tagpdf-debug} {2024-08-02} {0.99d} { debug code for tagpdf } \@ifpackageloaded{tagpdf}{}{\PackageWarning{tagpdf-debug}{tagpdf~not~loaded,~quitting}\endinput} \prop_gput:Nnn \g_msg_module_type_prop { tag / debug} {} diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def index 09846bc0b56..1425f7f3ae1 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-backend.dtx -\ProvidesExplFile {tagpdf-luatex.def} {2024-06-20} {0.99c} +\ProvidesExplFile {tagpdf-luatex.def} {2024-08-02} {0.99d} {tagpdf~driver~for~luatex} { \fontencoding{TU}\fontfamily{lmr}\fontseries{m}\fontshape{n}\fontsize{10pt}{10pt}\selectfont diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-generic.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-generic.sty index ca704be6e82..20f619c57b2 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-generic.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-generic.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-mc-generic.dtx -\ProvidesExplPackage {tagpdf-mc-code-generic} {2024-06-20} {0.99c} +\ProvidesExplPackage {tagpdf-mc-code-generic} {2024-08-02} {0.99d} {part of tagpdf - code related to marking chunks - generic mode} \tl_new:N \l__tag_mc_ref_abspage_tl diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-lua.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-lua.sty index 1057a7bc678..e87996ede51 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-lua.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-lua.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-mc-luacode.dtx -\ProvidesExplPackage {tagpdf-mc-code-lua} {2024-06-20} {0.99c} +\ProvidesExplPackage {tagpdf-mc-code-lua} {2024-08-02} {0.99d} {tagpdf - mc code only for the luamode } \hook_gput_code:nnn{begindocument}{tagpdf/mc} { diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex-book.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex-book.def index 19dac1571b8..c869398d1c6 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex-book.def +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex-book.def @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2024-06-20} {0.99c} +%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2024-08-02} {0.99d} %% {latex-book} {https://www.latex-project.org/ns/book/2022}{} chapter, H1,pdf2, section, H2,pdf2, diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex.def index 4b51be0e8d7..de5cfacde9a 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex.def +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex.def @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-ns-latex.def} {2024-06-20} {0.99c} +%% \ProvidesExplFile {tagpdf-ns-latex.def} {2024-08-02} {0.99d} %% {latex} {https://www.latex-project.org/ns/dflt/2022}{} title, Title, pdf2, part, Title, pdf2, diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-mathml.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-mathml.def index bca7660ca53..eba7d348687 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-mathml.def +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-mathml.def @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2024-06-20} {0.99c} +%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2024-08-02} {0.99d} abs,abs,mathml, and,and,mathml, annotation,annotation,mathml, diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf.def index 2e2ccc6c45f..3dd6cd6af68 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf.def +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf.def @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2024-06-20} {0.99c} +%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2024-08-02} {0.99d} %% {pdf} {http://iso.org/pdf/ssn}{} StructTreeRoot,StructTreeRoot,pdf,D, Document,Document,pdf,D, diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf2.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf2.def index b5cb091a716..f646b798d92 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf2.def +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf2.def @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2024-06-20} {0.99c} +%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2024-08-02} {0.99d} %% {pdf2} {http://iso.org/pdf2/ssn}{} StructTreeRoot,StructTreeRoot,pdf2,D, Document,Document,pdf2,D, diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child-2.csv b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child-2.csv index b0495a598c1..6acd9851901 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child-2.csv +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child-2.csv @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2024-06-20} {0.99c} +%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2024-08-02} {0.99d} ,,,StructTreeRoot,Document,DocumentFragment,Art,Part,Div,Sect,Aside,BlockQuote,NonStruct,TOC,TOCI,Index,Private,Title,Sub,Quote,Note,Reference,BibEntry,P,Hn,H,Lbl,Code,Em,Strong,Span,Link,Annot,Form,Ruby,RB,RT,RP,Warichu,WT,WP,FENote,L,LI,LBody,Table,TR,TH,TD,THead,TBody,TFoot,Caption,Figure,Formula,math,mathml,Artifact,MC Document,both,document level,1,0..n,0..n,∅,‡,‡,∅,0..n,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,0..n,∅ DocumentFragment,2.0,document level,∅,0..n,0..n,0..n,‡,‡,0..n,0..n,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅*,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅*,∅*,∅,∅,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅,0..n,∅ diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child.csv b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child.csv index c3b120e5d5a..74e8ba8e519 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child.csv +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child.csv @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-parent-child.csv} {2024-06-20} {0.99c} +%% \ProvidesExplFile {tagpdf-parent-child.csv} {2024-08-02} {0.99d} ,,,StructTreeRoot,Document,Art,Part,Div,Sect,BlockQuote,NonStruct,TOC,TOCI,Index,Private,Quote,Note,Reference,BibEntry,P,Hn,H,Lbl,Code,Span,Link,Annot,Form,Ruby,RB,RT,RP,Warichu,WT,WP,L,LI,LBody,Table,TR,TH,TD,THead,TBody,TFoot,Caption,Figure,Formula,MC Document,both,document level,1,0..n,∅,‡,‡,∅,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅ Art,1.7,grouping,∅,0..n,∅,‡,‡,0..n,0..n,‡,∅,∅,∅,0..n,∅,0..n,∅,∅,∅,0..1,0..1,∅,∅,∅,0..n,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,0..n,∅,∅,0..n,0..n,∅,∅,∅,0..n,0..n,∅,∅ diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua index 425dd8120f1..eebcf5ec97d 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua @@ -24,8 +24,8 @@ local ProvidesLuaModule = { name = "tagpdf", - version = "0.99c", --TAGVERSION - date = "2024-06-20", --TAGDATE + version = "0.99d", --TAGVERSION + date = "2024-08-02", --TAGDATE description = "tagpdf lua code", license = "The LATEX Project Public License 1.3c" } @@ -90,6 +90,8 @@ local iwspaceattributeid = luatexbase.new_attribute ("g__tag_interwordspace_attr local iwfontattributeid = luatexbase.new_attribute ("g__tag_interwordfont_attr") local tagunmarkedbool= token.create("g__tag_tagunmarked_bool") local truebool = token.create("c_true_bool") +local softhyphenbool = token.create("g__tag_softhyphen_bool") + local catlatex = luatexbase.registernumber("catcodetable@latex") local tableinsert = table.insert local nodeid = node.id @@ -121,6 +123,9 @@ local KERN = node.id("kern") local PENALTY = node.id("penalty") local LOCAL_PAR = node.id("local_par") local MATH = node.id("math") + +local explicit_disc = 1 +local regular_disc = 3 ltx = ltx or { } ltx.__tag = ltx.__tag or { } ltx.__tag.mc = ltx.__tag.mc or { } -- mc data @@ -826,5 +831,53 @@ function ltx.__tag.func.output_parenttree (abspage) tex.sprint(catlatex,line) end end +do + local properties = node.get_properties_table() + local is_soft_hyphen_prop = 'tagpdf.rewrite-softhyphen.is_soft_hyphen' + local hyphen_char = 0x2D + local soft_hyphen_char = 0xAD + local softhyphen_fonts = setmetatable({}, {__index = function(t, fid) + local fdir = identifiers[fid] + local format = fdir and fdir.format + local result = (format == 'opentype' or format == 'truetype') + local characters = fdir and fdir.characters + result = result and (characters and characters[soft_hyphen_char]) ~= nil + t[fid] = result + return result + end}) + local function process_softhyphen_pre(head, _context, _dir) + if softhyphenbool.mode ~= truebool.mode then return true end + for disc, sub in node.traverse_id(DISC, head) do + if sub == explicit_disc or sub == regular_disc then + for n, _ch, _f in node.traverse_char(disc.pre) do + local props = properties[n] + if not props then + props = {} + properties[n] = props + end + props[is_soft_hyphen_prop] = true + end + end + end + return true + end + + local function process_softhyphen_post(head, _context, _dir) + if softhyphenbool.mode ~= truebool.mode then return true end + for disc, sub in node.traverse_id(DISC, head) do + for n, ch, fid in node.traverse_glyph(disc.pre) do + local props = properties[n] + if softhyphen_fonts[fid] and ch == hyphen_char and props and props[is_soft_hyphen_prop] then + n.char = soft_hyphen_char + props.glyph_info = nil + end + end + end + return true + end + + luatexbase.add_to_callback('pre_shaping_filter', process_softhyphen_pre, 'tagpdf.rewrite-softhyphen') + luatexbase.add_to_callback('post_shaping_filter', process_softhyphen_post, 'tagpdf.rewrite-softhyphen') +end -- -- End of File `tagpdf.lua'. diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty index 1688cdf6478..063109a7a22 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty @@ -28,7 +28,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf.dtx -\ProvidesExplPackage {tagpdf} {2024-06-20} {0.99c} +\ProvidesExplPackage {tagpdf} {2024-08-02} {0.99d} { A package to experiment with pdf tagging } \bool_if:nF @@ -137,6 +137,7 @@ \bool_set_true:N \l__tag_active_struct_bool \bool_new:N \l__tag_active_socket_bool \bool_new:N \g__tag_tagunmarked_bool +\bool_new:N \g__tag_softhyphen_bool \prg_generate_conditional_variant:Nnn \pdf_object_if_exist:n {e}{T,F,TF} \cs_generate_variant:Nn \pdf_object_ref:n {e} \cs_generate_variant:Nn \pdfannot_dict_put:nnn {nne} @@ -273,6 +274,8 @@ activate/tagunmarked .bool_gset:N = \g__tag_tagunmarked_bool, activate/tagunmarked .initial:n = true, tagunmarked .bool_gset:N = \g__tag_tagunmarked_bool, + activate/softhyphen .bool_gset:N = \g__tag_softhyphen_bool, + activate/softhyphen .initial:n = true, page/tabsorder .choice:, page/tabsorder / row .code:n = \pdfmanagement_add:nnn { Page } {Tabs}{/R}, diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty index 936f8adacd2..6ae5840b113 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty @@ -1,5 +1,5 @@ %\RequirePackage[enable-debug]{expl3}[2018/06/14] -\ProvidesExplPackage {tagpdfdocu-patches} {2024-06-20} {0.99c} +\ProvidesExplPackage {tagpdfdocu-patches} {2024-08-02} {0.99d} {patches/commands for the tagpdf documentation} \RequirePackage{etoolbox,xpatch} @@ -82,10 +82,6 @@ % } \ExplSyntaxOff -% ======== tikzpicture ========== -% TODO this needs some investigation: it messes up the stack if one add paraOff - -\AddToHook{env/tikzpicture/begin}{} %======== tcolorbox ======== % We switch of paratagging at the begin and reenable it locally in before upper. @@ -138,22 +134,6 @@ % ======= footnote ======== % done in testphase code -% ======= bibliography ======== -% biblatex. Creates some empty mc-chunks. -% no internal patches, but redefining begentry/finentry is not safe. -% better hook is needed. - - -\def\blx@endbibliography{% - \csuse{blx@endenv@\blx@theenv}% - \blx@noitem - \blx@locallabelwidth@finish - \endgroup - \blx@bibnote\blx@thepostnote -% \endgroup - \expandafter\endgroup\if@endpe\@doendpe\fi -} - % ====== hyperref ======== % this should probably go into tagpdf, but it is related to % problem of pdf strings and context .... @@ -167,16 +147,147 @@ \let\tagstructend\relax }}{} -%====== picture ======= +%====== tikz picture ======= +% first draft to tag. The main problem is to handle paragraphs. One +\ExplSyntaxOn +\cs_new_protected:Npn\__tag_tikz_savepos:n #1 + { + \tex_savepos:D + \tikz@resetexpandcount% + \tikz@scan@one@point\pgfutil@firstofone(current~bounding~box.north~east)\relax + \pgf@pos@transform{\pgf@x}{\pgf@y}% + \property_record:nn{#1}{xpos,ypos,abspage} + \property_record:nn{#1-tr}{pgfx,pgfy} + \tikz@scan@one@point\pgfutil@firstofone(current~bounding~box.south~west)\relax + \pgf@pos@transform{\pgf@x}{\pgf@y}% + \property_record:nn{#1-bl}{pgfx,pgfy} + \tex_savepos:D + } +\cs_generate_variant:Nn \__tag_tikz_savepos:n {e} + +\NewProperty{pgfx}{now}{0} + { + \dim_compare:nNnTF {\dim_abs:n {\pgf@x}} > {15999pt} + { 0 } + { \dim_to_decimal_in_sp:n{\pgf@x} } + } +\NewProperty{pgfy}{now}{0} + { + \dim_compare:nNnTF {\dim_abs:n {\pgf@y}} > {15999pt} + { 0 } + { \dim_to_decimal_in_sp:n{\pgf@y} } + } + +\cs_new_protected:Npn \__tag_tikz_getbbox: + { + \int_gincr:N\g__tag_graphic_int + \tl_set:Ne\l__tag_graphic_currentlabel_tl {__tag_graphic_\int_use:N \g__tag_graphic_int} + \tl_gset:Ne\g__tag_graphic_lx_tl + { + \dim_to_decimal_in_bp:n + { \property_ref:een {\l__tag_graphic_currentlabel_tl}{xpos}{0}sp + + \property_ref:een {\l__tag_graphic_currentlabel_tl-bl}{pgfx}{0}sp + } + } + \tl_gset:Ne\g__tag_graphic_ly_tl + { + \dim_to_decimal_in_bp:n + { \property_ref:een {\l__tag_graphic_currentlabel_tl}{ypos}{0}sp + + \property_ref:een {\l__tag_graphic_currentlabel_tl-bl}{pgfy}{0}sp + } + } + \tl_gset:Ne\g__tag_graphic_ux_tl + { + \dim_to_decimal_in_bp:n + { \property_ref:een {\l__tag_graphic_currentlabel_tl}{xpos}{0}sp + + \property_ref:een {\l__tag_graphic_currentlabel_tl-tr}{pgfx}{0}sp + } + } + \tl_gset:Ne\g__tag_graphic_uy_tl + { + \dim_to_decimal_in_bp:n + { \property_ref:een {\l__tag_graphic_currentlabel_tl}{ypos}{0}sp + + \property_ref:een {\l__tag_graphic_currentlabel_tl-tr}{pgfy}{0}sp + } + } + } -% PAC3 complained that the BBox is missing, so we are cheating for now -% and add a fix size. -\tagpdfsetup - { - newattribute = - {bbox}{/O /Layout /BBox [0 0 100 100]} +\cs_new_protected:Npn \__tag_graphic_tikz_begin_picture: + { + \tag_mc_end_push: + \bool_if:NTF \l__tag_graphic_artifact_bool + { \tagmcbegin{artifact} } + { + \__tag_tikz_getbbox: + \tagstructbegin{tag=Figure,alt=\l__tag_graphic_alt_tl}\tagmcbegin{} + \__tag_prop_gput:cne + { g__tag_struct_\int_eval:n {\c@g__tag_struct_abs_int}_prop } + { A } + { + << + /O /Layout /BBox~ + [ + \g__tag_graphic_lx_tl\c_space_tl + \g__tag_graphic_ly_tl\c_space_tl + \g__tag_graphic_ux_tl\c_space_tl + \g__tag_graphic_uy_tl + ] + >> + } + \bool_if:NT\l__tag_graphic_debug_bool + { + \__tag_graphic_show_bbox:VVVVne + \g__tag_graphic_lx_tl + \g__tag_graphic_ly_tl + \g__tag_graphic_ux_tl + \g__tag_graphic_uy_tl + {red} + {\int_use:N\g__tag_graphic_int} + } + } + \SuspendTagging{tikz} } +\cs_new_protected:Npn \__tag_graphic_tikz_end_picture: + { + \ResumeTagging{tikz}\tagmcend + \bool_if:NF \l__tag_graphic_artifact_bool + { + \tagstructend + \__tag_tikz_savepos:e {__tag_graphic_\int_use:N \g__tag_graphic_int} + } + \tag_mc_begin_pop:n{} + } + +\tikzset + { + every~picture/.style= + { + artifact, + execute~at~begin~picture=\__tag_graphic_tikz_begin_picture:, + execute~at~end~picture=\__tag_graphic_tikz_end_picture: + } + } +\AddToHook{env/tikzpicture/before}{\leavevmode} + +\tikzset + { + alt/.code= + { + \bool_set_false:N \l__tag_graphic_artifact_bool + \tl_set:Nn \l__tag_graphic_alt_tl{#1} + } + } +\tikzset + { + artifact/.code= + \bool_set_true:N \l__tag_graphic_artifact_bool + } + +\ExplSyntaxOff + + + \endinput diff --git a/Master/texmf-dist/tex/latex/tutodoc/tutodoc-locale-main-french.cfg.sty b/Master/texmf-dist/tex/latex/tutodoc/tutodoc-locale-main-french.cfg.sty index c639e1e9e03..5c97cb2f180 100644 --- a/Master/texmf-dist/tex/latex/tutodoc/tutodoc-locale-main-french.cfg.sty +++ b/Master/texmf-dist/tex/latex/tutodoc/tutodoc-locale-main-french.cfg.sty @@ -8,8 +8,8 @@ \NewDocumentCommand{\tutodoc@trans@note@title}{}{Note} \NewDocumentCommand{\tutodoc@trans@tip@title}{}{Astuce} \NewDocumentCommand{\tutodoc@trans@important@title}{}{Important} -\NewDocumentCommand{\tutodoc@trans@caution@title}{}{Caution} -\NewDocumentCommand{\tutodoc@trans@warn@title}{}{Danger} +\NewDocumentCommand{\tutodoc@trans@caution@title}{}{Mise ~ en ~ garde} +\NewDocumentCommand{\tutodoc@trans@warn@title}{}{Avertissement} \NewDocumentCommand{\tutodoc@trans@chges@pb}{}{Problème} \NewDocumentCommand{\tutodoc@trans@chges@break}{}{Bifurcation} \NewDocumentCommand{\tutodoc@trans@chges@fix}{}{Réparation} diff --git a/Master/texmf-dist/tex/latex/tutodoc/tutodoc.sty b/Master/texmf-dist/tex/latex/tutodoc/tutodoc.sty index 5e0ea7a0fb4..a1e0acdd130 100644 --- a/Master/texmf-dist/tex/latex/tutodoc/tutodoc.sty +++ b/Master/texmf-dist/tex/latex/tutodoc/tutodoc.sty @@ -9,8 +9,8 @@ \ProvidesExplPackage {tutodoc} - {2024-01-06} % Creation: 2023-11-29 - {1.1.0} + {2024-08-23} % Creation: 2023-11-29 + {1.2.0-a} {This package proposes tools for writing "human friendly" documentations of LaTeX packages.} \RequirePackage[ @@ -21,31 +21,42 @@ marginparwidth = 2cm, marginparsep = 2mm, heightrounded -]{geometry}[2020-01-02] +]{geometry}% + [2020-01-02] + +\RequirePackage[raggedright]% + {titlesec}% + [2021/07/05] -\RequirePackage[raggedright]{titlesec}[2021/07/05] \RequirePackage{tocbasic} -\RequirePackage{xcolor}[2022/06/12] -\RequirePackage{hyperref}[2023-02-07] +\RequirePackage{xcolor}% + [2022/06/12] + +\RequirePackage{hyperref}% + [2023-02-07] % We delegate the management of quoting to the `csquotes' package, % which takes care of the linguistic parameters. -\RequirePackage{csquotes}[2022-09-14] +\RequirePackage{csquotes}% + [2022-09-14] -\RequirePackage{amsthm}[2017/09] +\RequirePackage{amsthm}% + [2017/09] -\RequirePackage{clrstrip}[2021-08-28] +\RequirePackage{clrstrip}% + [2021-08-28] \RequirePackage{tcolorbox}[2023/06/19] \tcbuselibrary{minted, breakable, skins} -\RequirePackage{marginnote}[2023-09-07] +\RequirePackage{marginnote}% + [2023-09-07] % -- LOCALE LANG -- % @@ -808,8 +819,8 @@ %%% % prototype:: % #1 : the color of the margin note -% #2 : the first material (a date or nothing) -% #3 : the second material (a version number or nothing) +% #2 : the first material (a version number or nothing) +% #3 : the second material (a date or nothing) % #4 : the last negative vertical spacing for the 2nd rule % % :action: this macro factorizes the printing of the changes @@ -829,15 +840,19 @@ \IfBlankTF{#2}{}{ \par - \__tdoc_translate_date:n { #2 } + #2 \par } - \vspace{1pt} + \IfBlankTF{#3}{}{ + \IfBlankTF{#2}{}{ + \vspace{1pt} + } - \par - #3 - \par + \par + \__tdoc_translate_date:n { #3 } + \par + } \vspace{#4} \rule{1.65cm}{.95pt} @@ -871,8 +886,8 @@ %%% \cs_new:Npn \__tdoc_translate_date_process:w #1 - #2 - #3 \q_stop { \tutodoc@trans@date{#1} - {#2} - {#3} + {#2} + {#3} } @@ -895,9 +910,9 @@ %%% \NewDocumentCommand{\tdocversion}{O{blue} m O{}}{ \tutodoc@new@change@margin{#1} % Color - {#3} % Date - {#2} % Version - {-4.25pt} % Last negative vertical spacing + {#2} % Version + {#3} % Date + {-4.25pt} % Last negative vertical spacing } @@ -919,7 +934,7 @@ } -% -- CHANGES - WHAT? +% -- CHANGES - WHAT? -- % % :: MESSAGES :: % diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/beamerthemeuantwerpen.sty b/Master/texmf-dist/tex/latex/uantwerpendocs/beamerthemeuantwerpen.sty index 61fe5db1b48..c901bd70b5b 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/beamerthemeuantwerpen.sty +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/beamerthemeuantwerpen.sty @@ -26,7 +26,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesPackage{beamerthemeuantwerpen} - [2024/06/04 v4.7 .dtx skeleton file] + [2024/08/27 v4.8 .dtx skeleton file] diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls index 34e0dceb034..dacdc2eba5f 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls @@ -26,7 +26,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{uantwerpenbamathesis} - [2024/06/04 v4.7 .dtx skeleton file] + [2024/08/27 v4.8 .dtx skeleton file] \newif\if@filled \DeclareOption{filled}{\@filledtrue} \input{uantwerpencommonoptions.clo} diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencolorlogoscheme.sty b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencolorlogoscheme.sty index c18c069f77a..cbc4e66ac75 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencolorlogoscheme.sty +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencolorlogoscheme.sty @@ -25,7 +25,7 @@ %% The Current Maintainer of this work is Walter Daems. %% \ProvidesPackage{uantwerpencolorlogoscheme} - [2024/06/04 v4.7 .dtx skeleton file] + [2024/08/27 v4.8 .dtx skeleton file] \if@cmyk %% UAntwerpen \definecolor{uauamain}{cmyk}{0.00,0.96,0.82,0.01} diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls index 0f39d9fce21..75b7428ba8d 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpencoursetext.cls @@ -26,7 +26,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{uantwerpencoursetext} - [2024/06/04 v4.7 .dtx skeleton file] + [2024/08/27 v4.8 .dtx skeleton file] \newif\if@modern \@modernfalse \DeclareOption{modern}{\@moderntrue} diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-en.data b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-en.data index 78baa70ad6a..b3d2a343bdf 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-en.data +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpendocs-en.data @@ -46,8 +46,8 @@ juryname = Jury jurymembersname = Members jurychairname = Chair bmthesisname = Thesis to obtain the degree of -pthesisnamei = Thesis submitted in fulfilment of the requirements for the degree of -pthesisnameii = at the University of Antwerp +pthesisnamei = Thesis submitted for the degree of +pthesisnameii = at the University of Antwerp to be defended by weightname = Weight diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls index 3b6ba3c95e5..7e4b1999d4c 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenexam.cls @@ -26,7 +26,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{uantwerpenexam} - [2024/06/04 v4.7 .dtx skeleton file] + [2024/08/27 v4.8 .dtx skeleton file] \newif\if@examiner \DeclareOption{examiner}{\@examinertrue} \input{uantwerpencommonoptions.clo} diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls index 36ea4e52a16..eebd93d7930 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenletter.cls @@ -26,7 +26,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{uantwerpenletter} - [2024/06/04 v4.7 .dtx skeleton file] + [2024/08/27 v4.8 .dtx skeleton file] \newif\if@filled \DeclareOption{filled}{\@filledtrue} \newif\if@nofoldline diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls index 99966e060cd..ddb8dd2d254 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls @@ -26,7 +26,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{uantwerpenphdthesis} - [2024/06/04 v4.7 .dtx skeleton file] + [2024/08/27 v4.8 .dtx skeleton file] \newif\if@filled \DeclareOption{filled}{\@filledtrue} \newif\if@cameraready diff --git a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenreport.cls b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenreport.cls index 09009072947..feeb5ac9623 100644 --- a/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenreport.cls +++ b/Master/texmf-dist/tex/latex/uantwerpendocs/uantwerpenreport.cls @@ -26,7 +26,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{uantwerpenreport} - [2024/06/04 v4.7 .dtx skeleton file] + [2024/08/27 v4.8 .dtx skeleton file] \newif\if@copyright \DeclareOption{copyright}{\@copyrighttrue} \newif\if@filled diff --git a/Master/texmf-dist/tex/latex/verifycommand/verifycommand.sty b/Master/texmf-dist/tex/latex/verifycommand/verifycommand.sty index 535bc7da318..72417ae4000 100644 --- a/Master/texmf-dist/tex/latex/verifycommand/verifycommand.sty +++ b/Master/texmf-dist/tex/latex/verifycommand/verifycommand.sty @@ -18,18 +18,16 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{verifycommand} - [2024/01/11 v1.00 Verify definitions have not changed.] - - + [2024/09/03 v1.10 Verify definitions have not changed.] \RequirePackage{etoolbox} \RequirePackage{iftex} -\newbool{VERCMD@enable} -\booltrue{VERCMD@enable} +\newbool{VERCMDenable} +\booltrue{VERCMDenable} \DeclareOption{disable}{% - \boolfalse{VERCMD@enable}% + \boolfalse{VERCMDenable}% \typeout{----}% \typeout{Package verifycommand: Turned off by option 'disable'.}% \typeout{----}% @@ -68,20 +66,46 @@ } \newcommand*{\VERCMD@whatchanged}{} +\newbool{VERCMD@this@ltxcmd} +\boolfalse{VERCMD@this@ltxcmd} + +\newbool{VERCMD@failed@ltxcmd} +\boolfalse{VERCMD@failed@ltxcmd} + \newcommand*{\VERCMD@addchanged}[2]{% \ifdefempty{\VERCMD@whatchanged}% {}% {\apptocmd{\VERCMD@whatchanged}{^^J}{}{}}% - \apptocmd{\VERCMD@whatchanged}{Definition changed: #2^^J}{}{}% - \apptocmd{\VERCMD@whatchanged}{Definition changed: \space\space\space#1}{}{}% + \apptocmd{\VERCMD@whatchanged}{% + (verifycommand)\space\space#2^^J% + \space\space\space\space\space\space\space\space\space\space% + \space\space\space\space\space\space\space\space\space(#1)% + }{}{}% + \ifbool{VERCMD@this@ltxcmd}{% + \apptocmd{\VERCMD@whatchanged}{ *}{}{}% + \booltrue{VERCMD@failed@ltxcmd}% + }{}% + \boolfalse{VERCMD@this@ltxcmd}% } -\AfterEndDocument{ +\AtEndDocument{ \ifdefempty{\VERCMD@whatchanged}{}{% \typeout{--------------------------------}% - \typeout{WARNING: Something may fail.}% - \typeout{\VERCMD@whatchanged}% - \typeout{--------------------------------}% + \typeout{Package verifycommand Warning: Definitions have changed.}% + \typeout{Patches for the following macros may need to be updated.}% + \typeout{See the previous warnings for line numbers.}% + \typeout{}% + \typeout{Syntax:\space\space Patching pkg -> Defining pkg: Macro (checksum)}% + \typeout{-----}% + \typeout{\VERCMD@whatchanged} + \typeout{-----}% + \typeout{Look for updates to these packages.} + \ifbool{VERCMD@failed@ltxcmd}{ + \typeout{Any of the above marked with a * may be due to changes in LaTeX internals,} + \typeout{the most recently known of which was 2023/12/01.} + \typeout{If so, look for updates for the LaTeX sytem as well.} + }{} + \typeout{--------------------------------} } } @@ -93,32 +117,57 @@ }% } -\newcommand*{\VERCMD@Warning}[3]{% +\newcommand*{\VERCMDWarning}[3]{% \ifblank{#1}% {% \VERCMD@ProgWarning{% - Something may fail. A definition has changed:\MessageBreak + A definition has changed:\MessageBreak \ifblank{#2}{}{#2: }\string#3\MessageBreak - \VERCMD@temp\MessageBreak - } - \expandafter\VERCMD@addchanged\expandafter{\VERCMD@temp}{\string#3}% + (\VERCMD@temp)\MessageBreak + }% + \expandafter\VERCMD@addchanged% + \expandafter{\VERCMD@temp}{\string#3}% }% {% \PackageWarning{#1}{% - Something may fail. A definition has changed:\MessageBreak% + A definition has changed:\MessageBreak% \ifblank{#2}{}{#2: }% \string#3\MessageBreak% - \VERCMD@temp\MessageBreak% + (\VERCMD@temp)\MessageBreak% }% - \expandafter\VERCMD@addchanged\expandafter{\VERCMD@temp}{\ifblank{#2}{}{#2: }\string#3}% + \expandafter\VERCMD@addchanged% + \expandafter{\VERCMD@temp}{#1 -> \ifblank{#2}{}{#2: }\string#3}% }% } \ExplSyntaxOn -\NewDocumentCommand{\VerifyCommand}{O{} O{} m m}{% - \ifbool{VERCMD@enable}{% +\newbool{VERCMD@passed} +\newbool{VERCMD@failed} +\newcommand*{\TestVerifyCommands} +{ + \boolfalse{VERCMD@passed} + \boolfalse{VERCMD@failed} +} +\newcommand*{\IfVerifyCommandPassed} + {% + \ifbool{VERCMD@passed}% + {\let\VERCMD@tempa\@firstoftwo}% + {\let\VERCMD@tempa\@secondoftwo}% + \VERCMD@tempa% + } +\newcommand*{\IfVerifyCommandFailed} + {% + \ifbool{VERCMD@failed}% + {\let\VERCMD@tempa\@firstoftwo}% + {\let\VERCMD@tempa\@secondoftwo}% + \VERCMD@tempa% + } +\NewDocumentCommand{\IfVerifyCommand}{O{} O{} m m}{% + \ifbool{VERCMDenable}{% \edef\VERCMD@temp{Unknown~definition}% + \boolfalse{VERCMD@this@ltxcmd} \ifcsdef{\cs_to_str:N #3~code}% {% + \booltrue{VERCMD@this@ltxcmd}% \expandafter\VERCMD@mdfive% \csname \cs_to_str:N #3~code\endcsname% }% @@ -138,7 +187,10 @@ \ifcsdef{\VERCMD@backslash\cs_to_str:N #3}% {% \expandafter\VERCMD@mdfive% - \csname \VERCMD@backslash\cs_to_str:N #3\endcsname% + \csname % + \VERCMD@backslash% + \cs_to_str:N #3% + \endcsname% }% {% \ifdef{#3}% @@ -149,18 +201,38 @@ }% }% \ifdefstring{\VERCMD@temp}{#4}% - {}% {% - \VERCMD@Warning{#1}{#2}{#3}% + \booltrue{VERCMD@passed}% + \let\VERCMD@tempa\@firstoftwo% + }% + {% + \booltrue{VERCMD@failed}% + \let\VERCMD@tempa\@secondoftwo% }% }% if package enabled - {}% if package not enabled + {\let\VERCMD@tempa\@firstoftwo}% if package not enabled + \VERCMD@tempa% } -\NewDocumentCommand{\VerifyEnvironment}{O{} O{} m m m}{% - \ifbool{VERCMD@enable}{% +\NewDocumentCommand{\VerifyCommand}{O{} O{} m m}{% + \ifblank{#1}{% #1 blank + \IfVerifyCommand{#3}{#4}{}{\VERCMDWarning{}{}{#3}}% + }% #1 blank + {% #1 given + \ifblank{#2}{% #2 blank + \IfVerifyCommand[#1]{#3}{#4}{}{\VERCMDWarning{#1}{}{#3}}% + }% #2 blank + {% #2 given + \IfVerifyCommand[#1][#2]{#3}{#4}{}{\VERCMDWarning{#1}{#2}{#3}}% + }% #2 given + }% #1 given +} +\NewDocumentCommand{\IfVerifyEnvironmentBegin}{O{} O{} m m}{% + \ifbool{VERCMDenable}{% \edef\VERCMD@temp{Unknown~definition}% + \boolfalse{VERCMD@this@ltxcmd} \ifcsdef{environment~#3~code}% {% + \booltrue{VERCMD@this@ltxcmd}% \expandafter\VERCMD@mdfive% \csname environment~#3~code\endcsname% }% @@ -177,13 +249,25 @@ }% }% \ifdefstring{\VERCMD@temp}{#4}% - {}% {% - \VERCMD@Warning{#1}{#2}{#3}% + \booltrue{VERCMD@passed}% + \let\VERCMD@tempa\@firstoftwo% + }% + {% + \booltrue{VERCMD@failed}% + \let\VERCMD@tempa\@secondoftwo% }% + }% if package enabled + {\let\VERCMD@tempa\@firstoftwo}% if package not enabled + \VERCMD@tempa% +} +\NewDocumentCommand{\IfVerifyEnvironmentEnd}{O{} O{} m m}{% + \ifbool{VERCMDenable}{% \edef\VERCMD@temp{Unknown~definition}% + \boolfalse{VERCMD@this@ltxcmd} \ifcsdef{environment~#3~end~aux~}% {% + \booltrue{VERCMD@this@ltxcmd}% \expandafter\VERCMD@mdfive \csname environment~#3~end~aux~\endcsname% }% @@ -195,15 +279,57 @@ }% {}% }% - \ifdefstring{\VERCMD@temp}{#5}% - {}% + \ifdefstring{\VERCMD@temp}{#4}% + {% + \booltrue{VERCMD@passed}% + \let\VERCMD@tempa\@firstoftwo% + }% {% - \VERCMD@Warning{#1}{#2}{(end)#3}% + \booltrue{VERCMD@failed}% + \let\VERCMD@tempa\@secondoftwo% }% }% if package enabled - {}% if package not enabled + {\let\VERCMD@tempa\@firstoftwo}% if package not enabled + \VERCMD@tempa% +} +\NewDocumentCommand{\VerifyEnvironment}{O{} O{} m m m}{% + \ifblank{#1}{% #1 blank + \IfVerifyEnvironmentBegin{#3}{#4}% + {}% + {\VERCMDWarning{}{}{#3}}% + }% #1 blank + {% #1 given + \ifblank{#2}{% #2 blank + \IfVerifyEnvironmentBegin[#1]{#3}{#4}% + {}% + {\VERCMDWarning{#1}{}{#3}}% + }% #2 blank + {% #2 given + \IfVerifyEnvironmentBegin[#1][#2]{#3}{#4}% + {}% + {\VERCMDWarning{#1}{#2}{#3}}% + }% #2 given + }% #1 given + \ifblank{#1}{% #1 blank + \IfVerifyEnvironmentEnd{#3}{#5}% + {}% + {\VERCMDWarning{}{}{(end)#3}}% + }% #1 blank + {% #1 given + \ifblank{#2}{% #2 blank + \IfVerifyEnvironmentEnd[#1]{#3}{#5}% + {}% + {\VERCMDWarning{#1}{}{(end)#3}}% + }% #2 blank + {% #2 given + \IfVerifyEnvironmentEnd[#1][#2]{#3}{#5}% + {}% + {\VERCMDWarning{#1}{#2}{(end)#3}}% + }% #2 given + }% #1 given } \ExplSyntaxOff + \endinput %% %% End of file `verifycommand.sty'. diff --git a/Master/texmf-dist/tex/latex/wordle/wordle.sty b/Master/texmf-dist/tex/latex/wordle/wordle.sty index 4df1801ba02..a463f22837e 100644 --- a/Master/texmf-dist/tex/latex/wordle/wordle.sty +++ b/Master/texmf-dist/tex/latex/wordle/wordle.sty @@ -1,298 +1,670 @@ -% Author.........: C. Pierquet -% licence........: Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf -% Inspiration....: https://tex.stackexchange.com/questions/659860/wordle-like-colored-letter-boxes-in-latex +% --------------------------------------------------------------- +% wordle --- A latex package for typesetting wordle puzzles +% +% E-mail: andrew.mathas@gmail.com and cpierquet@outlook.fr +% Released under the LaTeX Project Public License v1.3c or later +% See http://www.latex-project.org/lppl.txt +% ---------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{wordle}[2023/09/03 v0.1.1 Wordle grid] -% 0.1.1 Coorection d'un bug sur la version anglaise -% 0.1.0 Version initiale + quelques modèles -%------Packages utiles +% Package version +\def\wordle@version{0.3.0} +\def\wordle@release{2024-08-18} + +\providecommand\DeclareRelease[3]{} +\providecommand\DeclareCurrentRelease[2]{} +\DeclareRelease{\wordle@version}{\wordle@release}{wordle.sty} +\DeclareCurrentRelease{}{\wordle@release} + +\ProvidesExplPackage{wordle} {\wordle@release} {\wordle@version} + {A latex package for typesetting wordle puzzles} + +% ---------------------------------------------------------------- +% Required packages +%\RequirePackage{xcolor} \RequirePackage{tikz} -\RequirePackage{simplekv} -\RequirePackage{xstring} -%commandes utiles -\usepackage{expl3} -\ExplSyntaxOn +% ---------------------------------------------------------------- +% predefined tile colours + +% from https://www.nytimes.com/games/wordle +\definecolor{WordleAbsent} {HTML} {797D7F} +\definecolor{WordlePresent} {HTML} {F7DA21} +\definecolor{WordleCorrect} {HTML} {6AAB64} +\definecolor{WordleEmpty} {HTML} {F5F5DC} + +\definecolor{WordleHardPresent} {HTML} {95BEFA} +\definecolor{WordleHardCorrect} {HTML} {FB9B00} + +% from https://sutom.nocle.fr/# +\definecolor{WordleSutomAbsent} {HTML} {0077B7} +\definecolor{WordleSutomPresent} {HTML} {FFBB00} +\definecolor{WordleSutomCorrect} {HTML} {EB2152} + +% ---------------------------------------------------------------- +% package variables + +\bool_new:N \l__wordle_case_sensitive_bool % case sensitive mode (false by default) +\bool_new:N \l__wordle_strict_bool % strict mode (false by default) + +\dim_new:N \l__wordle_grid_dim +\dim_new:N \l__wordle_rounded_dim +\dim_new:N \l__wordle_sep_dim +\dim_new:N \l__wordle_size_dim +\dim_new:N \l__wordle_thickness_dim + +\int_new:N \l__wordle_rows_int -%boite en [fr] -\cs_new:Npn \l__sutom_boite_lettre:nn #1#2#3 +\fp_new:N \l__wordle_scale_fp + +\tl_new:N \l__wordle_align_tl +\tl_new:N \l__wordle_depth_tl +\tl_new:N \l__wordle_font_tl +\tl_new:N \l__wordle_name_tl +\tl_new:N \l__wordle_style_tl +\tl_new:N \l__wordle_tikz_tl +\tl_new:N \l__wordle_tile_style_tl + +\tl_new:N \l__wordle_present_border_tl +\tl_new:N \l__wordle_present_colour_tl +\tl_new:N \l__wordle_present_frame_tl +\tl_new:N \l__wordle_present_shape_tl +\tl_new:N \l__wordle_present_text_tl + +\tl_new:N \l__wordle_correct_border_tl +\tl_new:N \l__wordle_correct_colour_tl +\tl_new:N \l__wordle_correct_frame_tl +\tl_new:N \l__wordle_correct_shape_tl +\tl_new:N \l__wordle_correct_text_tl + +\tl_new:N \l__wordle_empty_border_tl +\tl_new:N \l__wordle_empty_colour_tl +\tl_new:N \l__wordle_empty_frame_tl +\tl_new:N \l__wordle_empty_shape_tl +\tl_new:N \l__wordle_empty_text_tl + +\tl_new:N \l__wordle_absent_border_tl +\tl_new:N \l__wordle_absent_colour_tl +\tl_new:N \l__wordle_absent_frame_tl +\tl_new:N \l__wordle_absent_shape_tl +\tl_new:N \l__wordle_absent_text_tl + + +% ---------------------------------------------------------------- +% Assign up to four style attributes from comma separated list to absent, +% present, correct, empty, respectively. If there is only one entry in +% the list then everything is set equal to that entry +\cs_new_nopar:Npn \__wordle_set_style:nn #1#2 { - \ifboolKV[SUTOM]{Lettres}% - {% - \tikz \draw[rounded~corners=\fpeval{#3*\SutomUnit}cm,draw=\SutomBorder,line~width=\SutomWidth~mm,fill=#1] (0,0) rectangle++ (\SutomUnit,\SutomUnit) node[midway,font=\SutomFonte,text=\SutomFonteColor,scale=\SutomUnit] {#2} ; - }% - {% - \tikz \draw[rounded~corners=\fpeval{#3*\SutomUnit}cm,draw=\SutomBorder,line~width=\SutomWidth~mm,fill=#1] (0,0) rectangle++ (\SutomUnit,\SutomUnit) ; - }% + \seq_set_split:Nnn \l_tmpa_seq {,} {#2} + \int_compare:nNnTF {\seq_count:N \l_tmpa_seq} = {1} + { + \tl_set:co {l__wordle_absent_#1_tl} {#2} + \tl_set:co {l__wordle_present_#1_tl} {#2} + \tl_set:co {l__wordle_correct_#1_tl} {#2} + \tl_set:co {l__wordle_empty_#1_tl} {#2} + } + { + \seq_pop_left:NNT \l_tmpa_seq \l_tmpa_tl { \tl_set:co {l__wordle_absent_#1_tl} {\l_tmpa_tl} } + \seq_pop_left:NNT \l_tmpa_seq \l_tmpa_tl { \tl_set:co {l__wordle_present_#1_tl} {\l_tmpa_tl} } + \seq_pop_left:NNT \l_tmpa_seq \l_tmpa_tl { \tl_set:co {l__wordle_correct_#1_tl} {\l_tmpa_tl} } + \seq_pop_left:NNT \l_tmpa_seq \l_tmpa_tl { \tl_set:co {l__wordle_empty_#1_tl} {\l_tmpa_tl} } + } } -\cs_new:Npn \l__sutom_boite_lettre_rond:nn #1#2#3#4 +% apply the wordle styles +\cs_new_nopar:Npn \__wordle_apply_style:n #1 { + \str_case:enF { #1 } + { + {hard} + { + \__wordle_set_style:nn {border} {white} + \__wordle_set_style:nn {colour} {WordleAbsent,WordleHardPresent,WordleHardCorrect,WordleEmpty} + \__wordle_set_style:nn {frame} {false} + \__wordle_set_style:nn {shape} {rectangle} + \__wordle_set_style:nn {text} {white,white,white,black} + } + + {alt} + { % alt appears in the English version of Cedric's manual for sutom + \__wordle_set_style:nn {border} {white} + \__wordle_set_style:nn {colour} {WordleSutomAbsent,WordleSutomPresent,WordleSutomCorrect,WordleEmpty} + \__wordle_set_style:nn {frame} {false,true,false,false} + \__wordle_set_style:nn {shape} {rectangle,circle,rectangle,circle} + \__wordle_set_style:nn {text} {white,white,white,black} + \tl_set:Nn \l_wordle_font_tl {\LARGE\bfseries\sffamily} + + } + + {sutom} + { + \__wordle_set_style:nn {border} {white} + \__wordle_set_style:nn {colour} {WordleSutomAbsent,WordleSutomPresent,WordleSutomCorrect,WordleEmpty} + \__wordle_set_style:nn {frame} {false,true,false,false} + \__wordle_set_style:nn {shape} {rectangle,circle,rectangle,circle} + \__wordle_set_style:nn {text} {white,white,white,black} + \tl_set:Nn \l_wordle_font_tl {\LARGE\bfseries\sffamily} + } + } + { + % default style + \__wordle_set_style:nn {border} {white} + \__wordle_set_style:nn {colour} {WordleAbsent,WordlePresent,WordleCorrect,WordleEmpty} + \__wordle_set_style:nn {frame} {false} + \__wordle_set_style:nn {shape} {rectangle} + \__wordle_set_style:nn {text} {white,white,white,black} + } +} + +% rescale dimensions +\cs_new_nopar:Npn \__wordle_rescale:n #1 { - \IfStrEq{\SutomStyle}{rond} - {% - \tikz {\draw[rounded~corners=\fpeval{#4*\SutomUnit}cm,draw=\SutomBorder,line~width=\SutomWidth~mm,fill=#1] (0,0) rectangle++ (\SutomUnit,\SutomUnit) ; - \ifboolKV[SUTOM]{Lettres}% - {% - \draw[line~width=\SutomWidth~mm,draw=#2,fill=#2] ({0.5*\SutomUnit},{0.5*\SutomUnit}) circle[radius=\fpeval{0.5*\SutomUnit-0.1*\SutomWidth}] node[font=\SutomFonte,text=\SutomFonteColor,scale=\SutomUnit] {#3} ; - }% - {% - \draw[line~width=\SutomWidth~mm,draw=#2,fill=#2] ({0.5*\SutomUnit},{0.5*\SutomUnit}) circle[radius=\fpeval{0.5*\SutomUnit-0.1*\SutomWidth}]; - }% - }% - }% - {% - \ifboolKV[SUTOM]{Lettres}% - {% - \tikz \draw[rounded~corners=\fpeval{#4*\SutomUnit}cm,line~width=0\SutomWidth~mm,draw=\SutomBorder,fill=#2] (0,0) rectangle++ (\SutomUnit,\SutomUnit) node[midway,font=\SutomFonte,text=\SutomFonteColor,scale=\SutomUnit] {#3} ; - }% - {% - \tikz \draw[rounded~corners=\fpeval{#4*\SutomUnit}cm,line~width=\SutomWidth~mm,draw=\SutomBorder,fill=#2] (0,0) rectangle++ (\SutomUnit,\SutomUnit) ; - }% - }% + \fp_set:Nn \l__wordle_scale_fp {#1} + \dim_set:Nn \l__wordle_rounded_dim { \fp_eval:n {#1*\dim_to_decimal_in_mm:n {\l__wordle_rounded_dim }}mm } + \dim_set:Nn \l__wordle_sep_dim { \fp_eval:n {#1*\dim_to_decimal_in_mm:n {\l__wordle_sep_dim }}mm } + \dim_set:Nn \l__wordle_size_dim { \fp_eval:n {#1*\dim_to_decimal_in_mm:n {\l__wordle_size_dim }}mm } + \dim_set:Nn \l__wordle_thickness_dim { \fp_eval:n {#1*\dim_to_decimal_in_mm:n {\l__wordle_thickness_dim}}mm } } -%boite en [en] -\cs_new:Npn \l__wordle_boite_lettre:nn #1#2#3 + +% ---------------------------------------------------------------- +% just in case we're running an old version of latex +\providecommand \IfFormatAtLeastTF { \@ifl@t@r \fmtversion } + +\IfFormatAtLeastTF { 2022-06-01 } + { \ProcessKeyOptions [ wordle ] } + { + \RequirePackage { l3keys2e } + \ProcessKeysOptions { wordle } + } + +% ---------------------------------------------------------------- +% Define keys for the package options and their defaults + +\keys_define:nn { wordle } { - \ifboolKV[WORDLE]{Letters}% - {% - \tikz \draw[rounded~corners=\fpeval{#3*\SutomUnit}cm,draw=\SutomBorder,line~width=\SutomWidth~mm,fill=#1] (0,0) rectangle++ (\SutomUnit,\SutomUnit) node[midway,font=\SutomFonte,text=\SutomFonteColor,scale=\SutomUnit] {#2} ; - }% - {% - \tikz \draw[rounded~corners=\fpeval{#3*\SutomUnit}cm,draw=\SutomBorder,line~width=\SutomWidth~mm,fill=#1] (0,0) rectangle++ (\SutomUnit,\SutomUnit) ; - }% + % apply puzzle styles: sets colours of absent, present, correct and empty tiles + style .code:n = { + \seq_set_from_clist:Nn \l_tmpa_seq {#1} + \seq_map_inline:Nn \l_tmpa_seq { \__wordle_apply_style:n { \str_lowercase:n{##1}} } + }, + Style .meta:n = { style = #1 }, + style .initial:n = standard, + + % specifying tile colours and shapes + borders .code:n = { \__wordle_set_style:nn {border} {#1} }, + BorderColor .code:n = { \__wordle_set_style:nn {border} {#1} }, + CouleurBordures.code:n = { \__wordle_set_style:nn {border} {#1} }, + + Couleurs .code:n = { \__wordle_set_style:nn {colour} {#1} }, + colours .code:n = { \__wordle_set_style:nn {colour} {#1} }, + + frames .code:n = { \__wordle_set_style:nn {frame} {#1} }, + Cadres .code:n = { \__wordle_set_style:nn {frame} {#1} }, + frames .default:n = true, + shapes .code:n = { \__wordle_set_style:nn {shape} {#1} }, + Formes .code:n = { \__wordle_set_style:nn {shape} {#1} }, + + % text colour + text .code:n = { \__wordle_set_style:nn {text} {#1} }, + CouleurLettres .code:n = { \__wordle_set_style:nn {text} {#1} }, + + % align letters in puzzle + align .code:n = { + \tl_set:Nn \l__wordle_align_tl {\vphantom{azertyuiopqsdfghjklmwxcvbnAZERTYUIOPQSDFGHJKLMWXCVBN}} + \tl_set:Nn \l__wordle_depth_tl {text~depth=0pt} + }, + noalign .code:n = { + \tl_set:Nn \l__wordle_align_tl {} + \tl_set:Nn \l__wordle_depth_tl {} + }, + nonalign .meta:n = { noalign }, + align .initial:n = {true}, + + absent .tl_set:N = \l__wordle_absent_colour_tl, + absent~color .tl_set:N = \l__wordle_absent_colour_tl, + couleur~absent .tl_set:N = \l__wordle_absent_colour_tl, + absent~colour .tl_set:N = \l__wordle_absent_colour_tl, + bordure~absent .tl_set:N = \l__wordle_absent_border_tl, + absent~border .tl_set:N = \l__wordle_absent_border_tl, + absent~frame .tl_set:N = \l__wordle_absent_frame_tl, + cadre~absent .tl_set:N = \l__wordle_absent_frame_tl, + absent~frame .default:n = true, + absent~shape .tl_set:N = \l__wordle_absent_shape_tl, + forme~absent .tl_set:N = \l__wordle_absent_shape_tl, + absent~text .tl_set:N = \l__wordle_absent_text_tl, + coultxt~absent .tl_set:N = \l__wordle_absent_text_tl, + + correct .tl_set:N = \l__wordle_correct_colour_tl, + correct~color .tl_set:N = \l__wordle_correct_colour_tl, + correct~colour .tl_set:N = \l__wordle_correct_colour_tl, + couleur~correct.tl_set:N = \l__wordle_correct_colour_tl, + correct~border .tl_set:N = \l__wordle_correct_border_tl, + bordure~correct.tl_set:N = \l__wordle_correct_border_tl, + correct~frame .tl_set:N = \l__wordle_correct_frame_tl, + cadre~correct .tl_set:N = \l__wordle_correct_frame_tl, + correct~frame .default:n = true, + correct~shape .tl_set:N = \l__wordle_correct_shape_tl, + forme~correct .tl_set:N = \l__wordle_correct_shape_tl, + correct~text .tl_set:N = \l__wordle_correct_text_tl, + coultxt~correct.tl_set:N = \l__wordle_correct_text_tl, + + empty .tl_set:N = \l__wordle_empty_colour_tl, + couleur~vide .tl_set:N = \l__wordle_empty_colour_tl, + empty~color .tl_set:N = \l__wordle_empty_colour_tl, + empty~colour .tl_set:N = \l__wordle_empty_colour_tl, + empty~border .tl_set:N = \l__wordle_empty_border_tl, + bordure~vide .tl_set:N = \l__wordle_empty_border_tl, + empty~frame .tl_set:N = \l__wordle_empty_frame_tl, + cadre~vide .tl_set:N = \l__wordle_empty_frame_tl, + empty~frame .default:n = true, + empty~shape .tl_set:N = \l__wordle_empty_shape_tl, + forme~vide .tl_set:N = \l__wordle_empty_shape_tl, + empty~text .tl_set:N = \l__wordle_empty_text_tl, + coultxt~vide. tl_set:N = \l__wordle_empty_text_tl, + + present .tl_set:N = \l__wordle_present_colour_tl, + couleur~present.tl_set:N = \l__wordle_present_colour_tl, + present~color .tl_set:N = \l__wordle_present_colour_tl, + present~colour .tl_set:N = \l__wordle_present_colour_tl, + present~border .tl_set:N = \l__wordle_present_border_tl, + bordure~present.tl_set:N = \l__wordle_present_border_tl, + present~frame .tl_set:N = \l__wordle_present_frame_tl, + cadre~present .tl_set:N = \l__wordle_present_frame_tl, + present~frame .default:n = true, + present~shape .tl_set:N = \l__wordle_present_shape_tl, + forme~present .tl_set:N = \l__wordle_present_shape_tl, + present~text .tl_set:N = \l__wordle_present_text_tl, + coultxt~present.tl_set:N = \l__wordle_present_text_tl, + + % text font + font .tl_set:N = \l__wordle_font_tl, + Fonte .tl_set:N = \l__wordle_font_tl, + Police .tl_set:N = \l__wordle_font_tl, + font .initial:n = \Large\bfseries\sffamily, + + % tile size + size .dim_set:N = \l__wordle_size_dim, + Taille .dim_set:N = \l__wordle_size_dim, + size .initial:n = 8mm, + + % thickness of tile border + thickness .dim_set:N = \l__wordle_thickness_dim, + Epaisseur .dim_set:N = \l__wordle_thickness_dim, + Thick .code:n = {\dim_set:Nn \l__wordle_thickness_dim {#1mm}}, + thickness .initial:n = 0.25mm, + + % rounded-corner = # + rounded .dim_set:N = \l__wordle_rounded_dim, + Arrondi .dim_set:N = \l__wordle_rounded_dim, + rounded .default:n = 4pt, + Rounded .code:n = {\dim_set:Nn \l__wordle_rounded_dim {#1mm}}, + rounded .initial:n = 1mm, + + % separation between tiles + separation .dim_set:N = \l__wordle_sep_dim, + Separation .dim_set:N = \l__wordle_sep_dim, + separation .initial:n = 0.5mm, + + % rescale tiles + scale .code:n = { \__wordle_rescale:n {#1} }, + Echelle .code:n = { \__wordle_rescale:n {#1} }, + scale .initial:n = 1, + Unit .code:n = { \__wordle_rescale:n {#1} }, + Unite .code:n = { \__wordle_rescale:n {#1} }, + + % letter case + case~sensitive .bool_set:N = \l__wordle_case_sensitive_bool, + case~sensitive .default:n = true, + case~sensitive .initial:n = false, + + % letter visibility + letters .code:n = {\cs_set_eq:NN \__wordle_letter:n \__wordle_letter_natural:n}, + Lettres .code:n = {\cs_set_eq:NN \__wordle_letter:n \__wordle_letter_natural:n}, + noletters .code:n = {\cs_set_eq:NN \__wordle_letter:n \__wordle_letter_none:n}, + NonLettres .code:n = {\cs_set_eq:NN \__wordle_letter:n \__wordle_letter_none:n}, + letters .initial:n = true, + + % forced letter case + natural~case .code:n = { + \cs_set_eq:NN \__wordle_letter:n \__wordle_letter_natural:n + }, + lower~case .code:n = { + \cs_set_eq:NN \__wordle_letter:n \__wordle_letter_lower:n + \bool_set_false:N \l__wordle_case_sensitive_bool + }, + upper~case .code:n = { + \cs_set_eq:NN \__wordle_letter:n \__wordle_letter_upper:n + \bool_set_false:N \l__wordle_case_sensitive_bool + }, + + % puzzle specs: rows and columns + rows .int_set:N = \l__wordle_rows_int, + Lignes .int_set:N = \l__wordle_rows_int, + rows .initial:n = 0, + + strict .bool_set:N = \l__wordle_strict_bool, + Strict .bool_set:N = \l__wordle_strict_bool, + strict .default:n = true, + strict .initial:n = false, + + % tikz settings + tile~style .tl_set:N = \l__wordle_tile_style_tl, + Style~case .tl_set:N = \l__wordle_tile_style_tl, + tile~style .initial:n = , + + name .tl_set:N = \l__wordle_name_tl, + Nom .tl_set:N = \l__wordle_name_tl, + name .initial:n = W, + tikz .tl_set:N = \l__wordle_tikz_tl, + tikz .initial:n = , +} + +% user settings +\NewDocumentCommand\WordleSetup{ m }{ \keys_set:nn { wordle } {#1} } +\NewDocumentCommand\ParamsSutom{ m }{ \keys_set:nn { wordle } {#1} } + +% ---------------------------------------------------------------- +% Define TikZ Wordle styles for the letters. Using tikz styles both +% ensures consistency and has the added advantage of taking care of +% expansion issues with the tile settings +\tikzset{/Wordle/.is~family, /Wordle, + tile/.style = { + /tikz, % change back to using tikz keys + inner~sep = \l__wordle_sep_dim, + minimum~height = \l__wordle_size_dim, + minimum~size = \l__wordle_size_dim, + rounded~corners= \l__wordle_rounded_dim, + line~width = \l__wordle_thickness_dim, + font = \l__wordle_font_tl, + % scale = \fp_to_decimal:N \l__wordle_scale_fp, + text = \tl_use:c {l__wordle_#1_text_tl}, + fill = \tl_use:c {l__wordle_#1_colour_tl}, + shape = \tl_use:c {l__wordle_#1_shape_tl}, + }, + frame/.style = { + /Wordle/tile=#1, + /tikz, % change back to using tikz keys + draw = \tl_use:c{l__wordle_#1_border_tl}, + minimum~size = {\l__wordle_size_dim+\l__wordle_thickness_dim}, + fill = \tl_use:c {l__wordle_#1_colour_tl}, + shape = rectangle, + }, } -\cs_new:Npn \l__wordle_boite_lettre_rond:nn #1#2#3#4 +% apply a TikZ setting +\cs_new_nopar:Npn \__wordle_tikzset:n #1 { \exp_args:Nx \tikzset{#1} } + +% ---------------------------------------------------------------- +% preprocessing of the wordle letters +\cs_new_nopar:Npn \__wordle_letter_none:n #1 {} +\cs_new_nopar:Npn \__wordle_letter_natural:n #1 {#1} +\cs_new_nopar:Npn \__wordle_letter_lower:n #1 { \str_lowercase:n {#1} } +\cs_new_nopar:Npn \__wordle_letter_upper:n #1 { \str_uppercase:n {#1} } + +% by default wordle letters are not processed +\cs_set_eq:NN \__wordle_letter:n \__wordle_letter_natural:n + +% Print a letter in a box as a node. There is slightly different behaviour +% depending on whether the tile is frames or we are in strict mode. The way +% that the entry is printed depends is controlled by \__wordle_letter:n. +\cs_new_nopar:Npn \wordle__boxed_letter:nn #1#2 { - \IfStrEq{\SutomStyle}{default} - {% - \ifboolKV[WORDLE]{Letters}% - {% - \tikz \draw[rounded~corners=\fpeval{#4*\SutomUnit}cm,line~width=\SutomWidth~mm,draw=\SutomBorder,fill=#2] (0,0) rectangle++ (\SutomUnit,\SutomUnit) node[midway,font=\SutomFonte,text=\SutomFonteColor,scale=\SutomUnit] {#3} ; - }% - {% - \tikz \draw[rounded~corners=\fpeval{#4*\SutomUnit}cm,line~width=\SutomWidth~mm,draw=\SutomBorder,fill=#2] (0,0) rectangle++ (\SutomUnit,\SutomUnit) ; - }% - }% - {% - \tikz {\draw[rounded~corners=\fpeval{#4*\SutomUnit}cm,draw=\SutomBorder,line~width=\SutomWidth~mm,fill=#1] (0,0) rectangle++ (\SutomUnit,\SutomUnit) ; - \ifboolKV[WORDLE]{Letters}% - {% - \draw[line~width=\SutomWidth~mm,draw=#2,fill=#2] ({0.5*\SutomUnit},{0.5*\SutomUnit}) circle[radius=\fpeval{0.5*\SutomUnit-0.1*\SutomWidth}] node[font=\SutomFonte,text=\SutomFonteColor,scale=\SutomUnit] {#3} ; - }% - {% - \draw[line~width=\SutomWidth~mm,draw=#2,fill=#2] ({0.5*\SutomUnit},{0.5*\SutomUnit}) circle[radius=\fpeval{0.5*\SutomUnit-0.1*\SutomWidth}]; - }% - }% - }% + % determine the node name, which takes the form <W>-<row>-<col> + \tl_set:No \l_tmpa_tl + { + \l__wordle_name_tl-\int_eval:n{1+\l__wordle_row_index_int}-\int_use:N\l__wordle_letter_index_int + } + + % the construction of the node depends on whether the tile is framed + \tl_if_eq:cnTF {l__wordle_#1_frame_tl} {true} + { + % draw the frame + \node[/Wordle/frame=absent] % frame use the absent fill colour + at ({\l__wordle_letter_index_int*\l__wordle_grid_dim},{-\l__wordle_row_index_int*\l__wordle_grid_dim}){}; + % draw the tile + \node[/Wordle/tile=#1] + (\l_tmpa_tl) at ({\l__wordle_letter_index_int*\l__wordle_grid_dim}, + {-\l__wordle_row_index_int*\l__wordle_grid_dim}) + { \l__wordle_align_tl\__wordle_letter:n {#2} }; + } + { + % draw the tile, with a border + \node[/Wordle/frame=#1, /Wordle/tile=#1] + (\l_tmpa_tl) at ({\l__wordle_letter_index_int*\l__wordle_grid_dim}, + {-\l__wordle_row_index_int*\l__wordle_grid_dim}) + { \l__wordle_align_tl\__wordle_letter:n {#2} }; + } + + % if strict then put a slash through any extra letters + \bool_if:NT \l__wordle_strict_bool + { + \int_compare:nNnT {\l__wordle_letter_index_int} > {\seq_count:N \l__wordle_answer_seq } + { + \draw[red,ultra~thick] (\tl_use:N\l_tmpa_tl.south~west)--(\tl_use:N\l_tmpa_tl.north~east); + } + } } -\seq_new:N \l_wordle_seq % the answer -\prop_new:N \l_wordle_prop % count letters in wordle -\seq_new:N \l_words_seq % list of all words -\prop_new:N \l_word_prop % count letters in word -\int_new:N \l_letter_int % index of current letter in word +\seq_new:N \l__wordle_answer_seq % the answer +\prop_new:N \l__wordle_answer_counts_prop % count letters in wordle +\seq_new:N \l__wordle_solution_seq % list of all words +\prop_new:N \l__wordle_word_counts_prop % count letters in word +\int_new:N \l__wordle_letter_index_int % index of current letter in word +\int_new:N \l__wordle_row_index_int % TikZ row index in solution -% a conditional for nonnegative prop counter in \l_word_prop -\prg_new_protected_conditional:Npnn \if_wordle_letter_nonnegative:n #1 {TF} +% a conditional for non-negative prop counter in \l__wordle_word_counts_prop +\prg_new_protected_conditional:Npnn \if__wordle_letter_nonnegative:n #1 {TF} { - \prop_if_in:NnTF \l_word_prop {#1} - { % letter in in prop - \prop_get:NnN \l_word_prop {#1} \l_tmpa_tl - \int_compare:nNnTF {\l_tmpa_tl} < {0} - {\prg_return_false:} {\prg_return_true:} - } - {\prg_return_false:} + \prop_if_in:NnTF \l__wordle_word_counts_prop {#1} + { % letter in in prop + \prop_get:NnN \l__wordle_word_counts_prop {#1} \l_tmpa_tl + \int_compare:nNnTF {\l_tmpa_tl} < {0} + {\prg_return_false:} {\prg_return_true:} + } + {\prg_return_false:} } +\cs_generate_variant:Nn \str_if_eq:nVTF {xVTF} + % a conditional for comparing letters -\prg_new_protected_conditional:Npnn \if_wordle_letters_agree:n #1 {T, TF} +\prg_new_protected_conditional:Npnn \if__wordle_letters_agree:n #1 {T, TF} { - \str_set:Nx \l_tmpa_str {\seq_item:Nn \l_wordle_seq {\l_letter_int}} - \str_if_eq:nVTF {#1} \l_tmpa_str {\prg_return_true:} {\prg_return_false:} + \str_set:Nx \l_tmpa_str + {\seq_item:Nn \l__wordle_answer_seq {\l__wordle_letter_index_int}} + + + \bool_if:NTF \l__wordle_case_sensitive_bool + {\str_if_eq:nVTF {#1} \l_tmpa_str {\prg_return_true:} {\prg_return_false:}} + {\str_if_eq:xVTF {\str_uppercase:n{#1}} \l_tmpa_str {\prg_return_true:} {\prg_return_false:}} } % add #3 to <prop=#1>.#2 -\cs_new_protected:Npn \wordle__add_to_prop_counter:Nnn #1#2#3 +\cs_new_nopar:Npn \wordle__add_to_prop_counter:Nnn #1#2#3 { - \prop_put_if_new:Nnn #1 {#2} {0} - \prop_pop:NnN #1 {#2} \l_tmp_a - \prop_put:Nnx #1 {#2} {\int_eval:n {#3+\l_tmp_a}} + \prop_put_if_new:Nnn #1 {#2} {0} + \prop_pop:NnN #1 {#2} \l_tmp_a + \prop_put:Nnx #1 {#2} {\int_eval:n {#3+\l_tmp_a}} } -% make \l_wordle_prop<x> = #x's in wordle_seq -\cs_new_protected:Npn \count_letters_in_wordle:n #1 +% make \l__wordle_answer_counts_prop<x> = #x's in wordle_seq +\cs_new_nopar:Npn \wordle__count_letters_in_answer:n #1 { - \wordle__add_to_prop_counter:Nnn \l_wordle_prop {#1} {1}% + \wordle__add_to_prop_counter:Nnn \l__wordle_answer_counts_prop {#1} {1} } % first run: subtract correct matches from letter counts -\cs_new:Npn \count_letters_in_word:n #1 +\cs_new_nopar:Npn \wordle__count_letters_in_word:n #1 { - \int_incr:N \l_letter_int - \if_wordle_letters_agree:nT {#1} - { \wordle__add_to_prop_counter:Nnn \l_word_prop {#1} {-1} }% + \int_incr:N \l__wordle_letter_index_int + \if__wordle_letters_agree:nT {#1} + { \wordle__add_to_prop_counter:Nnn \l__wordle_word_counts_prop {#1} {-1} } } -%commande [fr] % on the second run we print a coloured wordle word -\cs_new:Npn \write_letters_in_word:n #1 +\cs_new_nopar:Npn \wordle__write_letters_in_word:n #1 { - \int_incr:N \l_letter_int - \if_wordle_letters_agree:nTF {#1} - { \l__sutom_boite_lettre:nn {\SutomBienPlacee}{#1}{\SutomRounded} } - { - % subtract 1 from the prop counter - \wordle__add_to_prop_counter:Nnn \l_word_prop {#1} {-1} - % if the counter is non-negative this is a pseudo match - \if_wordle_letter_nonnegative:nTF {#1} - { \l__sutom_boite_lettre_rond:nn {\SutomCoulFond}{\SutomCoulMalPlacee}{#1}{\SutomRounded} } - { \l__sutom_boite_lettre:nn {\SutomCoulFond}{#1}{\SutomRounded} } - }% + \int_incr:N \l__wordle_letter_index_int + \if__wordle_letters_agree:nTF {#1} + { \wordle__boxed_letter:nn {correct} {#1} } + { + % subtract 1 from the prop counter + \wordle__add_to_prop_counter:Nnn \l__wordle_word_counts_prop {#1} {-1} + % if the counter is non-negative this is a pseudo match + \if__wordle_letter_nonnegative:nTF {#1} + { \wordle__boxed_letter:nn {present} {#1} } + { \wordle__boxed_letter:nn {absent} {#1} } + } } -%commande [en] -% on the second run we print a coloured wordle word -\cs_new:Npn \write_letters_in_wordle:n #1 +\cs_generate_variant:Nn \seq_set_split:Nnn {Nnx} +\cs_generate_variant:Nn \cs_set_nopar:Nn {NV} + +% typeset the word "#1", colouring letters using the wordle convention +\cs_new_nopar:Npn \wordle__mark_word:n #1 { - \int_incr:N \l_letter_int - \if_wordle_letters_agree:nTF {#1} - { \l__wordle_boite_lettre:nn {\SutomBienPlacee}{#1}{\SutomRounded} } - { - % subtract 1 from the prop counter - \wordle__add_to_prop_counter:Nnn \l_word_prop {#1} {-1} - % if the counter is non-negative this is a pseudo match - \if_wordle_letter_nonnegative:nTF {#1} - { \l__wordle_boite_lettre_rond:nn {\SutomCoulFond}{\SutomCoulMalPlacee}{#1}{\SutomRounded} } - { \l__wordle_boite_lettre:nn {\SutomCoulFond}{#1}{\SutomRounded} } - }% -} + \str_if_eq:nnTF {#1} {*} + { + \cs_set_eq:NN \wordle__process_word:n \wordle__empty_word:n + } + { + \prop_set_eq:NN \l__wordle_word_counts_prop \l__wordle_answer_counts_prop + \tl_map_function:nN {#1} \wordle__count_letters_in_word:n + \int_zero:N \l__wordle_letter_index_int + \tl_map_function:nN {#1} \wordle__write_letters_in_word:n -%clés [fr] -\defKV[SUTOM]{% - Couleurs=\def\SutomCouleurs{#1},% - Arrondi=\def\SutomRounded{#1},% - Unite=\def\SutomUnit{#1},% - Police=\def\SutomFonte{#1},% - CouleurLettres=\def\SutomFonteColor{#1},% - Style=\def\SutomStyle{#1},% - Epaisseur=\def\SutomWidth{#1},% - CouleurBordure=\def\SutomBorder{#1} -} + % if strict then check lengths + \bool_if:NT \l__wordle_strict_bool + { + \int_while_do:nNnn {\l__wordle_letter_index_int} < {\seq_count:N\l__wordle_answer_seq} + { + \int_incr:N \l__wordle_letter_index_int + \wordle__boxed_letter:nn {absent} {\c_space_tl} + } + } -\setKVdefault[SUTOM]{% - Couleurs={cyan!75!black,yellow,red},% - Arrondi=0.1,% - Unite=1,% - Police=\LARGE\bfseries\sffamily,% - CouleurLettres=white,% - Lettres=true,% - Style=rond,% - Epaisseur=0.25,% - CouleurBordure=white + % increment the row index + \int_incr:N \l__wordle_row_index_int + } } -%environnement [fr] -\NewDocumentEnvironment{GrilleSutom}{ O{} m b }% -{% - \restoreKV[SUTOM]% - \setKV[SUTOM]{#1}% - \StrBefore{\SutomCouleurs}{,}[\SutomCoulFond]% - \StrBetween[1,2]{\SutomCouleurs}{,}{,}[\SutomCoulMalPlacee]% - \StrBehind[2]{\SutomCouleurs}{,}[\SutomBienPlacee]% - \StrLen{#2}[\SutomNbLettres]% - \def\SutomLarg{\fpeval{1.01*\SutomUnit*\SutomNbLettres}}% - \begin{minipage}{\SutomLarg~cm} - \lineskip=0pt% - \parindent=0pt% - % split the answer into letters - \seq_set_split:Nnn \l_wordle_seq {} {#2} - % we need to count the number of times each letter appears in \l_wordle_seq - \prop_clear:N \l_wordle_prop - \tl_map_function:nN {#2} \count_letters_in_wordle:n - % split the solution into words - \regex_split:nnN {\s} {#3} \l_words_seq - % process the words - \seq_map_inline:Nn \l_words_seq - { - \int_zero:N \l_letter_int - \prop_set_eq:NN \l_word_prop \l_wordle_prop - \tl_map_function:nN {##1} \count_letters_in_word:n - \int_zero:N \l_letter_int - \tl_map_function:nN {##1} \write_letters_in_word:n - \par - } -}% -{% - \end{minipage}% +% typeset the word "#1" by putting boxes around each letter +\cs_new_nopar:Npn \wordle__empty_word:n #1 +{ + \tl_map_inline:nn {#1} + { + \int_incr:N \l__wordle_letter_index_int + \wordle__boxed_letter:nn {empty} {##1} + } + % if strict then check lengths + \bool_if:NT \l__wordle_strict_bool + { + \int_while_do:nNnn {\l__wordle_ltter_index_int} < {\seq_count:N\l__wordle_answer_seq} + { + \int_incr:N \l__wordle_letter_index_int + \wordle__boxed_letter:nn {empty} {\c_space_tl} + } + } + \int_incr:N \l__wordle_row_index_int } -%clés [en] -\definecolor{WordleBack}{HTML}{797D7F} -\definecolor{WordleBad}{HTML}{CAB557} -\definecolor{WordleGood}{HTML}{6AAB64} - -\defKV[WORDLE]{% - Colors=\def\SutomCouleurs{#1},% - Rounded=\def\SutomRounded{#1},% - Unit=\def\SutomUnit{#1},% - Fonte=\def\SutomFonte{#1},% - ColorLetters=\def\SutomFonteColor{#1},% - Style=\def\SutomStyle{#1},% - Thickness=\def\SutomWidth{#1},% - BorderColor=\def\SutomBorder{#1} -} +\cs_set_eq:NN \wordle__process_word:n \wordle__mark_word:n -\setKVdefault[WORDLE]{% - Colors={WordleBack,WordleBad,WordleGood},% - Rounded=0.1,% - Unit=1,% - Fonte=\LARGE\bfseries\sffamily,% - CouleurLettres=white,% - Letters=true,% - Style=default,% - Thick=0.25,% - BorderColor=white -} +\NewDocumentEnvironment{wordle}{ O{} m O{} b } +{ + % apply wordle environment options + \WordleSetup{#1} + \begin{tikzpicture} -%environnement [en] -\NewDocumentEnvironment{WordleGrid}{ O{} m b } -{% - \restoreKV[WORDLE]% - \setKV[WORDLE]{#1}% - \StrBefore{\SutomCouleurs}{,}[\SutomCoulFond]% - \StrBetween[1,2]{\SutomCouleurs}{,}{,}[\SutomCoulMalPlacee]% - \StrBehind[2]{\SutomCouleurs}{,}[\SutomBienPlacee]% - \StrLen{#2}[\SutomNbLettres]% - \def\SutomLarg{\fpeval{1.01*\SutomUnit*\SutomNbLettres}}% - \begin{minipage}{\SutomLarg~cm} - \parindent=0pt - \lineskip=0pt - % split the answer into letters - \seq_set_split:Nnn \l_wordle_seq {} {#2} - % we need to count the number of times each letter appears in \l_wordle_seq - \prop_clear:N \l_wordle_prop - \tl_map_function:nN {#2} \count_letters_in_wordle:n - % split the solution into words - \regex_split:nnN {\s} {#3} \l_words_seq - % process the words - \seq_map_inline:Nn \l_words_seq - { - \int_zero:N \l_letter_int - \prop_set_eq:NN \l_word_prop \l_wordle_prop - \tl_map_function:nN {##1} \count_letters_in_word:n - \int_zero:N \l_letter_int - \tl_map_function:nN {##1} \write_letters_in_wordle:n - \par - } -}% -{% - \end{minipage}% -} + % apply any tikz settings -- we need to some expansion trickery to do this + \__wordle_tikzset:n {\l__wordle_tikz_tl} + \__wordle_tikzset:n {/Wordle/tile/.append~style={\l__wordle_depth_tl,\l__wordle_tile_style_tl}} + + % set grid dimension = box size + separation + \dim_set:Nn \l__wordle_grid_dim {\l__wordle_size_dim+\l__wordle_sep_dim} + + % split the answer into letters + \bool_if:NTF \l__wordle_case_sensitive_bool + { \seq_set_split:Nnn \l__wordle_answer_seq {} {#2} } + { \seq_set_split:Nnx \l__wordle_answer_seq {} {\str_uppercase:n {#2}} } + + % count the number of times letters appear in \l__wordle_answer_seq + \prop_clear:N \l__wordle_answer_counts_prop + \tl_map_function:nN {#2} \wordle__count_letters_in_answer:n + + % split the solution into words + \regex_split:nnN {\s} {#4} \l__wordle_solution_seq + + % process the words + \int_zero:N \l__wordle_row_index_int + \seq_map_inline:Nn \l__wordle_solution_seq + { + \int_zero:N \l__wordle_letter_index_int + \wordle__process_word:n {##1} + } + + % if required, add extra required blank rows + \int_while_do:nNnn {\l__wordle_row_index_int} < {\l__wordle_rows_int} + { + \int_zero:N \l__wordle_letter_index_int + \int_while_do:nNnn {\l__wordle_letter_index_int} < {\seq_count:N\l__wordle_answer_seq} + { + \int_incr:N \l__wordle_letter_index_int + \wordle__boxed_letter:nn {empty} {\c_space_tl} + } + \int_incr:N \l__wordle_row_index_int + } + + % finally, execute the optional TikZ commands + #3 + + \end{tikzpicture} +}{} + +% wrapper environment for Gridwordle +\NewDocumentEnvironment{GridWordle}{ O{} m O{} b } + { + \begin{wordle}[#1]{#2}[#3]#4]\end{wordle} + } + {} + +% wrapper environment for GrilleSutom +\NewDocumentEnvironment{GrilleSutom}{ O{} m O{} b } + { + \begin{wordle}[style=sutom,#1]{#2}[#3]#4\end{wordle} + } + {} -\ExplSyntaxOff +\endinput -\endinput
\ No newline at end of file +% ---------------------------------------------------------------- +% CHANGE LOG +% +% Version 0.3 - \wordle@release +% - merged AM & CP packages, adding styles and streamlining options, french keys +% +% Version 0.2 - \wordle@release +% - added documentation and cleaned some of the options +% +% Version 0.1 - 2022-10-01 +% - initial version +% +% ---------------------------------------------------------------- +% +% Copyright (C) 2022-3 by Andrew Mathas <andrew.mathas@gmail.com> +% and Cédric Pierquet cpierquet@outlook.fr +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License (LPPL), either +% version 1.3c of this license or (at your option) any later +% version. The latest version of this license is in the file: +% +% http://www.latex-project.org/lppl.txt +% +% This work is "maintained" (as per LPPL maintenance status) by +% Andrew Mathas. +% +% This work consists of the files: +% wordle.sty +% wordle.tex diff --git a/Master/texmf-dist/tex/latex/writeongrid/WriteOnGrid.sty b/Master/texmf-dist/tex/latex/writeongrid/WriteOnGrid.sty index e2673d3c581..3d462b8a33e 100644 --- a/Master/texmf-dist/tex/latex/writeongrid/WriteOnGrid.sty +++ b/Master/texmf-dist/tex/latex/writeongrid/WriteOnGrid.sty @@ -2,7 +2,8 @@ % licence : Released under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txtf \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{WriteOnGrid}[2024/04/12 v0.1.6 package to write on grid lines] +\ProvidesPackage{WriteOnGrid}[2024/09/01 v0.1.7 package to write on grid lines] +% 0.1.7 Option pour régler la marge pour les PleinePageCinqCinq % 0.1.6 Commande pour calculer le nombre de lignes à insérer en fin de page / options Auto % 0.1.5 Choix de la réglure pour le seyes (en pretest) + amélioration de la gestion des paragraphes % 0.1.4 Suppression des options de xcolor (définition manuelle des couleurs) @@ -564,16 +565,21 @@ } %------page entière 5x5 +%les marges doivent valoir MargeH=0.2+k*0.5 et MargeV=0.3+k'*0.5 \defKV[CxCFull]{% Couleur=\xdef\CCFullCoul{#1},% CouleurMarge=\xdef\CCFullCoulM{#1},% - FormatPapier=\xdef\CCFullFormatPap{#1} + FormatPapier=\xdef\CCFullFormatPap{#1},% + MargeG=\xdef\CCFullMargeG{#1},% + MargeH=\xdef\CCFullMargeH{#1} } \setKVdefault[CxCFull]{% Couleur=lightgray!50,% CouleurMarge=gray,% NumLignes=false,% - FormatPapier=A4 + FormatPapier=A4,% + MargeG=auto,% + MargeH=auto } \NewDocumentEnvironment{PleinePageCinqCinq}{ O{} }%semble OK ^^ @@ -581,13 +587,49 @@ \useKVdefault[CxCFull]% \setKV[CxCFull]{#1}% \IfEq{\CCFullFormatPap}{A4}% - {\xdef\CCFullHautPap{29.7}\xdef\CCFullLargPap{21}\xdef\CCFullMargeG{1.7}\xdef\CCFullMargeH{1.3}}% + {% + \xdef\CCFullHautPap{29.7}\xdef\CCFullLargPap{21}% + \IfEq{\CCFullMargeG}{auto}% + {% + \xdef\CCFullMargeG{1.7}% + }% + {}% + \IfEq{\CCFullMargeH}{auto}% + {% + \xdef\CCFullMargeH{1.3}% + }% + {}% + }% {}% \IfEq{\CCFullFormatPap}{A5}% - {\xdef\CCFullHautPap{21}\xdef\CCFullLargPap{14.8}\xdef\CCFullMargeG{1.2}\xdef\CCFullMargeH{0.8}}% + {% + \xdef\CCFullHautPap{21}\xdef\CCFullLargPap{14.8}% + \IfEq{\CCFullMargeG}{auto}% + {% + \xdef\CCFullMargeG{1.2}% + }% + {}% + \IfEq{\CCFullMargeH}{auto}% + {% + \xdef\CCFullMargeH{0.8}% + }% + {}% + }% {}% \IfSubStr{\CCFullFormatPap}{x}% - {\StrCut{\CCFullFormatPap}{x}{\CCFullLargPap}{\CCFullHautPap}\xdef\CCFullMargeG{1.7}\xdef\CCFullMargeH{1.3}}% + {% + \StrCut{\CCFullFormatPap}{x}{\CCFullLargPap}{\CCFullHautPap}% + \IfEq{\CCFullMargeG}{auto}% + {% + \xdef\CCFullMargeG{1.7}% + }% + {}% + \IfEq{\CCFullMargeH}{auto}% + {% + \xdef\CCFullMargeH{1.3}% + }% + {}% + }% {}% %calcul du nombre de lignes /colonnes ? \xdef\CCFullNbLign{\fpeval{round(\CCFullHautPap/(0.5),0)}}% diff --git a/Master/texmf-dist/tex/latex/xreview/xreview.sty b/Master/texmf-dist/tex/latex/xreview/xreview.sty new file mode 100644 index 00000000000..a6d2501eed1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/xreview/xreview.sty @@ -0,0 +1,135 @@ +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{xreview}[2024/08/29 Reviewing LaTeX documents made easy] + +\RequirePackage{xcolor} +\RequirePackage[normalem]{ulem} +\RequirePackage{etoolbox} +\RequirePackage{environ} +\RequirePackage{letltxmacro} +\RequirePackage{todonotes} +\RequirePackage{soul} +\RequirePackage{pifont} +\RequirePackage{xparse} +\RequirePackage{amsmath} + +%%%% Equation numbering +\newcounter{removedeqcounter} +\setcounter{removedeqcounter}{0} + +%%%% Comment numbering +\newcounter{commentcounter} +\setcounter{commentcounter}{0} + +%%%% Define colours and prefixes +\newcommand{\addedcolor}{blue} +\newcommand{\removedcolor}{red} +\newcommand{\removedeqprefix}{R} +\newcommand{\commentcolor}{yellow} +\newcommand{\resolvedcommentcolor}{green} +\newcommand{\commentprefix}{C} + +%%%% Necessary for comments to work in twocolumn-type documents +\setlength{\marginparwidth}{2cm} + +%%%% Reviewing commands +\newtoggle{annotated} +\toggletrue{annotated} % Show changes by default + +\newcommand{\showchanges}{\toggletrue{annotated}} +\newcommand{\showclean}{\togglefalse{annotated}} + +\newtoggle{commented} +\toggletrue{commented} % Show comments by default + +\newcommand{\showcomments}{\toggletrue{commented}} +\newcommand{\hidecomments}{\togglefalse{commented}} + +%%%% Text coloring and hiding +\newcommand{\colortext}[2]{{\leavevmode\color{#1}{#2}}} +\newcommand{\safesout}[1]{\ifmmode\text{\sout{\ensuremath{#1}}}\else\sout{#1}\fi} +\newcommand{\hidefromclean}[1]{\iftoggle{annotated}{#1}{}} + +\newcommand{\added}[1]{\iftoggle{annotated}{\colortext{\addedcolor}{#1}}{{#1}}} + +\newcommand{\removed}[1]{\hidefromclean{% +\begingroup% +\let\oldcite\cite% +\renewcommand{\cite}[1]{\mbox{\oldcite{##1}}}% +\colortext{\removedcolor}{\safesout{#1}}% +\endgroup}} + +\newcommand{\changed}[2]{\removed{#1}\iftoggle{annotated}{ }{}\added{#2}} + +%%%% Equation coloring and hiding +\NewEnviron{remequation}{\hidefromclean{% +\addtocounter{equation}{-1}% +\refstepcounter{removedeqcounter}% +\renewcommand{\theequation}{\textcolor{\removedcolor}{\removedeqprefix\arabic{removedeqcounter}}}% +\let\oldnonumber\nonumber% +\renewcommand{\nonumber}{\addtocounter{equation}{1}\addtocounter{removedeqcounter}{-1}\oldnonumber}% +\renewcommand{\notag}{\nonumber}% +\begin{equation}% +\color{\removedcolor}% +\safesout{\BODY}% +\end{equation}}} + +\NewEnviron{remequation*}{\hidefromclean{% +\begin{equation*}% +\color{\removedcolor}% +\safesout{\BODY}% +\end{equation*}}} + +\NewEnviron{addequation}{% +\begin{equation}% +\added{\BODY}% +\end{equation}} + +\NewEnviron{addequation*}{% +\begin{equation*}% +\added{\BODY}% +\end{equation*}} + +\newcommand{\removedeqline}[1]{\hidefromclean{% +\let\oldnonumber\nonumber% +\renewcommand{\nonumber}{\global\tag@false\addtocounter{removedeqcounter}{-1}}% +\renewcommand{\notag}{\nonumber}% +\makeatletter% +\newcommand{\remlabel}{% +\refstepcounter{removedeqcounter}% +\global\tag@true% +\oldnonumber% +\gdef\df@tag{\maketag@@@{\textcolor{\removedcolor}{(\removedeqprefix\arabic{removedeqcounter})}}\def\@currentlabel{\textcolor{\removedcolor}{\removedeqprefix\arabic{removedeqcounter}}}}} +\makeatother +\remlabel% +\color{\removedcolor}% +\makeatletter\let\default@color\current@color\makeatother% +\safesout{#1}% +}} + +\newcommand{\addedeqline}[1]{% +\iftoggle{annotated}{\color{\addedcolor}{#1}}% +{{#1}}% +} + +\newcommand{\remaligntab}{\hidefromclean{&}} +\newcommand{\remnewline}{\hidefromclean{\\}} + +%%%% Commenting +\DeclareRobustCommand{\resolvedhl}[1]{{\sethlcolor{green}\hl{#1}}} + +\newcommand{\comment}[3][]{% +\stepcounter{commentcounter}% +\ifboolexpr{togl{annotated} and togl{commented}}{% +\hl{#2}\todo[prepend, color=\commentcolor ,caption=\textbf{\commentprefix\arabic{commentcounter}}, linecolor=black, #1]{#3}}% +{#2}} + +\newcommand{\resolvedcomment}[3][]{% +\stepcounter{commentcounter}% +\ifboolexpr{togl{annotated} and togl{commented}}{% +\resolvedhl{#2}\todo[prepend, color=\resolvedcommentcolor ,caption=\textbf{\ding{52} \commentprefix\arabic{commentcounter}}, linecolor=black, #1]{#3}}% +{#2}} + +\NewDocumentCommand{\authoredcomments}{O{} O{} m}{% + \expandafter\newcommand\csname #3comment\endcsname{\comment[author=#3, #1]}% + \expandafter\newcommand\csname resolved#3comment\endcsname{\resolvedcomment[author=#3, #2]}% +}
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty b/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty index 5a91bc017a9..03bab0e35d0 100644 --- a/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty +++ b/Master/texmf-dist/tex/latex/zref-clever/zref-clever.sty @@ -52,7 +52,7 @@ 'zref-clever' requires a LaTeX kernel \zrefclever@required@kernel\space or newer.% }% }% -\ProvidesExplPackage {zref-clever} {2024-05-20} {0.4.5} +\ProvidesExplPackage {zref-clever} {2024-08-23} {0.4.6} {Clever LaTeX cross-references based on zref} \RequirePackage { zref-base } \RequirePackage { zref-user } @@ -102,6 +102,15 @@ \zref@addprop \ZREF@mainlist { zc@cntval } \zref@newprop* { zc@pgval } [0] { \int_use:c { c@page } } \zref@addprop \ZREF@mainlist { zc@pgval } +\cs_new:Npn \__zrefclever_get_enclosing_counters:n #1 + { + \cs_if_exist:cT { c@ \__zrefclever_counter_reset_by:n {#1} } + { + { \__zrefclever_counter_reset_by:n {#1} } + \__zrefclever_get_enclosing_counters:e + { \__zrefclever_counter_reset_by:n {#1} } + } + } \cs_new:Npn \__zrefclever_get_enclosing_counters_value:n #1 { \cs_if_exist:cT { c@ \__zrefclever_counter_reset_by:n {#1} } @@ -111,6 +120,7 @@ { \__zrefclever_counter_reset_by:n {#1} } } } +\cs_generate_variant:Nn \__zrefclever_get_enclosing_counters:n { e } \cs_generate_variant:Nn \__zrefclever_get_enclosing_counters_value:n { e } \cs_new:Npn \__zrefclever_counter_reset_by:n #1 { @@ -144,6 +154,8 @@ \l__zrefclever_current_counter_tl } \zref@addprop \ZREF@mainlist { zc@enclval } +\zref@newprop { zc@enclcnt } + { \__zrefclever_get_enclosing_counters:e \l__zrefclever_current_counter_tl } \int_new:N \g__zrefclever_page_format_int \tl_new:N \g__zrefclever_prev_page_format_tl \AddToHook { shipout / before } @@ -2418,25 +2430,16 @@ \keys_define:nn { zref-clever/label } { counterresetters .code:n = - { - \clist_map_inline:nn {#1} - { - \seq_if_in:NnF \l__zrefclever_counter_resetters_seq {##1} - { - \seq_put_right:Nn - \l__zrefclever_counter_resetters_seq {##1} - } - } - } , + { \seq_set_from_clist:Nn \l__zrefclever_counter_resetters_seq {#1} } , counterresetters .initial:n = { - part , - chapter , - section , - subsection , - subsubsection , - paragraph , subparagraph , + paragraph , + subsubsection , + subsection , + section , + chapter , + part , }, counterresetters .value_required:n = true , } @@ -5389,8 +5392,34 @@ \cs_generate_variant:Nn \__zrefclever_get_rf_opt_bool:nnnnN { nneeN } \__zrefclever_compat_module:nn { appendix } { + \newcounter { zc@appendix } + \cs_if_exist:cTF { chapter } + { + \__zrefclever_zcsetup:e + { + counterresetby = + { + zc@appendix = \__zrefclever_counter_reset_by:n { chapter } , + chapter = zc@appendix , + } , + } + } + { + \cs_if_exist:cT { section } + { + \__zrefclever_zcsetup:e + { + counterresetby = + { + zc@appendix = \__zrefclever_counter_reset_by:n { section } , + section = zc@appendix , + } , + } + } + } \AddToHook { cmd / appendix / before } { + \setcounter { zc@appendix } { 1 } \__zrefclever_zcsetup:n { countertype = @@ -5409,26 +5438,9 @@ { \__zrefclever_if_package_loaded:nT { appendix } { - \newcounter { zc@appendix } - \newcounter { zc@save@appendix } - \setcounter { zc@appendix } { 0 } - \setcounter { zc@save@appendix } { 0 } - \cs_if_exist:cTF { chapter } - { - \__zrefclever_zcsetup:n - { counterresetby = { chapter = zc@appendix } } - } - { - \cs_if_exist:cT { section } - { - \__zrefclever_zcsetup:n - { counterresetby = { section = zc@appendix } } - } - } \AddToHook { env / appendices / begin } { - \stepcounter { zc@save@appendix } - \setcounter { zc@appendix } { \value { zc@save@appendix } } + \setcounter { zc@appendix } { 1 } \__zrefclever_zcsetup:n { countertype = @@ -5444,13 +5456,31 @@ } \AddToHook { env / appendices / end } { \setcounter { zc@appendix } { 0 } } - \AddToHook { cmd / appendix / before } + \newcounter { zc@subappendix } + \cs_if_exist:cTF { chapter } + { + \__zrefclever_zcsetup:e + { + counterresetby = + { + zc@subappendix = \__zrefclever_counter_reset_by:n { section } , + section = zc@subappendix , + } , + } + } { - \stepcounter { zc@save@appendix } - \setcounter { zc@appendix } { \value { zc@save@appendix } } + \__zrefclever_zcsetup:e + { + counterresetby = + { + zc@subappendix = \__zrefclever_counter_reset_by:n { subsection } , + subsection = zc@subappendix , + } , + } } \AddToHook { env / subappendices / begin } { + \setcounter { zc@subappendix } { 1 } \__zrefclever_zcsetup:n { countertype = @@ -5463,6 +5493,8 @@ } , } } + \AddToHook { env / subappendices / end } + { \setcounter { zc@subappendix } { 0 } } \msg_info:nnn { zref-clever } { compat-package } { appendix } } } |