diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
577 files changed, 27033 insertions, 17882 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/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/asmejour/asmejour.cls b/Master/texmf-dist/tex/latex/asmejour/asmejour.cls index 095964ffc7b..a8cd43eae27 100644 --- a/Master/texmf-dist/tex/latex/asmejour/asmejour.cls +++ b/Master/texmf-dist/tex/latex/asmejour/asmejour.cls @@ -4,10 +4,9 @@ %% %% The asmejour.cls file should be used with the files asmejour.bst (for citations) and asmejour-template.tex. %% -%% %% This file's version and date are: - \def\versionno{1.22} - \def\versiondate{2024/01/30\space} + \def\versionno{1.23} + \def\versiondate{2024/07/24\space} %% %% Author: John H. Lienhard V %% Department of Mechanical Engineering @@ -22,14 +21,14 @@ %% 4. Support citations, footnotes, and bold face math in section headings %% 5. Provide optional line numbers for editing and review %% 6. Support balancing height of columns on the last page -%% 7. Support the archival PDF/A standards 1b, 2b, 2u, 3b, and 3u +%% 7. Support archival PDF/A standards %% 8. Provide copyright notices for government employees and government contractors %% 9. Enable various math and text features from the newtxmath, mathalfa, and newtxtext packages %% 10. Support inclusion of passages in languages other than English %% %% This class is compatible with both pdfLaTeX and LuaLaTeX. All packages required by the class -%% are in standard distributions, such as TeXLive, and are also available at CTAN (https://ctan.org/). -%% The use of an up-to-date (Feb. 2020 or later) and complete LaTeX distribution is strongly recommended. +%% are in standard distributions, such as TeX Live, and are also available at CTAN (https://ctan.org/). +%% The use of an up-to-date (Nov. 2022 or later) and complete LaTeX distribution is strongly recommended. %% %% The title block is set by specific commands that are described in the asmejour-template.tex file. %% @@ -57,72 +56,79 @@ %% 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} \ProvidesClass{asmejour}[\versiondate asmejour paper format] -\LoadClass[twoside,9pt,twocolumn]{extarticle} - -\ifdefined\NewDocumentCommand\else - \RequirePackage{xparse}[2020/02/25] -\fi +\LoadClass[twoside,9pt]{extarticle}% twocolumn format initiated in \MakeTitle command 2024/07/20 \RequirePackage{iftex}% provides \ifpdftex, etc. \RequirePackage{ifthen} -%%%%%%%%%%%%% Test compatibility of older distributions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\ExplSyntaxOn + \str_const:Nn \ClassName {asmejour} +\ExplSyntaxOff -\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 +%%%%%%%%%%%%% Some compatibility for older distributions %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\IfFormatAtLeastTF{2020/02/25}{% - \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 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, but your abstract will probably not compile properly if you lack the xparse package [2020/02/25], and the code will crash entirely if you lack the iftex package [2019/11/07].}% +\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 + +\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 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 any errors for now, but your abstract will not compile properly if you lack the xparse package [2020/02/25], and the code will crash entirely if you lack the iftex package [2019/11/07].}% } - -\DeclareDocumentCommand\LogNote{m}{% - \IfFormatAtLeastTF{2021/11/15}{% - \ClassNoteNoLine{asmejour}{#1}% Added to LaTeX in Nov. 2021 - }{% - \ClassWarningNoLine{asmejour}{#1}% + +% 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} +} + +% 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} } } -%% Test whether \DocumentMetadata has been loaded (Thank you Ulrike Fischer) -\newif\if@asme@pdfmanagement -\ExplSyntaxOn -\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 - } -\ExplSyntaxOff +% Enable pre-2020/10 formats to access essential macros later moved into LaTeX kernel +\ifdefined\NewDocumentCommand\else + \RequirePackage{xparse}[2020/02/25] +\fi + +% Provide pre-2020/10 installations with basic unicode character mappings +\IfFormatAtLeastTF{2020/10/01}{\relax}{% + \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 +} -%%%%%%%%%%%%%% Options for the class %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%% Options for the class %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \RequirePackage{kvoptions}% this package calls kvsetkeys \SetupKeyvalOptions{ - family=asmejour, + family=\ClassName, prefix=asmejour@, setkeys=\kvsetkeys, } %% for mathalfa, so we may pass options in this format: mathalfa=cal=euler, mathalfa=frak=boondox -\define@key{asmejour}{mathalfa}{% +\define@key{\ClassName}{mathalfa}{% \PassOptionsToPackage{#1}{mathalfa}% } +%% Option to obtain line numbers [singlecolumn], 2024/07/20 +\DeclareBoolOption{singlecolumn} + %% Option to obtain line numbers [lineno] \DeclareBoolOption{lineno} @@ -132,6 +138,12 @@ %% Option to omit lists of figures and tables \DeclareBoolOption{nolists} +%% Option to omit ASME copyright notice [nocopyright] +\DeclareBoolOption{nocopyright} + +%% Option to omit ASME footers [nofoot] +\DeclareBoolOption{nofoot} + %% Option for copyright notice if all authors are government employees [govt] \DeclareBoolOption{govt} @@ -141,57 +153,54 @@ %% Option for government contractor copyright notice [contractor] \DeclareBoolOption{contractor} -%% set [barcolor=] to a color name defined by xcolor package +%% set key [barcolor=] to pass a color name defined by xcolor package \DeclareStringOption[black]{barcolor} -%% the key main= passes the choice of main language to babel +%% the key [main= ] to pass the choice of main language to babel \newif\ifaj@mainset\aj@mainsetfalse -\define@key{asmejour}{main}[english]{% +\define@key{\ClassName}{main}{% \PassOptionsToPackage{main=#1,#1}{babel}% added #1 resolves conflicts between certain .ldf files under "main=". \aj@mainsettrue - \ifthenelse{\equal{#1}{english}}{% - \PassOptionsToPackage{pdflang=en}{hyperref}}{% - \LogNote{Selecting #1 as the primary language} - }% + \ClassNoteNoLine{\ClassName}{Selecting #1 as the primary language} } -%% if main language was not chosen explicitly, default to English -\ifaj@mainset\relax\else - \PassOptionsToPackage{main=english}{babel}% - \PassOptionsToPackage{pdflang=en}{hyperref} - \ClassInfo{Selecting English as the primary language, since main= not set}% -\fi - %% Suppress warnings about unused global options, 2021/12/01 -\DeclareDefaultOption{}% suppress warning about unused mathalfa option +\DeclareDefaultOption{} -\ProcessKeyvalOptions{asmejour} +\ProcessKeyvalOptions{\ClassName} %% Turn off these keys now that we're done with them \NewDocumentCommand\aj@DisableOption{m}{% \DisableKeyvalOption[% action=ignore,% - class=asmejour% + class=\ClassName% ]{#1}{\@KeyFamily}% } \NewDocumentCommand\@DisableKeys{>{\SplitList{;}}m}{\ProcessList{#1}{\aj@DisableOption}} -\def\@KeyFamily{asmejour} -\@DisableKeys{mathalfa;barcolor;lineno;balance;nolists;govt;govtsome;contractor;main} +\def\@KeyFamily{\ClassName} +\@DisableKeys{mathalfa;singlecolumn;lineno;balance;nolists;nocopyright;nofoot;govt;govtsome;contractor;barcolor;main} + + +%% if main language was not was chosen explicitly, default to English +\ifaj@mainset\relax\else + \PassOptionsToPackage{main=english}{babel}% + \ClassNoteNoLine{\ClassName}{Selecting English as the primary language, since main= not set}% +\fi -%%%%%%% PDF/A Compliance Keys %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%% PDF/A Compliance Keys %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% new pdf management in LaTeX, with \DocumentMetaData{..}, is preferred to this approach. \newif\ifaj@setpdfa\aj@setpdfafalse \newif\ifaj@pdfaone\aj@pdfaonefalse -\if@asme@pdfmanagement\else +\ifasme@pdfmanagement\else \SetupKeyvalOptions{ family=pdfaopt, - prefix=pdafopt@, + prefix=pdfaopt@, setkeys=\kvsetkeys, } @@ -201,7 +210,7 @@ \define@key{pdfaopt}{pdf-a}[true]{% \aj@setpdfatrue \PassOptionsToPackage{pdfa}{hyperref} - \AtBeginDocument{\hypersetup{pdfapart=3,pdfaconformance=u}}% note: hyperref takes these options if hyperxmp is loaded + \AtBeginDocument{\hypersetup{pdfapart=3,pdfaconformance=u}}% hyperref takes these options if hyperxmp is loaded } %%% to select part 1, 2 or 3 \define@key{pdfaopt}{pdfapart}[3]{% @@ -209,7 +218,7 @@ \AtBeginDocument{\hypersetup{pdfapart=\asmejour@tempa}} \ifthenelse{\equal{#1}{1}}{\aj@pdfaonetrue}{\relax}% } - %% to select conformance b or u. NB: a is not possible with pdfLaTeX, and u is not possible with 1. + %% to select conformance b or u. NB: a is not currently possible with pdfLaTeX; u not possible with 1. \ExplSyntaxOn \define@key{pdfaopt}{pdfaconformance}[u]{% \str_set:Ne \l_tmp_str { \str_uppercase:n {#1} } @@ -236,9 +245,10 @@ \pdfminorversion=7 % this selection is not required \fi \else - \ifaj@setpdfa\ClassWarningNoLine{asmejour}{pdf-a option requires pdfLaTeX engine. Under LuaLaTeX, use % - \protect\DocumentMetadata{pdfstandard=A-3b} before \protect\documentclass[..]{asmeconf}}\fi% - \ifx\directlua\undefined\else + \ifaj@setpdfa\ClassWarningNoLine{\ClassName}{pdf-a option requires pdfLaTeX. Under LuaLaTeX, use % + \protect\DocumentMetadata{pdfstandard=A-3b} before \protect\documentclass[..]{\ClassName}}% + \fi + \ifx\directlua\undefined\else % default under lualatex is 1.4 \directlua{ if pdf.getminorversion() \string~= 7 then if (status.pdf_gone and status.pdf_gone > 0) @@ -248,58 +258,28 @@ pdf.setminorversion(7) end end + } \fi - }% will lose some accented characters this way... better to use fontspec, if the system fonts exist. \fi \fi -%%%%%%%%%% Further class options %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -%% Option to omit ASME footer -\DeclareOption{nofoot}{% - \AtBeginDocument{\pagestyle{plain}% - \fancypagestyle{title}{% - \fancyhf{} - \fancyfoot[CE,CO]{\thepage} - } - } -} - -%% Option to omit ASME copyright -\DeclareOption{nocopyright}{% - \AtBeginDocument{\fancypagestyle{title}{% - \fancyhf{} - \fancyfoot[RO]{\large\sffamily \@PreprintStringR\space\space\bfseries/\space\space\@PaperNumber\thepage} - \fancyfoot[LO]{\large\bfseries\sffamily Journal of \@JourName} - \fancyfoot[CO]{} - } - } -} +%%%%%%%%% Various font-related options %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Option for slightly larger small capitals font [largesc], corrected 2021/01/29 \DeclareOption{largesc}{\PassOptionsToPackage{largesc=true}{newtxtext}}% largesc is a boolean key in newtxtext -%% ASME word separation is greater than newtxtext defaults so change these parameters. -\PassOptionsToPackage{spacing=0.3em, stretch=0.18em, shrink=0.10em}{newtxtext}% increased shrink from 0.08, 2021/01/30 - %% Disable newtxtext osf option, which is not appropriate for documents in this class \DeclareOption{osf}{% \PassOptionsToPackage{lining}{newtxtext}% } -%% Option to hyphenate the typewriter font [hyphenate] -\DeclareOption{hyphenate}{% - \PassOptionsToPackage{hyphenate}{inconsolata}% - \LogNote{Allowing hyphenation of typewriter font}% -} - \DeclareOption{hyphenate}{% \ifpdftex \PassOptionsToPackage{hyphenate}{inconsolata}% hyphenate is a key via xkeyval in inconsolata - \LogNote{Allowing hyphenation of typewriter font}% + \ClassNoteNoLine{\ClassName}{Allowing hyphenation of typewriter font}% \else - \ClassWarningNoLine{asmejour}{The [hyphenate] option is only supported with pdftex. It will be ignored}% + \ClassWarningNoLine{\ClassName}{The [hyphenate] option is only supported with pdftex. It will be ignored}% \fi } @@ -329,7 +309,7 @@ \ProcessOptions \relax -%%%%%%%%%%%% Page size, bibliography, graphics, color, etc. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%% Page size, bibliography, graphics, color %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \RequirePackage[paperheight=285.7mm, paperwidth=215.900mm, left=21.100mm, right=21.100mm, top=15.9mm, bottom = 24mm, footskip=8mm]{geometry} \setlength\columnsep{4.5mm} @@ -342,22 +322,8 @@ \renewcommand*{\bibfont}{\footnotesize} \RequirePackage{graphicx} -\RequirePackage[dvipsnames,svgnames,x11names]{xcolor}% remove obsolete options, 2023/10/23 +\RequirePackage[dvipsnames,svgnames,x11names]{xcolor}% removed obsolete options, 2023/10/23 -% 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} - } -} - -% Nice solution from DPC to prevent aux file errors when switching from pdflatex to lualatex -\ifx\directlua\undefined - \AtBeginDocument{\immediate\write\@auxout{\detokenize{% - \ifx\directlua\undefined\else\endinput\fi}}} -\fi %%%%%%%%%%%%% Table related %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -383,7 +349,9 @@ \ifpdftex \RequirePackage[T1]{fontenc} \RequirePackage[utf8]{inputenc}% for backward compatibility with pre-2018 LaTeX distributions - \RequirePackage[helvratio=0.91]{newtxtext}% add this scaling 2022/06/26 + %% ASME word separation is greater than newtxtext defaults so change these parameters. + %% increased shrink from 0.08, 2021/01/30; add this helvetica scaling 2022/06/26 + \RequirePackage[helvratio=0.91, spacing=0.3em, stretch=0.18em, shrink=0.10em]{newtxtext}% default {0.25em,0.2em,0.1em} \RequirePackage[varl,varqu]{inconsolata}% sans typewriter font; restored varl, varqu 2020/08/10 \RequirePackage[]{newtxmath} \else % use lualatex with newtxmath and fontspec for text primary fonts. Revised 2023/10/21. @@ -396,20 +364,20 @@ % \RequirePackage[varqu,varl]{inconsolata} % typewriter font for math \renewcommand\rmdefault{ntxtlf} % roman font for math - \DeclareFontFamily{T1}{\sfdefault}{} % sf for math + \DeclareFontFamily{T1}{\sfdefault}{} % sf for math \DeclareFontShape{T1}{\sfdefault}{m}{n}{<-> s*[0.94] ec-qhvr}{} %% see t1qhv.fd; 0.9-->0.94 2022/01/15 \RequirePackage[]{newtxmath} % newtxmath still handles mathematics \RequirePackage[no-math]{fontspec} \defaultfontfeatures{Ligatures=TeX,} % - \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 DON'T have these fonts, you will see ERROR messages!} + \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{TeXGyreTermesX}{}{\ClassWarning{asmeconf}{\FontWarning} } - \IfFontExistsTF{texgyreheros}{}{ \ClassWarning{asmeconf}{\FontWarning} } - \IfFontExistsTF{Inconsolatazi4}{}{\ClassWarning{asmeconf}{\FontWarning} } + \IfFontExistsTF{TeX Gyre Termes}{}{\ClassWarningNoLine{\ClassName}{\FontWarning} } + \IfFontExistsTF{texgyreheros}{}{ \ClassWarningNoLine{\ClassName}{\FontWarning} } + \IfFontExistsTF{Inconsolatazi4}{}{\ClassWarningNoLine{\ClassName}{\FontWarning} } % - \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 + \setmainfont{TeXGyreTermes}[% Presumes these are system fonts! Available at: http://www.gust.org.pl/projects/e-foundry/tex-gyre + WordSpace = {1.20,1.43,1.2},%% This stretch matches newtxtext a little better (reset 2024/07/23) Extension = .otf, UprightFont = *-Regular, ItalicFont = *-Italic, @@ -418,7 +386,8 @@ 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.20,1.43,1.2},%% This stretch matches newtxtext a little better (reset 2024/07/23) +% WordSpace = {1,1.4,1}, Extension = .otf, UprightFont = *-regular, ItalicFont = *-italic, @@ -443,7 +412,7 @@ \RequirePackage{bm}% load after all math for expanded access to bold math -%% In addition to the word spacing options declared in line 235... +%% In addition to the word spacing options declared in line 371... %% Relative to size9.clo: leading reduced to 10 pt; displayskips made greater \renewcommand\normalsize{% \@setfontsize\normalsize\@ixpt{10\p@}% % <== was \@xipt @@ -464,13 +433,12 @@ \newcommand*{\CondSans}{\fontencoding{T1}\fontfamily{qhvc}\selectfont}% remove extra \selectfont, 2023/10/21 \renewcommand\huge{\@setfontsize\huge{14}{14}} %... for author names only \newcommand*{\CondSansBold}{\renewcommand\bfdefault{b}\fontencoding{T1}\fontfamily{qhvc}\selectfont\bfseries} -\renewcommand\Huge{\@setfontsize\Huge{26.5}{26.5}} %... for title font only +\renewcommand\Huge{\@setfontsize\Huge{26.5}{26.5}} %... for title only \RequirePackage{metalogo,hologo}% Access to various LaTeX logos (for use in the documentation) -%% This provides sans serif italic and sans serif bold italic math. -%% It's intended for use in the figure and table captions. -%% Fonts are from newtxsf package. +%% This provides sans serif italic and sans serif bold italic math, against with fonts from newtxsf. +%% For use in the figure and table captions. \DeclareMathVersion{sansbold} \SetSymbolFont{letters}{sansbold}{OML}{ntxsfmi}{b}{it} \SetSymbolFont{lettersA}{sansbold}{U}{ntxsfmia}{b}{it} @@ -480,8 +448,8 @@ \SetSymbolFont{operators}{sansbold}{\encodingdefault}{\sfdefault}{\bfdefault}{n} \SetMathAlphabet{\mathsf}{sansbold}{\encodingdefault}{\sfdefault}{b}{n}% \mathsf is upright -%% These lines are to provide math accents for the sans and sansbold math versions. -%% The accents from ntxsfmi work normally with regular times fonts. Added 2021/01/27 +%% Provide math accents for the sans and sansbold math versions. Accents from ntxsfmi work normally +%% with regular times fonts. 2021/01/27 \DeclareSymbolFont{lettersAB}{U}{ntxsfmia}{m}{it} \SetSymbolFont{lettersAB}{normal}{U}{ntxsfmia}{m}{it} \SetSymbolFont{lettersAB}{bold}{U}{ntxsfmia}{b}{it} @@ -556,8 +524,7 @@ \DeclareMathSymbol{\sfhslash}{\mathalpha}{lettersAB}{52}% this is not upright \DeclareMathSymbol{\sfhbar}{\mathalpha}{lettersAB}{53}% this is not upright -%%% sans math version, potential value with PGFPlots, and provisionally called in subfigure captions. -%%% this is experimental, still needs stress testing. 2021/01/30 +%%% sans math version, potential value with PGFPlots, called in subfigure captions. 2021/01/30 \DeclareMathVersion{sans} \SetSymbolFont{letters}{sans}{OML}{ntxsfmi}{m}{it} \SetSymbolFont{lettersA}{sans}{U}{ntxsfmia}{m}{it} @@ -569,7 +536,7 @@ \SetMathAlphabet{\mathsf}{sans}{\encodingdefault}{\sfdefault}{m}{n} -%%%%%%%%%%%%%%%%% Some adjustments to math layout %%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%% Some adjustments to math layout %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \setlength{\jot}{10pt}% <== default is 3pt @@ -580,7 +547,7 @@ \allowdisplaybreaks % ASME allows these breaks -%%%%%%%%%%%%%%%%% Equation and Line Numbering %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%% Equation and Line Numbering %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \RequirePackage{etoolbox}% patching amsmath @@ -598,37 +565,36 @@ \ifasmejour@lineno \RequirePackage[switch,mathlines]{lineno}% - \renewcommand{\linenumberfont}{\normalfont\footnotesize\color{red}}% + \renewcommand{\linenumberfont}{\normalfont\scriptsize\color{red}}% \AtBeginDocument{\linenumbers}% \ifasmejour@balance - \ClassWarningNoLine{asmejour}{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. %%% 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}{}{}{}} + \NewDocumentCommand{\aj@losepostpenalty}{}{\patchcmd{\linenomathWithnumbers}{\advance\postdisplaypenalty\linenopenalty}{}{}{}} % - \NewDocumentCommand{\ac@FixAMSMath}{m}{% - \AtBeginEnvironment{#1}{\ac@losepostpenalty\linenomath}% + \NewDocumentCommand{\aj@FixAMSMath}{m}{% + \AtBeginEnvironment{#1}{\aj@losepostpenalty\linenomath}% \AtEndEnvironment{#1}{\endlinenomath}% - \AtBeginEnvironment{#1*}{\ac@losepostpenalty\linenomath}% + \AtBeginEnvironment{#1*}{\aj@losepostpenalty\linenomath}% \AtEndEnvironment{#1*}{\endlinenomath}% } % - \NewDocumentCommand{\ac@FixAll}{>{\SplitList{;}}m}{\ProcessList{#1}{\ac@FixAMSMath}} + \NewDocumentCommand{\aj@FixAll}{>{\SplitList{;}}m}{\ProcessList{#1}{\aj@FixAMSMath}} % - \ac@FixAll{align;alignat;gather;flalign;multline} + \aj@FixAll{align;alignat;gather;flalign;multline} } % \else \ProvideDocumentEnvironment{linenomath}{}{}{}% - \ifasmejour@balance % balancing through flushend can produce weird errors - \RequirePackage{flushend}% flushend package is NOT compatible with lineno + \ifasmejour@balance % balancing through flushend can produce weird errors. + \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 @@ -638,9 +604,9 @@ %% ASME page proofs seem to align the number at top of the line, rather than bottom as done here. -%%%%%%%%%%%%%%%%% Footer Set Up %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%% Footer Set Up %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%%%%%%%%%% footer text names %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%% footer text names %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \newcommand{\JourName}[1]{\gdef\@JourName{#1}} \providecommand\@JourName{\hbox{ }} @@ -650,8 +616,8 @@ } \providecommand\@PaperYear{\the\year} -\def\@PreprintStringL{PREPRINT FOR REVIEW} -\def\@PreprintStringR{PREPRINT FOR REVIEW} +\def\@PreprintStringL{PREPRINT}% updated 2024/07/24 +\def\@PreprintStringR{PREPRINT} \NewDocumentCommand{\PreprintString}{m o}{% \IfNoValueTF{#2}{% @@ -668,32 +634,53 @@ %%%%%% Fancyhdr %%%%%%%%%%%%%%%%%%%%%%%%% -\RequirePackage{fancyhdr} +\RequirePackage{fancyhdr}% options revised 2024/07/23 \pagestyle{fancy} \fancyhf{}% clear all header and footer fields \renewcommand{\headrulewidth}{0pt} \renewcommand{\footrulewidth}{0pt} -\fancyfoot[RE]{\large\bfseries\sffamily Transactions of the ASME} -\fancyfoot[LO]{\large\bfseries\sffamily Journal of \@JourName} -\fancyfoot[RO]{\large\sffamily \@PreprintStringR\space\space\bfseries/\space\space\@PaperNumber\thepage} -\fancyfoot[LE]{\large\sffamily {\bfseries \@PaperNumber\thepage\space\space/}\space\space\@PreprintStringL\ } +\ifasmejour@nofoot + \fancyfoot[CE,CO]{\thepage} +\else + \fancyfoot[RE]{\large\bfseries\sffamily Transactions of the ASME} + \fancyfoot[LO]{\large\bfseries\sffamily Journal of \@JourName} + \fancyfoot[RO]{\large\sffamily \@PreprintStringR\space\space\bfseries/\space\space\@PaperNumber\thepage} + \fancyfoot[LE]{\large\sffamily {\bfseries \@PaperNumber\thepage\space\space/}\space\space\@PreprintStringL\ } +\fi -\fancypagestyle{title}{% +\fancypagestyle{title}{% is an odd page \fancyhf{}% clear all header and footer fields \renewcommand{\headrulewidth}{0pt} \renewcommand{\footrulewidth}{0pt} - \fancyfoot[RO]{\large\sffamily \@PreprintStringR\space\space\bfseries/\space\space\@PaperNumber\thepage} - \fancyfoot[LO]{\large\bfseries\sffamily Journal of \@JourName} - \fancyfoot[CO]{\large\bfseries\sffamily Copyright \textcopyright\ \@PaperYear\ by ASME} + \ifasmejour@nofoot + \fancyfoot[CO]{\thepage} + \else + \fancyfoot[RO]{\large\sffamily \@PreprintStringR\space\space\bfseries/\space\space\@PaperNumber\thepage} + \fancyfoot[LO]{\large\bfseries\sffamily Journal of \@JourName} + \ifasmejour@nocopyright + \fancyfoot[CO]{} + \else + \fancyfoot[CO]{\large\bfseries\sffamily Copyright \textcopyright\ \@PaperYear\ by ASME} + \fi + \fi } + %%%%%% Footnotes %%%%%%%%%%%%%%%%%%%%%%%%%%% \RequirePackage{fnpos} \makeFNbottom \makeFNbelow +\RequirePackage{footmisc}% +\IfPackageAtLeastTF{footmisc}{2022/02/05}{ + \PassOptionsToPackage{belowfloats}{footmisc}% + }{ \RequirePackage{fnpos} + \makeFNbottom + \makeFNbelow + }% +\setlength\footnotemargin{4mm}% reduce indentation of footnotes, from footmisc \setlength{\skip\footins}{12pt plus 2pt minus 1pt} \renewcommand{\footnoterule}{% @@ -702,10 +689,6 @@ \kern 2pt } -%% reduce indentation of footnotes -\renewcommand\@makefntext[1]{% - \noindent\makebox[4mm][r]{\@makefnmark}\hyphenpenalty=300\exhyphenpenalty=300 #1}% <== suppress hyphenation - %% Produces an unmarked footnote about the revision date. %% This command is invoked by \date as part of \MakeTitlePage below. %% Text can be anything given as the argument to \date{..}. @@ -717,13 +700,13 @@ %% include a comma for sequential footnotes \ExplSyntaxOn - \cs_new:Npn \__asmejour_NoteComma:n { \peek_meaning:NT \footnote { \textsu{\mdseries,} } } + \cs_new:Npn \__asmejour_NoteComma:n { \peek_meaning:NT \footnote { \textsuperscript{\mdseries,} } } \cs_new_eq:NN \__savefootnote \footnote \cs_gset_protected:Npn \footnote #1 { \__savefootnote{#1}\__asmejour_NoteComma:n } \ExplSyntaxOff -%%%%%%%%% Caption Related %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%% Caption Related %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \addto{\captionsenglish}{% \renewcommand{\figurename}{Fig.} @@ -739,7 +722,7 @@ \captionsetup[figure]{labelfont={sf,bf},textfont={sf,bf},textformat=boldmath,labelsep=quad} \captionsetup[table]{labelfont={sf,bf},textfont={sf,bf},textformat=boldmath,labelsep=quad,skip=0.5\baselineskip} -%% 30 January 2021. ASME only labels subfigures with a sans serif, italic (a), (b),... no caption text, no bold face. +%% 2021/01/30: ASME only labels subfigures with a sans serif, italic (a), (b),... no caption text, no bold face. \captionsetup[subfigure]{labelfont={sf},textfont={sf},textformat=sansmath,labelformat=simple}% default: =parens \renewcommand\thesubfigure{(\textit{\alph{subfigure}})} @@ -747,7 +730,7 @@ \renewcommand\thesubtable{(\textit{\alph{subtable}})} -%%%%%%%%%%%% Section Headings %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%% Section Headings %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \RequirePackage[raggedright,indentafter]{titlesec} @@ -760,28 +743,28 @@ \titlespacing{\subsubsection}{\parindent}{12pt plus 3pt minus 2pt}{0.5em} %% ASME style does not seem to go lower than third level heading, so ... -%% ....putting \paragraph into \subsubsection settings. +%% ...put \paragraph into \subsubsection settings. \titleformat{\paragraph}[runin]{\itshape}{\thesubsubsection}{0.5em}{}[.] \titlespacing{\paragraph}{\parindent}{14pt plus 3pt minus 2pt}{0.5em} %% Special handling of the appendices %% Assumes that appendices are the last technical content in paper -\providecommand{\appendicesname}{Appendices} - -\RenewDocumentCommand{\appendix}{}{% - \pdfbookmark[1]{\appendicesname}{appendices} - \setcounter{section}{0} - \renewcommand\thesection{\Alph{section}} - \setcounter{equation}{0} - \renewcommand\theequation{\Alph{section}\arabic{equation}} - \titleformat{\section}[block]{\mathversion{bold}\bfseries\large\raggedright}{\appendixname\ \thesection:}{0.5em}{}[\setcounter{equation}{0}] -} +\providecommand*{\appendicesname}{Appendices} +\newcounter{appeqn}%% Code revised to better support tagged pdf, 2024/07/24 +\patchcmd{\appendix}{% + \setcounter{subsection}{0}}{% + \setcounter{subsection}{0}% + \pdfbookmark[1]{\appendicesname}{appendices}% + \@addtoreset{equation}{appeqn}\stepcounter{appeqn}% + \gdef\theequation{\@Alph\c@section\@arabic\c@equation}% +}{}{} +\apptocmd{\appendix}{\titleformat{\section}[block]{\mathversion{bold}\bfseries\large\raggedright}{\appendixname\ \thesection:}{0.5em}{}} %% natbib's \bibsection controls section heading for References. -%%%%%%%%%%%%%%%%% List environments %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%% List environments %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \RequirePackage{enumitem} @@ -789,24 +772,20 @@ %% I have no examples of sublists... -%%%%%%%%%%%%%%%%% Hyperref %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%% Hyperref %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%% new pdf management in LaTeX, with \DocumentMetaData{..}, is preferred to this 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 in pdf/a, per M. Sharpe's recommendation in newtx documentation \InputIfFileExists{glyphtounicode-cmr.tex}{}{} %% additional mappings \InputIfFileExists{glyphtounicode-ntx.tex}{}{} %% additional mappings + %% new pdf management in LaTeX, with \DocumentMetaData{..}, is preferred to this approach. \ifaj@setpdfa - %%%% the pdfmanagement options are experimental, from Ulrike Fischer 2021/06/12 - \if@asme@pdfmanagement - \ClassInfo{asmejour}{pdfmanagement is defined. Class file will not load a color profile} + %%%% the pdfmanagement options from Ulrike Fischer 2021/06/12 + \ifasme@pdfmanagement + \ClassInfo{\ClassName}{pdfmanagement is defined. Class file will not load a color profile} \else - \ClassInfo{asmejour}{pdfmanagement not defined. Class file will load a color profile}% + \ClassInfo{\ClassName}{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{% @@ -826,41 +805,41 @@ %%% -\RequirePackage[psdextra]{hyperref} % recent kernel transition suggests providing most hyperref options via \hypersetup, - % but setting psdextra here (for additional math support in bookmarks) 2021/12/23 +\RequirePackage[psdextra]{hyperref} % provide most hyperref options via \hypersetup, but per documentation + % set [psdextra] here (for additional math support in bookmarks) 2021/12/23 \hypersetup{% - pdfborder={0 0 0},% - bookmarksnumbered=true,% - bookmarksopen=true,% - bookmarksopenlevel=1,% - colorlinks=true,% - linkcolor=blue, % - citecolor=blue, % - urlcolor=blue, % - filecolor=red, % added 2021/12/23, to make certain broken links more apparent - pdfnewwindow=true,% - pdfpagelayout=SinglePage, %TwoPageRight,% changed 2020/08/12 - pdfdisplaydoctitle=true% + pdfborder={0 0 0}, + bookmarksnumbered=true, + bookmarksopen=true, + bookmarksopenlevel=1, + colorlinks=true, + linkcolor=blue, + citecolor=blue, + urlcolor=blue, + filecolor=red, % added 2021/12/23, to make certain broken links more apparent + pdfnewwindow=true, + pdfpagelayout=SinglePage, % was TwoPageRight, changed 2020/08/12 + pdfdisplaydoctitle=true, } \urlstyle{same} % don't switch to typewriter font \RequirePackage{doi} % supports nasty characters in some doi's \renewcommand{\doitext}{doi:~} % change the default, {doi:}, to this for 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/22 %% This alias is also incorporated into asmejour.bst -\if@asme@pdfmanagement - \ClassInfo{asmejour}{pdfmanagement is defined. Class file will not load hyperxmp} +\ifasme@pdfmanagement + \ClassInfo{\ClassName}{pdfmanagement is defined. Class file will not load hyperxmp} \else + \RequirePackage{bookmark} %% improves handling of pdf bookmarks \RequirePackage{hyperxmp} %% to fix transfer of metadata to Acrobat pdf % Patch bug in hyperxmp, unless a more recent version is used. \@ifpackagelater{hyperxmp}{2022/10/15}{% v5.11 or later \relax - % \ClassInfo{asmeconf}{hyperxmp v5.11 or later is in use} + % \ClassInfo{\ClassName}{hyperxmp v5.11 or later is in use} }{% \ifx\undefined\hyxmp@no@bad@parts\relax\else \newcount\hypxmp@tempcnt @@ -872,10 +851,11 @@ } \fi -%%%%%% Adjustments to accommodate hyperref bookmarks %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%% Adjustments to accommodate hyperref bookmarks %%%%%%%%%%%%%%%%%%%%%% -%%% ==> recent and evolving development of \pdfstring removes all robust commands from bookmarks, so -%%% the following interventions may become unnecessary over time (2021/12/23). +%%% Recent development of \pdfstring has removed all robust commands from bookmarks (2021/12/23). +%%% By mid-2024, no errors are thrown except for \bm; however, these commands serve to still suppress warnings. +%%% Math shift by $..$ still creates a warning, but I am leaving that in place. To avoid, use \( .. \) instead. %% Since \bm is useful in headings, this fix will reduce frequency with which %% alternate pdfstrings must be given in section command as \section[pdfstring]{texstring} @@ -896,7 +876,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})}% } %% Let's make sure footnotes in section headings don't break pdf bookmarks. @@ -906,13 +886,13 @@ } -%%%%%%%%%%%%% Define some section and other names for special environments %%%%%%% +%%%%%%%%%%%%% Define some section and other names for special environments %%%%%%%%%%%%%%%%%%%%%%%% \providecommand{\nomname}{Nomenclature} \providecommand{\keywordname}{Keywords} \providecommand{\CAwords}{Corresponding Author.} -%%%%%%%%%%%%% Nomenclature Environment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%% Nomenclature Environment %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Nomenclature environment in ASME Journal Style. %% Run twice to get proper label width. @@ -926,7 +906,7 @@ \NewDocumentCommand{\entry}{m m}{% \ifblank{#2}{% - \ClassError{asmejour}{The command \protect\entry should have two arguments. For subheadings, use \protect\EntryHeading}{It appears that you gave only one argument for \protect\entry. You need to include a second argument.} + \ClassError{\ClassName}{The command \protect\entry should have two arguments. For subheadings, use \protect\EntryHeading}{It appears that you gave only one argument for \protect\entry. You need to include a second argument.} }{% \item[\hfill#1${} = {}$]#2% \@itempenalty=-\@lowpenalty% @@ -938,7 +918,7 @@ %% A separate command command for nomenclature subheadings \NewDocumentCommand\EntryHeading{m}{% - \itemsep12\p@ plus 4\p@ minus 4\p@% \bigskip + \itemsep12\p@ plus 4\p@ minus 4\p@ \goodbreak\item[\bfseries#1\hfill]\mbox{}\itemsep3\p@ plus 1\p@ minus 1\p@\@itempenalty=1000% add \mbox for tagged pdf, 2023/10/20 } @@ -966,28 +946,25 @@ }% }{% \setcounter{savedlength}{\widest}% - \end{list}% + \end{list}\ignorespacesafterend } -%%%%%%%%%%%%%%%% List of figures and list of tables %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%% List of figures and list of tables %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% ASME requires these lists for production. \ifasmejour@nolists - \LogNote{Omitting lists of figures and tables}% + \ClassNoteNoLine{\ClassName}{Omitting lists of figures and tables}% \else \AtEndDocument{% - \clearpage \twocolumn[% - \begin{@twocolumnfalse} \listoffigures \listoftables - \end{@twocolumnfalse} ]% }% \fi -%%%%%%%%%%%%%%%% Author/Title/Abstract block %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%% Author/Title/Abstract block %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \RequirePackage{xcoffins} @@ -1028,12 +1005,12 @@ \fi } - \NewDocumentCommand\SetTitle{m}{% \SetVerticalCoffin{\Title}{114mm}{% \vspace*{0.5mm}% <== ASME doesn't align bar and text \noindent\Huge\CondSansBold\raggedright% #1% + %\gdef\@title{#1}% for tagging, etc. 2024/07/24. pdf metadata will probably override. \par } } @@ -1086,7 +1063,7 @@ \addtocounter{footnote}{-1}% in case of more than one CA } -%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \newlength{\@AbstractSep}%% <== separation of author/abstract coffin from main two-column text. \setlength{\@AbstractSep}{12.5mm} @@ -1094,12 +1071,15 @@ \NewDocumentCommand{\MakeTitlePage}{}{% \thispagestyle{title}% - \twocolumn[ - \begin{@twocolumnfalse} + \ifasmejour@singlecolumn % 2024/07/20 \@ConstructAuthorBlock \vspace*{\@AbstractSep} - \end{@twocolumnfalse} - ] + \else + \twocolumn[ + \@ConstructAuthorBlock + \vspace*{\@AbstractSep} + ] + \fi \ifaj@CA \addtocounter{footnote}{1} \footnotetext{\CAwords} @@ -1113,7 +1093,7 @@ \fi } -%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Provide compatibility with titling commands from standard LaTeX article class @@ -1143,7 +1123,7 @@ \RenewDocumentCommand{\thanks}{m}{\relax}%% disabling this standard command, as it is inconsistent with this format -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \endinput %% diff --git a/Master/texmf-dist/tex/latex/beamertheme-rainbow/beamertheme-rainbow-doc-settings.sty b/Master/texmf-dist/tex/latex/beamertheme-rainbow/beamertheme-rainbow-doc-settings.sty deleted file mode 100644 index 777cedba6ef..00000000000 --- a/Master/texmf-dist/tex/latex/beamertheme-rainbow/beamertheme-rainbow-doc-settings.sty +++ /dev/null @@ -1,199 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% Personal helper theme for package documentations -% Copyright samcarter -% -% This file may be distributed and/or modified -% under the LaTeX Project Public License 1.3c or later -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% Usage: -% ln ~/Life/latex/beamertheme-sam/themesam.sty package-doc-settings.sty -% \usepackage[ -% themecolor=samdblue -% ]{\jobname-settings} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% Colours -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\RequirePackage{xcolor} -\definecolor{samyellow}{RGB}{246,193,65} -\definecolor{samorange}{RGB}{241,147,45} -\definecolor{samred}{RGB}{191,26,46}% TikZbricks -\definecolor{sammagenta}{RGB}{170,42,104}% TikZmarmots -\definecolor{samviolet}{RGB}{136,46,114}% TikZlings -\definecolor{samlila}{RGB}{101,67,159}% Rainbow beamer theme -\definecolor{samdblue}{RGB}{0,51,134}% beamer theme -\definecolor{samlblue}{RGB}{22,89,155}% TikZducks -\definecolor{samteal}{RGB}{25,143,157}% Tcolorbox beamer theme -\definecolor{samlgreen}{RGB}{68,170,153}% Jigsaw -\definecolor{samdgreen}{RGB}{78,178,125} -\definecolor{samlgray}{RGB}{160,160,185} -\definecolor{samdgray}{RGB}{60,60,85} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% Package options -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\RequirePackage{xkeyval} -\DeclareOptionX{themecolor}[samdblue]{\colorlet{themecolor}{#1}} -\DeclareOptionX{listingcolor}[samlblue]{\colorlet{listingcolor}{#1}} -\ExecuteOptionsX{themecolor,listingcolor} -\ProcessOptionsX - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% Packages -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\@ifclassloaded{beamer}{}{% - \RequirePackage[english]{babel} - \RequirePackage[paper=a4paper,margin=2.9cm]{geometry} - \RequirePackage{scrlayer-scrpage} - \let\hrulefillx\hrulefill - \RequirePackage[bitstream-charter]{mathdesign} - \let\hrulefill\hrulefillx - \RequirePackage[hang,flushmargin,bottom]{footmisc} - \RequirePackage{footnotehyper} - \makesavenoteenv{tcolorbox} - \RequirePackage[all]{nowidow} - \RequirePackage[colorlinks=true,breaklinks=true,allcolors=themecolor,hyperfootnotes=false]{hyperref} -} -\RequirePackage[T1]{fontenc} -\RequirePackage{xspace} -\RequirePackage{inconsolata}% mono font with bold, but italic is missing -% \RequirePackage[scale=0.85]{cascadia-code} -% \AddToHook{cmd/ttfamily/before}{\fontseries{sl}} -\RequirePackage{iexec} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% Listings -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\RequirePackage[ - cachedir=$TMPDIR/minted/ -]{minted} - -% smuggling custom pygmentize style in cache folder -% (a real pygmentise style would need installtion in some python folder) -\begin{filecontents*}[noheader]{./sam.pygstyle} -\makeatletter -\def\PYG@reset{\let\PYG@it=\relax \let\PYG@bf=\relax% - \let\PYG@ul=\relax \let\PYG@tc=\relax% - \let\PYG@bc=\relax \let\PYG@ff=\relax} -\def\PYG@tok#1{\csname PYG@tok@#1\endcsname} -\def\PYG@toks#1+{\ifx\relax#1\empty\else% - \PYG@tok{#1}\expandafter\PYG@toks\fi} -\def\PYG@do#1{\PYG@bc{\PYG@tc{\PYG@ul{% - \PYG@it{\PYG@bf{\PYG@ff{#1}}}}}}} -\def\PYG#1#2{\PYG@reset\PYG@toks#1+\relax+\PYG@do{#2}} - -% optional arguments -\expandafter\def\csname PYG@tok@na\endcsname{\def\PYG@tc##1{\textcolor{black}{##1}}} - -% macros -\expandafter\def\csname PYG@tok@k\endcsname{\def\PYG@tc##1{\textcolor{listingcolor}{\bfseries ##1}}} -% curly brakets -\expandafter\def\csname PYG@tok@nb\endcsname{\def\PYG@tc##1{\textcolor{listingcolor}{\bfseries ##1}}} - -% comments (italics won't work with the inconsolata font) -\expandafter\def\csname PYG@tok@c\endcsname{\def\PYG@tc##1{\textcolor{gray}{##1}}} - -\def\PYGZbs{\char`\\} -\def\PYGZus{\char`\_} -\def\PYGZob{\char`\{} -\def\PYGZcb{\char`\}} -\def\PYGZca{\char`\^} -\def\PYGZam{\char`\&} -\def\PYGZlt{\char`\<} -\def\PYGZgt{\char`\>} -\def\PYGZsh{\char`\#} -\def\PYGZpc{\char`\%} -\def\PYGZdl{\char`\$} -\def\PYGZhy{\char`\-} -\def\PYGZsq{\char`\'} -\def\PYGZdq{\char`\"} -\def\PYGZti{\char`\~} -% for compatibility with earlier versions -\def\PYGZat{@} -\def\PYGZlb{[} -\def\PYGZrb{]} -\makeatother -\end{filecontents*} - -\iexec{mkdir -p $TMPDIR/minted && mv sam.pygstyle $TMPDIR/minted/.} - -\usemintedstyle{sam} -\setminted{ - breaksymbolleft={}, - tabsize=2, - breaklines=true, -} -\newminted[samcode]{latex}{} -\newmintinline[saminline]{latex}{} - -% use non-bold and all coloured for inline code in articles -\ifdefined\insertaspectratio\else - \patchcmd{\minted@inputpyg@inline}{\minted@input}{\color{listingcolor}\renewcommand\textcolor[3][]{##3}\renewcommand\bfseries{}\minted@input}{}{} -\fi - -\RequirePackage[most]{tcolorbox} -\tcbuselibrary{minted} -\tcbset{% - colframe=themecolor, - fonttitle=\bfseries, - sidebyside, - center lower, - righthand width=5.7cm, - bottom=2pt, - top=2pt, - left=3pt, - right=3pt, - sidebyside gap=10pt, - lower separated=false, - listing engine=minted, - minted language=latex, - colback=themecolor!10, - sharp corners, - boxrule=0pt, - before title={\strut} -} - -% avoid page breaks right in front of the tcolorbox -\@ifclassloaded{beamer}{}{ - \tcbuselibrary{hooks} - \tcbset{before pre={\nopagebreak[4]}} -} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% document settings -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\@ifclassloaded{scrartcl}{% - \KOMAoptions{parskip=half} - \addtokomafont{sectioning}{\color{themecolor}} - \addtokomafont{date}{\normalsize} - \addtokomafont{author}{\normalsize} - \setlength{\footnotemargin}{0.7em} -}{} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% Custom macros -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\providecommand*{\CTAN}{\textsc{CTAN}\xspace} -\providecommand*{\TikZ}{Ti\emph{k}Z\xspace} -\providecommand*{\miktex}{MiK\TeX\xspace} -\providecommand*{\texlive}{\TeX{}Live\xspace} -\providecommand*{\tikzbrick}{Ti\emph{k}Zbrick\xspace} -\providecommand*{\tikzducks}{Ti\emph{k}Zducks\xspace} -\providecommand*{\tikzlings}{Ti\emph{k}Zlings\xspace} -\providecommand*{\tikzmarmots}{Ti\emph{k}Zmarmots\xspace} -\providecommand*{\ConTeXt}{C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt}
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/bib2qr/bib2qr.sty b/Master/texmf-dist/tex/latex/bib2qr/bib2qr.sty new file mode 100644 index 00000000000..093c38dba6d --- /dev/null +++ b/Master/texmf-dist/tex/latex/bib2qr/bib2qr.sty @@ -0,0 +1,107 @@ +%% +%% This is file `bib2qr.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% bib2qr.dtx (with options: `package') +%% +%% Copyright (C) 2024 Christian Schreinemachers +%% +%% 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 2008-05-04 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The current maintainer of this work is +%% Christian Schreinemachers. +%% +%% This work consists of the files +%% bib2qr.dtx +%% bib2qr.ins +%% and the derived files +%% bib2qr.sty +%% bib2qr.pdf +%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{bib2qr} + [2024-07-31 v0.2 Cite BibTeX entries with QR codes] +\RequirePackage{biblatex} +\RequirePackage{ifthen} +\RequirePackage{qrcode} +\RequirePackage{xstring} +\DeclareKeys[@bibiiqr]{ + doiurlbase.store = \@bibiiqr@doiurlbase, + doiurlbase.usage = load, + qrdelimiter.store = \@bibiiqr@qrdelimiter, + qrdelimiter.usage = load, + qrversion.store = \@bibiiqr@qrversion, + qrversion.usage = load, + qrwidth.store = \@bibiiqr@qrwidth, + qrwidth.usage = load, +}% +\SetKeys[@bibiiqr]{ + doiurlbase=https://doi.org/, + qrdelimiter=\space, + qrversion=0, + qrwidth=2cm, +}% +\ProcessKeyOptions[@bibiiqr]\relax +\newcommand\@bibiiqr@showqr[1]{% + \qrcode[height=\@bibiiqr@qrwidth,version=\@bibiiqr@qrversion]{#1}% +}% +\DeclareFieldFormat{@bibiiqr@fldFmtDoi}{% + \IfBeginWith{#1}{\@bibiiqr@doiurlbase}% + {\@bibiiqr@showqr{#1}}% + {\@bibiiqr@showqr{\@bibiiqr@doiurlbase#1}}% +}% +\DeclareFieldFormat{@bibiiqr@fldFmtUrl}{\@bibiiqr@showqr{#1}} +\DeclareBibliographyDriver{@bibiiqr@bibDrvQR}{% + \usebibmacro{begentry}% + \ifboolexpr{test{\iffieldundef{doi}}} + {% + \ifboolexpr{test{\iffieldundef{url}}}% + {% + \PackageWarning{bib2qr}% + {BibTeX entry without DOI or URL: \thefield{entrykey}}{}% + }% + {\printfield[@bibiiqr@fldFmtUrl]{url}}% + }% + {\printfield[@bibiiqr@fldFmtDoi]{doi}}% + \usebibmacro{finentry}% +} +\DeclareCiteCommand{\qrcite} + {\usebibmacro{prenote}}% + {\usedriver{}{@bibiiqr@bibDrvQR}}% + {\@bibiiqr@qrdelimiter}% + {\usebibmacro{postnote}}% +\NewDocumentCommand{\qrfullcite}{O{}m}{% + \par% + \ifthenelse{\equal{#1}{noindent}}{% + \noindent% + \edef\@bibiiqr@mpiiwidth{\dimexpr\linewidth-\@bibiiqr@qrwidth-0.5em}% + }{% + \edef\@bibiiqr@mpiiwidth{% + \dimexpr\linewidth-\parindent-\@bibiiqr@qrwidth-0.5em}% + }% + \begin{minipage}[t]{\@bibiiqr@qrwidth} + \qrcite{#2}% + \end{minipage} + \hspace{0.5em}% + \begin{minipage}{\@bibiiqr@mpiiwidth} + \fullcite{#2}% + \end{minipage} + \par% +}% + +\endinput +%% +%% End of file `bib2qr.sty'. 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-phys/phys.bbx b/Master/texmf-dist/tex/latex/biblatex-phys/phys.bbx index 442f4feae5c..336f90e5474 100644 --- a/Master/texmf-dist/tex/latex/biblatex-phys/phys.bbx +++ b/Master/texmf-dist/tex/latex/biblatex-phys/phys.bbx @@ -2,13 +2,13 @@ %% biblatex-phys --- A biblatex implementation of the AIP and APS %% 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{phys.bbx}[2019/12/03 v1.1b biblatex bibliography style] +\ProvidesFile{phys.bbx}[2024/07/26 v1.1c biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -464,14 +464,15 @@ \printfield{pages}% \iffieldundef{pages} {% - \printfield{doi}% - \clearfield{doi}% - }% - {% - \iftoggle{bbx:doi} - {} - {\clearfield{doi}}% - }% + \iffieldundef{eid} + {% + \iftoggle{bbx:doi} + {} + {\printfield{doi}}% + } + {}% + } + {}% } \newbibmacro*{related:translatedas}[1]{% @@ -495,8 +496,8 @@ %% -%% Copyright (C) 2012-2014,2016,2018,2019 by -%% Joseph Wright <joseph.wright@morningstar2.co.uk> +%% Copyright (C) 2012-2014,2016,2018-2020,2023,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-phys/phys.cbx b/Master/texmf-dist/tex/latex/biblatex-phys/phys.cbx index 7758bc0a2b5..4452bd71133 100644 --- a/Master/texmf-dist/tex/latex/biblatex-phys/phys.cbx +++ b/Master/texmf-dist/tex/latex/biblatex-phys/phys.cbx @@ -2,13 +2,13 @@ %% biblatex-phys --- A biblatex implementation of the AIP and APS %% 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{phys.cbx}[2019/12/03 v1.1b biblatex citation style] +\ProvidesFile{phys.cbx}[2024/07/26 v1.1c biblatex citation style] \RequireCitationStyle{numeric-comp} @@ -20,8 +20,8 @@ } %% -%% Copyright (C) 2012-2014,2016,2018,2019 by -%% Joseph Wright <joseph.wright@morningstar2.co.uk> +%% Copyright (C) 2012-2014,2016,2018,2019,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-phys/phys.dbx b/Master/texmf-dist/tex/latex/biblatex-phys/phys.dbx index c47ca1e2d93..388e7ee4355 100644 --- a/Master/texmf-dist/tex/latex/biblatex-phys/phys.dbx +++ b/Master/texmf-dist/tex/latex/biblatex-phys/phys.dbx @@ -2,19 +2,19 @@ %% biblatex-phys --- A biblatex implementation of the AIP and APS %% 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{phys.dbx}[2019/12/03 v1.1b biblatex database model extension] +\ProvidesFile{phys.dbx}[2024/07/26 v1.1c biblatex database model extension] \DeclareDatamodelFields[type=field, datatype=literal]{collaboration} %% -%% Copyright (C) 2012-2014,2016,2018,2019 by -%% Joseph Wright <joseph.wright@morningstar2.co.uk> +%% Copyright (C) 2012-2014,2016,2018,2019,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-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/bxjatoucs/bxjatoucs.sty b/Master/texmf-dist/tex/latex/bxjatoucs/bxjatoucs.sty index b387872640d..04fb01765a4 100644 --- a/Master/texmf-dist/tex/latex/bxjatoucs/bxjatoucs.sty +++ b/Master/texmf-dist/tex/latex/bxjatoucs/bxjatoucs.sty @@ -1,7 +1,7 @@ %% %% This is file 'bxjatoucs.sty'. %% -%% Copyright (c) 2019 Takayuki YATO (aka. "ZR") +%% Copyright (c) 2019-2024 Takayuki YATO (aka. "ZR") %% GitHub: https://github.com/zr-tex8r %% Twitter: @zr_tex8r %% @@ -53,7 +53,7 @@ %% package declaration \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bxjatoucs}[2019/10/20 v0.2] +\ProvidesPackage{bxjatoucs}[2024/07/22 v0.3a] \def\bxju@pkgname{bxjatoucs} %--------------------------------------- "check-avail" @@ -167,6 +167,22 @@ \bxju@ifdefinable\bxjaFastJscToUcsHex{% \def\bxjaFastJscToUcsHex{% \bxju@burst-`>\bxju@in@hex\bxju@fast@jsc@to@ucs}} +%%<*> \bxjaUcsToJis{<ucs>} +\bxju@ifdefinable\bxjaUcsToJis{% + \def\bxjaUcsToJis{% + \bxju@burst-`>\bxju@ucs@to@jis}} +%%<*> \bxjaUcsToEuc{<ucs>} +\bxju@ifdefinable\bxjaUcsToEuc{% + \def\bxjaUcsToEuc{% + \bxju@burst-`>\bxju@ucs@to@euc}} +%%<*> \bxjaUcsToSjis{<ucs>} +\bxju@ifdefinable\bxjaUcsToSjis{% + \def\bxjaUcsToSjis{% + \bxju@burst-`>\bxju@ucs@to@sjis}} +%%<*> \bxjaFastUcsToJsc{<ucs>} +\bxju@ifdefinable\bxjaFastUcsToJsc{% + \def\bxjaFastUcsToJsc{% + \bxju@burst-`>\bxju@fast@ucs@to@jsc}} %--------------------------------------- auxiliary @@ -195,6 +211,16 @@ \expandafter\bxju@decomp@b\the\numexpr#2-#1*256:#1:} \def\bxju@decomp@b#1:#2:#3{#3{#2}{#1}} +%% \bxju@decomp@int{<number>}\CScont +% Divides the <number> by 94 and returns the quotient and +% the remainder as \CScont{<high>}{<low>}. +\def\bxju@decomp@int#1{% + \expandafter\bxju@decomp@int@a + \number\numexpr\ifnum#1>\ltx@zero(#1-47)/94\else0\fi:#1:} +\def\bxju@decomp@int@a#1:#2:{% + \expandafter\bxju@decomp@int@b\the\numexpr#2-#1*94:#1:} +\def\bxju@decomp@int@b#1:#2:#3{#3{#2}{#1}} + %% \bxju@in@hex\CSconv{<arg>} \def\bxju@in@hex#1#2{% \expandafter\bxju@in@hex@a\bxju@burst-`>#1{#2}:>} @@ -231,6 +257,7 @@ %% umbralist fontdefs \font\bxju@ul@cid=bxjatoucs-cid \font\bxju@ul@jis=bxjatoucs-jis +\font\bxju@ul@tojis=bxjatoucs-tojis %% \bxju@cid@to@ucs{<cid>} \def\bxju@cid@to@ucs#1{% @@ -284,6 +311,55 @@ \def\bxju@fast@jsc@to@ucs#1{% \number\fontdimen\numexpr(#1)+8\bxju@ul@jis} +%% \bxju@conv@ucs@to@jsc{<ucs>}\CScont +% Converts a UCS value <ucs> to JSC and returns the result. +% If no corresponding JSC codepoint exists, returns 9999. +\def\bxju@conv@ucs@to@jsc#1{% + \expandafter\bxju@conv@ucs@to@jsc@a\number\numexpr#1\bxju@mk} +\def\bxju@conv@ucs@to@jsc@a#1\bxju@mk{% + \bxju@cond\ifnum#1<"10000 \fi{% + \expandafter\bxju@conv@ucs@to@jsc@b + \number\fontdimen\numexpr(#1+480)/64\bxju@ul@tojis:#1\bxju@mk + }{\bxju@conv@ucs@to@jsc@a0\bxju@mk}} +\def\bxju@conv@ucs@to@jsc@b#1:#2\bxju@mk{% + \expandafter\bxju@conv@ucs@to@jsc@c + \number\fontdimen\numexpr#2+1088-#1\bxju@ul@tojis\bxju@mk} +\def\bxju@conv@ucs@to@jsc@c#1\bxju@mk#2{#2{#1}} + +%% \bxju@ucs@to@jis{<ucs>} +\def\bxju@ucs@to@jis#1{% + \bxju@check@number{#1}\bxju@ucs@to@jiseuc{8481}} +\def\bxju@ucs@to@jiseuc#1{% + \bxju@conv@ucs@to@jsc{#1}\bxju@ucs@to@jiseuc@a} +\def\bxju@ucs@to@jiseuc@a#1{% + \bxju@cond\ifnum#1=9999 \fi{\ltx@firstoftwo{0}}{%else + \bxju@decomp@int{#1}\bxju@ucs@to@jiseuc@b}} +\def\bxju@ucs@to@jiseuc@b#1#2#3{% + \number\numexpr#1*256+#2+#3\relax} + +%% \bxju@ucs@to@euc{<ucs>} +\def\bxju@ucs@to@euc#1{% + \bxju@check@number{#1}\bxju@ucs@to@jiseuc{41377}} + +%% \bxju@ucs@to@sjis{<ucs>} +\def\bxju@ucs@to@sjis#1{% + \bxju@check@number{#1}\bxju@ucs@to@sjis@a} +\def\bxju@ucs@to@sjis@a#1{% + \bxju@conv@ucs@to@jsc{#1}\bxju@ucs@to@sjis@b} +\def\bxju@ucs@to@sjis@b#1{% + \bxju@cond\ifnum#1=9999 \fi{0}{%else + \bxju@decomp@int{#1}\bxju@ucs@to@sjis@c}} +\def\bxju@ucs@to@sjis@c#1#2{% + \number\numexpr#1*128+#2 % + \ifodd#1 -33 \else\ifnum#2>62 +1 \fi\fi + \ifnum#1<62 +33088 \else +49472 \fi\relax} + +%% \bxju@fast@ucs@to@jsc{<ucs>} +\def\bxju@fast@ucs@to@jsc#1{% + \bxju@conv@ucs@to@jsc{#1}\bxju@fast@ucs@to@jsc@a} +\def\bxju@fast@ucs@to@jsc@a#1{% + \bxju@cond\ifnum#1=9999 \fi{-1}{#1}} + %--------------------------------------- all done \let\bxju@next\@undefined \let\bxju@ifdefinable\@undefined diff --git a/Master/texmf-dist/tex/latex/bxpdfver/bxpdfver.sty b/Master/texmf-dist/tex/latex/bxpdfver/bxpdfver.sty index ccc9825f6fb..296774068c6 100644 --- a/Master/texmf-dist/tex/latex/bxpdfver/bxpdfver.sty +++ b/Master/texmf-dist/tex/latex/bxpdfver/bxpdfver.sty @@ -1,7 +1,7 @@ %% %% This is file 'bxpdfver.sty'. %% -%% Copyright (c) 2014-2022 Takayuki YATO (aka. "ZR") +%% Copyright (c) 2014-2024 Takayuki YATO (aka. "ZR") %% GitHub: https://github.com/zr-tex8r %% Twitter: @zr_tex8r %% @@ -10,12 +10,8 @@ %% package declaration \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bxpdfver}[2022/04/28 v0.6] +\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 @@ -144,6 +150,13 @@ \def#3{#2}% } +%% \bxpv@info{<message>} +% Issues an info message. +\@onlypreamble\bxpv@info +\def\bxpv@info#1{% + \PackageInfo\bxpv@pkgname{#1\@gobble}% +} + %% \bxpv@warn{<message>} % Issues a warning. \@onlypreamble\bxpv@warn @@ -175,17 +188,61 @@ } %% \ifbxpv@defined -\let\ifbxpv@defined\ifdefined -\ifx\ifbxpv@defined\@undefined \expandafter\@firstofone -\else \expandafter\@gobble -\fi{\let\ifbxpv@defined\iffalse} +% Identical to \ifdefined, and is used only in e-TeX-aware code. +% On non-e-TeX engines it is made \iffalse to keep \if-balancedness. +\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". +% They are later redefined according to the driver type. + %% \bxpv@suppress@compress \@onlypreamble\bxpv@suppress@compress \def\bxpv@suppress@compress{% @@ -224,25 +281,11 @@ \@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 - -%% adjust internal dispatchers +%% Redefine internal dispatchers. \ifx 0\bxpv@drv@type\else %-------- \begingroup @@ -264,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 @@ -386,12 +451,14 @@ \bxpv@warn {Unsupported engine}% \else\if d\bxpv@drv@type % 'dvipdfmx' + % All the real settings are done in the begin-document hook, + % so the dispatchers themselves will do nothing (if available). \global\let\bxpv@suppress@compress\relax \global\let\bxpv@suppress@obj@compress\relax \global\let\bxpv@check@version\relax \global\let\bxpv@set@version\relax \global\let\bxpv@set@decimaldigits\relax - %\global\let\bxpv@set@pkresolution\relax + \global\let\bxpv@set@pkresolution\relax \global\let\bxpv@preserve@destinations\relax \g@addto@macro\bxpv@begin@document@hook{% \bxpv@begin@document@dvipdfmx @@ -671,6 +738,7 @@ \fi %% variables +\let\bxpv@dvipdfmx@known@min\relax % minimum known dviodfmx version \let\bxpv@C@value\relax %% \bxpv@C@bits @@ -689,6 +757,7 @@ %% \bxpv@begin@document@dvipdfmx \@onlypreamble\bxpv@begin@document@dvipdfmx \def\bxpv@begin@document@dvipdfmx{% + \bxpv@get@dvipdfmx@known@min % PDF version \ifx\bxpdfverMajorVersion\tw@ \bxpv@check@dvipdfmx@version{20180217}% @@ -701,8 +770,8 @@ \bxpv@put@special{pdf:minorversion \the\bxpdfverMinorVersion}% \fi \ifx\bxpdfverMinorVersion\relax\else - \bxpv@cache@fetch{dvipdfmxver}% - \ifnum\bxpv@cache@@dvipdfmxver<20180217 \else + \bxpv@at@least@dvipdfmx@version{20180217}% + \ifbxpv@ok \bxpv@put@special{pdf:majorversion \the\bxpdfverMajorVersion}% \fi \fi @@ -734,7 +803,9 @@ \fi % PK resolution \ifx\bxpdfverPkResolution\relax\else - \iffalse % This will never work.... + \bxpv@check@dvipdfmx@version{20211016}% + {Cannot set PK resolution}% + \ifbxpv@ok \bxpv@put@special{dvipdfmx:config r \the\bxpdfverPkResolution}% \fi \fi @@ -748,10 +819,9 @@ \fi % C option value \ifx\bxpv@C@bits\@empty\else - \bxpv@cache@fetch{dvipdfmxcfg}% - \def\bxpv@next##1##2\bxpv@mk{\def\bxpv@C@value{##1}}% - \expandafter\bxpv@next\bxpv@cache@@dvipdfmxcfg{0}\bxpv@mk - \bxpv@rc@bitset{\bxpv@C@value}{64}% + % When C option is used, its value is automatically OR'ed with + % 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}% \let\bxpv@C@value\bxpv@rc@num}% @@ -776,25 +846,67 @@ \fi } +%% \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}% +} + +%% \bxpv@at@least@dvipdfmx@version{<version>} +% Checks if dvipdfmx >= <version> and sets bxpv@ok. +\@onlypreamble\bxpv@at@least@dvipdfmx@version +\def\bxpv@at@least@dvipdfmx@version#1{% + % first check using known-min + \ifnum\bxpv@dvipdfmx@known@min<#1 + % get real version + \bxpv@cache@fetch{dvipdfmxver}% + \bxpv@info + {dvipdfmx version is \bxpv@cache@@dvipdfmxver}% + \bxpv@oktrue + \ifnum\bxpv@cache@@dvipdfmxver<#1 + \bxpv@okfalse + \fi + \else % new enough + \bxpv@oktrue + \fi +} + %% \bxpv@check@dvipdfmx@version \@onlypreamble\bxpv@check@dvipdfmx@version \def\bxpv@check@dvipdfmx@version#1#2{% - \bxpv@cache@fetch{dvipdfmxver}% - \bxpv@okfalse - \ifnum\bxpv@cache@@dvipdfmxver=\z@ + \bxpv@at@least@dvipdfmx@version{#1}% + \ifbxpv@ok % no-op + \else\ifnum\bxpv@cache@@dvipdfmxver=\z@ \bxpv@fail {#2, because the\MessageBreak version of dvipdfmx in use is unknown \MessageBreak (v.#1 or later is required)}% - \else\ifnum\bxpv@cache@@dvipdfmxver<#1 + \else \bxpv@fail {#2, because the\MessageBreak version of dvipdfmx in use (v.\bxpv@cache@@dvipdfmxver) is too old \MessageBreak (v.#1 or later is required)}% - \else - \PackageInfo\bxpv@pkgname - {dvipdfmx version is \bxpv@cache@@dvipdfmxver\@gobble}% - \bxpv@oktrue \fi\fi } @@ -950,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..d72cb1d1eb3 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,83 @@ \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_cite_input:nnn {#1} {#2} {#3} \__csl_process_citation_info:NN \l__csl_cite_keys_seq \l__csl_citation_items_seq - \IfBooleanT {#1} + \prop_put:Nnn \l__csl_citation_properties_prop { noteIndex } { 0 } + \tl_if_empty:nF {#4} + { + \prop_put:Nnn \l__csl_citation_properties_prop { mode } {#4} + } + \__csl_make_citation:N \l__csl_citation_info_prop + } + } + +% #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} } { - \bool_if:NTF \l__csl_note_bool - { \msg_warning:nn { citation-style-language } { starred-cite-in-note-style } } + \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 + \tl_if_empty:nF {#4} { - \prop_put:Nnn \l__csl_citation_properties_prop { noteIndex } { 0 } - \prop_put:Nnn \l__csl_citation_properties_prop { mode } { suppress-author } + \prop_put:Nnn \l__csl_citation_properties_prop { mode } {#4} + } + \__csl_make_citation:N \l__csl_citation_info_prop + } + } + { + \footnote + { + \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 {#1} {#2} {#3} + \__csl_process_citation_info:NN \l__csl_cite_keys_seq \l__csl_citation_items_seq + \tl_if_empty:nF {#4} + { + \prop_put:Nnn \l__csl_citation_properties_prop { mode } {#4} + } + \__csl_make_citation:N \l__csl_citation_info_prop } } - \__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,21 +151,10 @@ \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 } } } @@ -121,8 +170,18 @@ { \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:NN \l__csl_cite_keys_seq \l__csl_citation_items_seq + \__csl_make_citation:N \l__csl_citation_info_prop + } + } + { + \__csl_process_citation_info:NN \l__csl_cite_keys_seq \l__csl_citation_items_seq + \__csl_make_citation:N \l__csl_citation_info_prop + } } { \__csl_process_cite_input:nnn {#1} {#2} {#3} @@ -131,48 +190,6 @@ } -\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 - { - \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 - } - - % Appends the cite key into \l__csl_cite_keys_seq and cite-items into % \l__csl_citation_items_seq % #1, #2: prenote/postnote @@ -246,10 +263,17 @@ \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. } + \keys_define:nn { csl / cite-item } { prefix .prop_put:N = \l__csl_cite_item_prop, @@ -309,9 +333,19 @@ \__csl_process_citation_id:NN \l__csl_citation_id_tl #1 \__csl_get_note_index:N \l__csl_note_index_tl \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 @@ -376,7 +410,7 @@ \__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 @@ -404,7 +438,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 @@ -469,11 +503,7 @@ % #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 #1 { \int_use:c { c@ \@mpfn } } } { \tl_if_empty:NTF \l__csl_class_tl { @@ -483,16 +513,17 @@ \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 #1 { 0 } } + { \tl_set:Nn #1 { 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 } @@ -511,13 +542,7 @@ { \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} + #1 } @@ -539,9 +564,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 +573,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 { @@ -580,23 +603,23 @@ } \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 +635,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 +650,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..84da32c79b8 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 @@ -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..f54f8d0e85e 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-21} {0.6.2} {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..d59376693f0 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-06T11:26:59-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"> @@ -1377,6 +1619,9 @@ <if variable="archive DOI URL" match="none"> <text variable="publisher"/> </if> + <else> + <text variable="archive"/> + </else> </choose> </if> <else-if type="post webpage" match="any"> @@ -1389,12 +1634,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,15 +1649,27 @@ <!-- 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"/> + </if> + <else> + <group delimiter=" "> + <text variable="archive"/> + <text variable="archive_location" prefix="(" suffix=")"/> + </group> + </else> + </choose> </if> </choose> - <text variable="archive"/> <text variable="archive-place"/> </group> </group> @@ -1439,19 +1696,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 +1740,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 +1778,6 @@ </else> </choose> </group> - </if> - <else> - <text variable="references" prefix="(" suffix=")"/> </else> </choose> </macro> @@ -1510,24 +1786,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 +1829,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 +1885,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 +1958,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 +2065,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 +2103,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/cjs-rcs-article/cjs-rcs-article.cls b/Master/texmf-dist/tex/latex/cjs-rcs-article/cjs-rcs-article.cls index ec78eb3ab06..1d4c0f01c12 100644 --- a/Master/texmf-dist/tex/latex/cjs-rcs-article/cjs-rcs-article.cls +++ b/Master/texmf-dist/tex/latex/cjs-rcs-article/cjs-rcs-article.cls @@ -32,7 +32,7 @@ %% \NeedsTeXFormat{LaTeX2e}[2021/06/01] \ProvidesClass{cjs-rcs-article}% -[2024/07/14 v1.1 Article class for The Canadian Journal of +[2024/07/30 v1.1a Article class for The Canadian Journal of Statistics | La revue canadienne de statistique] \newif\ifCJS@review \CJS@reviewfalse % review version? \newif\ifCJS@supplement \CJS@supplementfalse % supplementary material? @@ -176,12 +176,12 @@ \def\CJS@journalname@en{The Canadian Journal of Statistics} \def\CJS@journalname@fr{La revue canadienne de statistique} \def\CJS@journalname{\CJS@journalname@en~{\textbar}~\CJS@journalname@fr} -\setbox\z@=\vbox{\sffamily\hbox{\CJS@journalname}\hbox{\bfseries V,}} \newsavebox\CJS@journalornament \setbox\CJS@journalornament=\vbox{% + \setbox\z@=\vbox{\sffamily\hbox{\CJS@journalname}\hbox{\bfseries V,}} \setbox\tw@\hbox{\vrule \@width4pt\@height\ht\z@\@depth\dp\z@} - \hbox{\textcolor{CJSpink}{\copy\tw@}\kern2pt% - \textcolor{CJSred}{\copy\tw@}\kern2pt% + \hbox{\textcolor{CJSpink}{\copy\tw@}\kern2pt + \textcolor{CJSred}{\copy\tw@}\kern2pt \textcolor{CJSyellow}{\copy\tw@}\kern6pt}} \newcommand*\makejournalinfo{% \mbox{% @@ -576,41 +576,42 @@ \setbox\CJS@licencebox=\vbox{% \CJS@setlicencefont \ifCJS@specialack\CJS@specialackstatement\fi - \ifdefempty{\CJS@licence}{\CJS@licencesample}{\CJS@licence}} + \ifdefempty{\CJS@licence}{\CJS@licencesample}{\CJS@licence}}% \setlength\CJS@licenceht{\dimexpr\ht\CJS@licencebox+\dp\CJS@licencebox}} \def\CJS@licence{} \newcommand\licence[1]{\renewcommand*\CJS@licence{#1}} \let\license\licence \newcommand*\ccby{\ccby@\@ifstar{~\faCopyright[regular]}\relax} +\def\CJS@fakern{\kern0.1em} \def\ccby@{\mbox{% - \faCreativeCommons\kern0.1em% - \faCreativeCommonsBy\kern0.1em}} + \faCreativeCommons\CJS@fakern + \faCreativeCommonsBy\CJS@fakern}} \newcommand*\ccbysa{\ccbysa@\@ifstar{~\faCopyright[regular]}\relax} \def\ccbysa@{\mbox{% - \faCreativeCommons\kern0.1em% - \faCreativeCommonsBy\kern0.1em% + \faCreativeCommons\CJS@fakern + \faCreativeCommonsBy\CJS@fakern \faCreativeCommonsSa}} \newcommand*\ccbync{\ccbync@\@ifstar{~\faCopyright[regular]}\relax} \def\ccbync@{\mbox{% - \faCreativeCommons\kern0.1em% - \faCreativeCommonsBy\kern0.1em% + \faCreativeCommons\CJS@fakern + \faCreativeCommonsBy\CJS@fakern \faCreativeCommonsNc}} \newcommand*\ccbyncsa{\ccbyncsa@\@ifstar{~\faCopyright[regular]}\relax} \def\ccbyncsa@{\mbox{% - \faCreativeCommons\kern0.1em% - \faCreativeCommonsBy\kern0.1em% - \faCreativeCommonsNc\kern0.1em% + \faCreativeCommons\CJS@fakern + \faCreativeCommonsBy\CJS@fakern + \faCreativeCommonsNc\CJS@fakern \faCreativeCommonsSa}} \newcommand*\ccbynd{\ccbynd@\@ifstar{~\faCopyright[regular]}\relax} \def\ccbynd@{\mbox{% - \faCreativeCommons\kern0.1em% - \faCreativeCommonsBy\kern0.1em% + \faCreativeCommons\CJS@fakern + \faCreativeCommonsBy\CJS@fakern \faCreativeCommonsNd}} \newcommand*\ccbyncnd{\ccbyncnd@\@ifstar{~\faCopyright[regular]}\relax} \def\ccbyncnd@{\mbox{% - \faCreativeCommons\kern0.1em% - \faCreativeCommonsBy\kern0.1em% - \faCreativeCommonsNc\kern0.1em% + \faCreativeCommons\CJS@fakern + \faCreativeCommonsBy\CJS@fakern + \faCreativeCommonsNc\CJS@fakern \faCreativeCommonsNd}} \let\Pr\relax \DeclareMathOperator{\Pr}{P} @@ -672,7 +673,7 @@ \theoremstyle{remark} \newtheorem{remark}{\iflanguage{french}{\CJS@remarkname@fr}{\CJS@remarkname@en}} \renewcommand*\eqref[1]{\hyperref[{#1}]{\textup{(\ref*{#1})}}} -\newcommand*\proglang[1]{{\hyphenchar\font=-1 #1}} +\newrobustcmd*\proglang[1]{\mbox{#1}} \newcommand*\Rlang{\proglang{R}} \newcommand*\SASlang{\proglang{SAS}} \newcommand*\SPSSlang{\proglang{SPSS}} @@ -770,13 +771,13 @@ \item[\iflanguage{french}{\CJS@acceptedname@fr}{\CJS@acceptedname@en}] \DTMusedate{accepted}}{\relax}% \end{CJS@historylist}\par} -\setbox\@ne=\vbox{\hbox{\firaoldstyle\small l4}} \newsavebox\CJS@historyornament \setbox\CJS@historyornament=\vbox{% - \setbox\thr@@\hbox{\vrule \@width1.5pt\@height\ht\@ne\@depth\dp\@ne} - \hbox{\textcolor{CJSpink}{\copy\thr@@}\kern.75pt% - \textcolor{CJSred}{\copy\thr@@}\kern.75pt% - \textcolor{CJSyellow}{\copy\thr@@}\kern3pt}} + \setbox\z@=\vbox{\hbox{\firaoldstyle\small l4}} + \setbox\tw@\hbox{\vrule \@width1.5pt\@height\ht\z@\@depth\dp\z@} + \hbox{\textcolor{CJSpink}{\copy\tw@}\kern.75pt + \textcolor{CJSred}{\copy\tw@}\kern.75pt + \textcolor{CJSyellow}{\copy\tw@}\kern3pt}} \def\CJS@historybox{ \par\addvspace{2\baselineskip}\noindent% \smash{\box\CJS@historyornament \CJS@history}\par% diff --git a/Master/texmf-dist/tex/latex/customenvs/customenvs.sty b/Master/texmf-dist/tex/latex/customenvs/customenvs.sty index af81d0b88dd..535baa0f186 100644 --- a/Master/texmf-dist/tex/latex/customenvs/customenvs.sty +++ b/Master/texmf-dist/tex/latex/customenvs/customenvs.sty @@ -3,9 +3,10 @@ % 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/08/20 0.1.9 Custom classic environments] %====HISTORIQUE +% 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 @@ -2107,4 +2108,264 @@ \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,% + 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}% +} + + \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/doibanner/doibanner.sty b/Master/texmf-dist/tex/latex/doibanner/doibanner.sty new file mode 100644 index 00000000000..986b52ad11e --- /dev/null +++ b/Master/texmf-dist/tex/latex/doibanner/doibanner.sty @@ -0,0 +1,98 @@ +%% +%% This is file `doibanner.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% doibanner.dtx (with options: `package') +%% +%% Copyright (C) 2024 Christian Schreinemachers +%% +%% 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 2008-05-04 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% The current maintainer of this work is +%% Christian Schreinemachers. +%% +%% This work consists of the files +%% doibanner.dtx +%% doibanner.ins +%% and the derived files +%% doibanner.sty +%% doibanner.pdf +%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{doibanner} + [2024-07-28 v0.3 Generate DOI banners and links] +\RequirePackage{adjustbox} +\RequirePackage{hyperref} +\RequirePackage{tikz} +\definecolor{leftcolor}{RGB}{82,82,82} +\definecolor{rightcolor}{RGB}{6,119,183} +\definecolor{toptextcolor}{RGB}{235,235,235} +\definecolor{bottomtextcolor}{RGB}{59,59,59} +\tikzstyle{toptextstyle} = [ + font=\fontfamily{\sfdefault}\selectfont\bfseries\Large,toptextcolor] +\tikzstyle{bottomtextstyle} = [ + font=\fontfamily{\sfdefault}\selectfont\bfseries\Large,bottomtextcolor] +\DeclareKeys[@doibanner]{ + label.store = \@doibanner@label, + label.usage = load, + urlbase.store = \@doibanner@urlbase, + urlbase.usage = load, + width.store = \@doibanner@width, + width.usage = load, +} +\SetKeys[@doibanner]{ + label=DOI, + urlbase=https://doi.org/, + width=3.6cm, +} +\ProcessKeyOptions[@doibanner]\relax +\NewDocumentCommand\doiurl{s m}{% + \IfBooleanTF#1 + {\@doibanner@urlbase#2}% + {\href{\@doibanner@urlbase#2}{#2}}% +} +\NewDocumentCommand\@doibanner@draw{o m}{% + \adjustbox{#1}{% + \begin{tikzpicture} + \fill [leftcolor,draw] + (1.5,0) -- + ++(0,.8) {[rounded corners=5] -- + ++(-1.5,0) -- + ++(0,-.8)} -- + cycle + {}; + \node[bottomtextstyle] at (.75,.35) {\@doibanner@label}; + \node[toptextstyle] at (.75,.4) {\@doibanner@label}; + \fill [rightcolor,draw] + (1.5,0) {[rounded corners=5] -- + ++(6.5,0) -- + ++(0,.8)} -- + ++(-6.5,0) -- + cycle + {}; + \node[bottomtextstyle] at (4.75,.35) {#2}; + \node[toptextstyle] at (4.75,.4) {#2}; + \end{tikzpicture}% + }% +} +\NewDocumentCommand\doibanner{s O{width=\@doibanner@width} m}{% + \IfBooleanTF#1 + {\@doibanner@draw[#2]{#3}}% + {\href{\@doibanner@urlbase#3}{\@doibanner@draw[#2]{#3}}}% +} +\endinput +%% +%% End of file `doibanner.sty'. diff --git a/Master/texmf-dist/tex/latex/easybook/easybase.sty b/Master/texmf-dist/tex/latex/easybook/easybase.sty index 4719d3abaa4..5f18e679586 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/20}{2024cv} +\ProvidesExplPackage{easybase}{2024/08/14}{2024dj} {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, @@ -597,7 +596,7 @@ \str_case:nnF {#1} { { bottom } - { \bool_set_true:N \l__eb_fnpara_bottom_bool } + { \PushFntBottom } { flush } { \tl_set:Nn \l__eb_footnote_value_tl { plain } @@ -630,7 +629,6 @@ } } -\bool_new:N \l__eb_fnpara_bottom_bool \tl_new:N \l__eb_fnmarktext_format_tl \tl_new:N \l__eb_fncustom_format_tl \clist_new:N \l__eb_footnote_value_clist @@ -678,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} } @@ -688,58 +686,91 @@ { page } { \counterwithin*{footnote}{page} } } { \counterwithout*{footnote}{chapter} } - \eb_fnpara_if_pos_bottom: } -\cs_new_protected:Npn \setspread #1 { \linespread{#1}\selectfont } -\cs_new:Npn \eb@ifvoid #1#2#3 { \ifvoid #1#2\else #3\fi } -\cs_new_protected:Npn \eb_fnpara_if_pos_bottom: + +\def\@if@footnotes@TF #1#2 {\ifvoid\footins #2\else #1\fi} +\def\@outputbox@removebskip + { + \ifx\@textbottom\relax\else + \@outputbox@append + { + \@tempskipa\lastskip + \ifnum\gluestretchorder\@tempskipa>\z@ + \vskip -\@tempskipa + \xdef\@outputbox@reinsertbskip + {\noexpand\@outputbox@append{\vskip\the\@tempskipa}} + \else + \global\let\@outputbox@reinsertbskip\relax + \fi + } + \fi + } +\let\@outputbox@reinsertbskip\relax +\def\@outputbox@append #1 + { + \setbox\@outputbox\vbox + { + \boxmaxdepth\@maxdepth + \dimen@\dp\@outputbox + \unvbox\@outputbox + #1 + } + } +\def\@outputbox@attachfloats{\@combinefloats} +\NewHook{makecol/footins/before} +\NewHook{makecol/footins/begin} +\def\@outputbox@appendfootnotes { - \bool_if:NT \l__eb_fnpara_bottom_bool + \@if@footnotes@TF { - \IfPackageLoadedTF{footmisc} - {\msg_warning:nn { easybase } { bottom-not-compatible }} + \UseHook{makecol/footins/before} + \@outputbox@append { - \cs_set:Npn \@makecol - { - \setbox\@outputbox\box\@cclv - \let\@elt\relax - \xdef\@freelist{\@freelist\@midlist} - \global\let\@midlist\@empty - \@combinefloats - \eb@ifvoid\footins{} - { - \setbox\@outputbox\vbox - { - \boxmaxdepth\@maxdepth - \unvbox\@outputbox - \vfill\relax - \vskip\skip\footins - \color@begingroup - \normalcolor\footnoterule - \unvbox\footins - \color@endgroup - } - } - \eb@ifvoid\@kludgeins - {\@makespecialcolbox} - { - \setbox\@outputbox\vbox to\@colht - { - \@texttop\dimen@\dp\@outputbox - \unvbox\@outputbox - \vskip -\dimen@\@textbottom - } - } - \global\maxdepth\@maxdepth - } + \vskip\skip\footins + \UseHook{makecol/footins/begin} + \color@begingroup + \normalcolor + \footnoterule + \@nameuse{pdfcolfoot@current} + \unvbox\footins + \color@endgroup } + }{} + } +\def\@makenormalcolbox + { + \setbox\@outputbox\vbox to\@colht + { + \@texttop + \dimen@\dp\@outputbox + \unvbox\@outputbox + \vskip -\dimen@ + \@textbottom } } -\msg_new:nnn { easybase } { bottom-not-compatible } +\cs_new_protected:Npn \PushFntBottom { - Not~compatible~with~the~'footmisc'~package. \\ - Please~use~the~'bottom'~option~of~'footmisc'~package. + \cs_set:Npn \@makecol + { + \setbox\@outputbox\box\@cclv + \@outputbox@removebskip + \let\@elt\relax + \xdef\@freelist{\@freelist\@midlist} + \global\let\@midlist\@empty + \@outputbox@attachfloats + \@if@footnotes@TF + {\@outputbox@append{\vfill}} + {\@outputbox@reinsertbskip} + \@outputbox@appendfootnotes + \ifvbox\@kludgeins + \@makespecialcolbox + \else + \@makenormalcolbox + \fi + \global\maxdepth\@maxdepth + } } +\@onlypreamble\PushFntBottom \cs_new_protected:Npn \eb_footnote_direct_hang: { @@ -795,6 +826,7 @@ \l__eb_fnpara_format_tl{#1} \tl_if_eq:NnT \l__eb_footnote_value_tl { hang } { \par } } +\cs_new_protected:Npn \setspread #1 { \linespread{#1}\selectfont } \clist_map_inline:nn { \@footnotetext,\@mpfootnotetext } { \eb_patch_cmd:Nnn #1 @@ -810,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 @@ -1193,7 +1225,7 @@ \tl_set:Nn \eb@toc@title@level {#1} \eb_toc_extract_level: }, - level .initial:e = + level .initial:x = { \bool_if:NTF \l__eb_class_mode_book_bool { \exp_not:N \bichapter* } @@ -1336,8 +1368,9 @@ { \protect\numberline{#3}{#4} } } } -\cs_new_protected:Npn \AllotCaptionExt #1#2 +\cs_new_protected:Npn \AssignCaptionExt #1#2 { \tl_set:cn { ext@#1 } {#2} } +\cs_set_eq:NN \AllotCaptionExt \AssignCaptionExt \ctex_define:n { bicontentsname .tl_set:N = \bicontentsname, @@ -1572,7 +1605,7 @@ {\iow_now:Nn \@mainaux { \RemoveFromHook{starttoc/after}[aux] }} } } -\cs_set_protected:Npn \AllotPartialExt #1#2 +\cs_set_protected:Npn \AssignPartialExt #1#2 { \tl_if_exist:cTF { ttl@partial#1 } { \msg_warning:nnnn { easybase } { repeated-ptoc } {#1} {#2} } @@ -1582,12 +1615,13 @@ {\ttl@topartial{#1}{##1}{##2}} } } +\cs_set_eq:NN \AllotPartialExt \AssignPartialExt \msg_new:nnn { easybase } { repeated-ptoc } { Local~directory~file~'#2'~of~directory~type~'#1'~is \\ repeatedly~allocated. } -\AllotPartialExt{lol}{pll} +\AssignPartialExt{lol}{pll} \cs_new_protected:Npn \RegisterTitleIfname #1 { @@ -1658,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 @@ -1813,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 } { @@ -2029,7 +2085,7 @@ \theoremstyle{default} \cs_undefine:N \proof \DeclareFloatList{theorem}{loe} - \AllotPartialExt{loe}{ple} + \AssignPartialExt{loe}{ple} \eb_preto_cmd:nn { listoftheorems } { \group_begin: @@ -2140,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 @@ -2188,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 @@ -2413,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 bcef9c79478..119b932f507 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/20}{2024cv} +\ProvidesExplClass{easybook}{2024/08/14}{2024dj} {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 d52ed4e2bcd..8cd8c256c88 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/20}{2024cv} +\ProvidesExplFile{eb-tcolorbox.cfg}{2024/08/14}{2024dj} {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..e11c5153448 --- /dev/null +++ b/Master/texmf-dist/tex/latex/edmaths/edmaths.sty @@ -0,0 +1,258 @@ +%% Package `edmaths' v0.98 +%% 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-09 Edinburgh maths thesis/report style v0.98] +\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 must be compiled with xelatex or luatex + \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} +} diff --git a/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty b/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty index 268c91fa3ff..ab4ea7b0745 100644 --- a/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty +++ b/Master/texmf-dist/tex/latex/fancyhdr/extramarks.sty @@ -21,7 +21,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{extramarks} - [2024/07/18 v4.3 + [2024/07/23 v4.3.1 Extra marks for LaTeX] % Copyright (C) 1994-2024 by Pieter van Oostrum <pieter@vanoostrum.org> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty b/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty index d138cd4a505..9030da7b18c 100644 --- a/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty +++ b/Master/texmf-dist/tex/latex/fancyhdr/fancyhdr.sty @@ -21,7 +21,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{fancyhdr}% - [2024/07/18 v4.3 + [2024/07/23 v4.3.1 Extensive control of page headers and footers]% % Copyright (C) 1994-2024 by Pieter van Oostrum <pieter@vanoostrum.org> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -232,6 +232,7 @@ \let\f@nch@everypar\tex_everypar:D \newcommand\f@nch@resetpar{% \f@nch@everypar{}% + \cs_set_eq:NN \everypar\tex_everypar:D \cs_set_eq:NN \par \tex_par:D \cs_set_eq:NN \@@par \tex_par:D \cs_set_eq:NN \endgraf \tex_par:D 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/fontscale/fontscale.sty b/Master/texmf-dist/tex/latex/fontscale/fontscale.sty index d032e49860a..70bfae6026c 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-12} + {2.1.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 +% Scratch variables +\tl_new:N \l__fontscale_tmp_tl +\str_new:N \l__fontscale_tmp_str +\dim_new:N \l__fontscale_tmp_dim +\fp_new:N \l__fontscale_tmp_fp % SOME HELPER FUNCTIONS -% Sets a dimen/skip variable from a dimen/skip expression, supplying a default +% Sets a dimen/skip variable from a dimen/skip expression, appending a default % unit of pt. -\cs_new_protected:Npn \__fontscale_dim_set_with_default_pt:Nn #1#2 +\cs_new_protected:Npn \__fontscale_dim_set_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 +\cs_generate_variant:Nn \__fontscale_dim_set_default_pt:Nn { c } +\cs_new_protected:Npn \__fontscale_skip_set_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. +\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:nn { fontscale } { font-baselineskip-out-of-bounds } } + { + \fontsize \l__fontscale_fontsize_dim \l__fontscale_fontsize_skip + \selectfont + } + } + { \msg_error:nn { fontscale } { font-size-out-of-bounds } } } % 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:nn { fontscale } { font-size-out-of-bounds } } } % 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'~ + The~ value~ of~ the~ key~ 'baselineskip-size-ratio'~ \msg_line_context: \c_space_tl - must~ be~ greater~ than~ 1. + must~ be~ at~ least~ 1. } -\msg_new:nnn { fontscale } { musical-ratio-out-of-bounds } +\msg_new:nnn { fontscale } { key-musical-base-out-of-bounds } { - The~ value~ for~ the~ key~ 'musical / ratio'~ + The~ value~ of~ the~ key~ 'musical / base'~ + \msg_line_context: \c_space_tl + must~ be~ a~ positive~ length. + } +\msg_new:nnn { fontscale } { key-musical-ratio-out-of-bounds } + { + The~ value~ of~ the~ key~ 'musical / ratio'~ \msg_line_context: \c_space_tl 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'~ + The~ value~ of~ the~ key~ 'musical / notes'~ \msg_line_context: \c_space_tl 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'~ + The~ value~ of~ the~ 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. + must~ be~ positive. + } +\msg_new:nnn { fontscale } { key-font-size-out-of-bounds } + { + The~ value~ of~ the~ key~ '#1 / size'~ + \msg_line_context: \c_space_tl + 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 } + { + The~ value~ of~ the~ key~ '#1 / baselineskip'~ + \msg_line_context: \c_space_tl + must~ be~ greater~ than~ or~ equal~ to~ + the~ font~ size~ of~ '\iow_char:N \\#1'. } \msg_new:nnn { fontscale } { 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'. + 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 } { 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'. + 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'~ + \msg_line_context: \c_space_tl + does~ nothing~ if~ used~ in~ math~ mode. + } +\msg_new:nnn { fontscale } { math-mode-error } + { + '#1'~ + \msg_line_context: \c_space_tl + cannot~ be~ used~ in~ math~ mode. + } +\msg_new:nnn { fontscale } { font-size-out-of-bounds } + { + The~ font~ size~ + \msg_line_context: \c_space_tl + must~ be~ a~ positive~ length. + } +\msg_new:nnn { fontscale } { font-baselineskip-out-of-bounds } + { + The~ font~ baselineskip~ + \msg_line_context: \c_space_tl + must~ be~ greater~ than~ or~ equal~ to~ the~ font~ size. } \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'. + must~ equal~ an~ integer~ from~ -4~ to~ 5,~ + unless~ the~ value~ of~ the~ key~ 'typographic-scale'~ is~ 'musical'.~ + \msg_see_documentation_text:n { fontscale } } \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. + the~ current~ font~ step~ is~ undefined.~ + \msg_see_documentation_text:n { fontscale } } % 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: -% 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: +% SET AND PROCESS KEYS + +\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,65 @@ \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:nn { fontscale } + { key-baselineskip-size-ratio-out-of-bounds } + \prg_break: + } + \dim_compare:nNnF \l__fontscale_musical_base_dim > \c_zero_dim + { + \msg_error:nn { fontscale } { key-musical-base-out-of-bounds } \prg_break: } \fp_compare:nNnF \l__fontscale_musical_ratio_fp > \c_one_fp { - \msg_error:nn { fontscale } { musical-ratio-out-of-bounds } + \msg_error:nn { fontscale } { key-musical-ratio-out-of-bounds } \prg_break: } \int_compare:nNnF \l__fontscale_musical_notes_int > 0 { - \msg_error:nn { fontscale } { musical-notes-out-of-bounds } + \msg_error:nn { fontscale } { key-musical-notes-out-of-bounds } \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:nnn { fontscale } { key-font-size-out-of-bounds } + { 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 +631,17 @@ } } { - \__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:nnn { fontscale } + { key-font-baselineskip-out-of-bounds } { 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 +690,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 +749,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:nnn { fontscale } { key-font-scale-out-of-bounds } + {#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:nnn { fontscale } { key-font-size-out-of-bounds } + {#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 +797,113 @@ } } { - \__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:nnn { fontscale } + { key-font-baselineskip-out-of-bounds } {#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'. +% stretch and shrink components) 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 } { 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 } } } % 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 +919,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 +1032,42 @@ { 5 } { \Huge } } { - \str_case:VnF \l__fontscale_typographic_scale_str + \str_if_eq:VnTF \l__fontscale_typographic_scale_str { musical } { - { 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 ) - } - } - } + \__fontscale_fontsize:n + { + \fp_to_dim:n + { + \l__fontscale_musical_base_fp + * \l__fontscale_musical_ratio_fp + ^ ( (#1) / \l__fontscale_musical_notes_fp ) + } + } } { \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 +1082,150 @@ \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} } + { + \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 \PrintFontParameters { } - { \__fontscale_print_font_parameters: } -\cs_new_protected:Npn \__fontscale_print_font_parameters: +\NewDocumentCommand \PrintFontSizeParameters { } + { \__fontscale_print_font_size_parameters: } +\cs_new_protected:Npn \__fontscale_print_font_size_parameters: { - step ~=~ \__fontscale_current_font_step: ,~ - scale ~=~ \__fontscale_current_font_scale: ,~ - size ~=~ \__fontscale_current_font_size: ,~ - baselineskip ~=~ \__fontscale_current_font_baselineskip: + step ~=~ \__fontscale_step: ,~ + scale ~=~ \__fontscale_scale: ,~ + size ~=~ \__fontscale_size: ,~ + baselineskip ~=~ \__fontscale_baselineskip: } -\NewDocumentCommand \PrintAllFontParameters { } - { \__fontscale_print_all_font_parameters: } -\cs_new_protected:Npn \__fontscale_print_all_font_parameters: +\NewDocumentCommand \PrintAllFontSizeParameters { } { - \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_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} } } - } - -\NewDocumentCommand \PrintSampleText - { s O - { - The~ \texttt { fontscale }~ package \c_colon_str \c_space_tl - A~ user~ interface~ for~ setting~ document~ font~ sizes - } - } - { - \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 +1254,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 +1283,13 @@ } { \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 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..9a52b811408 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-08-14 v3.4.1.1 Class for Horizon Europe (R)IA proposals] \LoadClass[11pt,a4paper]{article} \RequirePackage[T1]{fontenc} % T1 font encoding \RequirePackage[left=15mm, diff --git a/Master/texmf-dist/tex/latex/oberdiek/hypcap.sty b/Master/texmf-dist/tex/latex/hypcap/hypcap.sty index c9486d68fca..04f91fefea4 100644 --- a/Master/texmf-dist/tex/latex/oberdiek/hypcap.sty +++ b/Master/texmf-dist/tex/latex/hypcap/hypcap.sty @@ -9,11 +9,11 @@ %% This is a generated file. %% %% Project: hypcap -%% Version: 2016/05/16 v1.12 +%% Version: 2024-07-26 v1.13 %% %% Copyright (C) %% 1999-2001, 2006-2008, 2011 Heiko Oberdiek -%% 2016-2019 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 @@ -29,8 +29,7 @@ %% %% The Current Maintainers of this work are %% Heiko Oberdiek and the Oberdiek Package Support Group -%% https://github.com/ho-tex/oberdiek/issues -%% +%% https://github.com/ho-tex/hypcap/issues %% %% This work consists of the main source file hypcap.dtx %% and the derived files @@ -38,7 +37,7 @@ %% \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{hypcap}% - [2016/05/16 v1.12 Adjusting the anchors of captions (HO)] + [2024-07-26 v1.13 Adjusting the anchors of captions (HO)] \@ifundefined{hyper@@anchor}{% \PackageError{hypcap}{You have to load 'hyperref' first}\@ehc \endinput @@ -116,7 +115,7 @@ \capstart }{% \if@capstart - \PackageError{hypcap}{You have forgotten to use \string\caption}% + \PackageWarning{hypcap}{You have forgotten to use \string\caption}% \global\@capstartfalse \else \fi 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..852aed35ea6 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/20 v1.2 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/jigsaw/jigsaw-doc-settings.sty b/Master/texmf-dist/tex/latex/jigsaw/jigsaw-doc-settings.sty deleted file mode 100644 index 13a1498c38e..00000000000 --- a/Master/texmf-dist/tex/latex/jigsaw/jigsaw-doc-settings.sty +++ /dev/null @@ -1,196 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% Personal helper theme for package documentations -% Copyright samcarter -% -% This file may be distributed and/or modified -% under the LaTeX Project Public License 1.3c or later -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% Usage: -% ln ~/Life/latex/beamertheme-sam/themesam.sty package-doc-settings.sty -% \usepackage[ -% themecolor=samdblue -% ]{\jobname-settings} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% Colours -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\RequirePackage{xcolor} -\definecolor{samyellow}{RGB}{246,193,65} -\definecolor{samorange}{RGB}{241,147,45} -\definecolor{samred}{RGB}{191,26,46}% TikZbricks -\definecolor{sammagenta}{RGB}{170,42,104}% TikZmarmots -\definecolor{samviolet}{RGB}{136,46,114}% TikZlings -\definecolor{samlila}{RGB}{101,67,159}% Rainbow beamer theme -\definecolor{samdblue}{RGB}{0,51,134}% beamer theme -\definecolor{samlblue}{RGB}{22,89,155}% TikZducks -\definecolor{samteal}{RGB}{25,143,157}% Tcolorbox beamer theme -\definecolor{samlgreen}{RGB}{68,170,153}% Jigsaw -\definecolor{samdgreen}{RGB}{78,178,125} -\definecolor{samlgray}{RGB}{160,160,185} -\definecolor{samdgray}{RGB}{60,60,85} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% Package options -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\RequirePackage{xkeyval} -\DeclareOptionX{themecolor}[samdblue]{\colorlet{themecolor}{#1}} -\DeclareOptionX{listingcolor}[samlblue]{\colorlet{listingcolor}{#1}} -\ExecuteOptionsX{themecolor,listingcolor} -\ProcessOptionsX - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% Packages -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\@ifclassloaded{beamer}{}{% - \RequirePackage[english]{babel} - \RequirePackage[paper=a4paper,margin=2.9cm]{geometry} - \RequirePackage{scrlayer-scrpage} - \let\hrulefillx\hrulefill - \RequirePackage[bitstream-charter]{mathdesign} - \let\hrulefill\hrulefillx - \RequirePackage[hang,flushmargin,bottom]{footmisc} - \RequirePackage{footnotehyper} - \makesavenoteenv{tcolorbox} - \RequirePackage[all]{nowidow} - \RequirePackage[colorlinks=true,breaklinks=true,allcolors=themecolor,hyperfootnotes=false]{hyperref} -} -\RequirePackage[T1]{fontenc} -\RequirePackage{xspace} -\RequirePackage{inconsolata}% mono font with bold, but italic is missing -% \RequirePackage[scale=0.85]{cascadia-code} -% \AddToHook{cmd/ttfamily/before}{\fontseries{sl}} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% Listings -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\RequirePackage[ - cachedir=./build/ -]{minted} - -% smuggling custom pygmentize style in cache folder -% (a real pygmentise style would need installtion in some python folder) -\begin{filecontents*}[noheader]{./build/sam.pygstyle} -\makeatletter -\def\PYG@reset{\let\PYG@it=\relax \let\PYG@bf=\relax% - \let\PYG@ul=\relax \let\PYG@tc=\relax% - \let\PYG@bc=\relax \let\PYG@ff=\relax} -\def\PYG@tok#1{\csname PYG@tok@#1\endcsname} -\def\PYG@toks#1+{\ifx\relax#1\empty\else% - \PYG@tok{#1}\expandafter\PYG@toks\fi} -\def\PYG@do#1{\PYG@bc{\PYG@tc{\PYG@ul{% - \PYG@it{\PYG@bf{\PYG@ff{#1}}}}}}} -\def\PYG#1#2{\PYG@reset\PYG@toks#1+\relax+\PYG@do{#2}} - -% optional arguments -\expandafter\def\csname PYG@tok@na\endcsname{\def\PYG@tc##1{\textcolor{black}{##1}}} - -% macros -\expandafter\def\csname PYG@tok@k\endcsname{\def\PYG@tc##1{\textcolor{listingcolor}{\bfseries ##1}}} -% curly brakets -\expandafter\def\csname PYG@tok@nb\endcsname{\def\PYG@tc##1{\textcolor{listingcolor}{\bfseries ##1}}} - -% comments (italics won't work with the inconsolata font) -\expandafter\def\csname PYG@tok@c\endcsname{\def\PYG@tc##1{\textcolor{gray}{##1}}} - -\def\PYGZbs{\char`\\} -\def\PYGZus{\char`\_} -\def\PYGZob{\char`\{} -\def\PYGZcb{\char`\}} -\def\PYGZca{\char`\^} -\def\PYGZam{\char`\&} -\def\PYGZlt{\char`\<} -\def\PYGZgt{\char`\>} -\def\PYGZsh{\char`\#} -\def\PYGZpc{\char`\%} -\def\PYGZdl{\char`\$} -\def\PYGZhy{\char`\-} -\def\PYGZsq{\char`\'} -\def\PYGZdq{\char`\"} -\def\PYGZti{\char`\~} -% for compatibility with earlier versions -\def\PYGZat{@} -\def\PYGZlb{[} -\def\PYGZrb{]} -\makeatother -\end{filecontents*} - -\usemintedstyle{sam} -\setminted{ - breaksymbolleft={}, - tabsize=2, - breaklines=true, -} -\newminted[samcode]{latex}{} -\newmintinline[saminline]{latex}{} - -% use non-bold and all coloured for inline code in articles -\ifdefined\insertaspectratio\else - \patchcmd{\minted@inputpyg@inline}{\minted@input}{\color{listingcolor}\renewcommand\textcolor[3][]{##3}\renewcommand\bfseries{}\minted@input}{}{} -\fi - -\RequirePackage[most]{tcolorbox} -\tcbuselibrary{minted} -\tcbset{% - colframe=themecolor, - fonttitle=\bfseries, - sidebyside, - center lower, - righthand width=5.7cm, - bottom=2pt, - top=2pt, - left=3pt, - right=3pt, - sidebyside gap=10pt, - lower separated=false, - listing engine=minted, - minted language=latex, - colback=themecolor!10, - sharp corners, - boxrule=0pt, - before title={\strut} -} - -% avoid page breaks right in front of the tcolorbox -\@ifclassloaded{beamer}{}{ - \tcbuselibrary{hooks} - \tcbset{before pre={\nopagebreak[4]}} -} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% document settings -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\@ifclassloaded{scrartcl}{% - \KOMAoptions{parskip=half} - \addtokomafont{sectioning}{\color{themecolor}} - \addtokomafont{date}{\normalsize} - \addtokomafont{author}{\normalsize} - \setlength{\footnotemargin}{0.7em} -}{} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% Custom macros -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\providecommand*{\CTAN}{\textsc{CTAN}\xspace} -\providecommand*{\TikZ}{Ti\emph{k}Z\xspace} -\providecommand*{\miktex}{MiK\TeX\xspace} -\providecommand*{\texlive}{\TeX{}Live\xspace} -\providecommand*{\tikzbrick}{Ti\emph{k}Zbrick\xspace} -\providecommand*{\tikzducks}{Ti\emph{k}Zducks\xspace} -\providecommand*{\tikzlings}{Ti\emph{k}Zlings\xspace} -\providecommand*{\tikzmarmots}{Ti\emph{k}Zmarmots\xspace} -\providecommand*{\ConTeXt}{C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt}
\ 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..514064d92a1 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-08} {0.8.7} {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,117 @@ \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_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 +752,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 +774,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 +784,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 +797,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 +835,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 +849,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/junicode/LGRJunicode-Inf.fd b/Master/texmf-dist/tex/latex/junicode/LGRJunicode-Inf.fd index 1741a4af34c..966bf21d46a 100644 --- a/Master/texmf-dist/tex/latex/junicode/LGRJunicode-Inf.fd +++ b/Master/texmf-dist/tex/latex/junicode/LGRJunicode-Inf.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{LGRJunicode-Inf.fd} - [2024/06/03 (autoinst) Font definitions for LGR/Junicode-Inf.] + [2024/07/21 (autoinst) Font definitions for LGR/Junicode-Inf.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,6 +20,33 @@ \DeclareFontFamily{LGR}{Junicode-Inf}{} +% ---- lsc = lightsemicondensed ---- + +\DeclareFontShape{LGR}{Junicode-Inf}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-inf-lgr +}{} + +\DeclareFontShape{LGR}{Junicode-Inf}{lightsemicondensed}{n}{ + <-> alias * Junicode-Inf/lsc/n +}{} + +\DeclareFontShape{LGR}{Junicode-Inf}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-inf-lgr +}{} + +\DeclareFontShape{LGR}{Junicode-Inf}{lightsemicondensed}{it}{ + <-> alias * Junicode-Inf/lsc/it +}{} + +\DeclareFontShape{LGR}{Junicode-Inf}{lsc}{sl}{ + <-> ssub * Junicode-Inf/lsc/it +}{} + +\DeclareFontShape{LGR}{Junicode-Inf}{lightsemicondensed}{sl}{ + <-> ssub * Junicode-Inf/lightsemicondensed/it +}{} + + % ---- mediumexpanded ---- \DeclareFontShape{LGR}{Junicode-Inf}{mediumexpanded}{it}{ @@ -35,50 +62,43 @@ }{} -% ---- sbsx = semiboldsemiexpanded ---- +% ---- b = bold ---- -\DeclareFontShape{LGR}{Junicode-Inf}{sbsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-inf-lgr +\DeclareFontShape{LGR}{Junicode-Inf}{b}{it}{ + <-> \Junicode@@scale Junicode-BoldItalic-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{semiboldsemiexpanded}{it}{ - <-> alias * Junicode-Inf/sbsx/it +\DeclareFontShape{LGR}{Junicode-Inf}{bold}{it}{ + <-> alias * Junicode-Inf/b/it }{} -\DeclareFontShape{LGR}{Junicode-Inf}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-inf-lgr +\DeclareFontShape{LGR}{Junicode-Inf}{b}{n}{ + <-> \Junicode@@scale Junicode-Bold-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-Inf/sbsx/n +\DeclareFontShape{LGR}{Junicode-Inf}{bold}{n}{ + <-> alias * Junicode-Inf/b/n }{} -\DeclareFontShape{LGR}{Junicode-Inf}{sbsx}{sl}{ - <-> ssub * Junicode-Inf/sbsx/it +\DeclareFontShape{LGR}{Junicode-Inf}{b}{sl}{ + <-> ssub * Junicode-Inf/b/it }{} -\DeclareFontShape{LGR}{Junicode-Inf}{semiboldsemiexpanded}{sl}{ - <-> ssub * Junicode-Inf/semiboldsemiexpanded/it +\DeclareFontShape{LGR}{Junicode-Inf}{bold}{sl}{ + <-> ssub * Junicode-Inf/bold/it }{} -% ---- mediumsemiexpanded ---- - -\DeclareFontShape{LGR}{Junicode-Inf}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-inf-lgr -}{} +% ---- x = expanded ---- -\DeclareFontShape{LGR}{Junicode-Inf}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-inf-lgr +\DeclareFontShape{LGR}{Junicode-Inf}{x}{it}{ + <-> \Junicode@@scale Junicode-ExpItalic-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-Inf/mediumsemiexpanded/it +\DeclareFontShape{LGR}{Junicode-Inf}{expanded}{it}{ + <-> alias * Junicode-Inf/x/it }{} - -% ---- x = expanded ---- - \DeclareFontShape{LGR}{Junicode-Inf}{x}{n}{ <-> \Junicode@@scale Junicode-Exp-inf-lgr }{} @@ -87,14 +107,6 @@ <-> alias * Junicode-Inf/x/n }{} -\DeclareFontShape{LGR}{Junicode-Inf}{x}{it}{ - <-> \Junicode@@scale Junicode-ExpItalic-inf-lgr -}{} - -\DeclareFontShape{LGR}{Junicode-Inf}{expanded}{it}{ - <-> alias * Junicode-Inf/x/it -}{} - \DeclareFontShape{LGR}{Junicode-Inf}{x}{sl}{ <-> ssub * Junicode-Inf/x/it }{} @@ -104,6 +116,33 @@ }{} +% ---- sbx = semiboldexpanded ---- + +\DeclareFontShape{LGR}{Junicode-Inf}{sbx}{it}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-inf-lgr +}{} + +\DeclareFontShape{LGR}{Junicode-Inf}{semiboldexpanded}{it}{ + <-> alias * Junicode-Inf/sbx/it +}{} + +\DeclareFontShape{LGR}{Junicode-Inf}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-inf-lgr +}{} + +\DeclareFontShape{LGR}{Junicode-Inf}{semiboldexpanded}{n}{ + <-> alias * Junicode-Inf/sbx/n +}{} + +\DeclareFontShape{LGR}{Junicode-Inf}{sbx}{sl}{ + <-> ssub * Junicode-Inf/sbx/it +}{} + +\DeclareFontShape{LGR}{Junicode-Inf}{semiboldexpanded}{sl}{ + <-> ssub * Junicode-Inf/semiboldexpanded/it +}{} + + % ---- c = condensed ---- \DeclareFontShape{LGR}{Junicode-Inf}{c}{it}{ @@ -131,345 +170,306 @@ }{} -% ---- sx = semiexpanded ---- - -\DeclareFontShape{LGR}{Junicode-Inf}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-inf-lgr -}{} +% ---- sc = semicondensed ---- -\DeclareFontShape{LGR}{Junicode-Inf}{semiexpanded}{it}{ - <-> alias * Junicode-Inf/sx/it +\DeclareFontShape{LGR}{Junicode-Inf}{sc}{n}{ + <-> \Junicode@@scale Junicode-SmCond-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-inf-lgr +\DeclareFontShape{LGR}{Junicode-Inf}{semicondensed}{n}{ + <-> alias * Junicode-Inf/sc/n }{} -\DeclareFontShape{LGR}{Junicode-Inf}{semiexpanded}{n}{ - <-> alias * Junicode-Inf/sx/n +\DeclareFontShape{LGR}{Junicode-Inf}{sc}{it}{ + <-> \Junicode@@scale Junicode-SmCondItalic-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{sx}{sl}{ - <-> ssub * Junicode-Inf/sx/it +\DeclareFontShape{LGR}{Junicode-Inf}{semicondensed}{it}{ + <-> alias * Junicode-Inf/sc/it }{} -\DeclareFontShape{LGR}{Junicode-Inf}{semiexpanded}{sl}{ - <-> ssub * Junicode-Inf/semiexpanded/it +\DeclareFontShape{LGR}{Junicode-Inf}{sc}{sl}{ + <-> ssub * Junicode-Inf/sc/it }{} - -% ---- m = regular ---- - -\DeclareFontShape{LGR}{Junicode-Inf}{m}{it}{ - <-> \Junicode@@scale Junicode-Italic-inf-lgr +\DeclareFontShape{LGR}{Junicode-Inf}{semicondensed}{sl}{ + <-> ssub * Junicode-Inf/semicondensed/it }{} -\DeclareFontShape{LGR}{Junicode-Inf}{regular}{it}{ - <-> alias * Junicode-Inf/m/it -}{} -\DeclareFontShape{LGR}{Junicode-Inf}{m}{n}{ - <-> \Junicode@@scale Junicode-Regular-inf-lgr -}{} +% ---- bsx = boldsemiexpanded ---- -\DeclareFontShape{LGR}{Junicode-Inf}{regular}{n}{ - <-> alias * Junicode-Inf/m/n +\DeclareFontShape{LGR}{Junicode-Inf}{bsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpBold-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{m}{sl}{ - <-> ssub * Junicode-Inf/m/it +\DeclareFontShape{LGR}{Junicode-Inf}{boldsemiexpanded}{n}{ + <-> alias * Junicode-Inf/bsx/n }{} -\DeclareFontShape{LGR}{Junicode-Inf}{regular}{sl}{ - <-> ssub * Junicode-Inf/regular/it +\DeclareFontShape{LGR}{Junicode-Inf}{bsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-inf-lgr }{} - -% ---- medium ---- - -\DeclareFontShape{LGR}{Junicode-Inf}{medium}{n}{ - <-> \Junicode@@scale Junicode-Medium-inf-lgr +\DeclareFontShape{LGR}{Junicode-Inf}{boldsemiexpanded}{it}{ + <-> alias * Junicode-Inf/bsx/it }{} -\DeclareFontShape{LGR}{Junicode-Inf}{medium}{it}{ - <-> \Junicode@@scale Junicode-MediumItalic-inf-lgr +\DeclareFontShape{LGR}{Junicode-Inf}{bsx}{sl}{ + <-> ssub * Junicode-Inf/bsx/it }{} -\DeclareFontShape{LGR}{Junicode-Inf}{medium}{sl}{ - <-> ssub * Junicode-Inf/medium/it +\DeclareFontShape{LGR}{Junicode-Inf}{boldsemiexpanded}{sl}{ + <-> ssub * Junicode-Inf/boldsemiexpanded/it }{} -% ---- lsc = lightsemicondensed ---- - -\DeclareFontShape{LGR}{Junicode-Inf}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-inf-lgr -}{} +% ---- sbsx = semiboldsemiexpanded ---- -\DeclareFontShape{LGR}{Junicode-Inf}{lightsemicondensed}{it}{ - <-> alias * Junicode-Inf/lsc/it +\DeclareFontShape{LGR}{Junicode-Inf}{sbsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-inf-lgr +\DeclareFontShape{LGR}{Junicode-Inf}{semiboldsemiexpanded}{it}{ + <-> alias * Junicode-Inf/sbsx/it }{} -\DeclareFontShape{LGR}{Junicode-Inf}{lightsemicondensed}{n}{ - <-> alias * Junicode-Inf/lsc/n +\DeclareFontShape{LGR}{Junicode-Inf}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{lsc}{sl}{ - <-> ssub * Junicode-Inf/lsc/it +\DeclareFontShape{LGR}{Junicode-Inf}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-Inf/sbsx/n }{} -\DeclareFontShape{LGR}{Junicode-Inf}{lightsemicondensed}{sl}{ - <-> ssub * Junicode-Inf/lightsemicondensed/it +\DeclareFontShape{LGR}{Junicode-Inf}{sbsx}{sl}{ + <-> ssub * Junicode-Inf/sbsx/it }{} - -% ---- l = light ---- - -\DeclareFontShape{LGR}{Junicode-Inf}{l}{n}{ - <-> \Junicode@@scale Junicode-Light-inf-lgr +\DeclareFontShape{LGR}{Junicode-Inf}{semiboldsemiexpanded}{sl}{ + <-> ssub * Junicode-Inf/semiboldsemiexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-Inf}{light}{n}{ - <-> alias * Junicode-Inf/l/n -}{} -\DeclareFontShape{LGR}{Junicode-Inf}{l}{it}{ - <-> \Junicode@@scale Junicode-LightItalic-inf-lgr -}{} +% ---- mediumcondensed ---- -\DeclareFontShape{LGR}{Junicode-Inf}{light}{it}{ - <-> alias * Junicode-Inf/l/it +\DeclareFontShape{LGR}{Junicode-Inf}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{l}{sl}{ - <-> ssub * Junicode-Inf/l/it +\DeclareFontShape{LGR}{Junicode-Inf}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{light}{sl}{ - <-> ssub * Junicode-Inf/light/it +\DeclareFontShape{LGR}{Junicode-Inf}{mediumcondensed}{sl}{ + <-> ssub * Junicode-Inf/mediumcondensed/it }{} -% ---- bx = boldexpanded ---- +% ---- sb = semibold ---- -\DeclareFontShape{LGR}{Junicode-Inf}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-inf-lgr +\DeclareFontShape{LGR}{Junicode-Inf}{sb}{n}{ + <-> \Junicode@@scale Junicode-SmBold-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{boldexpanded}{it}{ - <-> alias * Junicode-Inf/bx/it +\DeclareFontShape{LGR}{Junicode-Inf}{semibold}{n}{ + <-> alias * Junicode-Inf/sb/n }{} -\DeclareFontShape{LGR}{Junicode-Inf}{bx}{n}{ - <-> \Junicode@@scale Junicode-ExpBold-inf-lgr +\DeclareFontShape{LGR}{Junicode-Inf}{sb}{it}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{boldexpanded}{n}{ - <-> alias * Junicode-Inf/bx/n +\DeclareFontShape{LGR}{Junicode-Inf}{semibold}{it}{ + <-> alias * Junicode-Inf/sb/it }{} -\DeclareFontShape{LGR}{Junicode-Inf}{bx}{sl}{ - <-> ssub * Junicode-Inf/bx/it +\DeclareFontShape{LGR}{Junicode-Inf}{sb}{sl}{ + <-> ssub * Junicode-Inf/sb/it }{} -\DeclareFontShape{LGR}{Junicode-Inf}{boldexpanded}{sl}{ - <-> ssub * Junicode-Inf/boldexpanded/it +\DeclareFontShape{LGR}{Junicode-Inf}{semibold}{sl}{ + <-> ssub * Junicode-Inf/semibold/it }{} -% ---- mediumcondensed ---- +% ---- mediumsemicondensed ---- -\DeclareFontShape{LGR}{Junicode-Inf}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-inf-lgr +\DeclareFontShape{LGR}{Junicode-Inf}{mediumsemicondensed}{n}{ + <-> \Junicode@@scale Junicode-SmCondMedium-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-inf-lgr +\DeclareFontShape{LGR}{Junicode-Inf}{mediumsemicondensed}{it}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{mediumcondensed}{sl}{ - <-> ssub * Junicode-Inf/mediumcondensed/it +\DeclareFontShape{LGR}{Junicode-Inf}{mediumsemicondensed}{sl}{ + <-> ssub * Junicode-Inf/mediumsemicondensed/it }{} -% ---- b = bold ---- +% ---- l = light ---- -\DeclareFontShape{LGR}{Junicode-Inf}{b}{it}{ - <-> \Junicode@@scale Junicode-BoldItalic-inf-lgr +\DeclareFontShape{LGR}{Junicode-Inf}{l}{n}{ + <-> \Junicode@@scale Junicode-Light-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{bold}{it}{ - <-> alias * Junicode-Inf/b/it +\DeclareFontShape{LGR}{Junicode-Inf}{light}{n}{ + <-> alias * Junicode-Inf/l/n }{} -\DeclareFontShape{LGR}{Junicode-Inf}{b}{n}{ - <-> \Junicode@@scale Junicode-Bold-inf-lgr +\DeclareFontShape{LGR}{Junicode-Inf}{l}{it}{ + <-> \Junicode@@scale Junicode-LightItalic-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{bold}{n}{ - <-> alias * Junicode-Inf/b/n +\DeclareFontShape{LGR}{Junicode-Inf}{light}{it}{ + <-> alias * Junicode-Inf/l/it }{} -\DeclareFontShape{LGR}{Junicode-Inf}{b}{sl}{ - <-> ssub * Junicode-Inf/b/it +\DeclareFontShape{LGR}{Junicode-Inf}{l}{sl}{ + <-> ssub * Junicode-Inf/l/it }{} -\DeclareFontShape{LGR}{Junicode-Inf}{bold}{sl}{ - <-> ssub * Junicode-Inf/bold/it +\DeclareFontShape{LGR}{Junicode-Inf}{light}{sl}{ + <-> ssub * Junicode-Inf/light/it }{} -% ---- bsx = boldsemiexpanded ---- - -\DeclareFontShape{LGR}{Junicode-Inf}{bsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpBold-inf-lgr -}{} +% ---- sx = semiexpanded ---- -\DeclareFontShape{LGR}{Junicode-Inf}{boldsemiexpanded}{n}{ - <-> alias * Junicode-Inf/bsx/n +\DeclareFontShape{LGR}{Junicode-Inf}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{bsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-inf-lgr +\DeclareFontShape{LGR}{Junicode-Inf}{semiexpanded}{n}{ + <-> alias * Junicode-Inf/sx/n }{} -\DeclareFontShape{LGR}{Junicode-Inf}{boldsemiexpanded}{it}{ - <-> alias * Junicode-Inf/bsx/it +\DeclareFontShape{LGR}{Junicode-Inf}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{bsx}{sl}{ - <-> ssub * Junicode-Inf/bsx/it +\DeclareFontShape{LGR}{Junicode-Inf}{semiexpanded}{it}{ + <-> alias * Junicode-Inf/sx/it }{} -\DeclareFontShape{LGR}{Junicode-Inf}{boldsemiexpanded}{sl}{ - <-> ssub * Junicode-Inf/boldsemiexpanded/it +\DeclareFontShape{LGR}{Junicode-Inf}{sx}{sl}{ + <-> ssub * Junicode-Inf/sx/it }{} - -% ---- lc = lightcondensed ---- - -\DeclareFontShape{LGR}{Junicode-Inf}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-inf-lgr +\DeclareFontShape{LGR}{Junicode-Inf}{semiexpanded}{sl}{ + <-> ssub * Junicode-Inf/semiexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-Inf}{lightcondensed}{n}{ - <-> alias * Junicode-Inf/lc/n -}{} -\DeclareFontShape{LGR}{Junicode-Inf}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-inf-lgr -}{} +% ---- medium ---- -\DeclareFontShape{LGR}{Junicode-Inf}{lightcondensed}{it}{ - <-> alias * Junicode-Inf/lc/it +\DeclareFontShape{LGR}{Junicode-Inf}{medium}{n}{ + <-> \Junicode@@scale Junicode-Medium-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{lc}{sl}{ - <-> ssub * Junicode-Inf/lc/it +\DeclareFontShape{LGR}{Junicode-Inf}{medium}{it}{ + <-> \Junicode@@scale Junicode-MediumItalic-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{lightcondensed}{sl}{ - <-> ssub * Junicode-Inf/lightcondensed/it +\DeclareFontShape{LGR}{Junicode-Inf}{medium}{sl}{ + <-> ssub * Junicode-Inf/medium/it }{} -% ---- sb = semibold ---- +% ---- bx = boldexpanded ---- -\DeclareFontShape{LGR}{Junicode-Inf}{sb}{it}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-inf-lgr +\DeclareFontShape{LGR}{Junicode-Inf}{bx}{n}{ + <-> \Junicode@@scale Junicode-ExpBold-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{semibold}{it}{ - <-> alias * Junicode-Inf/sb/it +\DeclareFontShape{LGR}{Junicode-Inf}{boldexpanded}{n}{ + <-> alias * Junicode-Inf/bx/n }{} -\DeclareFontShape{LGR}{Junicode-Inf}{sb}{n}{ - <-> \Junicode@@scale Junicode-SmBold-inf-lgr +\DeclareFontShape{LGR}{Junicode-Inf}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{semibold}{n}{ - <-> alias * Junicode-Inf/sb/n +\DeclareFontShape{LGR}{Junicode-Inf}{boldexpanded}{it}{ + <-> alias * Junicode-Inf/bx/it }{} -\DeclareFontShape{LGR}{Junicode-Inf}{sb}{sl}{ - <-> ssub * Junicode-Inf/sb/it +\DeclareFontShape{LGR}{Junicode-Inf}{bx}{sl}{ + <-> ssub * Junicode-Inf/bx/it }{} -\DeclareFontShape{LGR}{Junicode-Inf}{semibold}{sl}{ - <-> ssub * Junicode-Inf/semibold/it +\DeclareFontShape{LGR}{Junicode-Inf}{boldexpanded}{sl}{ + <-> ssub * Junicode-Inf/boldexpanded/it }{} -% ---- sc = semicondensed ---- +% ---- mediumsemiexpanded ---- -\DeclareFontShape{LGR}{Junicode-Inf}{sc}{n}{ - <-> \Junicode@@scale Junicode-SmCond-inf-lgr +\DeclareFontShape{LGR}{Junicode-Inf}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{semicondensed}{n}{ - <-> alias * Junicode-Inf/sc/n +\DeclareFontShape{LGR}{Junicode-Inf}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{sc}{it}{ - <-> \Junicode@@scale Junicode-SmCondItalic-inf-lgr +\DeclareFontShape{LGR}{Junicode-Inf}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-Inf/mediumsemiexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-Inf}{semicondensed}{it}{ - <-> alias * Junicode-Inf/sc/it -}{} -\DeclareFontShape{LGR}{Junicode-Inf}{sc}{sl}{ - <-> ssub * Junicode-Inf/sc/it -}{} +% ---- m = regular ---- -\DeclareFontShape{LGR}{Junicode-Inf}{semicondensed}{sl}{ - <-> ssub * Junicode-Inf/semicondensed/it +\DeclareFontShape{LGR}{Junicode-Inf}{m}{n}{ + <-> \Junicode@@scale Junicode-Regular-inf-lgr }{} +\DeclareFontShape{LGR}{Junicode-Inf}{regular}{n}{ + <-> alias * Junicode-Inf/m/n +}{} -% ---- mediumsemicondensed ---- +\DeclareFontShape{LGR}{Junicode-Inf}{m}{it}{ + <-> \Junicode@@scale Junicode-Italic-inf-lgr +}{} -\DeclareFontShape{LGR}{Junicode-Inf}{mediumsemicondensed}{it}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-inf-lgr +\DeclareFontShape{LGR}{Junicode-Inf}{regular}{it}{ + <-> alias * Junicode-Inf/m/it }{} -\DeclareFontShape{LGR}{Junicode-Inf}{mediumsemicondensed}{n}{ - <-> \Junicode@@scale Junicode-SmCondMedium-inf-lgr +\DeclareFontShape{LGR}{Junicode-Inf}{m}{sl}{ + <-> ssub * Junicode-Inf/m/it }{} -\DeclareFontShape{LGR}{Junicode-Inf}{mediumsemicondensed}{sl}{ - <-> ssub * Junicode-Inf/mediumsemicondensed/it +\DeclareFontShape{LGR}{Junicode-Inf}{regular}{sl}{ + <-> ssub * Junicode-Inf/regular/it }{} -% ---- sbx = semiboldexpanded ---- +% ---- lc = lightcondensed ---- -\DeclareFontShape{LGR}{Junicode-Inf}{sbx}{it}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-inf-lgr +\DeclareFontShape{LGR}{Junicode-Inf}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{semiboldexpanded}{it}{ - <-> alias * Junicode-Inf/sbx/it +\DeclareFontShape{LGR}{Junicode-Inf}{lightcondensed}{n}{ + <-> alias * Junicode-Inf/lc/n }{} -\DeclareFontShape{LGR}{Junicode-Inf}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-inf-lgr +\DeclareFontShape{LGR}{Junicode-Inf}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-inf-lgr }{} -\DeclareFontShape{LGR}{Junicode-Inf}{semiboldexpanded}{n}{ - <-> alias * Junicode-Inf/sbx/n +\DeclareFontShape{LGR}{Junicode-Inf}{lightcondensed}{it}{ + <-> alias * Junicode-Inf/lc/it }{} -\DeclareFontShape{LGR}{Junicode-Inf}{sbx}{sl}{ - <-> ssub * Junicode-Inf/sbx/it +\DeclareFontShape{LGR}{Junicode-Inf}{lc}{sl}{ + <-> ssub * Junicode-Inf/lc/it }{} -\DeclareFontShape{LGR}{Junicode-Inf}{semiboldexpanded}{sl}{ - <-> ssub * Junicode-Inf/semiboldexpanded/it +\DeclareFontShape{LGR}{Junicode-Inf}{lightcondensed}{sl}{ + <-> ssub * Junicode-Inf/lightcondensed/it }{} diff --git a/Master/texmf-dist/tex/latex/junicode/LGRJunicode-LF.fd b/Master/texmf-dist/tex/latex/junicode/LGRJunicode-LF.fd index 5e4958c6c0f..da1c18dc7b9 100644 --- a/Master/texmf-dist/tex/latex/junicode/LGRJunicode-LF.fd +++ b/Master/texmf-dist/tex/latex/junicode/LGRJunicode-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{LGRJunicode-LF.fd} - [2024/06/03 (autoinst) Font definitions for LGR/Junicode-LF.] + [2024/07/21 (autoinst) Font definitions for LGR/Junicode-LF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,161 +20,212 @@ \DeclareFontFamily{LGR}{Junicode-LF}{} -% ---- bx = boldexpanded ---- +% ---- c = condensed ---- -\DeclareFontShape{LGR}{Junicode-LF}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-lgr +\DeclareFontShape{LGR}{Junicode-LF}{c}{sc}{ + <-> \Junicode@@scale Junicode-Cond-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{boldexpanded}{it}{ - <-> alias * Junicode-LF/bx/it +\DeclareFontShape{LGR}{Junicode-LF}{condensed}{sc}{ + <-> alias * Junicode-LF/c/sc }{} -\DeclareFontShape{LGR}{Junicode-LF}{bx}{scit}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{c}{scit}{ + <-> \Junicode@@scale Junicode-CondItalic-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{boldexpanded}{scit}{ - <-> alias * Junicode-LF/bx/scit +\DeclareFontShape{LGR}{Junicode-LF}{condensed}{scit}{ + <-> alias * Junicode-LF/c/scit }{} -\DeclareFontShape{LGR}{Junicode-LF}{bx}{n}{ - <-> \Junicode@@scale Junicode-ExpBold-lf-lgr +\DeclareFontShape{LGR}{Junicode-LF}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{boldexpanded}{n}{ - <-> alias * Junicode-LF/bx/n +\DeclareFontShape{LGR}{Junicode-LF}{condensed}{n}{ + <-> alias * Junicode-LF/c/n }{} -\DeclareFontShape{LGR}{Junicode-LF}{bx}{sc}{ - <-> \Junicode@@scale Junicode-ExpBold-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{boldexpanded}{sc}{ - <-> alias * Junicode-LF/bx/sc +\DeclareFontShape{LGR}{Junicode-LF}{condensed}{it}{ + <-> alias * Junicode-LF/c/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{bx}{scsl}{ - <-> ssub * Junicode-LF/bx/scit +\DeclareFontShape{LGR}{Junicode-LF}{c}{sl}{ + <-> ssub * Junicode-LF/c/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{boldexpanded}{scsl}{ - <-> ssub * Junicode-LF/boldexpanded/scit +\DeclareFontShape{LGR}{Junicode-LF}{condensed}{sl}{ + <-> ssub * Junicode-LF/condensed/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{bx}{sl}{ - <-> ssub * Junicode-LF/bx/it +\DeclareFontShape{LGR}{Junicode-LF}{c}{scsl}{ + <-> ssub * Junicode-LF/c/scit }{} -\DeclareFontShape{LGR}{Junicode-LF}{boldexpanded}{sl}{ - <-> ssub * Junicode-LF/boldexpanded/it +\DeclareFontShape{LGR}{Junicode-LF}{condensed}{scsl}{ + <-> ssub * Junicode-LF/condensed/scit }{} -% ---- l = light ---- +% ---- sbx = semiboldexpanded ---- -\DeclareFontShape{LGR}{Junicode-LF}{l}{n}{ - <-> \Junicode@@scale Junicode-Light-lf-lgr +\DeclareFontShape{LGR}{Junicode-LF}{sbx}{sc}{ + <-> \Junicode@@scale Junicode-ExpSmBold-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{light}{n}{ - <-> alias * Junicode-LF/l/n +\DeclareFontShape{LGR}{Junicode-LF}{semiboldexpanded}{sc}{ + <-> alias * Junicode-LF/sbx/sc }{} -\DeclareFontShape{LGR}{Junicode-LF}{l}{sc}{ - <-> \Junicode@@scale Junicode-Light-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{sbx}{it}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{light}{sc}{ - <-> alias * Junicode-LF/l/sc +\DeclareFontShape{LGR}{Junicode-LF}{semiboldexpanded}{it}{ + <-> alias * Junicode-LF/sbx/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{l}{it}{ - <-> \Junicode@@scale Junicode-LightItalic-lf-lgr +\DeclareFontShape{LGR}{Junicode-LF}{sbx}{scit}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{light}{it}{ - <-> alias * Junicode-LF/l/it +\DeclareFontShape{LGR}{Junicode-LF}{semiboldexpanded}{scit}{ + <-> alias * Junicode-LF/sbx/scit }{} -\DeclareFontShape{LGR}{Junicode-LF}{l}{scit}{ - <-> \Junicode@@scale Junicode-LightItalic-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{light}{scit}{ - <-> alias * Junicode-LF/l/scit +\DeclareFontShape{LGR}{Junicode-LF}{semiboldexpanded}{n}{ + <-> alias * Junicode-LF/sbx/n }{} -\DeclareFontShape{LGR}{Junicode-LF}{l}{scsl}{ - <-> ssub * Junicode-LF/l/scit +\DeclareFontShape{LGR}{Junicode-LF}{sbx}{sl}{ + <-> ssub * Junicode-LF/sbx/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{light}{scsl}{ - <-> ssub * Junicode-LF/light/scit +\DeclareFontShape{LGR}{Junicode-LF}{semiboldexpanded}{sl}{ + <-> ssub * Junicode-LF/semiboldexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{l}{sl}{ - <-> ssub * Junicode-LF/l/it +\DeclareFontShape{LGR}{Junicode-LF}{sbx}{scsl}{ + <-> ssub * Junicode-LF/sbx/scit }{} -\DeclareFontShape{LGR}{Junicode-LF}{light}{sl}{ - <-> ssub * Junicode-LF/light/it +\DeclareFontShape{LGR}{Junicode-LF}{semiboldexpanded}{scsl}{ + <-> ssub * Junicode-LF/semiboldexpanded/scit }{} -% ---- medium ---- +% ---- x = expanded ---- -\DeclareFontShape{LGR}{Junicode-LF}{medium}{it}{ - <-> \Junicode@@scale Junicode-MediumItalic-lf-lgr +\DeclareFontShape{LGR}{Junicode-LF}{x}{sc}{ + <-> \Junicode@@scale Junicode-Exp-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{medium}{scit}{ - <-> \Junicode@@scale Junicode-MediumItalic-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{expanded}{sc}{ + <-> alias * Junicode-LF/x/sc }{} -\DeclareFontShape{LGR}{Junicode-LF}{medium}{n}{ - <-> \Junicode@@scale Junicode-Medium-lf-lgr +\DeclareFontShape{LGR}{Junicode-LF}{x}{scit}{ + <-> \Junicode@@scale Junicode-ExpItalic-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{medium}{sc}{ - <-> \Junicode@@scale Junicode-Medium-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{expanded}{scit}{ + <-> alias * Junicode-LF/x/scit }{} -\DeclareFontShape{LGR}{Junicode-LF}{medium}{scsl}{ - <-> ssub * Junicode-LF/medium/scit +\DeclareFontShape{LGR}{Junicode-LF}{x}{n}{ + <-> \Junicode@@scale Junicode-Exp-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{medium}{sl}{ - <-> ssub * Junicode-LF/medium/it +\DeclareFontShape{LGR}{Junicode-LF}{expanded}{n}{ + <-> alias * Junicode-LF/x/n }{} +\DeclareFontShape{LGR}{Junicode-LF}{x}{it}{ + <-> \Junicode@@scale Junicode-ExpItalic-lf-lgr +}{} -% ---- lsc = lightsemicondensed ---- +\DeclareFontShape{LGR}{Junicode-LF}{expanded}{it}{ + <-> alias * Junicode-LF/x/it +}{} -\DeclareFontShape{LGR}{Junicode-LF}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-lf-lgr +\DeclareFontShape{LGR}{Junicode-LF}{x}{sl}{ + <-> ssub * Junicode-LF/x/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{lightsemicondensed}{n}{ - <-> alias * Junicode-LF/lsc/n +\DeclareFontShape{LGR}{Junicode-LF}{expanded}{sl}{ + <-> ssub * Junicode-LF/expanded/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{lsc}{sc}{ - <-> \Junicode@@scale Junicode-SmCondLight-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{x}{scsl}{ + <-> ssub * Junicode-LF/x/scit }{} -\DeclareFontShape{LGR}{Junicode-LF}{lightsemicondensed}{sc}{ - <-> alias * Junicode-LF/lsc/sc +\DeclareFontShape{LGR}{Junicode-LF}{expanded}{scsl}{ + <-> ssub * Junicode-LF/expanded/scit }{} -\DeclareFontShape{LGR}{Junicode-LF}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-lgr + +% ---- b = bold ---- + +\DeclareFontShape{LGR}{Junicode-LF}{b}{sc}{ + <-> \Junicode@@scale Junicode-Bold-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{lightsemicondensed}{it}{ - <-> alias * Junicode-LF/lsc/it +\DeclareFontShape{LGR}{Junicode-LF}{bold}{sc}{ + <-> alias * Junicode-LF/b/sc +}{} + +\DeclareFontShape{LGR}{Junicode-LF}{b}{it}{ + <-> \Junicode@@scale Junicode-BoldItalic-lf-lgr +}{} + +\DeclareFontShape{LGR}{Junicode-LF}{bold}{it}{ + <-> alias * Junicode-LF/b/it +}{} + +\DeclareFontShape{LGR}{Junicode-LF}{b}{scit}{ + <-> \Junicode@@scale Junicode-BoldItalic-lf-sc-lgr +}{} + +\DeclareFontShape{LGR}{Junicode-LF}{bold}{scit}{ + <-> alias * Junicode-LF/b/scit +}{} + +\DeclareFontShape{LGR}{Junicode-LF}{b}{n}{ + <-> \Junicode@@scale Junicode-Bold-lf-lgr +}{} + +\DeclareFontShape{LGR}{Junicode-LF}{bold}{n}{ + <-> alias * Junicode-LF/b/n }{} +\DeclareFontShape{LGR}{Junicode-LF}{b}{sl}{ + <-> ssub * Junicode-LF/b/it +}{} + +\DeclareFontShape{LGR}{Junicode-LF}{bold}{sl}{ + <-> ssub * Junicode-LF/bold/it +}{} + +\DeclareFontShape{LGR}{Junicode-LF}{b}{scsl}{ + <-> ssub * Junicode-LF/b/scit +}{} + +\DeclareFontShape{LGR}{Junicode-LF}{bold}{scsl}{ + <-> ssub * Junicode-LF/bold/scit +}{} + + +% ---- lsc = lightsemicondensed ---- + \DeclareFontShape{LGR}{Junicode-LF}{lsc}{scit}{ <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-sc-lgr }{} @@ -183,12 +234,28 @@ <-> alias * Junicode-LF/lsc/scit }{} -\DeclareFontShape{LGR}{Junicode-LF}{lsc}{scsl}{ - <-> ssub * Junicode-LF/lsc/scit +\DeclareFontShape{LGR}{Junicode-LF}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{lightsemicondensed}{scsl}{ - <-> ssub * Junicode-LF/lightsemicondensed/scit +\DeclareFontShape{LGR}{Junicode-LF}{lightsemicondensed}{n}{ + <-> alias * Junicode-LF/lsc/n +}{} + +\DeclareFontShape{LGR}{Junicode-LF}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-lgr +}{} + +\DeclareFontShape{LGR}{Junicode-LF}{lightsemicondensed}{it}{ + <-> alias * Junicode-LF/lsc/it +}{} + +\DeclareFontShape{LGR}{Junicode-LF}{lsc}{sc}{ + <-> \Junicode@@scale Junicode-SmCondLight-lf-sc-lgr +}{} + +\DeclareFontShape{LGR}{Junicode-LF}{lightsemicondensed}{sc}{ + <-> alias * Junicode-LF/lsc/sc }{} \DeclareFontShape{LGR}{Junicode-LF}{lsc}{sl}{ @@ -199,25 +266,44 @@ <-> ssub * Junicode-LF/lightsemicondensed/it }{} +\DeclareFontShape{LGR}{Junicode-LF}{lsc}{scsl}{ + <-> ssub * Junicode-LF/lsc/scit +}{} -% ---- m = regular ---- +\DeclareFontShape{LGR}{Junicode-LF}{lightsemicondensed}{scsl}{ + <-> ssub * Junicode-LF/lightsemicondensed/scit +}{} -\DeclareFontShape{LGR}{Junicode-LF}{m}{scit}{ - <-> \Junicode@@scale Junicode-Italic-lf-sc-lgr + +% ---- mediumexpanded ---- + +\DeclareFontShape{LGR}{Junicode-LF}{mediumexpanded}{sc}{ + <-> \Junicode@@scale Junicode-ExpMedium-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{regular}{scit}{ - <-> alias * Junicode-LF/m/scit +\DeclareFontShape{LGR}{Junicode-LF}{mediumexpanded}{n}{ + <-> \Junicode@@scale Junicode-ExpMedium-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{m}{it}{ - <-> \Junicode@@scale Junicode-Italic-lf-lgr +\DeclareFontShape{LGR}{Junicode-LF}{mediumexpanded}{scit}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{regular}{it}{ - <-> alias * Junicode-LF/m/it +\DeclareFontShape{LGR}{Junicode-LF}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-lgr +}{} + +\DeclareFontShape{LGR}{Junicode-LF}{mediumexpanded}{sl}{ + <-> ssub * Junicode-LF/mediumexpanded/it }{} +\DeclareFontShape{LGR}{Junicode-LF}{mediumexpanded}{scsl}{ + <-> ssub * Junicode-LF/mediumexpanded/scit +}{} + + +% ---- m = regular ---- + \DeclareFontShape{LGR}{Junicode-LF}{m}{sc}{ <-> \Junicode@@scale Junicode-Regular-lf-sc-lgr }{} @@ -234,361 +320,334 @@ <-> alias * Junicode-LF/m/n }{} -\DeclareFontShape{LGR}{Junicode-LF}{m}{scsl}{ - <-> ssub * Junicode-LF/m/scit +\DeclareFontShape{LGR}{Junicode-LF}{m}{scit}{ + <-> \Junicode@@scale Junicode-Italic-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{regular}{scsl}{ - <-> ssub * Junicode-LF/regular/scit +\DeclareFontShape{LGR}{Junicode-LF}{regular}{scit}{ + <-> alias * Junicode-LF/m/scit }{} -\DeclareFontShape{LGR}{Junicode-LF}{m}{sl}{ - <-> ssub * Junicode-LF/m/it +\DeclareFontShape{LGR}{Junicode-LF}{m}{it}{ + <-> \Junicode@@scale Junicode-Italic-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{regular}{sl}{ - <-> ssub * Junicode-LF/regular/it +\DeclareFontShape{LGR}{Junicode-LF}{regular}{it}{ + <-> alias * Junicode-LF/m/it }{} - -% ---- x = expanded ---- - -\DeclareFontShape{LGR}{Junicode-LF}{x}{n}{ - <-> \Junicode@@scale Junicode-Exp-lf-lgr +\DeclareFontShape{LGR}{Junicode-LF}{m}{sl}{ + <-> ssub * Junicode-LF/m/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{expanded}{n}{ - <-> alias * Junicode-LF/x/n +\DeclareFontShape{LGR}{Junicode-LF}{regular}{sl}{ + <-> ssub * Junicode-LF/regular/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{x}{sc}{ - <-> \Junicode@@scale Junicode-Exp-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{m}{scsl}{ + <-> ssub * Junicode-LF/m/scit }{} -\DeclareFontShape{LGR}{Junicode-LF}{expanded}{sc}{ - <-> alias * Junicode-LF/x/sc +\DeclareFontShape{LGR}{Junicode-LF}{regular}{scsl}{ + <-> ssub * Junicode-LF/regular/scit }{} -\DeclareFontShape{LGR}{Junicode-LF}{x}{it}{ - <-> \Junicode@@scale Junicode-ExpItalic-lf-lgr -}{} -\DeclareFontShape{LGR}{Junicode-LF}{expanded}{it}{ - <-> alias * Junicode-LF/x/it -}{} +% ---- mediumsemiexpanded ---- -\DeclareFontShape{LGR}{Junicode-LF}{x}{scit}{ - <-> \Junicode@@scale Junicode-ExpItalic-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{mediumsemiexpanded}{sc}{ + <-> \Junicode@@scale Junicode-SmExpMedium-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{expanded}{scit}{ - <-> alias * Junicode-LF/x/scit +\DeclareFontShape{LGR}{Junicode-LF}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{x}{scsl}{ - <-> ssub * Junicode-LF/x/scit +\DeclareFontShape{LGR}{Junicode-LF}{mediumsemiexpanded}{scit}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{expanded}{scsl}{ - <-> ssub * Junicode-LF/expanded/scit +\DeclareFontShape{LGR}{Junicode-LF}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{x}{sl}{ - <-> ssub * Junicode-LF/x/it +\DeclareFontShape{LGR}{Junicode-LF}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-LF/mediumsemiexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{expanded}{sl}{ - <-> ssub * Junicode-LF/expanded/it +\DeclareFontShape{LGR}{Junicode-LF}{mediumsemiexpanded}{scsl}{ + <-> ssub * Junicode-LF/mediumsemiexpanded/scit }{} -% ---- c = condensed ---- +% ---- bx = boldexpanded ---- -\DeclareFontShape{LGR}{Junicode-LF}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-lf-lgr +\DeclareFontShape{LGR}{Junicode-LF}{bx}{sc}{ + <-> \Junicode@@scale Junicode-ExpBold-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{condensed}{it}{ - <-> alias * Junicode-LF/c/it +\DeclareFontShape{LGR}{Junicode-LF}{boldexpanded}{sc}{ + <-> alias * Junicode-LF/bx/sc }{} -\DeclareFontShape{LGR}{Junicode-LF}{c}{scit}{ - <-> \Junicode@@scale Junicode-CondItalic-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{bx}{n}{ + <-> \Junicode@@scale Junicode-ExpBold-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{condensed}{scit}{ - <-> alias * Junicode-LF/c/scit +\DeclareFontShape{LGR}{Junicode-LF}{boldexpanded}{n}{ + <-> alias * Junicode-LF/bx/n }{} -\DeclareFontShape{LGR}{Junicode-LF}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-lf-lgr +\DeclareFontShape{LGR}{Junicode-LF}{bx}{scit}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{condensed}{n}{ - <-> alias * Junicode-LF/c/n +\DeclareFontShape{LGR}{Junicode-LF}{boldexpanded}{scit}{ + <-> alias * Junicode-LF/bx/scit }{} -\DeclareFontShape{LGR}{Junicode-LF}{c}{sc}{ - <-> \Junicode@@scale Junicode-Cond-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{condensed}{sc}{ - <-> alias * Junicode-LF/c/sc +\DeclareFontShape{LGR}{Junicode-LF}{boldexpanded}{it}{ + <-> alias * Junicode-LF/bx/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{c}{scsl}{ - <-> ssub * Junicode-LF/c/scit +\DeclareFontShape{LGR}{Junicode-LF}{bx}{sl}{ + <-> ssub * Junicode-LF/bx/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{condensed}{scsl}{ - <-> ssub * Junicode-LF/condensed/scit +\DeclareFontShape{LGR}{Junicode-LF}{boldexpanded}{sl}{ + <-> ssub * Junicode-LF/boldexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{c}{sl}{ - <-> ssub * Junicode-LF/c/it +\DeclareFontShape{LGR}{Junicode-LF}{bx}{scsl}{ + <-> ssub * Junicode-LF/bx/scit }{} -\DeclareFontShape{LGR}{Junicode-LF}{condensed}{sl}{ - <-> ssub * Junicode-LF/condensed/it +\DeclareFontShape{LGR}{Junicode-LF}{boldexpanded}{scsl}{ + <-> ssub * Junicode-LF/boldexpanded/scit }{} -% ---- sx = semiexpanded ---- +% ---- medium ---- -\DeclareFontShape{LGR}{Junicode-LF}{sx}{sc}{ - <-> \Junicode@@scale Junicode-SmExp-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{medium}{it}{ + <-> \Junicode@@scale Junicode-MediumItalic-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{semiexpanded}{sc}{ - <-> alias * Junicode-LF/sx/sc +\DeclareFontShape{LGR}{Junicode-LF}{medium}{scit}{ + <-> \Junicode@@scale Junicode-MediumItalic-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-lf-lgr +\DeclareFontShape{LGR}{Junicode-LF}{medium}{n}{ + <-> \Junicode@@scale Junicode-Medium-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{semiexpanded}{n}{ - <-> alias * Junicode-LF/sx/n +\DeclareFontShape{LGR}{Junicode-LF}{medium}{sc}{ + <-> \Junicode@@scale Junicode-Medium-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{sx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpItalic-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{medium}{sl}{ + <-> ssub * Junicode-LF/medium/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{semiexpanded}{scit}{ - <-> alias * Junicode-LF/sx/scit +\DeclareFontShape{LGR}{Junicode-LF}{medium}{scsl}{ + <-> ssub * Junicode-LF/medium/scit }{} -\DeclareFontShape{LGR}{Junicode-LF}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-lf-lgr -}{} -\DeclareFontShape{LGR}{Junicode-LF}{semiexpanded}{it}{ - <-> alias * Junicode-LF/sx/it -}{} +% ---- lc = lightcondensed ---- -\DeclareFontShape{LGR}{Junicode-LF}{sx}{scsl}{ - <-> ssub * Junicode-LF/sx/scit +\DeclareFontShape{LGR}{Junicode-LF}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{semiexpanded}{scsl}{ - <-> ssub * Junicode-LF/semiexpanded/scit +\DeclareFontShape{LGR}{Junicode-LF}{lightcondensed}{it}{ + <-> alias * Junicode-LF/lc/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{sx}{sl}{ - <-> ssub * Junicode-LF/sx/it +\DeclareFontShape{LGR}{Junicode-LF}{lc}{scit}{ + <-> \Junicode@@scale Junicode-CondLightItalic-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{semiexpanded}{sl}{ - <-> ssub * Junicode-LF/semiexpanded/it +\DeclareFontShape{LGR}{Junicode-LF}{lightcondensed}{scit}{ + <-> alias * Junicode-LF/lc/scit }{} +\DeclareFontShape{LGR}{Junicode-LF}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-lf-lgr +}{} -% ---- mediumsemiexpanded ---- +\DeclareFontShape{LGR}{Junicode-LF}{lightcondensed}{n}{ + <-> alias * Junicode-LF/lc/n +}{} -\DeclareFontShape{LGR}{Junicode-LF}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-lf-lgr +\DeclareFontShape{LGR}{Junicode-LF}{lc}{sc}{ + <-> \Junicode@@scale Junicode-CondLight-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{mediumsemiexpanded}{sc}{ - <-> \Junicode@@scale Junicode-SmExpMedium-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{lightcondensed}{sc}{ + <-> alias * Junicode-LF/lc/sc }{} -\DeclareFontShape{LGR}{Junicode-LF}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-lgr +\DeclareFontShape{LGR}{Junicode-LF}{lc}{sl}{ + <-> ssub * Junicode-LF/lc/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{mediumsemiexpanded}{scit}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{lightcondensed}{sl}{ + <-> ssub * Junicode-LF/lightcondensed/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{mediumsemiexpanded}{scsl}{ - <-> ssub * Junicode-LF/mediumsemiexpanded/scit +\DeclareFontShape{LGR}{Junicode-LF}{lc}{scsl}{ + <-> ssub * Junicode-LF/lc/scit }{} -\DeclareFontShape{LGR}{Junicode-LF}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-LF/mediumsemiexpanded/it +\DeclareFontShape{LGR}{Junicode-LF}{lightcondensed}{scsl}{ + <-> ssub * Junicode-LF/lightcondensed/scit }{} -% ---- mediumexpanded ---- +% ---- mediumsemicondensed ---- -\DeclareFontShape{LGR}{Junicode-LF}{mediumexpanded}{scit}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{mediumsemicondensed}{it}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-lgr +\DeclareFontShape{LGR}{Junicode-LF}{mediumsemicondensed}{scit}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{mediumexpanded}{sc}{ - <-> \Junicode@@scale Junicode-ExpMedium-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{mediumsemicondensed}{n}{ + <-> \Junicode@@scale Junicode-SmCondMedium-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{mediumexpanded}{n}{ - <-> \Junicode@@scale Junicode-ExpMedium-lf-lgr +\DeclareFontShape{LGR}{Junicode-LF}{mediumsemicondensed}{sc}{ + <-> \Junicode@@scale Junicode-SmCondMedium-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{mediumexpanded}{scsl}{ - <-> ssub * Junicode-LF/mediumexpanded/scit +\DeclareFontShape{LGR}{Junicode-LF}{mediumsemicondensed}{sl}{ + <-> ssub * Junicode-LF/mediumsemicondensed/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{mediumexpanded}{sl}{ - <-> ssub * Junicode-LF/mediumexpanded/it +\DeclareFontShape{LGR}{Junicode-LF}{mediumsemicondensed}{scsl}{ + <-> ssub * Junicode-LF/mediumsemicondensed/scit }{} -% ---- sbsx = semiboldsemiexpanded ---- +% ---- sx = semiexpanded ---- -\DeclareFontShape{LGR}{Junicode-LF}{sbsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{semiboldsemiexpanded}{sc}{ - <-> alias * Junicode-LF/sbsx/sc +\DeclareFontShape{LGR}{Junicode-LF}{semiexpanded}{it}{ + <-> alias * Junicode-LF/sx/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-lf-lgr +\DeclareFontShape{LGR}{Junicode-LF}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-LF/sbsx/n +\DeclareFontShape{LGR}{Junicode-LF}{semiexpanded}{n}{ + <-> alias * Junicode-LF/sx/n }{} -\DeclareFontShape{LGR}{Junicode-LF}{sbsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{sx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpItalic-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{semiboldsemiexpanded}{scit}{ - <-> alias * Junicode-LF/sbsx/scit +\DeclareFontShape{LGR}{Junicode-LF}{semiexpanded}{scit}{ + <-> alias * Junicode-LF/sx/scit }{} -\DeclareFontShape{LGR}{Junicode-LF}{sbsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-lgr +\DeclareFontShape{LGR}{Junicode-LF}{sx}{sc}{ + <-> \Junicode@@scale Junicode-SmExp-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{semiboldsemiexpanded}{it}{ - <-> alias * Junicode-LF/sbsx/it +\DeclareFontShape{LGR}{Junicode-LF}{semiexpanded}{sc}{ + <-> alias * Junicode-LF/sx/sc }{} -\DeclareFontShape{LGR}{Junicode-LF}{sbsx}{scsl}{ - <-> ssub * Junicode-LF/sbsx/scit +\DeclareFontShape{LGR}{Junicode-LF}{sx}{sl}{ + <-> ssub * Junicode-LF/sx/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{semiboldsemiexpanded}{scsl}{ - <-> ssub * Junicode-LF/semiboldsemiexpanded/scit +\DeclareFontShape{LGR}{Junicode-LF}{semiexpanded}{sl}{ + <-> ssub * Junicode-LF/semiexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{sbsx}{sl}{ - <-> ssub * Junicode-LF/sbsx/it +\DeclareFontShape{LGR}{Junicode-LF}{sx}{scsl}{ + <-> ssub * Junicode-LF/sx/scit }{} -\DeclareFontShape{LGR}{Junicode-LF}{semiboldsemiexpanded}{sl}{ - <-> ssub * Junicode-LF/semiboldsemiexpanded/it +\DeclareFontShape{LGR}{Junicode-LF}{semiexpanded}{scsl}{ + <-> ssub * Junicode-LF/semiexpanded/scit }{} -% ---- sbx = semiboldexpanded ---- - -\DeclareFontShape{LGR}{Junicode-LF}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-lf-lgr -}{} - -\DeclareFontShape{LGR}{Junicode-LF}{semiboldexpanded}{n}{ - <-> alias * Junicode-LF/sbx/n -}{} +% ---- l = light ---- -\DeclareFontShape{LGR}{Junicode-LF}{sbx}{sc}{ - <-> \Junicode@@scale Junicode-ExpSmBold-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{l}{sc}{ + <-> \Junicode@@scale Junicode-Light-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{semiboldexpanded}{sc}{ - <-> alias * Junicode-LF/sbx/sc +\DeclareFontShape{LGR}{Junicode-LF}{light}{sc}{ + <-> alias * Junicode-LF/l/sc }{} -\DeclareFontShape{LGR}{Junicode-LF}{sbx}{it}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-lgr +\DeclareFontShape{LGR}{Junicode-LF}{l}{n}{ + <-> \Junicode@@scale Junicode-Light-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{semiboldexpanded}{it}{ - <-> alias * Junicode-LF/sbx/it +\DeclareFontShape{LGR}{Junicode-LF}{light}{n}{ + <-> alias * Junicode-LF/l/n }{} -\DeclareFontShape{LGR}{Junicode-LF}{sbx}{scit}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{l}{scit}{ + <-> \Junicode@@scale Junicode-LightItalic-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{semiboldexpanded}{scit}{ - <-> alias * Junicode-LF/sbx/scit +\DeclareFontShape{LGR}{Junicode-LF}{light}{scit}{ + <-> alias * Junicode-LF/l/scit }{} -\DeclareFontShape{LGR}{Junicode-LF}{sbx}{scsl}{ - <-> ssub * Junicode-LF/sbx/scit +\DeclareFontShape{LGR}{Junicode-LF}{l}{it}{ + <-> \Junicode@@scale Junicode-LightItalic-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{semiboldexpanded}{scsl}{ - <-> ssub * Junicode-LF/semiboldexpanded/scit +\DeclareFontShape{LGR}{Junicode-LF}{light}{it}{ + <-> alias * Junicode-LF/l/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{sbx}{sl}{ - <-> ssub * Junicode-LF/sbx/it +\DeclareFontShape{LGR}{Junicode-LF}{l}{sl}{ + <-> ssub * Junicode-LF/l/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{semiboldexpanded}{sl}{ - <-> ssub * Junicode-LF/semiboldexpanded/it +\DeclareFontShape{LGR}{Junicode-LF}{light}{sl}{ + <-> ssub * Junicode-LF/light/it }{} - -% ---- mediumsemicondensed ---- - -\DeclareFontShape{LGR}{Junicode-LF}{mediumsemicondensed}{n}{ - <-> \Junicode@@scale Junicode-SmCondMedium-lf-lgr +\DeclareFontShape{LGR}{Junicode-LF}{l}{scsl}{ + <-> ssub * Junicode-LF/l/scit }{} -\DeclareFontShape{LGR}{Junicode-LF}{mediumsemicondensed}{sc}{ - <-> \Junicode@@scale Junicode-SmCondMedium-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{light}{scsl}{ + <-> ssub * Junicode-LF/light/scit }{} -\DeclareFontShape{LGR}{Junicode-LF}{mediumsemicondensed}{it}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-lgr -}{} -\DeclareFontShape{LGR}{Junicode-LF}{mediumsemicondensed}{scit}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-sc-lgr -}{} +% ---- sb = semibold ---- -\DeclareFontShape{LGR}{Junicode-LF}{mediumsemicondensed}{scsl}{ - <-> ssub * Junicode-LF/mediumsemicondensed/scit +\DeclareFontShape{LGR}{Junicode-LF}{sb}{it}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{mediumsemicondensed}{sl}{ - <-> ssub * Junicode-LF/mediumsemicondensed/it +\DeclareFontShape{LGR}{Junicode-LF}{semibold}{it}{ + <-> alias * Junicode-LF/sb/it }{} - -% ---- sb = semibold ---- - \DeclareFontShape{LGR}{Junicode-LF}{sb}{scit}{ <-> \Junicode@@scale Junicode-SmBoldItalic-lf-sc-lgr }{} @@ -597,12 +656,12 @@ <-> alias * Junicode-LF/sb/scit }{} -\DeclareFontShape{LGR}{Junicode-LF}{sb}{it}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-lf-lgr +\DeclareFontShape{LGR}{Junicode-LF}{sb}{n}{ + <-> \Junicode@@scale Junicode-SmBold-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{semibold}{it}{ - <-> alias * Junicode-LF/sb/it +\DeclareFontShape{LGR}{Junicode-LF}{semibold}{n}{ + <-> alias * Junicode-LF/sb/n }{} \DeclareFontShape{LGR}{Junicode-LF}{sb}{sc}{ @@ -613,12 +672,12 @@ <-> alias * Junicode-LF/sb/sc }{} -\DeclareFontShape{LGR}{Junicode-LF}{sb}{n}{ - <-> \Junicode@@scale Junicode-SmBold-lf-lgr +\DeclareFontShape{LGR}{Junicode-LF}{sb}{sl}{ + <-> ssub * Junicode-LF/sb/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{semibold}{n}{ - <-> alias * Junicode-LF/sb/n +\DeclareFontShape{LGR}{Junicode-LF}{semibold}{sl}{ + <-> ssub * Junicode-LF/semibold/it }{} \DeclareFontShape{LGR}{Junicode-LF}{sb}{scsl}{ @@ -629,33 +688,36 @@ <-> ssub * Junicode-LF/semibold/scit }{} -\DeclareFontShape{LGR}{Junicode-LF}{sb}{sl}{ - <-> ssub * Junicode-LF/sb/it -}{} -\DeclareFontShape{LGR}{Junicode-LF}{semibold}{sl}{ - <-> ssub * Junicode-LF/semibold/it -}{} +% ---- mediumcondensed ---- +\DeclareFontShape{LGR}{Junicode-LF}{mediumcondensed}{scit}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-lf-sc-lgr +}{} -% ---- sc = semicondensed ---- +\DeclareFontShape{LGR}{Junicode-LF}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-lf-lgr +}{} -\DeclareFontShape{LGR}{Junicode-LF}{sc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondItalic-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{semicondensed}{scit}{ - <-> alias * Junicode-LF/sc/scit +\DeclareFontShape{LGR}{Junicode-LF}{mediumcondensed}{sc}{ + <-> \Junicode@@scale Junicode-CondMedium-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{sc}{it}{ - <-> \Junicode@@scale Junicode-SmCondItalic-lf-lgr +\DeclareFontShape{LGR}{Junicode-LF}{mediumcondensed}{sl}{ + <-> ssub * Junicode-LF/mediumcondensed/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{semicondensed}{it}{ - <-> alias * Junicode-LF/sc/it +\DeclareFontShape{LGR}{Junicode-LF}{mediumcondensed}{scsl}{ + <-> ssub * Junicode-LF/mediumcondensed/scit }{} + +% ---- sc = semicondensed ---- + \DeclareFontShape{LGR}{Junicode-LF}{sc}{sc}{ <-> \Junicode@@scale Junicode-SmCond-lf-sc-lgr }{} @@ -664,6 +726,14 @@ <-> alias * Junicode-LF/sc/sc }{} +\DeclareFontShape{LGR}{Junicode-LF}{sc}{it}{ + <-> \Junicode@@scale Junicode-SmCondItalic-lf-lgr +}{} + +\DeclareFontShape{LGR}{Junicode-LF}{semicondensed}{it}{ + <-> alias * Junicode-LF/sc/it +}{} + \DeclareFontShape{LGR}{Junicode-LF}{sc}{n}{ <-> \Junicode@@scale Junicode-SmCond-lf-lgr }{} @@ -672,12 +742,12 @@ <-> alias * Junicode-LF/sc/n }{} -\DeclareFontShape{LGR}{Junicode-LF}{sc}{scsl}{ - <-> ssub * Junicode-LF/sc/scit +\DeclareFontShape{LGR}{Junicode-LF}{sc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondItalic-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{semicondensed}{scsl}{ - <-> ssub * Junicode-LF/semicondensed/scit +\DeclareFontShape{LGR}{Junicode-LF}{semicondensed}{scit}{ + <-> alias * Junicode-LF/sc/scit }{} \DeclareFontShape{LGR}{Junicode-LF}{sc}{sl}{ @@ -688,66 +758,74 @@ <-> ssub * Junicode-LF/semicondensed/it }{} +\DeclareFontShape{LGR}{Junicode-LF}{sc}{scsl}{ + <-> ssub * Junicode-LF/sc/scit +}{} -% ---- lc = lightcondensed ---- +\DeclareFontShape{LGR}{Junicode-LF}{semicondensed}{scsl}{ + <-> ssub * Junicode-LF/semicondensed/scit +}{} -\DeclareFontShape{LGR}{Junicode-LF}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-lf-lgr + +% ---- sbsx = semiboldsemiexpanded ---- + +\DeclareFontShape{LGR}{Junicode-LF}{sbsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{lightcondensed}{it}{ - <-> alias * Junicode-LF/lc/it +\DeclareFontShape{LGR}{Junicode-LF}{semiboldsemiexpanded}{sc}{ + <-> alias * Junicode-LF/sbsx/sc }{} -\DeclareFontShape{LGR}{Junicode-LF}{lc}{scit}{ - <-> \Junicode@@scale Junicode-CondLightItalic-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{sbsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{lightcondensed}{scit}{ - <-> alias * Junicode-LF/lc/scit +\DeclareFontShape{LGR}{Junicode-LF}{semiboldsemiexpanded}{it}{ + <-> alias * Junicode-LF/sbsx/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-lf-lgr +\DeclareFontShape{LGR}{Junicode-LF}{sbsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{lightcondensed}{n}{ - <-> alias * Junicode-LF/lc/n +\DeclareFontShape{LGR}{Junicode-LF}{semiboldsemiexpanded}{scit}{ + <-> alias * Junicode-LF/sbsx/scit }{} -\DeclareFontShape{LGR}{Junicode-LF}{lc}{sc}{ - <-> \Junicode@@scale Junicode-CondLight-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-lf-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{lightcondensed}{sc}{ - <-> alias * Junicode-LF/lc/sc +\DeclareFontShape{LGR}{Junicode-LF}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-LF/sbsx/n }{} -\DeclareFontShape{LGR}{Junicode-LF}{lc}{scsl}{ - <-> ssub * Junicode-LF/lc/scit +\DeclareFontShape{LGR}{Junicode-LF}{sbsx}{sl}{ + <-> ssub * Junicode-LF/sbsx/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{lightcondensed}{scsl}{ - <-> ssub * Junicode-LF/lightcondensed/scit +\DeclareFontShape{LGR}{Junicode-LF}{semiboldsemiexpanded}{sl}{ + <-> ssub * Junicode-LF/semiboldsemiexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{lc}{sl}{ - <-> ssub * Junicode-LF/lc/it +\DeclareFontShape{LGR}{Junicode-LF}{sbsx}{scsl}{ + <-> ssub * Junicode-LF/sbsx/scit }{} -\DeclareFontShape{LGR}{Junicode-LF}{lightcondensed}{sl}{ - <-> ssub * Junicode-LF/lightcondensed/it +\DeclareFontShape{LGR}{Junicode-LF}{semiboldsemiexpanded}{scsl}{ + <-> ssub * Junicode-LF/semiboldsemiexpanded/scit }{} % ---- bsx = boldsemiexpanded ---- -\DeclareFontShape{LGR}{Junicode-LF}{bsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpBold-lf-sc-lgr +\DeclareFontShape{LGR}{Junicode-LF}{bsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{boldsemiexpanded}{sc}{ - <-> alias * Junicode-LF/bsx/sc +\DeclareFontShape{LGR}{Junicode-LF}{boldsemiexpanded}{scit}{ + <-> alias * Junicode-LF/bsx/scit }{} \DeclareFontShape{LGR}{Junicode-LF}{bsx}{n}{ @@ -758,14 +836,6 @@ <-> alias * Junicode-LF/bsx/n }{} -\DeclareFontShape{LGR}{Junicode-LF}{bsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-sc-lgr -}{} - -\DeclareFontShape{LGR}{Junicode-LF}{boldsemiexpanded}{scit}{ - <-> alias * Junicode-LF/bsx/scit -}{} - \DeclareFontShape{LGR}{Junicode-LF}{bsx}{it}{ <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-lgr }{} @@ -774,12 +844,12 @@ <-> alias * Junicode-LF/bsx/it }{} -\DeclareFontShape{LGR}{Junicode-LF}{bsx}{scsl}{ - <-> ssub * Junicode-LF/bsx/scit +\DeclareFontShape{LGR}{Junicode-LF}{bsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpBold-lf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-LF}{boldsemiexpanded}{scsl}{ - <-> ssub * Junicode-LF/boldsemiexpanded/scit +\DeclareFontShape{LGR}{Junicode-LF}{boldsemiexpanded}{sc}{ + <-> alias * Junicode-LF/bsx/sc }{} \DeclareFontShape{LGR}{Junicode-LF}{bsx}{sl}{ @@ -790,82 +860,12 @@ <-> ssub * Junicode-LF/boldsemiexpanded/it }{} - -% ---- b = bold ---- - -\DeclareFontShape{LGR}{Junicode-LF}{b}{scit}{ - <-> \Junicode@@scale Junicode-BoldItalic-lf-sc-lgr -}{} - -\DeclareFontShape{LGR}{Junicode-LF}{bold}{scit}{ - <-> alias * Junicode-LF/b/scit -}{} - -\DeclareFontShape{LGR}{Junicode-LF}{b}{it}{ - <-> \Junicode@@scale Junicode-BoldItalic-lf-lgr -}{} - -\DeclareFontShape{LGR}{Junicode-LF}{bold}{it}{ - <-> alias * Junicode-LF/b/it -}{} - -\DeclareFontShape{LGR}{Junicode-LF}{b}{sc}{ - <-> \Junicode@@scale Junicode-Bold-lf-sc-lgr -}{} - -\DeclareFontShape{LGR}{Junicode-LF}{bold}{sc}{ - <-> alias * Junicode-LF/b/sc -}{} - -\DeclareFontShape{LGR}{Junicode-LF}{b}{n}{ - <-> \Junicode@@scale Junicode-Bold-lf-lgr -}{} - -\DeclareFontShape{LGR}{Junicode-LF}{bold}{n}{ - <-> alias * Junicode-LF/b/n -}{} - -\DeclareFontShape{LGR}{Junicode-LF}{b}{scsl}{ - <-> ssub * Junicode-LF/b/scit -}{} - -\DeclareFontShape{LGR}{Junicode-LF}{bold}{scsl}{ - <-> ssub * Junicode-LF/bold/scit -}{} - -\DeclareFontShape{LGR}{Junicode-LF}{b}{sl}{ - <-> ssub * Junicode-LF/b/it -}{} - -\DeclareFontShape{LGR}{Junicode-LF}{bold}{sl}{ - <-> ssub * Junicode-LF/bold/it -}{} - - -% ---- mediumcondensed ---- - -\DeclareFontShape{LGR}{Junicode-LF}{mediumcondensed}{scit}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-lf-sc-lgr -}{} - -\DeclareFontShape{LGR}{Junicode-LF}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-lf-lgr -}{} - -\DeclareFontShape{LGR}{Junicode-LF}{mediumcondensed}{sc}{ - <-> \Junicode@@scale Junicode-CondMedium-lf-sc-lgr -}{} - -\DeclareFontShape{LGR}{Junicode-LF}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-lf-lgr -}{} - -\DeclareFontShape{LGR}{Junicode-LF}{mediumcondensed}{scsl}{ - <-> ssub * Junicode-LF/mediumcondensed/scit +\DeclareFontShape{LGR}{Junicode-LF}{bsx}{scsl}{ + <-> ssub * Junicode-LF/bsx/scit }{} -\DeclareFontShape{LGR}{Junicode-LF}{mediumcondensed}{sl}{ - <-> ssub * Junicode-LF/mediumcondensed/it +\DeclareFontShape{LGR}{Junicode-LF}{boldsemiexpanded}{scsl}{ + <-> ssub * Junicode-LF/boldsemiexpanded/scit }{} diff --git a/Master/texmf-dist/tex/latex/junicode/LGRJunicode-OsF.fd b/Master/texmf-dist/tex/latex/junicode/LGRJunicode-OsF.fd index e63959e9b76..129ac229558 100644 --- a/Master/texmf-dist/tex/latex/junicode/LGRJunicode-OsF.fd +++ b/Master/texmf-dist/tex/latex/junicode/LGRJunicode-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{LGRJunicode-OsF.fd} - [2024/06/03 (autoinst) Font definitions for LGR/Junicode-OsF.] + [2024/07/21 (autoinst) Font definitions for LGR/Junicode-OsF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,363 +20,363 @@ \DeclareFontFamily{LGR}{Junicode-OsF}{} -% ---- sx = semiexpanded ---- +% ---- sc = semicondensed ---- -\DeclareFontShape{LGR}{Junicode-OsF}{sx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpItalic-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{sc}{n}{ + <-> \Junicode@@scale Junicode-SmCond-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semiexpanded}{scit}{ - <-> alias * Junicode-OsF/sx/scit +\DeclareFontShape{LGR}{Junicode-OsF}{semicondensed}{n}{ + <-> alias * Junicode-OsF/sc/n }{} -\DeclareFontShape{LGR}{Junicode-OsF}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{sc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondItalic-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semiexpanded}{it}{ - <-> alias * Junicode-OsF/sx/it +\DeclareFontShape{LGR}{Junicode-OsF}{semicondensed}{scit}{ + <-> alias * Junicode-OsF/sc/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{sx}{sc}{ - <-> \Junicode@@scale Junicode-SmExp-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{sc}{it}{ + <-> \Junicode@@scale Junicode-SmCondItalic-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semiexpanded}{sc}{ - <-> alias * Junicode-OsF/sx/sc +\DeclareFontShape{LGR}{Junicode-OsF}{semicondensed}{it}{ + <-> alias * Junicode-OsF/sc/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{sc}{sc}{ + <-> \Junicode@@scale Junicode-SmCond-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semiexpanded}{n}{ - <-> alias * Junicode-OsF/sx/n +\DeclareFontShape{LGR}{Junicode-OsF}{semicondensed}{sc}{ + <-> alias * Junicode-OsF/sc/sc }{} -\DeclareFontShape{LGR}{Junicode-OsF}{sx}{scsl}{ - <-> ssub * Junicode-OsF/sx/scit +\DeclareFontShape{LGR}{Junicode-OsF}{sc}{sl}{ + <-> ssub * Junicode-OsF/sc/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semiexpanded}{scsl}{ - <-> ssub * Junicode-OsF/semiexpanded/scit +\DeclareFontShape{LGR}{Junicode-OsF}{semicondensed}{sl}{ + <-> ssub * Junicode-OsF/semicondensed/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{sx}{sl}{ - <-> ssub * Junicode-OsF/sx/it +\DeclareFontShape{LGR}{Junicode-OsF}{sc}{scsl}{ + <-> ssub * Junicode-OsF/sc/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semiexpanded}{sl}{ - <-> ssub * Junicode-OsF/semiexpanded/it +\DeclareFontShape{LGR}{Junicode-OsF}{semicondensed}{scsl}{ + <-> ssub * Junicode-OsF/semicondensed/scit }{} -% ---- c = condensed ---- +% ---- bsx = boldsemiexpanded ---- -\DeclareFontShape{LGR}{Junicode-OsF}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{bsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpBold-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{condensed}{n}{ - <-> alias * Junicode-OsF/c/n +\DeclareFontShape{LGR}{Junicode-OsF}{boldsemiexpanded}{sc}{ + <-> alias * Junicode-OsF/bsx/sc }{} -\DeclareFontShape{LGR}{Junicode-OsF}{c}{sc}{ - <-> \Junicode@@scale Junicode-Cond-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{bsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{condensed}{sc}{ - <-> alias * Junicode-OsF/c/sc +\DeclareFontShape{LGR}{Junicode-OsF}{boldsemiexpanded}{it}{ + <-> alias * Junicode-OsF/bsx/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{bsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpBold-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{condensed}{it}{ - <-> alias * Junicode-OsF/c/it +\DeclareFontShape{LGR}{Junicode-OsF}{boldsemiexpanded}{n}{ + <-> alias * Junicode-OsF/bsx/n }{} -\DeclareFontShape{LGR}{Junicode-OsF}{c}{scit}{ - <-> \Junicode@@scale Junicode-CondItalic-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{bsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{condensed}{scit}{ - <-> alias * Junicode-OsF/c/scit +\DeclareFontShape{LGR}{Junicode-OsF}{boldsemiexpanded}{scit}{ + <-> alias * Junicode-OsF/bsx/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{c}{scsl}{ - <-> ssub * Junicode-OsF/c/scit +\DeclareFontShape{LGR}{Junicode-OsF}{bsx}{sl}{ + <-> ssub * Junicode-OsF/bsx/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{condensed}{scsl}{ - <-> ssub * Junicode-OsF/condensed/scit +\DeclareFontShape{LGR}{Junicode-OsF}{boldsemiexpanded}{sl}{ + <-> ssub * Junicode-OsF/boldsemiexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{c}{sl}{ - <-> ssub * Junicode-OsF/c/it +\DeclareFontShape{LGR}{Junicode-OsF}{bsx}{scsl}{ + <-> ssub * Junicode-OsF/bsx/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{condensed}{sl}{ - <-> ssub * Junicode-OsF/condensed/it +\DeclareFontShape{LGR}{Junicode-OsF}{boldsemiexpanded}{scsl}{ + <-> ssub * Junicode-OsF/boldsemiexpanded/scit }{} -% ---- x = expanded ---- +% ---- sbsx = semiboldsemiexpanded ---- -\DeclareFontShape{LGR}{Junicode-OsF}{x}{it}{ - <-> \Junicode@@scale Junicode-ExpItalic-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{sbsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{expanded}{it}{ - <-> alias * Junicode-OsF/x/it +\DeclareFontShape{LGR}{Junicode-OsF}{semiboldsemiexpanded}{it}{ + <-> alias * Junicode-OsF/sbsx/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{x}{scit}{ - <-> \Junicode@@scale Junicode-ExpItalic-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{sbsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{expanded}{scit}{ - <-> alias * Junicode-OsF/x/scit +\DeclareFontShape{LGR}{Junicode-OsF}{semiboldsemiexpanded}{scit}{ + <-> alias * Junicode-OsF/sbsx/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{x}{n}{ - <-> \Junicode@@scale Junicode-Exp-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{expanded}{n}{ - <-> alias * Junicode-OsF/x/n +\DeclareFontShape{LGR}{Junicode-OsF}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-OsF/sbsx/n }{} -\DeclareFontShape{LGR}{Junicode-OsF}{x}{sc}{ - <-> \Junicode@@scale Junicode-Exp-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{sbsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{expanded}{sc}{ - <-> alias * Junicode-OsF/x/sc +\DeclareFontShape{LGR}{Junicode-OsF}{semiboldsemiexpanded}{sc}{ + <-> alias * Junicode-OsF/sbsx/sc }{} -\DeclareFontShape{LGR}{Junicode-OsF}{x}{scsl}{ - <-> ssub * Junicode-OsF/x/scit +\DeclareFontShape{LGR}{Junicode-OsF}{sbsx}{sl}{ + <-> ssub * Junicode-OsF/sbsx/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{expanded}{scsl}{ - <-> ssub * Junicode-OsF/expanded/scit +\DeclareFontShape{LGR}{Junicode-OsF}{semiboldsemiexpanded}{sl}{ + <-> ssub * Junicode-OsF/semiboldsemiexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{x}{sl}{ - <-> ssub * Junicode-OsF/x/it +\DeclareFontShape{LGR}{Junicode-OsF}{sbsx}{scsl}{ + <-> ssub * Junicode-OsF/sbsx/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{expanded}{sl}{ - <-> ssub * Junicode-OsF/expanded/it +\DeclareFontShape{LGR}{Junicode-OsF}{semiboldsemiexpanded}{scsl}{ + <-> ssub * Junicode-OsF/semiboldsemiexpanded/scit }{} -% ---- sbsx = semiboldsemiexpanded ---- +% ---- sb = semibold ---- -\DeclareFontShape{LGR}{Junicode-OsF}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{sb}{sc}{ + <-> \Junicode@@scale Junicode-SmBold-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-OsF/sbsx/n +\DeclareFontShape{LGR}{Junicode-OsF}{semibold}{sc}{ + <-> alias * Junicode-OsF/sb/sc }{} -\DeclareFontShape{LGR}{Junicode-OsF}{sbsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{sb}{n}{ + <-> \Junicode@@scale Junicode-SmBold-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semiboldsemiexpanded}{sc}{ - <-> alias * Junicode-OsF/sbsx/sc +\DeclareFontShape{LGR}{Junicode-OsF}{semibold}{n}{ + <-> alias * Junicode-OsF/sb/n }{} -\DeclareFontShape{LGR}{Junicode-OsF}{sbsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{sb}{scit}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semiboldsemiexpanded}{it}{ - <-> alias * Junicode-OsF/sbsx/it +\DeclareFontShape{LGR}{Junicode-OsF}{semibold}{scit}{ + <-> alias * Junicode-OsF/sb/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{sbsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{sb}{it}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semiboldsemiexpanded}{scit}{ - <-> alias * Junicode-OsF/sbsx/scit +\DeclareFontShape{LGR}{Junicode-OsF}{semibold}{it}{ + <-> alias * Junicode-OsF/sb/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{sbsx}{scsl}{ - <-> ssub * Junicode-OsF/sbsx/scit +\DeclareFontShape{LGR}{Junicode-OsF}{sb}{sl}{ + <-> ssub * Junicode-OsF/sb/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semiboldsemiexpanded}{scsl}{ - <-> ssub * Junicode-OsF/semiboldsemiexpanded/scit +\DeclareFontShape{LGR}{Junicode-OsF}{semibold}{sl}{ + <-> ssub * Junicode-OsF/semibold/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{sbsx}{sl}{ - <-> ssub * Junicode-OsF/sbsx/it +\DeclareFontShape{LGR}{Junicode-OsF}{sb}{scsl}{ + <-> ssub * Junicode-OsF/sb/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semiboldsemiexpanded}{sl}{ - <-> ssub * Junicode-OsF/semiboldsemiexpanded/it +\DeclareFontShape{LGR}{Junicode-OsF}{semibold}{scsl}{ + <-> ssub * Junicode-OsF/semibold/scit }{} -% ---- mediumexpanded ---- +% ---- mediumcondensed ---- -\DeclareFontShape{LGR}{Junicode-OsF}{mediumexpanded}{scit}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{mediumcondensed}{sc}{ + <-> \Junicode@@scale Junicode-CondMedium-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{mediumexpanded}{sc}{ - <-> \Junicode@@scale Junicode-ExpMedium-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{mediumexpanded}{n}{ - <-> \Junicode@@scale Junicode-ExpMedium-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{mediumcondensed}{scit}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{mediumexpanded}{scsl}{ - <-> ssub * Junicode-OsF/mediumexpanded/scit +\DeclareFontShape{LGR}{Junicode-OsF}{mediumcondensed}{sl}{ + <-> ssub * Junicode-OsF/mediumcondensed/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{mediumexpanded}{sl}{ - <-> ssub * Junicode-OsF/mediumexpanded/it +\DeclareFontShape{LGR}{Junicode-OsF}{mediumcondensed}{scsl}{ + <-> ssub * Junicode-OsF/mediumcondensed/scit }{} -% ---- mediumsemiexpanded ---- +% ---- mediumsemicondensed ---- -\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemicondensed}{sc}{ + <-> \Junicode@@scale Junicode-SmCondMedium-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemiexpanded}{sc}{ - <-> \Junicode@@scale Junicode-SmExpMedium-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemicondensed}{scit}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemicondensed}{n}{ + <-> \Junicode@@scale Junicode-SmCondMedium-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemiexpanded}{scit}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemicondensed}{it}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemiexpanded}{scsl}{ - <-> ssub * Junicode-OsF/mediumsemiexpanded/scit +\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemicondensed}{sl}{ + <-> ssub * Junicode-OsF/mediumsemicondensed/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-OsF/mediumsemiexpanded/it +\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemicondensed}{scsl}{ + <-> ssub * Junicode-OsF/mediumsemicondensed/scit }{} -% ---- l = light ---- +% ---- sx = semiexpanded ---- -\DeclareFontShape{LGR}{Junicode-OsF}{l}{sc}{ - <-> \Junicode@@scale Junicode-Light-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{sx}{sc}{ + <-> \Junicode@@scale Junicode-SmExp-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{light}{sc}{ - <-> alias * Junicode-OsF/l/sc +\DeclareFontShape{LGR}{Junicode-OsF}{semiexpanded}{sc}{ + <-> alias * Junicode-OsF/sx/sc }{} -\DeclareFontShape{LGR}{Junicode-OsF}{l}{n}{ - <-> \Junicode@@scale Junicode-Light-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{light}{n}{ - <-> alias * Junicode-OsF/l/n +\DeclareFontShape{LGR}{Junicode-OsF}{semiexpanded}{it}{ + <-> alias * Junicode-OsF/sx/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{l}{scit}{ - <-> \Junicode@@scale Junicode-LightItalic-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{light}{scit}{ - <-> alias * Junicode-OsF/l/scit +\DeclareFontShape{LGR}{Junicode-OsF}{semiexpanded}{n}{ + <-> alias * Junicode-OsF/sx/n }{} -\DeclareFontShape{LGR}{Junicode-OsF}{l}{it}{ - <-> \Junicode@@scale Junicode-LightItalic-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{sx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpItalic-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{light}{it}{ - <-> alias * Junicode-OsF/l/it +\DeclareFontShape{LGR}{Junicode-OsF}{semiexpanded}{scit}{ + <-> alias * Junicode-OsF/sx/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{l}{scsl}{ - <-> ssub * Junicode-OsF/l/scit +\DeclareFontShape{LGR}{Junicode-OsF}{sx}{sl}{ + <-> ssub * Junicode-OsF/sx/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{light}{scsl}{ - <-> ssub * Junicode-OsF/light/scit +\DeclareFontShape{LGR}{Junicode-OsF}{semiexpanded}{sl}{ + <-> ssub * Junicode-OsF/semiexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{l}{sl}{ - <-> ssub * Junicode-OsF/l/it +\DeclareFontShape{LGR}{Junicode-OsF}{sx}{scsl}{ + <-> ssub * Junicode-OsF/sx/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{light}{sl}{ - <-> ssub * Junicode-OsF/light/it +\DeclareFontShape{LGR}{Junicode-OsF}{semiexpanded}{scsl}{ + <-> ssub * Junicode-OsF/semiexpanded/scit }{} -% ---- bx = boldexpanded ---- +% ---- l = light ---- -\DeclareFontShape{LGR}{Junicode-OsF}{bx}{n}{ - <-> \Junicode@@scale Junicode-ExpBold-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{l}{n}{ + <-> \Junicode@@scale Junicode-Light-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{boldexpanded}{n}{ - <-> alias * Junicode-OsF/bx/n +\DeclareFontShape{LGR}{Junicode-OsF}{light}{n}{ + <-> alias * Junicode-OsF/l/n }{} -\DeclareFontShape{LGR}{Junicode-OsF}{bx}{sc}{ - <-> \Junicode@@scale Junicode-ExpBold-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{l}{scit}{ + <-> \Junicode@@scale Junicode-LightItalic-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{boldexpanded}{sc}{ - <-> alias * Junicode-OsF/bx/sc +\DeclareFontShape{LGR}{Junicode-OsF}{light}{scit}{ + <-> alias * Junicode-OsF/l/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{l}{it}{ + <-> \Junicode@@scale Junicode-LightItalic-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{boldexpanded}{it}{ - <-> alias * Junicode-OsF/bx/it +\DeclareFontShape{LGR}{Junicode-OsF}{light}{it}{ + <-> alias * Junicode-OsF/l/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{bx}{scit}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{l}{sc}{ + <-> \Junicode@@scale Junicode-Light-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{boldexpanded}{scit}{ - <-> alias * Junicode-OsF/bx/scit +\DeclareFontShape{LGR}{Junicode-OsF}{light}{sc}{ + <-> alias * Junicode-OsF/l/sc }{} -\DeclareFontShape{LGR}{Junicode-OsF}{bx}{scsl}{ - <-> ssub * Junicode-OsF/bx/scit +\DeclareFontShape{LGR}{Junicode-OsF}{l}{sl}{ + <-> ssub * Junicode-OsF/l/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{boldexpanded}{scsl}{ - <-> ssub * Junicode-OsF/boldexpanded/scit +\DeclareFontShape{LGR}{Junicode-OsF}{light}{sl}{ + <-> ssub * Junicode-OsF/light/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{bx}{sl}{ - <-> ssub * Junicode-OsF/bx/it +\DeclareFontShape{LGR}{Junicode-OsF}{l}{scsl}{ + <-> ssub * Junicode-OsF/l/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{boldexpanded}{sl}{ - <-> ssub * Junicode-OsF/boldexpanded/it +\DeclareFontShape{LGR}{Junicode-OsF}{light}{scsl}{ + <-> ssub * Junicode-OsF/light/scit }{} @@ -414,14 +414,6 @@ <-> alias * Junicode-OsF/m/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{m}{scsl}{ - <-> ssub * Junicode-OsF/m/scit -}{} - -\DeclareFontShape{LGR}{Junicode-OsF}{regular}{scsl}{ - <-> ssub * Junicode-OsF/regular/scit -}{} - \DeclareFontShape{LGR}{Junicode-OsF}{m}{sl}{ <-> ssub * Junicode-OsF/m/it }{} @@ -430,55 +422,39 @@ <-> ssub * Junicode-OsF/regular/it }{} - -% ---- lsc = lightsemicondensed ---- - -\DeclareFontShape{LGR}{Junicode-OsF}{lsc}{sc}{ - <-> \Junicode@@scale Junicode-SmCondLight-osf-sc-lgr -}{} - -\DeclareFontShape{LGR}{Junicode-OsF}{lightsemicondensed}{sc}{ - <-> alias * Junicode-OsF/lsc/sc -}{} - -\DeclareFontShape{LGR}{Junicode-OsF}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{m}{scsl}{ + <-> ssub * Junicode-OsF/m/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{lightsemicondensed}{n}{ - <-> alias * Junicode-OsF/lsc/n +\DeclareFontShape{LGR}{Junicode-OsF}{regular}{scsl}{ + <-> ssub * Junicode-OsF/regular/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{lsc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-sc-lgr -}{} -\DeclareFontShape{LGR}{Junicode-OsF}{lightsemicondensed}{scit}{ - <-> alias * Junicode-OsF/lsc/scit -}{} +% ---- mediumsemiexpanded ---- -\DeclareFontShape{LGR}{Junicode-OsF}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemiexpanded}{sc}{ + <-> \Junicode@@scale Junicode-SmExpMedium-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{lightsemicondensed}{it}{ - <-> alias * Junicode-OsF/lsc/it +\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{lsc}{scsl}{ - <-> ssub * Junicode-OsF/lsc/scit +\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemiexpanded}{scit}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{lightsemicondensed}{scsl}{ - <-> ssub * Junicode-OsF/lightsemicondensed/scit +\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{lsc}{sl}{ - <-> ssub * Junicode-OsF/lsc/it +\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-OsF/mediumsemiexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{lightsemicondensed}{sl}{ - <-> ssub * Junicode-OsF/lightsemicondensed/it +\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemiexpanded}{scsl}{ + <-> ssub * Junicode-OsF/mediumsemiexpanded/scit }{} @@ -488,384 +464,408 @@ <-> \Junicode@@scale Junicode-Medium-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{medium}{n}{ - <-> \Junicode@@scale Junicode-Medium-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{medium}{it}{ + <-> \Junicode@@scale Junicode-MediumItalic-osf-lgr }{} \DeclareFontShape{LGR}{Junicode-OsF}{medium}{scit}{ <-> \Junicode@@scale Junicode-MediumItalic-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{medium}{it}{ - <-> \Junicode@@scale Junicode-MediumItalic-osf-lgr -}{} - -\DeclareFontShape{LGR}{Junicode-OsF}{medium}{scsl}{ - <-> ssub * Junicode-OsF/medium/scit +\DeclareFontShape{LGR}{Junicode-OsF}{medium}{n}{ + <-> \Junicode@@scale Junicode-Medium-osf-lgr }{} \DeclareFontShape{LGR}{Junicode-OsF}{medium}{sl}{ <-> ssub * Junicode-OsF/medium/it }{} +\DeclareFontShape{LGR}{Junicode-OsF}{medium}{scsl}{ + <-> ssub * Junicode-OsF/medium/scit +}{} -% ---- b = bold ---- -\DeclareFontShape{LGR}{Junicode-OsF}{b}{scit}{ - <-> \Junicode@@scale Junicode-BoldItalic-osf-sc-lgr +% ---- bx = boldexpanded ---- + +\DeclareFontShape{LGR}{Junicode-OsF}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{bold}{scit}{ - <-> alias * Junicode-OsF/b/scit +\DeclareFontShape{LGR}{Junicode-OsF}{boldexpanded}{it}{ + <-> alias * Junicode-OsF/bx/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{b}{it}{ - <-> \Junicode@@scale Junicode-BoldItalic-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{bx}{scit}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{bold}{it}{ - <-> alias * Junicode-OsF/b/it +\DeclareFontShape{LGR}{Junicode-OsF}{boldexpanded}{scit}{ + <-> alias * Junicode-OsF/bx/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{b}{sc}{ - <-> \Junicode@@scale Junicode-Bold-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{bx}{n}{ + <-> \Junicode@@scale Junicode-ExpBold-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{bold}{sc}{ - <-> alias * Junicode-OsF/b/sc +\DeclareFontShape{LGR}{Junicode-OsF}{boldexpanded}{n}{ + <-> alias * Junicode-OsF/bx/n }{} -\DeclareFontShape{LGR}{Junicode-OsF}{b}{n}{ - <-> \Junicode@@scale Junicode-Bold-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{bx}{sc}{ + <-> \Junicode@@scale Junicode-ExpBold-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{bold}{n}{ - <-> alias * Junicode-OsF/b/n +\DeclareFontShape{LGR}{Junicode-OsF}{boldexpanded}{sc}{ + <-> alias * Junicode-OsF/bx/sc }{} -\DeclareFontShape{LGR}{Junicode-OsF}{b}{scsl}{ - <-> ssub * Junicode-OsF/b/scit +\DeclareFontShape{LGR}{Junicode-OsF}{bx}{sl}{ + <-> ssub * Junicode-OsF/bx/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{bold}{scsl}{ - <-> ssub * Junicode-OsF/bold/scit +\DeclareFontShape{LGR}{Junicode-OsF}{boldexpanded}{sl}{ + <-> ssub * Junicode-OsF/boldexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{b}{sl}{ - <-> ssub * Junicode-OsF/b/it +\DeclareFontShape{LGR}{Junicode-OsF}{bx}{scsl}{ + <-> ssub * Junicode-OsF/bx/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{bold}{sl}{ - <-> ssub * Junicode-OsF/bold/it +\DeclareFontShape{LGR}{Junicode-OsF}{boldexpanded}{scsl}{ + <-> ssub * Junicode-OsF/boldexpanded/scit }{} -% ---- mediumcondensed ---- +% ---- lc = lightcondensed ---- -\DeclareFontShape{LGR}{Junicode-OsF}{mediumcondensed}{scit}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{lc}{sc}{ + <-> \Junicode@@scale Junicode-CondLight-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{lightcondensed}{sc}{ + <-> alias * Junicode-OsF/lc/sc }{} -\DeclareFontShape{LGR}{Junicode-OsF}{mediumcondensed}{sc}{ - <-> \Junicode@@scale Junicode-CondMedium-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{lc}{scit}{ + <-> \Junicode@@scale Junicode-CondLightItalic-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{lightcondensed}{scit}{ + <-> alias * Junicode-OsF/lc/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{mediumcondensed}{scsl}{ - <-> ssub * Junicode-OsF/mediumcondensed/scit +\DeclareFontShape{LGR}{Junicode-OsF}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{mediumcondensed}{sl}{ - <-> ssub * Junicode-OsF/mediumcondensed/it +\DeclareFontShape{LGR}{Junicode-OsF}{lightcondensed}{n}{ + <-> alias * Junicode-OsF/lc/n }{} +\DeclareFontShape{LGR}{Junicode-OsF}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-osf-lgr +}{} -% ---- mediumsemicondensed ---- +\DeclareFontShape{LGR}{Junicode-OsF}{lightcondensed}{it}{ + <-> alias * Junicode-OsF/lc/it +}{} -\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemicondensed}{it}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{lc}{sl}{ + <-> ssub * Junicode-OsF/lc/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemicondensed}{scit}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{lightcondensed}{sl}{ + <-> ssub * Junicode-OsF/lightcondensed/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemicondensed}{n}{ - <-> \Junicode@@scale Junicode-SmCondMedium-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{lc}{scsl}{ + <-> ssub * Junicode-OsF/lc/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemicondensed}{sc}{ - <-> \Junicode@@scale Junicode-SmCondMedium-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{lightcondensed}{scsl}{ + <-> ssub * Junicode-OsF/lightcondensed/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemicondensed}{scsl}{ - <-> ssub * Junicode-OsF/mediumsemicondensed/scit + +% ---- lsc = lightsemicondensed ---- + +\DeclareFontShape{LGR}{Junicode-OsF}{lsc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{mediumsemicondensed}{sl}{ - <-> ssub * Junicode-OsF/mediumsemicondensed/it +\DeclareFontShape{LGR}{Junicode-OsF}{lightsemicondensed}{scit}{ + <-> alias * Junicode-OsF/lsc/scit }{} +\DeclareFontShape{LGR}{Junicode-OsF}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-osf-lgr +}{} -% ---- sbx = semiboldexpanded ---- +\DeclareFontShape{LGR}{Junicode-OsF}{lightsemicondensed}{n}{ + <-> alias * Junicode-OsF/lsc/n +}{} -\DeclareFontShape{LGR}{Junicode-OsF}{sbx}{it}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semiboldexpanded}{it}{ - <-> alias * Junicode-OsF/sbx/it +\DeclareFontShape{LGR}{Junicode-OsF}{lightsemicondensed}{it}{ + <-> alias * Junicode-OsF/lsc/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{sbx}{scit}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{lsc}{sc}{ + <-> \Junicode@@scale Junicode-SmCondLight-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semiboldexpanded}{scit}{ - <-> alias * Junicode-OsF/sbx/scit +\DeclareFontShape{LGR}{Junicode-OsF}{lightsemicondensed}{sc}{ + <-> alias * Junicode-OsF/lsc/sc }{} -\DeclareFontShape{LGR}{Junicode-OsF}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{lsc}{sl}{ + <-> ssub * Junicode-OsF/lsc/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semiboldexpanded}{n}{ - <-> alias * Junicode-OsF/sbx/n +\DeclareFontShape{LGR}{Junicode-OsF}{lightsemicondensed}{sl}{ + <-> ssub * Junicode-OsF/lightsemicondensed/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{sbx}{sc}{ - <-> \Junicode@@scale Junicode-ExpSmBold-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{lsc}{scsl}{ + <-> ssub * Junicode-OsF/lsc/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semiboldexpanded}{sc}{ - <-> alias * Junicode-OsF/sbx/sc +\DeclareFontShape{LGR}{Junicode-OsF}{lightsemicondensed}{scsl}{ + <-> ssub * Junicode-OsF/lightsemicondensed/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{sbx}{scsl}{ - <-> ssub * Junicode-OsF/sbx/scit + +% ---- mediumexpanded ---- + +\DeclareFontShape{LGR}{Junicode-OsF}{mediumexpanded}{sc}{ + <-> \Junicode@@scale Junicode-ExpMedium-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semiboldexpanded}{scsl}{ - <-> ssub * Junicode-OsF/semiboldexpanded/scit +\DeclareFontShape{LGR}{Junicode-OsF}{mediumexpanded}{n}{ + <-> \Junicode@@scale Junicode-ExpMedium-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{sbx}{sl}{ - <-> ssub * Junicode-OsF/sbx/it +\DeclareFontShape{LGR}{Junicode-OsF}{mediumexpanded}{scit}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semiboldexpanded}{sl}{ - <-> ssub * Junicode-OsF/semiboldexpanded/it +\DeclareFontShape{LGR}{Junicode-OsF}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-lgr }{} +\DeclareFontShape{LGR}{Junicode-OsF}{mediumexpanded}{sl}{ + <-> ssub * Junicode-OsF/mediumexpanded/it +}{} -% ---- bsx = boldsemiexpanded ---- +\DeclareFontShape{LGR}{Junicode-OsF}{mediumexpanded}{scsl}{ + <-> ssub * Junicode-OsF/mediumexpanded/scit +}{} -\DeclareFontShape{LGR}{Junicode-OsF}{bsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpBold-osf-sc-lgr + +% ---- x = expanded ---- + +\DeclareFontShape{LGR}{Junicode-OsF}{x}{n}{ + <-> \Junicode@@scale Junicode-Exp-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{boldsemiexpanded}{sc}{ - <-> alias * Junicode-OsF/bsx/sc +\DeclareFontShape{LGR}{Junicode-OsF}{expanded}{n}{ + <-> alias * Junicode-OsF/x/n }{} -\DeclareFontShape{LGR}{Junicode-OsF}{bsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpBold-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{x}{scit}{ + <-> \Junicode@@scale Junicode-ExpItalic-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{boldsemiexpanded}{n}{ - <-> alias * Junicode-OsF/bsx/n +\DeclareFontShape{LGR}{Junicode-OsF}{expanded}{scit}{ + <-> alias * Junicode-OsF/x/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{bsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{x}{it}{ + <-> \Junicode@@scale Junicode-ExpItalic-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{boldsemiexpanded}{scit}{ - <-> alias * Junicode-OsF/bsx/scit +\DeclareFontShape{LGR}{Junicode-OsF}{expanded}{it}{ + <-> alias * Junicode-OsF/x/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{bsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{x}{sc}{ + <-> \Junicode@@scale Junicode-Exp-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{boldsemiexpanded}{it}{ - <-> alias * Junicode-OsF/bsx/it +\DeclareFontShape{LGR}{Junicode-OsF}{expanded}{sc}{ + <-> alias * Junicode-OsF/x/sc }{} -\DeclareFontShape{LGR}{Junicode-OsF}{bsx}{scsl}{ - <-> ssub * Junicode-OsF/bsx/scit +\DeclareFontShape{LGR}{Junicode-OsF}{x}{sl}{ + <-> ssub * Junicode-OsF/x/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{boldsemiexpanded}{scsl}{ - <-> ssub * Junicode-OsF/boldsemiexpanded/scit +\DeclareFontShape{LGR}{Junicode-OsF}{expanded}{sl}{ + <-> ssub * Junicode-OsF/expanded/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{bsx}{sl}{ - <-> ssub * Junicode-OsF/bsx/it +\DeclareFontShape{LGR}{Junicode-OsF}{x}{scsl}{ + <-> ssub * Junicode-OsF/x/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{boldsemiexpanded}{sl}{ - <-> ssub * Junicode-OsF/boldsemiexpanded/it +\DeclareFontShape{LGR}{Junicode-OsF}{expanded}{scsl}{ + <-> ssub * Junicode-OsF/expanded/scit }{} -% ---- lc = lightcondensed ---- +% ---- b = bold ---- -\DeclareFontShape{LGR}{Junicode-OsF}{lc}{scit}{ - <-> \Junicode@@scale Junicode-CondLightItalic-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{b}{sc}{ + <-> \Junicode@@scale Junicode-Bold-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{lightcondensed}{scit}{ - <-> alias * Junicode-OsF/lc/scit +\DeclareFontShape{LGR}{Junicode-OsF}{bold}{sc}{ + <-> alias * Junicode-OsF/b/sc }{} -\DeclareFontShape{LGR}{Junicode-OsF}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{b}{it}{ + <-> \Junicode@@scale Junicode-BoldItalic-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{lightcondensed}{it}{ - <-> alias * Junicode-OsF/lc/it +\DeclareFontShape{LGR}{Junicode-OsF}{bold}{it}{ + <-> alias * Junicode-OsF/b/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{lc}{sc}{ - <-> \Junicode@@scale Junicode-CondLight-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{b}{scit}{ + <-> \Junicode@@scale Junicode-BoldItalic-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{lightcondensed}{sc}{ - <-> alias * Junicode-OsF/lc/sc +\DeclareFontShape{LGR}{Junicode-OsF}{bold}{scit}{ + <-> alias * Junicode-OsF/b/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{b}{n}{ + <-> \Junicode@@scale Junicode-Bold-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{lightcondensed}{n}{ - <-> alias * Junicode-OsF/lc/n +\DeclareFontShape{LGR}{Junicode-OsF}{bold}{n}{ + <-> alias * Junicode-OsF/b/n }{} -\DeclareFontShape{LGR}{Junicode-OsF}{lc}{scsl}{ - <-> ssub * Junicode-OsF/lc/scit +\DeclareFontShape{LGR}{Junicode-OsF}{b}{sl}{ + <-> ssub * Junicode-OsF/b/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{lightcondensed}{scsl}{ - <-> ssub * Junicode-OsF/lightcondensed/scit +\DeclareFontShape{LGR}{Junicode-OsF}{bold}{sl}{ + <-> ssub * Junicode-OsF/bold/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{lc}{sl}{ - <-> ssub * Junicode-OsF/lc/it +\DeclareFontShape{LGR}{Junicode-OsF}{b}{scsl}{ + <-> ssub * Junicode-OsF/b/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{lightcondensed}{sl}{ - <-> ssub * Junicode-OsF/lightcondensed/it +\DeclareFontShape{LGR}{Junicode-OsF}{bold}{scsl}{ + <-> ssub * Junicode-OsF/bold/scit }{} -% ---- sc = semicondensed ---- +% ---- sbx = semiboldexpanded ---- -\DeclareFontShape{LGR}{Junicode-OsF}{sc}{n}{ - <-> \Junicode@@scale Junicode-SmCond-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{sbx}{it}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semicondensed}{n}{ - <-> alias * Junicode-OsF/sc/n +\DeclareFontShape{LGR}{Junicode-OsF}{semiboldexpanded}{it}{ + <-> alias * Junicode-OsF/sbx/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{sc}{sc}{ - <-> \Junicode@@scale Junicode-SmCond-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{sbx}{scit}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semicondensed}{sc}{ - <-> alias * Junicode-OsF/sc/sc +\DeclareFontShape{LGR}{Junicode-OsF}{semiboldexpanded}{scit}{ + <-> alias * Junicode-OsF/sbx/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{sc}{it}{ - <-> \Junicode@@scale Junicode-SmCondItalic-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semicondensed}{it}{ - <-> alias * Junicode-OsF/sc/it +\DeclareFontShape{LGR}{Junicode-OsF}{semiboldexpanded}{n}{ + <-> alias * Junicode-OsF/sbx/n }{} -\DeclareFontShape{LGR}{Junicode-OsF}{sc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondItalic-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{sbx}{sc}{ + <-> \Junicode@@scale Junicode-ExpSmBold-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semicondensed}{scit}{ - <-> alias * Junicode-OsF/sc/scit +\DeclareFontShape{LGR}{Junicode-OsF}{semiboldexpanded}{sc}{ + <-> alias * Junicode-OsF/sbx/sc }{} -\DeclareFontShape{LGR}{Junicode-OsF}{sc}{scsl}{ - <-> ssub * Junicode-OsF/sc/scit +\DeclareFontShape{LGR}{Junicode-OsF}{sbx}{sl}{ + <-> ssub * Junicode-OsF/sbx/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semicondensed}{scsl}{ - <-> ssub * Junicode-OsF/semicondensed/scit +\DeclareFontShape{LGR}{Junicode-OsF}{semiboldexpanded}{sl}{ + <-> ssub * Junicode-OsF/semiboldexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{sc}{sl}{ - <-> ssub * Junicode-OsF/sc/it +\DeclareFontShape{LGR}{Junicode-OsF}{sbx}{scsl}{ + <-> ssub * Junicode-OsF/sbx/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semicondensed}{sl}{ - <-> ssub * Junicode-OsF/semicondensed/it +\DeclareFontShape{LGR}{Junicode-OsF}{semiboldexpanded}{scsl}{ + <-> ssub * Junicode-OsF/semiboldexpanded/scit }{} -% ---- sb = semibold ---- +% ---- c = condensed ---- -\DeclareFontShape{LGR}{Junicode-OsF}{sb}{scit}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semibold}{scit}{ - <-> alias * Junicode-OsF/sb/scit +\DeclareFontShape{LGR}{Junicode-OsF}{condensed}{it}{ + <-> alias * Junicode-OsF/c/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{sb}{it}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-osf-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semibold}{it}{ - <-> alias * Junicode-OsF/sb/it +\DeclareFontShape{LGR}{Junicode-OsF}{condensed}{n}{ + <-> alias * Junicode-OsF/c/n }{} -\DeclareFontShape{LGR}{Junicode-OsF}{sb}{sc}{ - <-> \Junicode@@scale Junicode-SmBold-osf-sc-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{c}{scit}{ + <-> \Junicode@@scale Junicode-CondItalic-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semibold}{sc}{ - <-> alias * Junicode-OsF/sb/sc +\DeclareFontShape{LGR}{Junicode-OsF}{condensed}{scit}{ + <-> alias * Junicode-OsF/c/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{sb}{n}{ - <-> \Junicode@@scale Junicode-SmBold-osf-lgr +\DeclareFontShape{LGR}{Junicode-OsF}{c}{sc}{ + <-> \Junicode@@scale Junicode-Cond-osf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semibold}{n}{ - <-> alias * Junicode-OsF/sb/n +\DeclareFontShape{LGR}{Junicode-OsF}{condensed}{sc}{ + <-> alias * Junicode-OsF/c/sc }{} -\DeclareFontShape{LGR}{Junicode-OsF}{sb}{scsl}{ - <-> ssub * Junicode-OsF/sb/scit +\DeclareFontShape{LGR}{Junicode-OsF}{c}{sl}{ + <-> ssub * Junicode-OsF/c/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semibold}{scsl}{ - <-> ssub * Junicode-OsF/semibold/scit +\DeclareFontShape{LGR}{Junicode-OsF}{condensed}{sl}{ + <-> ssub * Junicode-OsF/condensed/it }{} -\DeclareFontShape{LGR}{Junicode-OsF}{sb}{sl}{ - <-> ssub * Junicode-OsF/sb/it +\DeclareFontShape{LGR}{Junicode-OsF}{c}{scsl}{ + <-> ssub * Junicode-OsF/c/scit }{} -\DeclareFontShape{LGR}{Junicode-OsF}{semibold}{sl}{ - <-> ssub * Junicode-OsF/semibold/it +\DeclareFontShape{LGR}{Junicode-OsF}{condensed}{scsl}{ + <-> ssub * Junicode-OsF/condensed/scit }{} diff --git a/Master/texmf-dist/tex/latex/junicode/LGRJunicode-Sup.fd b/Master/texmf-dist/tex/latex/junicode/LGRJunicode-Sup.fd index 01cd3f1df7a..f9051a7c583 100644 --- a/Master/texmf-dist/tex/latex/junicode/LGRJunicode-Sup.fd +++ b/Master/texmf-dist/tex/latex/junicode/LGRJunicode-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{LGRJunicode-Sup.fd} - [2024/06/03 (autoinst) Font definitions for LGR/Junicode-Sup.] + [2024/07/21 (autoinst) Font definitions for LGR/Junicode-Sup.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,23 +20,16 @@ \DeclareFontFamily{LGR}{Junicode-Sup}{} -% ---- mediumsemicondensed ---- - -\DeclareFontShape{LGR}{Junicode-Sup}{mediumsemicondensed}{n}{ - <-> \Junicode@@scale Junicode-SmCondMedium-sup-lgr -}{} +% ---- sbx = semiboldexpanded ---- -\DeclareFontShape{LGR}{Junicode-Sup}{mediumsemicondensed}{it}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-sup-lgr +\DeclareFontShape{LGR}{Junicode-Sup}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-sup-lgr }{} -\DeclareFontShape{LGR}{Junicode-Sup}{mediumsemicondensed}{sl}{ - <-> ssub * Junicode-Sup/mediumsemicondensed/it +\DeclareFontShape{LGR}{Junicode-Sup}{semiboldexpanded}{n}{ + <-> alias * Junicode-Sup/sbx/n }{} - -% ---- sbx = semiboldexpanded ---- - \DeclareFontShape{LGR}{Junicode-Sup}{sbx}{it}{ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-sup-lgr }{} @@ -45,14 +38,6 @@ <-> alias * Junicode-Sup/sbx/it }{} -\DeclareFontShape{LGR}{Junicode-Sup}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-sup-lgr -}{} - -\DeclareFontShape{LGR}{Junicode-Sup}{semiboldexpanded}{n}{ - <-> alias * Junicode-Sup/sbx/n -}{} - \DeclareFontShape{LGR}{Junicode-Sup}{sbx}{sl}{ <-> ssub * Junicode-Sup/sbx/it }{} @@ -62,111 +47,99 @@ }{} -% ---- lc = lightcondensed ---- - -\DeclareFontShape{LGR}{Junicode-Sup}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-sup-lgr -}{} +% ---- c = condensed ---- -\DeclareFontShape{LGR}{Junicode-Sup}{lightcondensed}{n}{ - <-> alias * Junicode-Sup/lc/n +\DeclareFontShape{LGR}{Junicode-Sup}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-sup-lgr }{} -\DeclareFontShape{LGR}{Junicode-Sup}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-sup-lgr +\DeclareFontShape{LGR}{Junicode-Sup}{condensed}{n}{ + <-> alias * Junicode-Sup/c/n }{} -\DeclareFontShape{LGR}{Junicode-Sup}{lightcondensed}{it}{ - <-> alias * Junicode-Sup/lc/it +\DeclareFontShape{LGR}{Junicode-Sup}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-sup-lgr }{} -\DeclareFontShape{LGR}{Junicode-Sup}{lc}{sl}{ - <-> ssub * Junicode-Sup/lc/it +\DeclareFontShape{LGR}{Junicode-Sup}{condensed}{it}{ + <-> alias * Junicode-Sup/c/it }{} -\DeclareFontShape{LGR}{Junicode-Sup}{lightcondensed}{sl}{ - <-> ssub * Junicode-Sup/lightcondensed/it +\DeclareFontShape{LGR}{Junicode-Sup}{c}{sl}{ + <-> ssub * Junicode-Sup/c/it }{} - -% ---- bsx = boldsemiexpanded ---- - -\DeclareFontShape{LGR}{Junicode-Sup}{bsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-sup-lgr +\DeclareFontShape{LGR}{Junicode-Sup}{condensed}{sl}{ + <-> ssub * Junicode-Sup/condensed/it }{} -\DeclareFontShape{LGR}{Junicode-Sup}{boldsemiexpanded}{it}{ - <-> alias * Junicode-Sup/bsx/it -}{} -\DeclareFontShape{LGR}{Junicode-Sup}{bsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpBold-sup-lgr -}{} +% ---- mediumexpanded ---- -\DeclareFontShape{LGR}{Junicode-Sup}{boldsemiexpanded}{n}{ - <-> alias * Junicode-Sup/bsx/n +\DeclareFontShape{LGR}{Junicode-Sup}{mediumexpanded}{n}{ + <-> \Junicode@@scale Junicode-ExpMedium-sup-lgr }{} -\DeclareFontShape{LGR}{Junicode-Sup}{bsx}{sl}{ - <-> ssub * Junicode-Sup/bsx/it +\DeclareFontShape{LGR}{Junicode-Sup}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-sup-lgr }{} -\DeclareFontShape{LGR}{Junicode-Sup}{boldsemiexpanded}{sl}{ - <-> ssub * Junicode-Sup/boldsemiexpanded/it +\DeclareFontShape{LGR}{Junicode-Sup}{mediumexpanded}{sl}{ + <-> ssub * Junicode-Sup/mediumexpanded/it }{} -% ---- sc = semicondensed ---- +% ---- lsc = lightsemicondensed ---- -\DeclareFontShape{LGR}{Junicode-Sup}{sc}{n}{ - <-> \Junicode@@scale Junicode-SmCond-sup-lgr +\DeclareFontShape{LGR}{Junicode-Sup}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-sup-lgr }{} -\DeclareFontShape{LGR}{Junicode-Sup}{semicondensed}{n}{ - <-> alias * Junicode-Sup/sc/n +\DeclareFontShape{LGR}{Junicode-Sup}{lightsemicondensed}{n}{ + <-> alias * Junicode-Sup/lsc/n }{} -\DeclareFontShape{LGR}{Junicode-Sup}{sc}{it}{ - <-> \Junicode@@scale Junicode-SmCondItalic-sup-lgr +\DeclareFontShape{LGR}{Junicode-Sup}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-sup-lgr }{} -\DeclareFontShape{LGR}{Junicode-Sup}{semicondensed}{it}{ - <-> alias * Junicode-Sup/sc/it +\DeclareFontShape{LGR}{Junicode-Sup}{lightsemicondensed}{it}{ + <-> alias * Junicode-Sup/lsc/it }{} -\DeclareFontShape{LGR}{Junicode-Sup}{sc}{sl}{ - <-> ssub * Junicode-Sup/sc/it +\DeclareFontShape{LGR}{Junicode-Sup}{lsc}{sl}{ + <-> ssub * Junicode-Sup/lsc/it }{} -\DeclareFontShape{LGR}{Junicode-Sup}{semicondensed}{sl}{ - <-> ssub * Junicode-Sup/semicondensed/it +\DeclareFontShape{LGR}{Junicode-Sup}{lightsemicondensed}{sl}{ + <-> ssub * Junicode-Sup/lightsemicondensed/it }{} -% ---- sb = semibold ---- +% ---- x = expanded ---- -\DeclareFontShape{LGR}{Junicode-Sup}{sb}{it}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-sup-lgr +\DeclareFontShape{LGR}{Junicode-Sup}{x}{n}{ + <-> \Junicode@@scale Junicode-Exp-sup-lgr }{} -\DeclareFontShape{LGR}{Junicode-Sup}{semibold}{it}{ - <-> alias * Junicode-Sup/sb/it +\DeclareFontShape{LGR}{Junicode-Sup}{expanded}{n}{ + <-> alias * Junicode-Sup/x/n }{} -\DeclareFontShape{LGR}{Junicode-Sup}{sb}{n}{ - <-> \Junicode@@scale Junicode-SmBold-sup-lgr +\DeclareFontShape{LGR}{Junicode-Sup}{x}{it}{ + <-> \Junicode@@scale Junicode-ExpItalic-sup-lgr }{} -\DeclareFontShape{LGR}{Junicode-Sup}{semibold}{n}{ - <-> alias * Junicode-Sup/sb/n +\DeclareFontShape{LGR}{Junicode-Sup}{expanded}{it}{ + <-> alias * Junicode-Sup/x/it }{} -\DeclareFontShape{LGR}{Junicode-Sup}{sb}{sl}{ - <-> ssub * Junicode-Sup/sb/it +\DeclareFontShape{LGR}{Junicode-Sup}{x}{sl}{ + <-> ssub * Junicode-Sup/x/it }{} -\DeclareFontShape{LGR}{Junicode-Sup}{semibold}{sl}{ - <-> ssub * Junicode-Sup/semibold/it +\DeclareFontShape{LGR}{Junicode-Sup}{expanded}{sl}{ + <-> ssub * Junicode-Sup/expanded/it }{} @@ -197,18 +170,30 @@ }{} -% ---- mediumcondensed ---- +% ---- sx = semiexpanded ---- -\DeclareFontShape{LGR}{Junicode-Sup}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-sup-lgr +\DeclareFontShape{LGR}{Junicode-Sup}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-sup-lgr }{} -\DeclareFontShape{LGR}{Junicode-Sup}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-sup-lgr +\DeclareFontShape{LGR}{Junicode-Sup}{semiexpanded}{it}{ + <-> alias * Junicode-Sup/sx/it }{} -\DeclareFontShape{LGR}{Junicode-Sup}{mediumcondensed}{sl}{ - <-> ssub * Junicode-Sup/mediumcondensed/it +\DeclareFontShape{LGR}{Junicode-Sup}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-sup-lgr +}{} + +\DeclareFontShape{LGR}{Junicode-Sup}{semiexpanded}{n}{ + <-> alias * Junicode-Sup/sx/n +}{} + +\DeclareFontShape{LGR}{Junicode-Sup}{sx}{sl}{ + <-> ssub * Junicode-Sup/sx/it +}{} + +\DeclareFontShape{LGR}{Junicode-Sup}{semiexpanded}{sl}{ + <-> ssub * Junicode-Sup/semiexpanded/it }{} @@ -239,30 +224,60 @@ }{} -% ---- bx = boldexpanded ---- +% ---- mediumsemicondensed ---- -\DeclareFontShape{LGR}{Junicode-Sup}{bx}{n}{ - <-> \Junicode@@scale Junicode-ExpBold-sup-lgr +\DeclareFontShape{LGR}{Junicode-Sup}{mediumsemicondensed}{it}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-sup-lgr }{} -\DeclareFontShape{LGR}{Junicode-Sup}{boldexpanded}{n}{ - <-> alias * Junicode-Sup/bx/n +\DeclareFontShape{LGR}{Junicode-Sup}{mediumsemicondensed}{n}{ + <-> \Junicode@@scale Junicode-SmCondMedium-sup-lgr }{} -\DeclareFontShape{LGR}{Junicode-Sup}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-sup-lgr +\DeclareFontShape{LGR}{Junicode-Sup}{mediumsemicondensed}{sl}{ + <-> ssub * Junicode-Sup/mediumsemicondensed/it }{} -\DeclareFontShape{LGR}{Junicode-Sup}{boldexpanded}{it}{ - <-> alias * Junicode-Sup/bx/it + +% ---- lc = lightcondensed ---- + +\DeclareFontShape{LGR}{Junicode-Sup}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-sup-lgr }{} -\DeclareFontShape{LGR}{Junicode-Sup}{bx}{sl}{ - <-> ssub * Junicode-Sup/bx/it +\DeclareFontShape{LGR}{Junicode-Sup}{lightcondensed}{n}{ + <-> alias * Junicode-Sup/lc/n }{} -\DeclareFontShape{LGR}{Junicode-Sup}{boldexpanded}{sl}{ - <-> ssub * Junicode-Sup/boldexpanded/it +\DeclareFontShape{LGR}{Junicode-Sup}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-sup-lgr +}{} + +\DeclareFontShape{LGR}{Junicode-Sup}{lightcondensed}{it}{ + <-> alias * Junicode-Sup/lc/it +}{} + +\DeclareFontShape{LGR}{Junicode-Sup}{lc}{sl}{ + <-> ssub * Junicode-Sup/lc/it +}{} + +\DeclareFontShape{LGR}{Junicode-Sup}{lightcondensed}{sl}{ + <-> ssub * Junicode-Sup/lightcondensed/it +}{} + + +% ---- mediumsemiexpanded ---- + +\DeclareFontShape{LGR}{Junicode-Sup}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-sup-lgr +}{} + +\DeclareFontShape{LGR}{Junicode-Sup}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-sup-lgr +}{} + +\DeclareFontShape{LGR}{Junicode-Sup}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-Sup/mediumsemiexpanded/it }{} @@ -308,168 +323,153 @@ }{} -% ---- lsc = lightsemicondensed ---- +% ---- bx = boldexpanded ---- -\DeclareFontShape{LGR}{Junicode-Sup}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-sup-lgr +\DeclareFontShape{LGR}{Junicode-Sup}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-sup-lgr }{} -\DeclareFontShape{LGR}{Junicode-Sup}{lightsemicondensed}{n}{ - <-> alias * Junicode-Sup/lsc/n +\DeclareFontShape{LGR}{Junicode-Sup}{boldexpanded}{it}{ + <-> alias * Junicode-Sup/bx/it }{} -\DeclareFontShape{LGR}{Junicode-Sup}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-sup-lgr +\DeclareFontShape{LGR}{Junicode-Sup}{bx}{n}{ + <-> \Junicode@@scale Junicode-ExpBold-sup-lgr }{} -\DeclareFontShape{LGR}{Junicode-Sup}{lightsemicondensed}{it}{ - <-> alias * Junicode-Sup/lsc/it +\DeclareFontShape{LGR}{Junicode-Sup}{boldexpanded}{n}{ + <-> alias * Junicode-Sup/bx/n }{} -\DeclareFontShape{LGR}{Junicode-Sup}{lsc}{sl}{ - <-> ssub * Junicode-Sup/lsc/it +\DeclareFontShape{LGR}{Junicode-Sup}{bx}{sl}{ + <-> ssub * Junicode-Sup/bx/it }{} -\DeclareFontShape{LGR}{Junicode-Sup}{lightsemicondensed}{sl}{ - <-> ssub * Junicode-Sup/lightsemicondensed/it +\DeclareFontShape{LGR}{Junicode-Sup}{boldexpanded}{sl}{ + <-> ssub * Junicode-Sup/boldexpanded/it }{} -% ---- c = condensed ---- +% ---- bsx = boldsemiexpanded ---- -\DeclareFontShape{LGR}{Junicode-Sup}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-sup-lgr +\DeclareFontShape{LGR}{Junicode-Sup}{bsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-sup-lgr }{} -\DeclareFontShape{LGR}{Junicode-Sup}{condensed}{n}{ - <-> alias * Junicode-Sup/c/n +\DeclareFontShape{LGR}{Junicode-Sup}{boldsemiexpanded}{it}{ + <-> alias * Junicode-Sup/bsx/it }{} -\DeclareFontShape{LGR}{Junicode-Sup}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-sup-lgr +\DeclareFontShape{LGR}{Junicode-Sup}{bsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpBold-sup-lgr }{} -\DeclareFontShape{LGR}{Junicode-Sup}{condensed}{it}{ - <-> alias * Junicode-Sup/c/it +\DeclareFontShape{LGR}{Junicode-Sup}{boldsemiexpanded}{n}{ + <-> alias * Junicode-Sup/bsx/n }{} -\DeclareFontShape{LGR}{Junicode-Sup}{c}{sl}{ - <-> ssub * Junicode-Sup/c/it +\DeclareFontShape{LGR}{Junicode-Sup}{bsx}{sl}{ + <-> ssub * Junicode-Sup/bsx/it }{} -\DeclareFontShape{LGR}{Junicode-Sup}{condensed}{sl}{ - <-> ssub * Junicode-Sup/condensed/it +\DeclareFontShape{LGR}{Junicode-Sup}{boldsemiexpanded}{sl}{ + <-> ssub * Junicode-Sup/boldsemiexpanded/it }{} -% ---- x = expanded ---- - -\DeclareFontShape{LGR}{Junicode-Sup}{x}{n}{ - <-> \Junicode@@scale Junicode-Exp-sup-lgr -}{} +% ---- sbsx = semiboldsemiexpanded ---- -\DeclareFontShape{LGR}{Junicode-Sup}{expanded}{n}{ - <-> alias * Junicode-Sup/x/n +\DeclareFontShape{LGR}{Junicode-Sup}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-sup-lgr }{} -\DeclareFontShape{LGR}{Junicode-Sup}{x}{it}{ - <-> \Junicode@@scale Junicode-ExpItalic-sup-lgr +\DeclareFontShape{LGR}{Junicode-Sup}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-Sup/sbsx/n }{} -\DeclareFontShape{LGR}{Junicode-Sup}{expanded}{it}{ - <-> alias * Junicode-Sup/x/it +\DeclareFontShape{LGR}{Junicode-Sup}{sbsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-sup-lgr }{} -\DeclareFontShape{LGR}{Junicode-Sup}{x}{sl}{ - <-> ssub * Junicode-Sup/x/it +\DeclareFontShape{LGR}{Junicode-Sup}{semiboldsemiexpanded}{it}{ + <-> alias * Junicode-Sup/sbsx/it }{} -\DeclareFontShape{LGR}{Junicode-Sup}{expanded}{sl}{ - <-> ssub * Junicode-Sup/expanded/it +\DeclareFontShape{LGR}{Junicode-Sup}{sbsx}{sl}{ + <-> ssub * Junicode-Sup/sbsx/it }{} - -% ---- sx = semiexpanded ---- - -\DeclareFontShape{LGR}{Junicode-Sup}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-sup-lgr +\DeclareFontShape{LGR}{Junicode-Sup}{semiboldsemiexpanded}{sl}{ + <-> ssub * Junicode-Sup/semiboldsemiexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-Sup}{semiexpanded}{it}{ - <-> alias * Junicode-Sup/sx/it -}{} -\DeclareFontShape{LGR}{Junicode-Sup}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-sup-lgr -}{} +% ---- sc = semicondensed ---- -\DeclareFontShape{LGR}{Junicode-Sup}{semiexpanded}{n}{ - <-> alias * Junicode-Sup/sx/n +\DeclareFontShape{LGR}{Junicode-Sup}{sc}{it}{ + <-> \Junicode@@scale Junicode-SmCondItalic-sup-lgr }{} -\DeclareFontShape{LGR}{Junicode-Sup}{sx}{sl}{ - <-> ssub * Junicode-Sup/sx/it +\DeclareFontShape{LGR}{Junicode-Sup}{semicondensed}{it}{ + <-> alias * Junicode-Sup/sc/it }{} -\DeclareFontShape{LGR}{Junicode-Sup}{semiexpanded}{sl}{ - <-> ssub * Junicode-Sup/semiexpanded/it +\DeclareFontShape{LGR}{Junicode-Sup}{sc}{n}{ + <-> \Junicode@@scale Junicode-SmCond-sup-lgr }{} - -% ---- mediumexpanded ---- - -\DeclareFontShape{LGR}{Junicode-Sup}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-sup-lgr +\DeclareFontShape{LGR}{Junicode-Sup}{semicondensed}{n}{ + <-> alias * Junicode-Sup/sc/n }{} -\DeclareFontShape{LGR}{Junicode-Sup}{mediumexpanded}{n}{ - <-> \Junicode@@scale Junicode-ExpMedium-sup-lgr +\DeclareFontShape{LGR}{Junicode-Sup}{sc}{sl}{ + <-> ssub * Junicode-Sup/sc/it }{} -\DeclareFontShape{LGR}{Junicode-Sup}{mediumexpanded}{sl}{ - <-> ssub * Junicode-Sup/mediumexpanded/it +\DeclareFontShape{LGR}{Junicode-Sup}{semicondensed}{sl}{ + <-> ssub * Junicode-Sup/semicondensed/it }{} -% ---- sbsx = semiboldsemiexpanded ---- +% ---- sb = semibold ---- -\DeclareFontShape{LGR}{Junicode-Sup}{sbsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-sup-lgr +\DeclareFontShape{LGR}{Junicode-Sup}{sb}{it}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-sup-lgr }{} -\DeclareFontShape{LGR}{Junicode-Sup}{semiboldsemiexpanded}{it}{ - <-> alias * Junicode-Sup/sbsx/it +\DeclareFontShape{LGR}{Junicode-Sup}{semibold}{it}{ + <-> alias * Junicode-Sup/sb/it }{} -\DeclareFontShape{LGR}{Junicode-Sup}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-sup-lgr +\DeclareFontShape{LGR}{Junicode-Sup}{sb}{n}{ + <-> \Junicode@@scale Junicode-SmBold-sup-lgr }{} -\DeclareFontShape{LGR}{Junicode-Sup}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-Sup/sbsx/n +\DeclareFontShape{LGR}{Junicode-Sup}{semibold}{n}{ + <-> alias * Junicode-Sup/sb/n }{} -\DeclareFontShape{LGR}{Junicode-Sup}{sbsx}{sl}{ - <-> ssub * Junicode-Sup/sbsx/it +\DeclareFontShape{LGR}{Junicode-Sup}{sb}{sl}{ + <-> ssub * Junicode-Sup/sb/it }{} -\DeclareFontShape{LGR}{Junicode-Sup}{semiboldsemiexpanded}{sl}{ - <-> ssub * Junicode-Sup/semiboldsemiexpanded/it +\DeclareFontShape{LGR}{Junicode-Sup}{semibold}{sl}{ + <-> ssub * Junicode-Sup/semibold/it }{} -% ---- mediumsemiexpanded ---- +% ---- mediumcondensed ---- -\DeclareFontShape{LGR}{Junicode-Sup}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-sup-lgr +\DeclareFontShape{LGR}{Junicode-Sup}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-sup-lgr }{} -\DeclareFontShape{LGR}{Junicode-Sup}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-sup-lgr +\DeclareFontShape{LGR}{Junicode-Sup}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-sup-lgr }{} -\DeclareFontShape{LGR}{Junicode-Sup}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-Sup/mediumsemiexpanded/it +\DeclareFontShape{LGR}{Junicode-Sup}{mediumcondensed}{sl}{ + <-> ssub * Junicode-Sup/mediumcondensed/it }{} diff --git a/Master/texmf-dist/tex/latex/junicode/LGRJunicode-TLF.fd b/Master/texmf-dist/tex/latex/junicode/LGRJunicode-TLF.fd index 64237086df5..d0970130c3d 100644 --- a/Master/texmf-dist/tex/latex/junicode/LGRJunicode-TLF.fd +++ b/Master/texmf-dist/tex/latex/junicode/LGRJunicode-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{LGRJunicode-TLF.fd} - [2024/06/03 (autoinst) Font definitions for LGR/Junicode-TLF.] + [2024/07/21 (autoinst) Font definitions for LGR/Junicode-TLF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,607 +20,626 @@ \DeclareFontFamily{LGR}{Junicode-TLF}{} -% ---- lsc = lightsemicondensed ---- +% ---- sbx = semiboldexpanded ---- -\DeclareFontShape{LGR}{Junicode-TLF}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{lightsemicondensed}{it}{ - <-> alias * Junicode-TLF/lsc/it +\DeclareFontShape{LGR}{Junicode-TLF}{semiboldexpanded}{n}{ + <-> alias * Junicode-TLF/sbx/n }{} -\DeclareFontShape{LGR}{Junicode-TLF}{lsc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{sbx}{scit}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{lightsemicondensed}{scit}{ - <-> alias * Junicode-TLF/lsc/scit +\DeclareFontShape{LGR}{Junicode-TLF}{semiboldexpanded}{scit}{ + <-> alias * Junicode-TLF/sbx/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{sbx}{it}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{lightsemicondensed}{n}{ - <-> alias * Junicode-TLF/lsc/n +\DeclareFontShape{LGR}{Junicode-TLF}{semiboldexpanded}{it}{ + <-> alias * Junicode-TLF/sbx/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{lsc}{sc}{ - <-> \Junicode@@scale Junicode-SmCondLight-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{sbx}{sc}{ + <-> \Junicode@@scale Junicode-ExpSmBold-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{lightsemicondensed}{sc}{ - <-> alias * Junicode-TLF/lsc/sc +\DeclareFontShape{LGR}{Junicode-TLF}{semiboldexpanded}{sc}{ + <-> alias * Junicode-TLF/sbx/sc }{} -\DeclareFontShape{LGR}{Junicode-TLF}{lsc}{scsl}{ - <-> ssub * Junicode-TLF/lsc/scit +\DeclareFontShape{LGR}{Junicode-TLF}{sbx}{sl}{ + <-> ssub * Junicode-TLF/sbx/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{lightsemicondensed}{scsl}{ - <-> ssub * Junicode-TLF/lightsemicondensed/scit +\DeclareFontShape{LGR}{Junicode-TLF}{semiboldexpanded}{sl}{ + <-> ssub * Junicode-TLF/semiboldexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{lsc}{sl}{ - <-> ssub * Junicode-TLF/lsc/it +\DeclareFontShape{LGR}{Junicode-TLF}{sbx}{scsl}{ + <-> ssub * Junicode-TLF/sbx/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{lightsemicondensed}{sl}{ - <-> ssub * Junicode-TLF/lightsemicondensed/it +\DeclareFontShape{LGR}{Junicode-TLF}{semiboldexpanded}{scsl}{ + <-> ssub * Junicode-TLF/semiboldexpanded/scit }{} -% ---- medium ---- +% ---- c = condensed ---- -\DeclareFontShape{LGR}{Junicode-TLF}{medium}{it}{ - <-> \Junicode@@scale Junicode-MediumItalic-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{medium}{scit}{ - <-> \Junicode@@scale Junicode-MediumItalic-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{condensed}{n}{ + <-> alias * Junicode-TLF/c/n }{} -\DeclareFontShape{LGR}{Junicode-TLF}{medium}{n}{ - <-> \Junicode@@scale Junicode-Medium-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{c}{scit}{ + <-> \Junicode@@scale Junicode-CondItalic-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{medium}{sc}{ - <-> \Junicode@@scale Junicode-Medium-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{condensed}{scit}{ + <-> alias * Junicode-TLF/c/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{medium}{scsl}{ - <-> ssub * Junicode-TLF/medium/scit +\DeclareFontShape{LGR}{Junicode-TLF}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{medium}{sl}{ - <-> ssub * Junicode-TLF/medium/it +\DeclareFontShape{LGR}{Junicode-TLF}{condensed}{it}{ + <-> alias * Junicode-TLF/c/it }{} - -% ---- m = regular ---- - -\DeclareFontShape{LGR}{Junicode-TLF}{m}{sc}{ - <-> \Junicode@@scale Junicode-Regular-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{c}{sc}{ + <-> \Junicode@@scale Junicode-Cond-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{regular}{sc}{ - <-> alias * Junicode-TLF/m/sc +\DeclareFontShape{LGR}{Junicode-TLF}{condensed}{sc}{ + <-> alias * Junicode-TLF/c/sc }{} -\DeclareFontShape{LGR}{Junicode-TLF}{m}{n}{ - <-> \Junicode@@scale Junicode-Regular-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{c}{sl}{ + <-> ssub * Junicode-TLF/c/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{regular}{n}{ - <-> alias * Junicode-TLF/m/n +\DeclareFontShape{LGR}{Junicode-TLF}{condensed}{sl}{ + <-> ssub * Junicode-TLF/condensed/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{m}{scit}{ - <-> \Junicode@@scale Junicode-Italic-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{c}{scsl}{ + <-> ssub * Junicode-TLF/c/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{regular}{scit}{ - <-> alias * Junicode-TLF/m/scit +\DeclareFontShape{LGR}{Junicode-TLF}{condensed}{scsl}{ + <-> ssub * Junicode-TLF/condensed/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{m}{it}{ - <-> \Junicode@@scale Junicode-Italic-tlf-lgr + +% ---- mediumexpanded ---- + +\DeclareFontShape{LGR}{Junicode-TLF}{mediumexpanded}{sc}{ + <-> \Junicode@@scale Junicode-ExpMedium-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{regular}{it}{ - <-> alias * Junicode-TLF/m/it +\DeclareFontShape{LGR}{Junicode-TLF}{mediumexpanded}{scit}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{m}{scsl}{ - <-> ssub * Junicode-TLF/m/scit +\DeclareFontShape{LGR}{Junicode-TLF}{mediumexpanded}{n}{ + <-> \Junicode@@scale Junicode-ExpMedium-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{regular}{scsl}{ - <-> ssub * Junicode-TLF/regular/scit +\DeclareFontShape{LGR}{Junicode-TLF}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{m}{sl}{ - <-> ssub * Junicode-TLF/m/it +\DeclareFontShape{LGR}{Junicode-TLF}{mediumexpanded}{sl}{ + <-> ssub * Junicode-TLF/mediumexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{regular}{sl}{ - <-> ssub * Junicode-TLF/regular/it +\DeclareFontShape{LGR}{Junicode-TLF}{mediumexpanded}{scsl}{ + <-> ssub * Junicode-TLF/mediumexpanded/scit }{} -% ---- bx = boldexpanded ---- +% ---- lsc = lightsemicondensed ---- -\DeclareFontShape{LGR}{Junicode-TLF}{bx}{sc}{ - <-> \Junicode@@scale Junicode-ExpBold-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{lsc}{sc}{ + <-> \Junicode@@scale Junicode-SmCondLight-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{boldexpanded}{sc}{ - <-> alias * Junicode-TLF/bx/sc +\DeclareFontShape{LGR}{Junicode-TLF}{lightsemicondensed}{sc}{ + <-> alias * Junicode-TLF/lsc/sc }{} -\DeclareFontShape{LGR}{Junicode-TLF}{bx}{n}{ - <-> \Junicode@@scale Junicode-ExpBold-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{lsc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{boldexpanded}{n}{ - <-> alias * Junicode-TLF/bx/n +\DeclareFontShape{LGR}{Junicode-TLF}{lightsemicondensed}{scit}{ + <-> alias * Junicode-TLF/lsc/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{bx}{scit}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{boldexpanded}{scit}{ - <-> alias * Junicode-TLF/bx/scit +\DeclareFontShape{LGR}{Junicode-TLF}{lightsemicondensed}{n}{ + <-> alias * Junicode-TLF/lsc/n }{} -\DeclareFontShape{LGR}{Junicode-TLF}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{boldexpanded}{it}{ - <-> alias * Junicode-TLF/bx/it +\DeclareFontShape{LGR}{Junicode-TLF}{lightsemicondensed}{it}{ + <-> alias * Junicode-TLF/lsc/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{bx}{scsl}{ - <-> ssub * Junicode-TLF/bx/scit +\DeclareFontShape{LGR}{Junicode-TLF}{lsc}{sl}{ + <-> ssub * Junicode-TLF/lsc/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{boldexpanded}{scsl}{ - <-> ssub * Junicode-TLF/boldexpanded/scit +\DeclareFontShape{LGR}{Junicode-TLF}{lightsemicondensed}{sl}{ + <-> ssub * Junicode-TLF/lightsemicondensed/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{bx}{sl}{ - <-> ssub * Junicode-TLF/bx/it +\DeclareFontShape{LGR}{Junicode-TLF}{lsc}{scsl}{ + <-> ssub * Junicode-TLF/lsc/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{boldexpanded}{sl}{ - <-> ssub * Junicode-TLF/boldexpanded/it +\DeclareFontShape{LGR}{Junicode-TLF}{lightsemicondensed}{scsl}{ + <-> ssub * Junicode-TLF/lightsemicondensed/scit }{} -% ---- l = light ---- +% ---- x = expanded ---- -\DeclareFontShape{LGR}{Junicode-TLF}{l}{scit}{ - <-> \Junicode@@scale Junicode-LightItalic-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{x}{sc}{ + <-> \Junicode@@scale Junicode-Exp-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{light}{scit}{ - <-> alias * Junicode-TLF/l/scit +\DeclareFontShape{LGR}{Junicode-TLF}{expanded}{sc}{ + <-> alias * Junicode-TLF/x/sc }{} -\DeclareFontShape{LGR}{Junicode-TLF}{l}{it}{ - <-> \Junicode@@scale Junicode-LightItalic-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{x}{scit}{ + <-> \Junicode@@scale Junicode-ExpItalic-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{light}{it}{ - <-> alias * Junicode-TLF/l/it +\DeclareFontShape{LGR}{Junicode-TLF}{expanded}{scit}{ + <-> alias * Junicode-TLF/x/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{l}{sc}{ - <-> \Junicode@@scale Junicode-Light-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{x}{n}{ + <-> \Junicode@@scale Junicode-Exp-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{light}{sc}{ - <-> alias * Junicode-TLF/l/sc +\DeclareFontShape{LGR}{Junicode-TLF}{expanded}{n}{ + <-> alias * Junicode-TLF/x/n }{} -\DeclareFontShape{LGR}{Junicode-TLF}{l}{n}{ - <-> \Junicode@@scale Junicode-Light-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{x}{it}{ + <-> \Junicode@@scale Junicode-ExpItalic-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{light}{n}{ - <-> alias * Junicode-TLF/l/n +\DeclareFontShape{LGR}{Junicode-TLF}{expanded}{it}{ + <-> alias * Junicode-TLF/x/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{l}{scsl}{ - <-> ssub * Junicode-TLF/l/scit +\DeclareFontShape{LGR}{Junicode-TLF}{x}{sl}{ + <-> ssub * Junicode-TLF/x/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{light}{scsl}{ - <-> ssub * Junicode-TLF/light/scit +\DeclareFontShape{LGR}{Junicode-TLF}{expanded}{sl}{ + <-> ssub * Junicode-TLF/expanded/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{l}{sl}{ - <-> ssub * Junicode-TLF/l/it +\DeclareFontShape{LGR}{Junicode-TLF}{x}{scsl}{ + <-> ssub * Junicode-TLF/x/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{light}{sl}{ - <-> ssub * Junicode-TLF/light/it +\DeclareFontShape{LGR}{Junicode-TLF}{expanded}{scsl}{ + <-> ssub * Junicode-TLF/expanded/scit }{} -% ---- mediumsemiexpanded ---- +% ---- b = bold ---- -\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{b}{sc}{ + <-> \Junicode@@scale Junicode-Bold-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemiexpanded}{sc}{ - <-> \Junicode@@scale Junicode-SmExpMedium-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{bold}{sc}{ + <-> alias * Junicode-TLF/b/sc }{} -\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{b}{scit}{ + <-> \Junicode@@scale Junicode-BoldItalic-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemiexpanded}{scit}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{bold}{scit}{ + <-> alias * Junicode-TLF/b/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemiexpanded}{scsl}{ - <-> ssub * Junicode-TLF/mediumsemiexpanded/scit +\DeclareFontShape{LGR}{Junicode-TLF}{b}{n}{ + <-> \Junicode@@scale Junicode-Bold-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-TLF/mediumsemiexpanded/it +\DeclareFontShape{LGR}{Junicode-TLF}{bold}{n}{ + <-> alias * Junicode-TLF/b/n }{} +\DeclareFontShape{LGR}{Junicode-TLF}{b}{it}{ + <-> \Junicode@@scale Junicode-BoldItalic-tlf-lgr +}{} -% ---- sbsx = semiboldsemiexpanded ---- +\DeclareFontShape{LGR}{Junicode-TLF}{bold}{it}{ + <-> alias * Junicode-TLF/b/it +}{} -\DeclareFontShape{LGR}{Junicode-TLF}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{b}{sl}{ + <-> ssub * Junicode-TLF/b/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-TLF/sbsx/n +\DeclareFontShape{LGR}{Junicode-TLF}{bold}{sl}{ + <-> ssub * Junicode-TLF/bold/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{sbsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{b}{scsl}{ + <-> ssub * Junicode-TLF/b/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semiboldsemiexpanded}{sc}{ - <-> alias * Junicode-TLF/sbsx/sc +\DeclareFontShape{LGR}{Junicode-TLF}{bold}{scsl}{ + <-> ssub * Junicode-TLF/bold/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{sbsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-lgr + +% ---- sx = semiexpanded ---- + +\DeclareFontShape{LGR}{Junicode-TLF}{sx}{sc}{ + <-> \Junicode@@scale Junicode-SmExp-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semiboldsemiexpanded}{it}{ - <-> alias * Junicode-TLF/sbsx/it +\DeclareFontShape{LGR}{Junicode-TLF}{semiexpanded}{sc}{ + <-> alias * Junicode-TLF/sx/sc }{} -\DeclareFontShape{LGR}{Junicode-TLF}{sbsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semiboldsemiexpanded}{scit}{ - <-> alias * Junicode-TLF/sbsx/scit +\DeclareFontShape{LGR}{Junicode-TLF}{semiexpanded}{n}{ + <-> alias * Junicode-TLF/sx/n }{} -\DeclareFontShape{LGR}{Junicode-TLF}{sbsx}{scsl}{ - <-> ssub * Junicode-TLF/sbsx/scit +\DeclareFontShape{LGR}{Junicode-TLF}{sx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpItalic-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semiboldsemiexpanded}{scsl}{ - <-> ssub * Junicode-TLF/semiboldsemiexpanded/scit +\DeclareFontShape{LGR}{Junicode-TLF}{semiexpanded}{scit}{ + <-> alias * Junicode-TLF/sx/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{sbsx}{sl}{ - <-> ssub * Junicode-TLF/sbsx/it +\DeclareFontShape{LGR}{Junicode-TLF}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semiboldsemiexpanded}{sl}{ - <-> ssub * Junicode-TLF/semiboldsemiexpanded/it +\DeclareFontShape{LGR}{Junicode-TLF}{semiexpanded}{it}{ + <-> alias * Junicode-TLF/sx/it }{} +\DeclareFontShape{LGR}{Junicode-TLF}{sx}{sl}{ + <-> ssub * Junicode-TLF/sx/it +}{} -% ---- mediumexpanded ---- +\DeclareFontShape{LGR}{Junicode-TLF}{semiexpanded}{sl}{ + <-> ssub * Junicode-TLF/semiexpanded/it +}{} -\DeclareFontShape{LGR}{Junicode-TLF}{mediumexpanded}{n}{ - <-> \Junicode@@scale Junicode-ExpMedium-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{sx}{scsl}{ + <-> ssub * Junicode-TLF/sx/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{mediumexpanded}{sc}{ - <-> \Junicode@@scale Junicode-ExpMedium-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{semiexpanded}{scsl}{ + <-> ssub * Junicode-TLF/semiexpanded/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-lgr + +% ---- l = light ---- + +\DeclareFontShape{LGR}{Junicode-TLF}{l}{scit}{ + <-> \Junicode@@scale Junicode-LightItalic-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{mediumexpanded}{scit}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{light}{scit}{ + <-> alias * Junicode-TLF/l/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{mediumexpanded}{scsl}{ - <-> ssub * Junicode-TLF/mediumexpanded/scit +\DeclareFontShape{LGR}{Junicode-TLF}{l}{n}{ + <-> \Junicode@@scale Junicode-Light-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{mediumexpanded}{sl}{ - <-> ssub * Junicode-TLF/mediumexpanded/it +\DeclareFontShape{LGR}{Junicode-TLF}{light}{n}{ + <-> alias * Junicode-TLF/l/n }{} +\DeclareFontShape{LGR}{Junicode-TLF}{l}{it}{ + <-> \Junicode@@scale Junicode-LightItalic-tlf-lgr +}{} -% ---- sx = semiexpanded ---- +\DeclareFontShape{LGR}{Junicode-TLF}{light}{it}{ + <-> alias * Junicode-TLF/l/it +}{} -\DeclareFontShape{LGR}{Junicode-TLF}{sx}{sc}{ - <-> \Junicode@@scale Junicode-SmExp-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{l}{sc}{ + <-> \Junicode@@scale Junicode-Light-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semiexpanded}{sc}{ - <-> alias * Junicode-TLF/sx/sc +\DeclareFontShape{LGR}{Junicode-TLF}{light}{sc}{ + <-> alias * Junicode-TLF/l/sc }{} -\DeclareFontShape{LGR}{Junicode-TLF}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{l}{sl}{ + <-> ssub * Junicode-TLF/l/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semiexpanded}{n}{ - <-> alias * Junicode-TLF/sx/n +\DeclareFontShape{LGR}{Junicode-TLF}{light}{sl}{ + <-> ssub * Junicode-TLF/light/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{sx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpItalic-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{l}{scsl}{ + <-> ssub * Junicode-TLF/l/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semiexpanded}{scit}{ - <-> alias * Junicode-TLF/sx/scit +\DeclareFontShape{LGR}{Junicode-TLF}{light}{scsl}{ + <-> ssub * Junicode-TLF/light/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-tlf-lgr + +% ---- mediumsemicondensed ---- + +\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemicondensed}{scit}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semiexpanded}{it}{ - <-> alias * Junicode-TLF/sx/it +\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemicondensed}{n}{ + <-> \Junicode@@scale Junicode-SmCondMedium-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{sx}{scsl}{ - <-> ssub * Junicode-TLF/sx/scit +\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemicondensed}{it}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semiexpanded}{scsl}{ - <-> ssub * Junicode-TLF/semiexpanded/scit +\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemicondensed}{sc}{ + <-> \Junicode@@scale Junicode-SmCondMedium-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{sx}{sl}{ - <-> ssub * Junicode-TLF/sx/it +\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemicondensed}{sl}{ + <-> ssub * Junicode-TLF/mediumsemicondensed/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semiexpanded}{sl}{ - <-> ssub * Junicode-TLF/semiexpanded/it +\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemicondensed}{scsl}{ + <-> ssub * Junicode-TLF/mediumsemicondensed/scit }{} -% ---- c = condensed ---- +% ---- lc = lightcondensed ---- -\DeclareFontShape{LGR}{Junicode-TLF}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{lc}{scit}{ + <-> \Junicode@@scale Junicode-CondLightItalic-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{condensed}{it}{ - <-> alias * Junicode-TLF/c/it +\DeclareFontShape{LGR}{Junicode-TLF}{lightcondensed}{scit}{ + <-> alias * Junicode-TLF/lc/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{c}{scit}{ - <-> \Junicode@@scale Junicode-CondItalic-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{condensed}{scit}{ - <-> alias * Junicode-TLF/c/scit +\DeclareFontShape{LGR}{Junicode-TLF}{lightcondensed}{n}{ + <-> alias * Junicode-TLF/lc/n }{} -\DeclareFontShape{LGR}{Junicode-TLF}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{condensed}{n}{ - <-> alias * Junicode-TLF/c/n +\DeclareFontShape{LGR}{Junicode-TLF}{lightcondensed}{it}{ + <-> alias * Junicode-TLF/lc/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{c}{sc}{ - <-> \Junicode@@scale Junicode-Cond-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{lc}{sc}{ + <-> \Junicode@@scale Junicode-CondLight-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{condensed}{sc}{ - <-> alias * Junicode-TLF/c/sc +\DeclareFontShape{LGR}{Junicode-TLF}{lightcondensed}{sc}{ + <-> alias * Junicode-TLF/lc/sc }{} -\DeclareFontShape{LGR}{Junicode-TLF}{c}{scsl}{ - <-> ssub * Junicode-TLF/c/scit +\DeclareFontShape{LGR}{Junicode-TLF}{lc}{sl}{ + <-> ssub * Junicode-TLF/lc/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{condensed}{scsl}{ - <-> ssub * Junicode-TLF/condensed/scit +\DeclareFontShape{LGR}{Junicode-TLF}{lightcondensed}{sl}{ + <-> ssub * Junicode-TLF/lightcondensed/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{c}{sl}{ - <-> ssub * Junicode-TLF/c/it +\DeclareFontShape{LGR}{Junicode-TLF}{lc}{scsl}{ + <-> ssub * Junicode-TLF/lc/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{condensed}{sl}{ - <-> ssub * Junicode-TLF/condensed/it +\DeclareFontShape{LGR}{Junicode-TLF}{lightcondensed}{scsl}{ + <-> ssub * Junicode-TLF/lightcondensed/scit }{} -% ---- x = expanded ---- +% ---- m = regular ---- -\DeclareFontShape{LGR}{Junicode-TLF}{x}{n}{ - <-> \Junicode@@scale Junicode-Exp-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{m}{n}{ + <-> \Junicode@@scale Junicode-Regular-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{expanded}{n}{ - <-> alias * Junicode-TLF/x/n +\DeclareFontShape{LGR}{Junicode-TLF}{regular}{n}{ + <-> alias * Junicode-TLF/m/n }{} -\DeclareFontShape{LGR}{Junicode-TLF}{x}{sc}{ - <-> \Junicode@@scale Junicode-Exp-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{m}{scit}{ + <-> \Junicode@@scale Junicode-Italic-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{expanded}{sc}{ - <-> alias * Junicode-TLF/x/sc +\DeclareFontShape{LGR}{Junicode-TLF}{regular}{scit}{ + <-> alias * Junicode-TLF/m/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{x}{it}{ - <-> \Junicode@@scale Junicode-ExpItalic-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{m}{it}{ + <-> \Junicode@@scale Junicode-Italic-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{expanded}{it}{ - <-> alias * Junicode-TLF/x/it +\DeclareFontShape{LGR}{Junicode-TLF}{regular}{it}{ + <-> alias * Junicode-TLF/m/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{x}{scit}{ - <-> \Junicode@@scale Junicode-ExpItalic-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{m}{sc}{ + <-> \Junicode@@scale Junicode-Regular-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{expanded}{scit}{ - <-> alias * Junicode-TLF/x/scit +\DeclareFontShape{LGR}{Junicode-TLF}{regular}{sc}{ + <-> alias * Junicode-TLF/m/sc }{} -\DeclareFontShape{LGR}{Junicode-TLF}{x}{scsl}{ - <-> ssub * Junicode-TLF/x/scit +\DeclareFontShape{LGR}{Junicode-TLF}{m}{sl}{ + <-> ssub * Junicode-TLF/m/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{expanded}{scsl}{ - <-> ssub * Junicode-TLF/expanded/scit +\DeclareFontShape{LGR}{Junicode-TLF}{regular}{sl}{ + <-> ssub * Junicode-TLF/regular/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{x}{sl}{ - <-> ssub * Junicode-TLF/x/it +\DeclareFontShape{LGR}{Junicode-TLF}{m}{scsl}{ + <-> ssub * Junicode-TLF/m/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{expanded}{sl}{ - <-> ssub * Junicode-TLF/expanded/it +\DeclareFontShape{LGR}{Junicode-TLF}{regular}{scsl}{ + <-> ssub * Junicode-TLF/regular/scit }{} -% ---- sc = semicondensed ---- +% ---- mediumsemiexpanded ---- -\DeclareFontShape{LGR}{Junicode-TLF}{sc}{n}{ - <-> \Junicode@@scale Junicode-SmCond-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemiexpanded}{sc}{ + <-> \Junicode@@scale Junicode-SmExpMedium-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semicondensed}{n}{ - <-> alias * Junicode-TLF/sc/n +\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{sc}{sc}{ - <-> \Junicode@@scale Junicode-SmCond-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semicondensed}{sc}{ - <-> alias * Junicode-TLF/sc/sc +\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemiexpanded}{scit}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{sc}{it}{ - <-> \Junicode@@scale Junicode-SmCondItalic-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-TLF/mediumsemiexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semicondensed}{it}{ - <-> alias * Junicode-TLF/sc/it +\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemiexpanded}{scsl}{ + <-> ssub * Junicode-TLF/mediumsemiexpanded/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{sc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondItalic-tlf-sc-lgr + +% ---- medium ---- + +\DeclareFontShape{LGR}{Junicode-TLF}{medium}{sc}{ + <-> \Junicode@@scale Junicode-Medium-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semicondensed}{scit}{ - <-> alias * Junicode-TLF/sc/scit +\DeclareFontShape{LGR}{Junicode-TLF}{medium}{it}{ + <-> \Junicode@@scale Junicode-MediumItalic-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{sc}{scsl}{ - <-> ssub * Junicode-TLF/sc/scit +\DeclareFontShape{LGR}{Junicode-TLF}{medium}{scit}{ + <-> \Junicode@@scale Junicode-MediumItalic-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semicondensed}{scsl}{ - <-> ssub * Junicode-TLF/semicondensed/scit +\DeclareFontShape{LGR}{Junicode-TLF}{medium}{n}{ + <-> \Junicode@@scale Junicode-Medium-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{sc}{sl}{ - <-> ssub * Junicode-TLF/sc/it +\DeclareFontShape{LGR}{Junicode-TLF}{medium}{sl}{ + <-> ssub * Junicode-TLF/medium/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semicondensed}{sl}{ - <-> ssub * Junicode-TLF/semicondensed/it +\DeclareFontShape{LGR}{Junicode-TLF}{medium}{scsl}{ + <-> ssub * Junicode-TLF/medium/scit }{} -% ---- sb = semibold ---- +% ---- bx = boldexpanded ---- -\DeclareFontShape{LGR}{Junicode-TLF}{sb}{scit}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{bx}{sc}{ + <-> \Junicode@@scale Junicode-ExpBold-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semibold}{scit}{ - <-> alias * Junicode-TLF/sb/scit +\DeclareFontShape{LGR}{Junicode-TLF}{boldexpanded}{sc}{ + <-> alias * Junicode-TLF/bx/sc }{} -\DeclareFontShape{LGR}{Junicode-TLF}{sb}{it}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{bx}{scit}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semibold}{it}{ - <-> alias * Junicode-TLF/sb/it +\DeclareFontShape{LGR}{Junicode-TLF}{boldexpanded}{scit}{ + <-> alias * Junicode-TLF/bx/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{sb}{sc}{ - <-> \Junicode@@scale Junicode-SmBold-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{bx}{n}{ + <-> \Junicode@@scale Junicode-ExpBold-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semibold}{sc}{ - <-> alias * Junicode-TLF/sb/sc +\DeclareFontShape{LGR}{Junicode-TLF}{boldexpanded}{n}{ + <-> alias * Junicode-TLF/bx/n }{} -\DeclareFontShape{LGR}{Junicode-TLF}{sb}{n}{ - <-> \Junicode@@scale Junicode-SmBold-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semibold}{n}{ - <-> alias * Junicode-TLF/sb/n +\DeclareFontShape{LGR}{Junicode-TLF}{boldexpanded}{it}{ + <-> alias * Junicode-TLF/bx/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{sb}{scsl}{ - <-> ssub * Junicode-TLF/sb/scit +\DeclareFontShape{LGR}{Junicode-TLF}{bx}{sl}{ + <-> ssub * Junicode-TLF/bx/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semibold}{scsl}{ - <-> ssub * Junicode-TLF/semibold/scit +\DeclareFontShape{LGR}{Junicode-TLF}{boldexpanded}{sl}{ + <-> ssub * Junicode-TLF/boldexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{sb}{sl}{ - <-> ssub * Junicode-TLF/sb/it +\DeclareFontShape{LGR}{Junicode-TLF}{bx}{scsl}{ + <-> ssub * Junicode-TLF/bx/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semibold}{sl}{ - <-> ssub * Junicode-TLF/semibold/it +\DeclareFontShape{LGR}{Junicode-TLF}{boldexpanded}{scsl}{ + <-> ssub * Junicode-TLF/boldexpanded/scit }{} % ---- bsx = boldsemiexpanded ---- -\DeclareFontShape{LGR}{Junicode-TLF}{bsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpBold-tlf-lgr -}{} - -\DeclareFontShape{LGR}{Junicode-TLF}{boldsemiexpanded}{n}{ - <-> alias * Junicode-TLF/bsx/n -}{} - \DeclareFontShape{LGR}{Junicode-TLF}{bsx}{sc}{ <-> \Junicode@@scale Junicode-SmExpBold-tlf-sc-lgr }{} @@ -645,12 +664,12 @@ <-> alias * Junicode-TLF/bsx/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{bsx}{scsl}{ - <-> ssub * Junicode-TLF/bsx/scit +\DeclareFontShape{LGR}{Junicode-TLF}{bsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpBold-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{boldsemiexpanded}{scsl}{ - <-> ssub * Junicode-TLF/boldsemiexpanded/scit +\DeclareFontShape{LGR}{Junicode-TLF}{boldsemiexpanded}{n}{ + <-> alias * Junicode-TLF/bsx/n }{} \DeclareFontShape{LGR}{Junicode-TLF}{bsx}{sl}{ @@ -661,211 +680,192 @@ <-> ssub * Junicode-TLF/boldsemiexpanded/it }{} - -% ---- lc = lightcondensed ---- - -\DeclareFontShape{LGR}{Junicode-TLF}{lc}{scit}{ - <-> \Junicode@@scale Junicode-CondLightItalic-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{bsx}{scsl}{ + <-> ssub * Junicode-TLF/bsx/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{lightcondensed}{scit}{ - <-> alias * Junicode-TLF/lc/scit +\DeclareFontShape{LGR}{Junicode-TLF}{boldsemiexpanded}{scsl}{ + <-> ssub * Junicode-TLF/boldsemiexpanded/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-tlf-lgr -}{} -\DeclareFontShape{LGR}{Junicode-TLF}{lightcondensed}{it}{ - <-> alias * Junicode-TLF/lc/it -}{} +% ---- sbsx = semiboldsemiexpanded ---- -\DeclareFontShape{LGR}{Junicode-TLF}{lc}{sc}{ - <-> \Junicode@@scale Junicode-CondLight-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{sbsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{lightcondensed}{sc}{ - <-> alias * Junicode-TLF/lc/sc +\DeclareFontShape{LGR}{Junicode-TLF}{semiboldsemiexpanded}{sc}{ + <-> alias * Junicode-TLF/sbsx/sc }{} -\DeclareFontShape{LGR}{Junicode-TLF}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{lightcondensed}{n}{ - <-> alias * Junicode-TLF/lc/n +\DeclareFontShape{LGR}{Junicode-TLF}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-TLF/sbsx/n }{} -\DeclareFontShape{LGR}{Junicode-TLF}{lc}{scsl}{ - <-> ssub * Junicode-TLF/lc/scit +\DeclareFontShape{LGR}{Junicode-TLF}{sbsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{lightcondensed}{scsl}{ - <-> ssub * Junicode-TLF/lightcondensed/scit +\DeclareFontShape{LGR}{Junicode-TLF}{semiboldsemiexpanded}{scit}{ + <-> alias * Junicode-TLF/sbsx/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{lc}{sl}{ - <-> ssub * Junicode-TLF/lc/it +\DeclareFontShape{LGR}{Junicode-TLF}{sbsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{lightcondensed}{sl}{ - <-> ssub * Junicode-TLF/lightcondensed/it +\DeclareFontShape{LGR}{Junicode-TLF}{semiboldsemiexpanded}{it}{ + <-> alias * Junicode-TLF/sbsx/it }{} - -% ---- sbx = semiboldexpanded ---- - -\DeclareFontShape{LGR}{Junicode-TLF}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{sbsx}{sl}{ + <-> ssub * Junicode-TLF/sbsx/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semiboldexpanded}{n}{ - <-> alias * Junicode-TLF/sbx/n +\DeclareFontShape{LGR}{Junicode-TLF}{semiboldsemiexpanded}{sl}{ + <-> ssub * Junicode-TLF/semiboldsemiexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{sbx}{sc}{ - <-> \Junicode@@scale Junicode-ExpSmBold-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{sbsx}{scsl}{ + <-> ssub * Junicode-TLF/sbsx/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semiboldexpanded}{sc}{ - <-> alias * Junicode-TLF/sbx/sc +\DeclareFontShape{LGR}{Junicode-TLF}{semiboldsemiexpanded}{scsl}{ + <-> ssub * Junicode-TLF/semiboldsemiexpanded/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{sbx}{it}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-lgr -}{} -\DeclareFontShape{LGR}{Junicode-TLF}{semiboldexpanded}{it}{ - <-> alias * Junicode-TLF/sbx/it -}{} +% ---- sc = semicondensed ---- -\DeclareFontShape{LGR}{Junicode-TLF}{sbx}{scit}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{sc}{sc}{ + <-> \Junicode@@scale Junicode-SmCond-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semiboldexpanded}{scit}{ - <-> alias * Junicode-TLF/sbx/scit +\DeclareFontShape{LGR}{Junicode-TLF}{semicondensed}{sc}{ + <-> alias * Junicode-TLF/sc/sc }{} -\DeclareFontShape{LGR}{Junicode-TLF}{sbx}{scsl}{ - <-> ssub * Junicode-TLF/sbx/scit +\DeclareFontShape{LGR}{Junicode-TLF}{sc}{n}{ + <-> \Junicode@@scale Junicode-SmCond-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semiboldexpanded}{scsl}{ - <-> ssub * Junicode-TLF/semiboldexpanded/scit +\DeclareFontShape{LGR}{Junicode-TLF}{semicondensed}{n}{ + <-> alias * Junicode-TLF/sc/n }{} -\DeclareFontShape{LGR}{Junicode-TLF}{sbx}{sl}{ - <-> ssub * Junicode-TLF/sbx/it +\DeclareFontShape{LGR}{Junicode-TLF}{sc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondItalic-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{semiboldexpanded}{sl}{ - <-> ssub * Junicode-TLF/semiboldexpanded/it +\DeclareFontShape{LGR}{Junicode-TLF}{semicondensed}{scit}{ + <-> alias * Junicode-TLF/sc/scit }{} - -% ---- mediumsemicondensed ---- - -\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemicondensed}{it}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{sc}{it}{ + <-> \Junicode@@scale Junicode-SmCondItalic-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemicondensed}{scit}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{semicondensed}{it}{ + <-> alias * Junicode-TLF/sc/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemicondensed}{n}{ - <-> \Junicode@@scale Junicode-SmCondMedium-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{sc}{sl}{ + <-> ssub * Junicode-TLF/sc/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemicondensed}{sc}{ - <-> \Junicode@@scale Junicode-SmCondMedium-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{semicondensed}{sl}{ + <-> ssub * Junicode-TLF/semicondensed/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemicondensed}{scsl}{ - <-> ssub * Junicode-TLF/mediumsemicondensed/scit +\DeclareFontShape{LGR}{Junicode-TLF}{sc}{scsl}{ + <-> ssub * Junicode-TLF/sc/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{mediumsemicondensed}{sl}{ - <-> ssub * Junicode-TLF/mediumsemicondensed/it +\DeclareFontShape{LGR}{Junicode-TLF}{semicondensed}{scsl}{ + <-> ssub * Junicode-TLF/semicondensed/scit }{} -% ---- mediumcondensed ---- +% ---- sb = semibold ---- -\DeclareFontShape{LGR}{Junicode-TLF}{mediumcondensed}{sc}{ - <-> \Junicode@@scale Junicode-CondMedium-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{sb}{sc}{ + <-> \Junicode@@scale Junicode-SmBold-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{semibold}{sc}{ + <-> alias * Junicode-TLF/sb/sc }{} -\DeclareFontShape{LGR}{Junicode-TLF}{mediumcondensed}{scit}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{sb}{scit}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{semibold}{scit}{ + <-> alias * Junicode-TLF/sb/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{mediumcondensed}{scsl}{ - <-> ssub * Junicode-TLF/mediumcondensed/scit +\DeclareFontShape{LGR}{Junicode-TLF}{sb}{n}{ + <-> \Junicode@@scale Junicode-SmBold-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{mediumcondensed}{sl}{ - <-> ssub * Junicode-TLF/mediumcondensed/it +\DeclareFontShape{LGR}{Junicode-TLF}{semibold}{n}{ + <-> alias * Junicode-TLF/sb/n }{} - -% ---- b = bold ---- - -\DeclareFontShape{LGR}{Junicode-TLF}{b}{scit}{ - <-> \Junicode@@scale Junicode-BoldItalic-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{sb}{it}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{bold}{scit}{ - <-> alias * Junicode-TLF/b/scit +\DeclareFontShape{LGR}{Junicode-TLF}{semibold}{it}{ + <-> alias * Junicode-TLF/sb/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{b}{it}{ - <-> \Junicode@@scale Junicode-BoldItalic-tlf-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{sb}{sl}{ + <-> ssub * Junicode-TLF/sb/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{bold}{it}{ - <-> alias * Junicode-TLF/b/it +\DeclareFontShape{LGR}{Junicode-TLF}{semibold}{sl}{ + <-> ssub * Junicode-TLF/semibold/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{b}{sc}{ - <-> \Junicode@@scale Junicode-Bold-tlf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TLF}{sb}{scsl}{ + <-> ssub * Junicode-TLF/sb/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{bold}{sc}{ - <-> alias * Junicode-TLF/b/sc +\DeclareFontShape{LGR}{Junicode-TLF}{semibold}{scsl}{ + <-> ssub * Junicode-TLF/semibold/scit }{} -\DeclareFontShape{LGR}{Junicode-TLF}{b}{n}{ - <-> \Junicode@@scale Junicode-Bold-tlf-lgr + +% ---- mediumcondensed ---- + +\DeclareFontShape{LGR}{Junicode-TLF}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{bold}{n}{ - <-> alias * Junicode-TLF/b/n +\DeclareFontShape{LGR}{Junicode-TLF}{mediumcondensed}{scit}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{b}{scsl}{ - <-> ssub * Junicode-TLF/b/scit +\DeclareFontShape{LGR}{Junicode-TLF}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{bold}{scsl}{ - <-> ssub * Junicode-TLF/bold/scit +\DeclareFontShape{LGR}{Junicode-TLF}{mediumcondensed}{sc}{ + <-> \Junicode@@scale Junicode-CondMedium-tlf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TLF}{b}{sl}{ - <-> ssub * Junicode-TLF/b/it +\DeclareFontShape{LGR}{Junicode-TLF}{mediumcondensed}{sl}{ + <-> ssub * Junicode-TLF/mediumcondensed/it }{} -\DeclareFontShape{LGR}{Junicode-TLF}{bold}{sl}{ - <-> ssub * Junicode-TLF/bold/it +\DeclareFontShape{LGR}{Junicode-TLF}{mediumcondensed}{scsl}{ + <-> ssub * Junicode-TLF/mediumcondensed/scit }{} diff --git a/Master/texmf-dist/tex/latex/junicode/LGRJunicode-TOsF.fd b/Master/texmf-dist/tex/latex/junicode/LGRJunicode-TOsF.fd index 79de53f63f9..b402baf7106 100644 --- a/Master/texmf-dist/tex/latex/junicode/LGRJunicode-TOsF.fd +++ b/Master/texmf-dist/tex/latex/junicode/LGRJunicode-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{LGRJunicode-TOsF.fd} - [2024/06/03 (autoinst) Font definitions for LGR/Junicode-TOsF.] + [2024/07/21 (autoinst) Font definitions for LGR/Junicode-TOsF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -30,14 +30,6 @@ <-> alias * Junicode-TOsF/l/sc }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{l}{n}{ - <-> \Junicode@@scale Junicode-Light-tosf-lgr -}{} - -\DeclareFontShape{LGR}{Junicode-TOsF}{light}{n}{ - <-> alias * Junicode-TOsF/l/n -}{} - \DeclareFontShape{LGR}{Junicode-TOsF}{l}{scit}{ <-> \Junicode@@scale Junicode-LightItalic-tosf-sc-lgr }{} @@ -46,20 +38,20 @@ <-> alias * Junicode-TOsF/l/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{l}{it}{ - <-> \Junicode@@scale Junicode-LightItalic-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{l}{n}{ + <-> \Junicode@@scale Junicode-Light-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{light}{it}{ - <-> alias * Junicode-TOsF/l/it +\DeclareFontShape{LGR}{Junicode-TOsF}{light}{n}{ + <-> alias * Junicode-TOsF/l/n }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{l}{scsl}{ - <-> ssub * Junicode-TOsF/l/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{l}{it}{ + <-> \Junicode@@scale Junicode-LightItalic-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{light}{scsl}{ - <-> ssub * Junicode-TOsF/light/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{light}{it}{ + <-> alias * Junicode-TOsF/l/it }{} \DeclareFontShape{LGR}{Junicode-TOsF}{l}{sl}{ @@ -70,350 +62,302 @@ <-> ssub * Junicode-TOsF/light/it }{} - -% ---- bx = boldexpanded ---- - -\DeclareFontShape{LGR}{Junicode-TOsF}{bx}{scit}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{l}{scsl}{ + <-> ssub * Junicode-TOsF/l/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{boldexpanded}{scit}{ - <-> alias * Junicode-TOsF/bx/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{light}{scsl}{ + <-> ssub * Junicode-TOsF/light/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-lgr -}{} -\DeclareFontShape{LGR}{Junicode-TOsF}{boldexpanded}{it}{ - <-> alias * Junicode-TOsF/bx/it -}{} +% ---- sx = semiexpanded ---- -\DeclareFontShape{LGR}{Junicode-TOsF}{bx}{sc}{ - <-> \Junicode@@scale Junicode-ExpBold-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{sx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpItalic-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{boldexpanded}{sc}{ - <-> alias * Junicode-TOsF/bx/sc +\DeclareFontShape{LGR}{Junicode-TOsF}{semiexpanded}{scit}{ + <-> alias * Junicode-TOsF/sx/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{bx}{n}{ - <-> \Junicode@@scale Junicode-ExpBold-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{boldexpanded}{n}{ - <-> alias * Junicode-TOsF/bx/n +\DeclareFontShape{LGR}{Junicode-TOsF}{semiexpanded}{n}{ + <-> alias * Junicode-TOsF/sx/n }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{bx}{scsl}{ - <-> ssub * Junicode-TOsF/bx/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{boldexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/boldexpanded/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{semiexpanded}{it}{ + <-> alias * Junicode-TOsF/sx/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{bx}{sl}{ - <-> ssub * Junicode-TOsF/bx/it +\DeclareFontShape{LGR}{Junicode-TOsF}{sx}{sc}{ + <-> \Junicode@@scale Junicode-SmExp-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{boldexpanded}{sl}{ - <-> ssub * Junicode-TOsF/boldexpanded/it +\DeclareFontShape{LGR}{Junicode-TOsF}{semiexpanded}{sc}{ + <-> alias * Junicode-TOsF/sx/sc }{} - -% ---- m = regular ---- - -\DeclareFontShape{LGR}{Junicode-TOsF}{m}{n}{ - <-> \Junicode@@scale Junicode-Regular-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{sx}{sl}{ + <-> ssub * Junicode-TOsF/sx/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{regular}{n}{ - <-> alias * Junicode-TOsF/m/n +\DeclareFontShape{LGR}{Junicode-TOsF}{semiexpanded}{sl}{ + <-> ssub * Junicode-TOsF/semiexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{m}{sc}{ - <-> \Junicode@@scale Junicode-Regular-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{sx}{scsl}{ + <-> ssub * Junicode-TOsF/sx/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{regular}{sc}{ - <-> alias * Junicode-TOsF/m/sc +\DeclareFontShape{LGR}{Junicode-TOsF}{semiexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/semiexpanded/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{m}{it}{ - <-> \Junicode@@scale Junicode-Italic-tosf-lgr -}{} -\DeclareFontShape{LGR}{Junicode-TOsF}{regular}{it}{ - <-> alias * Junicode-TOsF/m/it -}{} +% ---- mediumsemicondensed ---- -\DeclareFontShape{LGR}{Junicode-TOsF}{m}{scit}{ - <-> \Junicode@@scale Junicode-Italic-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemicondensed}{sc}{ + <-> \Junicode@@scale Junicode-SmCondMedium-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{regular}{scit}{ - <-> alias * Junicode-TOsF/m/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemicondensed}{it}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{m}{scsl}{ - <-> ssub * Junicode-TOsF/m/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemicondensed}{scit}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{regular}{scsl}{ - <-> ssub * Junicode-TOsF/regular/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemicondensed}{n}{ + <-> \Junicode@@scale Junicode-SmCondMedium-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{m}{sl}{ - <-> ssub * Junicode-TOsF/m/it +\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemicondensed}{sl}{ + <-> ssub * Junicode-TOsF/mediumsemicondensed/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{regular}{sl}{ - <-> ssub * Junicode-TOsF/regular/it +\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemicondensed}{scsl}{ + <-> ssub * Junicode-TOsF/mediumsemicondensed/scit }{} -% ---- lsc = lightsemicondensed ---- +% ---- lc = lightcondensed ---- -\DeclareFontShape{LGR}{Junicode-TOsF}{lsc}{sc}{ - <-> \Junicode@@scale Junicode-SmCondLight-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{lc}{sc}{ + <-> \Junicode@@scale Junicode-CondLight-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{lightsemicondensed}{sc}{ - <-> alias * Junicode-TOsF/lsc/sc +\DeclareFontShape{LGR}{Junicode-TOsF}{lightcondensed}{sc}{ + <-> alias * Junicode-TOsF/lc/sc }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{lightsemicondensed}{n}{ - <-> alias * Junicode-TOsF/lsc/n +\DeclareFontShape{LGR}{Junicode-TOsF}{lightcondensed}{n}{ + <-> alias * Junicode-TOsF/lc/n }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{lsc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{lc}{scit}{ + <-> \Junicode@@scale Junicode-CondLightItalic-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{lightsemicondensed}{scit}{ - <-> alias * Junicode-TOsF/lsc/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{lightcondensed}{scit}{ + <-> alias * Junicode-TOsF/lc/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{lightsemicondensed}{it}{ - <-> alias * Junicode-TOsF/lsc/it +\DeclareFontShape{LGR}{Junicode-TOsF}{lightcondensed}{it}{ + <-> alias * Junicode-TOsF/lc/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{lsc}{scsl}{ - <-> ssub * Junicode-TOsF/lsc/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{lc}{sl}{ + <-> ssub * Junicode-TOsF/lc/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{lightsemicondensed}{scsl}{ - <-> ssub * Junicode-TOsF/lightsemicondensed/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{lightcondensed}{sl}{ + <-> ssub * Junicode-TOsF/lightcondensed/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{lsc}{sl}{ - <-> ssub * Junicode-TOsF/lsc/it +\DeclareFontShape{LGR}{Junicode-TOsF}{lc}{scsl}{ + <-> ssub * Junicode-TOsF/lc/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{lightsemicondensed}{sl}{ - <-> ssub * Junicode-TOsF/lightsemicondensed/it +\DeclareFontShape{LGR}{Junicode-TOsF}{lightcondensed}{scsl}{ + <-> ssub * Junicode-TOsF/lightcondensed/scit }{} % ---- medium ---- -\DeclareFontShape{LGR}{Junicode-TOsF}{medium}{n}{ - <-> \Junicode@@scale Junicode-Medium-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{medium}{scit}{ + <-> \Junicode@@scale Junicode-MediumItalic-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{medium}{sc}{ - <-> \Junicode@@scale Junicode-Medium-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{medium}{n}{ + <-> \Junicode@@scale Junicode-Medium-tosf-lgr }{} \DeclareFontShape{LGR}{Junicode-TOsF}{medium}{it}{ <-> \Junicode@@scale Junicode-MediumItalic-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{medium}{scit}{ - <-> \Junicode@@scale Junicode-MediumItalic-tosf-sc-lgr -}{} - -\DeclareFontShape{LGR}{Junicode-TOsF}{medium}{scsl}{ - <-> ssub * Junicode-TOsF/medium/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{medium}{sc}{ + <-> \Junicode@@scale Junicode-Medium-tosf-sc-lgr }{} \DeclareFontShape{LGR}{Junicode-TOsF}{medium}{sl}{ <-> ssub * Junicode-TOsF/medium/it }{} - -% ---- sx = semiexpanded ---- - -\DeclareFontShape{LGR}{Junicode-TOsF}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{medium}{scsl}{ + <-> ssub * Junicode-TOsF/medium/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{semiexpanded}{n}{ - <-> alias * Junicode-TOsF/sx/n -}{} -\DeclareFontShape{LGR}{Junicode-TOsF}{sx}{sc}{ - <-> \Junicode@@scale Junicode-SmExp-tosf-sc-lgr -}{} +% ---- bx = boldexpanded ---- -\DeclareFontShape{LGR}{Junicode-TOsF}{semiexpanded}{sc}{ - <-> alias * Junicode-TOsF/sx/sc +\DeclareFontShape{LGR}{Junicode-TOsF}{bx}{sc}{ + <-> \Junicode@@scale Junicode-ExpBold-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{boldexpanded}{sc}{ + <-> alias * Junicode-TOsF/bx/sc }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{semiexpanded}{it}{ - <-> alias * Junicode-TOsF/sx/it +\DeclareFontShape{LGR}{Junicode-TOsF}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{sx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpItalic-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{boldexpanded}{it}{ + <-> alias * Junicode-TOsF/bx/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{semiexpanded}{scit}{ - <-> alias * Junicode-TOsF/sx/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{bx}{scit}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{sx}{scsl}{ - <-> ssub * Junicode-TOsF/sx/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{boldexpanded}{scit}{ + <-> alias * Junicode-TOsF/bx/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{semiexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/semiexpanded/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{bx}{n}{ + <-> \Junicode@@scale Junicode-ExpBold-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{sx}{sl}{ - <-> ssub * Junicode-TOsF/sx/it +\DeclareFontShape{LGR}{Junicode-TOsF}{boldexpanded}{n}{ + <-> alias * Junicode-TOsF/bx/n }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{semiexpanded}{sl}{ - <-> ssub * Junicode-TOsF/semiexpanded/it +\DeclareFontShape{LGR}{Junicode-TOsF}{bx}{sl}{ + <-> ssub * Junicode-TOsF/bx/it }{} - -% ---- x = expanded ---- - -\DeclareFontShape{LGR}{Junicode-TOsF}{x}{it}{ - <-> \Junicode@@scale Junicode-ExpItalic-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{boldexpanded}{sl}{ + <-> ssub * Junicode-TOsF/boldexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{expanded}{it}{ - <-> alias * Junicode-TOsF/x/it +\DeclareFontShape{LGR}{Junicode-TOsF}{bx}{scsl}{ + <-> ssub * Junicode-TOsF/bx/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{x}{scit}{ - <-> \Junicode@@scale Junicode-ExpItalic-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{boldexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/boldexpanded/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{expanded}{scit}{ - <-> alias * Junicode-TOsF/x/scit -}{} -\DeclareFontShape{LGR}{Junicode-TOsF}{x}{n}{ - <-> \Junicode@@scale Junicode-Exp-tosf-lgr -}{} +% ---- m = regular ---- -\DeclareFontShape{LGR}{Junicode-TOsF}{expanded}{n}{ - <-> alias * Junicode-TOsF/x/n +\DeclareFontShape{LGR}{Junicode-TOsF}{m}{n}{ + <-> \Junicode@@scale Junicode-Regular-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{x}{sc}{ - <-> \Junicode@@scale Junicode-Exp-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{regular}{n}{ + <-> alias * Junicode-TOsF/m/n }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{expanded}{sc}{ - <-> alias * Junicode-TOsF/x/sc +\DeclareFontShape{LGR}{Junicode-TOsF}{m}{scit}{ + <-> \Junicode@@scale Junicode-Italic-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{x}{scsl}{ - <-> ssub * Junicode-TOsF/x/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{regular}{scit}{ + <-> alias * Junicode-TOsF/m/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{expanded}{scsl}{ - <-> ssub * Junicode-TOsF/expanded/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{m}{it}{ + <-> \Junicode@@scale Junicode-Italic-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{x}{sl}{ - <-> ssub * Junicode-TOsF/x/it +\DeclareFontShape{LGR}{Junicode-TOsF}{regular}{it}{ + <-> alias * Junicode-TOsF/m/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{expanded}{sl}{ - <-> ssub * Junicode-TOsF/expanded/it +\DeclareFontShape{LGR}{Junicode-TOsF}{m}{sc}{ + <-> \Junicode@@scale Junicode-Regular-tosf-sc-lgr }{} - -% ---- c = condensed ---- - -\DeclareFontShape{LGR}{Junicode-TOsF}{c}{sc}{ - <-> \Junicode@@scale Junicode-Cond-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{regular}{sc}{ + <-> alias * Junicode-TOsF/m/sc }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{condensed}{sc}{ - <-> alias * Junicode-TOsF/c/sc +\DeclareFontShape{LGR}{Junicode-TOsF}{m}{sl}{ + <-> ssub * Junicode-TOsF/m/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{regular}{sl}{ + <-> ssub * Junicode-TOsF/regular/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{condensed}{n}{ - <-> alias * Junicode-TOsF/c/n +\DeclareFontShape{LGR}{Junicode-TOsF}{m}{scsl}{ + <-> ssub * Junicode-TOsF/m/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{c}{scit}{ - <-> \Junicode@@scale Junicode-CondItalic-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{regular}{scsl}{ + <-> ssub * Junicode-TOsF/regular/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{condensed}{scit}{ - <-> alias * Junicode-TOsF/c/scit -}{} -\DeclareFontShape{LGR}{Junicode-TOsF}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-tosf-lgr +% ---- mediumsemiexpanded ---- + +\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{condensed}{it}{ - <-> alias * Junicode-TOsF/c/it +\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{c}{scsl}{ - <-> ssub * Junicode-TOsF/c/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemiexpanded}{scit}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{condensed}{scsl}{ - <-> ssub * Junicode-TOsF/condensed/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemiexpanded}{sc}{ + <-> \Junicode@@scale Junicode-SmExpMedium-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{c}{sl}{ - <-> ssub * Junicode-TOsF/c/it +\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-TOsF/mediumsemiexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{condensed}{sl}{ - <-> ssub * Junicode-TOsF/condensed/it +\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemiexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/mediumsemiexpanded/scit }{} % ---- sbsx = semiboldsemiexpanded ---- -\DeclareFontShape{LGR}{Junicode-TOsF}{sbsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-sc-lgr -}{} - -\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldsemiexpanded}{sc}{ - <-> alias * Junicode-TOsF/sbsx/sc -}{} - \DeclareFontShape{LGR}{Junicode-TOsF}{sbsx}{n}{ <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-lgr }{} @@ -438,12 +382,12 @@ <-> alias * Junicode-TOsF/sbsx/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{sbsx}{scsl}{ - <-> ssub * Junicode-TOsF/sbsx/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{sbsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldsemiexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/semiboldsemiexpanded/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldsemiexpanded}{sc}{ + <-> alias * Junicode-TOsF/sbsx/sc }{} \DeclareFontShape{LGR}{Junicode-TOsF}{sbsx}{sl}{ @@ -454,345 +398,385 @@ <-> ssub * Junicode-TOsF/semiboldsemiexpanded/it }{} - -% ---- mediumexpanded ---- - -\DeclareFontShape{LGR}{Junicode-TOsF}{mediumexpanded}{scit}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{sbsx}{scsl}{ + <-> ssub * Junicode-TOsF/sbsx/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldsemiexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/semiboldsemiexpanded/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{mediumexpanded}{sc}{ - <-> \Junicode@@scale Junicode-ExpMedium-tosf-sc-lgr + +% ---- bsx = boldsemiexpanded ---- + +\DeclareFontShape{LGR}{Junicode-TOsF}{bsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpBold-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{mediumexpanded}{n}{ - <-> \Junicode@@scale Junicode-ExpMedium-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{boldsemiexpanded}{sc}{ + <-> alias * Junicode-TOsF/bsx/sc }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{mediumexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/mediumexpanded/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{bsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpBold-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{mediumexpanded}{sl}{ - <-> ssub * Junicode-TOsF/mediumexpanded/it +\DeclareFontShape{LGR}{Junicode-TOsF}{boldsemiexpanded}{n}{ + <-> alias * Junicode-TOsF/bsx/n }{} +\DeclareFontShape{LGR}{Junicode-TOsF}{bsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-sc-lgr +}{} -% ---- mediumsemiexpanded ---- +\DeclareFontShape{LGR}{Junicode-TOsF}{boldsemiexpanded}{scit}{ + <-> alias * Junicode-TOsF/bsx/scit +}{} -\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{bsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemiexpanded}{sc}{ - <-> \Junicode@@scale Junicode-SmExpMedium-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{boldsemiexpanded}{it}{ + <-> alias * Junicode-TOsF/bsx/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{bsx}{sl}{ + <-> ssub * Junicode-TOsF/bsx/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemiexpanded}{scit}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{boldsemiexpanded}{sl}{ + <-> ssub * Junicode-TOsF/boldsemiexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemiexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/mediumsemiexpanded/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{bsx}{scsl}{ + <-> ssub * Junicode-TOsF/bsx/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-TOsF/mediumsemiexpanded/it +\DeclareFontShape{LGR}{Junicode-TOsF}{boldsemiexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/boldsemiexpanded/scit }{} -% ---- mediumsemicondensed ---- +% ---- sc = semicondensed ---- -\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemicondensed}{scit}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{sc}{sc}{ + <-> \Junicode@@scale Junicode-SmCond-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemicondensed}{it}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{semicondensed}{sc}{ + <-> alias * Junicode-TOsF/sc/sc }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemicondensed}{sc}{ - <-> \Junicode@@scale Junicode-SmCondMedium-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{sc}{n}{ + <-> \Junicode@@scale Junicode-SmCond-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemicondensed}{n}{ - <-> \Junicode@@scale Junicode-SmCondMedium-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{semicondensed}{n}{ + <-> alias * Junicode-TOsF/sc/n }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemicondensed}{scsl}{ - <-> ssub * Junicode-TOsF/mediumsemicondensed/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{sc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondItalic-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{mediumsemicondensed}{sl}{ - <-> ssub * Junicode-TOsF/mediumsemicondensed/it +\DeclareFontShape{LGR}{Junicode-TOsF}{semicondensed}{scit}{ + <-> alias * Junicode-TOsF/sc/scit }{} - -% ---- sbx = semiboldexpanded ---- - -\DeclareFontShape{LGR}{Junicode-TOsF}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{sc}{it}{ + <-> \Junicode@@scale Junicode-SmCondItalic-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldexpanded}{n}{ - <-> alias * Junicode-TOsF/sbx/n +\DeclareFontShape{LGR}{Junicode-TOsF}{semicondensed}{it}{ + <-> alias * Junicode-TOsF/sc/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{sbx}{sc}{ - <-> \Junicode@@scale Junicode-ExpSmBold-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{sc}{sl}{ + <-> ssub * Junicode-TOsF/sc/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldexpanded}{sc}{ - <-> alias * Junicode-TOsF/sbx/sc +\DeclareFontShape{LGR}{Junicode-TOsF}{semicondensed}{sl}{ + <-> ssub * Junicode-TOsF/semicondensed/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{sbx}{it}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{sc}{scsl}{ + <-> ssub * Junicode-TOsF/sc/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldexpanded}{it}{ - <-> alias * Junicode-TOsF/sbx/it +\DeclareFontShape{LGR}{Junicode-TOsF}{semicondensed}{scsl}{ + <-> ssub * Junicode-TOsF/semicondensed/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{sbx}{scit}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-sc-lgr + +% ---- mediumcondensed ---- + +\DeclareFontShape{LGR}{Junicode-TOsF}{mediumcondensed}{sc}{ + <-> \Junicode@@scale Junicode-CondMedium-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldexpanded}{scit}{ - <-> alias * Junicode-TOsF/sbx/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{mediumcondensed}{scit}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{sbx}{scsl}{ - <-> ssub * Junicode-TOsF/sbx/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/semiboldexpanded/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{sbx}{sl}{ - <-> ssub * Junicode-TOsF/sbx/it +\DeclareFontShape{LGR}{Junicode-TOsF}{mediumcondensed}{sl}{ + <-> ssub * Junicode-TOsF/mediumcondensed/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldexpanded}{sl}{ - <-> ssub * Junicode-TOsF/semiboldexpanded/it +\DeclareFontShape{LGR}{Junicode-TOsF}{mediumcondensed}{scsl}{ + <-> ssub * Junicode-TOsF/mediumcondensed/scit }{} -% ---- bsx = boldsemiexpanded ---- +% ---- sb = semibold ---- -\DeclareFontShape{LGR}{Junicode-TOsF}{bsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpBold-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{sb}{it}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{boldsemiexpanded}{sc}{ - <-> alias * Junicode-TOsF/bsx/sc +\DeclareFontShape{LGR}{Junicode-TOsF}{semibold}{it}{ + <-> alias * Junicode-TOsF/sb/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{bsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpBold-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{sb}{n}{ + <-> \Junicode@@scale Junicode-SmBold-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{boldsemiexpanded}{n}{ - <-> alias * Junicode-TOsF/bsx/n +\DeclareFontShape{LGR}{Junicode-TOsF}{semibold}{n}{ + <-> alias * Junicode-TOsF/sb/n }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{bsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{sb}{scit}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{boldsemiexpanded}{scit}{ - <-> alias * Junicode-TOsF/bsx/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{semibold}{scit}{ + <-> alias * Junicode-TOsF/sb/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{bsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{sb}{sc}{ + <-> \Junicode@@scale Junicode-SmBold-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{boldsemiexpanded}{it}{ - <-> alias * Junicode-TOsF/bsx/it +\DeclareFontShape{LGR}{Junicode-TOsF}{semibold}{sc}{ + <-> alias * Junicode-TOsF/sb/sc }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{bsx}{scsl}{ - <-> ssub * Junicode-TOsF/bsx/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{sb}{sl}{ + <-> ssub * Junicode-TOsF/sb/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{boldsemiexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/boldsemiexpanded/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{semibold}{sl}{ + <-> ssub * Junicode-TOsF/semibold/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{bsx}{sl}{ - <-> ssub * Junicode-TOsF/bsx/it +\DeclareFontShape{LGR}{Junicode-TOsF}{sb}{scsl}{ + <-> ssub * Junicode-TOsF/sb/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{boldsemiexpanded}{sl}{ - <-> ssub * Junicode-TOsF/boldsemiexpanded/it +\DeclareFontShape{LGR}{Junicode-TOsF}{semibold}{scsl}{ + <-> ssub * Junicode-TOsF/semibold/scit }{} -% ---- lc = lightcondensed ---- +% ---- sbx = semiboldexpanded ---- -\DeclareFontShape{LGR}{Junicode-TOsF}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{sbx}{sc}{ + <-> \Junicode@@scale Junicode-ExpSmBold-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{lightcondensed}{n}{ - <-> alias * Junicode-TOsF/lc/n +\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldexpanded}{sc}{ + <-> alias * Junicode-TOsF/sbx/sc }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{lc}{sc}{ - <-> \Junicode@@scale Junicode-CondLight-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{sbx}{scit}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{lightcondensed}{sc}{ - <-> alias * Junicode-TOsF/lc/sc +\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldexpanded}{scit}{ + <-> alias * Junicode-TOsF/sbx/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{lightcondensed}{it}{ - <-> alias * Junicode-TOsF/lc/it +\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldexpanded}{n}{ + <-> alias * Junicode-TOsF/sbx/n }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{lc}{scit}{ - <-> \Junicode@@scale Junicode-CondLightItalic-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{sbx}{it}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{lightcondensed}{scit}{ - <-> alias * Junicode-TOsF/lc/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldexpanded}{it}{ + <-> alias * Junicode-TOsF/sbx/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{lc}{scsl}{ - <-> ssub * Junicode-TOsF/lc/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{sbx}{sl}{ + <-> ssub * Junicode-TOsF/sbx/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{lightcondensed}{scsl}{ - <-> ssub * Junicode-TOsF/lightcondensed/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldexpanded}{sl}{ + <-> ssub * Junicode-TOsF/semiboldexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{lc}{sl}{ - <-> ssub * Junicode-TOsF/lc/it +\DeclareFontShape{LGR}{Junicode-TOsF}{sbx}{scsl}{ + <-> ssub * Junicode-TOsF/sbx/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{lightcondensed}{sl}{ - <-> ssub * Junicode-TOsF/lightcondensed/it +\DeclareFontShape{LGR}{Junicode-TOsF}{semiboldexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/semiboldexpanded/scit }{} -% ---- sc = semicondensed ---- +% ---- c = condensed ---- -\DeclareFontShape{LGR}{Junicode-TOsF}{sc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondItalic-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{semicondensed}{scit}{ - <-> alias * Junicode-TOsF/sc/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{condensed}{it}{ + <-> alias * Junicode-TOsF/c/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{sc}{it}{ - <-> \Junicode@@scale Junicode-SmCondItalic-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{c}{scit}{ + <-> \Junicode@@scale Junicode-CondItalic-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{semicondensed}{it}{ - <-> alias * Junicode-TOsF/sc/it +\DeclareFontShape{LGR}{Junicode-TOsF}{condensed}{scit}{ + <-> alias * Junicode-TOsF/c/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{sc}{sc}{ - <-> \Junicode@@scale Junicode-SmCond-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{semicondensed}{sc}{ - <-> alias * Junicode-TOsF/sc/sc +\DeclareFontShape{LGR}{Junicode-TOsF}{condensed}{n}{ + <-> alias * Junicode-TOsF/c/n }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{sc}{n}{ - <-> \Junicode@@scale Junicode-SmCond-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{c}{sc}{ + <-> \Junicode@@scale Junicode-Cond-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{semicondensed}{n}{ - <-> alias * Junicode-TOsF/sc/n +\DeclareFontShape{LGR}{Junicode-TOsF}{condensed}{sc}{ + <-> alias * Junicode-TOsF/c/sc }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{sc}{scsl}{ - <-> ssub * Junicode-TOsF/sc/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{c}{sl}{ + <-> ssub * Junicode-TOsF/c/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{semicondensed}{scsl}{ - <-> ssub * Junicode-TOsF/semicondensed/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{condensed}{sl}{ + <-> ssub * Junicode-TOsF/condensed/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{sc}{sl}{ - <-> ssub * Junicode-TOsF/sc/it +\DeclareFontShape{LGR}{Junicode-TOsF}{c}{scsl}{ + <-> ssub * Junicode-TOsF/c/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{semicondensed}{sl}{ - <-> ssub * Junicode-TOsF/semicondensed/it +\DeclareFontShape{LGR}{Junicode-TOsF}{condensed}{scsl}{ + <-> ssub * Junicode-TOsF/condensed/scit }{} -% ---- sb = semibold ---- +% ---- mediumexpanded ---- -\DeclareFontShape{LGR}{Junicode-TOsF}{sb}{n}{ - <-> \Junicode@@scale Junicode-SmBold-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{semibold}{n}{ - <-> alias * Junicode-TOsF/sb/n +\DeclareFontShape{LGR}{Junicode-TOsF}{mediumexpanded}{scit}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{sb}{sc}{ - <-> \Junicode@@scale Junicode-SmBold-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{mediumexpanded}{n}{ + <-> \Junicode@@scale Junicode-ExpMedium-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{semibold}{sc}{ - <-> alias * Junicode-TOsF/sb/sc +\DeclareFontShape{LGR}{Junicode-TOsF}{mediumexpanded}{sc}{ + <-> \Junicode@@scale Junicode-ExpMedium-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{sb}{it}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{mediumexpanded}{sl}{ + <-> ssub * Junicode-TOsF/mediumexpanded/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{semibold}{it}{ - <-> alias * Junicode-TOsF/sb/it +\DeclareFontShape{LGR}{Junicode-TOsF}{mediumexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/mediumexpanded/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{sb}{scit}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-sc-lgr + +% ---- lsc = lightsemicondensed ---- + +\DeclareFontShape{LGR}{Junicode-TOsF}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{semibold}{scit}{ - <-> alias * Junicode-TOsF/sb/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{lightsemicondensed}{n}{ + <-> alias * Junicode-TOsF/lsc/n }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{sb}{scsl}{ - <-> ssub * Junicode-TOsF/sb/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{lsc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{semibold}{scsl}{ - <-> ssub * Junicode-TOsF/semibold/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{lightsemicondensed}{scit}{ + <-> alias * Junicode-TOsF/lsc/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{sb}{sl}{ - <-> ssub * Junicode-TOsF/sb/it +\DeclareFontShape{LGR}{Junicode-TOsF}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{semibold}{sl}{ - <-> ssub * Junicode-TOsF/semibold/it +\DeclareFontShape{LGR}{Junicode-TOsF}{lightsemicondensed}{it}{ + <-> alias * Junicode-TOsF/lsc/it +}{} + +\DeclareFontShape{LGR}{Junicode-TOsF}{lsc}{sc}{ + <-> \Junicode@@scale Junicode-SmCondLight-tosf-sc-lgr +}{} + +\DeclareFontShape{LGR}{Junicode-TOsF}{lightsemicondensed}{sc}{ + <-> alias * Junicode-TOsF/lsc/sc +}{} + +\DeclareFontShape{LGR}{Junicode-TOsF}{lsc}{sl}{ + <-> ssub * Junicode-TOsF/lsc/it +}{} + +\DeclareFontShape{LGR}{Junicode-TOsF}{lightsemicondensed}{sl}{ + <-> ssub * Junicode-TOsF/lightsemicondensed/it +}{} + +\DeclareFontShape{LGR}{Junicode-TOsF}{lsc}{scsl}{ + <-> ssub * Junicode-TOsF/lsc/scit +}{} + +\DeclareFontShape{LGR}{Junicode-TOsF}{lightsemicondensed}{scsl}{ + <-> ssub * Junicode-TOsF/lightsemicondensed/scit }{} % ---- b = bold ---- +\DeclareFontShape{LGR}{Junicode-TOsF}{b}{sc}{ + <-> \Junicode@@scale Junicode-Bold-tosf-sc-lgr +}{} + +\DeclareFontShape{LGR}{Junicode-TOsF}{bold}{sc}{ + <-> alias * Junicode-TOsF/b/sc +}{} + \DeclareFontShape{LGR}{Junicode-TOsF}{b}{it}{ <-> \Junicode@@scale Junicode-BoldItalic-tosf-lgr }{} @@ -817,12 +801,12 @@ <-> alias * Junicode-TOsF/b/n }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{b}{sc}{ - <-> \Junicode@@scale Junicode-Bold-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{b}{sl}{ + <-> ssub * Junicode-TOsF/b/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{bold}{sc}{ - <-> alias * Junicode-TOsF/b/sc +\DeclareFontShape{LGR}{Junicode-TOsF}{bold}{sl}{ + <-> ssub * Junicode-TOsF/bold/it }{} \DeclareFontShape{LGR}{Junicode-TOsF}{b}{scsl}{ @@ -833,39 +817,55 @@ <-> ssub * Junicode-TOsF/bold/scit }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{b}{sl}{ - <-> ssub * Junicode-TOsF/b/it + +% ---- x = expanded ---- + +\DeclareFontShape{LGR}{Junicode-TOsF}{x}{scit}{ + <-> \Junicode@@scale Junicode-ExpItalic-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{bold}{sl}{ - <-> ssub * Junicode-TOsF/bold/it +\DeclareFontShape{LGR}{Junicode-TOsF}{expanded}{scit}{ + <-> alias * Junicode-TOsF/x/scit }{} +\DeclareFontShape{LGR}{Junicode-TOsF}{x}{n}{ + <-> \Junicode@@scale Junicode-Exp-tosf-lgr +}{} -% ---- mediumcondensed ---- +\DeclareFontShape{LGR}{Junicode-TOsF}{expanded}{n}{ + <-> alias * Junicode-TOsF/x/n +}{} -\DeclareFontShape{LGR}{Junicode-TOsF}{mediumcondensed}{scit}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{x}{it}{ + <-> \Junicode@@scale Junicode-ExpItalic-tosf-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{expanded}{it}{ + <-> alias * Junicode-TOsF/x/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{mediumcondensed}{sc}{ - <-> \Junicode@@scale Junicode-CondMedium-tosf-sc-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{x}{sc}{ + <-> \Junicode@@scale Junicode-Exp-tosf-sc-lgr }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-tosf-lgr +\DeclareFontShape{LGR}{Junicode-TOsF}{expanded}{sc}{ + <-> alias * Junicode-TOsF/x/sc }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{mediumcondensed}{scsl}{ - <-> ssub * Junicode-TOsF/mediumcondensed/scit +\DeclareFontShape{LGR}{Junicode-TOsF}{x}{sl}{ + <-> ssub * Junicode-TOsF/x/it }{} -\DeclareFontShape{LGR}{Junicode-TOsF}{mediumcondensed}{sl}{ - <-> ssub * Junicode-TOsF/mediumcondensed/it +\DeclareFontShape{LGR}{Junicode-TOsF}{expanded}{sl}{ + <-> ssub * Junicode-TOsF/expanded/it +}{} + +\DeclareFontShape{LGR}{Junicode-TOsF}{x}{scsl}{ + <-> ssub * Junicode-TOsF/x/scit +}{} + +\DeclareFontShape{LGR}{Junicode-TOsF}{expanded}{scsl}{ + <-> ssub * Junicode-TOsF/expanded/scit }{} diff --git a/Master/texmf-dist/tex/latex/junicode/LY1Junicode-Inf.fd b/Master/texmf-dist/tex/latex/junicode/LY1Junicode-Inf.fd index ba4320e2d53..b442772ef0e 100644 --- a/Master/texmf-dist/tex/latex/junicode/LY1Junicode-Inf.fd +++ b/Master/texmf-dist/tex/latex/junicode/LY1Junicode-Inf.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{LY1Junicode-Inf.fd} - [2024/06/03 (autoinst) Font definitions for LY1/Junicode-Inf.] + [2024/07/21 (autoinst) Font definitions for LY1/Junicode-Inf.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,72 +20,57 @@ \DeclareFontFamily{LY1}{Junicode-Inf}{} -% ---- mediumcondensed ---- - -\DeclareFontShape{LY1}{Junicode-Inf}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-inf-ly1 -}{} - -\DeclareFontShape{LY1}{Junicode-Inf}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-inf-ly1 -}{} - -\DeclareFontShape{LY1}{Junicode-Inf}{mediumcondensed}{sl}{ - <-> ssub * Junicode-Inf/mediumcondensed/it -}{} - - -% ---- b = bold ---- +% ---- bsx = boldsemiexpanded ---- -\DeclareFontShape{LY1}{Junicode-Inf}{b}{n}{ - <-> \Junicode@@scale Junicode-Bold-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{bsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{bold}{n}{ - <-> alias * Junicode-Inf/b/n +\DeclareFontShape{LY1}{Junicode-Inf}{boldsemiexpanded}{it}{ + <-> alias * Junicode-Inf/bsx/it }{} -\DeclareFontShape{LY1}{Junicode-Inf}{b}{it}{ - <-> \Junicode@@scale Junicode-BoldItalic-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{bsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpBold-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{bold}{it}{ - <-> alias * Junicode-Inf/b/it +\DeclareFontShape{LY1}{Junicode-Inf}{boldsemiexpanded}{n}{ + <-> alias * Junicode-Inf/bsx/n }{} -\DeclareFontShape{LY1}{Junicode-Inf}{b}{sl}{ - <-> ssub * Junicode-Inf/b/it +\DeclareFontShape{LY1}{Junicode-Inf}{bsx}{sl}{ + <-> ssub * Junicode-Inf/bsx/it }{} -\DeclareFontShape{LY1}{Junicode-Inf}{bold}{sl}{ - <-> ssub * Junicode-Inf/bold/it +\DeclareFontShape{LY1}{Junicode-Inf}{boldsemiexpanded}{sl}{ + <-> ssub * Junicode-Inf/boldsemiexpanded/it }{} -% ---- sb = semibold ---- +% ---- sbsx = semiboldsemiexpanded ---- -\DeclareFontShape{LY1}{Junicode-Inf}{sb}{it}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{sbsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{semibold}{it}{ - <-> alias * Junicode-Inf/sb/it +\DeclareFontShape{LY1}{Junicode-Inf}{semiboldsemiexpanded}{it}{ + <-> alias * Junicode-Inf/sbsx/it }{} -\DeclareFontShape{LY1}{Junicode-Inf}{sb}{n}{ - <-> \Junicode@@scale Junicode-SmBold-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{semibold}{n}{ - <-> alias * Junicode-Inf/sb/n +\DeclareFontShape{LY1}{Junicode-Inf}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-Inf/sbsx/n }{} -\DeclareFontShape{LY1}{Junicode-Inf}{sb}{sl}{ - <-> ssub * Junicode-Inf/sb/it +\DeclareFontShape{LY1}{Junicode-Inf}{sbsx}{sl}{ + <-> ssub * Junicode-Inf/sbsx/it }{} -\DeclareFontShape{LY1}{Junicode-Inf}{semibold}{sl}{ - <-> ssub * Junicode-Inf/semibold/it +\DeclareFontShape{LY1}{Junicode-Inf}{semiboldsemiexpanded}{sl}{ + <-> ssub * Junicode-Inf/semiboldsemiexpanded/it }{} @@ -116,84 +101,99 @@ }{} -% ---- lc = lightcondensed ---- +% ---- mediumcondensed ---- -\DeclareFontShape{LY1}{Junicode-Inf}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{lightcondensed}{n}{ - <-> alias * Junicode-Inf/lc/n +\DeclareFontShape{LY1}{Junicode-Inf}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{mediumcondensed}{sl}{ + <-> ssub * Junicode-Inf/mediumcondensed/it }{} -\DeclareFontShape{LY1}{Junicode-Inf}{lightcondensed}{it}{ - <-> alias * Junicode-Inf/lc/it + +% ---- sb = semibold ---- + +\DeclareFontShape{LY1}{Junicode-Inf}{sb}{it}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{lc}{sl}{ - <-> ssub * Junicode-Inf/lc/it +\DeclareFontShape{LY1}{Junicode-Inf}{semibold}{it}{ + <-> alias * Junicode-Inf/sb/it }{} -\DeclareFontShape{LY1}{Junicode-Inf}{lightcondensed}{sl}{ - <-> ssub * Junicode-Inf/lightcondensed/it +\DeclareFontShape{LY1}{Junicode-Inf}{sb}{n}{ + <-> \Junicode@@scale Junicode-SmBold-inf-ly1 }{} +\DeclareFontShape{LY1}{Junicode-Inf}{semibold}{n}{ + <-> alias * Junicode-Inf/sb/n +}{} -% ---- bsx = boldsemiexpanded ---- +\DeclareFontShape{LY1}{Junicode-Inf}{sb}{sl}{ + <-> ssub * Junicode-Inf/sb/it +}{} -\DeclareFontShape{LY1}{Junicode-Inf}{bsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{semibold}{sl}{ + <-> ssub * Junicode-Inf/semibold/it }{} -\DeclareFontShape{LY1}{Junicode-Inf}{boldsemiexpanded}{it}{ - <-> alias * Junicode-Inf/bsx/it + +% ---- l = light ---- + +\DeclareFontShape{LY1}{Junicode-Inf}{l}{n}{ + <-> \Junicode@@scale Junicode-Light-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{bsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpBold-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{light}{n}{ + <-> alias * Junicode-Inf/l/n }{} -\DeclareFontShape{LY1}{Junicode-Inf}{boldsemiexpanded}{n}{ - <-> alias * Junicode-Inf/bsx/n +\DeclareFontShape{LY1}{Junicode-Inf}{l}{it}{ + <-> \Junicode@@scale Junicode-LightItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{bsx}{sl}{ - <-> ssub * Junicode-Inf/bsx/it +\DeclareFontShape{LY1}{Junicode-Inf}{light}{it}{ + <-> alias * Junicode-Inf/l/it }{} -\DeclareFontShape{LY1}{Junicode-Inf}{boldsemiexpanded}{sl}{ - <-> ssub * Junicode-Inf/boldsemiexpanded/it +\DeclareFontShape{LY1}{Junicode-Inf}{l}{sl}{ + <-> ssub * Junicode-Inf/l/it }{} +\DeclareFontShape{LY1}{Junicode-Inf}{light}{sl}{ + <-> ssub * Junicode-Inf/light/it +}{} -% ---- sbx = semiboldexpanded ---- -\DeclareFontShape{LY1}{Junicode-Inf}{sbx}{it}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-inf-ly1 +% ---- sx = semiexpanded ---- + +\DeclareFontShape{LY1}{Junicode-Inf}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{semiboldexpanded}{it}{ - <-> alias * Junicode-Inf/sbx/it +\DeclareFontShape{LY1}{Junicode-Inf}{semiexpanded}{n}{ + <-> alias * Junicode-Inf/sx/n }{} -\DeclareFontShape{LY1}{Junicode-Inf}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{semiboldexpanded}{n}{ - <-> alias * Junicode-Inf/sbx/n +\DeclareFontShape{LY1}{Junicode-Inf}{semiexpanded}{it}{ + <-> alias * Junicode-Inf/sx/it }{} -\DeclareFontShape{LY1}{Junicode-Inf}{sbx}{sl}{ - <-> ssub * Junicode-Inf/sbx/it +\DeclareFontShape{LY1}{Junicode-Inf}{sx}{sl}{ + <-> ssub * Junicode-Inf/sx/it }{} -\DeclareFontShape{LY1}{Junicode-Inf}{semiboldexpanded}{sl}{ - <-> ssub * Junicode-Inf/semiboldexpanded/it +\DeclareFontShape{LY1}{Junicode-Inf}{semiexpanded}{sl}{ + <-> ssub * Junicode-Inf/semiexpanded/it }{} @@ -212,154 +212,134 @@ }{} -% ---- mediumsemiexpanded ---- - -\DeclareFontShape{LY1}{Junicode-Inf}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-inf-ly1 -}{} - -\DeclareFontShape{LY1}{Junicode-Inf}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-inf-ly1 -}{} - -\DeclareFontShape{LY1}{Junicode-Inf}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-Inf/mediumsemiexpanded/it -}{} - - -% ---- sbsx = semiboldsemiexpanded ---- +% ---- lc = lightcondensed ---- -\DeclareFontShape{LY1}{Junicode-Inf}{sbsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{semiboldsemiexpanded}{it}{ - <-> alias * Junicode-Inf/sbsx/it +\DeclareFontShape{LY1}{Junicode-Inf}{lightcondensed}{it}{ + <-> alias * Junicode-Inf/lc/it }{} -\DeclareFontShape{LY1}{Junicode-Inf}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-Inf/sbsx/n +\DeclareFontShape{LY1}{Junicode-Inf}{lightcondensed}{n}{ + <-> alias * Junicode-Inf/lc/n }{} -\DeclareFontShape{LY1}{Junicode-Inf}{sbsx}{sl}{ - <-> ssub * Junicode-Inf/sbsx/it +\DeclareFontShape{LY1}{Junicode-Inf}{lc}{sl}{ + <-> ssub * Junicode-Inf/lc/it }{} -\DeclareFontShape{LY1}{Junicode-Inf}{semiboldsemiexpanded}{sl}{ - <-> ssub * Junicode-Inf/semiboldsemiexpanded/it +\DeclareFontShape{LY1}{Junicode-Inf}{lightcondensed}{sl}{ + <-> ssub * Junicode-Inf/lightcondensed/it }{} -% ---- mediumexpanded ---- +% ---- medium ---- -\DeclareFontShape{LY1}{Junicode-Inf}{mediumexpanded}{n}{ - <-> \Junicode@@scale Junicode-ExpMedium-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{medium}{it}{ + <-> \Junicode@@scale Junicode-MediumItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{medium}{n}{ + <-> \Junicode@@scale Junicode-Medium-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{mediumexpanded}{sl}{ - <-> ssub * Junicode-Inf/mediumexpanded/it +\DeclareFontShape{LY1}{Junicode-Inf}{medium}{sl}{ + <-> ssub * Junicode-Inf/medium/it }{} -% ---- sx = semiexpanded ---- +% ---- bx = boldexpanded ---- -\DeclareFontShape{LY1}{Junicode-Inf}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{bx}{n}{ + <-> \Junicode@@scale Junicode-ExpBold-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{semiexpanded}{n}{ - <-> alias * Junicode-Inf/sx/n +\DeclareFontShape{LY1}{Junicode-Inf}{boldexpanded}{n}{ + <-> alias * Junicode-Inf/bx/n }{} -\DeclareFontShape{LY1}{Junicode-Inf}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{semiexpanded}{it}{ - <-> alias * Junicode-Inf/sx/it +\DeclareFontShape{LY1}{Junicode-Inf}{boldexpanded}{it}{ + <-> alias * Junicode-Inf/bx/it }{} -\DeclareFontShape{LY1}{Junicode-Inf}{sx}{sl}{ - <-> ssub * Junicode-Inf/sx/it +\DeclareFontShape{LY1}{Junicode-Inf}{bx}{sl}{ + <-> ssub * Junicode-Inf/bx/it }{} -\DeclareFontShape{LY1}{Junicode-Inf}{semiexpanded}{sl}{ - <-> ssub * Junicode-Inf/semiexpanded/it +\DeclareFontShape{LY1}{Junicode-Inf}{boldexpanded}{sl}{ + <-> ssub * Junicode-Inf/boldexpanded/it }{} -% ---- x = expanded ---- +% ---- m = regular ---- -\DeclareFontShape{LY1}{Junicode-Inf}{x}{it}{ - <-> \Junicode@@scale Junicode-ExpItalic-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{m}{n}{ + <-> \Junicode@@scale Junicode-Regular-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{expanded}{it}{ - <-> alias * Junicode-Inf/x/it +\DeclareFontShape{LY1}{Junicode-Inf}{regular}{n}{ + <-> alias * Junicode-Inf/m/n }{} -\DeclareFontShape{LY1}{Junicode-Inf}{x}{n}{ - <-> \Junicode@@scale Junicode-Exp-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{m}{it}{ + <-> \Junicode@@scale Junicode-Italic-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{expanded}{n}{ - <-> alias * Junicode-Inf/x/n +\DeclareFontShape{LY1}{Junicode-Inf}{regular}{it}{ + <-> alias * Junicode-Inf/m/it }{} -\DeclareFontShape{LY1}{Junicode-Inf}{x}{sl}{ - <-> ssub * Junicode-Inf/x/it +\DeclareFontShape{LY1}{Junicode-Inf}{m}{sl}{ + <-> ssub * Junicode-Inf/m/it }{} -\DeclareFontShape{LY1}{Junicode-Inf}{expanded}{sl}{ - <-> ssub * Junicode-Inf/expanded/it +\DeclareFontShape{LY1}{Junicode-Inf}{regular}{sl}{ + <-> ssub * Junicode-Inf/regular/it }{} -% ---- c = condensed ---- +% ---- mediumsemiexpanded ---- -\DeclareFontShape{LY1}{Junicode-Inf}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{condensed}{it}{ - <-> alias * Junicode-Inf/c/it +\DeclareFontShape{LY1}{Junicode-Inf}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-Inf/mediumsemiexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-Inf}{condensed}{n}{ - <-> alias * Junicode-Inf/c/n + +% ---- mediumexpanded ---- + +\DeclareFontShape{LY1}{Junicode-Inf}{mediumexpanded}{n}{ + <-> \Junicode@@scale Junicode-ExpMedium-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{c}{sl}{ - <-> ssub * Junicode-Inf/c/it +\DeclareFontShape{LY1}{Junicode-Inf}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{condensed}{sl}{ - <-> ssub * Junicode-Inf/condensed/it +\DeclareFontShape{LY1}{Junicode-Inf}{mediumexpanded}{sl}{ + <-> ssub * Junicode-Inf/mediumexpanded/it }{} % ---- lsc = lightsemicondensed ---- -\DeclareFontShape{LY1}{Junicode-Inf}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-inf-ly1 -}{} - -\DeclareFontShape{LY1}{Junicode-Inf}{lightsemicondensed}{it}{ - <-> alias * Junicode-Inf/lsc/it -}{} - \DeclareFontShape{LY1}{Junicode-Inf}{lsc}{n}{ <-> \Junicode@@scale Junicode-SmCondLight-inf-ly1 }{} @@ -368,6 +348,14 @@ <-> alias * Junicode-Inf/lsc/n }{} +\DeclareFontShape{LY1}{Junicode-Inf}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-inf-ly1 +}{} + +\DeclareFontShape{LY1}{Junicode-Inf}{lightsemicondensed}{it}{ + <-> alias * Junicode-Inf/lsc/it +}{} + \DeclareFontShape{LY1}{Junicode-Inf}{lsc}{sl}{ <-> ssub * Junicode-Inf/lsc/it }{} @@ -377,99 +365,111 @@ }{} -% ---- medium ---- +% ---- b = bold ---- -\DeclareFontShape{LY1}{Junicode-Inf}{medium}{n}{ - <-> \Junicode@@scale Junicode-Medium-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{b}{n}{ + <-> \Junicode@@scale Junicode-Bold-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{medium}{it}{ - <-> \Junicode@@scale Junicode-MediumItalic-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{bold}{n}{ + <-> alias * Junicode-Inf/b/n }{} -\DeclareFontShape{LY1}{Junicode-Inf}{medium}{sl}{ - <-> ssub * Junicode-Inf/medium/it +\DeclareFontShape{LY1}{Junicode-Inf}{b}{it}{ + <-> \Junicode@@scale Junicode-BoldItalic-inf-ly1 }{} +\DeclareFontShape{LY1}{Junicode-Inf}{bold}{it}{ + <-> alias * Junicode-Inf/b/it +}{} -% ---- m = regular ---- +\DeclareFontShape{LY1}{Junicode-Inf}{b}{sl}{ + <-> ssub * Junicode-Inf/b/it +}{} -\DeclareFontShape{LY1}{Junicode-Inf}{m}{n}{ - <-> \Junicode@@scale Junicode-Regular-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{bold}{sl}{ + <-> ssub * Junicode-Inf/bold/it }{} -\DeclareFontShape{LY1}{Junicode-Inf}{regular}{n}{ - <-> alias * Junicode-Inf/m/n + +% ---- x = expanded ---- + +\DeclareFontShape{LY1}{Junicode-Inf}{x}{it}{ + <-> \Junicode@@scale Junicode-ExpItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{m}{it}{ - <-> \Junicode@@scale Junicode-Italic-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{expanded}{it}{ + <-> alias * Junicode-Inf/x/it }{} -\DeclareFontShape{LY1}{Junicode-Inf}{regular}{it}{ - <-> alias * Junicode-Inf/m/it +\DeclareFontShape{LY1}{Junicode-Inf}{x}{n}{ + <-> \Junicode@@scale Junicode-Exp-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{m}{sl}{ - <-> ssub * Junicode-Inf/m/it +\DeclareFontShape{LY1}{Junicode-Inf}{expanded}{n}{ + <-> alias * Junicode-Inf/x/n }{} -\DeclareFontShape{LY1}{Junicode-Inf}{regular}{sl}{ - <-> ssub * Junicode-Inf/regular/it +\DeclareFontShape{LY1}{Junicode-Inf}{x}{sl}{ + <-> ssub * Junicode-Inf/x/it }{} +\DeclareFontShape{LY1}{Junicode-Inf}{expanded}{sl}{ + <-> ssub * Junicode-Inf/expanded/it +}{} -% ---- bx = boldexpanded ---- -\DeclareFontShape{LY1}{Junicode-Inf}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-inf-ly1 +% ---- sbx = semiboldexpanded ---- + +\DeclareFontShape{LY1}{Junicode-Inf}{sbx}{it}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{boldexpanded}{it}{ - <-> alias * Junicode-Inf/bx/it +\DeclareFontShape{LY1}{Junicode-Inf}{semiboldexpanded}{it}{ + <-> alias * Junicode-Inf/sbx/it }{} -\DeclareFontShape{LY1}{Junicode-Inf}{bx}{n}{ - <-> \Junicode@@scale Junicode-ExpBold-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{boldexpanded}{n}{ - <-> alias * Junicode-Inf/bx/n +\DeclareFontShape{LY1}{Junicode-Inf}{semiboldexpanded}{n}{ + <-> alias * Junicode-Inf/sbx/n }{} -\DeclareFontShape{LY1}{Junicode-Inf}{bx}{sl}{ - <-> ssub * Junicode-Inf/bx/it +\DeclareFontShape{LY1}{Junicode-Inf}{sbx}{sl}{ + <-> ssub * Junicode-Inf/sbx/it }{} -\DeclareFontShape{LY1}{Junicode-Inf}{boldexpanded}{sl}{ - <-> ssub * Junicode-Inf/boldexpanded/it +\DeclareFontShape{LY1}{Junicode-Inf}{semiboldexpanded}{sl}{ + <-> ssub * Junicode-Inf/semiboldexpanded/it }{} -% ---- l = light ---- +% ---- c = condensed ---- -\DeclareFontShape{LY1}{Junicode-Inf}{l}{n}{ - <-> \Junicode@@scale Junicode-Light-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{light}{n}{ - <-> alias * Junicode-Inf/l/n +\DeclareFontShape{LY1}{Junicode-Inf}{condensed}{n}{ + <-> alias * Junicode-Inf/c/n }{} -\DeclareFontShape{LY1}{Junicode-Inf}{l}{it}{ - <-> \Junicode@@scale Junicode-LightItalic-inf-ly1 +\DeclareFontShape{LY1}{Junicode-Inf}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-inf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Inf}{light}{it}{ - <-> alias * Junicode-Inf/l/it +\DeclareFontShape{LY1}{Junicode-Inf}{condensed}{it}{ + <-> alias * Junicode-Inf/c/it }{} -\DeclareFontShape{LY1}{Junicode-Inf}{l}{sl}{ - <-> ssub * Junicode-Inf/l/it +\DeclareFontShape{LY1}{Junicode-Inf}{c}{sl}{ + <-> ssub * Junicode-Inf/c/it }{} -\DeclareFontShape{LY1}{Junicode-Inf}{light}{sl}{ - <-> ssub * Junicode-Inf/light/it +\DeclareFontShape{LY1}{Junicode-Inf}{condensed}{sl}{ + <-> ssub * Junicode-Inf/condensed/it }{} diff --git a/Master/texmf-dist/tex/latex/junicode/LY1Junicode-LF.fd b/Master/texmf-dist/tex/latex/junicode/LY1Junicode-LF.fd index 86852180b23..a225169dea5 100644 --- a/Master/texmf-dist/tex/latex/junicode/LY1Junicode-LF.fd +++ b/Master/texmf-dist/tex/latex/junicode/LY1Junicode-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{LY1Junicode-LF.fd} - [2024/06/03 (autoinst) Font definitions for LY1/Junicode-LF.] + [2024/07/21 (autoinst) Font definitions for LY1/Junicode-LF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,312 +20,285 @@ \DeclareFontFamily{LY1}{Junicode-LF}{} -% ---- mediumexpanded ---- +% ---- c = condensed ---- -\DeclareFontShape{LY1}{Junicode-LF}{mediumexpanded}{scit}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{c}{sc}{ + <-> \Junicode@@scale Junicode-Cond-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{condensed}{sc}{ + <-> alias * Junicode-LF/c/sc }{} -\DeclareFontShape{LY1}{Junicode-LF}{mediumexpanded}{sc}{ - <-> \Junicode@@scale Junicode-ExpMedium-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{c}{scit}{ + <-> \Junicode@@scale Junicode-CondItalic-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{mediumexpanded}{n}{ - <-> \Junicode@@scale Junicode-ExpMedium-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{condensed}{scit}{ + <-> alias * Junicode-LF/c/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{mediumexpanded}{scsl}{ - <-> ssub * Junicode-LF/mediumexpanded/scit +\DeclareFontShape{LY1}{Junicode-LF}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{mediumexpanded}{sl}{ - <-> ssub * Junicode-LF/mediumexpanded/it +\DeclareFontShape{LY1}{Junicode-LF}{condensed}{n}{ + <-> alias * Junicode-LF/c/n }{} - -% ---- sbsx = semiboldsemiexpanded ---- - -\DeclareFontShape{LY1}{Junicode-LF}{sbsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{semiboldsemiexpanded}{scit}{ - <-> alias * Junicode-LF/sbsx/scit +\DeclareFontShape{LY1}{Junicode-LF}{condensed}{it}{ + <-> alias * Junicode-LF/c/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{sbsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{c}{sl}{ + <-> ssub * Junicode-LF/c/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{semiboldsemiexpanded}{it}{ - <-> alias * Junicode-LF/sbsx/it +\DeclareFontShape{LY1}{Junicode-LF}{condensed}{sl}{ + <-> ssub * Junicode-LF/condensed/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{sbsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{c}{scsl}{ + <-> ssub * Junicode-LF/c/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{semiboldsemiexpanded}{sc}{ - <-> alias * Junicode-LF/sbsx/sc +\DeclareFontShape{LY1}{Junicode-LF}{condensed}{scsl}{ + <-> ssub * Junicode-LF/condensed/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-lf-ly1 -}{} -\DeclareFontShape{LY1}{Junicode-LF}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-LF/sbsx/n -}{} +% ---- sbx = semiboldexpanded ---- -\DeclareFontShape{LY1}{Junicode-LF}{sbsx}{scsl}{ - <-> ssub * Junicode-LF/sbsx/scit +\DeclareFontShape{LY1}{Junicode-LF}{sbx}{sc}{ + <-> \Junicode@@scale Junicode-ExpSmBold-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{semiboldsemiexpanded}{scsl}{ - <-> ssub * Junicode-LF/semiboldsemiexpanded/scit +\DeclareFontShape{LY1}{Junicode-LF}{semiboldexpanded}{sc}{ + <-> alias * Junicode-LF/sbx/sc }{} -\DeclareFontShape{LY1}{Junicode-LF}{sbsx}{sl}{ - <-> ssub * Junicode-LF/sbsx/it +\DeclareFontShape{LY1}{Junicode-LF}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{semiboldsemiexpanded}{sl}{ - <-> ssub * Junicode-LF/semiboldsemiexpanded/it +\DeclareFontShape{LY1}{Junicode-LF}{semiboldexpanded}{n}{ + <-> alias * Junicode-LF/sbx/n }{} +\DeclareFontShape{LY1}{Junicode-LF}{sbx}{scit}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-sc-ly1 +}{} -% ---- mediumsemiexpanded ---- +\DeclareFontShape{LY1}{Junicode-LF}{semiboldexpanded}{scit}{ + <-> alias * Junicode-LF/sbx/scit +}{} -\DeclareFontShape{LY1}{Junicode-LF}{mediumsemiexpanded}{sc}{ - <-> \Junicode@@scale Junicode-SmExpMedium-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{sbx}{it}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{semiboldexpanded}{it}{ + <-> alias * Junicode-LF/sbx/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{mediumsemiexpanded}{scit}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{sbx}{sl}{ + <-> ssub * Junicode-LF/sbx/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{semiboldexpanded}{sl}{ + <-> ssub * Junicode-LF/semiboldexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{mediumsemiexpanded}{scsl}{ - <-> ssub * Junicode-LF/mediumsemiexpanded/scit +\DeclareFontShape{LY1}{Junicode-LF}{sbx}{scsl}{ + <-> ssub * Junicode-LF/sbx/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-LF/mediumsemiexpanded/it +\DeclareFontShape{LY1}{Junicode-LF}{semiboldexpanded}{scsl}{ + <-> ssub * Junicode-LF/semiboldexpanded/scit }{} -% ---- x = expanded ---- +% ---- b = bold ---- -\DeclareFontShape{LY1}{Junicode-LF}{x}{it}{ - <-> \Junicode@@scale Junicode-ExpItalic-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{b}{it}{ + <-> \Junicode@@scale Junicode-BoldItalic-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{expanded}{it}{ - <-> alias * Junicode-LF/x/it +\DeclareFontShape{LY1}{Junicode-LF}{bold}{it}{ + <-> alias * Junicode-LF/b/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{x}{scit}{ - <-> \Junicode@@scale Junicode-ExpItalic-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{b}{scit}{ + <-> \Junicode@@scale Junicode-BoldItalic-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{expanded}{scit}{ - <-> alias * Junicode-LF/x/scit +\DeclareFontShape{LY1}{Junicode-LF}{bold}{scit}{ + <-> alias * Junicode-LF/b/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{x}{n}{ - <-> \Junicode@@scale Junicode-Exp-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{b}{n}{ + <-> \Junicode@@scale Junicode-Bold-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{expanded}{n}{ - <-> alias * Junicode-LF/x/n +\DeclareFontShape{LY1}{Junicode-LF}{bold}{n}{ + <-> alias * Junicode-LF/b/n }{} -\DeclareFontShape{LY1}{Junicode-LF}{x}{sc}{ - <-> \Junicode@@scale Junicode-Exp-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{b}{sc}{ + <-> \Junicode@@scale Junicode-Bold-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{expanded}{sc}{ - <-> alias * Junicode-LF/x/sc +\DeclareFontShape{LY1}{Junicode-LF}{bold}{sc}{ + <-> alias * Junicode-LF/b/sc }{} -\DeclareFontShape{LY1}{Junicode-LF}{x}{scsl}{ - <-> ssub * Junicode-LF/x/scit +\DeclareFontShape{LY1}{Junicode-LF}{b}{sl}{ + <-> ssub * Junicode-LF/b/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{expanded}{scsl}{ - <-> ssub * Junicode-LF/expanded/scit +\DeclareFontShape{LY1}{Junicode-LF}{bold}{sl}{ + <-> ssub * Junicode-LF/bold/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{x}{sl}{ - <-> ssub * Junicode-LF/x/it +\DeclareFontShape{LY1}{Junicode-LF}{b}{scsl}{ + <-> ssub * Junicode-LF/b/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{expanded}{sl}{ - <-> ssub * Junicode-LF/expanded/it +\DeclareFontShape{LY1}{Junicode-LF}{bold}{scsl}{ + <-> ssub * Junicode-LF/bold/scit }{} -% ---- c = condensed ---- - -\DeclareFontShape{LY1}{Junicode-LF}{c}{scit}{ - <-> \Junicode@@scale Junicode-CondItalic-lf-sc-ly1 -}{} - -\DeclareFontShape{LY1}{Junicode-LF}{condensed}{scit}{ - <-> alias * Junicode-LF/c/scit -}{} +% ---- x = expanded ---- -\DeclareFontShape{LY1}{Junicode-LF}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{x}{sc}{ + <-> \Junicode@@scale Junicode-Exp-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{condensed}{it}{ - <-> alias * Junicode-LF/c/it +\DeclareFontShape{LY1}{Junicode-LF}{expanded}{sc}{ + <-> alias * Junicode-LF/x/sc }{} -\DeclareFontShape{LY1}{Junicode-LF}{c}{sc}{ - <-> \Junicode@@scale Junicode-Cond-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{x}{scit}{ + <-> \Junicode@@scale Junicode-ExpItalic-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{condensed}{sc}{ - <-> alias * Junicode-LF/c/sc +\DeclareFontShape{LY1}{Junicode-LF}{expanded}{scit}{ + <-> alias * Junicode-LF/x/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{x}{n}{ + <-> \Junicode@@scale Junicode-Exp-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{condensed}{n}{ - <-> alias * Junicode-LF/c/n +\DeclareFontShape{LY1}{Junicode-LF}{expanded}{n}{ + <-> alias * Junicode-LF/x/n }{} -\DeclareFontShape{LY1}{Junicode-LF}{c}{scsl}{ - <-> ssub * Junicode-LF/c/scit +\DeclareFontShape{LY1}{Junicode-LF}{x}{it}{ + <-> \Junicode@@scale Junicode-ExpItalic-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{condensed}{scsl}{ - <-> ssub * Junicode-LF/condensed/scit +\DeclareFontShape{LY1}{Junicode-LF}{expanded}{it}{ + <-> alias * Junicode-LF/x/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{c}{sl}{ - <-> ssub * Junicode-LF/c/it +\DeclareFontShape{LY1}{Junicode-LF}{x}{sl}{ + <-> ssub * Junicode-LF/x/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{condensed}{sl}{ - <-> ssub * Junicode-LF/condensed/it +\DeclareFontShape{LY1}{Junicode-LF}{expanded}{sl}{ + <-> ssub * Junicode-LF/expanded/it }{} - -% ---- sx = semiexpanded ---- - -\DeclareFontShape{LY1}{Junicode-LF}{sx}{sc}{ - <-> \Junicode@@scale Junicode-SmExp-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{x}{scsl}{ + <-> ssub * Junicode-LF/x/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{semiexpanded}{sc}{ - <-> alias * Junicode-LF/sx/sc +\DeclareFontShape{LY1}{Junicode-LF}{expanded}{scsl}{ + <-> ssub * Junicode-LF/expanded/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-lf-ly1 -}{} -\DeclareFontShape{LY1}{Junicode-LF}{semiexpanded}{n}{ - <-> alias * Junicode-LF/sx/n -}{} +% ---- lsc = lightsemicondensed ---- -\DeclareFontShape{LY1}{Junicode-LF}{sx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpItalic-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{lsc}{sc}{ + <-> \Junicode@@scale Junicode-SmCondLight-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{semiexpanded}{scit}{ - <-> alias * Junicode-LF/sx/scit +\DeclareFontShape{LY1}{Junicode-LF}{lightsemicondensed}{sc}{ + <-> alias * Junicode-LF/lsc/sc }{} -\DeclareFontShape{LY1}{Junicode-LF}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{semiexpanded}{it}{ - <-> alias * Junicode-LF/sx/it +\DeclareFontShape{LY1}{Junicode-LF}{lightsemicondensed}{it}{ + <-> alias * Junicode-LF/lsc/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{sx}{scsl}{ - <-> ssub * Junicode-LF/sx/scit +\DeclareFontShape{LY1}{Junicode-LF}{lsc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{semiexpanded}{scsl}{ - <-> ssub * Junicode-LF/semiexpanded/scit +\DeclareFontShape{LY1}{Junicode-LF}{lightsemicondensed}{scit}{ + <-> alias * Junicode-LF/lsc/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{sx}{sl}{ - <-> ssub * Junicode-LF/sx/it +\DeclareFontShape{LY1}{Junicode-LF}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{semiexpanded}{sl}{ - <-> ssub * Junicode-LF/semiexpanded/it +\DeclareFontShape{LY1}{Junicode-LF}{lightsemicondensed}{n}{ + <-> alias * Junicode-LF/lsc/n }{} - -% ---- m = regular ---- - -\DeclareFontShape{LY1}{Junicode-LF}{m}{n}{ - <-> \Junicode@@scale Junicode-Regular-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{lsc}{sl}{ + <-> ssub * Junicode-LF/lsc/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{regular}{n}{ - <-> alias * Junicode-LF/m/n +\DeclareFontShape{LY1}{Junicode-LF}{lightsemicondensed}{sl}{ + <-> ssub * Junicode-LF/lightsemicondensed/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{m}{sc}{ - <-> \Junicode@@scale Junicode-Regular-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{lsc}{scsl}{ + <-> ssub * Junicode-LF/lsc/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{regular}{sc}{ - <-> alias * Junicode-LF/m/sc +\DeclareFontShape{LY1}{Junicode-LF}{lightsemicondensed}{scsl}{ + <-> ssub * Junicode-LF/lightsemicondensed/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{m}{it}{ - <-> \Junicode@@scale Junicode-Italic-lf-ly1 -}{} -\DeclareFontShape{LY1}{Junicode-LF}{regular}{it}{ - <-> alias * Junicode-LF/m/it -}{} +% ---- mediumexpanded ---- -\DeclareFontShape{LY1}{Junicode-LF}{m}{scit}{ - <-> \Junicode@@scale Junicode-Italic-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{regular}{scit}{ - <-> alias * Junicode-LF/m/scit +\DeclareFontShape{LY1}{Junicode-LF}{mediumexpanded}{n}{ + <-> \Junicode@@scale Junicode-ExpMedium-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{m}{scsl}{ - <-> ssub * Junicode-LF/m/scit +\DeclareFontShape{LY1}{Junicode-LF}{mediumexpanded}{scit}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{regular}{scsl}{ - <-> ssub * Junicode-LF/regular/scit +\DeclareFontShape{LY1}{Junicode-LF}{mediumexpanded}{sc}{ + <-> \Junicode@@scale Junicode-ExpMedium-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{m}{sl}{ - <-> ssub * Junicode-LF/m/it +\DeclareFontShape{LY1}{Junicode-LF}{mediumexpanded}{sl}{ + <-> ssub * Junicode-LF/mediumexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{regular}{sl}{ - <-> ssub * Junicode-LF/regular/it +\DeclareFontShape{LY1}{Junicode-LF}{mediumexpanded}{scsl}{ + <-> ssub * Junicode-LF/mediumexpanded/scit }{} @@ -347,358 +320,404 @@ <-> \Junicode@@scale Junicode-Medium-lf-sc-ly1 }{} +\DeclareFontShape{LY1}{Junicode-LF}{medium}{sl}{ + <-> ssub * Junicode-LF/medium/it +}{} + \DeclareFontShape{LY1}{Junicode-LF}{medium}{scsl}{ <-> ssub * Junicode-LF/medium/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{medium}{sl}{ - <-> ssub * Junicode-LF/medium/it + +% ---- bx = boldexpanded ---- + +\DeclareFontShape{LY1}{Junicode-LF}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-ly1 }{} +\DeclareFontShape{LY1}{Junicode-LF}{boldexpanded}{it}{ + <-> alias * Junicode-LF/bx/it +}{} -% ---- lsc = lightsemicondensed ---- +\DeclareFontShape{LY1}{Junicode-LF}{bx}{n}{ + <-> \Junicode@@scale Junicode-ExpBold-lf-ly1 +}{} -\DeclareFontShape{LY1}{Junicode-LF}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{boldexpanded}{n}{ + <-> alias * Junicode-LF/bx/n }{} -\DeclareFontShape{LY1}{Junicode-LF}{lightsemicondensed}{n}{ - <-> alias * Junicode-LF/lsc/n +\DeclareFontShape{LY1}{Junicode-LF}{bx}{scit}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{lsc}{sc}{ - <-> \Junicode@@scale Junicode-SmCondLight-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{boldexpanded}{scit}{ + <-> alias * Junicode-LF/bx/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{lightsemicondensed}{sc}{ - <-> alias * Junicode-LF/lsc/sc +\DeclareFontShape{LY1}{Junicode-LF}{bx}{sc}{ + <-> \Junicode@@scale Junicode-ExpBold-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{boldexpanded}{sc}{ + <-> alias * Junicode-LF/bx/sc }{} -\DeclareFontShape{LY1}{Junicode-LF}{lightsemicondensed}{it}{ - <-> alias * Junicode-LF/lsc/it +\DeclareFontShape{LY1}{Junicode-LF}{bx}{sl}{ + <-> ssub * Junicode-LF/bx/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{lsc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{boldexpanded}{sl}{ + <-> ssub * Junicode-LF/boldexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{lightsemicondensed}{scit}{ - <-> alias * Junicode-LF/lsc/scit +\DeclareFontShape{LY1}{Junicode-LF}{bx}{scsl}{ + <-> ssub * Junicode-LF/bx/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{lsc}{scsl}{ - <-> ssub * Junicode-LF/lsc/scit +\DeclareFontShape{LY1}{Junicode-LF}{boldexpanded}{scsl}{ + <-> ssub * Junicode-LF/boldexpanded/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{lightsemicondensed}{scsl}{ - <-> ssub * Junicode-LF/lightsemicondensed/scit + +% ---- mediumsemiexpanded ---- + +\DeclareFontShape{LY1}{Junicode-LF}{mediumsemiexpanded}{scit}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{lsc}{sl}{ - <-> ssub * Junicode-LF/lsc/it +\DeclareFontShape{LY1}{Junicode-LF}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{lightsemicondensed}{sl}{ - <-> ssub * Junicode-LF/lightsemicondensed/it +\DeclareFontShape{LY1}{Junicode-LF}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-ly1 }{} +\DeclareFontShape{LY1}{Junicode-LF}{mediumsemiexpanded}{sc}{ + <-> \Junicode@@scale Junicode-SmExpMedium-lf-sc-ly1 +}{} -% ---- l = light ---- +\DeclareFontShape{LY1}{Junicode-LF}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-LF/mediumsemiexpanded/it +}{} -\DeclareFontShape{LY1}{Junicode-LF}{l}{sc}{ - <-> \Junicode@@scale Junicode-Light-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{mediumsemiexpanded}{scsl}{ + <-> ssub * Junicode-LF/mediumsemiexpanded/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{light}{sc}{ - <-> alias * Junicode-LF/l/sc + +% ---- m = regular ---- + +\DeclareFontShape{LY1}{Junicode-LF}{m}{sc}{ + <-> \Junicode@@scale Junicode-Regular-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{l}{n}{ - <-> \Junicode@@scale Junicode-Light-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{regular}{sc}{ + <-> alias * Junicode-LF/m/sc }{} -\DeclareFontShape{LY1}{Junicode-LF}{light}{n}{ - <-> alias * Junicode-LF/l/n +\DeclareFontShape{LY1}{Junicode-LF}{m}{it}{ + <-> \Junicode@@scale Junicode-Italic-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{l}{scit}{ - <-> \Junicode@@scale Junicode-LightItalic-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{regular}{it}{ + <-> alias * Junicode-LF/m/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{light}{scit}{ - <-> alias * Junicode-LF/l/scit +\DeclareFontShape{LY1}{Junicode-LF}{m}{scit}{ + <-> \Junicode@@scale Junicode-Italic-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{l}{it}{ - <-> \Junicode@@scale Junicode-LightItalic-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{regular}{scit}{ + <-> alias * Junicode-LF/m/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{light}{it}{ - <-> alias * Junicode-LF/l/it +\DeclareFontShape{LY1}{Junicode-LF}{m}{n}{ + <-> \Junicode@@scale Junicode-Regular-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{l}{scsl}{ - <-> ssub * Junicode-LF/l/scit +\DeclareFontShape{LY1}{Junicode-LF}{regular}{n}{ + <-> alias * Junicode-LF/m/n }{} -\DeclareFontShape{LY1}{Junicode-LF}{light}{scsl}{ - <-> ssub * Junicode-LF/light/scit +\DeclareFontShape{LY1}{Junicode-LF}{m}{sl}{ + <-> ssub * Junicode-LF/m/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{l}{sl}{ - <-> ssub * Junicode-LF/l/it +\DeclareFontShape{LY1}{Junicode-LF}{regular}{sl}{ + <-> ssub * Junicode-LF/regular/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{light}{sl}{ - <-> ssub * Junicode-LF/light/it +\DeclareFontShape{LY1}{Junicode-LF}{m}{scsl}{ + <-> ssub * Junicode-LF/m/scit }{} +\DeclareFontShape{LY1}{Junicode-LF}{regular}{scsl}{ + <-> ssub * Junicode-LF/regular/scit +}{} -% ---- bx = boldexpanded ---- -\DeclareFontShape{LY1}{Junicode-LF}{bx}{scit}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-sc-ly1 +% ---- lc = lightcondensed ---- + +\DeclareFontShape{LY1}{Junicode-LF}{lc}{sc}{ + <-> \Junicode@@scale Junicode-CondLight-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{boldexpanded}{scit}{ - <-> alias * Junicode-LF/bx/scit +\DeclareFontShape{LY1}{Junicode-LF}{lightcondensed}{sc}{ + <-> alias * Junicode-LF/lc/sc }{} -\DeclareFontShape{LY1}{Junicode-LF}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{boldexpanded}{it}{ - <-> alias * Junicode-LF/bx/it +\DeclareFontShape{LY1}{Junicode-LF}{lightcondensed}{it}{ + <-> alias * Junicode-LF/lc/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{bx}{sc}{ - <-> \Junicode@@scale Junicode-ExpBold-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{boldexpanded}{sc}{ - <-> alias * Junicode-LF/bx/sc +\DeclareFontShape{LY1}{Junicode-LF}{lightcondensed}{n}{ + <-> alias * Junicode-LF/lc/n }{} -\DeclareFontShape{LY1}{Junicode-LF}{bx}{n}{ - <-> \Junicode@@scale Junicode-ExpBold-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{lc}{scit}{ + <-> \Junicode@@scale Junicode-CondLightItalic-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{boldexpanded}{n}{ - <-> alias * Junicode-LF/bx/n +\DeclareFontShape{LY1}{Junicode-LF}{lightcondensed}{scit}{ + <-> alias * Junicode-LF/lc/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{bx}{scsl}{ - <-> ssub * Junicode-LF/bx/scit +\DeclareFontShape{LY1}{Junicode-LF}{lc}{sl}{ + <-> ssub * Junicode-LF/lc/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{boldexpanded}{scsl}{ - <-> ssub * Junicode-LF/boldexpanded/scit +\DeclareFontShape{LY1}{Junicode-LF}{lightcondensed}{sl}{ + <-> ssub * Junicode-LF/lightcondensed/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{bx}{sl}{ - <-> ssub * Junicode-LF/bx/it +\DeclareFontShape{LY1}{Junicode-LF}{lc}{scsl}{ + <-> ssub * Junicode-LF/lc/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{boldexpanded}{sl}{ - <-> ssub * Junicode-LF/boldexpanded/it +\DeclareFontShape{LY1}{Junicode-LF}{lightcondensed}{scsl}{ + <-> ssub * Junicode-LF/lightcondensed/scit }{} -% ---- mediumcondensed ---- +% ---- mediumsemicondensed ---- -\DeclareFontShape{LY1}{Junicode-LF}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{mediumsemicondensed}{it}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{mediumcondensed}{sc}{ - <-> \Junicode@@scale Junicode-CondMedium-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{mediumsemicondensed}{scit}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{mediumsemicondensed}{n}{ + <-> \Junicode@@scale Junicode-SmCondMedium-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{mediumcondensed}{scit}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{mediumsemicondensed}{sc}{ + <-> \Junicode@@scale Junicode-SmCondMedium-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{mediumcondensed}{scsl}{ - <-> ssub * Junicode-LF/mediumcondensed/scit +\DeclareFontShape{LY1}{Junicode-LF}{mediumsemicondensed}{sl}{ + <-> ssub * Junicode-LF/mediumsemicondensed/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{mediumcondensed}{sl}{ - <-> ssub * Junicode-LF/mediumcondensed/it +\DeclareFontShape{LY1}{Junicode-LF}{mediumsemicondensed}{scsl}{ + <-> ssub * Junicode-LF/mediumsemicondensed/scit }{} -% ---- b = bold ---- +% ---- l = light ---- -\DeclareFontShape{LY1}{Junicode-LF}{b}{sc}{ - <-> \Junicode@@scale Junicode-Bold-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{l}{sc}{ + <-> \Junicode@@scale Junicode-Light-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{bold}{sc}{ - <-> alias * Junicode-LF/b/sc +\DeclareFontShape{LY1}{Junicode-LF}{light}{sc}{ + <-> alias * Junicode-LF/l/sc }{} -\DeclareFontShape{LY1}{Junicode-LF}{b}{n}{ - <-> \Junicode@@scale Junicode-Bold-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{l}{it}{ + <-> \Junicode@@scale Junicode-LightItalic-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{bold}{n}{ - <-> alias * Junicode-LF/b/n +\DeclareFontShape{LY1}{Junicode-LF}{light}{it}{ + <-> alias * Junicode-LF/l/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{b}{scit}{ - <-> \Junicode@@scale Junicode-BoldItalic-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{l}{n}{ + <-> \Junicode@@scale Junicode-Light-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{bold}{scit}{ - <-> alias * Junicode-LF/b/scit +\DeclareFontShape{LY1}{Junicode-LF}{light}{n}{ + <-> alias * Junicode-LF/l/n }{} -\DeclareFontShape{LY1}{Junicode-LF}{b}{it}{ - <-> \Junicode@@scale Junicode-BoldItalic-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{l}{scit}{ + <-> \Junicode@@scale Junicode-LightItalic-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{bold}{it}{ - <-> alias * Junicode-LF/b/it +\DeclareFontShape{LY1}{Junicode-LF}{light}{scit}{ + <-> alias * Junicode-LF/l/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{b}{scsl}{ - <-> ssub * Junicode-LF/b/scit +\DeclareFontShape{LY1}{Junicode-LF}{l}{sl}{ + <-> ssub * Junicode-LF/l/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{bold}{scsl}{ - <-> ssub * Junicode-LF/bold/scit +\DeclareFontShape{LY1}{Junicode-LF}{light}{sl}{ + <-> ssub * Junicode-LF/light/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{b}{sl}{ - <-> ssub * Junicode-LF/b/it +\DeclareFontShape{LY1}{Junicode-LF}{l}{scsl}{ + <-> ssub * Junicode-LF/l/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{bold}{sl}{ - <-> ssub * Junicode-LF/bold/it +\DeclareFontShape{LY1}{Junicode-LF}{light}{scsl}{ + <-> ssub * Junicode-LF/light/scit }{} -% ---- bsx = boldsemiexpanded ---- +% ---- sx = semiexpanded ---- -\DeclareFontShape{LY1}{Junicode-LF}{bsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{sx}{sc}{ + <-> \Junicode@@scale Junicode-SmExp-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{boldsemiexpanded}{it}{ - <-> alias * Junicode-LF/bsx/it +\DeclareFontShape{LY1}{Junicode-LF}{semiexpanded}{sc}{ + <-> alias * Junicode-LF/sx/sc }{} -\DeclareFontShape{LY1}{Junicode-LF}{bsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{sx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpItalic-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{boldsemiexpanded}{scit}{ - <-> alias * Junicode-LF/bsx/scit +\DeclareFontShape{LY1}{Junicode-LF}{semiexpanded}{scit}{ + <-> alias * Junicode-LF/sx/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{bsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpBold-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{boldsemiexpanded}{n}{ - <-> alias * Junicode-LF/bsx/n +\DeclareFontShape{LY1}{Junicode-LF}{semiexpanded}{n}{ + <-> alias * Junicode-LF/sx/n }{} -\DeclareFontShape{LY1}{Junicode-LF}{bsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpBold-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{boldsemiexpanded}{sc}{ - <-> alias * Junicode-LF/bsx/sc +\DeclareFontShape{LY1}{Junicode-LF}{semiexpanded}{it}{ + <-> alias * Junicode-LF/sx/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{bsx}{scsl}{ - <-> ssub * Junicode-LF/bsx/scit +\DeclareFontShape{LY1}{Junicode-LF}{sx}{sl}{ + <-> ssub * Junicode-LF/sx/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{boldsemiexpanded}{scsl}{ - <-> ssub * Junicode-LF/boldsemiexpanded/scit +\DeclareFontShape{LY1}{Junicode-LF}{semiexpanded}{sl}{ + <-> ssub * Junicode-LF/semiexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{bsx}{sl}{ - <-> ssub * Junicode-LF/bsx/it +\DeclareFontShape{LY1}{Junicode-LF}{sx}{scsl}{ + <-> ssub * Junicode-LF/sx/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{boldsemiexpanded}{sl}{ - <-> ssub * Junicode-LF/boldsemiexpanded/it +\DeclareFontShape{LY1}{Junicode-LF}{semiexpanded}{scsl}{ + <-> ssub * Junicode-LF/semiexpanded/scit }{} -% ---- lc = lightcondensed ---- +% ---- mediumcondensed ---- -\DeclareFontShape{LY1}{Junicode-LF}{lc}{scit}{ - <-> \Junicode@@scale Junicode-CondLightItalic-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{mediumcondensed}{sc}{ + <-> \Junicode@@scale Junicode-CondMedium-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{lightcondensed}{scit}{ - <-> alias * Junicode-LF/lc/scit +\DeclareFontShape{LY1}{Junicode-LF}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{mediumcondensed}{scit}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{lightcondensed}{it}{ - <-> alias * Junicode-LF/lc/it +\DeclareFontShape{LY1}{Junicode-LF}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{lc}{sc}{ - <-> \Junicode@@scale Junicode-CondLight-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{mediumcondensed}{sl}{ + <-> ssub * Junicode-LF/mediumcondensed/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{lightcondensed}{sc}{ - <-> alias * Junicode-LF/lc/sc +\DeclareFontShape{LY1}{Junicode-LF}{mediumcondensed}{scsl}{ + <-> ssub * Junicode-LF/mediumcondensed/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-lf-ly1 + +% ---- sb = semibold ---- + +\DeclareFontShape{LY1}{Junicode-LF}{sb}{it}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{lightcondensed}{n}{ - <-> alias * Junicode-LF/lc/n +\DeclareFontShape{LY1}{Junicode-LF}{semibold}{it}{ + <-> alias * Junicode-LF/sb/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{lc}{scsl}{ - <-> ssub * Junicode-LF/lc/scit +\DeclareFontShape{LY1}{Junicode-LF}{sb}{scit}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{lightcondensed}{scsl}{ - <-> ssub * Junicode-LF/lightcondensed/scit +\DeclareFontShape{LY1}{Junicode-LF}{semibold}{scit}{ + <-> alias * Junicode-LF/sb/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{lc}{sl}{ - <-> ssub * Junicode-LF/lc/it +\DeclareFontShape{LY1}{Junicode-LF}{sb}{n}{ + <-> \Junicode@@scale Junicode-SmBold-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{lightcondensed}{sl}{ - <-> ssub * Junicode-LF/lightcondensed/it +\DeclareFontShape{LY1}{Junicode-LF}{semibold}{n}{ + <-> alias * Junicode-LF/sb/n }{} +\DeclareFontShape{LY1}{Junicode-LF}{sb}{sc}{ + <-> \Junicode@@scale Junicode-SmBold-lf-sc-ly1 +}{} -% ---- sc = semicondensed ---- +\DeclareFontShape{LY1}{Junicode-LF}{semibold}{sc}{ + <-> alias * Junicode-LF/sb/sc +}{} -\DeclareFontShape{LY1}{Junicode-LF}{sc}{n}{ - <-> \Junicode@@scale Junicode-SmCond-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{sb}{sl}{ + <-> ssub * Junicode-LF/sb/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{semicondensed}{n}{ - <-> alias * Junicode-LF/sc/n +\DeclareFontShape{LY1}{Junicode-LF}{semibold}{sl}{ + <-> ssub * Junicode-LF/semibold/it +}{} + +\DeclareFontShape{LY1}{Junicode-LF}{sb}{scsl}{ + <-> ssub * Junicode-LF/sb/scit }{} +\DeclareFontShape{LY1}{Junicode-LF}{semibold}{scsl}{ + <-> ssub * Junicode-LF/semibold/scit +}{} + + +% ---- sc = semicondensed ---- + \DeclareFontShape{LY1}{Junicode-LF}{sc}{sc}{ <-> \Junicode@@scale Junicode-SmCond-lf-sc-ly1 }{} @@ -723,12 +742,12 @@ <-> alias * Junicode-LF/sc/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{sc}{scsl}{ - <-> ssub * Junicode-LF/sc/scit +\DeclareFontShape{LY1}{Junicode-LF}{sc}{n}{ + <-> \Junicode@@scale Junicode-SmCond-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{semicondensed}{scsl}{ - <-> ssub * Junicode-LF/semicondensed/scit +\DeclareFontShape{LY1}{Junicode-LF}{semicondensed}{n}{ + <-> alias * Junicode-LF/sc/n }{} \DeclareFontShape{LY1}{Junicode-LF}{sc}{sl}{ @@ -739,133 +758,114 @@ <-> ssub * Junicode-LF/semicondensed/it }{} - -% ---- sb = semibold ---- - -\DeclareFontShape{LY1}{Junicode-LF}{sb}{sc}{ - <-> \Junicode@@scale Junicode-SmBold-lf-sc-ly1 -}{} - -\DeclareFontShape{LY1}{Junicode-LF}{semibold}{sc}{ - <-> alias * Junicode-LF/sb/sc -}{} - -\DeclareFontShape{LY1}{Junicode-LF}{sb}{n}{ - <-> \Junicode@@scale Junicode-SmBold-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{sc}{scsl}{ + <-> ssub * Junicode-LF/sc/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{semibold}{n}{ - <-> alias * Junicode-LF/sb/n +\DeclareFontShape{LY1}{Junicode-LF}{semicondensed}{scsl}{ + <-> ssub * Junicode-LF/semicondensed/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{sb}{scit}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-lf-sc-ly1 -}{} -\DeclareFontShape{LY1}{Junicode-LF}{semibold}{scit}{ - <-> alias * Junicode-LF/sb/scit -}{} +% ---- bsx = boldsemiexpanded ---- -\DeclareFontShape{LY1}{Junicode-LF}{sb}{it}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{bsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpBold-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{semibold}{it}{ - <-> alias * Junicode-LF/sb/it +\DeclareFontShape{LY1}{Junicode-LF}{boldsemiexpanded}{sc}{ + <-> alias * Junicode-LF/bsx/sc }{} -\DeclareFontShape{LY1}{Junicode-LF}{sb}{scsl}{ - <-> ssub * Junicode-LF/sb/scit +\DeclareFontShape{LY1}{Junicode-LF}{bsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{semibold}{scsl}{ - <-> ssub * Junicode-LF/semibold/scit +\DeclareFontShape{LY1}{Junicode-LF}{boldsemiexpanded}{scit}{ + <-> alias * Junicode-LF/bsx/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{sb}{sl}{ - <-> ssub * Junicode-LF/sb/it +\DeclareFontShape{LY1}{Junicode-LF}{bsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpBold-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{semibold}{sl}{ - <-> ssub * Junicode-LF/semibold/it +\DeclareFontShape{LY1}{Junicode-LF}{boldsemiexpanded}{n}{ + <-> alias * Junicode-LF/bsx/n }{} - -% ---- mediumsemicondensed ---- - -\DeclareFontShape{LY1}{Junicode-LF}{mediumsemicondensed}{scit}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{bsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{mediumsemicondensed}{it}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{boldsemiexpanded}{it}{ + <-> alias * Junicode-LF/bsx/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{mediumsemicondensed}{sc}{ - <-> \Junicode@@scale Junicode-SmCondMedium-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{bsx}{sl}{ + <-> ssub * Junicode-LF/bsx/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{mediumsemicondensed}{n}{ - <-> \Junicode@@scale Junicode-SmCondMedium-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{boldsemiexpanded}{sl}{ + <-> ssub * Junicode-LF/boldsemiexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{mediumsemicondensed}{scsl}{ - <-> ssub * Junicode-LF/mediumsemicondensed/scit +\DeclareFontShape{LY1}{Junicode-LF}{bsx}{scsl}{ + <-> ssub * Junicode-LF/bsx/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{mediumsemicondensed}{sl}{ - <-> ssub * Junicode-LF/mediumsemicondensed/it +\DeclareFontShape{LY1}{Junicode-LF}{boldsemiexpanded}{scsl}{ + <-> ssub * Junicode-LF/boldsemiexpanded/scit }{} -% ---- sbx = semiboldexpanded ---- +% ---- sbsx = semiboldsemiexpanded ---- -\DeclareFontShape{LY1}{Junicode-LF}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{sbsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{semiboldexpanded}{n}{ - <-> alias * Junicode-LF/sbx/n +\DeclareFontShape{LY1}{Junicode-LF}{semiboldsemiexpanded}{sc}{ + <-> alias * Junicode-LF/sbsx/sc }{} -\DeclareFontShape{LY1}{Junicode-LF}{sbx}{sc}{ - <-> \Junicode@@scale Junicode-ExpSmBold-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{semiboldexpanded}{sc}{ - <-> alias * Junicode-LF/sbx/sc +\DeclareFontShape{LY1}{Junicode-LF}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-LF/sbsx/n }{} -\DeclareFontShape{LY1}{Junicode-LF}{sbx}{it}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{sbsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{semiboldexpanded}{it}{ - <-> alias * Junicode-LF/sbx/it +\DeclareFontShape{LY1}{Junicode-LF}{semiboldsemiexpanded}{scit}{ + <-> alias * Junicode-LF/sbsx/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{sbx}{scit}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-LF}{sbsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-LF}{semiboldexpanded}{scit}{ - <-> alias * Junicode-LF/sbx/scit +\DeclareFontShape{LY1}{Junicode-LF}{semiboldsemiexpanded}{it}{ + <-> alias * Junicode-LF/sbsx/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{sbx}{scsl}{ - <-> ssub * Junicode-LF/sbx/scit +\DeclareFontShape{LY1}{Junicode-LF}{sbsx}{sl}{ + <-> ssub * Junicode-LF/sbsx/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{semiboldexpanded}{scsl}{ - <-> ssub * Junicode-LF/semiboldexpanded/scit +\DeclareFontShape{LY1}{Junicode-LF}{semiboldsemiexpanded}{sl}{ + <-> ssub * Junicode-LF/semiboldsemiexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-LF}{sbx}{sl}{ - <-> ssub * Junicode-LF/sbx/it +\DeclareFontShape{LY1}{Junicode-LF}{sbsx}{scsl}{ + <-> ssub * Junicode-LF/sbsx/scit }{} -\DeclareFontShape{LY1}{Junicode-LF}{semiboldexpanded}{sl}{ - <-> ssub * Junicode-LF/semiboldexpanded/it +\DeclareFontShape{LY1}{Junicode-LF}{semiboldsemiexpanded}{scsl}{ + <-> ssub * Junicode-LF/semiboldsemiexpanded/scit }{} diff --git a/Master/texmf-dist/tex/latex/junicode/LY1Junicode-OsF.fd b/Master/texmf-dist/tex/latex/junicode/LY1Junicode-OsF.fd index fd942d07b1b..eb4595a4bf5 100644 --- a/Master/texmf-dist/tex/latex/junicode/LY1Junicode-OsF.fd +++ b/Master/texmf-dist/tex/latex/junicode/LY1Junicode-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{LY1Junicode-OsF.fd} - [2024/06/03 (autoinst) Font definitions for LY1/Junicode-OsF.] + [2024/07/21 (autoinst) Font definitions for LY1/Junicode-OsF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,852 +20,852 @@ \DeclareFontFamily{LY1}{Junicode-OsF}{} -% ---- medium ---- +% ---- mediumcondensed ---- -\DeclareFontShape{LY1}{Junicode-OsF}{medium}{it}{ - <-> \Junicode@@scale Junicode-MediumItalic-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{mediumcondensed}{sc}{ + <-> \Junicode@@scale Junicode-CondMedium-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{medium}{scit}{ - <-> \Junicode@@scale Junicode-MediumItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{medium}{n}{ - <-> \Junicode@@scale Junicode-Medium-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{medium}{sc}{ - <-> \Junicode@@scale Junicode-Medium-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{mediumcondensed}{scit}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{medium}{scsl}{ - <-> ssub * Junicode-OsF/medium/scit +\DeclareFontShape{LY1}{Junicode-OsF}{mediumcondensed}{sl}{ + <-> ssub * Junicode-OsF/mediumcondensed/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{medium}{sl}{ - <-> ssub * Junicode-OsF/medium/it +\DeclareFontShape{LY1}{Junicode-OsF}{mediumcondensed}{scsl}{ + <-> ssub * Junicode-OsF/mediumcondensed/scit }{} -% ---- lsc = lightsemicondensed ---- +% ---- sb = semibold ---- -\DeclareFontShape{LY1}{Junicode-OsF}{lsc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{sb}{scit}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{lightsemicondensed}{scit}{ - <-> alias * Junicode-OsF/lsc/scit +\DeclareFontShape{LY1}{Junicode-OsF}{semibold}{scit}{ + <-> alias * Junicode-OsF/sb/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{sb}{n}{ + <-> \Junicode@@scale Junicode-SmBold-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{lightsemicondensed}{it}{ - <-> alias * Junicode-OsF/lsc/it +\DeclareFontShape{LY1}{Junicode-OsF}{semibold}{n}{ + <-> alias * Junicode-OsF/sb/n }{} -\DeclareFontShape{LY1}{Junicode-OsF}{lsc}{sc}{ - <-> \Junicode@@scale Junicode-SmCondLight-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{sb}{it}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{lightsemicondensed}{sc}{ - <-> alias * Junicode-OsF/lsc/sc +\DeclareFontShape{LY1}{Junicode-OsF}{semibold}{it}{ + <-> alias * Junicode-OsF/sb/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{sb}{sc}{ + <-> \Junicode@@scale Junicode-SmBold-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{lightsemicondensed}{n}{ - <-> alias * Junicode-OsF/lsc/n +\DeclareFontShape{LY1}{Junicode-OsF}{semibold}{sc}{ + <-> alias * Junicode-OsF/sb/sc }{} -\DeclareFontShape{LY1}{Junicode-OsF}{lsc}{scsl}{ - <-> ssub * Junicode-OsF/lsc/scit +\DeclareFontShape{LY1}{Junicode-OsF}{sb}{sl}{ + <-> ssub * Junicode-OsF/sb/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{lightsemicondensed}{scsl}{ - <-> ssub * Junicode-OsF/lightsemicondensed/scit +\DeclareFontShape{LY1}{Junicode-OsF}{semibold}{sl}{ + <-> ssub * Junicode-OsF/semibold/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{lsc}{sl}{ - <-> ssub * Junicode-OsF/lsc/it +\DeclareFontShape{LY1}{Junicode-OsF}{sb}{scsl}{ + <-> ssub * Junicode-OsF/sb/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{lightsemicondensed}{sl}{ - <-> ssub * Junicode-OsF/lightsemicondensed/it +\DeclareFontShape{LY1}{Junicode-OsF}{semibold}{scsl}{ + <-> ssub * Junicode-OsF/semibold/scit }{} -% ---- m = regular ---- +% ---- sbsx = semiboldsemiexpanded ---- -\DeclareFontShape{LY1}{Junicode-OsF}{m}{sc}{ - <-> \Junicode@@scale Junicode-Regular-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{sbsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{regular}{sc}{ - <-> alias * Junicode-OsF/m/sc +\DeclareFontShape{LY1}{Junicode-OsF}{semiboldsemiexpanded}{sc}{ + <-> alias * Junicode-OsF/sbsx/sc }{} -\DeclareFontShape{LY1}{Junicode-OsF}{m}{n}{ - <-> \Junicode@@scale Junicode-Regular-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{sbsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{regular}{n}{ - <-> alias * Junicode-OsF/m/n +\DeclareFontShape{LY1}{Junicode-OsF}{semiboldsemiexpanded}{scit}{ + <-> alias * Junicode-OsF/sbsx/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{m}{scit}{ - <-> \Junicode@@scale Junicode-Italic-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{regular}{scit}{ - <-> alias * Junicode-OsF/m/scit +\DeclareFontShape{LY1}{Junicode-OsF}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-OsF/sbsx/n }{} -\DeclareFontShape{LY1}{Junicode-OsF}{m}{it}{ - <-> \Junicode@@scale Junicode-Italic-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{sbsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{regular}{it}{ - <-> alias * Junicode-OsF/m/it +\DeclareFontShape{LY1}{Junicode-OsF}{semiboldsemiexpanded}{it}{ + <-> alias * Junicode-OsF/sbsx/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{m}{scsl}{ - <-> ssub * Junicode-OsF/m/scit +\DeclareFontShape{LY1}{Junicode-OsF}{sbsx}{sl}{ + <-> ssub * Junicode-OsF/sbsx/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{regular}{scsl}{ - <-> ssub * Junicode-OsF/regular/scit +\DeclareFontShape{LY1}{Junicode-OsF}{semiboldsemiexpanded}{sl}{ + <-> ssub * Junicode-OsF/semiboldsemiexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{m}{sl}{ - <-> ssub * Junicode-OsF/m/it +\DeclareFontShape{LY1}{Junicode-OsF}{sbsx}{scsl}{ + <-> ssub * Junicode-OsF/sbsx/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{regular}{sl}{ - <-> ssub * Junicode-OsF/regular/it +\DeclareFontShape{LY1}{Junicode-OsF}{semiboldsemiexpanded}{scsl}{ + <-> ssub * Junicode-OsF/semiboldsemiexpanded/scit }{} -% ---- bx = boldexpanded ---- +% ---- bsx = boldsemiexpanded ---- -\DeclareFontShape{LY1}{Junicode-OsF}{bx}{sc}{ - <-> \Junicode@@scale Junicode-ExpBold-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{bsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpBold-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{boldexpanded}{sc}{ - <-> alias * Junicode-OsF/bx/sc +\DeclareFontShape{LY1}{Junicode-OsF}{boldsemiexpanded}{sc}{ + <-> alias * Junicode-OsF/bsx/sc }{} -\DeclareFontShape{LY1}{Junicode-OsF}{bx}{n}{ - <-> \Junicode@@scale Junicode-ExpBold-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{bsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{boldexpanded}{n}{ - <-> alias * Junicode-OsF/bx/n +\DeclareFontShape{LY1}{Junicode-OsF}{boldsemiexpanded}{scit}{ + <-> alias * Junicode-OsF/bsx/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{bx}{scit}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{bsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpBold-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{boldexpanded}{scit}{ - <-> alias * Junicode-OsF/bx/scit +\DeclareFontShape{LY1}{Junicode-OsF}{boldsemiexpanded}{n}{ + <-> alias * Junicode-OsF/bsx/n }{} -\DeclareFontShape{LY1}{Junicode-OsF}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{bsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{boldexpanded}{it}{ - <-> alias * Junicode-OsF/bx/it +\DeclareFontShape{LY1}{Junicode-OsF}{boldsemiexpanded}{it}{ + <-> alias * Junicode-OsF/bsx/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{bx}{scsl}{ - <-> ssub * Junicode-OsF/bx/scit +\DeclareFontShape{LY1}{Junicode-OsF}{bsx}{sl}{ + <-> ssub * Junicode-OsF/bsx/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{boldexpanded}{scsl}{ - <-> ssub * Junicode-OsF/boldexpanded/scit +\DeclareFontShape{LY1}{Junicode-OsF}{boldsemiexpanded}{sl}{ + <-> ssub * Junicode-OsF/boldsemiexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{bx}{sl}{ - <-> ssub * Junicode-OsF/bx/it +\DeclareFontShape{LY1}{Junicode-OsF}{bsx}{scsl}{ + <-> ssub * Junicode-OsF/bsx/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{boldexpanded}{sl}{ - <-> ssub * Junicode-OsF/boldexpanded/it +\DeclareFontShape{LY1}{Junicode-OsF}{boldsemiexpanded}{scsl}{ + <-> ssub * Junicode-OsF/boldsemiexpanded/scit }{} -% ---- l = light ---- +% ---- sc = semicondensed ---- -\DeclareFontShape{LY1}{Junicode-OsF}{l}{scit}{ - <-> \Junicode@@scale Junicode-LightItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{sc}{it}{ + <-> \Junicode@@scale Junicode-SmCondItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{light}{scit}{ - <-> alias * Junicode-OsF/l/scit +\DeclareFontShape{LY1}{Junicode-OsF}{semicondensed}{it}{ + <-> alias * Junicode-OsF/sc/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{l}{it}{ - <-> \Junicode@@scale Junicode-LightItalic-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{sc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{light}{it}{ - <-> alias * Junicode-OsF/l/it +\DeclareFontShape{LY1}{Junicode-OsF}{semicondensed}{scit}{ + <-> alias * Junicode-OsF/sc/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{l}{sc}{ - <-> \Junicode@@scale Junicode-Light-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{sc}{n}{ + <-> \Junicode@@scale Junicode-SmCond-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{light}{sc}{ - <-> alias * Junicode-OsF/l/sc +\DeclareFontShape{LY1}{Junicode-OsF}{semicondensed}{n}{ + <-> alias * Junicode-OsF/sc/n }{} -\DeclareFontShape{LY1}{Junicode-OsF}{l}{n}{ - <-> \Junicode@@scale Junicode-Light-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{sc}{sc}{ + <-> \Junicode@@scale Junicode-SmCond-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{light}{n}{ - <-> alias * Junicode-OsF/l/n +\DeclareFontShape{LY1}{Junicode-OsF}{semicondensed}{sc}{ + <-> alias * Junicode-OsF/sc/sc }{} -\DeclareFontShape{LY1}{Junicode-OsF}{l}{scsl}{ - <-> ssub * Junicode-OsF/l/scit +\DeclareFontShape{LY1}{Junicode-OsF}{sc}{sl}{ + <-> ssub * Junicode-OsF/sc/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{light}{scsl}{ - <-> ssub * Junicode-OsF/light/scit +\DeclareFontShape{LY1}{Junicode-OsF}{semicondensed}{sl}{ + <-> ssub * Junicode-OsF/semicondensed/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{l}{sl}{ - <-> ssub * Junicode-OsF/l/it +\DeclareFontShape{LY1}{Junicode-OsF}{sc}{scsl}{ + <-> ssub * Junicode-OsF/sc/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{light}{sl}{ - <-> ssub * Junicode-OsF/light/it +\DeclareFontShape{LY1}{Junicode-OsF}{semicondensed}{scsl}{ + <-> ssub * Junicode-OsF/semicondensed/scit }{} -% ---- mediumsemiexpanded ---- +% ---- lc = lightcondensed ---- -\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{lc}{scit}{ + <-> \Junicode@@scale Junicode-CondLightItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemiexpanded}{sc}{ - <-> \Junicode@@scale Junicode-SmExpMedium-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{lightcondensed}{scit}{ + <-> alias * Junicode-OsF/lc/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemiexpanded}{scit}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{lightcondensed}{n}{ + <-> alias * Junicode-OsF/lc/n }{} -\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemiexpanded}{scsl}{ - <-> ssub * Junicode-OsF/mediumsemiexpanded/scit +\DeclareFontShape{LY1}{Junicode-OsF}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-OsF/mediumsemiexpanded/it +\DeclareFontShape{LY1}{Junicode-OsF}{lightcondensed}{it}{ + <-> alias * Junicode-OsF/lc/it }{} - -% ---- mediumexpanded ---- - -\DeclareFontShape{LY1}{Junicode-OsF}{mediumexpanded}{scit}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{lc}{sc}{ + <-> \Junicode@@scale Junicode-CondLight-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{lightcondensed}{sc}{ + <-> alias * Junicode-OsF/lc/sc }{} -\DeclareFontShape{LY1}{Junicode-OsF}{mediumexpanded}{sc}{ - <-> \Junicode@@scale Junicode-ExpMedium-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{lc}{sl}{ + <-> ssub * Junicode-OsF/lc/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{mediumexpanded}{n}{ - <-> \Junicode@@scale Junicode-ExpMedium-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{lightcondensed}{sl}{ + <-> ssub * Junicode-OsF/lightcondensed/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{mediumexpanded}{scsl}{ - <-> ssub * Junicode-OsF/mediumexpanded/scit +\DeclareFontShape{LY1}{Junicode-OsF}{lc}{scsl}{ + <-> ssub * Junicode-OsF/lc/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{mediumexpanded}{sl}{ - <-> ssub * Junicode-OsF/mediumexpanded/it +\DeclareFontShape{LY1}{Junicode-OsF}{lightcondensed}{scsl}{ + <-> ssub * Junicode-OsF/lightcondensed/scit }{} -% ---- sbsx = semiboldsemiexpanded ---- +% ---- medium ---- -\DeclareFontShape{LY1}{Junicode-OsF}{sbsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{medium}{it}{ + <-> \Junicode@@scale Junicode-MediumItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semiboldsemiexpanded}{it}{ - <-> alias * Junicode-OsF/sbsx/it +\DeclareFontShape{LY1}{Junicode-OsF}{medium}{scit}{ + <-> \Junicode@@scale Junicode-MediumItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{sbsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{medium}{n}{ + <-> \Junicode@@scale Junicode-Medium-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semiboldsemiexpanded}{scit}{ - <-> alias * Junicode-OsF/sbsx/scit +\DeclareFontShape{LY1}{Junicode-OsF}{medium}{sc}{ + <-> \Junicode@@scale Junicode-Medium-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{medium}{sl}{ + <-> ssub * Junicode-OsF/medium/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-OsF/sbsx/n +\DeclareFontShape{LY1}{Junicode-OsF}{medium}{scsl}{ + <-> ssub * Junicode-OsF/medium/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{sbsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-osf-sc-ly1 -}{} -\DeclareFontShape{LY1}{Junicode-OsF}{semiboldsemiexpanded}{sc}{ - <-> alias * Junicode-OsF/sbsx/sc -}{} +% ---- bx = boldexpanded ---- -\DeclareFontShape{LY1}{Junicode-OsF}{sbsx}{scsl}{ - <-> ssub * Junicode-OsF/sbsx/scit +\DeclareFontShape{LY1}{Junicode-OsF}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semiboldsemiexpanded}{scsl}{ - <-> ssub * Junicode-OsF/semiboldsemiexpanded/scit +\DeclareFontShape{LY1}{Junicode-OsF}{boldexpanded}{it}{ + <-> alias * Junicode-OsF/bx/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{sbsx}{sl}{ - <-> ssub * Junicode-OsF/sbsx/it +\DeclareFontShape{LY1}{Junicode-OsF}{bx}{scit}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semiboldsemiexpanded}{sl}{ - <-> ssub * Junicode-OsF/semiboldsemiexpanded/it +\DeclareFontShape{LY1}{Junicode-OsF}{boldexpanded}{scit}{ + <-> alias * Junicode-OsF/bx/scit }{} +\DeclareFontShape{LY1}{Junicode-OsF}{bx}{n}{ + <-> \Junicode@@scale Junicode-ExpBold-osf-ly1 +}{} -% ---- c = condensed ---- +\DeclareFontShape{LY1}{Junicode-OsF}{boldexpanded}{n}{ + <-> alias * Junicode-OsF/bx/n +}{} -\DeclareFontShape{LY1}{Junicode-OsF}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{bx}{sc}{ + <-> \Junicode@@scale Junicode-ExpBold-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{condensed}{n}{ - <-> alias * Junicode-OsF/c/n +\DeclareFontShape{LY1}{Junicode-OsF}{boldexpanded}{sc}{ + <-> alias * Junicode-OsF/bx/sc }{} -\DeclareFontShape{LY1}{Junicode-OsF}{c}{sc}{ - <-> \Junicode@@scale Junicode-Cond-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{bx}{sl}{ + <-> ssub * Junicode-OsF/bx/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{condensed}{sc}{ - <-> alias * Junicode-OsF/c/sc +\DeclareFontShape{LY1}{Junicode-OsF}{boldexpanded}{sl}{ + <-> ssub * Junicode-OsF/boldexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{bx}{scsl}{ + <-> ssub * Junicode-OsF/bx/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{condensed}{it}{ - <-> alias * Junicode-OsF/c/it +\DeclareFontShape{LY1}{Junicode-OsF}{boldexpanded}{scsl}{ + <-> ssub * Junicode-OsF/boldexpanded/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{c}{scit}{ - <-> \Junicode@@scale Junicode-CondItalic-osf-sc-ly1 + +% ---- mediumsemiexpanded ---- + +\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemiexpanded}{sc}{ + <-> \Junicode@@scale Junicode-SmExpMedium-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{condensed}{scit}{ - <-> alias * Junicode-OsF/c/scit +\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{c}{scsl}{ - <-> ssub * Junicode-OsF/c/scit +\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemiexpanded}{scit}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{condensed}{scsl}{ - <-> ssub * Junicode-OsF/condensed/scit +\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{c}{sl}{ - <-> ssub * Junicode-OsF/c/it +\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-OsF/mediumsemiexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{condensed}{sl}{ - <-> ssub * Junicode-OsF/condensed/it +\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemiexpanded}{scsl}{ + <-> ssub * Junicode-OsF/mediumsemiexpanded/scit }{} -% ---- x = expanded ---- +% ---- m = regular ---- -\DeclareFontShape{LY1}{Junicode-OsF}{x}{it}{ - <-> \Junicode@@scale Junicode-ExpItalic-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{m}{scit}{ + <-> \Junicode@@scale Junicode-Italic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{expanded}{it}{ - <-> alias * Junicode-OsF/x/it +\DeclareFontShape{LY1}{Junicode-OsF}{regular}{scit}{ + <-> alias * Junicode-OsF/m/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{x}{scit}{ - <-> \Junicode@@scale Junicode-ExpItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{m}{n}{ + <-> \Junicode@@scale Junicode-Regular-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{expanded}{scit}{ - <-> alias * Junicode-OsF/x/scit +\DeclareFontShape{LY1}{Junicode-OsF}{regular}{n}{ + <-> alias * Junicode-OsF/m/n }{} -\DeclareFontShape{LY1}{Junicode-OsF}{x}{n}{ - <-> \Junicode@@scale Junicode-Exp-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{m}{it}{ + <-> \Junicode@@scale Junicode-Italic-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{expanded}{n}{ - <-> alias * Junicode-OsF/x/n +\DeclareFontShape{LY1}{Junicode-OsF}{regular}{it}{ + <-> alias * Junicode-OsF/m/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{x}{sc}{ - <-> \Junicode@@scale Junicode-Exp-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{m}{sc}{ + <-> \Junicode@@scale Junicode-Regular-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{expanded}{sc}{ - <-> alias * Junicode-OsF/x/sc +\DeclareFontShape{LY1}{Junicode-OsF}{regular}{sc}{ + <-> alias * Junicode-OsF/m/sc }{} -\DeclareFontShape{LY1}{Junicode-OsF}{x}{scsl}{ - <-> ssub * Junicode-OsF/x/scit +\DeclareFontShape{LY1}{Junicode-OsF}{m}{sl}{ + <-> ssub * Junicode-OsF/m/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{expanded}{scsl}{ - <-> ssub * Junicode-OsF/expanded/scit +\DeclareFontShape{LY1}{Junicode-OsF}{regular}{sl}{ + <-> ssub * Junicode-OsF/regular/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{x}{sl}{ - <-> ssub * Junicode-OsF/x/it +\DeclareFontShape{LY1}{Junicode-OsF}{m}{scsl}{ + <-> ssub * Junicode-OsF/m/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{expanded}{sl}{ - <-> ssub * Junicode-OsF/expanded/it +\DeclareFontShape{LY1}{Junicode-OsF}{regular}{scsl}{ + <-> ssub * Junicode-OsF/regular/scit }{} -% ---- sx = semiexpanded ---- +% ---- l = light ---- -\DeclareFontShape{LY1}{Junicode-OsF}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{l}{n}{ + <-> \Junicode@@scale Junicode-Light-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semiexpanded}{it}{ - <-> alias * Junicode-OsF/sx/it +\DeclareFontShape{LY1}{Junicode-OsF}{light}{n}{ + <-> alias * Junicode-OsF/l/n }{} -\DeclareFontShape{LY1}{Junicode-OsF}{sx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{l}{scit}{ + <-> \Junicode@@scale Junicode-LightItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semiexpanded}{scit}{ - <-> alias * Junicode-OsF/sx/scit +\DeclareFontShape{LY1}{Junicode-OsF}{light}{scit}{ + <-> alias * Junicode-OsF/l/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{l}{it}{ + <-> \Junicode@@scale Junicode-LightItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semiexpanded}{n}{ - <-> alias * Junicode-OsF/sx/n +\DeclareFontShape{LY1}{Junicode-OsF}{light}{it}{ + <-> alias * Junicode-OsF/l/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{sx}{sc}{ - <-> \Junicode@@scale Junicode-SmExp-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{l}{sc}{ + <-> \Junicode@@scale Junicode-Light-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semiexpanded}{sc}{ - <-> alias * Junicode-OsF/sx/sc +\DeclareFontShape{LY1}{Junicode-OsF}{light}{sc}{ + <-> alias * Junicode-OsF/l/sc }{} -\DeclareFontShape{LY1}{Junicode-OsF}{sx}{scsl}{ - <-> ssub * Junicode-OsF/sx/scit +\DeclareFontShape{LY1}{Junicode-OsF}{l}{sl}{ + <-> ssub * Junicode-OsF/l/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semiexpanded}{scsl}{ - <-> ssub * Junicode-OsF/semiexpanded/scit +\DeclareFontShape{LY1}{Junicode-OsF}{light}{sl}{ + <-> ssub * Junicode-OsF/light/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{sx}{sl}{ - <-> ssub * Junicode-OsF/sx/it +\DeclareFontShape{LY1}{Junicode-OsF}{l}{scsl}{ + <-> ssub * Junicode-OsF/l/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semiexpanded}{sl}{ - <-> ssub * Junicode-OsF/semiexpanded/it +\DeclareFontShape{LY1}{Junicode-OsF}{light}{scsl}{ + <-> ssub * Junicode-OsF/light/scit }{} -% ---- sc = semicondensed ---- +% ---- sx = semiexpanded ---- -\DeclareFontShape{LY1}{Junicode-OsF}{sc}{it}{ - <-> \Junicode@@scale Junicode-SmCondItalic-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{sx}{sc}{ + <-> \Junicode@@scale Junicode-SmExp-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semicondensed}{it}{ - <-> alias * Junicode-OsF/sc/it +\DeclareFontShape{LY1}{Junicode-OsF}{semiexpanded}{sc}{ + <-> alias * Junicode-OsF/sx/sc }{} -\DeclareFontShape{LY1}{Junicode-OsF}{sc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{sx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semicondensed}{scit}{ - <-> alias * Junicode-OsF/sc/scit +\DeclareFontShape{LY1}{Junicode-OsF}{semiexpanded}{scit}{ + <-> alias * Junicode-OsF/sx/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{sc}{n}{ - <-> \Junicode@@scale Junicode-SmCond-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semicondensed}{n}{ - <-> alias * Junicode-OsF/sc/n +\DeclareFontShape{LY1}{Junicode-OsF}{semiexpanded}{n}{ + <-> alias * Junicode-OsF/sx/n }{} -\DeclareFontShape{LY1}{Junicode-OsF}{sc}{sc}{ - <-> \Junicode@@scale Junicode-SmCond-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semicondensed}{sc}{ - <-> alias * Junicode-OsF/sc/sc +\DeclareFontShape{LY1}{Junicode-OsF}{semiexpanded}{it}{ + <-> alias * Junicode-OsF/sx/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{sc}{scsl}{ - <-> ssub * Junicode-OsF/sc/scit +\DeclareFontShape{LY1}{Junicode-OsF}{sx}{sl}{ + <-> ssub * Junicode-OsF/sx/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semicondensed}{scsl}{ - <-> ssub * Junicode-OsF/semicondensed/scit +\DeclareFontShape{LY1}{Junicode-OsF}{semiexpanded}{sl}{ + <-> ssub * Junicode-OsF/semiexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{sc}{sl}{ - <-> ssub * Junicode-OsF/sc/it +\DeclareFontShape{LY1}{Junicode-OsF}{sx}{scsl}{ + <-> ssub * Junicode-OsF/sx/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semicondensed}{sl}{ - <-> ssub * Junicode-OsF/semicondensed/it +\DeclareFontShape{LY1}{Junicode-OsF}{semiexpanded}{scsl}{ + <-> ssub * Junicode-OsF/semiexpanded/scit }{} -% ---- sb = semibold ---- +% ---- mediumsemicondensed ---- -\DeclareFontShape{LY1}{Junicode-OsF}{sb}{scit}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemicondensed}{sc}{ + <-> \Junicode@@scale Junicode-SmCondMedium-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semibold}{scit}{ - <-> alias * Junicode-OsF/sb/scit +\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemicondensed}{scit}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{sb}{it}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemicondensed}{n}{ + <-> \Junicode@@scale Junicode-SmCondMedium-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semibold}{it}{ - <-> alias * Junicode-OsF/sb/it +\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemicondensed}{it}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{sb}{sc}{ - <-> \Junicode@@scale Junicode-SmBold-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemicondensed}{sl}{ + <-> ssub * Junicode-OsF/mediumsemicondensed/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semibold}{sc}{ - <-> alias * Junicode-OsF/sb/sc +\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemicondensed}{scsl}{ + <-> ssub * Junicode-OsF/mediumsemicondensed/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{sb}{n}{ - <-> \Junicode@@scale Junicode-SmBold-osf-ly1 -}{} -\DeclareFontShape{LY1}{Junicode-OsF}{semibold}{n}{ - <-> alias * Junicode-OsF/sb/n -}{} +% ---- b = bold ---- -\DeclareFontShape{LY1}{Junicode-OsF}{sb}{scsl}{ - <-> ssub * Junicode-OsF/sb/scit +\DeclareFontShape{LY1}{Junicode-OsF}{b}{sc}{ + <-> \Junicode@@scale Junicode-Bold-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semibold}{scsl}{ - <-> ssub * Junicode-OsF/semibold/scit +\DeclareFontShape{LY1}{Junicode-OsF}{bold}{sc}{ + <-> alias * Junicode-OsF/b/sc }{} -\DeclareFontShape{LY1}{Junicode-OsF}{sb}{sl}{ - <-> ssub * Junicode-OsF/sb/it +\DeclareFontShape{LY1}{Junicode-OsF}{b}{it}{ + <-> \Junicode@@scale Junicode-BoldItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semibold}{sl}{ - <-> ssub * Junicode-OsF/semibold/it +\DeclareFontShape{LY1}{Junicode-OsF}{bold}{it}{ + <-> alias * Junicode-OsF/b/it }{} - -% ---- bsx = boldsemiexpanded ---- - -\DeclareFontShape{LY1}{Junicode-OsF}{bsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpBold-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{b}{n}{ + <-> \Junicode@@scale Junicode-Bold-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{boldsemiexpanded}{n}{ - <-> alias * Junicode-OsF/bsx/n +\DeclareFontShape{LY1}{Junicode-OsF}{bold}{n}{ + <-> alias * Junicode-OsF/b/n }{} -\DeclareFontShape{LY1}{Junicode-OsF}{bsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpBold-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{b}{scit}{ + <-> \Junicode@@scale Junicode-BoldItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{boldsemiexpanded}{sc}{ - <-> alias * Junicode-OsF/bsx/sc +\DeclareFontShape{LY1}{Junicode-OsF}{bold}{scit}{ + <-> alias * Junicode-OsF/b/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{bsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{b}{sl}{ + <-> ssub * Junicode-OsF/b/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{boldsemiexpanded}{it}{ - <-> alias * Junicode-OsF/bsx/it +\DeclareFontShape{LY1}{Junicode-OsF}{bold}{sl}{ + <-> ssub * Junicode-OsF/bold/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{bsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{b}{scsl}{ + <-> ssub * Junicode-OsF/b/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{boldsemiexpanded}{scit}{ - <-> alias * Junicode-OsF/bsx/scit +\DeclareFontShape{LY1}{Junicode-OsF}{bold}{scsl}{ + <-> ssub * Junicode-OsF/bold/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{bsx}{scsl}{ - <-> ssub * Junicode-OsF/bsx/scit + +% ---- x = expanded ---- + +\DeclareFontShape{LY1}{Junicode-OsF}{x}{scit}{ + <-> \Junicode@@scale Junicode-ExpItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{boldsemiexpanded}{scsl}{ - <-> ssub * Junicode-OsF/boldsemiexpanded/scit +\DeclareFontShape{LY1}{Junicode-OsF}{expanded}{scit}{ + <-> alias * Junicode-OsF/x/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{bsx}{sl}{ - <-> ssub * Junicode-OsF/bsx/it +\DeclareFontShape{LY1}{Junicode-OsF}{x}{n}{ + <-> \Junicode@@scale Junicode-Exp-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{boldsemiexpanded}{sl}{ - <-> ssub * Junicode-OsF/boldsemiexpanded/it +\DeclareFontShape{LY1}{Junicode-OsF}{expanded}{n}{ + <-> alias * Junicode-OsF/x/n }{} +\DeclareFontShape{LY1}{Junicode-OsF}{x}{it}{ + <-> \Junicode@@scale Junicode-ExpItalic-osf-ly1 +}{} -% ---- lc = lightcondensed ---- +\DeclareFontShape{LY1}{Junicode-OsF}{expanded}{it}{ + <-> alias * Junicode-OsF/x/it +}{} -\DeclareFontShape{LY1}{Junicode-OsF}{lc}{scit}{ - <-> \Junicode@@scale Junicode-CondLightItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{x}{sc}{ + <-> \Junicode@@scale Junicode-Exp-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{lightcondensed}{scit}{ - <-> alias * Junicode-OsF/lc/scit +\DeclareFontShape{LY1}{Junicode-OsF}{expanded}{sc}{ + <-> alias * Junicode-OsF/x/sc }{} -\DeclareFontShape{LY1}{Junicode-OsF}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{x}{sl}{ + <-> ssub * Junicode-OsF/x/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{lightcondensed}{it}{ - <-> alias * Junicode-OsF/lc/it +\DeclareFontShape{LY1}{Junicode-OsF}{expanded}{sl}{ + <-> ssub * Junicode-OsF/expanded/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{lc}{sc}{ - <-> \Junicode@@scale Junicode-CondLight-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{x}{scsl}{ + <-> ssub * Junicode-OsF/x/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{lightcondensed}{sc}{ - <-> alias * Junicode-OsF/lc/sc +\DeclareFontShape{LY1}{Junicode-OsF}{expanded}{scsl}{ + <-> ssub * Junicode-OsF/expanded/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-osf-ly1 + +% ---- mediumexpanded ---- + +\DeclareFontShape{LY1}{Junicode-OsF}{mediumexpanded}{sc}{ + <-> \Junicode@@scale Junicode-ExpMedium-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{lightcondensed}{n}{ - <-> alias * Junicode-OsF/lc/n +\DeclareFontShape{LY1}{Junicode-OsF}{mediumexpanded}{scit}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{lc}{scsl}{ - <-> ssub * Junicode-OsF/lc/scit +\DeclareFontShape{LY1}{Junicode-OsF}{mediumexpanded}{n}{ + <-> \Junicode@@scale Junicode-ExpMedium-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{lightcondensed}{scsl}{ - <-> ssub * Junicode-OsF/lightcondensed/scit +\DeclareFontShape{LY1}{Junicode-OsF}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{lc}{sl}{ - <-> ssub * Junicode-OsF/lc/it +\DeclareFontShape{LY1}{Junicode-OsF}{mediumexpanded}{sl}{ + <-> ssub * Junicode-OsF/mediumexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{lightcondensed}{sl}{ - <-> ssub * Junicode-OsF/lightcondensed/it +\DeclareFontShape{LY1}{Junicode-OsF}{mediumexpanded}{scsl}{ + <-> ssub * Junicode-OsF/mediumexpanded/scit }{} -% ---- sbx = semiboldexpanded ---- +% ---- lsc = lightsemicondensed ---- -\DeclareFontShape{LY1}{Junicode-OsF}{sbx}{it}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{lsc}{sc}{ + <-> \Junicode@@scale Junicode-SmCondLight-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semiboldexpanded}{it}{ - <-> alias * Junicode-OsF/sbx/it +\DeclareFontShape{LY1}{Junicode-OsF}{lightsemicondensed}{sc}{ + <-> alias * Junicode-OsF/lsc/sc }{} -\DeclareFontShape{LY1}{Junicode-OsF}{sbx}{scit}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semiboldexpanded}{scit}{ - <-> alias * Junicode-OsF/sbx/scit +\DeclareFontShape{LY1}{Junicode-OsF}{lightsemicondensed}{it}{ + <-> alias * Junicode-OsF/lsc/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semiboldexpanded}{n}{ - <-> alias * Junicode-OsF/sbx/n +\DeclareFontShape{LY1}{Junicode-OsF}{lightsemicondensed}{n}{ + <-> alias * Junicode-OsF/lsc/n }{} -\DeclareFontShape{LY1}{Junicode-OsF}{sbx}{sc}{ - <-> \Junicode@@scale Junicode-ExpSmBold-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{lsc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semiboldexpanded}{sc}{ - <-> alias * Junicode-OsF/sbx/sc +\DeclareFontShape{LY1}{Junicode-OsF}{lightsemicondensed}{scit}{ + <-> alias * Junicode-OsF/lsc/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{sbx}{scsl}{ - <-> ssub * Junicode-OsF/sbx/scit +\DeclareFontShape{LY1}{Junicode-OsF}{lsc}{sl}{ + <-> ssub * Junicode-OsF/lsc/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semiboldexpanded}{scsl}{ - <-> ssub * Junicode-OsF/semiboldexpanded/scit +\DeclareFontShape{LY1}{Junicode-OsF}{lightsemicondensed}{sl}{ + <-> ssub * Junicode-OsF/lightsemicondensed/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{sbx}{sl}{ - <-> ssub * Junicode-OsF/sbx/it +\DeclareFontShape{LY1}{Junicode-OsF}{lsc}{scsl}{ + <-> ssub * Junicode-OsF/lsc/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{semiboldexpanded}{sl}{ - <-> ssub * Junicode-OsF/semiboldexpanded/it +\DeclareFontShape{LY1}{Junicode-OsF}{lightsemicondensed}{scsl}{ + <-> ssub * Junicode-OsF/lightsemicondensed/scit }{} -% ---- mediumsemicondensed ---- +% ---- c = condensed ---- -\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemicondensed}{sc}{ - <-> \Junicode@@scale Junicode-SmCondMedium-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemicondensed}{n}{ - <-> \Junicode@@scale Junicode-SmCondMedium-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{condensed}{n}{ + <-> alias * Junicode-OsF/c/n }{} -\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemicondensed}{scit}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{c}{scit}{ + <-> \Junicode@@scale Junicode-CondItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemicondensed}{it}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{condensed}{scit}{ + <-> alias * Junicode-OsF/c/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemicondensed}{scsl}{ - <-> ssub * Junicode-OsF/mediumsemicondensed/scit +\DeclareFontShape{LY1}{Junicode-OsF}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{mediumsemicondensed}{sl}{ - <-> ssub * Junicode-OsF/mediumsemicondensed/it +\DeclareFontShape{LY1}{Junicode-OsF}{condensed}{it}{ + <-> alias * Junicode-OsF/c/it }{} - -% ---- mediumcondensed ---- - -\DeclareFontShape{LY1}{Junicode-OsF}{mediumcondensed}{sc}{ - <-> \Junicode@@scale Junicode-CondMedium-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{c}{sc}{ + <-> \Junicode@@scale Junicode-Cond-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{condensed}{sc}{ + <-> alias * Junicode-OsF/c/sc }{} -\DeclareFontShape{LY1}{Junicode-OsF}{mediumcondensed}{scit}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{c}{sl}{ + <-> ssub * Junicode-OsF/c/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{condensed}{sl}{ + <-> ssub * Junicode-OsF/condensed/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{mediumcondensed}{scsl}{ - <-> ssub * Junicode-OsF/mediumcondensed/scit +\DeclareFontShape{LY1}{Junicode-OsF}{c}{scsl}{ + <-> ssub * Junicode-OsF/c/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{mediumcondensed}{sl}{ - <-> ssub * Junicode-OsF/mediumcondensed/it +\DeclareFontShape{LY1}{Junicode-OsF}{condensed}{scsl}{ + <-> ssub * Junicode-OsF/condensed/scit }{} -% ---- b = bold ---- +% ---- sbx = semiboldexpanded ---- -\DeclareFontShape{LY1}{Junicode-OsF}{b}{scit}{ - <-> \Junicode@@scale Junicode-BoldItalic-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{sbx}{it}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{bold}{scit}{ - <-> alias * Junicode-OsF/b/scit +\DeclareFontShape{LY1}{Junicode-OsF}{semiboldexpanded}{it}{ + <-> alias * Junicode-OsF/sbx/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{b}{it}{ - <-> \Junicode@@scale Junicode-BoldItalic-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{sbx}{scit}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{bold}{it}{ - <-> alias * Junicode-OsF/b/it +\DeclareFontShape{LY1}{Junicode-OsF}{semiboldexpanded}{scit}{ + <-> alias * Junicode-OsF/sbx/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{b}{sc}{ - <-> \Junicode@@scale Junicode-Bold-osf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-osf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{bold}{sc}{ - <-> alias * Junicode-OsF/b/sc +\DeclareFontShape{LY1}{Junicode-OsF}{semiboldexpanded}{n}{ + <-> alias * Junicode-OsF/sbx/n }{} -\DeclareFontShape{LY1}{Junicode-OsF}{b}{n}{ - <-> \Junicode@@scale Junicode-Bold-osf-ly1 +\DeclareFontShape{LY1}{Junicode-OsF}{sbx}{sc}{ + <-> \Junicode@@scale Junicode-ExpSmBold-osf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-OsF}{bold}{n}{ - <-> alias * Junicode-OsF/b/n +\DeclareFontShape{LY1}{Junicode-OsF}{semiboldexpanded}{sc}{ + <-> alias * Junicode-OsF/sbx/sc }{} -\DeclareFontShape{LY1}{Junicode-OsF}{b}{scsl}{ - <-> ssub * Junicode-OsF/b/scit +\DeclareFontShape{LY1}{Junicode-OsF}{sbx}{sl}{ + <-> ssub * Junicode-OsF/sbx/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{bold}{scsl}{ - <-> ssub * Junicode-OsF/bold/scit +\DeclareFontShape{LY1}{Junicode-OsF}{semiboldexpanded}{sl}{ + <-> ssub * Junicode-OsF/semiboldexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-OsF}{b}{sl}{ - <-> ssub * Junicode-OsF/b/it +\DeclareFontShape{LY1}{Junicode-OsF}{sbx}{scsl}{ + <-> ssub * Junicode-OsF/sbx/scit }{} -\DeclareFontShape{LY1}{Junicode-OsF}{bold}{sl}{ - <-> ssub * Junicode-OsF/bold/it +\DeclareFontShape{LY1}{Junicode-OsF}{semiboldexpanded}{scsl}{ + <-> ssub * Junicode-OsF/semiboldexpanded/scit }{} diff --git a/Master/texmf-dist/tex/latex/junicode/LY1Junicode-Sup.fd b/Master/texmf-dist/tex/latex/junicode/LY1Junicode-Sup.fd index 55a81ba0ea5..8de022b535c 100644 --- a/Master/texmf-dist/tex/latex/junicode/LY1Junicode-Sup.fd +++ b/Master/texmf-dist/tex/latex/junicode/LY1Junicode-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{LY1Junicode-Sup.fd} - [2024/06/03 (autoinst) Font definitions for LY1/Junicode-Sup.] + [2024/07/21 (autoinst) Font definitions for LY1/Junicode-Sup.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,57 +20,57 @@ \DeclareFontFamily{LY1}{Junicode-Sup}{} -% ---- sx = semiexpanded ---- +% ---- c = condensed ---- -\DeclareFontShape{LY1}{Junicode-Sup}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-sup-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Sup}{semiexpanded}{it}{ - <-> alias * Junicode-Sup/sx/it +\DeclareFontShape{LY1}{Junicode-Sup}{condensed}{n}{ + <-> alias * Junicode-Sup/c/n }{} -\DeclareFontShape{LY1}{Junicode-Sup}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Sup}{semiexpanded}{n}{ - <-> alias * Junicode-Sup/sx/n +\DeclareFontShape{LY1}{Junicode-Sup}{condensed}{it}{ + <-> alias * Junicode-Sup/c/it }{} -\DeclareFontShape{LY1}{Junicode-Sup}{sx}{sl}{ - <-> ssub * Junicode-Sup/sx/it +\DeclareFontShape{LY1}{Junicode-Sup}{c}{sl}{ + <-> ssub * Junicode-Sup/c/it }{} -\DeclareFontShape{LY1}{Junicode-Sup}{semiexpanded}{sl}{ - <-> ssub * Junicode-Sup/semiexpanded/it +\DeclareFontShape{LY1}{Junicode-Sup}{condensed}{sl}{ + <-> ssub * Junicode-Sup/condensed/it }{} -% ---- c = condensed ---- +% ---- sbx = semiboldexpanded ---- -\DeclareFontShape{LY1}{Junicode-Sup}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{sbx}{it}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Sup}{condensed}{it}{ - <-> alias * Junicode-Sup/c/it +\DeclareFontShape{LY1}{Junicode-Sup}{semiboldexpanded}{it}{ + <-> alias * Junicode-Sup/sbx/it }{} -\DeclareFontShape{LY1}{Junicode-Sup}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-sup-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Sup}{condensed}{n}{ - <-> alias * Junicode-Sup/c/n +\DeclareFontShape{LY1}{Junicode-Sup}{semiboldexpanded}{n}{ + <-> alias * Junicode-Sup/sbx/n }{} -\DeclareFontShape{LY1}{Junicode-Sup}{c}{sl}{ - <-> ssub * Junicode-Sup/c/it +\DeclareFontShape{LY1}{Junicode-Sup}{sbx}{sl}{ + <-> ssub * Junicode-Sup/sbx/it }{} -\DeclareFontShape{LY1}{Junicode-Sup}{condensed}{sl}{ - <-> ssub * Junicode-Sup/condensed/it +\DeclareFontShape{LY1}{Junicode-Sup}{semiboldexpanded}{sl}{ + <-> ssub * Junicode-Sup/semiboldexpanded/it }{} @@ -101,156 +101,114 @@ }{} -% ---- mediumsemiexpanded ---- +% ---- b = bold ---- -\DeclareFontShape{LY1}{Junicode-Sup}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{b}{it}{ + <-> \Junicode@@scale Junicode-BoldItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Sup}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{bold}{it}{ + <-> alias * Junicode-Sup/b/it }{} -\DeclareFontShape{LY1}{Junicode-Sup}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-Sup/mediumsemiexpanded/it +\DeclareFontShape{LY1}{Junicode-Sup}{b}{n}{ + <-> \Junicode@@scale Junicode-Bold-sup-ly1 }{} - -% ---- sbsx = semiboldsemiexpanded ---- - -\DeclareFontShape{LY1}{Junicode-Sup}{sbsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{bold}{n}{ + <-> alias * Junicode-Sup/b/n }{} -\DeclareFontShape{LY1}{Junicode-Sup}{semiboldsemiexpanded}{it}{ - <-> alias * Junicode-Sup/sbsx/it +\DeclareFontShape{LY1}{Junicode-Sup}{b}{sl}{ + <-> ssub * Junicode-Sup/b/it }{} -\DeclareFontShape{LY1}{Junicode-Sup}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{bold}{sl}{ + <-> ssub * Junicode-Sup/bold/it }{} -\DeclareFontShape{LY1}{Junicode-Sup}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-Sup/sbsx/n -}{} -\DeclareFontShape{LY1}{Junicode-Sup}{sbsx}{sl}{ - <-> ssub * Junicode-Sup/sbsx/it -}{} +% ---- mediumexpanded ---- -\DeclareFontShape{LY1}{Junicode-Sup}{semiboldsemiexpanded}{sl}{ - <-> ssub * Junicode-Sup/semiboldsemiexpanded/it +\DeclareFontShape{LY1}{Junicode-Sup}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-sup-ly1 }{} - -% ---- mediumexpanded ---- - \DeclareFontShape{LY1}{Junicode-Sup}{mediumexpanded}{n}{ <-> \Junicode@@scale Junicode-ExpMedium-sup-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Sup}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-sup-ly1 -}{} - \DeclareFontShape{LY1}{Junicode-Sup}{mediumexpanded}{sl}{ <-> ssub * Junicode-Sup/mediumexpanded/it }{} -% ---- bx = boldexpanded ---- - -\DeclareFontShape{LY1}{Junicode-Sup}{bx}{n}{ - <-> \Junicode@@scale Junicode-ExpBold-sup-ly1 -}{} - -\DeclareFontShape{LY1}{Junicode-Sup}{boldexpanded}{n}{ - <-> alias * Junicode-Sup/bx/n -}{} - -\DeclareFontShape{LY1}{Junicode-Sup}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-sup-ly1 -}{} - -\DeclareFontShape{LY1}{Junicode-Sup}{boldexpanded}{it}{ - <-> alias * Junicode-Sup/bx/it -}{} - -\DeclareFontShape{LY1}{Junicode-Sup}{bx}{sl}{ - <-> ssub * Junicode-Sup/bx/it -}{} - -\DeclareFontShape{LY1}{Junicode-Sup}{boldexpanded}{sl}{ - <-> ssub * Junicode-Sup/boldexpanded/it -}{} - - -% ---- l = light ---- +% ---- lsc = lightsemicondensed ---- -\DeclareFontShape{LY1}{Junicode-Sup}{l}{it}{ - <-> \Junicode@@scale Junicode-LightItalic-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-sup-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Sup}{light}{it}{ - <-> alias * Junicode-Sup/l/it +\DeclareFontShape{LY1}{Junicode-Sup}{lightsemicondensed}{n}{ + <-> alias * Junicode-Sup/lsc/n }{} -\DeclareFontShape{LY1}{Junicode-Sup}{l}{n}{ - <-> \Junicode@@scale Junicode-Light-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Sup}{light}{n}{ - <-> alias * Junicode-Sup/l/n +\DeclareFontShape{LY1}{Junicode-Sup}{lightsemicondensed}{it}{ + <-> alias * Junicode-Sup/lsc/it }{} -\DeclareFontShape{LY1}{Junicode-Sup}{l}{sl}{ - <-> ssub * Junicode-Sup/l/it +\DeclareFontShape{LY1}{Junicode-Sup}{lsc}{sl}{ + <-> ssub * Junicode-Sup/lsc/it }{} -\DeclareFontShape{LY1}{Junicode-Sup}{light}{sl}{ - <-> ssub * Junicode-Sup/light/it +\DeclareFontShape{LY1}{Junicode-Sup}{lightsemicondensed}{sl}{ + <-> ssub * Junicode-Sup/lightsemicondensed/it }{} -% ---- lsc = lightsemicondensed ---- +% ---- lc = lightcondensed ---- -\DeclareFontShape{LY1}{Junicode-Sup}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-sup-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Sup}{lightsemicondensed}{n}{ - <-> alias * Junicode-Sup/lsc/n +\DeclareFontShape{LY1}{Junicode-Sup}{lightcondensed}{n}{ + <-> alias * Junicode-Sup/lc/n }{} -\DeclareFontShape{LY1}{Junicode-Sup}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Sup}{lightsemicondensed}{it}{ - <-> alias * Junicode-Sup/lsc/it +\DeclareFontShape{LY1}{Junicode-Sup}{lightcondensed}{it}{ + <-> alias * Junicode-Sup/lc/it }{} -\DeclareFontShape{LY1}{Junicode-Sup}{lsc}{sl}{ - <-> ssub * Junicode-Sup/lsc/it +\DeclareFontShape{LY1}{Junicode-Sup}{lc}{sl}{ + <-> ssub * Junicode-Sup/lc/it }{} -\DeclareFontShape{LY1}{Junicode-Sup}{lightsemicondensed}{sl}{ - <-> ssub * Junicode-Sup/lightsemicondensed/it +\DeclareFontShape{LY1}{Junicode-Sup}{lightcondensed}{sl}{ + <-> ssub * Junicode-Sup/lightcondensed/it }{} -% ---- medium ---- +% ---- mediumsemiexpanded ---- -\DeclareFontShape{LY1}{Junicode-Sup}{medium}{it}{ - <-> \Junicode@@scale Junicode-MediumItalic-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-sup-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Sup}{medium}{n}{ - <-> \Junicode@@scale Junicode-Medium-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Sup}{medium}{sl}{ - <-> ssub * Junicode-Sup/medium/it +\DeclareFontShape{LY1}{Junicode-Sup}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-Sup/mediumsemiexpanded/it }{} @@ -281,127 +239,119 @@ }{} -% ---- b = bold ---- +% ---- medium ---- -\DeclareFontShape{LY1}{Junicode-Sup}{b}{it}{ - <-> \Junicode@@scale Junicode-BoldItalic-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{medium}{it}{ + <-> \Junicode@@scale Junicode-MediumItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Sup}{bold}{it}{ - <-> alias * Junicode-Sup/b/it +\DeclareFontShape{LY1}{Junicode-Sup}{medium}{n}{ + <-> \Junicode@@scale Junicode-Medium-sup-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Sup}{b}{n}{ - <-> \Junicode@@scale Junicode-Bold-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{medium}{sl}{ + <-> ssub * Junicode-Sup/medium/it }{} -\DeclareFontShape{LY1}{Junicode-Sup}{bold}{n}{ - <-> alias * Junicode-Sup/b/n -}{} -\DeclareFontShape{LY1}{Junicode-Sup}{b}{sl}{ - <-> ssub * Junicode-Sup/b/it -}{} +% ---- bx = boldexpanded ---- -\DeclareFontShape{LY1}{Junicode-Sup}{bold}{sl}{ - <-> ssub * Junicode-Sup/bold/it +\DeclareFontShape{LY1}{Junicode-Sup}{bx}{n}{ + <-> \Junicode@@scale Junicode-ExpBold-sup-ly1 }{} +\DeclareFontShape{LY1}{Junicode-Sup}{boldexpanded}{n}{ + <-> alias * Junicode-Sup/bx/n +}{} -% ---- mediumcondensed ---- +\DeclareFontShape{LY1}{Junicode-Sup}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-sup-ly1 +}{} -\DeclareFontShape{LY1}{Junicode-Sup}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{boldexpanded}{it}{ + <-> alias * Junicode-Sup/bx/it }{} -\DeclareFontShape{LY1}{Junicode-Sup}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{bx}{sl}{ + <-> ssub * Junicode-Sup/bx/it }{} -\DeclareFontShape{LY1}{Junicode-Sup}{mediumcondensed}{sl}{ - <-> ssub * Junicode-Sup/mediumcondensed/it +\DeclareFontShape{LY1}{Junicode-Sup}{boldexpanded}{sl}{ + <-> ssub * Junicode-Sup/boldexpanded/it }{} -% ---- sbx = semiboldexpanded ---- +% ---- sx = semiexpanded ---- -\DeclareFontShape{LY1}{Junicode-Sup}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-sup-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Sup}{semiboldexpanded}{n}{ - <-> alias * Junicode-Sup/sbx/n +\DeclareFontShape{LY1}{Junicode-Sup}{semiexpanded}{n}{ + <-> alias * Junicode-Sup/sx/n }{} -\DeclareFontShape{LY1}{Junicode-Sup}{sbx}{it}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Sup}{semiboldexpanded}{it}{ - <-> alias * Junicode-Sup/sbx/it +\DeclareFontShape{LY1}{Junicode-Sup}{semiexpanded}{it}{ + <-> alias * Junicode-Sup/sx/it }{} -\DeclareFontShape{LY1}{Junicode-Sup}{sbx}{sl}{ - <-> ssub * Junicode-Sup/sbx/it +\DeclareFontShape{LY1}{Junicode-Sup}{sx}{sl}{ + <-> ssub * Junicode-Sup/sx/it }{} -\DeclareFontShape{LY1}{Junicode-Sup}{semiboldexpanded}{sl}{ - <-> ssub * Junicode-Sup/semiboldexpanded/it +\DeclareFontShape{LY1}{Junicode-Sup}{semiexpanded}{sl}{ + <-> ssub * Junicode-Sup/semiexpanded/it }{} -% ---- mediumsemicondensed ---- +% ---- l = light ---- -\DeclareFontShape{LY1}{Junicode-Sup}{mediumsemicondensed}{n}{ - <-> \Junicode@@scale Junicode-SmCondMedium-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{l}{it}{ + <-> \Junicode@@scale Junicode-LightItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Sup}{mediumsemicondensed}{it}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{light}{it}{ + <-> alias * Junicode-Sup/l/it }{} -\DeclareFontShape{LY1}{Junicode-Sup}{mediumsemicondensed}{sl}{ - <-> ssub * Junicode-Sup/mediumsemicondensed/it +\DeclareFontShape{LY1}{Junicode-Sup}{l}{n}{ + <-> \Junicode@@scale Junicode-Light-sup-ly1 }{} - -% ---- sc = semicondensed ---- - -\DeclareFontShape{LY1}{Junicode-Sup}{sc}{n}{ - <-> \Junicode@@scale Junicode-SmCond-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{light}{n}{ + <-> alias * Junicode-Sup/l/n }{} -\DeclareFontShape{LY1}{Junicode-Sup}{semicondensed}{n}{ - <-> alias * Junicode-Sup/sc/n +\DeclareFontShape{LY1}{Junicode-Sup}{l}{sl}{ + <-> ssub * Junicode-Sup/l/it }{} -\DeclareFontShape{LY1}{Junicode-Sup}{sc}{it}{ - <-> \Junicode@@scale Junicode-SmCondItalic-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{light}{sl}{ + <-> ssub * Junicode-Sup/light/it }{} -\DeclareFontShape{LY1}{Junicode-Sup}{semicondensed}{it}{ - <-> alias * Junicode-Sup/sc/it + +% ---- mediumsemicondensed ---- + +\DeclareFontShape{LY1}{Junicode-Sup}{mediumsemicondensed}{it}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Sup}{sc}{sl}{ - <-> ssub * Junicode-Sup/sc/it +\DeclareFontShape{LY1}{Junicode-Sup}{mediumsemicondensed}{n}{ + <-> \Junicode@@scale Junicode-SmCondMedium-sup-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Sup}{semicondensed}{sl}{ - <-> ssub * Junicode-Sup/semicondensed/it +\DeclareFontShape{LY1}{Junicode-Sup}{mediumsemicondensed}{sl}{ + <-> ssub * Junicode-Sup/mediumsemicondensed/it }{} % ---- sb = semibold ---- -\DeclareFontShape{LY1}{Junicode-Sup}{sb}{it}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-sup-ly1 -}{} - -\DeclareFontShape{LY1}{Junicode-Sup}{semibold}{it}{ - <-> alias * Junicode-Sup/sb/it -}{} - \DeclareFontShape{LY1}{Junicode-Sup}{sb}{n}{ <-> \Junicode@@scale Junicode-SmBold-sup-ly1 }{} @@ -410,6 +360,14 @@ <-> alias * Junicode-Sup/sb/n }{} +\DeclareFontShape{LY1}{Junicode-Sup}{sb}{it}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-sup-ly1 +}{} + +\DeclareFontShape{LY1}{Junicode-Sup}{semibold}{it}{ + <-> alias * Junicode-Sup/sb/it +}{} + \DeclareFontShape{LY1}{Junicode-Sup}{sb}{sl}{ <-> ssub * Junicode-Sup/sb/it }{} @@ -419,6 +377,21 @@ }{} +% ---- mediumcondensed ---- + +\DeclareFontShape{LY1}{Junicode-Sup}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-sup-ly1 +}{} + +\DeclareFontShape{LY1}{Junicode-Sup}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-sup-ly1 +}{} + +\DeclareFontShape{LY1}{Junicode-Sup}{mediumcondensed}{sl}{ + <-> ssub * Junicode-Sup/mediumcondensed/it +}{} + + % ---- bsx = boldsemiexpanded ---- \DeclareFontShape{LY1}{Junicode-Sup}{bsx}{it}{ @@ -446,30 +419,57 @@ }{} -% ---- lc = lightcondensed ---- +% ---- sbsx = semiboldsemiexpanded ---- -\DeclareFontShape{LY1}{Junicode-Sup}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-sup-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Sup}{lightcondensed}{n}{ - <-> alias * Junicode-Sup/lc/n +\DeclareFontShape{LY1}{Junicode-Sup}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-Sup/sbsx/n }{} -\DeclareFontShape{LY1}{Junicode-Sup}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-sup-ly1 +\DeclareFontShape{LY1}{Junicode-Sup}{sbsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-sup-ly1 }{} -\DeclareFontShape{LY1}{Junicode-Sup}{lightcondensed}{it}{ - <-> alias * Junicode-Sup/lc/it +\DeclareFontShape{LY1}{Junicode-Sup}{semiboldsemiexpanded}{it}{ + <-> alias * Junicode-Sup/sbsx/it }{} -\DeclareFontShape{LY1}{Junicode-Sup}{lc}{sl}{ - <-> ssub * Junicode-Sup/lc/it +\DeclareFontShape{LY1}{Junicode-Sup}{sbsx}{sl}{ + <-> ssub * Junicode-Sup/sbsx/it }{} -\DeclareFontShape{LY1}{Junicode-Sup}{lightcondensed}{sl}{ - <-> ssub * Junicode-Sup/lightcondensed/it +\DeclareFontShape{LY1}{Junicode-Sup}{semiboldsemiexpanded}{sl}{ + <-> ssub * Junicode-Sup/semiboldsemiexpanded/it +}{} + + +% ---- sc = semicondensed ---- + +\DeclareFontShape{LY1}{Junicode-Sup}{sc}{it}{ + <-> \Junicode@@scale Junicode-SmCondItalic-sup-ly1 +}{} + +\DeclareFontShape{LY1}{Junicode-Sup}{semicondensed}{it}{ + <-> alias * Junicode-Sup/sc/it +}{} + +\DeclareFontShape{LY1}{Junicode-Sup}{sc}{n}{ + <-> \Junicode@@scale Junicode-SmCond-sup-ly1 +}{} + +\DeclareFontShape{LY1}{Junicode-Sup}{semicondensed}{n}{ + <-> alias * Junicode-Sup/sc/n +}{} + +\DeclareFontShape{LY1}{Junicode-Sup}{sc}{sl}{ + <-> ssub * Junicode-Sup/sc/it +}{} + +\DeclareFontShape{LY1}{Junicode-Sup}{semicondensed}{sl}{ + <-> ssub * Junicode-Sup/semicondensed/it }{} diff --git a/Master/texmf-dist/tex/latex/junicode/LY1Junicode-TLF.fd b/Master/texmf-dist/tex/latex/junicode/LY1Junicode-TLF.fd index 9cabf8d170c..07d73da9c2c 100644 --- a/Master/texmf-dist/tex/latex/junicode/LY1Junicode-TLF.fd +++ b/Master/texmf-dist/tex/latex/junicode/LY1Junicode-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{LY1Junicode-TLF.fd} - [2024/06/03 (autoinst) Font definitions for LY1/Junicode-TLF.] + [2024/07/21 (autoinst) Font definitions for LY1/Junicode-TLF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,852 +20,852 @@ \DeclareFontFamily{LY1}{Junicode-TLF}{} -% ---- sbsx = semiboldsemiexpanded ---- +% ---- sc = semicondensed ---- -\DeclareFontShape{LY1}{Junicode-TLF}{sbsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{sc}{it}{ + <-> \Junicode@@scale Junicode-SmCondItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semiboldsemiexpanded}{sc}{ - <-> alias * Junicode-TLF/sbsx/sc +\DeclareFontShape{LY1}{Junicode-TLF}{semicondensed}{it}{ + <-> alias * Junicode-TLF/sc/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{sc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-TLF/sbsx/n +\DeclareFontShape{LY1}{Junicode-TLF}{semicondensed}{scit}{ + <-> alias * Junicode-TLF/sc/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{sbsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{sc}{n}{ + <-> \Junicode@@scale Junicode-SmCond-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semiboldsemiexpanded}{scit}{ - <-> alias * Junicode-TLF/sbsx/scit +\DeclareFontShape{LY1}{Junicode-TLF}{semicondensed}{n}{ + <-> alias * Junicode-TLF/sc/n }{} -\DeclareFontShape{LY1}{Junicode-TLF}{sbsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{sc}{sc}{ + <-> \Junicode@@scale Junicode-SmCond-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semiboldsemiexpanded}{it}{ - <-> alias * Junicode-TLF/sbsx/it +\DeclareFontShape{LY1}{Junicode-TLF}{semicondensed}{sc}{ + <-> alias * Junicode-TLF/sc/sc }{} -\DeclareFontShape{LY1}{Junicode-TLF}{sbsx}{scsl}{ - <-> ssub * Junicode-TLF/sbsx/scit +\DeclareFontShape{LY1}{Junicode-TLF}{sc}{sl}{ + <-> ssub * Junicode-TLF/sc/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semiboldsemiexpanded}{scsl}{ - <-> ssub * Junicode-TLF/semiboldsemiexpanded/scit +\DeclareFontShape{LY1}{Junicode-TLF}{semicondensed}{sl}{ + <-> ssub * Junicode-TLF/semicondensed/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{sbsx}{sl}{ - <-> ssub * Junicode-TLF/sbsx/it +\DeclareFontShape{LY1}{Junicode-TLF}{sc}{scsl}{ + <-> ssub * Junicode-TLF/sc/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semiboldsemiexpanded}{sl}{ - <-> ssub * Junicode-TLF/semiboldsemiexpanded/it +\DeclareFontShape{LY1}{Junicode-TLF}{semicondensed}{scsl}{ + <-> ssub * Junicode-TLF/semicondensed/scit }{} -% ---- mediumexpanded ---- +% ---- bsx = boldsemiexpanded ---- -\DeclareFontShape{LY1}{Junicode-TLF}{mediumexpanded}{scit}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{bsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpBold-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{boldsemiexpanded}{sc}{ + <-> alias * Junicode-TLF/bsx/sc }{} -\DeclareFontShape{LY1}{Junicode-TLF}{mediumexpanded}{sc}{ - <-> \Junicode@@scale Junicode-ExpMedium-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{bsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{mediumexpanded}{n}{ - <-> \Junicode@@scale Junicode-ExpMedium-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{boldsemiexpanded}{it}{ + <-> alias * Junicode-TLF/bsx/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{mediumexpanded}{scsl}{ - <-> ssub * Junicode-TLF/mediumexpanded/scit +\DeclareFontShape{LY1}{Junicode-TLF}{bsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpBold-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{mediumexpanded}{sl}{ - <-> ssub * Junicode-TLF/mediumexpanded/it +\DeclareFontShape{LY1}{Junicode-TLF}{boldsemiexpanded}{n}{ + <-> alias * Junicode-TLF/bsx/n }{} - -% ---- mediumsemiexpanded ---- - -\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemiexpanded}{sc}{ - <-> \Junicode@@scale Junicode-SmExpMedium-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{bsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{boldsemiexpanded}{scit}{ + <-> alias * Junicode-TLF/bsx/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemiexpanded}{scit}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{bsx}{sl}{ + <-> ssub * Junicode-TLF/bsx/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{boldsemiexpanded}{sl}{ + <-> ssub * Junicode-TLF/boldsemiexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemiexpanded}{scsl}{ - <-> ssub * Junicode-TLF/mediumsemiexpanded/scit +\DeclareFontShape{LY1}{Junicode-TLF}{bsx}{scsl}{ + <-> ssub * Junicode-TLF/bsx/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-TLF/mediumsemiexpanded/it +\DeclareFontShape{LY1}{Junicode-TLF}{boldsemiexpanded}{scsl}{ + <-> ssub * Junicode-TLF/boldsemiexpanded/scit }{} -% ---- sx = semiexpanded ---- +% ---- sbsx = semiboldsemiexpanded ---- -\DeclareFontShape{LY1}{Junicode-TLF}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{sbsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semiexpanded}{it}{ - <-> alias * Junicode-TLF/sx/it +\DeclareFontShape{LY1}{Junicode-TLF}{semiboldsemiexpanded}{sc}{ + <-> alias * Junicode-TLF/sbsx/sc }{} -\DeclareFontShape{LY1}{Junicode-TLF}{sx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{sbsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semiexpanded}{scit}{ - <-> alias * Junicode-TLF/sx/scit +\DeclareFontShape{LY1}{Junicode-TLF}{semiboldsemiexpanded}{it}{ + <-> alias * Junicode-TLF/sbsx/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{sbsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semiexpanded}{n}{ - <-> alias * Junicode-TLF/sx/n +\DeclareFontShape{LY1}{Junicode-TLF}{semiboldsemiexpanded}{scit}{ + <-> alias * Junicode-TLF/sbsx/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{sx}{sc}{ - <-> \Junicode@@scale Junicode-SmExp-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semiexpanded}{sc}{ - <-> alias * Junicode-TLF/sx/sc +\DeclareFontShape{LY1}{Junicode-TLF}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-TLF/sbsx/n }{} -\DeclareFontShape{LY1}{Junicode-TLF}{sx}{scsl}{ - <-> ssub * Junicode-TLF/sx/scit +\DeclareFontShape{LY1}{Junicode-TLF}{sbsx}{sl}{ + <-> ssub * Junicode-TLF/sbsx/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semiexpanded}{scsl}{ - <-> ssub * Junicode-TLF/semiexpanded/scit +\DeclareFontShape{LY1}{Junicode-TLF}{semiboldsemiexpanded}{sl}{ + <-> ssub * Junicode-TLF/semiboldsemiexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{sx}{sl}{ - <-> ssub * Junicode-TLF/sx/it +\DeclareFontShape{LY1}{Junicode-TLF}{sbsx}{scsl}{ + <-> ssub * Junicode-TLF/sbsx/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semiexpanded}{sl}{ - <-> ssub * Junicode-TLF/semiexpanded/it +\DeclareFontShape{LY1}{Junicode-TLF}{semiboldsemiexpanded}{scsl}{ + <-> ssub * Junicode-TLF/semiboldsemiexpanded/scit }{} -% ---- c = condensed ---- +% ---- mediumcondensed ---- -\DeclareFontShape{LY1}{Junicode-TLF}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{mediumcondensed}{sc}{ + <-> \Junicode@@scale Junicode-CondMedium-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{condensed}{it}{ - <-> alias * Junicode-TLF/c/it +\DeclareFontShape{LY1}{Junicode-TLF}{mediumcondensed}{scit}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{c}{scit}{ - <-> \Junicode@@scale Junicode-CondItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{condensed}{scit}{ - <-> alias * Junicode-TLF/c/scit +\DeclareFontShape{LY1}{Junicode-TLF}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{mediumcondensed}{sl}{ + <-> ssub * Junicode-TLF/mediumcondensed/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{condensed}{n}{ - <-> alias * Junicode-TLF/c/n +\DeclareFontShape{LY1}{Junicode-TLF}{mediumcondensed}{scsl}{ + <-> ssub * Junicode-TLF/mediumcondensed/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{c}{sc}{ - <-> \Junicode@@scale Junicode-Cond-tlf-sc-ly1 -}{} -\DeclareFontShape{LY1}{Junicode-TLF}{condensed}{sc}{ - <-> alias * Junicode-TLF/c/sc -}{} +% ---- sb = semibold ---- -\DeclareFontShape{LY1}{Junicode-TLF}{c}{scsl}{ - <-> ssub * Junicode-TLF/c/scit +\DeclareFontShape{LY1}{Junicode-TLF}{sb}{sc}{ + <-> \Junicode@@scale Junicode-SmBold-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{condensed}{scsl}{ - <-> ssub * Junicode-TLF/condensed/scit +\DeclareFontShape{LY1}{Junicode-TLF}{semibold}{sc}{ + <-> alias * Junicode-TLF/sb/sc }{} -\DeclareFontShape{LY1}{Junicode-TLF}{c}{sl}{ - <-> ssub * Junicode-TLF/c/it +\DeclareFontShape{LY1}{Junicode-TLF}{sb}{it}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{condensed}{sl}{ - <-> ssub * Junicode-TLF/condensed/it +\DeclareFontShape{LY1}{Junicode-TLF}{semibold}{it}{ + <-> alias * Junicode-TLF/sb/it }{} +\DeclareFontShape{LY1}{Junicode-TLF}{sb}{n}{ + <-> \Junicode@@scale Junicode-SmBold-tlf-ly1 +}{} -% ---- x = expanded ---- +\DeclareFontShape{LY1}{Junicode-TLF}{semibold}{n}{ + <-> alias * Junicode-TLF/sb/n +}{} -\DeclareFontShape{LY1}{Junicode-TLF}{x}{sc}{ - <-> \Junicode@@scale Junicode-Exp-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{sb}{scit}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{expanded}{sc}{ - <-> alias * Junicode-TLF/x/sc +\DeclareFontShape{LY1}{Junicode-TLF}{semibold}{scit}{ + <-> alias * Junicode-TLF/sb/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{x}{n}{ - <-> \Junicode@@scale Junicode-Exp-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{sb}{sl}{ + <-> ssub * Junicode-TLF/sb/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{expanded}{n}{ - <-> alias * Junicode-TLF/x/n +\DeclareFontShape{LY1}{Junicode-TLF}{semibold}{sl}{ + <-> ssub * Junicode-TLF/semibold/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{x}{scit}{ - <-> \Junicode@@scale Junicode-ExpItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{sb}{scsl}{ + <-> ssub * Junicode-TLF/sb/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{expanded}{scit}{ - <-> alias * Junicode-TLF/x/scit +\DeclareFontShape{LY1}{Junicode-TLF}{semibold}{scsl}{ + <-> ssub * Junicode-TLF/semibold/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{x}{it}{ - <-> \Junicode@@scale Junicode-ExpItalic-tlf-ly1 + +% ---- mediumsemicondensed ---- + +\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemicondensed}{it}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{expanded}{it}{ - <-> alias * Junicode-TLF/x/it +\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemicondensed}{n}{ + <-> \Junicode@@scale Junicode-SmCondMedium-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{x}{scsl}{ - <-> ssub * Junicode-TLF/x/scit +\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemicondensed}{scit}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{expanded}{scsl}{ - <-> ssub * Junicode-TLF/expanded/scit +\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemicondensed}{sc}{ + <-> \Junicode@@scale Junicode-SmCondMedium-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{x}{sl}{ - <-> ssub * Junicode-TLF/x/it +\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemicondensed}{sl}{ + <-> ssub * Junicode-TLF/mediumsemicondensed/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{expanded}{sl}{ - <-> ssub * Junicode-TLF/expanded/it +\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemicondensed}{scsl}{ + <-> ssub * Junicode-TLF/mediumsemicondensed/scit }{} -% ---- m = regular ---- +% ---- l = light ---- -\DeclareFontShape{LY1}{Junicode-TLF}{m}{it}{ - <-> \Junicode@@scale Junicode-Italic-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{l}{sc}{ + <-> \Junicode@@scale Junicode-Light-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{regular}{it}{ - <-> alias * Junicode-TLF/m/it +\DeclareFontShape{LY1}{Junicode-TLF}{light}{sc}{ + <-> alias * Junicode-TLF/l/sc }{} -\DeclareFontShape{LY1}{Junicode-TLF}{m}{scit}{ - <-> \Junicode@@scale Junicode-Italic-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{l}{it}{ + <-> \Junicode@@scale Junicode-LightItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{regular}{scit}{ - <-> alias * Junicode-TLF/m/scit +\DeclareFontShape{LY1}{Junicode-TLF}{light}{it}{ + <-> alias * Junicode-TLF/l/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{m}{n}{ - <-> \Junicode@@scale Junicode-Regular-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{l}{n}{ + <-> \Junicode@@scale Junicode-Light-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{regular}{n}{ - <-> alias * Junicode-TLF/m/n +\DeclareFontShape{LY1}{Junicode-TLF}{light}{n}{ + <-> alias * Junicode-TLF/l/n }{} -\DeclareFontShape{LY1}{Junicode-TLF}{m}{sc}{ - <-> \Junicode@@scale Junicode-Regular-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{l}{scit}{ + <-> \Junicode@@scale Junicode-LightItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{regular}{sc}{ - <-> alias * Junicode-TLF/m/sc +\DeclareFontShape{LY1}{Junicode-TLF}{light}{scit}{ + <-> alias * Junicode-TLF/l/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{m}{scsl}{ - <-> ssub * Junicode-TLF/m/scit +\DeclareFontShape{LY1}{Junicode-TLF}{l}{sl}{ + <-> ssub * Junicode-TLF/l/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{regular}{scsl}{ - <-> ssub * Junicode-TLF/regular/scit +\DeclareFontShape{LY1}{Junicode-TLF}{light}{sl}{ + <-> ssub * Junicode-TLF/light/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{m}{sl}{ - <-> ssub * Junicode-TLF/m/it +\DeclareFontShape{LY1}{Junicode-TLF}{l}{scsl}{ + <-> ssub * Junicode-TLF/l/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{regular}{sl}{ - <-> ssub * Junicode-TLF/regular/it +\DeclareFontShape{LY1}{Junicode-TLF}{light}{scsl}{ + <-> ssub * Junicode-TLF/light/scit }{} -% ---- lsc = lightsemicondensed ---- +% ---- sx = semiexpanded ---- -\DeclareFontShape{LY1}{Junicode-TLF}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{sx}{sc}{ + <-> \Junicode@@scale Junicode-SmExp-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{lightsemicondensed}{n}{ - <-> alias * Junicode-TLF/lsc/n +\DeclareFontShape{LY1}{Junicode-TLF}{semiexpanded}{sc}{ + <-> alias * Junicode-TLF/sx/sc }{} -\DeclareFontShape{LY1}{Junicode-TLF}{lsc}{sc}{ - <-> \Junicode@@scale Junicode-SmCondLight-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{lightsemicondensed}{sc}{ - <-> alias * Junicode-TLF/lsc/sc +\DeclareFontShape{LY1}{Junicode-TLF}{semiexpanded}{it}{ + <-> alias * Junicode-TLF/sx/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{sx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{lightsemicondensed}{it}{ - <-> alias * Junicode-TLF/lsc/it +\DeclareFontShape{LY1}{Junicode-TLF}{semiexpanded}{scit}{ + <-> alias * Junicode-TLF/sx/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{lsc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{lightsemicondensed}{scit}{ - <-> alias * Junicode-TLF/lsc/scit +\DeclareFontShape{LY1}{Junicode-TLF}{semiexpanded}{n}{ + <-> alias * Junicode-TLF/sx/n }{} -\DeclareFontShape{LY1}{Junicode-TLF}{lsc}{scsl}{ - <-> ssub * Junicode-TLF/lsc/scit +\DeclareFontShape{LY1}{Junicode-TLF}{sx}{sl}{ + <-> ssub * Junicode-TLF/sx/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{lightsemicondensed}{scsl}{ - <-> ssub * Junicode-TLF/lightsemicondensed/scit +\DeclareFontShape{LY1}{Junicode-TLF}{semiexpanded}{sl}{ + <-> ssub * Junicode-TLF/semiexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{lsc}{sl}{ - <-> ssub * Junicode-TLF/lsc/it +\DeclareFontShape{LY1}{Junicode-TLF}{sx}{scsl}{ + <-> ssub * Junicode-TLF/sx/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{lightsemicondensed}{sl}{ - <-> ssub * Junicode-TLF/lightsemicondensed/it +\DeclareFontShape{LY1}{Junicode-TLF}{semiexpanded}{scsl}{ + <-> ssub * Junicode-TLF/semiexpanded/scit }{} % ---- medium ---- -\DeclareFontShape{LY1}{Junicode-TLF}{medium}{it}{ - <-> \Junicode@@scale Junicode-MediumItalic-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{medium}{sc}{ + <-> \Junicode@@scale Junicode-Medium-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{medium}{scit}{ - <-> \Junicode@@scale Junicode-MediumItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{medium}{it}{ + <-> \Junicode@@scale Junicode-MediumItalic-tlf-ly1 }{} \DeclareFontShape{LY1}{Junicode-TLF}{medium}{n}{ <-> \Junicode@@scale Junicode-Medium-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{medium}{sc}{ - <-> \Junicode@@scale Junicode-Medium-tlf-sc-ly1 -}{} - -\DeclareFontShape{LY1}{Junicode-TLF}{medium}{scsl}{ - <-> ssub * Junicode-TLF/medium/scit +\DeclareFontShape{LY1}{Junicode-TLF}{medium}{scit}{ + <-> \Junicode@@scale Junicode-MediumItalic-tlf-sc-ly1 }{} \DeclareFontShape{LY1}{Junicode-TLF}{medium}{sl}{ <-> ssub * Junicode-TLF/medium/it }{} +\DeclareFontShape{LY1}{Junicode-TLF}{medium}{scsl}{ + <-> ssub * Junicode-TLF/medium/scit +}{} + -% ---- l = light ---- +% ---- bx = boldexpanded ---- -\DeclareFontShape{LY1}{Junicode-TLF}{l}{it}{ - <-> \Junicode@@scale Junicode-LightItalic-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{bx}{sc}{ + <-> \Junicode@@scale Junicode-ExpBold-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{light}{it}{ - <-> alias * Junicode-TLF/l/it +\DeclareFontShape{LY1}{Junicode-TLF}{boldexpanded}{sc}{ + <-> alias * Junicode-TLF/bx/sc }{} -\DeclareFontShape{LY1}{Junicode-TLF}{l}{scit}{ - <-> \Junicode@@scale Junicode-LightItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{bx}{scit}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{light}{scit}{ - <-> alias * Junicode-TLF/l/scit +\DeclareFontShape{LY1}{Junicode-TLF}{boldexpanded}{scit}{ + <-> alias * Junicode-TLF/bx/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{l}{n}{ - <-> \Junicode@@scale Junicode-Light-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{bx}{n}{ + <-> \Junicode@@scale Junicode-ExpBold-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{light}{n}{ - <-> alias * Junicode-TLF/l/n +\DeclareFontShape{LY1}{Junicode-TLF}{boldexpanded}{n}{ + <-> alias * Junicode-TLF/bx/n }{} -\DeclareFontShape{LY1}{Junicode-TLF}{l}{sc}{ - <-> \Junicode@@scale Junicode-Light-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{light}{sc}{ - <-> alias * Junicode-TLF/l/sc +\DeclareFontShape{LY1}{Junicode-TLF}{boldexpanded}{it}{ + <-> alias * Junicode-TLF/bx/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{l}{scsl}{ - <-> ssub * Junicode-TLF/l/scit +\DeclareFontShape{LY1}{Junicode-TLF}{bx}{sl}{ + <-> ssub * Junicode-TLF/bx/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{light}{scsl}{ - <-> ssub * Junicode-TLF/light/scit +\DeclareFontShape{LY1}{Junicode-TLF}{boldexpanded}{sl}{ + <-> ssub * Junicode-TLF/boldexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{l}{sl}{ - <-> ssub * Junicode-TLF/l/it +\DeclareFontShape{LY1}{Junicode-TLF}{bx}{scsl}{ + <-> ssub * Junicode-TLF/bx/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{light}{sl}{ - <-> ssub * Junicode-TLF/light/it +\DeclareFontShape{LY1}{Junicode-TLF}{boldexpanded}{scsl}{ + <-> ssub * Junicode-TLF/boldexpanded/scit }{} -% ---- bx = boldexpanded ---- +% ---- mediumsemiexpanded ---- -\DeclareFontShape{LY1}{Junicode-TLF}{bx}{sc}{ - <-> \Junicode@@scale Junicode-ExpBold-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{boldexpanded}{sc}{ - <-> alias * Junicode-TLF/bx/sc +\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemiexpanded}{scit}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{bx}{n}{ - <-> \Junicode@@scale Junicode-ExpBold-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{boldexpanded}{n}{ - <-> alias * Junicode-TLF/bx/n +\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemiexpanded}{sc}{ + <-> \Junicode@@scale Junicode-SmExpMedium-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{bx}{scit}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-TLF/mediumsemiexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{boldexpanded}{scit}{ - <-> alias * Junicode-TLF/bx/scit +\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemiexpanded}{scsl}{ + <-> ssub * Junicode-TLF/mediumsemiexpanded/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-ly1 -}{} -\DeclareFontShape{LY1}{Junicode-TLF}{boldexpanded}{it}{ - <-> alias * Junicode-TLF/bx/it -}{} +% ---- m = regular ---- -\DeclareFontShape{LY1}{Junicode-TLF}{bx}{scsl}{ - <-> ssub * Junicode-TLF/bx/scit +\DeclareFontShape{LY1}{Junicode-TLF}{m}{it}{ + <-> \Junicode@@scale Junicode-Italic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{boldexpanded}{scsl}{ - <-> ssub * Junicode-TLF/boldexpanded/scit +\DeclareFontShape{LY1}{Junicode-TLF}{regular}{it}{ + <-> alias * Junicode-TLF/m/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{bx}{sl}{ - <-> ssub * Junicode-TLF/bx/it +\DeclareFontShape{LY1}{Junicode-TLF}{m}{scit}{ + <-> \Junicode@@scale Junicode-Italic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{boldexpanded}{sl}{ - <-> ssub * Junicode-TLF/boldexpanded/it +\DeclareFontShape{LY1}{Junicode-TLF}{regular}{scit}{ + <-> alias * Junicode-TLF/m/scit }{} +\DeclareFontShape{LY1}{Junicode-TLF}{m}{n}{ + <-> \Junicode@@scale Junicode-Regular-tlf-ly1 +}{} -% ---- mediumcondensed ---- +\DeclareFontShape{LY1}{Junicode-TLF}{regular}{n}{ + <-> alias * Junicode-TLF/m/n +}{} -\DeclareFontShape{LY1}{Junicode-TLF}{mediumcondensed}{scit}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{m}{sc}{ + <-> \Junicode@@scale Junicode-Regular-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{regular}{sc}{ + <-> alias * Junicode-TLF/m/sc }{} -\DeclareFontShape{LY1}{Junicode-TLF}{mediumcondensed}{sc}{ - <-> \Junicode@@scale Junicode-CondMedium-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{m}{sl}{ + <-> ssub * Junicode-TLF/m/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{regular}{sl}{ + <-> ssub * Junicode-TLF/regular/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{mediumcondensed}{scsl}{ - <-> ssub * Junicode-TLF/mediumcondensed/scit +\DeclareFontShape{LY1}{Junicode-TLF}{m}{scsl}{ + <-> ssub * Junicode-TLF/m/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{mediumcondensed}{sl}{ - <-> ssub * Junicode-TLF/mediumcondensed/it +\DeclareFontShape{LY1}{Junicode-TLF}{regular}{scsl}{ + <-> ssub * Junicode-TLF/regular/scit }{} -% ---- b = bold ---- +% ---- lc = lightcondensed ---- -\DeclareFontShape{LY1}{Junicode-TLF}{b}{n}{ - <-> \Junicode@@scale Junicode-Bold-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{bold}{n}{ - <-> alias * Junicode-TLF/b/n +\DeclareFontShape{LY1}{Junicode-TLF}{lightcondensed}{it}{ + <-> alias * Junicode-TLF/lc/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{b}{sc}{ - <-> \Junicode@@scale Junicode-Bold-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{lc}{scit}{ + <-> \Junicode@@scale Junicode-CondLightItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{bold}{sc}{ - <-> alias * Junicode-TLF/b/sc +\DeclareFontShape{LY1}{Junicode-TLF}{lightcondensed}{scit}{ + <-> alias * Junicode-TLF/lc/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{b}{it}{ - <-> \Junicode@@scale Junicode-BoldItalic-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{bold}{it}{ - <-> alias * Junicode-TLF/b/it +\DeclareFontShape{LY1}{Junicode-TLF}{lightcondensed}{n}{ + <-> alias * Junicode-TLF/lc/n }{} -\DeclareFontShape{LY1}{Junicode-TLF}{b}{scit}{ - <-> \Junicode@@scale Junicode-BoldItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{lc}{sc}{ + <-> \Junicode@@scale Junicode-CondLight-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{bold}{scit}{ - <-> alias * Junicode-TLF/b/scit +\DeclareFontShape{LY1}{Junicode-TLF}{lightcondensed}{sc}{ + <-> alias * Junicode-TLF/lc/sc }{} -\DeclareFontShape{LY1}{Junicode-TLF}{b}{scsl}{ - <-> ssub * Junicode-TLF/b/scit +\DeclareFontShape{LY1}{Junicode-TLF}{lc}{sl}{ + <-> ssub * Junicode-TLF/lc/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{bold}{scsl}{ - <-> ssub * Junicode-TLF/bold/scit +\DeclareFontShape{LY1}{Junicode-TLF}{lightcondensed}{sl}{ + <-> ssub * Junicode-TLF/lightcondensed/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{b}{sl}{ - <-> ssub * Junicode-TLF/b/it +\DeclareFontShape{LY1}{Junicode-TLF}{lc}{scsl}{ + <-> ssub * Junicode-TLF/lc/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{bold}{sl}{ - <-> ssub * Junicode-TLF/bold/it +\DeclareFontShape{LY1}{Junicode-TLF}{lightcondensed}{scsl}{ + <-> ssub * Junicode-TLF/lightcondensed/scit }{} -% ---- bsx = boldsemiexpanded ---- +% ---- lsc = lightsemicondensed ---- -\DeclareFontShape{LY1}{Junicode-TLF}{bsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpBold-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{boldsemiexpanded}{n}{ - <-> alias * Junicode-TLF/bsx/n +\DeclareFontShape{LY1}{Junicode-TLF}{lightsemicondensed}{it}{ + <-> alias * Junicode-TLF/lsc/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{bsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpBold-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{lsc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{boldsemiexpanded}{sc}{ - <-> alias * Junicode-TLF/bsx/sc +\DeclareFontShape{LY1}{Junicode-TLF}{lightsemicondensed}{scit}{ + <-> alias * Junicode-TLF/lsc/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{bsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{boldsemiexpanded}{it}{ - <-> alias * Junicode-TLF/bsx/it +\DeclareFontShape{LY1}{Junicode-TLF}{lightsemicondensed}{n}{ + <-> alias * Junicode-TLF/lsc/n }{} -\DeclareFontShape{LY1}{Junicode-TLF}{bsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{lsc}{sc}{ + <-> \Junicode@@scale Junicode-SmCondLight-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{boldsemiexpanded}{scit}{ - <-> alias * Junicode-TLF/bsx/scit +\DeclareFontShape{LY1}{Junicode-TLF}{lightsemicondensed}{sc}{ + <-> alias * Junicode-TLF/lsc/sc }{} -\DeclareFontShape{LY1}{Junicode-TLF}{bsx}{scsl}{ - <-> ssub * Junicode-TLF/bsx/scit +\DeclareFontShape{LY1}{Junicode-TLF}{lsc}{sl}{ + <-> ssub * Junicode-TLF/lsc/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{boldsemiexpanded}{scsl}{ - <-> ssub * Junicode-TLF/boldsemiexpanded/scit +\DeclareFontShape{LY1}{Junicode-TLF}{lightsemicondensed}{sl}{ + <-> ssub * Junicode-TLF/lightsemicondensed/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{bsx}{sl}{ - <-> ssub * Junicode-TLF/bsx/it +\DeclareFontShape{LY1}{Junicode-TLF}{lsc}{scsl}{ + <-> ssub * Junicode-TLF/lsc/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{boldsemiexpanded}{sl}{ - <-> ssub * Junicode-TLF/boldsemiexpanded/it +\DeclareFontShape{LY1}{Junicode-TLF}{lightsemicondensed}{scsl}{ + <-> ssub * Junicode-TLF/lightsemicondensed/scit }{} -% ---- lc = lightcondensed ---- +% ---- mediumexpanded ---- -\DeclareFontShape{LY1}{Junicode-TLF}{lc}{sc}{ - <-> \Junicode@@scale Junicode-CondLight-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{mediumexpanded}{sc}{ + <-> \Junicode@@scale Junicode-ExpMedium-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{lightcondensed}{sc}{ - <-> alias * Junicode-TLF/lc/sc +\DeclareFontShape{LY1}{Junicode-TLF}{mediumexpanded}{n}{ + <-> \Junicode@@scale Junicode-ExpMedium-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{mediumexpanded}{scit}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{lightcondensed}{n}{ - <-> alias * Junicode-TLF/lc/n +\DeclareFontShape{LY1}{Junicode-TLF}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{lc}{scit}{ - <-> \Junicode@@scale Junicode-CondLightItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{mediumexpanded}{sl}{ + <-> ssub * Junicode-TLF/mediumexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{lightcondensed}{scit}{ - <-> alias * Junicode-TLF/lc/scit +\DeclareFontShape{LY1}{Junicode-TLF}{mediumexpanded}{scsl}{ + <-> ssub * Junicode-TLF/mediumexpanded/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-tlf-ly1 -}{} -\DeclareFontShape{LY1}{Junicode-TLF}{lightcondensed}{it}{ - <-> alias * Junicode-TLF/lc/it -}{} +% ---- b = bold ---- -\DeclareFontShape{LY1}{Junicode-TLF}{lc}{scsl}{ - <-> ssub * Junicode-TLF/lc/scit +\DeclareFontShape{LY1}{Junicode-TLF}{b}{sc}{ + <-> \Junicode@@scale Junicode-Bold-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{lightcondensed}{scsl}{ - <-> ssub * Junicode-TLF/lightcondensed/scit +\DeclareFontShape{LY1}{Junicode-TLF}{bold}{sc}{ + <-> alias * Junicode-TLF/b/sc }{} -\DeclareFontShape{LY1}{Junicode-TLF}{lc}{sl}{ - <-> ssub * Junicode-TLF/lc/it +\DeclareFontShape{LY1}{Junicode-TLF}{b}{n}{ + <-> \Junicode@@scale Junicode-Bold-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{lightcondensed}{sl}{ - <-> ssub * Junicode-TLF/lightcondensed/it +\DeclareFontShape{LY1}{Junicode-TLF}{bold}{n}{ + <-> alias * Junicode-TLF/b/n }{} - -% ---- sc = semicondensed ---- - -\DeclareFontShape{LY1}{Junicode-TLF}{sc}{n}{ - <-> \Junicode@@scale Junicode-SmCond-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{b}{scit}{ + <-> \Junicode@@scale Junicode-BoldItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semicondensed}{n}{ - <-> alias * Junicode-TLF/sc/n +\DeclareFontShape{LY1}{Junicode-TLF}{bold}{scit}{ + <-> alias * Junicode-TLF/b/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{sc}{sc}{ - <-> \Junicode@@scale Junicode-SmCond-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{b}{it}{ + <-> \Junicode@@scale Junicode-BoldItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semicondensed}{sc}{ - <-> alias * Junicode-TLF/sc/sc +\DeclareFontShape{LY1}{Junicode-TLF}{bold}{it}{ + <-> alias * Junicode-TLF/b/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{sc}{it}{ - <-> \Junicode@@scale Junicode-SmCondItalic-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{b}{sl}{ + <-> ssub * Junicode-TLF/b/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semicondensed}{it}{ - <-> alias * Junicode-TLF/sc/it +\DeclareFontShape{LY1}{Junicode-TLF}{bold}{sl}{ + <-> ssub * Junicode-TLF/bold/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{sc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{b}{scsl}{ + <-> ssub * Junicode-TLF/b/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semicondensed}{scit}{ - <-> alias * Junicode-TLF/sc/scit +\DeclareFontShape{LY1}{Junicode-TLF}{bold}{scsl}{ + <-> ssub * Junicode-TLF/bold/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{sc}{scsl}{ - <-> ssub * Junicode-TLF/sc/scit -}{} -\DeclareFontShape{LY1}{Junicode-TLF}{semicondensed}{scsl}{ - <-> ssub * Junicode-TLF/semicondensed/scit -}{} +% ---- x = expanded ---- -\DeclareFontShape{LY1}{Junicode-TLF}{sc}{sl}{ - <-> ssub * Junicode-TLF/sc/it +\DeclareFontShape{LY1}{Junicode-TLF}{x}{sc}{ + <-> \Junicode@@scale Junicode-Exp-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semicondensed}{sl}{ - <-> ssub * Junicode-TLF/semicondensed/it +\DeclareFontShape{LY1}{Junicode-TLF}{expanded}{sc}{ + <-> alias * Junicode-TLF/x/sc }{} +\DeclareFontShape{LY1}{Junicode-TLF}{x}{n}{ + <-> \Junicode@@scale Junicode-Exp-tlf-ly1 +}{} -% ---- sb = semibold ---- +\DeclareFontShape{LY1}{Junicode-TLF}{expanded}{n}{ + <-> alias * Junicode-TLF/x/n +}{} -\DeclareFontShape{LY1}{Junicode-TLF}{sb}{sc}{ - <-> \Junicode@@scale Junicode-SmBold-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{x}{scit}{ + <-> \Junicode@@scale Junicode-ExpItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semibold}{sc}{ - <-> alias * Junicode-TLF/sb/sc +\DeclareFontShape{LY1}{Junicode-TLF}{expanded}{scit}{ + <-> alias * Junicode-TLF/x/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{sb}{n}{ - <-> \Junicode@@scale Junicode-SmBold-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{x}{it}{ + <-> \Junicode@@scale Junicode-ExpItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semibold}{n}{ - <-> alias * Junicode-TLF/sb/n +\DeclareFontShape{LY1}{Junicode-TLF}{expanded}{it}{ + <-> alias * Junicode-TLF/x/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{sb}{scit}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{x}{sl}{ + <-> ssub * Junicode-TLF/x/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semibold}{scit}{ - <-> alias * Junicode-TLF/sb/scit +\DeclareFontShape{LY1}{Junicode-TLF}{expanded}{sl}{ + <-> ssub * Junicode-TLF/expanded/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{sb}{it}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{x}{scsl}{ + <-> ssub * Junicode-TLF/x/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semibold}{it}{ - <-> alias * Junicode-TLF/sb/it +\DeclareFontShape{LY1}{Junicode-TLF}{expanded}{scsl}{ + <-> ssub * Junicode-TLF/expanded/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{sb}{scsl}{ - <-> ssub * Junicode-TLF/sb/scit + +% ---- sbx = semiboldexpanded ---- + +\DeclareFontShape{LY1}{Junicode-TLF}{sbx}{sc}{ + <-> \Junicode@@scale Junicode-ExpSmBold-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semibold}{scsl}{ - <-> ssub * Junicode-TLF/semibold/scit +\DeclareFontShape{LY1}{Junicode-TLF}{semiboldexpanded}{sc}{ + <-> alias * Junicode-TLF/sbx/sc }{} -\DeclareFontShape{LY1}{Junicode-TLF}{sb}{sl}{ - <-> ssub * Junicode-TLF/sb/it +\DeclareFontShape{LY1}{Junicode-TLF}{sbx}{it}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semibold}{sl}{ - <-> ssub * Junicode-TLF/semibold/it +\DeclareFontShape{LY1}{Junicode-TLF}{semiboldexpanded}{it}{ + <-> alias * Junicode-TLF/sbx/it }{} +\DeclareFontShape{LY1}{Junicode-TLF}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-tlf-ly1 +}{} -% ---- mediumsemicondensed ---- +\DeclareFontShape{LY1}{Junicode-TLF}{semiboldexpanded}{n}{ + <-> alias * Junicode-TLF/sbx/n +}{} -\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemicondensed}{sc}{ - <-> \Junicode@@scale Junicode-SmCondMedium-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{sbx}{scit}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemicondensed}{n}{ - <-> \Junicode@@scale Junicode-SmCondMedium-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{semiboldexpanded}{scit}{ + <-> alias * Junicode-TLF/sbx/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemicondensed}{scit}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{sbx}{sl}{ + <-> ssub * Junicode-TLF/sbx/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemicondensed}{it}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{semiboldexpanded}{sl}{ + <-> ssub * Junicode-TLF/semiboldexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemicondensed}{scsl}{ - <-> ssub * Junicode-TLF/mediumsemicondensed/scit +\DeclareFontShape{LY1}{Junicode-TLF}{sbx}{scsl}{ + <-> ssub * Junicode-TLF/sbx/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{mediumsemicondensed}{sl}{ - <-> ssub * Junicode-TLF/mediumsemicondensed/it +\DeclareFontShape{LY1}{Junicode-TLF}{semiboldexpanded}{scsl}{ + <-> ssub * Junicode-TLF/semiboldexpanded/scit }{} -% ---- sbx = semiboldexpanded ---- +% ---- c = condensed ---- -\DeclareFontShape{LY1}{Junicode-TLF}{sbx}{scit}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{c}{scit}{ + <-> \Junicode@@scale Junicode-CondItalic-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semiboldexpanded}{scit}{ - <-> alias * Junicode-TLF/sbx/scit +\DeclareFontShape{LY1}{Junicode-TLF}{condensed}{scit}{ + <-> alias * Junicode-TLF/c/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{sbx}{it}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semiboldexpanded}{it}{ - <-> alias * Junicode-TLF/sbx/it +\DeclareFontShape{LY1}{Junicode-TLF}{condensed}{n}{ + <-> alias * Junicode-TLF/c/n }{} -\DeclareFontShape{LY1}{Junicode-TLF}{sbx}{sc}{ - <-> \Junicode@@scale Junicode-ExpSmBold-tlf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-tlf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semiboldexpanded}{sc}{ - <-> alias * Junicode-TLF/sbx/sc +\DeclareFontShape{LY1}{Junicode-TLF}{condensed}{it}{ + <-> alias * Junicode-TLF/c/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-tlf-ly1 +\DeclareFontShape{LY1}{Junicode-TLF}{c}{sc}{ + <-> \Junicode@@scale Junicode-Cond-tlf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semiboldexpanded}{n}{ - <-> alias * Junicode-TLF/sbx/n +\DeclareFontShape{LY1}{Junicode-TLF}{condensed}{sc}{ + <-> alias * Junicode-TLF/c/sc }{} -\DeclareFontShape{LY1}{Junicode-TLF}{sbx}{scsl}{ - <-> ssub * Junicode-TLF/sbx/scit +\DeclareFontShape{LY1}{Junicode-TLF}{c}{sl}{ + <-> ssub * Junicode-TLF/c/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semiboldexpanded}{scsl}{ - <-> ssub * Junicode-TLF/semiboldexpanded/scit +\DeclareFontShape{LY1}{Junicode-TLF}{condensed}{sl}{ + <-> ssub * Junicode-TLF/condensed/it }{} -\DeclareFontShape{LY1}{Junicode-TLF}{sbx}{sl}{ - <-> ssub * Junicode-TLF/sbx/it +\DeclareFontShape{LY1}{Junicode-TLF}{c}{scsl}{ + <-> ssub * Junicode-TLF/c/scit }{} -\DeclareFontShape{LY1}{Junicode-TLF}{semiboldexpanded}{sl}{ - <-> ssub * Junicode-TLF/semiboldexpanded/it +\DeclareFontShape{LY1}{Junicode-TLF}{condensed}{scsl}{ + <-> ssub * Junicode-TLF/condensed/scit }{} diff --git a/Master/texmf-dist/tex/latex/junicode/LY1Junicode-TOsF.fd b/Master/texmf-dist/tex/latex/junicode/LY1Junicode-TOsF.fd index b9e848b1a19..8465d1cb00a 100644 --- a/Master/texmf-dist/tex/latex/junicode/LY1Junicode-TOsF.fd +++ b/Master/texmf-dist/tex/latex/junicode/LY1Junicode-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{LY1Junicode-TOsF.fd} - [2024/06/03 (autoinst) Font definitions for LY1/Junicode-TOsF.] + [2024/07/21 (autoinst) Font definitions for LY1/Junicode-TOsF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,204 +20,215 @@ \DeclareFontFamily{LY1}{Junicode-TOsF}{} -% ---- medium ---- +% ---- lc = lightcondensed ---- -\DeclareFontShape{LY1}{Junicode-TOsF}{medium}{scit}{ - <-> \Junicode@@scale Junicode-MediumItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{lc}{sc}{ + <-> \Junicode@@scale Junicode-CondLight-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{medium}{it}{ - <-> \Junicode@@scale Junicode-MediumItalic-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{lightcondensed}{sc}{ + <-> alias * Junicode-TOsF/lc/sc }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{medium}{sc}{ - <-> \Junicode@@scale Junicode-Medium-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{medium}{n}{ - <-> \Junicode@@scale Junicode-Medium-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{lightcondensed}{it}{ + <-> alias * Junicode-TOsF/lc/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{medium}{scsl}{ - <-> ssub * Junicode-TOsF/medium/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{lc}{scit}{ + <-> \Junicode@@scale Junicode-CondLightItalic-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{medium}{sl}{ - <-> ssub * Junicode-TOsF/medium/it +\DeclareFontShape{LY1}{Junicode-TOsF}{lightcondensed}{scit}{ + <-> alias * Junicode-TOsF/lc/scit }{} - -% ---- lsc = lightsemicondensed ---- - -\DeclareFontShape{LY1}{Junicode-TOsF}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{lightsemicondensed}{it}{ - <-> alias * Junicode-TOsF/lsc/it +\DeclareFontShape{LY1}{Junicode-TOsF}{lightcondensed}{n}{ + <-> alias * Junicode-TOsF/lc/n }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{lsc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{lc}{sl}{ + <-> ssub * Junicode-TOsF/lc/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{lightsemicondensed}{scit}{ - <-> alias * Junicode-TOsF/lsc/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{lightcondensed}{sl}{ + <-> ssub * Junicode-TOsF/lightcondensed/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{lc}{scsl}{ + <-> ssub * Junicode-TOsF/lc/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{lightsemicondensed}{n}{ - <-> alias * Junicode-TOsF/lsc/n +\DeclareFontShape{LY1}{Junicode-TOsF}{lightcondensed}{scsl}{ + <-> ssub * Junicode-TOsF/lightcondensed/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{lsc}{sc}{ - <-> \Junicode@@scale Junicode-SmCondLight-tosf-sc-ly1 + +% ---- medium ---- + +\DeclareFontShape{LY1}{Junicode-TOsF}{medium}{sc}{ + <-> \Junicode@@scale Junicode-Medium-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{lightsemicondensed}{sc}{ - <-> alias * Junicode-TOsF/lsc/sc +\DeclareFontShape{LY1}{Junicode-TOsF}{medium}{it}{ + <-> \Junicode@@scale Junicode-MediumItalic-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{lsc}{scsl}{ - <-> ssub * Junicode-TOsF/lsc/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{medium}{scit}{ + <-> \Junicode@@scale Junicode-MediumItalic-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{lightsemicondensed}{scsl}{ - <-> ssub * Junicode-TOsF/lightsemicondensed/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{medium}{n}{ + <-> \Junicode@@scale Junicode-Medium-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{lsc}{sl}{ - <-> ssub * Junicode-TOsF/lsc/it +\DeclareFontShape{LY1}{Junicode-TOsF}{medium}{sl}{ + <-> ssub * Junicode-TOsF/medium/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{lightsemicondensed}{sl}{ - <-> ssub * Junicode-TOsF/lightsemicondensed/it +\DeclareFontShape{LY1}{Junicode-TOsF}{medium}{scsl}{ + <-> ssub * Junicode-TOsF/medium/scit }{} -% ---- m = regular ---- +% ---- bx = boldexpanded ---- -\DeclareFontShape{LY1}{Junicode-TOsF}{m}{sc}{ - <-> \Junicode@@scale Junicode-Regular-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{bx}{scit}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{regular}{sc}{ - <-> alias * Junicode-TOsF/m/sc +\DeclareFontShape{LY1}{Junicode-TOsF}{boldexpanded}{scit}{ + <-> alias * Junicode-TOsF/bx/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{m}{n}{ - <-> \Junicode@@scale Junicode-Regular-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{bx}{n}{ + <-> \Junicode@@scale Junicode-ExpBold-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{regular}{n}{ - <-> alias * Junicode-TOsF/m/n +\DeclareFontShape{LY1}{Junicode-TOsF}{boldexpanded}{n}{ + <-> alias * Junicode-TOsF/bx/n }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{m}{scit}{ - <-> \Junicode@@scale Junicode-Italic-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{regular}{scit}{ - <-> alias * Junicode-TOsF/m/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{boldexpanded}{it}{ + <-> alias * Junicode-TOsF/bx/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{m}{it}{ - <-> \Junicode@@scale Junicode-Italic-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{bx}{sc}{ + <-> \Junicode@@scale Junicode-ExpBold-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{regular}{it}{ - <-> alias * Junicode-TOsF/m/it +\DeclareFontShape{LY1}{Junicode-TOsF}{boldexpanded}{sc}{ + <-> alias * Junicode-TOsF/bx/sc }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{m}{scsl}{ - <-> ssub * Junicode-TOsF/m/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{bx}{sl}{ + <-> ssub * Junicode-TOsF/bx/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{regular}{scsl}{ - <-> ssub * Junicode-TOsF/regular/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{boldexpanded}{sl}{ + <-> ssub * Junicode-TOsF/boldexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{m}{sl}{ - <-> ssub * Junicode-TOsF/m/it +\DeclareFontShape{LY1}{Junicode-TOsF}{bx}{scsl}{ + <-> ssub * Junicode-TOsF/bx/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{regular}{sl}{ - <-> ssub * Junicode-TOsF/regular/it +\DeclareFontShape{LY1}{Junicode-TOsF}{boldexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/boldexpanded/scit }{} -% ---- bx = boldexpanded ---- +% ---- mediumsemiexpanded ---- -\DeclareFontShape{LY1}{Junicode-TOsF}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{boldexpanded}{it}{ - <-> alias * Junicode-TOsF/bx/it +\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemiexpanded}{scit}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{bx}{scit}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{boldexpanded}{scit}{ - <-> alias * Junicode-TOsF/bx/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemiexpanded}{sc}{ + <-> \Junicode@@scale Junicode-SmExpMedium-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{bx}{n}{ - <-> \Junicode@@scale Junicode-ExpBold-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-TOsF/mediumsemiexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{boldexpanded}{n}{ - <-> alias * Junicode-TOsF/bx/n +\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemiexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/mediumsemiexpanded/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{bx}{sc}{ - <-> \Junicode@@scale Junicode-ExpBold-tosf-sc-ly1 + +% ---- m = regular ---- + +\DeclareFontShape{LY1}{Junicode-TOsF}{m}{it}{ + <-> \Junicode@@scale Junicode-Italic-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{boldexpanded}{sc}{ - <-> alias * Junicode-TOsF/bx/sc +\DeclareFontShape{LY1}{Junicode-TOsF}{regular}{it}{ + <-> alias * Junicode-TOsF/m/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{bx}{scsl}{ - <-> ssub * Junicode-TOsF/bx/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{m}{n}{ + <-> \Junicode@@scale Junicode-Regular-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{boldexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/boldexpanded/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{regular}{n}{ + <-> alias * Junicode-TOsF/m/n }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{bx}{sl}{ - <-> ssub * Junicode-TOsF/bx/it +\DeclareFontShape{LY1}{Junicode-TOsF}{m}{scit}{ + <-> \Junicode@@scale Junicode-Italic-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{boldexpanded}{sl}{ - <-> ssub * Junicode-TOsF/boldexpanded/it +\DeclareFontShape{LY1}{Junicode-TOsF}{regular}{scit}{ + <-> alias * Junicode-TOsF/m/scit }{} +\DeclareFontShape{LY1}{Junicode-TOsF}{m}{sc}{ + <-> \Junicode@@scale Junicode-Regular-tosf-sc-ly1 +}{} -% ---- l = light ---- +\DeclareFontShape{LY1}{Junicode-TOsF}{regular}{sc}{ + <-> alias * Junicode-TOsF/m/sc +}{} -\DeclareFontShape{LY1}{Junicode-TOsF}{l}{n}{ - <-> \Junicode@@scale Junicode-Light-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{m}{sl}{ + <-> ssub * Junicode-TOsF/m/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{light}{n}{ - <-> alias * Junicode-TOsF/l/n +\DeclareFontShape{LY1}{Junicode-TOsF}{regular}{sl}{ + <-> ssub * Junicode-TOsF/regular/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{l}{sc}{ - <-> \Junicode@@scale Junicode-Light-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{m}{scsl}{ + <-> ssub * Junicode-TOsF/m/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{light}{sc}{ - <-> alias * Junicode-TOsF/l/sc +\DeclareFontShape{LY1}{Junicode-TOsF}{regular}{scsl}{ + <-> ssub * Junicode-TOsF/regular/scit }{} + +% ---- l = light ---- + \DeclareFontShape{LY1}{Junicode-TOsF}{l}{it}{ <-> \Junicode@@scale Junicode-LightItalic-tosf-ly1 }{} @@ -234,12 +245,20 @@ <-> alias * Junicode-TOsF/l/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{l}{scsl}{ - <-> ssub * Junicode-TOsF/l/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{l}{n}{ + <-> \Junicode@@scale Junicode-Light-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{light}{scsl}{ - <-> ssub * Junicode-TOsF/light/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{light}{n}{ + <-> alias * Junicode-TOsF/l/n +}{} + +\DeclareFontShape{LY1}{Junicode-TOsF}{l}{sc}{ + <-> \Junicode@@scale Junicode-Light-tosf-sc-ly1 +}{} + +\DeclareFontShape{LY1}{Junicode-TOsF}{light}{sc}{ + <-> alias * Junicode-TOsF/l/sc }{} \DeclareFontShape{LY1}{Junicode-TOsF}{l}{sl}{ @@ -250,283 +269,275 @@ <-> ssub * Junicode-TOsF/light/it }{} - -% ---- mediumsemiexpanded ---- - -\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{l}{scsl}{ + <-> ssub * Junicode-TOsF/l/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemiexpanded}{scit}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{light}{scsl}{ + <-> ssub * Junicode-TOsF/light/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-tosf-ly1 + +% ---- sx = semiexpanded ---- + +\DeclareFontShape{LY1}{Junicode-TOsF}{sx}{sc}{ + <-> \Junicode@@scale Junicode-SmExp-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemiexpanded}{sc}{ - <-> \Junicode@@scale Junicode-SmExpMedium-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{semiexpanded}{sc}{ + <-> alias * Junicode-TOsF/sx/sc }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemiexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/mediumsemiexpanded/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-TOsF/mediumsemiexpanded/it +\DeclareFontShape{LY1}{Junicode-TOsF}{semiexpanded}{it}{ + <-> alias * Junicode-TOsF/sx/it }{} +\DeclareFontShape{LY1}{Junicode-TOsF}{sx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpItalic-tosf-sc-ly1 +}{} -% ---- mediumexpanded ---- +\DeclareFontShape{LY1}{Junicode-TOsF}{semiexpanded}{scit}{ + <-> alias * Junicode-TOsF/sx/scit +}{} -\DeclareFontShape{LY1}{Junicode-TOsF}{mediumexpanded}{scit}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{semiexpanded}{n}{ + <-> alias * Junicode-TOsF/sx/n }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{mediumexpanded}{sc}{ - <-> \Junicode@@scale Junicode-ExpMedium-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{sx}{sl}{ + <-> ssub * Junicode-TOsF/sx/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{mediumexpanded}{n}{ - <-> \Junicode@@scale Junicode-ExpMedium-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{semiexpanded}{sl}{ + <-> ssub * Junicode-TOsF/semiexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{mediumexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/mediumexpanded/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{sx}{scsl}{ + <-> ssub * Junicode-TOsF/sx/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{mediumexpanded}{sl}{ - <-> ssub * Junicode-TOsF/mediumexpanded/it +\DeclareFontShape{LY1}{Junicode-TOsF}{semiexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/semiexpanded/scit }{} -% ---- sbsx = semiboldsemiexpanded ---- +% ---- mediumsemicondensed ---- -\DeclareFontShape{LY1}{Junicode-TOsF}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemicondensed}{it}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-TOsF/sbsx/n +\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemicondensed}{scit}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{sbsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemicondensed}{n}{ + <-> \Junicode@@scale Junicode-SmCondMedium-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldsemiexpanded}{sc}{ - <-> alias * Junicode-TOsF/sbsx/sc +\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemicondensed}{sc}{ + <-> \Junicode@@scale Junicode-SmCondMedium-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{sbsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemicondensed}{sl}{ + <-> ssub * Junicode-TOsF/mediumsemicondensed/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldsemiexpanded}{it}{ - <-> alias * Junicode-TOsF/sbsx/it +\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemicondensed}{scsl}{ + <-> ssub * Junicode-TOsF/mediumsemicondensed/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{sbsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-sc-ly1 + +% ---- mediumcondensed ---- + +\DeclareFontShape{LY1}{Junicode-TOsF}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldsemiexpanded}{scit}{ - <-> alias * Junicode-TOsF/sbsx/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{mediumcondensed}{scit}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{sbsx}{scsl}{ - <-> ssub * Junicode-TOsF/sbsx/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldsemiexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/semiboldsemiexpanded/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{mediumcondensed}{sc}{ + <-> \Junicode@@scale Junicode-CondMedium-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{sbsx}{sl}{ - <-> ssub * Junicode-TOsF/sbsx/it +\DeclareFontShape{LY1}{Junicode-TOsF}{mediumcondensed}{sl}{ + <-> ssub * Junicode-TOsF/mediumcondensed/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldsemiexpanded}{sl}{ - <-> ssub * Junicode-TOsF/semiboldsemiexpanded/it +\DeclareFontShape{LY1}{Junicode-TOsF}{mediumcondensed}{scsl}{ + <-> ssub * Junicode-TOsF/mediumcondensed/scit }{} -% ---- x = expanded ---- +% ---- sb = semibold ---- -\DeclareFontShape{LY1}{Junicode-TOsF}{x}{sc}{ - <-> \Junicode@@scale Junicode-Exp-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{sb}{it}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{expanded}{sc}{ - <-> alias * Junicode-TOsF/x/sc +\DeclareFontShape{LY1}{Junicode-TOsF}{semibold}{it}{ + <-> alias * Junicode-TOsF/sb/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{x}{n}{ - <-> \Junicode@@scale Junicode-Exp-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{sb}{scit}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{expanded}{n}{ - <-> alias * Junicode-TOsF/x/n +\DeclareFontShape{LY1}{Junicode-TOsF}{semibold}{scit}{ + <-> alias * Junicode-TOsF/sb/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{x}{scit}{ - <-> \Junicode@@scale Junicode-ExpItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{sb}{n}{ + <-> \Junicode@@scale Junicode-SmBold-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{expanded}{scit}{ - <-> alias * Junicode-TOsF/x/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{semibold}{n}{ + <-> alias * Junicode-TOsF/sb/n }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{x}{it}{ - <-> \Junicode@@scale Junicode-ExpItalic-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{sb}{sc}{ + <-> \Junicode@@scale Junicode-SmBold-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{expanded}{it}{ - <-> alias * Junicode-TOsF/x/it +\DeclareFontShape{LY1}{Junicode-TOsF}{semibold}{sc}{ + <-> alias * Junicode-TOsF/sb/sc }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{x}{scsl}{ - <-> ssub * Junicode-TOsF/x/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{sb}{sl}{ + <-> ssub * Junicode-TOsF/sb/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{expanded}{scsl}{ - <-> ssub * Junicode-TOsF/expanded/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{semibold}{sl}{ + <-> ssub * Junicode-TOsF/semibold/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{x}{sl}{ - <-> ssub * Junicode-TOsF/x/it +\DeclareFontShape{LY1}{Junicode-TOsF}{sb}{scsl}{ + <-> ssub * Junicode-TOsF/sb/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{expanded}{sl}{ - <-> ssub * Junicode-TOsF/expanded/it +\DeclareFontShape{LY1}{Junicode-TOsF}{semibold}{scsl}{ + <-> ssub * Junicode-TOsF/semibold/scit }{} -% ---- c = condensed ---- +% ---- sbsx = semiboldsemiexpanded ---- -\DeclareFontShape{LY1}{Junicode-TOsF}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{sbsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{condensed}{it}{ - <-> alias * Junicode-TOsF/c/it +\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldsemiexpanded}{it}{ + <-> alias * Junicode-TOsF/sbsx/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{c}{scit}{ - <-> \Junicode@@scale Junicode-CondItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{sbsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{condensed}{scit}{ - <-> alias * Junicode-TOsF/c/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldsemiexpanded}{scit}{ + <-> alias * Junicode-TOsF/sbsx/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{condensed}{n}{ - <-> alias * Junicode-TOsF/c/n +\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-TOsF/sbsx/n }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{c}{sc}{ - <-> \Junicode@@scale Junicode-Cond-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{sbsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{condensed}{sc}{ - <-> alias * Junicode-TOsF/c/sc +\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldsemiexpanded}{sc}{ + <-> alias * Junicode-TOsF/sbsx/sc }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{c}{scsl}{ - <-> ssub * Junicode-TOsF/c/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{sbsx}{sl}{ + <-> ssub * Junicode-TOsF/sbsx/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{condensed}{scsl}{ - <-> ssub * Junicode-TOsF/condensed/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldsemiexpanded}{sl}{ + <-> ssub * Junicode-TOsF/semiboldsemiexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{c}{sl}{ - <-> ssub * Junicode-TOsF/c/it +\DeclareFontShape{LY1}{Junicode-TOsF}{sbsx}{scsl}{ + <-> ssub * Junicode-TOsF/sbsx/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{condensed}{sl}{ - <-> ssub * Junicode-TOsF/condensed/it +\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldsemiexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/semiboldsemiexpanded/scit }{} -% ---- sx = semiexpanded ---- +% ---- bsx = boldsemiexpanded ---- -\DeclareFontShape{LY1}{Junicode-TOsF}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{bsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{semiexpanded}{it}{ - <-> alias * Junicode-TOsF/sx/it +\DeclareFontShape{LY1}{Junicode-TOsF}{boldsemiexpanded}{scit}{ + <-> alias * Junicode-TOsF/bsx/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{sx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{bsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpBold-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{semiexpanded}{scit}{ - <-> alias * Junicode-TOsF/sx/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{boldsemiexpanded}{n}{ + <-> alias * Junicode-TOsF/bsx/n }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{bsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{semiexpanded}{n}{ - <-> alias * Junicode-TOsF/sx/n +\DeclareFontShape{LY1}{Junicode-TOsF}{boldsemiexpanded}{it}{ + <-> alias * Junicode-TOsF/bsx/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{sx}{sc}{ - <-> \Junicode@@scale Junicode-SmExp-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{bsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpBold-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{semiexpanded}{sc}{ - <-> alias * Junicode-TOsF/sx/sc +\DeclareFontShape{LY1}{Junicode-TOsF}{boldsemiexpanded}{sc}{ + <-> alias * Junicode-TOsF/bsx/sc }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{sx}{scsl}{ - <-> ssub * Junicode-TOsF/sx/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{bsx}{sl}{ + <-> ssub * Junicode-TOsF/bsx/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{semiexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/semiexpanded/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{boldsemiexpanded}{sl}{ + <-> ssub * Junicode-TOsF/boldsemiexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{sx}{sl}{ - <-> ssub * Junicode-TOsF/sx/it +\DeclareFontShape{LY1}{Junicode-TOsF}{bsx}{scsl}{ + <-> ssub * Junicode-TOsF/bsx/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{semiexpanded}{sl}{ - <-> ssub * Junicode-TOsF/semiexpanded/it +\DeclareFontShape{LY1}{Junicode-TOsF}{boldsemiexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/boldsemiexpanded/scit }{} % ---- sc = semicondensed ---- -\DeclareFontShape{LY1}{Junicode-TOsF}{sc}{n}{ - <-> \Junicode@@scale Junicode-SmCond-tosf-ly1 -}{} - -\DeclareFontShape{LY1}{Junicode-TOsF}{semicondensed}{n}{ - <-> alias * Junicode-TOsF/sc/n -}{} - -\DeclareFontShape{LY1}{Junicode-TOsF}{sc}{sc}{ - <-> \Junicode@@scale Junicode-SmCond-tosf-sc-ly1 -}{} - -\DeclareFontShape{LY1}{Junicode-TOsF}{semicondensed}{sc}{ - <-> alias * Junicode-TOsF/sc/sc -}{} - \DeclareFontShape{LY1}{Junicode-TOsF}{sc}{it}{ <-> \Junicode@@scale Junicode-SmCondItalic-tosf-ly1 }{} @@ -535,6 +546,14 @@ <-> alias * Junicode-TOsF/sc/it }{} +\DeclareFontShape{LY1}{Junicode-TOsF}{sc}{n}{ + <-> \Junicode@@scale Junicode-SmCond-tosf-ly1 +}{} + +\DeclareFontShape{LY1}{Junicode-TOsF}{semicondensed}{n}{ + <-> alias * Junicode-TOsF/sc/n +}{} + \DeclareFontShape{LY1}{Junicode-TOsF}{sc}{scit}{ <-> \Junicode@@scale Junicode-SmCondItalic-tosf-sc-ly1 }{} @@ -543,12 +562,12 @@ <-> alias * Junicode-TOsF/sc/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{sc}{scsl}{ - <-> ssub * Junicode-TOsF/sc/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{sc}{sc}{ + <-> \Junicode@@scale Junicode-SmCond-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{semicondensed}{scsl}{ - <-> ssub * Junicode-TOsF/semicondensed/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{semicondensed}{sc}{ + <-> alias * Junicode-TOsF/sc/sc }{} \DeclareFontShape{LY1}{Junicode-TOsF}{sc}{sl}{ @@ -559,313 +578,294 @@ <-> ssub * Junicode-TOsF/semicondensed/it }{} - -% ---- sb = semibold ---- - -\DeclareFontShape{LY1}{Junicode-TOsF}{sb}{n}{ - <-> \Junicode@@scale Junicode-SmBold-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{sc}{scsl}{ + <-> ssub * Junicode-TOsF/sc/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{semibold}{n}{ - <-> alias * Junicode-TOsF/sb/n +\DeclareFontShape{LY1}{Junicode-TOsF}{semicondensed}{scsl}{ + <-> ssub * Junicode-TOsF/semicondensed/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{sb}{sc}{ - <-> \Junicode@@scale Junicode-SmBold-tosf-sc-ly1 -}{} -\DeclareFontShape{LY1}{Junicode-TOsF}{semibold}{sc}{ - <-> alias * Junicode-TOsF/sb/sc -}{} +% ---- c = condensed ---- -\DeclareFontShape{LY1}{Junicode-TOsF}{sb}{it}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{c}{sc}{ + <-> \Junicode@@scale Junicode-Cond-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{semibold}{it}{ - <-> alias * Junicode-TOsF/sb/it +\DeclareFontShape{LY1}{Junicode-TOsF}{condensed}{sc}{ + <-> alias * Junicode-TOsF/c/sc }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{sb}{scit}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{semibold}{scit}{ - <-> alias * Junicode-TOsF/sb/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{condensed}{it}{ + <-> alias * Junicode-TOsF/c/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{sb}{scsl}{ - <-> ssub * Junicode-TOsF/sb/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{semibold}{scsl}{ - <-> ssub * Junicode-TOsF/semibold/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{condensed}{n}{ + <-> alias * Junicode-TOsF/c/n }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{sb}{sl}{ - <-> ssub * Junicode-TOsF/sb/it +\DeclareFontShape{LY1}{Junicode-TOsF}{c}{scit}{ + <-> \Junicode@@scale Junicode-CondItalic-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{semibold}{sl}{ - <-> ssub * Junicode-TOsF/semibold/it +\DeclareFontShape{LY1}{Junicode-TOsF}{condensed}{scit}{ + <-> alias * Junicode-TOsF/c/scit }{} - -% ---- bsx = boldsemiexpanded ---- - -\DeclareFontShape{LY1}{Junicode-TOsF}{bsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{c}{sl}{ + <-> ssub * Junicode-TOsF/c/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{boldsemiexpanded}{scit}{ - <-> alias * Junicode-TOsF/bsx/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{condensed}{sl}{ + <-> ssub * Junicode-TOsF/condensed/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{bsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{c}{scsl}{ + <-> ssub * Junicode-TOsF/c/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{boldsemiexpanded}{it}{ - <-> alias * Junicode-TOsF/bsx/it +\DeclareFontShape{LY1}{Junicode-TOsF}{condensed}{scsl}{ + <-> ssub * Junicode-TOsF/condensed/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{bsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpBold-tosf-sc-ly1 -}{} -\DeclareFontShape{LY1}{Junicode-TOsF}{boldsemiexpanded}{sc}{ - <-> alias * Junicode-TOsF/bsx/sc -}{} +% ---- sbx = semiboldexpanded ---- -\DeclareFontShape{LY1}{Junicode-TOsF}{bsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpBold-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{sbx}{sc}{ + <-> \Junicode@@scale Junicode-ExpSmBold-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{boldsemiexpanded}{n}{ - <-> alias * Junicode-TOsF/bsx/n +\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldexpanded}{sc}{ + <-> alias * Junicode-TOsF/sbx/sc }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{bsx}{scsl}{ - <-> ssub * Junicode-TOsF/bsx/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{sbx}{it}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{boldsemiexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/boldsemiexpanded/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldexpanded}{it}{ + <-> alias * Junicode-TOsF/sbx/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{bsx}{sl}{ - <-> ssub * Junicode-TOsF/bsx/it +\DeclareFontShape{LY1}{Junicode-TOsF}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{boldsemiexpanded}{sl}{ - <-> ssub * Junicode-TOsF/boldsemiexpanded/it +\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldexpanded}{n}{ + <-> alias * Junicode-TOsF/sbx/n }{} - -% ---- lc = lightcondensed ---- - -\DeclareFontShape{LY1}{Junicode-TOsF}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{sbx}{scit}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{lightcondensed}{it}{ - <-> alias * Junicode-TOsF/lc/it +\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldexpanded}{scit}{ + <-> alias * Junicode-TOsF/sbx/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{lc}{scit}{ - <-> \Junicode@@scale Junicode-CondLightItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{sbx}{sl}{ + <-> ssub * Junicode-TOsF/sbx/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{lightcondensed}{scit}{ - <-> alias * Junicode-TOsF/lc/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldexpanded}{sl}{ + <-> ssub * Junicode-TOsF/semiboldexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{sbx}{scsl}{ + <-> ssub * Junicode-TOsF/sbx/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{lightcondensed}{n}{ - <-> alias * Junicode-TOsF/lc/n +\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/semiboldexpanded/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{lc}{sc}{ - <-> \Junicode@@scale Junicode-CondLight-tosf-sc-ly1 -}{} -\DeclareFontShape{LY1}{Junicode-TOsF}{lightcondensed}{sc}{ - <-> alias * Junicode-TOsF/lc/sc -}{} +% ---- b = bold ---- -\DeclareFontShape{LY1}{Junicode-TOsF}{lc}{scsl}{ - <-> ssub * Junicode-TOsF/lc/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{b}{n}{ + <-> \Junicode@@scale Junicode-Bold-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{lightcondensed}{scsl}{ - <-> ssub * Junicode-TOsF/lightcondensed/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{bold}{n}{ + <-> alias * Junicode-TOsF/b/n }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{lc}{sl}{ - <-> ssub * Junicode-TOsF/lc/it +\DeclareFontShape{LY1}{Junicode-TOsF}{b}{scit}{ + <-> \Junicode@@scale Junicode-BoldItalic-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{lightcondensed}{sl}{ - <-> ssub * Junicode-TOsF/lightcondensed/it +\DeclareFontShape{LY1}{Junicode-TOsF}{bold}{scit}{ + <-> alias * Junicode-TOsF/b/scit }{} - -% ---- sbx = semiboldexpanded ---- - -\DeclareFontShape{LY1}{Junicode-TOsF}{sbx}{it}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{b}{it}{ + <-> \Junicode@@scale Junicode-BoldItalic-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldexpanded}{it}{ - <-> alias * Junicode-TOsF/sbx/it +\DeclareFontShape{LY1}{Junicode-TOsF}{bold}{it}{ + <-> alias * Junicode-TOsF/b/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{sbx}{scit}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{b}{sc}{ + <-> \Junicode@@scale Junicode-Bold-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldexpanded}{scit}{ - <-> alias * Junicode-TOsF/sbx/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{bold}{sc}{ + <-> alias * Junicode-TOsF/b/sc }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{b}{sl}{ + <-> ssub * Junicode-TOsF/b/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldexpanded}{n}{ - <-> alias * Junicode-TOsF/sbx/n +\DeclareFontShape{LY1}{Junicode-TOsF}{bold}{sl}{ + <-> ssub * Junicode-TOsF/bold/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{sbx}{sc}{ - <-> \Junicode@@scale Junicode-ExpSmBold-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{b}{scsl}{ + <-> ssub * Junicode-TOsF/b/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldexpanded}{sc}{ - <-> alias * Junicode-TOsF/sbx/sc +\DeclareFontShape{LY1}{Junicode-TOsF}{bold}{scsl}{ + <-> ssub * Junicode-TOsF/bold/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{sbx}{scsl}{ - <-> ssub * Junicode-TOsF/sbx/scit + +% ---- x = expanded ---- + +\DeclareFontShape{LY1}{Junicode-TOsF}{x}{sc}{ + <-> \Junicode@@scale Junicode-Exp-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/semiboldexpanded/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{expanded}{sc}{ + <-> alias * Junicode-TOsF/x/sc }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{sbx}{sl}{ - <-> ssub * Junicode-TOsF/sbx/it +\DeclareFontShape{LY1}{Junicode-TOsF}{x}{n}{ + <-> \Junicode@@scale Junicode-Exp-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{semiboldexpanded}{sl}{ - <-> ssub * Junicode-TOsF/semiboldexpanded/it +\DeclareFontShape{LY1}{Junicode-TOsF}{expanded}{n}{ + <-> alias * Junicode-TOsF/x/n }{} +\DeclareFontShape{LY1}{Junicode-TOsF}{x}{scit}{ + <-> \Junicode@@scale Junicode-ExpItalic-tosf-sc-ly1 +}{} -% ---- mediumsemicondensed ---- +\DeclareFontShape{LY1}{Junicode-TOsF}{expanded}{scit}{ + <-> alias * Junicode-TOsF/x/scit +}{} -\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemicondensed}{sc}{ - <-> \Junicode@@scale Junicode-SmCondMedium-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{x}{it}{ + <-> \Junicode@@scale Junicode-ExpItalic-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemicondensed}{n}{ - <-> \Junicode@@scale Junicode-SmCondMedium-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{expanded}{it}{ + <-> alias * Junicode-TOsF/x/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemicondensed}{scit}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{x}{sl}{ + <-> ssub * Junicode-TOsF/x/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemicondensed}{it}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{expanded}{sl}{ + <-> ssub * Junicode-TOsF/expanded/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemicondensed}{scsl}{ - <-> ssub * Junicode-TOsF/mediumsemicondensed/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{x}{scsl}{ + <-> ssub * Junicode-TOsF/x/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{mediumsemicondensed}{sl}{ - <-> ssub * Junicode-TOsF/mediumsemicondensed/it +\DeclareFontShape{LY1}{Junicode-TOsF}{expanded}{scsl}{ + <-> ssub * Junicode-TOsF/expanded/scit }{} -% ---- mediumcondensed ---- +% ---- mediumexpanded ---- -\DeclareFontShape{LY1}{Junicode-TOsF}{mediumcondensed}{scit}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{mediumexpanded}{sc}{ + <-> \Junicode@@scale Junicode-ExpMedium-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{mediumexpanded}{scit}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{mediumcondensed}{sc}{ - <-> \Junicode@@scale Junicode-CondMedium-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{mediumexpanded}{n}{ + <-> \Junicode@@scale Junicode-ExpMedium-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{mediumcondensed}{scsl}{ - <-> ssub * Junicode-TOsF/mediumcondensed/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{mediumexpanded}{sl}{ + <-> ssub * Junicode-TOsF/mediumexpanded/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{mediumcondensed}{sl}{ - <-> ssub * Junicode-TOsF/mediumcondensed/it +\DeclareFontShape{LY1}{Junicode-TOsF}{mediumexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/mediumexpanded/scit }{} -% ---- b = bold ---- +% ---- lsc = lightsemicondensed ---- -\DeclareFontShape{LY1}{Junicode-TOsF}{b}{n}{ - <-> \Junicode@@scale Junicode-Bold-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{bold}{n}{ - <-> alias * Junicode-TOsF/b/n +\DeclareFontShape{LY1}{Junicode-TOsF}{lightsemicondensed}{it}{ + <-> alias * Junicode-TOsF/lsc/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{b}{sc}{ - <-> \Junicode@@scale Junicode-Bold-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{lsc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{bold}{sc}{ - <-> alias * Junicode-TOsF/b/sc +\DeclareFontShape{LY1}{Junicode-TOsF}{lightsemicondensed}{scit}{ + <-> alias * Junicode-TOsF/lsc/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{b}{it}{ - <-> \Junicode@@scale Junicode-BoldItalic-tosf-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-tosf-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{bold}{it}{ - <-> alias * Junicode-TOsF/b/it +\DeclareFontShape{LY1}{Junicode-TOsF}{lightsemicondensed}{n}{ + <-> alias * Junicode-TOsF/lsc/n }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{b}{scit}{ - <-> \Junicode@@scale Junicode-BoldItalic-tosf-sc-ly1 +\DeclareFontShape{LY1}{Junicode-TOsF}{lsc}{sc}{ + <-> \Junicode@@scale Junicode-SmCondLight-tosf-sc-ly1 }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{bold}{scit}{ - <-> alias * Junicode-TOsF/b/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{lightsemicondensed}{sc}{ + <-> alias * Junicode-TOsF/lsc/sc }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{b}{scsl}{ - <-> ssub * Junicode-TOsF/b/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{lsc}{sl}{ + <-> ssub * Junicode-TOsF/lsc/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{bold}{scsl}{ - <-> ssub * Junicode-TOsF/bold/scit +\DeclareFontShape{LY1}{Junicode-TOsF}{lightsemicondensed}{sl}{ + <-> ssub * Junicode-TOsF/lightsemicondensed/it }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{b}{sl}{ - <-> ssub * Junicode-TOsF/b/it +\DeclareFontShape{LY1}{Junicode-TOsF}{lsc}{scsl}{ + <-> ssub * Junicode-TOsF/lsc/scit }{} -\DeclareFontShape{LY1}{Junicode-TOsF}{bold}{sl}{ - <-> ssub * Junicode-TOsF/bold/it +\DeclareFontShape{LY1}{Junicode-TOsF}{lightsemicondensed}{scsl}{ + <-> ssub * Junicode-TOsF/lightsemicondensed/scit }{} diff --git a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-Inf.fd b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-Inf.fd index bb6dc563984..10a023e6710 100644 --- a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-Inf.fd +++ b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-Inf.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{OT1Junicode-Inf.fd} - [2024/06/03 (autoinst) Font definitions for OT1/Junicode-Inf.] + [2024/07/21 (autoinst) Font definitions for OT1/Junicode-Inf.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,111 +20,99 @@ \DeclareFontFamily{OT1}{Junicode-Inf}{} -% ---- sb = semibold ---- - -\DeclareFontShape{OT1}{Junicode-Inf}{sb}{it}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-inf-ot1 -}{} +% ---- lsc = lightsemicondensed ---- -\DeclareFontShape{OT1}{Junicode-Inf}{semibold}{it}{ - <-> alias * Junicode-Inf/sb/it +\DeclareFontShape{OT1}{Junicode-Inf}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{sb}{n}{ - <-> \Junicode@@scale Junicode-SmBold-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{lightsemicondensed}{n}{ + <-> alias * Junicode-Inf/lsc/n }{} -\DeclareFontShape{OT1}{Junicode-Inf}{semibold}{n}{ - <-> alias * Junicode-Inf/sb/n +\DeclareFontShape{OT1}{Junicode-Inf}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{sb}{sl}{ - <-> ssub * Junicode-Inf/sb/it +\DeclareFontShape{OT1}{Junicode-Inf}{lightsemicondensed}{it}{ + <-> alias * Junicode-Inf/lsc/it }{} -\DeclareFontShape{OT1}{Junicode-Inf}{semibold}{sl}{ - <-> ssub * Junicode-Inf/semibold/it +\DeclareFontShape{OT1}{Junicode-Inf}{lsc}{sl}{ + <-> ssub * Junicode-Inf/lsc/it }{} - -% ---- sc = semicondensed ---- - -\DeclareFontShape{OT1}{Junicode-Inf}{sc}{n}{ - <-> \Junicode@@scale Junicode-SmCond-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{lightsemicondensed}{sl}{ + <-> ssub * Junicode-Inf/lightsemicondensed/it }{} -\DeclareFontShape{OT1}{Junicode-Inf}{semicondensed}{n}{ - <-> alias * Junicode-Inf/sc/n -}{} -\DeclareFontShape{OT1}{Junicode-Inf}{sc}{it}{ - <-> \Junicode@@scale Junicode-SmCondItalic-inf-ot1 -}{} +% ---- mediumexpanded ---- -\DeclareFontShape{OT1}{Junicode-Inf}{semicondensed}{it}{ - <-> alias * Junicode-Inf/sc/it +\DeclareFontShape{OT1}{Junicode-Inf}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{sc}{sl}{ - <-> ssub * Junicode-Inf/sc/it +\DeclareFontShape{OT1}{Junicode-Inf}{mediumexpanded}{n}{ + <-> \Junicode@@scale Junicode-ExpMedium-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{semicondensed}{sl}{ - <-> ssub * Junicode-Inf/semicondensed/it +\DeclareFontShape{OT1}{Junicode-Inf}{mediumexpanded}{sl}{ + <-> ssub * Junicode-Inf/mediumexpanded/it }{} -% ---- bsx = boldsemiexpanded ---- +% ---- b = bold ---- -\DeclareFontShape{OT1}{Junicode-Inf}{bsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpBold-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{b}{it}{ + <-> \Junicode@@scale Junicode-BoldItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{boldsemiexpanded}{n}{ - <-> alias * Junicode-Inf/bsx/n +\DeclareFontShape{OT1}{Junicode-Inf}{bold}{it}{ + <-> alias * Junicode-Inf/b/it }{} -\DeclareFontShape{OT1}{Junicode-Inf}{bsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{b}{n}{ + <-> \Junicode@@scale Junicode-Bold-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{boldsemiexpanded}{it}{ - <-> alias * Junicode-Inf/bsx/it +\DeclareFontShape{OT1}{Junicode-Inf}{bold}{n}{ + <-> alias * Junicode-Inf/b/n }{} -\DeclareFontShape{OT1}{Junicode-Inf}{bsx}{sl}{ - <-> ssub * Junicode-Inf/bsx/it +\DeclareFontShape{OT1}{Junicode-Inf}{b}{sl}{ + <-> ssub * Junicode-Inf/b/it }{} -\DeclareFontShape{OT1}{Junicode-Inf}{boldsemiexpanded}{sl}{ - <-> ssub * Junicode-Inf/boldsemiexpanded/it +\DeclareFontShape{OT1}{Junicode-Inf}{bold}{sl}{ + <-> ssub * Junicode-Inf/bold/it }{} -% ---- lc = lightcondensed ---- +% ---- x = expanded ---- -\DeclareFontShape{OT1}{Junicode-Inf}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{x}{it}{ + <-> \Junicode@@scale Junicode-ExpItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{lightcondensed}{it}{ - <-> alias * Junicode-Inf/lc/it +\DeclareFontShape{OT1}{Junicode-Inf}{expanded}{it}{ + <-> alias * Junicode-Inf/x/it }{} -\DeclareFontShape{OT1}{Junicode-Inf}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{x}{n}{ + <-> \Junicode@@scale Junicode-Exp-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{lightcondensed}{n}{ - <-> alias * Junicode-Inf/lc/n +\DeclareFontShape{OT1}{Junicode-Inf}{expanded}{n}{ + <-> alias * Junicode-Inf/x/n }{} -\DeclareFontShape{OT1}{Junicode-Inf}{lc}{sl}{ - <-> ssub * Junicode-Inf/lc/it +\DeclareFontShape{OT1}{Junicode-Inf}{x}{sl}{ + <-> ssub * Junicode-Inf/x/it }{} -\DeclareFontShape{OT1}{Junicode-Inf}{lightcondensed}{sl}{ - <-> ssub * Junicode-Inf/lightcondensed/it +\DeclareFontShape{OT1}{Junicode-Inf}{expanded}{sl}{ + <-> ssub * Junicode-Inf/expanded/it }{} @@ -155,156 +143,168 @@ }{} -% ---- mediumsemicondensed ---- +% ---- c = condensed ---- -\DeclareFontShape{OT1}{Junicode-Inf}{mediumsemicondensed}{n}{ - <-> \Junicode@@scale Junicode-SmCondMedium-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{mediumsemicondensed}{it}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{condensed}{it}{ + <-> alias * Junicode-Inf/c/it }{} -\DeclareFontShape{OT1}{Junicode-Inf}{mediumsemicondensed}{sl}{ - <-> ssub * Junicode-Inf/mediumsemicondensed/it +\DeclareFontShape{OT1}{Junicode-Inf}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-inf-ot1 }{} - -% ---- mediumcondensed ---- - -\DeclareFontShape{OT1}{Junicode-Inf}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{condensed}{n}{ + <-> alias * Junicode-Inf/c/n }{} -\DeclareFontShape{OT1}{Junicode-Inf}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{c}{sl}{ + <-> ssub * Junicode-Inf/c/it }{} -\DeclareFontShape{OT1}{Junicode-Inf}{mediumcondensed}{sl}{ - <-> ssub * Junicode-Inf/mediumcondensed/it +\DeclareFontShape{OT1}{Junicode-Inf}{condensed}{sl}{ + <-> ssub * Junicode-Inf/condensed/it }{} -% ---- b = bold ---- +% ---- sc = semicondensed ---- -\DeclareFontShape{OT1}{Junicode-Inf}{b}{it}{ - <-> \Junicode@@scale Junicode-BoldItalic-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{sc}{it}{ + <-> \Junicode@@scale Junicode-SmCondItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{bold}{it}{ - <-> alias * Junicode-Inf/b/it +\DeclareFontShape{OT1}{Junicode-Inf}{semicondensed}{it}{ + <-> alias * Junicode-Inf/sc/it }{} -\DeclareFontShape{OT1}{Junicode-Inf}{b}{n}{ - <-> \Junicode@@scale Junicode-Bold-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{sc}{n}{ + <-> \Junicode@@scale Junicode-SmCond-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{bold}{n}{ - <-> alias * Junicode-Inf/b/n +\DeclareFontShape{OT1}{Junicode-Inf}{semicondensed}{n}{ + <-> alias * Junicode-Inf/sc/n }{} -\DeclareFontShape{OT1}{Junicode-Inf}{b}{sl}{ - <-> ssub * Junicode-Inf/b/it +\DeclareFontShape{OT1}{Junicode-Inf}{sc}{sl}{ + <-> ssub * Junicode-Inf/sc/it }{} -\DeclareFontShape{OT1}{Junicode-Inf}{bold}{sl}{ - <-> ssub * Junicode-Inf/bold/it +\DeclareFontShape{OT1}{Junicode-Inf}{semicondensed}{sl}{ + <-> ssub * Junicode-Inf/semicondensed/it }{} -% ---- medium ---- +% ---- bsx = boldsemiexpanded ---- -\DeclareFontShape{OT1}{Junicode-Inf}{medium}{it}{ - <-> \Junicode@@scale Junicode-MediumItalic-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{bsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpBold-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{medium}{n}{ - <-> \Junicode@@scale Junicode-Medium-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{boldsemiexpanded}{n}{ + <-> alias * Junicode-Inf/bsx/n }{} -\DeclareFontShape{OT1}{Junicode-Inf}{medium}{sl}{ - <-> ssub * Junicode-Inf/medium/it +\DeclareFontShape{OT1}{Junicode-Inf}{bsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-inf-ot1 }{} +\DeclareFontShape{OT1}{Junicode-Inf}{boldsemiexpanded}{it}{ + <-> alias * Junicode-Inf/bsx/it +}{} -% ---- lsc = lightsemicondensed ---- +\DeclareFontShape{OT1}{Junicode-Inf}{bsx}{sl}{ + <-> ssub * Junicode-Inf/bsx/it +}{} -\DeclareFontShape{OT1}{Junicode-Inf}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{boldsemiexpanded}{sl}{ + <-> ssub * Junicode-Inf/boldsemiexpanded/it }{} -\DeclareFontShape{OT1}{Junicode-Inf}{lightsemicondensed}{it}{ - <-> alias * Junicode-Inf/lsc/it + +% ---- sbsx = semiboldsemiexpanded ---- + +\DeclareFontShape{OT1}{Junicode-Inf}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-Inf/sbsx/n }{} -\DeclareFontShape{OT1}{Junicode-Inf}{lightsemicondensed}{n}{ - <-> alias * Junicode-Inf/lsc/n +\DeclareFontShape{OT1}{Junicode-Inf}{sbsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{lsc}{sl}{ - <-> ssub * Junicode-Inf/lsc/it +\DeclareFontShape{OT1}{Junicode-Inf}{semiboldsemiexpanded}{it}{ + <-> alias * Junicode-Inf/sbsx/it }{} -\DeclareFontShape{OT1}{Junicode-Inf}{lightsemicondensed}{sl}{ - <-> ssub * Junicode-Inf/lightsemicondensed/it +\DeclareFontShape{OT1}{Junicode-Inf}{sbsx}{sl}{ + <-> ssub * Junicode-Inf/sbsx/it }{} +\DeclareFontShape{OT1}{Junicode-Inf}{semiboldsemiexpanded}{sl}{ + <-> ssub * Junicode-Inf/semiboldsemiexpanded/it +}{} -% ---- m = regular ---- -\DeclareFontShape{OT1}{Junicode-Inf}{m}{it}{ - <-> \Junicode@@scale Junicode-Italic-inf-ot1 -}{} +% ---- mediumcondensed ---- -\DeclareFontShape{OT1}{Junicode-Inf}{regular}{it}{ - <-> alias * Junicode-Inf/m/it +\DeclareFontShape{OT1}{Junicode-Inf}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{m}{n}{ - <-> \Junicode@@scale Junicode-Regular-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{regular}{n}{ - <-> alias * Junicode-Inf/m/n +\DeclareFontShape{OT1}{Junicode-Inf}{mediumcondensed}{sl}{ + <-> ssub * Junicode-Inf/mediumcondensed/it }{} -\DeclareFontShape{OT1}{Junicode-Inf}{m}{sl}{ - <-> ssub * Junicode-Inf/m/it -}{} -\DeclareFontShape{OT1}{Junicode-Inf}{regular}{sl}{ - <-> ssub * Junicode-Inf/regular/it +% ---- sb = semibold ---- + +\DeclareFontShape{OT1}{Junicode-Inf}{sb}{it}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-inf-ot1 }{} +\DeclareFontShape{OT1}{Junicode-Inf}{semibold}{it}{ + <-> alias * Junicode-Inf/sb/it +}{} -% ---- bx = boldexpanded ---- +\DeclareFontShape{OT1}{Junicode-Inf}{sb}{n}{ + <-> \Junicode@@scale Junicode-SmBold-inf-ot1 +}{} -\DeclareFontShape{OT1}{Junicode-Inf}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{semibold}{n}{ + <-> alias * Junicode-Inf/sb/n }{} -\DeclareFontShape{OT1}{Junicode-Inf}{boldexpanded}{it}{ - <-> alias * Junicode-Inf/bx/it +\DeclareFontShape{OT1}{Junicode-Inf}{sb}{sl}{ + <-> ssub * Junicode-Inf/sb/it }{} -\DeclareFontShape{OT1}{Junicode-Inf}{bx}{n}{ - <-> \Junicode@@scale Junicode-ExpBold-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{semibold}{sl}{ + <-> ssub * Junicode-Inf/semibold/it }{} -\DeclareFontShape{OT1}{Junicode-Inf}{boldexpanded}{n}{ - <-> alias * Junicode-Inf/bx/n + +% ---- mediumsemicondensed ---- + +\DeclareFontShape{OT1}{Junicode-Inf}{mediumsemicondensed}{n}{ + <-> \Junicode@@scale Junicode-SmCondMedium-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{bx}{sl}{ - <-> ssub * Junicode-Inf/bx/it +\DeclareFontShape{OT1}{Junicode-Inf}{mediumsemicondensed}{it}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{boldexpanded}{sl}{ - <-> ssub * Junicode-Inf/boldexpanded/it +\DeclareFontShape{OT1}{Junicode-Inf}{mediumsemicondensed}{sl}{ + <-> ssub * Junicode-Inf/mediumsemicondensed/it }{} @@ -335,141 +335,141 @@ }{} -% ---- mediumsemiexpanded ---- +% ---- sx = semiexpanded ---- -\DeclareFontShape{OT1}{Junicode-Inf}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{semiexpanded}{n}{ + <-> alias * Junicode-Inf/sx/n }{} -\DeclareFontShape{OT1}{Junicode-Inf}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-Inf/mediumsemiexpanded/it +\DeclareFontShape{OT1}{Junicode-Inf}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-inf-ot1 }{} - -% ---- mediumexpanded ---- - -\DeclareFontShape{OT1}{Junicode-Inf}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{semiexpanded}{it}{ + <-> alias * Junicode-Inf/sx/it }{} -\DeclareFontShape{OT1}{Junicode-Inf}{mediumexpanded}{n}{ - <-> \Junicode@@scale Junicode-ExpMedium-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{sx}{sl}{ + <-> ssub * Junicode-Inf/sx/it }{} -\DeclareFontShape{OT1}{Junicode-Inf}{mediumexpanded}{sl}{ - <-> ssub * Junicode-Inf/mediumexpanded/it +\DeclareFontShape{OT1}{Junicode-Inf}{semiexpanded}{sl}{ + <-> ssub * Junicode-Inf/semiexpanded/it }{} -% ---- sbsx = semiboldsemiexpanded ---- +% ---- medium ---- -\DeclareFontShape{OT1}{Junicode-Inf}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{medium}{n}{ + <-> \Junicode@@scale Junicode-Medium-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-Inf/sbsx/n +\DeclareFontShape{OT1}{Junicode-Inf}{medium}{it}{ + <-> \Junicode@@scale Junicode-MediumItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{sbsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{medium}{sl}{ + <-> ssub * Junicode-Inf/medium/it }{} -\DeclareFontShape{OT1}{Junicode-Inf}{semiboldsemiexpanded}{it}{ - <-> alias * Junicode-Inf/sbsx/it -}{} -\DeclareFontShape{OT1}{Junicode-Inf}{sbsx}{sl}{ - <-> ssub * Junicode-Inf/sbsx/it -}{} +% ---- bx = boldexpanded ---- -\DeclareFontShape{OT1}{Junicode-Inf}{semiboldsemiexpanded}{sl}{ - <-> ssub * Junicode-Inf/semiboldsemiexpanded/it +\DeclareFontShape{OT1}{Junicode-Inf}{bx}{n}{ + <-> \Junicode@@scale Junicode-ExpBold-inf-ot1 }{} +\DeclareFontShape{OT1}{Junicode-Inf}{boldexpanded}{n}{ + <-> alias * Junicode-Inf/bx/n +}{} -% ---- c = condensed ---- +\DeclareFontShape{OT1}{Junicode-Inf}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-inf-ot1 +}{} -\DeclareFontShape{OT1}{Junicode-Inf}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{boldexpanded}{it}{ + <-> alias * Junicode-Inf/bx/it }{} -\DeclareFontShape{OT1}{Junicode-Inf}{condensed}{n}{ - <-> alias * Junicode-Inf/c/n +\DeclareFontShape{OT1}{Junicode-Inf}{bx}{sl}{ + <-> ssub * Junicode-Inf/bx/it }{} -\DeclareFontShape{OT1}{Junicode-Inf}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{boldexpanded}{sl}{ + <-> ssub * Junicode-Inf/boldexpanded/it }{} -\DeclareFontShape{OT1}{Junicode-Inf}{condensed}{it}{ - <-> alias * Junicode-Inf/c/it + +% ---- mediumsemiexpanded ---- + +\DeclareFontShape{OT1}{Junicode-Inf}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{c}{sl}{ - <-> ssub * Junicode-Inf/c/it +\DeclareFontShape{OT1}{Junicode-Inf}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{condensed}{sl}{ - <-> ssub * Junicode-Inf/condensed/it +\DeclareFontShape{OT1}{Junicode-Inf}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-Inf/mediumsemiexpanded/it }{} -% ---- x = expanded ---- +% ---- m = regular ---- -\DeclareFontShape{OT1}{Junicode-Inf}{x}{n}{ - <-> \Junicode@@scale Junicode-Exp-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{m}{it}{ + <-> \Junicode@@scale Junicode-Italic-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{expanded}{n}{ - <-> alias * Junicode-Inf/x/n +\DeclareFontShape{OT1}{Junicode-Inf}{regular}{it}{ + <-> alias * Junicode-Inf/m/it }{} -\DeclareFontShape{OT1}{Junicode-Inf}{x}{it}{ - <-> \Junicode@@scale Junicode-ExpItalic-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{m}{n}{ + <-> \Junicode@@scale Junicode-Regular-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{expanded}{it}{ - <-> alias * Junicode-Inf/x/it +\DeclareFontShape{OT1}{Junicode-Inf}{regular}{n}{ + <-> alias * Junicode-Inf/m/n }{} -\DeclareFontShape{OT1}{Junicode-Inf}{x}{sl}{ - <-> ssub * Junicode-Inf/x/it +\DeclareFontShape{OT1}{Junicode-Inf}{m}{sl}{ + <-> ssub * Junicode-Inf/m/it }{} -\DeclareFontShape{OT1}{Junicode-Inf}{expanded}{sl}{ - <-> ssub * Junicode-Inf/expanded/it +\DeclareFontShape{OT1}{Junicode-Inf}{regular}{sl}{ + <-> ssub * Junicode-Inf/regular/it }{} -% ---- sx = semiexpanded ---- +% ---- lc = lightcondensed ---- -\DeclareFontShape{OT1}{Junicode-Inf}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{semiexpanded}{n}{ - <-> alias * Junicode-Inf/sx/n +\DeclareFontShape{OT1}{Junicode-Inf}{lightcondensed}{n}{ + <-> alias * Junicode-Inf/lc/n }{} -\DeclareFontShape{OT1}{Junicode-Inf}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-inf-ot1 +\DeclareFontShape{OT1}{Junicode-Inf}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-inf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Inf}{semiexpanded}{it}{ - <-> alias * Junicode-Inf/sx/it +\DeclareFontShape{OT1}{Junicode-Inf}{lightcondensed}{it}{ + <-> alias * Junicode-Inf/lc/it }{} -\DeclareFontShape{OT1}{Junicode-Inf}{sx}{sl}{ - <-> ssub * Junicode-Inf/sx/it +\DeclareFontShape{OT1}{Junicode-Inf}{lc}{sl}{ + <-> ssub * Junicode-Inf/lc/it }{} -\DeclareFontShape{OT1}{Junicode-Inf}{semiexpanded}{sl}{ - <-> ssub * Junicode-Inf/semiexpanded/it +\DeclareFontShape{OT1}{Junicode-Inf}{lightcondensed}{sl}{ + <-> ssub * Junicode-Inf/lightcondensed/it }{} diff --git a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-LF.fd b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-LF.fd index a04c33f8827..28dd9eb8717 100644 --- a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-LF.fd +++ b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{OT1Junicode-LF.fd} - [2024/06/03 (autoinst) Font definitions for OT1/Junicode-LF.] + [2024/07/21 (autoinst) Font definitions for OT1/Junicode-LF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,207 +20,210 @@ \DeclareFontFamily{OT1}{Junicode-LF}{} -% ---- l = light ---- +% ---- mediumsemicondensed ---- -\DeclareFontShape{OT1}{Junicode-LF}{l}{scit}{ - <-> \Junicode@@scale Junicode-LightItalic-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{mediumsemicondensed}{n}{ + <-> \Junicode@@scale Junicode-SmCondMedium-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{light}{scit}{ - <-> alias * Junicode-LF/l/scit +\DeclareFontShape{OT1}{Junicode-LF}{mediumsemicondensed}{scit}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{l}{it}{ - <-> \Junicode@@scale Junicode-LightItalic-lf-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{mediumsemicondensed}{it}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{light}{it}{ - <-> alias * Junicode-LF/l/it +\DeclareFontShape{OT1}{Junicode-LF}{mediumsemicondensed}{sc}{ + <-> \Junicode@@scale Junicode-SmCondMedium-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{l}{sc}{ - <-> \Junicode@@scale Junicode-Light-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{mediumsemicondensed}{sl}{ + <-> ssub * Junicode-LF/mediumsemicondensed/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{light}{sc}{ - <-> alias * Junicode-LF/l/sc +\DeclareFontShape{OT1}{Junicode-LF}{mediumsemicondensed}{scsl}{ + <-> ssub * Junicode-LF/mediumsemicondensed/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{l}{n}{ - <-> \Junicode@@scale Junicode-Light-lf-ot1 -}{} -\DeclareFontShape{OT1}{Junicode-LF}{light}{n}{ - <-> alias * Junicode-LF/l/n -}{} +% ---- sx = semiexpanded ---- -\DeclareFontShape{OT1}{Junicode-LF}{l}{scsl}{ - <-> ssub * Junicode-LF/l/scit +\DeclareFontShape{OT1}{Junicode-LF}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{light}{scsl}{ - <-> ssub * Junicode-LF/light/scit +\DeclareFontShape{OT1}{Junicode-LF}{semiexpanded}{n}{ + <-> alias * Junicode-LF/sx/n }{} -\DeclareFontShape{OT1}{Junicode-LF}{l}{sl}{ - <-> ssub * Junicode-LF/l/it +\DeclareFontShape{OT1}{Junicode-LF}{sx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{light}{sl}{ - <-> ssub * Junicode-LF/light/it +\DeclareFontShape{OT1}{Junicode-LF}{semiexpanded}{scit}{ + <-> alias * Junicode-LF/sx/scit }{} - -% ---- bx = boldexpanded ---- - -\DeclareFontShape{OT1}{Junicode-LF}{bx}{n}{ - <-> \Junicode@@scale Junicode-ExpBold-lf-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{boldexpanded}{n}{ - <-> alias * Junicode-LF/bx/n +\DeclareFontShape{OT1}{Junicode-LF}{semiexpanded}{it}{ + <-> alias * Junicode-LF/sx/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{bx}{sc}{ - <-> \Junicode@@scale Junicode-ExpBold-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{sx}{sc}{ + <-> \Junicode@@scale Junicode-SmExp-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{boldexpanded}{sc}{ - <-> alias * Junicode-LF/bx/sc +\DeclareFontShape{OT1}{Junicode-LF}{semiexpanded}{sc}{ + <-> alias * Junicode-LF/sx/sc }{} -\DeclareFontShape{OT1}{Junicode-LF}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{sx}{sl}{ + <-> ssub * Junicode-LF/sx/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{boldexpanded}{it}{ - <-> alias * Junicode-LF/bx/it +\DeclareFontShape{OT1}{Junicode-LF}{semiexpanded}{sl}{ + <-> ssub * Junicode-LF/semiexpanded/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{bx}{scit}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{sx}{scsl}{ + <-> ssub * Junicode-LF/sx/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{boldexpanded}{scit}{ - <-> alias * Junicode-LF/bx/scit +\DeclareFontShape{OT1}{Junicode-LF}{semiexpanded}{scsl}{ + <-> ssub * Junicode-LF/semiexpanded/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{bx}{scsl}{ - <-> ssub * Junicode-LF/bx/scit + +% ---- l = light ---- + +\DeclareFontShape{OT1}{Junicode-LF}{l}{sc}{ + <-> \Junicode@@scale Junicode-Light-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{boldexpanded}{scsl}{ - <-> ssub * Junicode-LF/boldexpanded/scit +\DeclareFontShape{OT1}{Junicode-LF}{light}{sc}{ + <-> alias * Junicode-LF/l/sc }{} -\DeclareFontShape{OT1}{Junicode-LF}{bx}{sl}{ - <-> ssub * Junicode-LF/bx/it +\DeclareFontShape{OT1}{Junicode-LF}{l}{scit}{ + <-> \Junicode@@scale Junicode-LightItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{boldexpanded}{sl}{ - <-> ssub * Junicode-LF/boldexpanded/it +\DeclareFontShape{OT1}{Junicode-LF}{light}{scit}{ + <-> alias * Junicode-LF/l/scit }{} +\DeclareFontShape{OT1}{Junicode-LF}{l}{n}{ + <-> \Junicode@@scale Junicode-Light-lf-ot1 +}{} -% ---- m = regular ---- +\DeclareFontShape{OT1}{Junicode-LF}{light}{n}{ + <-> alias * Junicode-LF/l/n +}{} -\DeclareFontShape{OT1}{Junicode-LF}{m}{scit}{ - <-> \Junicode@@scale Junicode-Italic-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{l}{it}{ + <-> \Junicode@@scale Junicode-LightItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{regular}{scit}{ - <-> alias * Junicode-LF/m/scit +\DeclareFontShape{OT1}{Junicode-LF}{light}{it}{ + <-> alias * Junicode-LF/l/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{m}{it}{ - <-> \Junicode@@scale Junicode-Italic-lf-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{l}{sl}{ + <-> ssub * Junicode-LF/l/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{regular}{it}{ - <-> alias * Junicode-LF/m/it +\DeclareFontShape{OT1}{Junicode-LF}{light}{sl}{ + <-> ssub * Junicode-LF/light/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{m}{sc}{ - <-> \Junicode@@scale Junicode-Regular-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{l}{scsl}{ + <-> ssub * Junicode-LF/l/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{regular}{sc}{ - <-> alias * Junicode-LF/m/sc +\DeclareFontShape{OT1}{Junicode-LF}{light}{scsl}{ + <-> ssub * Junicode-LF/light/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{m}{n}{ - <-> \Junicode@@scale Junicode-Regular-lf-ot1 + +% ---- mediumsemiexpanded ---- + +\DeclareFontShape{OT1}{Junicode-LF}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{regular}{n}{ - <-> alias * Junicode-LF/m/n +\DeclareFontShape{OT1}{Junicode-LF}{mediumsemiexpanded}{scit}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{m}{scsl}{ - <-> ssub * Junicode-LF/m/scit +\DeclareFontShape{OT1}{Junicode-LF}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{regular}{scsl}{ - <-> ssub * Junicode-LF/regular/scit +\DeclareFontShape{OT1}{Junicode-LF}{mediumsemiexpanded}{sc}{ + <-> \Junicode@@scale Junicode-SmExpMedium-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{m}{sl}{ - <-> ssub * Junicode-LF/m/it +\DeclareFontShape{OT1}{Junicode-LF}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-LF/mediumsemiexpanded/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{regular}{sl}{ - <-> ssub * Junicode-LF/regular/it +\DeclareFontShape{OT1}{Junicode-LF}{mediumsemiexpanded}{scsl}{ + <-> ssub * Junicode-LF/mediumsemiexpanded/scit }{} -% ---- lsc = lightsemicondensed ---- +% ---- m = regular ---- -\DeclareFontShape{OT1}{Junicode-LF}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-lf-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{m}{n}{ + <-> \Junicode@@scale Junicode-Regular-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{lightsemicondensed}{n}{ - <-> alias * Junicode-LF/lsc/n +\DeclareFontShape{OT1}{Junicode-LF}{regular}{n}{ + <-> alias * Junicode-LF/m/n }{} -\DeclareFontShape{OT1}{Junicode-LF}{lsc}{sc}{ - <-> \Junicode@@scale Junicode-SmCondLight-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{m}{scit}{ + <-> \Junicode@@scale Junicode-Italic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{lightsemicondensed}{sc}{ - <-> alias * Junicode-LF/lsc/sc +\DeclareFontShape{OT1}{Junicode-LF}{regular}{scit}{ + <-> alias * Junicode-LF/m/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{m}{it}{ + <-> \Junicode@@scale Junicode-Italic-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{lightsemicondensed}{it}{ - <-> alias * Junicode-LF/lsc/it +\DeclareFontShape{OT1}{Junicode-LF}{regular}{it}{ + <-> alias * Junicode-LF/m/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{lsc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{m}{sc}{ + <-> \Junicode@@scale Junicode-Regular-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{lightsemicondensed}{scit}{ - <-> alias * Junicode-LF/lsc/scit +\DeclareFontShape{OT1}{Junicode-LF}{regular}{sc}{ + <-> alias * Junicode-LF/m/sc }{} -\DeclareFontShape{OT1}{Junicode-LF}{lsc}{scsl}{ - <-> ssub * Junicode-LF/lsc/scit +\DeclareFontShape{OT1}{Junicode-LF}{m}{sl}{ + <-> ssub * Junicode-LF/m/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{lightsemicondensed}{scsl}{ - <-> ssub * Junicode-LF/lightsemicondensed/scit +\DeclareFontShape{OT1}{Junicode-LF}{regular}{sl}{ + <-> ssub * Junicode-LF/regular/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{lsc}{sl}{ - <-> ssub * Junicode-LF/lsc/it +\DeclareFontShape{OT1}{Junicode-LF}{m}{scsl}{ + <-> ssub * Junicode-LF/m/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{lightsemicondensed}{sl}{ - <-> ssub * Junicode-LF/lightsemicondensed/it +\DeclareFontShape{OT1}{Junicode-LF}{regular}{scsl}{ + <-> ssub * Junicode-LF/regular/scit }{} @@ -230,177 +233,177 @@ <-> \Junicode@@scale Junicode-MediumItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{medium}{scit}{ - <-> \Junicode@@scale Junicode-MediumItalic-lf-sc-ot1 -}{} - \DeclareFontShape{OT1}{Junicode-LF}{medium}{n}{ <-> \Junicode@@scale Junicode-Medium-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{medium}{sc}{ - <-> \Junicode@@scale Junicode-Medium-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{medium}{scit}{ + <-> \Junicode@@scale Junicode-MediumItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{medium}{scsl}{ - <-> ssub * Junicode-LF/medium/scit +\DeclareFontShape{OT1}{Junicode-LF}{medium}{sc}{ + <-> \Junicode@@scale Junicode-Medium-lf-sc-ot1 }{} \DeclareFontShape{OT1}{Junicode-LF}{medium}{sl}{ <-> ssub * Junicode-LF/medium/it }{} +\DeclareFontShape{OT1}{Junicode-LF}{medium}{scsl}{ + <-> ssub * Junicode-LF/medium/scit +}{} -% ---- sx = semiexpanded ---- -\DeclareFontShape{OT1}{Junicode-LF}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-lf-ot1 +% ---- bx = boldexpanded ---- + +\DeclareFontShape{OT1}{Junicode-LF}{bx}{sc}{ + <-> \Junicode@@scale Junicode-ExpBold-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{semiexpanded}{it}{ - <-> alias * Junicode-LF/sx/it +\DeclareFontShape{OT1}{Junicode-LF}{boldexpanded}{sc}{ + <-> alias * Junicode-LF/bx/sc }{} -\DeclareFontShape{OT1}{Junicode-LF}{sx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpItalic-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{bx}{n}{ + <-> \Junicode@@scale Junicode-ExpBold-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{semiexpanded}{scit}{ - <-> alias * Junicode-LF/sx/scit +\DeclareFontShape{OT1}{Junicode-LF}{boldexpanded}{n}{ + <-> alias * Junicode-LF/bx/n }{} -\DeclareFontShape{OT1}{Junicode-LF}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-lf-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{bx}{scit}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{semiexpanded}{n}{ - <-> alias * Junicode-LF/sx/n +\DeclareFontShape{OT1}{Junicode-LF}{boldexpanded}{scit}{ + <-> alias * Junicode-LF/bx/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{sx}{sc}{ - <-> \Junicode@@scale Junicode-SmExp-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{semiexpanded}{sc}{ - <-> alias * Junicode-LF/sx/sc +\DeclareFontShape{OT1}{Junicode-LF}{boldexpanded}{it}{ + <-> alias * Junicode-LF/bx/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{sx}{scsl}{ - <-> ssub * Junicode-LF/sx/scit +\DeclareFontShape{OT1}{Junicode-LF}{bx}{sl}{ + <-> ssub * Junicode-LF/bx/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{semiexpanded}{scsl}{ - <-> ssub * Junicode-LF/semiexpanded/scit +\DeclareFontShape{OT1}{Junicode-LF}{boldexpanded}{sl}{ + <-> ssub * Junicode-LF/boldexpanded/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{sx}{sl}{ - <-> ssub * Junicode-LF/sx/it +\DeclareFontShape{OT1}{Junicode-LF}{bx}{scsl}{ + <-> ssub * Junicode-LF/bx/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{semiexpanded}{sl}{ - <-> ssub * Junicode-LF/semiexpanded/it +\DeclareFontShape{OT1}{Junicode-LF}{boldexpanded}{scsl}{ + <-> ssub * Junicode-LF/boldexpanded/scit }{} -% ---- c = condensed ---- +% ---- lc = lightcondensed ---- -\DeclareFontShape{OT1}{Junicode-LF}{c}{sc}{ - <-> \Junicode@@scale Junicode-Cond-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{condensed}{sc}{ - <-> alias * Junicode-LF/c/sc +\DeclareFontShape{OT1}{Junicode-LF}{lightcondensed}{it}{ + <-> alias * Junicode-LF/lc/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-lf-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{lc}{scit}{ + <-> \Junicode@@scale Junicode-CondLightItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{condensed}{n}{ - <-> alias * Junicode-LF/c/n +\DeclareFontShape{OT1}{Junicode-LF}{lightcondensed}{scit}{ + <-> alias * Junicode-LF/lc/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{c}{scit}{ - <-> \Junicode@@scale Junicode-CondItalic-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{condensed}{scit}{ - <-> alias * Junicode-LF/c/scit +\DeclareFontShape{OT1}{Junicode-LF}{lightcondensed}{n}{ + <-> alias * Junicode-LF/lc/n }{} -\DeclareFontShape{OT1}{Junicode-LF}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-lf-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{lc}{sc}{ + <-> \Junicode@@scale Junicode-CondLight-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{condensed}{it}{ - <-> alias * Junicode-LF/c/it +\DeclareFontShape{OT1}{Junicode-LF}{lightcondensed}{sc}{ + <-> alias * Junicode-LF/lc/sc }{} -\DeclareFontShape{OT1}{Junicode-LF}{c}{scsl}{ - <-> ssub * Junicode-LF/c/scit +\DeclareFontShape{OT1}{Junicode-LF}{lc}{sl}{ + <-> ssub * Junicode-LF/lc/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{condensed}{scsl}{ - <-> ssub * Junicode-LF/condensed/scit +\DeclareFontShape{OT1}{Junicode-LF}{lightcondensed}{sl}{ + <-> ssub * Junicode-LF/lightcondensed/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{c}{sl}{ - <-> ssub * Junicode-LF/c/it +\DeclareFontShape{OT1}{Junicode-LF}{lc}{scsl}{ + <-> ssub * Junicode-LF/lc/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{condensed}{sl}{ - <-> ssub * Junicode-LF/condensed/it +\DeclareFontShape{OT1}{Junicode-LF}{lightcondensed}{scsl}{ + <-> ssub * Junicode-LF/lightcondensed/scit }{} -% ---- x = expanded ---- +% ---- sc = semicondensed ---- -\DeclareFontShape{OT1}{Junicode-LF}{x}{sc}{ - <-> \Junicode@@scale Junicode-Exp-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{sc}{sc}{ + <-> \Junicode@@scale Junicode-SmCond-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{expanded}{sc}{ - <-> alias * Junicode-LF/x/sc +\DeclareFontShape{OT1}{Junicode-LF}{semicondensed}{sc}{ + <-> alias * Junicode-LF/sc/sc }{} -\DeclareFontShape{OT1}{Junicode-LF}{x}{n}{ - <-> \Junicode@@scale Junicode-Exp-lf-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{sc}{n}{ + <-> \Junicode@@scale Junicode-SmCond-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{expanded}{n}{ - <-> alias * Junicode-LF/x/n +\DeclareFontShape{OT1}{Junicode-LF}{semicondensed}{n}{ + <-> alias * Junicode-LF/sc/n }{} -\DeclareFontShape{OT1}{Junicode-LF}{x}{scit}{ - <-> \Junicode@@scale Junicode-ExpItalic-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{sc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{expanded}{scit}{ - <-> alias * Junicode-LF/x/scit +\DeclareFontShape{OT1}{Junicode-LF}{semicondensed}{scit}{ + <-> alias * Junicode-LF/sc/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{x}{it}{ - <-> \Junicode@@scale Junicode-ExpItalic-lf-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{sc}{it}{ + <-> \Junicode@@scale Junicode-SmCondItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{expanded}{it}{ - <-> alias * Junicode-LF/x/it +\DeclareFontShape{OT1}{Junicode-LF}{semicondensed}{it}{ + <-> alias * Junicode-LF/sc/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{x}{scsl}{ - <-> ssub * Junicode-LF/x/scit +\DeclareFontShape{OT1}{Junicode-LF}{sc}{sl}{ + <-> ssub * Junicode-LF/sc/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{expanded}{scsl}{ - <-> ssub * Junicode-LF/expanded/scit +\DeclareFontShape{OT1}{Junicode-LF}{semicondensed}{sl}{ + <-> ssub * Junicode-LF/semicondensed/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{x}{sl}{ - <-> ssub * Junicode-LF/x/it +\DeclareFontShape{OT1}{Junicode-LF}{sc}{scsl}{ + <-> ssub * Junicode-LF/sc/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{expanded}{sl}{ - <-> ssub * Junicode-LF/expanded/it +\DeclareFontShape{OT1}{Junicode-LF}{semicondensed}{scsl}{ + <-> ssub * Junicode-LF/semicondensed/scit }{} @@ -438,6 +441,14 @@ <-> alias * Junicode-LF/sbsx/it }{} +\DeclareFontShape{OT1}{Junicode-LF}{sbsx}{sl}{ + <-> ssub * Junicode-LF/sbsx/it +}{} + +\DeclareFontShape{OT1}{Junicode-LF}{semiboldsemiexpanded}{sl}{ + <-> ssub * Junicode-LF/semiboldsemiexpanded/it +}{} + \DeclareFontShape{OT1}{Junicode-LF}{sbsx}{scsl}{ <-> ssub * Junicode-LF/sbsx/scit }{} @@ -446,93 +457,133 @@ <-> ssub * Junicode-LF/semiboldsemiexpanded/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{sbsx}{sl}{ - <-> ssub * Junicode-LF/sbsx/it + +% ---- bsx = boldsemiexpanded ---- + +\DeclareFontShape{OT1}{Junicode-LF}{bsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpBold-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{semiboldsemiexpanded}{sl}{ - <-> ssub * Junicode-LF/semiboldsemiexpanded/it +\DeclareFontShape{OT1}{Junicode-LF}{boldsemiexpanded}{sc}{ + <-> alias * Junicode-LF/bsx/sc }{} +\DeclareFontShape{OT1}{Junicode-LF}{bsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-ot1 +}{} -% ---- mediumexpanded ---- +\DeclareFontShape{OT1}{Junicode-LF}{boldsemiexpanded}{it}{ + <-> alias * Junicode-LF/bsx/it +}{} -\DeclareFontShape{OT1}{Junicode-LF}{mediumexpanded}{sc}{ - <-> \Junicode@@scale Junicode-ExpMedium-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{bsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpBold-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{mediumexpanded}{n}{ - <-> \Junicode@@scale Junicode-ExpMedium-lf-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{boldsemiexpanded}{n}{ + <-> alias * Junicode-LF/bsx/n }{} -\DeclareFontShape{OT1}{Junicode-LF}{mediumexpanded}{scit}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{bsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{boldsemiexpanded}{scit}{ + <-> alias * Junicode-LF/bsx/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{mediumexpanded}{scsl}{ - <-> ssub * Junicode-LF/mediumexpanded/scit +\DeclareFontShape{OT1}{Junicode-LF}{bsx}{sl}{ + <-> ssub * Junicode-LF/bsx/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{mediumexpanded}{sl}{ - <-> ssub * Junicode-LF/mediumexpanded/it +\DeclareFontShape{OT1}{Junicode-LF}{boldsemiexpanded}{sl}{ + <-> ssub * Junicode-LF/boldsemiexpanded/it }{} +\DeclareFontShape{OT1}{Junicode-LF}{bsx}{scsl}{ + <-> ssub * Junicode-LF/bsx/scit +}{} -% ---- mediumsemiexpanded ---- +\DeclareFontShape{OT1}{Junicode-LF}{boldsemiexpanded}{scsl}{ + <-> ssub * Junicode-LF/boldsemiexpanded/scit +}{} -\DeclareFontShape{OT1}{Junicode-LF}{mediumsemiexpanded}{scit}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-sc-ot1 + +% ---- sb = semibold ---- + +\DeclareFontShape{OT1}{Junicode-LF}{sb}{n}{ + <-> \Junicode@@scale Junicode-SmBold-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{semibold}{n}{ + <-> alias * Junicode-LF/sb/n }{} -\DeclareFontShape{OT1}{Junicode-LF}{mediumsemiexpanded}{sc}{ - <-> \Junicode@@scale Junicode-SmExpMedium-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{sb}{scit}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-lf-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{semibold}{scit}{ + <-> alias * Junicode-LF/sb/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{mediumsemiexpanded}{scsl}{ - <-> ssub * Junicode-LF/mediumsemiexpanded/scit +\DeclareFontShape{OT1}{Junicode-LF}{sb}{it}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-LF/mediumsemiexpanded/it +\DeclareFontShape{OT1}{Junicode-LF}{semibold}{it}{ + <-> alias * Junicode-LF/sb/it }{} +\DeclareFontShape{OT1}{Junicode-LF}{sb}{sc}{ + <-> \Junicode@@scale Junicode-SmBold-lf-sc-ot1 +}{} -% ---- mediumsemicondensed ---- +\DeclareFontShape{OT1}{Junicode-LF}{semibold}{sc}{ + <-> alias * Junicode-LF/sb/sc +}{} -\DeclareFontShape{OT1}{Junicode-LF}{mediumsemicondensed}{sc}{ - <-> \Junicode@@scale Junicode-SmCondMedium-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{sb}{sl}{ + <-> ssub * Junicode-LF/sb/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{mediumsemicondensed}{n}{ - <-> \Junicode@@scale Junicode-SmCondMedium-lf-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{semibold}{sl}{ + <-> ssub * Junicode-LF/semibold/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{mediumsemicondensed}{scit}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{sb}{scsl}{ + <-> ssub * Junicode-LF/sb/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{mediumsemicondensed}{it}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{semibold}{scsl}{ + <-> ssub * Junicode-LF/semibold/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{mediumsemicondensed}{scsl}{ - <-> ssub * Junicode-LF/mediumsemicondensed/scit + +% ---- mediumcondensed ---- + +\DeclareFontShape{OT1}{Junicode-LF}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{mediumsemicondensed}{sl}{ - <-> ssub * Junicode-LF/mediumsemicondensed/it +\DeclareFontShape{OT1}{Junicode-LF}{mediumcondensed}{scit}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-lf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Junicode-LF}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-lf-ot1 +}{} + +\DeclareFontShape{OT1}{Junicode-LF}{mediumcondensed}{sc}{ + <-> \Junicode@@scale Junicode-CondMedium-lf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Junicode-LF}{mediumcondensed}{sl}{ + <-> ssub * Junicode-LF/mediumcondensed/it +}{} + +\DeclareFontShape{OT1}{Junicode-LF}{mediumcondensed}{scsl}{ + <-> ssub * Junicode-LF/mediumcondensed/scit }{} @@ -546,14 +597,6 @@ <-> alias * Junicode-LF/sbx/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{sbx}{scit}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-sc-ot1 -}{} - -\DeclareFontShape{OT1}{Junicode-LF}{semiboldexpanded}{scit}{ - <-> alias * Junicode-LF/sbx/scit -}{} - \DeclareFontShape{OT1}{Junicode-LF}{sbx}{n}{ <-> \Junicode@@scale Junicode-ExpSmBold-lf-ot1 }{} @@ -562,20 +605,20 @@ <-> alias * Junicode-LF/sbx/n }{} -\DeclareFontShape{OT1}{Junicode-LF}{sbx}{sc}{ - <-> \Junicode@@scale Junicode-ExpSmBold-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{sbx}{scit}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{semiboldexpanded}{sc}{ - <-> alias * Junicode-LF/sbx/sc +\DeclareFontShape{OT1}{Junicode-LF}{semiboldexpanded}{scit}{ + <-> alias * Junicode-LF/sbx/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{sbx}{scsl}{ - <-> ssub * Junicode-LF/sbx/scit +\DeclareFontShape{OT1}{Junicode-LF}{sbx}{sc}{ + <-> \Junicode@@scale Junicode-ExpSmBold-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{semiboldexpanded}{scsl}{ - <-> ssub * Junicode-LF/semiboldexpanded/scit +\DeclareFontShape{OT1}{Junicode-LF}{semiboldexpanded}{sc}{ + <-> alias * Junicode-LF/sbx/sc }{} \DeclareFontShape{OT1}{Junicode-LF}{sbx}{sl}{ @@ -586,208 +629,192 @@ <-> ssub * Junicode-LF/semiboldexpanded/it }{} - -% ---- lc = lightcondensed ---- - -\DeclareFontShape{OT1}{Junicode-LF}{lc}{scit}{ - <-> \Junicode@@scale Junicode-CondLightItalic-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{sbx}{scsl}{ + <-> ssub * Junicode-LF/sbx/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{lightcondensed}{scit}{ - <-> alias * Junicode-LF/lc/scit +\DeclareFontShape{OT1}{Junicode-LF}{semiboldexpanded}{scsl}{ + <-> ssub * Junicode-LF/semiboldexpanded/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-lf-ot1 -}{} -\DeclareFontShape{OT1}{Junicode-LF}{lightcondensed}{it}{ - <-> alias * Junicode-LF/lc/it -}{} +% ---- c = condensed ---- -\DeclareFontShape{OT1}{Junicode-LF}{lc}{sc}{ - <-> \Junicode@@scale Junicode-CondLight-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{lightcondensed}{sc}{ - <-> alias * Junicode-LF/lc/sc +\DeclareFontShape{OT1}{Junicode-LF}{condensed}{it}{ + <-> alias * Junicode-LF/c/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-lf-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{lightcondensed}{n}{ - <-> alias * Junicode-LF/lc/n +\DeclareFontShape{OT1}{Junicode-LF}{condensed}{n}{ + <-> alias * Junicode-LF/c/n }{} -\DeclareFontShape{OT1}{Junicode-LF}{lc}{scsl}{ - <-> ssub * Junicode-LF/lc/scit +\DeclareFontShape{OT1}{Junicode-LF}{c}{scit}{ + <-> \Junicode@@scale Junicode-CondItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{lightcondensed}{scsl}{ - <-> ssub * Junicode-LF/lightcondensed/scit +\DeclareFontShape{OT1}{Junicode-LF}{condensed}{scit}{ + <-> alias * Junicode-LF/c/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{lc}{sl}{ - <-> ssub * Junicode-LF/lc/it +\DeclareFontShape{OT1}{Junicode-LF}{c}{sc}{ + <-> \Junicode@@scale Junicode-Cond-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{lightcondensed}{sl}{ - <-> ssub * Junicode-LF/lightcondensed/it +\DeclareFontShape{OT1}{Junicode-LF}{condensed}{sc}{ + <-> alias * Junicode-LF/c/sc }{} - -% ---- bsx = boldsemiexpanded ---- - -\DeclareFontShape{OT1}{Junicode-LF}{bsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{c}{sl}{ + <-> ssub * Junicode-LF/c/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{boldsemiexpanded}{it}{ - <-> alias * Junicode-LF/bsx/it +\DeclareFontShape{OT1}{Junicode-LF}{condensed}{sl}{ + <-> ssub * Junicode-LF/condensed/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{bsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{c}{scsl}{ + <-> ssub * Junicode-LF/c/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{boldsemiexpanded}{scit}{ - <-> alias * Junicode-LF/bsx/scit +\DeclareFontShape{OT1}{Junicode-LF}{condensed}{scsl}{ + <-> ssub * Junicode-LF/condensed/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{bsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpBold-lf-ot1 -}{} -\DeclareFontShape{OT1}{Junicode-LF}{boldsemiexpanded}{n}{ - <-> alias * Junicode-LF/bsx/n -}{} +% ---- lsc = lightsemicondensed ---- -\DeclareFontShape{OT1}{Junicode-LF}{bsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpBold-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{lsc}{sc}{ + <-> \Junicode@@scale Junicode-SmCondLight-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{boldsemiexpanded}{sc}{ - <-> alias * Junicode-LF/bsx/sc +\DeclareFontShape{OT1}{Junicode-LF}{lightsemicondensed}{sc}{ + <-> alias * Junicode-LF/lsc/sc }{} -\DeclareFontShape{OT1}{Junicode-LF}{bsx}{scsl}{ - <-> ssub * Junicode-LF/bsx/scit +\DeclareFontShape{OT1}{Junicode-LF}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{boldsemiexpanded}{scsl}{ - <-> ssub * Junicode-LF/boldsemiexpanded/scit +\DeclareFontShape{OT1}{Junicode-LF}{lightsemicondensed}{it}{ + <-> alias * Junicode-LF/lsc/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{bsx}{sl}{ - <-> ssub * Junicode-LF/bsx/it +\DeclareFontShape{OT1}{Junicode-LF}{lsc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{boldsemiexpanded}{sl}{ - <-> ssub * Junicode-LF/boldsemiexpanded/it +\DeclareFontShape{OT1}{Junicode-LF}{lightsemicondensed}{scit}{ + <-> alias * Junicode-LF/lsc/scit }{} - -% ---- sc = semicondensed ---- - -\DeclareFontShape{OT1}{Junicode-LF}{sc}{it}{ - <-> \Junicode@@scale Junicode-SmCondItalic-lf-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{semicondensed}{it}{ - <-> alias * Junicode-LF/sc/it +\DeclareFontShape{OT1}{Junicode-LF}{lightsemicondensed}{n}{ + <-> alias * Junicode-LF/lsc/n }{} -\DeclareFontShape{OT1}{Junicode-LF}{sc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondItalic-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{lsc}{sl}{ + <-> ssub * Junicode-LF/lsc/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{semicondensed}{scit}{ - <-> alias * Junicode-LF/sc/scit +\DeclareFontShape{OT1}{Junicode-LF}{lightsemicondensed}{sl}{ + <-> ssub * Junicode-LF/lightsemicondensed/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{sc}{n}{ - <-> \Junicode@@scale Junicode-SmCond-lf-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{lsc}{scsl}{ + <-> ssub * Junicode-LF/lsc/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{semicondensed}{n}{ - <-> alias * Junicode-LF/sc/n +\DeclareFontShape{OT1}{Junicode-LF}{lightsemicondensed}{scsl}{ + <-> ssub * Junicode-LF/lightsemicondensed/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{sc}{sc}{ - <-> \Junicode@@scale Junicode-SmCond-lf-sc-ot1 + +% ---- mediumexpanded ---- + +\DeclareFontShape{OT1}{Junicode-LF}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{semicondensed}{sc}{ - <-> alias * Junicode-LF/sc/sc +\DeclareFontShape{OT1}{Junicode-LF}{mediumexpanded}{n}{ + <-> \Junicode@@scale Junicode-ExpMedium-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{sc}{scsl}{ - <-> ssub * Junicode-LF/sc/scit +\DeclareFontShape{OT1}{Junicode-LF}{mediumexpanded}{scit}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{semicondensed}{scsl}{ - <-> ssub * Junicode-LF/semicondensed/scit +\DeclareFontShape{OT1}{Junicode-LF}{mediumexpanded}{sc}{ + <-> \Junicode@@scale Junicode-ExpMedium-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{sc}{sl}{ - <-> ssub * Junicode-LF/sc/it +\DeclareFontShape{OT1}{Junicode-LF}{mediumexpanded}{sl}{ + <-> ssub * Junicode-LF/mediumexpanded/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{semicondensed}{sl}{ - <-> ssub * Junicode-LF/semicondensed/it +\DeclareFontShape{OT1}{Junicode-LF}{mediumexpanded}{scsl}{ + <-> ssub * Junicode-LF/mediumexpanded/scit }{} -% ---- sb = semibold ---- +% ---- x = expanded ---- -\DeclareFontShape{OT1}{Junicode-LF}{sb}{it}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-lf-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{x}{scit}{ + <-> \Junicode@@scale Junicode-ExpItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{semibold}{it}{ - <-> alias * Junicode-LF/sb/it +\DeclareFontShape{OT1}{Junicode-LF}{expanded}{scit}{ + <-> alias * Junicode-LF/x/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{sb}{scit}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{x}{n}{ + <-> \Junicode@@scale Junicode-Exp-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{semibold}{scit}{ - <-> alias * Junicode-LF/sb/scit +\DeclareFontShape{OT1}{Junicode-LF}{expanded}{n}{ + <-> alias * Junicode-LF/x/n }{} -\DeclareFontShape{OT1}{Junicode-LF}{sb}{n}{ - <-> \Junicode@@scale Junicode-SmBold-lf-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{x}{it}{ + <-> \Junicode@@scale Junicode-ExpItalic-lf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{semibold}{n}{ - <-> alias * Junicode-LF/sb/n +\DeclareFontShape{OT1}{Junicode-LF}{expanded}{it}{ + <-> alias * Junicode-LF/x/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{sb}{sc}{ - <-> \Junicode@@scale Junicode-SmBold-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{x}{sc}{ + <-> \Junicode@@scale Junicode-Exp-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{semibold}{sc}{ - <-> alias * Junicode-LF/sb/sc +\DeclareFontShape{OT1}{Junicode-LF}{expanded}{sc}{ + <-> alias * Junicode-LF/x/sc }{} -\DeclareFontShape{OT1}{Junicode-LF}{sb}{scsl}{ - <-> ssub * Junicode-LF/sb/scit +\DeclareFontShape{OT1}{Junicode-LF}{x}{sl}{ + <-> ssub * Junicode-LF/x/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{semibold}{scsl}{ - <-> ssub * Junicode-LF/semibold/scit +\DeclareFontShape{OT1}{Junicode-LF}{expanded}{sl}{ + <-> ssub * Junicode-LF/expanded/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{sb}{sl}{ - <-> ssub * Junicode-LF/sb/it +\DeclareFontShape{OT1}{Junicode-LF}{x}{scsl}{ + <-> ssub * Junicode-LF/x/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{semibold}{sl}{ - <-> ssub * Junicode-LF/semibold/it +\DeclareFontShape{OT1}{Junicode-LF}{expanded}{scsl}{ + <-> ssub * Junicode-LF/expanded/scit }{} @@ -801,12 +828,12 @@ <-> alias * Junicode-LF/b/n }{} -\DeclareFontShape{OT1}{Junicode-LF}{b}{sc}{ - <-> \Junicode@@scale Junicode-Bold-lf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-LF}{b}{scit}{ + <-> \Junicode@@scale Junicode-BoldItalic-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{bold}{sc}{ - <-> alias * Junicode-LF/b/sc +\DeclareFontShape{OT1}{Junicode-LF}{bold}{scit}{ + <-> alias * Junicode-LF/b/scit }{} \DeclareFontShape{OT1}{Junicode-LF}{b}{it}{ @@ -817,20 +844,12 @@ <-> alias * Junicode-LF/b/it }{} -\DeclareFontShape{OT1}{Junicode-LF}{b}{scit}{ - <-> \Junicode@@scale Junicode-BoldItalic-lf-sc-ot1 -}{} - -\DeclareFontShape{OT1}{Junicode-LF}{bold}{scit}{ - <-> alias * Junicode-LF/b/scit -}{} - -\DeclareFontShape{OT1}{Junicode-LF}{b}{scsl}{ - <-> ssub * Junicode-LF/b/scit +\DeclareFontShape{OT1}{Junicode-LF}{b}{sc}{ + <-> \Junicode@@scale Junicode-Bold-lf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-LF}{bold}{scsl}{ - <-> ssub * Junicode-LF/bold/scit +\DeclareFontShape{OT1}{Junicode-LF}{bold}{sc}{ + <-> alias * Junicode-LF/b/sc }{} \DeclareFontShape{OT1}{Junicode-LF}{b}{sl}{ @@ -841,31 +860,12 @@ <-> ssub * Junicode-LF/bold/it }{} - -% ---- mediumcondensed ---- - -\DeclareFontShape{OT1}{Junicode-LF}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-lf-ot1 -}{} - -\DeclareFontShape{OT1}{Junicode-LF}{mediumcondensed}{scit}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-lf-sc-ot1 -}{} - -\DeclareFontShape{OT1}{Junicode-LF}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-lf-ot1 -}{} - -\DeclareFontShape{OT1}{Junicode-LF}{mediumcondensed}{sc}{ - <-> \Junicode@@scale Junicode-CondMedium-lf-sc-ot1 -}{} - -\DeclareFontShape{OT1}{Junicode-LF}{mediumcondensed}{scsl}{ - <-> ssub * Junicode-LF/mediumcondensed/scit +\DeclareFontShape{OT1}{Junicode-LF}{b}{scsl}{ + <-> ssub * Junicode-LF/b/scit }{} -\DeclareFontShape{OT1}{Junicode-LF}{mediumcondensed}{sl}{ - <-> ssub * Junicode-LF/mediumcondensed/it +\DeclareFontShape{OT1}{Junicode-LF}{bold}{scsl}{ + <-> ssub * Junicode-LF/bold/scit }{} diff --git a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-OsF.fd b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-OsF.fd index 3c8fa652ba3..7cefdb7a0e1 100644 --- a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-OsF.fd +++ b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{OT1Junicode-OsF.fd} - [2024/06/03 (autoinst) Font definitions for OT1/Junicode-OsF.] + [2024/07/21 (autoinst) Font definitions for OT1/Junicode-OsF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,435 +20,446 @@ \DeclareFontFamily{OT1}{Junicode-OsF}{} -% ---- mediumsemicondensed ---- +% ---- bsx = boldsemiexpanded ---- -\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemicondensed}{it}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{bsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpBold-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemicondensed}{scit}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{boldsemiexpanded}{sc}{ + <-> alias * Junicode-OsF/bsx/sc }{} -\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemicondensed}{n}{ - <-> \Junicode@@scale Junicode-SmCondMedium-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{bsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpBold-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemicondensed}{sc}{ - <-> \Junicode@@scale Junicode-SmCondMedium-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{boldsemiexpanded}{n}{ + <-> alias * Junicode-OsF/bsx/n }{} -\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemicondensed}{scsl}{ - <-> ssub * Junicode-OsF/mediumsemicondensed/scit +\DeclareFontShape{OT1}{Junicode-OsF}{bsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemicondensed}{sl}{ - <-> ssub * Junicode-OsF/mediumsemicondensed/it +\DeclareFontShape{OT1}{Junicode-OsF}{boldsemiexpanded}{scit}{ + <-> alias * Junicode-OsF/bsx/scit }{} - -% ---- sbx = semiboldexpanded ---- - -\DeclareFontShape{OT1}{Junicode-OsF}{sbx}{it}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{bsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semiboldexpanded}{it}{ - <-> alias * Junicode-OsF/sbx/it +\DeclareFontShape{OT1}{Junicode-OsF}{boldsemiexpanded}{it}{ + <-> alias * Junicode-OsF/bsx/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{sbx}{scit}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{bsx}{sl}{ + <-> ssub * Junicode-OsF/bsx/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semiboldexpanded}{scit}{ - <-> alias * Junicode-OsF/sbx/scit +\DeclareFontShape{OT1}{Junicode-OsF}{boldsemiexpanded}{sl}{ + <-> ssub * Junicode-OsF/boldsemiexpanded/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{bsx}{scsl}{ + <-> ssub * Junicode-OsF/bsx/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semiboldexpanded}{n}{ - <-> alias * Junicode-OsF/sbx/n +\DeclareFontShape{OT1}{Junicode-OsF}{boldsemiexpanded}{scsl}{ + <-> ssub * Junicode-OsF/boldsemiexpanded/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{sbx}{sc}{ - <-> \Junicode@@scale Junicode-ExpSmBold-osf-sc-ot1 -}{} -\DeclareFontShape{OT1}{Junicode-OsF}{semiboldexpanded}{sc}{ - <-> alias * Junicode-OsF/sbx/sc -}{} +% ---- sbsx = semiboldsemiexpanded ---- -\DeclareFontShape{OT1}{Junicode-OsF}{sbx}{scsl}{ - <-> ssub * Junicode-OsF/sbx/scit +\DeclareFontShape{OT1}{Junicode-OsF}{sbsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semiboldexpanded}{scsl}{ - <-> ssub * Junicode-OsF/semiboldexpanded/scit +\DeclareFontShape{OT1}{Junicode-OsF}{semiboldsemiexpanded}{sc}{ + <-> alias * Junicode-OsF/sbsx/sc }{} -\DeclareFontShape{OT1}{Junicode-OsF}{sbx}{sl}{ - <-> ssub * Junicode-OsF/sbx/it +\DeclareFontShape{OT1}{Junicode-OsF}{sbsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semiboldexpanded}{sl}{ - <-> ssub * Junicode-OsF/semiboldexpanded/it +\DeclareFontShape{OT1}{Junicode-OsF}{semiboldsemiexpanded}{it}{ + <-> alias * Junicode-OsF/sbsx/it }{} - -% ---- bsx = boldsemiexpanded ---- - -\DeclareFontShape{OT1}{Junicode-OsF}{bsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpBold-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{boldsemiexpanded}{n}{ - <-> alias * Junicode-OsF/bsx/n +\DeclareFontShape{OT1}{Junicode-OsF}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-OsF/sbsx/n }{} -\DeclareFontShape{OT1}{Junicode-OsF}{bsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpBold-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{sbsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{boldsemiexpanded}{sc}{ - <-> alias * Junicode-OsF/bsx/sc +\DeclareFontShape{OT1}{Junicode-OsF}{semiboldsemiexpanded}{scit}{ + <-> alias * Junicode-OsF/sbsx/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{bsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{sbsx}{sl}{ + <-> ssub * Junicode-OsF/sbsx/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{boldsemiexpanded}{it}{ - <-> alias * Junicode-OsF/bsx/it +\DeclareFontShape{OT1}{Junicode-OsF}{semiboldsemiexpanded}{sl}{ + <-> ssub * Junicode-OsF/semiboldsemiexpanded/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{bsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{sbsx}{scsl}{ + <-> ssub * Junicode-OsF/sbsx/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{boldsemiexpanded}{scit}{ - <-> alias * Junicode-OsF/bsx/scit +\DeclareFontShape{OT1}{Junicode-OsF}{semiboldsemiexpanded}{scsl}{ + <-> ssub * Junicode-OsF/semiboldsemiexpanded/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{bsx}{scsl}{ - <-> ssub * Junicode-OsF/bsx/scit + +% ---- sc = semicondensed ---- + +\DeclareFontShape{OT1}{Junicode-OsF}{sc}{sc}{ + <-> \Junicode@@scale Junicode-SmCond-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{boldsemiexpanded}{scsl}{ - <-> ssub * Junicode-OsF/boldsemiexpanded/scit +\DeclareFontShape{OT1}{Junicode-OsF}{semicondensed}{sc}{ + <-> alias * Junicode-OsF/sc/sc }{} -\DeclareFontShape{OT1}{Junicode-OsF}{bsx}{sl}{ - <-> ssub * Junicode-OsF/bsx/it +\DeclareFontShape{OT1}{Junicode-OsF}{sc}{it}{ + <-> \Junicode@@scale Junicode-SmCondItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{boldsemiexpanded}{sl}{ - <-> ssub * Junicode-OsF/boldsemiexpanded/it +\DeclareFontShape{OT1}{Junicode-OsF}{semicondensed}{it}{ + <-> alias * Junicode-OsF/sc/it }{} +\DeclareFontShape{OT1}{Junicode-OsF}{sc}{n}{ + <-> \Junicode@@scale Junicode-SmCond-osf-ot1 +}{} -% ---- lc = lightcondensed ---- +\DeclareFontShape{OT1}{Junicode-OsF}{semicondensed}{n}{ + <-> alias * Junicode-OsF/sc/n +}{} -\DeclareFontShape{OT1}{Junicode-OsF}{lc}{sc}{ - <-> \Junicode@@scale Junicode-CondLight-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{sc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{lightcondensed}{sc}{ - <-> alias * Junicode-OsF/lc/sc +\DeclareFontShape{OT1}{Junicode-OsF}{semicondensed}{scit}{ + <-> alias * Junicode-OsF/sc/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{sc}{sl}{ + <-> ssub * Junicode-OsF/sc/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{lightcondensed}{n}{ - <-> alias * Junicode-OsF/lc/n +\DeclareFontShape{OT1}{Junicode-OsF}{semicondensed}{sl}{ + <-> ssub * Junicode-OsF/semicondensed/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{lc}{scit}{ - <-> \Junicode@@scale Junicode-CondLightItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{sc}{scsl}{ + <-> ssub * Junicode-OsF/sc/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{lightcondensed}{scit}{ - <-> alias * Junicode-OsF/lc/scit +\DeclareFontShape{OT1}{Junicode-OsF}{semicondensed}{scsl}{ + <-> ssub * Junicode-OsF/semicondensed/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-osf-ot1 + +% ---- mediumcondensed ---- + +\DeclareFontShape{OT1}{Junicode-OsF}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{lightcondensed}{it}{ - <-> alias * Junicode-OsF/lc/it +\DeclareFontShape{OT1}{Junicode-OsF}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{lc}{scsl}{ - <-> ssub * Junicode-OsF/lc/scit +\DeclareFontShape{OT1}{Junicode-OsF}{mediumcondensed}{scit}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{lightcondensed}{scsl}{ - <-> ssub * Junicode-OsF/lightcondensed/scit +\DeclareFontShape{OT1}{Junicode-OsF}{mediumcondensed}{sc}{ + <-> \Junicode@@scale Junicode-CondMedium-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{lc}{sl}{ - <-> ssub * Junicode-OsF/lc/it +\DeclareFontShape{OT1}{Junicode-OsF}{mediumcondensed}{sl}{ + <-> ssub * Junicode-OsF/mediumcondensed/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{lightcondensed}{sl}{ - <-> ssub * Junicode-OsF/lightcondensed/it +\DeclareFontShape{OT1}{Junicode-OsF}{mediumcondensed}{scsl}{ + <-> ssub * Junicode-OsF/mediumcondensed/scit }{} -% ---- sc = semicondensed ---- +% ---- sb = semibold ---- -\DeclareFontShape{OT1}{Junicode-OsF}{sc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{sb}{sc}{ + <-> \Junicode@@scale Junicode-SmBold-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semicondensed}{scit}{ - <-> alias * Junicode-OsF/sc/scit +\DeclareFontShape{OT1}{Junicode-OsF}{semibold}{sc}{ + <-> alias * Junicode-OsF/sb/sc }{} -\DeclareFontShape{OT1}{Junicode-OsF}{sc}{it}{ - <-> \Junicode@@scale Junicode-SmCondItalic-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{sb}{n}{ + <-> \Junicode@@scale Junicode-SmBold-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semicondensed}{it}{ - <-> alias * Junicode-OsF/sc/it +\DeclareFontShape{OT1}{Junicode-OsF}{semibold}{n}{ + <-> alias * Junicode-OsF/sb/n }{} -\DeclareFontShape{OT1}{Junicode-OsF}{sc}{sc}{ - <-> \Junicode@@scale Junicode-SmCond-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{sb}{scit}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semicondensed}{sc}{ - <-> alias * Junicode-OsF/sc/sc +\DeclareFontShape{OT1}{Junicode-OsF}{semibold}{scit}{ + <-> alias * Junicode-OsF/sb/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{sc}{n}{ - <-> \Junicode@@scale Junicode-SmCond-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{sb}{it}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semicondensed}{n}{ - <-> alias * Junicode-OsF/sc/n +\DeclareFontShape{OT1}{Junicode-OsF}{semibold}{it}{ + <-> alias * Junicode-OsF/sb/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{sc}{scsl}{ - <-> ssub * Junicode-OsF/sc/scit +\DeclareFontShape{OT1}{Junicode-OsF}{sb}{sl}{ + <-> ssub * Junicode-OsF/sb/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semicondensed}{scsl}{ - <-> ssub * Junicode-OsF/semicondensed/scit +\DeclareFontShape{OT1}{Junicode-OsF}{semibold}{sl}{ + <-> ssub * Junicode-OsF/semibold/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{sc}{sl}{ - <-> ssub * Junicode-OsF/sc/it +\DeclareFontShape{OT1}{Junicode-OsF}{sb}{scsl}{ + <-> ssub * Junicode-OsF/sb/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semicondensed}{sl}{ - <-> ssub * Junicode-OsF/semicondensed/it +\DeclareFontShape{OT1}{Junicode-OsF}{semibold}{scsl}{ + <-> ssub * Junicode-OsF/semibold/scit }{} -% ---- sb = semibold ---- +% ---- l = light ---- -\DeclareFontShape{OT1}{Junicode-OsF}{sb}{scit}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{l}{it}{ + <-> \Junicode@@scale Junicode-LightItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semibold}{scit}{ - <-> alias * Junicode-OsF/sb/scit +\DeclareFontShape{OT1}{Junicode-OsF}{light}{it}{ + <-> alias * Junicode-OsF/l/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{sb}{it}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{l}{n}{ + <-> \Junicode@@scale Junicode-Light-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semibold}{it}{ - <-> alias * Junicode-OsF/sb/it +\DeclareFontShape{OT1}{Junicode-OsF}{light}{n}{ + <-> alias * Junicode-OsF/l/n }{} -\DeclareFontShape{OT1}{Junicode-OsF}{sb}{sc}{ - <-> \Junicode@@scale Junicode-SmBold-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{l}{scit}{ + <-> \Junicode@@scale Junicode-LightItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semibold}{sc}{ - <-> alias * Junicode-OsF/sb/sc +\DeclareFontShape{OT1}{Junicode-OsF}{light}{scit}{ + <-> alias * Junicode-OsF/l/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{sb}{n}{ - <-> \Junicode@@scale Junicode-SmBold-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{l}{sc}{ + <-> \Junicode@@scale Junicode-Light-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semibold}{n}{ - <-> alias * Junicode-OsF/sb/n +\DeclareFontShape{OT1}{Junicode-OsF}{light}{sc}{ + <-> alias * Junicode-OsF/l/sc }{} -\DeclareFontShape{OT1}{Junicode-OsF}{sb}{scsl}{ - <-> ssub * Junicode-OsF/sb/scit +\DeclareFontShape{OT1}{Junicode-OsF}{l}{sl}{ + <-> ssub * Junicode-OsF/l/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semibold}{scsl}{ - <-> ssub * Junicode-OsF/semibold/scit +\DeclareFontShape{OT1}{Junicode-OsF}{light}{sl}{ + <-> ssub * Junicode-OsF/light/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{sb}{sl}{ - <-> ssub * Junicode-OsF/sb/it +\DeclareFontShape{OT1}{Junicode-OsF}{l}{scsl}{ + <-> ssub * Junicode-OsF/l/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semibold}{sl}{ - <-> ssub * Junicode-OsF/semibold/it +\DeclareFontShape{OT1}{Junicode-OsF}{light}{scsl}{ + <-> ssub * Junicode-OsF/light/scit }{} -% ---- b = bold ---- +% ---- sx = semiexpanded ---- -\DeclareFontShape{OT1}{Junicode-OsF}{b}{sc}{ - <-> \Junicode@@scale Junicode-Bold-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{sx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{bold}{sc}{ - <-> alias * Junicode-OsF/b/sc +\DeclareFontShape{OT1}{Junicode-OsF}{semiexpanded}{scit}{ + <-> alias * Junicode-OsF/sx/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{b}{n}{ - <-> \Junicode@@scale Junicode-Bold-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{bold}{n}{ - <-> alias * Junicode-OsF/b/n +\DeclareFontShape{OT1}{Junicode-OsF}{semiexpanded}{n}{ + <-> alias * Junicode-OsF/sx/n }{} -\DeclareFontShape{OT1}{Junicode-OsF}{b}{scit}{ - <-> \Junicode@@scale Junicode-BoldItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{bold}{scit}{ - <-> alias * Junicode-OsF/b/scit +\DeclareFontShape{OT1}{Junicode-OsF}{semiexpanded}{it}{ + <-> alias * Junicode-OsF/sx/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{b}{it}{ - <-> \Junicode@@scale Junicode-BoldItalic-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{sx}{sc}{ + <-> \Junicode@@scale Junicode-SmExp-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{bold}{it}{ - <-> alias * Junicode-OsF/b/it +\DeclareFontShape{OT1}{Junicode-OsF}{semiexpanded}{sc}{ + <-> alias * Junicode-OsF/sx/sc }{} -\DeclareFontShape{OT1}{Junicode-OsF}{b}{scsl}{ - <-> ssub * Junicode-OsF/b/scit +\DeclareFontShape{OT1}{Junicode-OsF}{sx}{sl}{ + <-> ssub * Junicode-OsF/sx/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{bold}{scsl}{ - <-> ssub * Junicode-OsF/bold/scit +\DeclareFontShape{OT1}{Junicode-OsF}{semiexpanded}{sl}{ + <-> ssub * Junicode-OsF/semiexpanded/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{b}{sl}{ - <-> ssub * Junicode-OsF/b/it +\DeclareFontShape{OT1}{Junicode-OsF}{sx}{scsl}{ + <-> ssub * Junicode-OsF/sx/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{bold}{sl}{ - <-> ssub * Junicode-OsF/bold/it +\DeclareFontShape{OT1}{Junicode-OsF}{semiexpanded}{scsl}{ + <-> ssub * Junicode-OsF/semiexpanded/scit }{} -% ---- mediumcondensed ---- +% ---- mediumsemicondensed ---- -\DeclareFontShape{OT1}{Junicode-OsF}{mediumcondensed}{scit}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemicondensed}{sc}{ + <-> \Junicode@@scale Junicode-SmCondMedium-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemicondensed}{n}{ + <-> \Junicode@@scale Junicode-SmCondMedium-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{mediumcondensed}{sc}{ - <-> \Junicode@@scale Junicode-CondMedium-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemicondensed}{scit}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemicondensed}{it}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{mediumcondensed}{scsl}{ - <-> ssub * Junicode-OsF/mediumcondensed/scit +\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemicondensed}{sl}{ + <-> ssub * Junicode-OsF/mediumsemicondensed/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{mediumcondensed}{sl}{ - <-> ssub * Junicode-OsF/mediumcondensed/it +\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemicondensed}{scsl}{ + <-> ssub * Junicode-OsF/mediumsemicondensed/scit }{} -% ---- l = light ---- +% ---- lc = lightcondensed ---- -\DeclareFontShape{OT1}{Junicode-OsF}{l}{scit}{ - <-> \Junicode@@scale Junicode-LightItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{lc}{sc}{ + <-> \Junicode@@scale Junicode-CondLight-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{light}{scit}{ - <-> alias * Junicode-OsF/l/scit +\DeclareFontShape{OT1}{Junicode-OsF}{lightcondensed}{sc}{ + <-> alias * Junicode-OsF/lc/sc }{} -\DeclareFontShape{OT1}{Junicode-OsF}{l}{it}{ - <-> \Junicode@@scale Junicode-LightItalic-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{light}{it}{ - <-> alias * Junicode-OsF/l/it +\DeclareFontShape{OT1}{Junicode-OsF}{lightcondensed}{n}{ + <-> alias * Junicode-OsF/lc/n }{} -\DeclareFontShape{OT1}{Junicode-OsF}{l}{sc}{ - <-> \Junicode@@scale Junicode-Light-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{lc}{scit}{ + <-> \Junicode@@scale Junicode-CondLightItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{light}{sc}{ - <-> alias * Junicode-OsF/l/sc +\DeclareFontShape{OT1}{Junicode-OsF}{lightcondensed}{scit}{ + <-> alias * Junicode-OsF/lc/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{l}{n}{ - <-> \Junicode@@scale Junicode-Light-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{light}{n}{ - <-> alias * Junicode-OsF/l/n +\DeclareFontShape{OT1}{Junicode-OsF}{lightcondensed}{it}{ + <-> alias * Junicode-OsF/lc/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{l}{scsl}{ - <-> ssub * Junicode-OsF/l/scit +\DeclareFontShape{OT1}{Junicode-OsF}{lc}{sl}{ + <-> ssub * Junicode-OsF/lc/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{light}{scsl}{ - <-> ssub * Junicode-OsF/light/scit +\DeclareFontShape{OT1}{Junicode-OsF}{lightcondensed}{sl}{ + <-> ssub * Junicode-OsF/lightcondensed/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{l}{sl}{ - <-> ssub * Junicode-OsF/l/it +\DeclareFontShape{OT1}{Junicode-OsF}{lc}{scsl}{ + <-> ssub * Junicode-OsF/lc/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{light}{sl}{ - <-> ssub * Junicode-OsF/light/it +\DeclareFontShape{OT1}{Junicode-OsF}{lightcondensed}{scsl}{ + <-> ssub * Junicode-OsF/lightcondensed/scit }{} -% ---- bx = boldexpanded ---- +% ---- medium ---- -\DeclareFontShape{OT1}{Junicode-OsF}{bx}{scit}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{medium}{it}{ + <-> \Junicode@@scale Junicode-MediumItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{boldexpanded}{scit}{ - <-> alias * Junicode-OsF/bx/scit +\DeclareFontShape{OT1}{Junicode-OsF}{medium}{n}{ + <-> \Junicode@@scale Junicode-Medium-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{medium}{scit}{ + <-> \Junicode@@scale Junicode-MediumItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{boldexpanded}{it}{ - <-> alias * Junicode-OsF/bx/it +\DeclareFontShape{OT1}{Junicode-OsF}{medium}{sc}{ + <-> \Junicode@@scale Junicode-Medium-osf-sc-ot1 }{} +\DeclareFontShape{OT1}{Junicode-OsF}{medium}{sl}{ + <-> ssub * Junicode-OsF/medium/it +}{} + +\DeclareFontShape{OT1}{Junicode-OsF}{medium}{scsl}{ + <-> ssub * Junicode-OsF/medium/scit +}{} + + +% ---- bx = boldexpanded ---- + \DeclareFontShape{OT1}{Junicode-OsF}{bx}{sc}{ <-> \Junicode@@scale Junicode-ExpBold-osf-sc-ot1 }{} @@ -465,12 +476,20 @@ <-> alias * Junicode-OsF/bx/n }{} -\DeclareFontShape{OT1}{Junicode-OsF}{bx}{scsl}{ - <-> ssub * Junicode-OsF/bx/scit +\DeclareFontShape{OT1}{Junicode-OsF}{bx}{scit}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{boldexpanded}{scsl}{ - <-> ssub * Junicode-OsF/boldexpanded/scit +\DeclareFontShape{OT1}{Junicode-OsF}{boldexpanded}{scit}{ + <-> alias * Junicode-OsF/bx/scit +}{} + +\DeclareFontShape{OT1}{Junicode-OsF}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Junicode-OsF}{boldexpanded}{it}{ + <-> alias * Junicode-OsF/bx/it }{} \DeclareFontShape{OT1}{Junicode-OsF}{bx}{sl}{ @@ -481,15 +500,23 @@ <-> ssub * Junicode-OsF/boldexpanded/it }{} +\DeclareFontShape{OT1}{Junicode-OsF}{bx}{scsl}{ + <-> ssub * Junicode-OsF/bx/scit +}{} + +\DeclareFontShape{OT1}{Junicode-OsF}{boldexpanded}{scsl}{ + <-> ssub * Junicode-OsF/boldexpanded/scit +}{} + % ---- m = regular ---- -\DeclareFontShape{OT1}{Junicode-OsF}{m}{it}{ - <-> \Junicode@@scale Junicode-Italic-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{m}{n}{ + <-> \Junicode@@scale Junicode-Regular-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{regular}{it}{ - <-> alias * Junicode-OsF/m/it +\DeclareFontShape{OT1}{Junicode-OsF}{regular}{n}{ + <-> alias * Junicode-OsF/m/n }{} \DeclareFontShape{OT1}{Junicode-OsF}{m}{scit}{ @@ -500,12 +527,12 @@ <-> alias * Junicode-OsF/m/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{m}{n}{ - <-> \Junicode@@scale Junicode-Regular-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{m}{it}{ + <-> \Junicode@@scale Junicode-Italic-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{regular}{n}{ - <-> alias * Junicode-OsF/m/n +\DeclareFontShape{OT1}{Junicode-OsF}{regular}{it}{ + <-> alias * Junicode-OsF/m/it }{} \DeclareFontShape{OT1}{Junicode-OsF}{m}{sc}{ @@ -516,14 +543,6 @@ <-> alias * Junicode-OsF/m/sc }{} -\DeclareFontShape{OT1}{Junicode-OsF}{m}{scsl}{ - <-> ssub * Junicode-OsF/m/scit -}{} - -\DeclareFontShape{OT1}{Junicode-OsF}{regular}{scsl}{ - <-> ssub * Junicode-OsF/regular/scit -}{} - \DeclareFontShape{OT1}{Junicode-OsF}{m}{sl}{ <-> ssub * Junicode-OsF/m/it }{} @@ -532,184 +551,168 @@ <-> ssub * Junicode-OsF/regular/it }{} - -% ---- lsc = lightsemicondensed ---- - -\DeclareFontShape{OT1}{Junicode-OsF}{lsc}{sc}{ - <-> \Junicode@@scale Junicode-SmCondLight-osf-sc-ot1 -}{} - -\DeclareFontShape{OT1}{Junicode-OsF}{lightsemicondensed}{sc}{ - <-> alias * Junicode-OsF/lsc/sc +\DeclareFontShape{OT1}{Junicode-OsF}{m}{scsl}{ + <-> ssub * Junicode-OsF/m/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{regular}{scsl}{ + <-> ssub * Junicode-OsF/regular/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{lightsemicondensed}{n}{ - <-> alias * Junicode-OsF/lsc/n -}{} -\DeclareFontShape{OT1}{Junicode-OsF}{lsc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-sc-ot1 -}{} - -\DeclareFontShape{OT1}{Junicode-OsF}{lightsemicondensed}{scit}{ - <-> alias * Junicode-OsF/lsc/scit -}{} +% ---- mediumsemiexpanded ---- -\DeclareFontShape{OT1}{Junicode-OsF}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{lightsemicondensed}{it}{ - <-> alias * Junicode-OsF/lsc/it +\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemiexpanded}{scit}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{lsc}{scsl}{ - <-> ssub * Junicode-OsF/lsc/scit +\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{lightsemicondensed}{scsl}{ - <-> ssub * Junicode-OsF/lightsemicondensed/scit +\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemiexpanded}{sc}{ + <-> \Junicode@@scale Junicode-SmExpMedium-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{lsc}{sl}{ - <-> ssub * Junicode-OsF/lsc/it +\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-OsF/mediumsemiexpanded/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{lightsemicondensed}{sl}{ - <-> ssub * Junicode-OsF/lightsemicondensed/it +\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemiexpanded}{scsl}{ + <-> ssub * Junicode-OsF/mediumsemiexpanded/scit }{} -% ---- medium ---- +% ---- mediumexpanded ---- -\DeclareFontShape{OT1}{Junicode-OsF}{medium}{n}{ - <-> \Junicode@@scale Junicode-Medium-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{mediumexpanded}{scit}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{medium}{sc}{ - <-> \Junicode@@scale Junicode-Medium-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{mediumexpanded}{n}{ + <-> \Junicode@@scale Junicode-ExpMedium-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{medium}{it}{ - <-> \Junicode@@scale Junicode-MediumItalic-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{medium}{scit}{ - <-> \Junicode@@scale Junicode-MediumItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{mediumexpanded}{sc}{ + <-> \Junicode@@scale Junicode-ExpMedium-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{medium}{scsl}{ - <-> ssub * Junicode-OsF/medium/scit +\DeclareFontShape{OT1}{Junicode-OsF}{mediumexpanded}{sl}{ + <-> ssub * Junicode-OsF/mediumexpanded/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{medium}{sl}{ - <-> ssub * Junicode-OsF/medium/it +\DeclareFontShape{OT1}{Junicode-OsF}{mediumexpanded}{scsl}{ + <-> ssub * Junicode-OsF/mediumexpanded/scit }{} -% ---- sx = semiexpanded ---- +% ---- lsc = lightsemicondensed ---- -\DeclareFontShape{OT1}{Junicode-OsF}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{lsc}{sc}{ + <-> \Junicode@@scale Junicode-SmCondLight-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semiexpanded}{it}{ - <-> alias * Junicode-OsF/sx/it +\DeclareFontShape{OT1}{Junicode-OsF}{lightsemicondensed}{sc}{ + <-> alias * Junicode-OsF/lsc/sc }{} -\DeclareFontShape{OT1}{Junicode-OsF}{sx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semiexpanded}{scit}{ - <-> alias * Junicode-OsF/sx/scit +\DeclareFontShape{OT1}{Junicode-OsF}{lightsemicondensed}{it}{ + <-> alias * Junicode-OsF/lsc/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{lsc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semiexpanded}{n}{ - <-> alias * Junicode-OsF/sx/n +\DeclareFontShape{OT1}{Junicode-OsF}{lightsemicondensed}{scit}{ + <-> alias * Junicode-OsF/lsc/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{sx}{sc}{ - <-> \Junicode@@scale Junicode-SmExp-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semiexpanded}{sc}{ - <-> alias * Junicode-OsF/sx/sc +\DeclareFontShape{OT1}{Junicode-OsF}{lightsemicondensed}{n}{ + <-> alias * Junicode-OsF/lsc/n }{} -\DeclareFontShape{OT1}{Junicode-OsF}{sx}{scsl}{ - <-> ssub * Junicode-OsF/sx/scit +\DeclareFontShape{OT1}{Junicode-OsF}{lsc}{sl}{ + <-> ssub * Junicode-OsF/lsc/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semiexpanded}{scsl}{ - <-> ssub * Junicode-OsF/semiexpanded/scit +\DeclareFontShape{OT1}{Junicode-OsF}{lightsemicondensed}{sl}{ + <-> ssub * Junicode-OsF/lightsemicondensed/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{sx}{sl}{ - <-> ssub * Junicode-OsF/sx/it +\DeclareFontShape{OT1}{Junicode-OsF}{lsc}{scsl}{ + <-> ssub * Junicode-OsF/lsc/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semiexpanded}{sl}{ - <-> ssub * Junicode-OsF/semiexpanded/it +\DeclareFontShape{OT1}{Junicode-OsF}{lightsemicondensed}{scsl}{ + <-> ssub * Junicode-OsF/lightsemicondensed/scit }{} -% ---- c = condensed ---- +% ---- b = bold ---- -\DeclareFontShape{OT1}{Junicode-OsF}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{b}{scit}{ + <-> \Junicode@@scale Junicode-BoldItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{condensed}{it}{ - <-> alias * Junicode-OsF/c/it +\DeclareFontShape{OT1}{Junicode-OsF}{bold}{scit}{ + <-> alias * Junicode-OsF/b/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{c}{scit}{ - <-> \Junicode@@scale Junicode-CondItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{b}{n}{ + <-> \Junicode@@scale Junicode-Bold-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{condensed}{scit}{ - <-> alias * Junicode-OsF/c/scit +\DeclareFontShape{OT1}{Junicode-OsF}{bold}{n}{ + <-> alias * Junicode-OsF/b/n }{} -\DeclareFontShape{OT1}{Junicode-OsF}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{b}{it}{ + <-> \Junicode@@scale Junicode-BoldItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{condensed}{n}{ - <-> alias * Junicode-OsF/c/n +\DeclareFontShape{OT1}{Junicode-OsF}{bold}{it}{ + <-> alias * Junicode-OsF/b/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{c}{sc}{ - <-> \Junicode@@scale Junicode-Cond-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{b}{sc}{ + <-> \Junicode@@scale Junicode-Bold-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{condensed}{sc}{ - <-> alias * Junicode-OsF/c/sc +\DeclareFontShape{OT1}{Junicode-OsF}{bold}{sc}{ + <-> alias * Junicode-OsF/b/sc }{} -\DeclareFontShape{OT1}{Junicode-OsF}{c}{scsl}{ - <-> ssub * Junicode-OsF/c/scit +\DeclareFontShape{OT1}{Junicode-OsF}{b}{sl}{ + <-> ssub * Junicode-OsF/b/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{condensed}{scsl}{ - <-> ssub * Junicode-OsF/condensed/scit +\DeclareFontShape{OT1}{Junicode-OsF}{bold}{sl}{ + <-> ssub * Junicode-OsF/bold/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{c}{sl}{ - <-> ssub * Junicode-OsF/c/it +\DeclareFontShape{OT1}{Junicode-OsF}{b}{scsl}{ + <-> ssub * Junicode-OsF/b/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{condensed}{sl}{ - <-> ssub * Junicode-OsF/condensed/it +\DeclareFontShape{OT1}{Junicode-OsF}{bold}{scsl}{ + <-> ssub * Junicode-OsF/bold/scit }{} @@ -723,6 +726,14 @@ <-> alias * Junicode-OsF/x/scit }{} +\DeclareFontShape{OT1}{Junicode-OsF}{x}{n}{ + <-> \Junicode@@scale Junicode-Exp-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Junicode-OsF}{expanded}{n}{ + <-> alias * Junicode-OsF/x/n +}{} + \DeclareFontShape{OT1}{Junicode-OsF}{x}{it}{ <-> \Junicode@@scale Junicode-ExpItalic-osf-ot1 }{} @@ -739,12 +750,12 @@ <-> alias * Junicode-OsF/x/sc }{} -\DeclareFontShape{OT1}{Junicode-OsF}{x}{n}{ - <-> \Junicode@@scale Junicode-Exp-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{x}{sl}{ + <-> ssub * Junicode-OsF/x/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{expanded}{n}{ - <-> alias * Junicode-OsF/x/n +\DeclareFontShape{OT1}{Junicode-OsF}{expanded}{sl}{ + <-> ssub * Junicode-OsF/expanded/it }{} \DeclareFontShape{OT1}{Junicode-OsF}{x}{scsl}{ @@ -755,117 +766,106 @@ <-> ssub * Junicode-OsF/expanded/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{x}{sl}{ - <-> ssub * Junicode-OsF/x/it -}{} - -\DeclareFontShape{OT1}{Junicode-OsF}{expanded}{sl}{ - <-> ssub * Junicode-OsF/expanded/it -}{} - -% ---- sbsx = semiboldsemiexpanded ---- +% ---- sbx = semiboldexpanded ---- -\DeclareFontShape{OT1}{Junicode-OsF}{sbsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semiboldsemiexpanded}{scit}{ - <-> alias * Junicode-OsF/sbsx/scit +\DeclareFontShape{OT1}{Junicode-OsF}{semiboldexpanded}{n}{ + <-> alias * Junicode-OsF/sbx/n }{} -\DeclareFontShape{OT1}{Junicode-OsF}{sbsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{sbx}{scit}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semiboldsemiexpanded}{it}{ - <-> alias * Junicode-OsF/sbsx/it +\DeclareFontShape{OT1}{Junicode-OsF}{semiboldexpanded}{scit}{ + <-> alias * Junicode-OsF/sbx/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{sbsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{sbx}{it}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semiboldsemiexpanded}{sc}{ - <-> alias * Junicode-OsF/sbsx/sc +\DeclareFontShape{OT1}{Junicode-OsF}{semiboldexpanded}{it}{ + <-> alias * Junicode-OsF/sbx/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{sbx}{sc}{ + <-> \Junicode@@scale Junicode-ExpSmBold-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-OsF/sbsx/n +\DeclareFontShape{OT1}{Junicode-OsF}{semiboldexpanded}{sc}{ + <-> alias * Junicode-OsF/sbx/sc }{} -\DeclareFontShape{OT1}{Junicode-OsF}{sbsx}{scsl}{ - <-> ssub * Junicode-OsF/sbsx/scit +\DeclareFontShape{OT1}{Junicode-OsF}{sbx}{sl}{ + <-> ssub * Junicode-OsF/sbx/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semiboldsemiexpanded}{scsl}{ - <-> ssub * Junicode-OsF/semiboldsemiexpanded/scit +\DeclareFontShape{OT1}{Junicode-OsF}{semiboldexpanded}{sl}{ + <-> ssub * Junicode-OsF/semiboldexpanded/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{sbsx}{sl}{ - <-> ssub * Junicode-OsF/sbsx/it +\DeclareFontShape{OT1}{Junicode-OsF}{sbx}{scsl}{ + <-> ssub * Junicode-OsF/sbx/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{semiboldsemiexpanded}{sl}{ - <-> ssub * Junicode-OsF/semiboldsemiexpanded/it +\DeclareFontShape{OT1}{Junicode-OsF}{semiboldexpanded}{scsl}{ + <-> ssub * Junicode-OsF/semiboldexpanded/scit }{} -% ---- mediumexpanded ---- +% ---- c = condensed ---- -\DeclareFontShape{OT1}{Junicode-OsF}{mediumexpanded}{n}{ - <-> \Junicode@@scale Junicode-ExpMedium-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{mediumexpanded}{sc}{ - <-> \Junicode@@scale Junicode-ExpMedium-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{condensed}{it}{ + <-> alias * Junicode-OsF/c/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-osf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{mediumexpanded}{scit}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{condensed}{n}{ + <-> alias * Junicode-OsF/c/n }{} -\DeclareFontShape{OT1}{Junicode-OsF}{mediumexpanded}{scsl}{ - <-> ssub * Junicode-OsF/mediumexpanded/scit +\DeclareFontShape{OT1}{Junicode-OsF}{c}{scit}{ + <-> \Junicode@@scale Junicode-CondItalic-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{mediumexpanded}{sl}{ - <-> ssub * Junicode-OsF/mediumexpanded/it +\DeclareFontShape{OT1}{Junicode-OsF}{condensed}{scit}{ + <-> alias * Junicode-OsF/c/scit }{} - -% ---- mediumsemiexpanded ---- - -\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{c}{sc}{ + <-> \Junicode@@scale Junicode-Cond-osf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemiexpanded}{sc}{ - <-> \Junicode@@scale Junicode-SmExpMedium-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{condensed}{sc}{ + <-> alias * Junicode-OsF/c/sc }{} -\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{c}{sl}{ + <-> ssub * Junicode-OsF/c/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemiexpanded}{scit}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-OsF}{condensed}{sl}{ + <-> ssub * Junicode-OsF/condensed/it }{} -\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemiexpanded}{scsl}{ - <-> ssub * Junicode-OsF/mediumsemiexpanded/scit +\DeclareFontShape{OT1}{Junicode-OsF}{c}{scsl}{ + <-> ssub * Junicode-OsF/c/scit }{} -\DeclareFontShape{OT1}{Junicode-OsF}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-OsF/mediumsemiexpanded/it +\DeclareFontShape{OT1}{Junicode-OsF}{condensed}{scsl}{ + <-> ssub * Junicode-OsF/condensed/scit }{} diff --git a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-Sup.fd b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-Sup.fd index 3e51e57f5ae..337961822dd 100644 --- a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-Sup.fd +++ b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{OT1Junicode-Sup.fd} - [2024/06/03 (autoinst) Font definitions for OT1/Junicode-Sup.] + [2024/07/21 (autoinst) Font definitions for OT1/Junicode-Sup.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,168 +20,207 @@ \DeclareFontFamily{OT1}{Junicode-Sup}{} -% ---- m = regular ---- +% ---- c = condensed ---- -\DeclareFontShape{OT1}{Junicode-Sup}{m}{n}{ - <-> \Junicode@@scale Junicode-Regular-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{regular}{n}{ - <-> alias * Junicode-Sup/m/n +\DeclareFontShape{OT1}{Junicode-Sup}{condensed}{it}{ + <-> alias * Junicode-Sup/c/it }{} -\DeclareFontShape{OT1}{Junicode-Sup}{m}{it}{ - <-> \Junicode@@scale Junicode-Italic-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{regular}{it}{ - <-> alias * Junicode-Sup/m/it +\DeclareFontShape{OT1}{Junicode-Sup}{condensed}{n}{ + <-> alias * Junicode-Sup/c/n }{} -\DeclareFontShape{OT1}{Junicode-Sup}{m}{sl}{ - <-> ssub * Junicode-Sup/m/it +\DeclareFontShape{OT1}{Junicode-Sup}{c}{sl}{ + <-> ssub * Junicode-Sup/c/it }{} -\DeclareFontShape{OT1}{Junicode-Sup}{regular}{sl}{ - <-> ssub * Junicode-Sup/regular/it +\DeclareFontShape{OT1}{Junicode-Sup}{condensed}{sl}{ + <-> ssub * Junicode-Sup/condensed/it }{} -% ---- lsc = lightsemicondensed ---- +% ---- sbx = semiboldexpanded ---- -\DeclareFontShape{OT1}{Junicode-Sup}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{lightsemicondensed}{it}{ - <-> alias * Junicode-Sup/lsc/it +\DeclareFontShape{OT1}{Junicode-Sup}{semiboldexpanded}{n}{ + <-> alias * Junicode-Sup/sbx/n }{} -\DeclareFontShape{OT1}{Junicode-Sup}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{sbx}{it}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{lightsemicondensed}{n}{ - <-> alias * Junicode-Sup/lsc/n +\DeclareFontShape{OT1}{Junicode-Sup}{semiboldexpanded}{it}{ + <-> alias * Junicode-Sup/sbx/it }{} -\DeclareFontShape{OT1}{Junicode-Sup}{lsc}{sl}{ - <-> ssub * Junicode-Sup/lsc/it +\DeclareFontShape{OT1}{Junicode-Sup}{sbx}{sl}{ + <-> ssub * Junicode-Sup/sbx/it }{} -\DeclareFontShape{OT1}{Junicode-Sup}{lightsemicondensed}{sl}{ - <-> ssub * Junicode-Sup/lightsemicondensed/it +\DeclareFontShape{OT1}{Junicode-Sup}{semiboldexpanded}{sl}{ + <-> ssub * Junicode-Sup/semiboldexpanded/it }{} -% ---- medium ---- +% ---- x = expanded ---- -\DeclareFontShape{OT1}{Junicode-Sup}{medium}{n}{ - <-> \Junicode@@scale Junicode-Medium-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{x}{it}{ + <-> \Junicode@@scale Junicode-ExpItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{medium}{it}{ - <-> \Junicode@@scale Junicode-MediumItalic-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{expanded}{it}{ + <-> alias * Junicode-Sup/x/it }{} -\DeclareFontShape{OT1}{Junicode-Sup}{medium}{sl}{ - <-> ssub * Junicode-Sup/medium/it +\DeclareFontShape{OT1}{Junicode-Sup}{x}{n}{ + <-> \Junicode@@scale Junicode-Exp-sup-ot1 }{} +\DeclareFontShape{OT1}{Junicode-Sup}{expanded}{n}{ + <-> alias * Junicode-Sup/x/n +}{} -% ---- l = light ---- +\DeclareFontShape{OT1}{Junicode-Sup}{x}{sl}{ + <-> ssub * Junicode-Sup/x/it +}{} -\DeclareFontShape{OT1}{Junicode-Sup}{l}{it}{ - <-> \Junicode@@scale Junicode-LightItalic-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{expanded}{sl}{ + <-> ssub * Junicode-Sup/expanded/it }{} -\DeclareFontShape{OT1}{Junicode-Sup}{light}{it}{ - <-> alias * Junicode-Sup/l/it + +% ---- b = bold ---- + +\DeclareFontShape{OT1}{Junicode-Sup}{b}{it}{ + <-> \Junicode@@scale Junicode-BoldItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{l}{n}{ - <-> \Junicode@@scale Junicode-Light-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{bold}{it}{ + <-> alias * Junicode-Sup/b/it }{} -\DeclareFontShape{OT1}{Junicode-Sup}{light}{n}{ - <-> alias * Junicode-Sup/l/n +\DeclareFontShape{OT1}{Junicode-Sup}{b}{n}{ + <-> \Junicode@@scale Junicode-Bold-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{l}{sl}{ - <-> ssub * Junicode-Sup/l/it +\DeclareFontShape{OT1}{Junicode-Sup}{bold}{n}{ + <-> alias * Junicode-Sup/b/n }{} -\DeclareFontShape{OT1}{Junicode-Sup}{light}{sl}{ - <-> ssub * Junicode-Sup/light/it +\DeclareFontShape{OT1}{Junicode-Sup}{b}{sl}{ + <-> ssub * Junicode-Sup/b/it }{} +\DeclareFontShape{OT1}{Junicode-Sup}{bold}{sl}{ + <-> ssub * Junicode-Sup/bold/it +}{} -% ---- bx = boldexpanded ---- -\DeclareFontShape{OT1}{Junicode-Sup}{bx}{n}{ - <-> \Junicode@@scale Junicode-ExpBold-sup-ot1 +% ---- mediumexpanded ---- + +\DeclareFontShape{OT1}{Junicode-Sup}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{boldexpanded}{n}{ - <-> alias * Junicode-Sup/bx/n +\DeclareFontShape{OT1}{Junicode-Sup}{mediumexpanded}{n}{ + <-> \Junicode@@scale Junicode-ExpMedium-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{mediumexpanded}{sl}{ + <-> ssub * Junicode-Sup/mediumexpanded/it }{} -\DeclareFontShape{OT1}{Junicode-Sup}{boldexpanded}{it}{ - <-> alias * Junicode-Sup/bx/it + +% ---- lsc = lightsemicondensed ---- + +\DeclareFontShape{OT1}{Junicode-Sup}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{bx}{sl}{ - <-> ssub * Junicode-Sup/bx/it +\DeclareFontShape{OT1}{Junicode-Sup}{lightsemicondensed}{it}{ + <-> alias * Junicode-Sup/lsc/it }{} -\DeclareFontShape{OT1}{Junicode-Sup}{boldexpanded}{sl}{ - <-> ssub * Junicode-Sup/boldexpanded/it +\DeclareFontShape{OT1}{Junicode-Sup}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-sup-ot1 }{} +\DeclareFontShape{OT1}{Junicode-Sup}{lightsemicondensed}{n}{ + <-> alias * Junicode-Sup/lsc/n +}{} -% ---- sbsx = semiboldsemiexpanded ---- +\DeclareFontShape{OT1}{Junicode-Sup}{lsc}{sl}{ + <-> ssub * Junicode-Sup/lsc/it +}{} -\DeclareFontShape{OT1}{Junicode-Sup}{sbsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{lightsemicondensed}{sl}{ + <-> ssub * Junicode-Sup/lightsemicondensed/it }{} -\DeclareFontShape{OT1}{Junicode-Sup}{semiboldsemiexpanded}{it}{ - <-> alias * Junicode-Sup/sbsx/it + +% ---- lc = lightcondensed ---- + +\DeclareFontShape{OT1}{Junicode-Sup}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{lightcondensed}{n}{ + <-> alias * Junicode-Sup/lc/n }{} -\DeclareFontShape{OT1}{Junicode-Sup}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-Sup/sbsx/n +\DeclareFontShape{OT1}{Junicode-Sup}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{sbsx}{sl}{ - <-> ssub * Junicode-Sup/sbsx/it +\DeclareFontShape{OT1}{Junicode-Sup}{lightcondensed}{it}{ + <-> alias * Junicode-Sup/lc/it }{} -\DeclareFontShape{OT1}{Junicode-Sup}{semiboldsemiexpanded}{sl}{ - <-> ssub * Junicode-Sup/semiboldsemiexpanded/it +\DeclareFontShape{OT1}{Junicode-Sup}{lc}{sl}{ + <-> ssub * Junicode-Sup/lc/it }{} +\DeclareFontShape{OT1}{Junicode-Sup}{lightcondensed}{sl}{ + <-> ssub * Junicode-Sup/lightcondensed/it +}{} -% ---- mediumexpanded ---- -\DeclareFontShape{OT1}{Junicode-Sup}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-sup-ot1 +% ---- m = regular ---- + +\DeclareFontShape{OT1}{Junicode-Sup}{m}{n}{ + <-> \Junicode@@scale Junicode-Regular-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{mediumexpanded}{n}{ - <-> \Junicode@@scale Junicode-ExpMedium-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{regular}{n}{ + <-> alias * Junicode-Sup/m/n }{} -\DeclareFontShape{OT1}{Junicode-Sup}{mediumexpanded}{sl}{ - <-> ssub * Junicode-Sup/mediumexpanded/it +\DeclareFontShape{OT1}{Junicode-Sup}{m}{it}{ + <-> \Junicode@@scale Junicode-Italic-sup-ot1 +}{} + +\DeclareFontShape{OT1}{Junicode-Sup}{regular}{it}{ + <-> alias * Junicode-Sup/m/it +}{} + +\DeclareFontShape{OT1}{Junicode-Sup}{m}{sl}{ + <-> ssub * Junicode-Sup/m/it +}{} + +\DeclareFontShape{OT1}{Junicode-Sup}{regular}{sl}{ + <-> ssub * Junicode-Sup/regular/it }{} @@ -200,138 +239,114 @@ }{} -% ---- sx = semiexpanded ---- - -\DeclareFontShape{OT1}{Junicode-Sup}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-sup-ot1 -}{} - -\DeclareFontShape{OT1}{Junicode-Sup}{semiexpanded}{it}{ - <-> alias * Junicode-Sup/sx/it -}{} - -\DeclareFontShape{OT1}{Junicode-Sup}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-sup-ot1 -}{} +% ---- medium ---- -\DeclareFontShape{OT1}{Junicode-Sup}{semiexpanded}{n}{ - <-> alias * Junicode-Sup/sx/n +\DeclareFontShape{OT1}{Junicode-Sup}{medium}{it}{ + <-> \Junicode@@scale Junicode-MediumItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{sx}{sl}{ - <-> ssub * Junicode-Sup/sx/it +\DeclareFontShape{OT1}{Junicode-Sup}{medium}{n}{ + <-> \Junicode@@scale Junicode-Medium-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{semiexpanded}{sl}{ - <-> ssub * Junicode-Sup/semiexpanded/it +\DeclareFontShape{OT1}{Junicode-Sup}{medium}{sl}{ + <-> ssub * Junicode-Sup/medium/it }{} -% ---- x = expanded ---- +% ---- bx = boldexpanded ---- -\DeclareFontShape{OT1}{Junicode-Sup}{x}{n}{ - <-> \Junicode@@scale Junicode-Exp-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{expanded}{n}{ - <-> alias * Junicode-Sup/x/n +\DeclareFontShape{OT1}{Junicode-Sup}{boldexpanded}{it}{ + <-> alias * Junicode-Sup/bx/it }{} -\DeclareFontShape{OT1}{Junicode-Sup}{x}{it}{ - <-> \Junicode@@scale Junicode-ExpItalic-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{bx}{n}{ + <-> \Junicode@@scale Junicode-ExpBold-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{expanded}{it}{ - <-> alias * Junicode-Sup/x/it +\DeclareFontShape{OT1}{Junicode-Sup}{boldexpanded}{n}{ + <-> alias * Junicode-Sup/bx/n }{} -\DeclareFontShape{OT1}{Junicode-Sup}{x}{sl}{ - <-> ssub * Junicode-Sup/x/it +\DeclareFontShape{OT1}{Junicode-Sup}{bx}{sl}{ + <-> ssub * Junicode-Sup/bx/it }{} -\DeclareFontShape{OT1}{Junicode-Sup}{expanded}{sl}{ - <-> ssub * Junicode-Sup/expanded/it +\DeclareFontShape{OT1}{Junicode-Sup}{boldexpanded}{sl}{ + <-> ssub * Junicode-Sup/boldexpanded/it }{} -% ---- c = condensed ---- +% ---- sx = semiexpanded ---- -\DeclareFontShape{OT1}{Junicode-Sup}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{condensed}{it}{ - <-> alias * Junicode-Sup/c/it +\DeclareFontShape{OT1}{Junicode-Sup}{semiexpanded}{it}{ + <-> alias * Junicode-Sup/sx/it }{} -\DeclareFontShape{OT1}{Junicode-Sup}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{condensed}{n}{ - <-> alias * Junicode-Sup/c/n +\DeclareFontShape{OT1}{Junicode-Sup}{semiexpanded}{n}{ + <-> alias * Junicode-Sup/sx/n }{} -\DeclareFontShape{OT1}{Junicode-Sup}{c}{sl}{ - <-> ssub * Junicode-Sup/c/it +\DeclareFontShape{OT1}{Junicode-Sup}{sx}{sl}{ + <-> ssub * Junicode-Sup/sx/it }{} -\DeclareFontShape{OT1}{Junicode-Sup}{condensed}{sl}{ - <-> ssub * Junicode-Sup/condensed/it +\DeclareFontShape{OT1}{Junicode-Sup}{semiexpanded}{sl}{ + <-> ssub * Junicode-Sup/semiexpanded/it }{} -% ---- lc = lightcondensed ---- - -\DeclareFontShape{OT1}{Junicode-Sup}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-sup-ot1 -}{} +% ---- l = light ---- -\DeclareFontShape{OT1}{Junicode-Sup}{lightcondensed}{it}{ - <-> alias * Junicode-Sup/lc/it +\DeclareFontShape{OT1}{Junicode-Sup}{l}{it}{ + <-> \Junicode@@scale Junicode-LightItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{light}{it}{ + <-> alias * Junicode-Sup/l/it }{} -\DeclareFontShape{OT1}{Junicode-Sup}{lightcondensed}{n}{ - <-> alias * Junicode-Sup/lc/n +\DeclareFontShape{OT1}{Junicode-Sup}{l}{n}{ + <-> \Junicode@@scale Junicode-Light-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{lc}{sl}{ - <-> ssub * Junicode-Sup/lc/it +\DeclareFontShape{OT1}{Junicode-Sup}{light}{n}{ + <-> alias * Junicode-Sup/l/n }{} -\DeclareFontShape{OT1}{Junicode-Sup}{lightcondensed}{sl}{ - <-> ssub * Junicode-Sup/lightcondensed/it +\DeclareFontShape{OT1}{Junicode-Sup}{l}{sl}{ + <-> ssub * Junicode-Sup/l/it }{} - -% ---- bsx = boldsemiexpanded ---- - -\DeclareFontShape{OT1}{Junicode-Sup}{bsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpBold-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{light}{sl}{ + <-> ssub * Junicode-Sup/light/it }{} -\DeclareFontShape{OT1}{Junicode-Sup}{boldsemiexpanded}{n}{ - <-> alias * Junicode-Sup/bsx/n -}{} -\DeclareFontShape{OT1}{Junicode-Sup}{bsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-sup-ot1 -}{} +% ---- mediumsemicondensed ---- -\DeclareFontShape{OT1}{Junicode-Sup}{boldsemiexpanded}{it}{ - <-> alias * Junicode-Sup/bsx/it +\DeclareFontShape{OT1}{Junicode-Sup}{mediumsemicondensed}{it}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{bsx}{sl}{ - <-> ssub * Junicode-Sup/bsx/it +\DeclareFontShape{OT1}{Junicode-Sup}{mediumsemicondensed}{n}{ + <-> \Junicode@@scale Junicode-SmCondMedium-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{boldsemiexpanded}{sl}{ - <-> ssub * Junicode-Sup/boldsemiexpanded/it +\DeclareFontShape{OT1}{Junicode-Sup}{mediumsemicondensed}{sl}{ + <-> ssub * Junicode-Sup/mediumsemicondensed/it }{} @@ -362,114 +377,99 @@ }{} -% ---- sc = semicondensed ---- +% ---- mediumcondensed ---- -\DeclareFontShape{OT1}{Junicode-Sup}{sc}{it}{ - <-> \Junicode@@scale Junicode-SmCondItalic-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{semicondensed}{it}{ - <-> alias * Junicode-Sup/sc/it +\DeclareFontShape{OT1}{Junicode-Sup}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{sc}{n}{ - <-> \Junicode@@scale Junicode-SmCond-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{mediumcondensed}{sl}{ + <-> ssub * Junicode-Sup/mediumcondensed/it }{} -\DeclareFontShape{OT1}{Junicode-Sup}{semicondensed}{n}{ - <-> alias * Junicode-Sup/sc/n -}{} -\DeclareFontShape{OT1}{Junicode-Sup}{sc}{sl}{ - <-> ssub * Junicode-Sup/sc/it -}{} +% ---- bsx = boldsemiexpanded ---- -\DeclareFontShape{OT1}{Junicode-Sup}{semicondensed}{sl}{ - <-> ssub * Junicode-Sup/semicondensed/it +\DeclareFontShape{OT1}{Junicode-Sup}{bsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpBold-sup-ot1 }{} - -% ---- mediumsemicondensed ---- - -\DeclareFontShape{OT1}{Junicode-Sup}{mediumsemicondensed}{it}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{boldsemiexpanded}{n}{ + <-> alias * Junicode-Sup/bsx/n }{} -\DeclareFontShape{OT1}{Junicode-Sup}{mediumsemicondensed}{n}{ - <-> \Junicode@@scale Junicode-SmCondMedium-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{bsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{mediumsemicondensed}{sl}{ - <-> ssub * Junicode-Sup/mediumsemicondensed/it +\DeclareFontShape{OT1}{Junicode-Sup}{boldsemiexpanded}{it}{ + <-> alias * Junicode-Sup/bsx/it }{} - -% ---- sbx = semiboldexpanded ---- - -\DeclareFontShape{OT1}{Junicode-Sup}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{bsx}{sl}{ + <-> ssub * Junicode-Sup/bsx/it }{} -\DeclareFontShape{OT1}{Junicode-Sup}{semiboldexpanded}{n}{ - <-> alias * Junicode-Sup/sbx/n +\DeclareFontShape{OT1}{Junicode-Sup}{boldsemiexpanded}{sl}{ + <-> ssub * Junicode-Sup/boldsemiexpanded/it }{} -\DeclareFontShape{OT1}{Junicode-Sup}{sbx}{it}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-sup-ot1 -}{} -\DeclareFontShape{OT1}{Junicode-Sup}{semiboldexpanded}{it}{ - <-> alias * Junicode-Sup/sbx/it -}{} +% ---- sbsx = semiboldsemiexpanded ---- -\DeclareFontShape{OT1}{Junicode-Sup}{sbx}{sl}{ - <-> ssub * Junicode-Sup/sbx/it +\DeclareFontShape{OT1}{Junicode-Sup}{sbsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{semiboldexpanded}{sl}{ - <-> ssub * Junicode-Sup/semiboldexpanded/it +\DeclareFontShape{OT1}{Junicode-Sup}{semiboldsemiexpanded}{it}{ + <-> alias * Junicode-Sup/sbsx/it }{} +\DeclareFontShape{OT1}{Junicode-Sup}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-sup-ot1 +}{} -% ---- mediumcondensed ---- - -\DeclareFontShape{OT1}{Junicode-Sup}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-Sup/sbsx/n }{} -\DeclareFontShape{OT1}{Junicode-Sup}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{sbsx}{sl}{ + <-> ssub * Junicode-Sup/sbsx/it }{} -\DeclareFontShape{OT1}{Junicode-Sup}{mediumcondensed}{sl}{ - <-> ssub * Junicode-Sup/mediumcondensed/it +\DeclareFontShape{OT1}{Junicode-Sup}{semiboldsemiexpanded}{sl}{ + <-> ssub * Junicode-Sup/semiboldsemiexpanded/it }{} -% ---- b = bold ---- +% ---- sc = semicondensed ---- -\DeclareFontShape{OT1}{Junicode-Sup}{b}{it}{ - <-> \Junicode@@scale Junicode-BoldItalic-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{sc}{n}{ + <-> \Junicode@@scale Junicode-SmCond-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{bold}{it}{ - <-> alias * Junicode-Sup/b/it +\DeclareFontShape{OT1}{Junicode-Sup}{semicondensed}{n}{ + <-> alias * Junicode-Sup/sc/n }{} -\DeclareFontShape{OT1}{Junicode-Sup}{b}{n}{ - <-> \Junicode@@scale Junicode-Bold-sup-ot1 +\DeclareFontShape{OT1}{Junicode-Sup}{sc}{it}{ + <-> \Junicode@@scale Junicode-SmCondItalic-sup-ot1 }{} -\DeclareFontShape{OT1}{Junicode-Sup}{bold}{n}{ - <-> alias * Junicode-Sup/b/n +\DeclareFontShape{OT1}{Junicode-Sup}{semicondensed}{it}{ + <-> alias * Junicode-Sup/sc/it }{} -\DeclareFontShape{OT1}{Junicode-Sup}{b}{sl}{ - <-> ssub * Junicode-Sup/b/it +\DeclareFontShape{OT1}{Junicode-Sup}{sc}{sl}{ + <-> ssub * Junicode-Sup/sc/it }{} -\DeclareFontShape{OT1}{Junicode-Sup}{bold}{sl}{ - <-> ssub * Junicode-Sup/bold/it +\DeclareFontShape{OT1}{Junicode-Sup}{semicondensed}{sl}{ + <-> ssub * Junicode-Sup/semicondensed/it }{} diff --git a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-TLF.fd b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-TLF.fd index 47eb8d3cf5b..77ad7e0b311 100644 --- a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-TLF.fd +++ b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{OT1Junicode-TLF.fd} - [2024/06/03 (autoinst) Font definitions for OT1/Junicode-TLF.] + [2024/07/21 (autoinst) Font definitions for OT1/Junicode-TLF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,86 +20,75 @@ \DeclareFontFamily{OT1}{Junicode-TLF}{} -% ---- mediumsemicondensed ---- +% ---- sc = semicondensed ---- -\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemicondensed}{scit}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{sc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemicondensed}{it}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{semicondensed}{scit}{ + <-> alias * Junicode-TLF/sc/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemicondensed}{sc}{ - <-> \Junicode@@scale Junicode-SmCondMedium-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{sc}{n}{ + <-> \Junicode@@scale Junicode-SmCond-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemicondensed}{n}{ - <-> \Junicode@@scale Junicode-SmCondMedium-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{semicondensed}{n}{ + <-> alias * Junicode-TLF/sc/n }{} -\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemicondensed}{scsl}{ - <-> ssub * Junicode-TLF/mediumsemicondensed/scit +\DeclareFontShape{OT1}{Junicode-TLF}{sc}{it}{ + <-> \Junicode@@scale Junicode-SmCondItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemicondensed}{sl}{ - <-> ssub * Junicode-TLF/mediumsemicondensed/it +\DeclareFontShape{OT1}{Junicode-TLF}{semicondensed}{it}{ + <-> alias * Junicode-TLF/sc/it }{} - -% ---- sbx = semiboldexpanded ---- - -\DeclareFontShape{OT1}{Junicode-TLF}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{sc}{sc}{ + <-> \Junicode@@scale Junicode-SmCond-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{semiboldexpanded}{n}{ - <-> alias * Junicode-TLF/sbx/n +\DeclareFontShape{OT1}{Junicode-TLF}{semicondensed}{sc}{ + <-> alias * Junicode-TLF/sc/sc }{} -\DeclareFontShape{OT1}{Junicode-TLF}{sbx}{sc}{ - <-> \Junicode@@scale Junicode-ExpSmBold-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{sc}{sl}{ + <-> ssub * Junicode-TLF/sc/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{semiboldexpanded}{sc}{ - <-> alias * Junicode-TLF/sbx/sc +\DeclareFontShape{OT1}{Junicode-TLF}{semicondensed}{sl}{ + <-> ssub * Junicode-TLF/semicondensed/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{sbx}{it}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{sc}{scsl}{ + <-> ssub * Junicode-TLF/sc/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{semiboldexpanded}{it}{ - <-> alias * Junicode-TLF/sbx/it +\DeclareFontShape{OT1}{Junicode-TLF}{semicondensed}{scsl}{ + <-> ssub * Junicode-TLF/semicondensed/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{sbx}{scit}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-sc-ot1 -}{} -\DeclareFontShape{OT1}{Junicode-TLF}{semiboldexpanded}{scit}{ - <-> alias * Junicode-TLF/sbx/scit -}{} +% ---- bsx = boldsemiexpanded ---- -\DeclareFontShape{OT1}{Junicode-TLF}{sbx}{scsl}{ - <-> ssub * Junicode-TLF/sbx/scit +\DeclareFontShape{OT1}{Junicode-TLF}{bsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{semiboldexpanded}{scsl}{ - <-> ssub * Junicode-TLF/semiboldexpanded/scit +\DeclareFontShape{OT1}{Junicode-TLF}{boldsemiexpanded}{it}{ + <-> alias * Junicode-TLF/bsx/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{sbx}{sl}{ - <-> ssub * Junicode-TLF/sbx/it +\DeclareFontShape{OT1}{Junicode-TLF}{bsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{semiboldexpanded}{sl}{ - <-> ssub * Junicode-TLF/semiboldexpanded/it +\DeclareFontShape{OT1}{Junicode-TLF}{boldsemiexpanded}{scit}{ + <-> alias * Junicode-TLF/bsx/scit }{} - -% ---- bsx = boldsemiexpanded ---- - \DeclareFontShape{OT1}{Junicode-TLF}{bsx}{n}{ <-> \Junicode@@scale Junicode-SmExpBold-tlf-ot1 }{} @@ -116,20 +105,12 @@ <-> alias * Junicode-TLF/bsx/sc }{} -\DeclareFontShape{OT1}{Junicode-TLF}{bsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-ot1 -}{} - -\DeclareFontShape{OT1}{Junicode-TLF}{boldsemiexpanded}{it}{ - <-> alias * Junicode-TLF/bsx/it -}{} - -\DeclareFontShape{OT1}{Junicode-TLF}{bsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{bsx}{sl}{ + <-> ssub * Junicode-TLF/bsx/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{boldsemiexpanded}{scit}{ - <-> alias * Junicode-TLF/bsx/scit +\DeclareFontShape{OT1}{Junicode-TLF}{boldsemiexpanded}{sl}{ + <-> ssub * Junicode-TLF/boldsemiexpanded/it }{} \DeclareFontShape{OT1}{Junicode-TLF}{bsx}{scsl}{ @@ -140,74 +121,66 @@ <-> ssub * Junicode-TLF/boldsemiexpanded/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{bsx}{sl}{ - <-> ssub * Junicode-TLF/bsx/it -}{} - -\DeclareFontShape{OT1}{Junicode-TLF}{boldsemiexpanded}{sl}{ - <-> ssub * Junicode-TLF/boldsemiexpanded/it -}{} - -% ---- lc = lightcondensed ---- +% ---- sbsx = semiboldsemiexpanded ---- -\DeclareFontShape{OT1}{Junicode-TLF}{lc}{scit}{ - <-> \Junicode@@scale Junicode-CondLightItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{sbsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{lightcondensed}{scit}{ - <-> alias * Junicode-TLF/lc/scit +\DeclareFontShape{OT1}{Junicode-TLF}{semiboldsemiexpanded}{sc}{ + <-> alias * Junicode-TLF/sbsx/sc }{} -\DeclareFontShape{OT1}{Junicode-TLF}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{sbsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{lightcondensed}{it}{ - <-> alias * Junicode-TLF/lc/it +\DeclareFontShape{OT1}{Junicode-TLF}{semiboldsemiexpanded}{it}{ + <-> alias * Junicode-TLF/sbsx/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{lc}{sc}{ - <-> \Junicode@@scale Junicode-CondLight-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{lightcondensed}{sc}{ - <-> alias * Junicode-TLF/lc/sc +\DeclareFontShape{OT1}{Junicode-TLF}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-TLF/sbsx/n }{} -\DeclareFontShape{OT1}{Junicode-TLF}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{sbsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{lightcondensed}{n}{ - <-> alias * Junicode-TLF/lc/n +\DeclareFontShape{OT1}{Junicode-TLF}{semiboldsemiexpanded}{scit}{ + <-> alias * Junicode-TLF/sbsx/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{lc}{scsl}{ - <-> ssub * Junicode-TLF/lc/scit +\DeclareFontShape{OT1}{Junicode-TLF}{sbsx}{sl}{ + <-> ssub * Junicode-TLF/sbsx/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{lightcondensed}{scsl}{ - <-> ssub * Junicode-TLF/lightcondensed/scit +\DeclareFontShape{OT1}{Junicode-TLF}{semiboldsemiexpanded}{sl}{ + <-> ssub * Junicode-TLF/semiboldsemiexpanded/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{lc}{sl}{ - <-> ssub * Junicode-TLF/lc/it +\DeclareFontShape{OT1}{Junicode-TLF}{sbsx}{scsl}{ + <-> ssub * Junicode-TLF/sbsx/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{lightcondensed}{sl}{ - <-> ssub * Junicode-TLF/lightcondensed/it +\DeclareFontShape{OT1}{Junicode-TLF}{semiboldsemiexpanded}{scsl}{ + <-> ssub * Junicode-TLF/semiboldsemiexpanded/scit }{} % ---- sb = semibold ---- -\DeclareFontShape{OT1}{Junicode-TLF}{sb}{it}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{sb}{sc}{ + <-> \Junicode@@scale Junicode-SmBold-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{semibold}{it}{ - <-> alias * Junicode-TLF/sb/it +\DeclareFontShape{OT1}{Junicode-TLF}{semibold}{sc}{ + <-> alias * Junicode-TLF/sb/sc }{} \DeclareFontShape{OT1}{Junicode-TLF}{sb}{scit}{ @@ -226,20 +199,12 @@ <-> alias * Junicode-TLF/sb/n }{} -\DeclareFontShape{OT1}{Junicode-TLF}{sb}{sc}{ - <-> \Junicode@@scale Junicode-SmBold-tlf-sc-ot1 -}{} - -\DeclareFontShape{OT1}{Junicode-TLF}{semibold}{sc}{ - <-> alias * Junicode-TLF/sb/sc -}{} - -\DeclareFontShape{OT1}{Junicode-TLF}{sb}{scsl}{ - <-> ssub * Junicode-TLF/sb/scit +\DeclareFontShape{OT1}{Junicode-TLF}{sb}{it}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{semibold}{scsl}{ - <-> ssub * Junicode-TLF/semibold/scit +\DeclareFontShape{OT1}{Junicode-TLF}{semibold}{it}{ + <-> alias * Junicode-TLF/sb/it }{} \DeclareFontShape{OT1}{Junicode-TLF}{sb}{sl}{ @@ -250,146 +215,122 @@ <-> ssub * Junicode-TLF/semibold/it }{} - -% ---- sc = semicondensed ---- - -\DeclareFontShape{OT1}{Junicode-TLF}{sc}{n}{ - <-> \Junicode@@scale Junicode-SmCond-tlf-ot1 -}{} - -\DeclareFontShape{OT1}{Junicode-TLF}{semicondensed}{n}{ - <-> alias * Junicode-TLF/sc/n -}{} - -\DeclareFontShape{OT1}{Junicode-TLF}{sc}{sc}{ - <-> \Junicode@@scale Junicode-SmCond-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{sb}{scsl}{ + <-> ssub * Junicode-TLF/sb/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{semicondensed}{sc}{ - <-> alias * Junicode-TLF/sc/sc +\DeclareFontShape{OT1}{Junicode-TLF}{semibold}{scsl}{ + <-> ssub * Junicode-TLF/semibold/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{sc}{it}{ - <-> \Junicode@@scale Junicode-SmCondItalic-tlf-ot1 -}{} -\DeclareFontShape{OT1}{Junicode-TLF}{semicondensed}{it}{ - <-> alias * Junicode-TLF/sc/it -}{} +% ---- mediumcondensed ---- -\DeclareFontShape{OT1}{Junicode-TLF}{sc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{mediumcondensed}{sc}{ + <-> \Junicode@@scale Junicode-CondMedium-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{semicondensed}{scit}{ - <-> alias * Junicode-TLF/sc/scit +\DeclareFontShape{OT1}{Junicode-TLF}{mediumcondensed}{scit}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{sc}{scsl}{ - <-> ssub * Junicode-TLF/sc/scit +\DeclareFontShape{OT1}{Junicode-TLF}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{semicondensed}{scsl}{ - <-> ssub * Junicode-TLF/semicondensed/scit +\DeclareFontShape{OT1}{Junicode-TLF}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{sc}{sl}{ - <-> ssub * Junicode-TLF/sc/it +\DeclareFontShape{OT1}{Junicode-TLF}{mediumcondensed}{sl}{ + <-> ssub * Junicode-TLF/mediumcondensed/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{semicondensed}{sl}{ - <-> ssub * Junicode-TLF/semicondensed/it +\DeclareFontShape{OT1}{Junicode-TLF}{mediumcondensed}{scsl}{ + <-> ssub * Junicode-TLF/mediumcondensed/scit }{} -% ---- b = bold ---- +% ---- mediumsemicondensed ---- -\DeclareFontShape{OT1}{Junicode-TLF}{b}{sc}{ - <-> \Junicode@@scale Junicode-Bold-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemicondensed}{sc}{ + <-> \Junicode@@scale Junicode-SmCondMedium-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{bold}{sc}{ - <-> alias * Junicode-TLF/b/sc +\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemicondensed}{n}{ + <-> \Junicode@@scale Junicode-SmCondMedium-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{b}{n}{ - <-> \Junicode@@scale Junicode-Bold-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemicondensed}{scit}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{bold}{n}{ - <-> alias * Junicode-TLF/b/n +\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemicondensed}{it}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{b}{scit}{ - <-> \Junicode@@scale Junicode-BoldItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemicondensed}{sl}{ + <-> ssub * Junicode-TLF/mediumsemicondensed/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{bold}{scit}{ - <-> alias * Junicode-TLF/b/scit +\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemicondensed}{scsl}{ + <-> ssub * Junicode-TLF/mediumsemicondensed/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{b}{it}{ - <-> \Junicode@@scale Junicode-BoldItalic-tlf-ot1 -}{} -\DeclareFontShape{OT1}{Junicode-TLF}{bold}{it}{ - <-> alias * Junicode-TLF/b/it -}{} +% ---- sx = semiexpanded ---- -\DeclareFontShape{OT1}{Junicode-TLF}{b}{scsl}{ - <-> ssub * Junicode-TLF/b/scit +\DeclareFontShape{OT1}{Junicode-TLF}{sx}{sc}{ + <-> \Junicode@@scale Junicode-SmExp-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{bold}{scsl}{ - <-> ssub * Junicode-TLF/bold/scit +\DeclareFontShape{OT1}{Junicode-TLF}{semiexpanded}{sc}{ + <-> alias * Junicode-TLF/sx/sc }{} -\DeclareFontShape{OT1}{Junicode-TLF}{b}{sl}{ - <-> ssub * Junicode-TLF/b/it +\DeclareFontShape{OT1}{Junicode-TLF}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{bold}{sl}{ - <-> ssub * Junicode-TLF/bold/it +\DeclareFontShape{OT1}{Junicode-TLF}{semiexpanded}{n}{ + <-> alias * Junicode-TLF/sx/n }{} +\DeclareFontShape{OT1}{Junicode-TLF}{sx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpItalic-tlf-sc-ot1 +}{} -% ---- mediumcondensed ---- +\DeclareFontShape{OT1}{Junicode-TLF}{semiexpanded}{scit}{ + <-> alias * Junicode-TLF/sx/scit +}{} -\DeclareFontShape{OT1}{Junicode-TLF}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{mediumcondensed}{scit}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{semiexpanded}{it}{ + <-> alias * Junicode-TLF/sx/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{sx}{sl}{ + <-> ssub * Junicode-TLF/sx/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{mediumcondensed}{sc}{ - <-> \Junicode@@scale Junicode-CondMedium-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{semiexpanded}{sl}{ + <-> ssub * Junicode-TLF/semiexpanded/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{mediumcondensed}{scsl}{ - <-> ssub * Junicode-TLF/mediumcondensed/scit +\DeclareFontShape{OT1}{Junicode-TLF}{sx}{scsl}{ + <-> ssub * Junicode-TLF/sx/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{mediumcondensed}{sl}{ - <-> ssub * Junicode-TLF/mediumcondensed/it +\DeclareFontShape{OT1}{Junicode-TLF}{semiexpanded}{scsl}{ + <-> ssub * Junicode-TLF/semiexpanded/scit }{} % ---- l = light ---- -\DeclareFontShape{OT1}{Junicode-TLF}{l}{n}{ - <-> \Junicode@@scale Junicode-Light-tlf-ot1 -}{} - -\DeclareFontShape{OT1}{Junicode-TLF}{light}{n}{ - <-> alias * Junicode-TLF/l/n -}{} - \DeclareFontShape{OT1}{Junicode-TLF}{l}{sc}{ <-> \Junicode@@scale Junicode-Light-tlf-sc-ot1 }{} @@ -406,20 +347,20 @@ <-> alias * Junicode-TLF/l/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{l}{scit}{ - <-> \Junicode@@scale Junicode-LightItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{l}{n}{ + <-> \Junicode@@scale Junicode-Light-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{light}{scit}{ - <-> alias * Junicode-TLF/l/scit +\DeclareFontShape{OT1}{Junicode-TLF}{light}{n}{ + <-> alias * Junicode-TLF/l/n }{} -\DeclareFontShape{OT1}{Junicode-TLF}{l}{scsl}{ - <-> ssub * Junicode-TLF/l/scit +\DeclareFontShape{OT1}{Junicode-TLF}{l}{scit}{ + <-> \Junicode@@scale Junicode-LightItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{light}{scsl}{ - <-> ssub * Junicode-TLF/light/scit +\DeclareFontShape{OT1}{Junicode-TLF}{light}{scit}{ + <-> alias * Junicode-TLF/l/scit }{} \DeclareFontShape{OT1}{Junicode-TLF}{l}{sl}{ @@ -430,297 +371,308 @@ <-> ssub * Junicode-TLF/light/it }{} +\DeclareFontShape{OT1}{Junicode-TLF}{l}{scsl}{ + <-> ssub * Junicode-TLF/l/scit +}{} -% ---- bx = boldexpanded ---- +\DeclareFontShape{OT1}{Junicode-TLF}{light}{scsl}{ + <-> ssub * Junicode-TLF/light/scit +}{} -\DeclareFontShape{OT1}{Junicode-TLF}{bx}{scit}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-sc-ot1 + +% ---- m = regular ---- + +\DeclareFontShape{OT1}{Junicode-TLF}{m}{scit}{ + <-> \Junicode@@scale Junicode-Italic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{boldexpanded}{scit}{ - <-> alias * Junicode-TLF/bx/scit +\DeclareFontShape{OT1}{Junicode-TLF}{regular}{scit}{ + <-> alias * Junicode-TLF/m/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{m}{n}{ + <-> \Junicode@@scale Junicode-Regular-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{boldexpanded}{it}{ - <-> alias * Junicode-TLF/bx/it +\DeclareFontShape{OT1}{Junicode-TLF}{regular}{n}{ + <-> alias * Junicode-TLF/m/n }{} -\DeclareFontShape{OT1}{Junicode-TLF}{bx}{sc}{ - <-> \Junicode@@scale Junicode-ExpBold-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{m}{it}{ + <-> \Junicode@@scale Junicode-Italic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{boldexpanded}{sc}{ - <-> alias * Junicode-TLF/bx/sc +\DeclareFontShape{OT1}{Junicode-TLF}{regular}{it}{ + <-> alias * Junicode-TLF/m/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{bx}{n}{ - <-> \Junicode@@scale Junicode-ExpBold-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{m}{sc}{ + <-> \Junicode@@scale Junicode-Regular-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{boldexpanded}{n}{ - <-> alias * Junicode-TLF/bx/n +\DeclareFontShape{OT1}{Junicode-TLF}{regular}{sc}{ + <-> alias * Junicode-TLF/m/sc }{} -\DeclareFontShape{OT1}{Junicode-TLF}{bx}{scsl}{ - <-> ssub * Junicode-TLF/bx/scit +\DeclareFontShape{OT1}{Junicode-TLF}{m}{sl}{ + <-> ssub * Junicode-TLF/m/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{boldexpanded}{scsl}{ - <-> ssub * Junicode-TLF/boldexpanded/scit +\DeclareFontShape{OT1}{Junicode-TLF}{regular}{sl}{ + <-> ssub * Junicode-TLF/regular/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{bx}{sl}{ - <-> ssub * Junicode-TLF/bx/it +\DeclareFontShape{OT1}{Junicode-TLF}{m}{scsl}{ + <-> ssub * Junicode-TLF/m/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{boldexpanded}{sl}{ - <-> ssub * Junicode-TLF/boldexpanded/it +\DeclareFontShape{OT1}{Junicode-TLF}{regular}{scsl}{ + <-> ssub * Junicode-TLF/regular/scit }{} -% ---- m = regular ---- +% ---- mediumsemiexpanded ---- -\DeclareFontShape{OT1}{Junicode-TLF}{m}{scit}{ - <-> \Junicode@@scale Junicode-Italic-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemiexpanded}{sc}{ + <-> \Junicode@@scale Junicode-SmExpMedium-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{regular}{scit}{ - <-> alias * Junicode-TLF/m/scit +\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{m}{it}{ - <-> \Junicode@@scale Junicode-Italic-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemiexpanded}{scit}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{regular}{it}{ - <-> alias * Junicode-TLF/m/it +\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{m}{sc}{ - <-> \Junicode@@scale Junicode-Regular-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-TLF/mediumsemiexpanded/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{regular}{sc}{ - <-> alias * Junicode-TLF/m/sc +\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemiexpanded}{scsl}{ + <-> ssub * Junicode-TLF/mediumsemiexpanded/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{m}{n}{ - <-> \Junicode@@scale Junicode-Regular-tlf-ot1 + +% ---- medium ---- + +\DeclareFontShape{OT1}{Junicode-TLF}{medium}{sc}{ + <-> \Junicode@@scale Junicode-Medium-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{regular}{n}{ - <-> alias * Junicode-TLF/m/n +\DeclareFontShape{OT1}{Junicode-TLF}{medium}{n}{ + <-> \Junicode@@scale Junicode-Medium-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{m}{scsl}{ - <-> ssub * Junicode-TLF/m/scit +\DeclareFontShape{OT1}{Junicode-TLF}{medium}{scit}{ + <-> \Junicode@@scale Junicode-MediumItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{regular}{scsl}{ - <-> ssub * Junicode-TLF/regular/scit +\DeclareFontShape{OT1}{Junicode-TLF}{medium}{it}{ + <-> \Junicode@@scale Junicode-MediumItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{m}{sl}{ - <-> ssub * Junicode-TLF/m/it +\DeclareFontShape{OT1}{Junicode-TLF}{medium}{sl}{ + <-> ssub * Junicode-TLF/medium/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{regular}{sl}{ - <-> ssub * Junicode-TLF/regular/it +\DeclareFontShape{OT1}{Junicode-TLF}{medium}{scsl}{ + <-> ssub * Junicode-TLF/medium/scit }{} -% ---- lsc = lightsemicondensed ---- +% ---- bx = boldexpanded ---- -\DeclareFontShape{OT1}{Junicode-TLF}{lsc}{sc}{ - <-> \Junicode@@scale Junicode-SmCondLight-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{lightsemicondensed}{sc}{ - <-> alias * Junicode-TLF/lsc/sc +\DeclareFontShape{OT1}{Junicode-TLF}{boldexpanded}{it}{ + <-> alias * Junicode-TLF/bx/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{bx}{n}{ + <-> \Junicode@@scale Junicode-ExpBold-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{lightsemicondensed}{n}{ - <-> alias * Junicode-TLF/lsc/n +\DeclareFontShape{OT1}{Junicode-TLF}{boldexpanded}{n}{ + <-> alias * Junicode-TLF/bx/n }{} -\DeclareFontShape{OT1}{Junicode-TLF}{lsc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{bx}{scit}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{lightsemicondensed}{scit}{ - <-> alias * Junicode-TLF/lsc/scit +\DeclareFontShape{OT1}{Junicode-TLF}{boldexpanded}{scit}{ + <-> alias * Junicode-TLF/bx/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{bx}{sc}{ + <-> \Junicode@@scale Junicode-ExpBold-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{lightsemicondensed}{it}{ - <-> alias * Junicode-TLF/lsc/it +\DeclareFontShape{OT1}{Junicode-TLF}{boldexpanded}{sc}{ + <-> alias * Junicode-TLF/bx/sc }{} -\DeclareFontShape{OT1}{Junicode-TLF}{lsc}{scsl}{ - <-> ssub * Junicode-TLF/lsc/scit +\DeclareFontShape{OT1}{Junicode-TLF}{bx}{sl}{ + <-> ssub * Junicode-TLF/bx/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{lightsemicondensed}{scsl}{ - <-> ssub * Junicode-TLF/lightsemicondensed/scit +\DeclareFontShape{OT1}{Junicode-TLF}{boldexpanded}{sl}{ + <-> ssub * Junicode-TLF/boldexpanded/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{lsc}{sl}{ - <-> ssub * Junicode-TLF/lsc/it +\DeclareFontShape{OT1}{Junicode-TLF}{bx}{scsl}{ + <-> ssub * Junicode-TLF/bx/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{lightsemicondensed}{sl}{ - <-> ssub * Junicode-TLF/lightsemicondensed/it +\DeclareFontShape{OT1}{Junicode-TLF}{boldexpanded}{scsl}{ + <-> ssub * Junicode-TLF/boldexpanded/scit }{} -% ---- medium ---- +% ---- lc = lightcondensed ---- -\DeclareFontShape{OT1}{Junicode-TLF}{medium}{sc}{ - <-> \Junicode@@scale Junicode-Medium-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{lc}{sc}{ + <-> \Junicode@@scale Junicode-CondLight-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{medium}{n}{ - <-> \Junicode@@scale Junicode-Medium-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{lightcondensed}{sc}{ + <-> alias * Junicode-TLF/lc/sc }{} -\DeclareFontShape{OT1}{Junicode-TLF}{medium}{scit}{ - <-> \Junicode@@scale Junicode-MediumItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{medium}{it}{ - <-> \Junicode@@scale Junicode-MediumItalic-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{lightcondensed}{it}{ + <-> alias * Junicode-TLF/lc/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{medium}{scsl}{ - <-> ssub * Junicode-TLF/medium/scit +\DeclareFontShape{OT1}{Junicode-TLF}{lc}{scit}{ + <-> \Junicode@@scale Junicode-CondLightItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{medium}{sl}{ - <-> ssub * Junicode-TLF/medium/it +\DeclareFontShape{OT1}{Junicode-TLF}{lightcondensed}{scit}{ + <-> alias * Junicode-TLF/lc/scit }{} - -% ---- sx = semiexpanded ---- - -\DeclareFontShape{OT1}{Junicode-TLF}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{semiexpanded}{n}{ - <-> alias * Junicode-TLF/sx/n +\DeclareFontShape{OT1}{Junicode-TLF}{lightcondensed}{n}{ + <-> alias * Junicode-TLF/lc/n }{} -\DeclareFontShape{OT1}{Junicode-TLF}{sx}{sc}{ - <-> \Junicode@@scale Junicode-SmExp-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{lc}{sl}{ + <-> ssub * Junicode-TLF/lc/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{semiexpanded}{sc}{ - <-> alias * Junicode-TLF/sx/sc +\DeclareFontShape{OT1}{Junicode-TLF}{lightcondensed}{sl}{ + <-> ssub * Junicode-TLF/lightcondensed/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{lc}{scsl}{ + <-> ssub * Junicode-TLF/lc/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{semiexpanded}{it}{ - <-> alias * Junicode-TLF/sx/it +\DeclareFontShape{OT1}{Junicode-TLF}{lightcondensed}{scsl}{ + <-> ssub * Junicode-TLF/lightcondensed/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{sx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpItalic-tlf-sc-ot1 -}{} -\DeclareFontShape{OT1}{Junicode-TLF}{semiexpanded}{scit}{ - <-> alias * Junicode-TLF/sx/scit -}{} +% ---- lsc = lightsemicondensed ---- -\DeclareFontShape{OT1}{Junicode-TLF}{sx}{scsl}{ - <-> ssub * Junicode-TLF/sx/scit +\DeclareFontShape{OT1}{Junicode-TLF}{lsc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{semiexpanded}{scsl}{ - <-> ssub * Junicode-TLF/semiexpanded/scit +\DeclareFontShape{OT1}{Junicode-TLF}{lightsemicondensed}{scit}{ + <-> alias * Junicode-TLF/lsc/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{sx}{sl}{ - <-> ssub * Junicode-TLF/sx/it +\DeclareFontShape{OT1}{Junicode-TLF}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{semiexpanded}{sl}{ - <-> ssub * Junicode-TLF/semiexpanded/it +\DeclareFontShape{OT1}{Junicode-TLF}{lightsemicondensed}{n}{ + <-> alias * Junicode-TLF/lsc/n }{} +\DeclareFontShape{OT1}{Junicode-TLF}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-ot1 +}{} -% ---- c = condensed ---- +\DeclareFontShape{OT1}{Junicode-TLF}{lightsemicondensed}{it}{ + <-> alias * Junicode-TLF/lsc/it +}{} -\DeclareFontShape{OT1}{Junicode-TLF}{c}{sc}{ - <-> \Junicode@@scale Junicode-Cond-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{lsc}{sc}{ + <-> \Junicode@@scale Junicode-SmCondLight-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{condensed}{sc}{ - <-> alias * Junicode-TLF/c/sc +\DeclareFontShape{OT1}{Junicode-TLF}{lightsemicondensed}{sc}{ + <-> alias * Junicode-TLF/lsc/sc }{} -\DeclareFontShape{OT1}{Junicode-TLF}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{lsc}{sl}{ + <-> ssub * Junicode-TLF/lsc/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{condensed}{n}{ - <-> alias * Junicode-TLF/c/n +\DeclareFontShape{OT1}{Junicode-TLF}{lightsemicondensed}{sl}{ + <-> ssub * Junicode-TLF/lightsemicondensed/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{c}{scit}{ - <-> \Junicode@@scale Junicode-CondItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{lsc}{scsl}{ + <-> ssub * Junicode-TLF/lsc/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{condensed}{scit}{ - <-> alias * Junicode-TLF/c/scit +\DeclareFontShape{OT1}{Junicode-TLF}{lightsemicondensed}{scsl}{ + <-> ssub * Junicode-TLF/lightsemicondensed/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-tlf-ot1 + +% ---- mediumexpanded ---- + +\DeclareFontShape{OT1}{Junicode-TLF}{mediumexpanded}{sc}{ + <-> \Junicode@@scale Junicode-ExpMedium-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{condensed}{it}{ - <-> alias * Junicode-TLF/c/it +\DeclareFontShape{OT1}{Junicode-TLF}{mediumexpanded}{scit}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{c}{scsl}{ - <-> ssub * Junicode-TLF/c/scit +\DeclareFontShape{OT1}{Junicode-TLF}{mediumexpanded}{n}{ + <-> \Junicode@@scale Junicode-ExpMedium-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{condensed}{scsl}{ - <-> ssub * Junicode-TLF/condensed/scit +\DeclareFontShape{OT1}{Junicode-TLF}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{c}{sl}{ - <-> ssub * Junicode-TLF/c/it +\DeclareFontShape{OT1}{Junicode-TLF}{mediumexpanded}{sl}{ + <-> ssub * Junicode-TLF/mediumexpanded/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{condensed}{sl}{ - <-> ssub * Junicode-TLF/condensed/it +\DeclareFontShape{OT1}{Junicode-TLF}{mediumexpanded}{scsl}{ + <-> ssub * Junicode-TLF/mediumexpanded/scit }{} % ---- x = expanded ---- -\DeclareFontShape{OT1}{Junicode-TLF}{x}{it}{ - <-> \Junicode@@scale Junicode-ExpItalic-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{x}{sc}{ + <-> \Junicode@@scale Junicode-Exp-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{expanded}{it}{ - <-> alias * Junicode-TLF/x/it +\DeclareFontShape{OT1}{Junicode-TLF}{expanded}{sc}{ + <-> alias * Junicode-TLF/x/sc }{} \DeclareFontShape{OT1}{Junicode-TLF}{x}{scit}{ @@ -739,12 +691,20 @@ <-> alias * Junicode-TLF/x/n }{} -\DeclareFontShape{OT1}{Junicode-TLF}{x}{sc}{ - <-> \Junicode@@scale Junicode-Exp-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{x}{it}{ + <-> \Junicode@@scale Junicode-ExpItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{expanded}{sc}{ - <-> alias * Junicode-TLF/x/sc +\DeclareFontShape{OT1}{Junicode-TLF}{expanded}{it}{ + <-> alias * Junicode-TLF/x/it +}{} + +\DeclareFontShape{OT1}{Junicode-TLF}{x}{sl}{ + <-> ssub * Junicode-TLF/x/it +}{} + +\DeclareFontShape{OT1}{Junicode-TLF}{expanded}{sl}{ + <-> ssub * Junicode-TLF/expanded/it }{} \DeclareFontShape{OT1}{Junicode-TLF}{x}{scsl}{ @@ -755,117 +715,157 @@ <-> ssub * Junicode-TLF/expanded/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{x}{sl}{ - <-> ssub * Junicode-TLF/x/it + +% ---- b = bold ---- + +\DeclareFontShape{OT1}{Junicode-TLF}{b}{scit}{ + <-> \Junicode@@scale Junicode-BoldItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{expanded}{sl}{ - <-> ssub * Junicode-TLF/expanded/it +\DeclareFontShape{OT1}{Junicode-TLF}{bold}{scit}{ + <-> alias * Junicode-TLF/b/scit }{} +\DeclareFontShape{OT1}{Junicode-TLF}{b}{n}{ + <-> \Junicode@@scale Junicode-Bold-tlf-ot1 +}{} -% ---- sbsx = semiboldsemiexpanded ---- +\DeclareFontShape{OT1}{Junicode-TLF}{bold}{n}{ + <-> alias * Junicode-TLF/b/n +}{} -\DeclareFontShape{OT1}{Junicode-TLF}{sbsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{b}{it}{ + <-> \Junicode@@scale Junicode-BoldItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{semiboldsemiexpanded}{it}{ - <-> alias * Junicode-TLF/sbsx/it +\DeclareFontShape{OT1}{Junicode-TLF}{bold}{it}{ + <-> alias * Junicode-TLF/b/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{sbsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{b}{sc}{ + <-> \Junicode@@scale Junicode-Bold-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{semiboldsemiexpanded}{scit}{ - <-> alias * Junicode-TLF/sbsx/scit +\DeclareFontShape{OT1}{Junicode-TLF}{bold}{sc}{ + <-> alias * Junicode-TLF/b/sc }{} -\DeclareFontShape{OT1}{Junicode-TLF}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{b}{sl}{ + <-> ssub * Junicode-TLF/b/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-TLF/sbsx/n +\DeclareFontShape{OT1}{Junicode-TLF}{bold}{sl}{ + <-> ssub * Junicode-TLF/bold/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{sbsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{b}{scsl}{ + <-> ssub * Junicode-TLF/b/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{semiboldsemiexpanded}{sc}{ - <-> alias * Junicode-TLF/sbsx/sc +\DeclareFontShape{OT1}{Junicode-TLF}{bold}{scsl}{ + <-> ssub * Junicode-TLF/bold/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{sbsx}{scsl}{ - <-> ssub * Junicode-TLF/sbsx/scit + +% ---- sbx = semiboldexpanded ---- + +\DeclareFontShape{OT1}{Junicode-TLF}{sbx}{sc}{ + <-> \Junicode@@scale Junicode-ExpSmBold-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{semiboldsemiexpanded}{scsl}{ - <-> ssub * Junicode-TLF/semiboldsemiexpanded/scit +\DeclareFontShape{OT1}{Junicode-TLF}{semiboldexpanded}{sc}{ + <-> alias * Junicode-TLF/sbx/sc }{} -\DeclareFontShape{OT1}{Junicode-TLF}{sbsx}{sl}{ - <-> ssub * Junicode-TLF/sbsx/it +\DeclareFontShape{OT1}{Junicode-TLF}{sbx}{it}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{semiboldsemiexpanded}{sl}{ - <-> ssub * Junicode-TLF/semiboldsemiexpanded/it +\DeclareFontShape{OT1}{Junicode-TLF}{semiboldexpanded}{it}{ + <-> alias * Junicode-TLF/sbx/it }{} +\DeclareFontShape{OT1}{Junicode-TLF}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-tlf-ot1 +}{} -% ---- mediumexpanded ---- +\DeclareFontShape{OT1}{Junicode-TLF}{semiboldexpanded}{n}{ + <-> alias * Junicode-TLF/sbx/n +}{} -\DeclareFontShape{OT1}{Junicode-TLF}{mediumexpanded}{sc}{ - <-> \Junicode@@scale Junicode-ExpMedium-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{sbx}{scit}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{mediumexpanded}{n}{ - <-> \Junicode@@scale Junicode-ExpMedium-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{semiboldexpanded}{scit}{ + <-> alias * Junicode-TLF/sbx/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{mediumexpanded}{scit}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{sbx}{sl}{ + <-> ssub * Junicode-TLF/sbx/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{semiboldexpanded}{sl}{ + <-> ssub * Junicode-TLF/semiboldexpanded/it }{} -\DeclareFontShape{OT1}{Junicode-TLF}{mediumexpanded}{scsl}{ - <-> ssub * Junicode-TLF/mediumexpanded/scit +\DeclareFontShape{OT1}{Junicode-TLF}{sbx}{scsl}{ + <-> ssub * Junicode-TLF/sbx/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{mediumexpanded}{sl}{ - <-> ssub * Junicode-TLF/mediumexpanded/it +\DeclareFontShape{OT1}{Junicode-TLF}{semiboldexpanded}{scsl}{ + <-> ssub * Junicode-TLF/semiboldexpanded/scit }{} -% ---- mediumsemiexpanded ---- +% ---- c = condensed ---- -\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemiexpanded}{sc}{ - <-> \Junicode@@scale Junicode-SmExpMedium-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{c}{sc}{ + <-> \Junicode@@scale Junicode-Cond-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{condensed}{sc}{ + <-> alias * Junicode-TLF/c/sc }{} -\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemiexpanded}{scit}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{c}{scit}{ + <-> \Junicode@@scale Junicode-CondItalic-tlf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-ot1 +\DeclareFontShape{OT1}{Junicode-TLF}{condensed}{scit}{ + <-> alias * Junicode-TLF/c/scit }{} -\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemiexpanded}{scsl}{ - <-> ssub * Junicode-TLF/mediumsemiexpanded/scit +\DeclareFontShape{OT1}{Junicode-TLF}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-tlf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TLF}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-TLF/mediumsemiexpanded/it +\DeclareFontShape{OT1}{Junicode-TLF}{condensed}{n}{ + <-> alias * Junicode-TLF/c/n +}{} + +\DeclareFontShape{OT1}{Junicode-TLF}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{Junicode-TLF}{condensed}{it}{ + <-> alias * Junicode-TLF/c/it +}{} + +\DeclareFontShape{OT1}{Junicode-TLF}{c}{sl}{ + <-> ssub * Junicode-TLF/c/it +}{} + +\DeclareFontShape{OT1}{Junicode-TLF}{condensed}{sl}{ + <-> ssub * Junicode-TLF/condensed/it +}{} + +\DeclareFontShape{OT1}{Junicode-TLF}{c}{scsl}{ + <-> ssub * Junicode-TLF/c/scit +}{} + +\DeclareFontShape{OT1}{Junicode-TLF}{condensed}{scsl}{ + <-> ssub * Junicode-TLF/condensed/scit }{} diff --git a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-TOsF.fd b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-TOsF.fd index 77547d3a2c7..d7caf690797 100644 --- a/Master/texmf-dist/tex/latex/junicode/OT1Junicode-TOsF.fd +++ b/Master/texmf-dist/tex/latex/junicode/OT1Junicode-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{OT1Junicode-TOsF.fd} - [2024/06/03 (autoinst) Font definitions for OT1/Junicode-TOsF.] + [2024/07/21 (autoinst) Font definitions for OT1/Junicode-TOsF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,394 +20,394 @@ \DeclareFontFamily{OT1}{Junicode-TOsF}{} -% ---- bx = boldexpanded ---- +% ---- c = condensed ---- -\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{scit}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{c}{scit}{ + <-> \Junicode@@scale Junicode-CondItalic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{scit}{ - <-> alias * Junicode-TOsF/bx/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{scit}{ + <-> alias * Junicode-TOsF/c/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{it}{ - <-> alias * Junicode-TOsF/bx/it +\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{n}{ + <-> alias * Junicode-TOsF/c/n }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{sc}{ - <-> \Junicode@@scale Junicode-ExpBold-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{sc}{ - <-> alias * Junicode-TOsF/bx/sc +\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{it}{ + <-> alias * Junicode-TOsF/c/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{n}{ - <-> \Junicode@@scale Junicode-ExpBold-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{c}{sc}{ + <-> \Junicode@@scale Junicode-Cond-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{n}{ - <-> alias * Junicode-TOsF/bx/n +\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{sc}{ + <-> alias * Junicode-TOsF/c/sc }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{scsl}{ - <-> ssub * Junicode-TOsF/bx/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{c}{sl}{ + <-> ssub * Junicode-TOsF/c/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/boldexpanded/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{sl}{ + <-> ssub * Junicode-TOsF/condensed/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{sl}{ - <-> ssub * Junicode-TOsF/bx/it +\DeclareFontShape{OT1}{Junicode-TOsF}{c}{scsl}{ + <-> ssub * Junicode-TOsF/c/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{sl}{ - <-> ssub * Junicode-TOsF/boldexpanded/it +\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{scsl}{ + <-> ssub * Junicode-TOsF/condensed/scit }{} -% ---- l = light ---- +% ---- sbx = semiboldexpanded ---- -\DeclareFontShape{OT1}{Junicode-TOsF}{l}{n}{ - <-> \Junicode@@scale Junicode-Light-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{sc}{ + <-> \Junicode@@scale Junicode-ExpSmBold-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{light}{n}{ - <-> alias * Junicode-TOsF/l/n +\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{sc}{ + <-> alias * Junicode-TOsF/sbx/sc }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{l}{sc}{ - <-> \Junicode@@scale Junicode-Light-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{it}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{light}{sc}{ - <-> alias * Junicode-TOsF/l/sc +\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{it}{ + <-> alias * Junicode-TOsF/sbx/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{l}{it}{ - <-> \Junicode@@scale Junicode-LightItalic-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{scit}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{light}{it}{ - <-> alias * Junicode-TOsF/l/it +\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{scit}{ + <-> alias * Junicode-TOsF/sbx/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{l}{scit}{ - <-> \Junicode@@scale Junicode-LightItalic-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{light}{scit}{ - <-> alias * Junicode-TOsF/l/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{n}{ + <-> alias * Junicode-TOsF/sbx/n }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{l}{scsl}{ - <-> ssub * Junicode-TOsF/l/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{sl}{ + <-> ssub * Junicode-TOsF/sbx/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{light}{scsl}{ - <-> ssub * Junicode-TOsF/light/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{sl}{ + <-> ssub * Junicode-TOsF/semiboldexpanded/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{l}{sl}{ - <-> ssub * Junicode-TOsF/l/it +\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{scsl}{ + <-> ssub * Junicode-TOsF/sbx/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{light}{sl}{ - <-> ssub * Junicode-TOsF/light/it +\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/semiboldexpanded/scit }{} -% ---- lsc = lightsemicondensed ---- +% ---- x = expanded ---- -\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{x}{n}{ + <-> \Junicode@@scale Junicode-Exp-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{n}{ - <-> alias * Junicode-TOsF/lsc/n +\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{n}{ + <-> alias * Junicode-TOsF/x/n }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{sc}{ - <-> \Junicode@@scale Junicode-SmCondLight-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{x}{scit}{ + <-> \Junicode@@scale Junicode-ExpItalic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{sc}{ - <-> alias * Junicode-TOsF/lsc/sc +\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{scit}{ + <-> alias * Junicode-TOsF/x/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{x}{it}{ + <-> \Junicode@@scale Junicode-ExpItalic-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{it}{ - <-> alias * Junicode-TOsF/lsc/it +\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{it}{ + <-> alias * Junicode-TOsF/x/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{x}{sc}{ + <-> \Junicode@@scale Junicode-Exp-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{scit}{ - <-> alias * Junicode-TOsF/lsc/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{sc}{ + <-> alias * Junicode-TOsF/x/sc }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{scsl}{ - <-> ssub * Junicode-TOsF/lsc/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{x}{sl}{ + <-> ssub * Junicode-TOsF/x/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{scsl}{ - <-> ssub * Junicode-TOsF/lightsemicondensed/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{sl}{ + <-> ssub * Junicode-TOsF/expanded/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{sl}{ - <-> ssub * Junicode-TOsF/lsc/it +\DeclareFontShape{OT1}{Junicode-TOsF}{x}{scsl}{ + <-> ssub * Junicode-TOsF/x/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{sl}{ - <-> ssub * Junicode-TOsF/lightsemicondensed/it +\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{scsl}{ + <-> ssub * Junicode-TOsF/expanded/scit }{} -% ---- medium ---- +% ---- b = bold ---- -\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{n}{ - <-> \Junicode@@scale Junicode-Medium-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{b}{it}{ + <-> \Junicode@@scale Junicode-BoldItalic-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{sc}{ - <-> \Junicode@@scale Junicode-Medium-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{it}{ + <-> alias * Junicode-TOsF/b/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{it}{ - <-> \Junicode@@scale Junicode-MediumItalic-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{b}{n}{ + <-> \Junicode@@scale Junicode-Bold-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{scit}{ - <-> \Junicode@@scale Junicode-MediumItalic-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{n}{ + <-> alias * Junicode-TOsF/b/n }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{scsl}{ - <-> ssub * Junicode-TOsF/medium/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{b}{scit}{ + <-> \Junicode@@scale Junicode-BoldItalic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{sl}{ - <-> ssub * Junicode-TOsF/medium/it +\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{scit}{ + <-> alias * Junicode-TOsF/b/scit }{} - -% ---- m = regular ---- - -\DeclareFontShape{OT1}{Junicode-TOsF}{m}{it}{ - <-> \Junicode@@scale Junicode-Italic-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{b}{sc}{ + <-> \Junicode@@scale Junicode-Bold-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{it}{ - <-> alias * Junicode-TOsF/m/it +\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{sc}{ + <-> alias * Junicode-TOsF/b/sc }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{m}{scit}{ - <-> \Junicode@@scale Junicode-Italic-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{b}{sl}{ + <-> ssub * Junicode-TOsF/b/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{scit}{ - <-> alias * Junicode-TOsF/m/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{sl}{ + <-> ssub * Junicode-TOsF/bold/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{m}{n}{ - <-> \Junicode@@scale Junicode-Regular-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{b}{scsl}{ + <-> ssub * Junicode-TOsF/b/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{n}{ - <-> alias * Junicode-TOsF/m/n +\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{scsl}{ + <-> ssub * Junicode-TOsF/bold/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{m}{sc}{ - <-> \Junicode@@scale Junicode-Regular-tosf-sc-ot1 + +% ---- mediumexpanded ---- + +\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{n}{ + <-> \Junicode@@scale Junicode-ExpMedium-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{sc}{ - <-> alias * Junicode-TOsF/m/sc +\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{scit}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{m}{scsl}{ - <-> ssub * Junicode-TOsF/m/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{scsl}{ - <-> ssub * Junicode-TOsF/regular/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{sc}{ + <-> \Junicode@@scale Junicode-ExpMedium-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{m}{sl}{ - <-> ssub * Junicode-TOsF/m/it +\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{sl}{ + <-> ssub * Junicode-TOsF/mediumexpanded/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{sl}{ - <-> ssub * Junicode-TOsF/regular/it +\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/mediumexpanded/scit }{} -% ---- sx = semiexpanded ---- +% ---- lsc = lightsemicondensed ---- -\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{sc}{ - <-> \Junicode@@scale Junicode-SmExp-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{sc}{ + <-> \Junicode@@scale Junicode-SmCondLight-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{sc}{ - <-> alias * Junicode-TOsF/sx/sc +\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{sc}{ + <-> alias * Junicode-TOsF/lsc/sc }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{n}{ - <-> alias * Junicode-TOsF/sx/n +\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{n}{ + <-> alias * Junicode-TOsF/lsc/n }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpItalic-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{scit}{ - <-> alias * Junicode-TOsF/sx/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{scit}{ + <-> alias * Junicode-TOsF/lsc/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{it}{ - <-> alias * Junicode-TOsF/sx/it +\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{it}{ + <-> alias * Junicode-TOsF/lsc/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{scsl}{ - <-> ssub * Junicode-TOsF/sx/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{sl}{ + <-> ssub * Junicode-TOsF/lsc/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/semiexpanded/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{sl}{ + <-> ssub * Junicode-TOsF/lightsemicondensed/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{sl}{ - <-> ssub * Junicode-TOsF/sx/it +\DeclareFontShape{OT1}{Junicode-TOsF}{lsc}{scsl}{ + <-> ssub * Junicode-TOsF/lsc/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{sl}{ - <-> ssub * Junicode-TOsF/semiexpanded/it +\DeclareFontShape{OT1}{Junicode-TOsF}{lightsemicondensed}{scsl}{ + <-> ssub * Junicode-TOsF/lightsemicondensed/scit }{} -% ---- c = condensed ---- +% ---- lc = lightcondensed ---- -\DeclareFontShape{OT1}{Junicode-TOsF}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{scit}{ + <-> \Junicode@@scale Junicode-CondLightItalic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{it}{ - <-> alias * Junicode-TOsF/c/it +\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{scit}{ + <-> alias * Junicode-TOsF/lc/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{c}{scit}{ - <-> \Junicode@@scale Junicode-CondItalic-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{scit}{ - <-> alias * Junicode-TOsF/c/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{n}{ + <-> alias * Junicode-TOsF/lc/n }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{n}{ - <-> alias * Junicode-TOsF/c/n +\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{it}{ + <-> alias * Junicode-TOsF/lc/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{c}{sc}{ - <-> \Junicode@@scale Junicode-Cond-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{sc}{ + <-> \Junicode@@scale Junicode-CondLight-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{sc}{ - <-> alias * Junicode-TOsF/c/sc +\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{sc}{ + <-> alias * Junicode-TOsF/lc/sc }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{c}{scsl}{ - <-> ssub * Junicode-TOsF/c/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{sl}{ + <-> ssub * Junicode-TOsF/lc/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{scsl}{ - <-> ssub * Junicode-TOsF/condensed/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{sl}{ + <-> ssub * Junicode-TOsF/lightcondensed/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{c}{sl}{ - <-> ssub * Junicode-TOsF/c/it +\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{scsl}{ + <-> ssub * Junicode-TOsF/lc/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{condensed}{sl}{ - <-> ssub * Junicode-TOsF/condensed/it +\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{scsl}{ + <-> ssub * Junicode-TOsF/lightcondensed/scit }{} -% ---- x = expanded ---- +% ---- m = regular ---- -\DeclareFontShape{OT1}{Junicode-TOsF}{x}{n}{ - <-> \Junicode@@scale Junicode-Exp-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{m}{sc}{ + <-> \Junicode@@scale Junicode-Regular-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{n}{ - <-> alias * Junicode-TOsF/x/n +\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{sc}{ + <-> alias * Junicode-TOsF/m/sc }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{x}{sc}{ - <-> \Junicode@@scale Junicode-Exp-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{m}{it}{ + <-> \Junicode@@scale Junicode-Italic-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{sc}{ - <-> alias * Junicode-TOsF/x/sc +\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{it}{ + <-> alias * Junicode-TOsF/m/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{x}{it}{ - <-> \Junicode@@scale Junicode-ExpItalic-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{m}{scit}{ + <-> \Junicode@@scale Junicode-Italic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{it}{ - <-> alias * Junicode-TOsF/x/it +\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{scit}{ + <-> alias * Junicode-TOsF/m/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{x}{scit}{ - <-> \Junicode@@scale Junicode-ExpItalic-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{m}{n}{ + <-> \Junicode@@scale Junicode-Regular-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{scit}{ - <-> alias * Junicode-TOsF/x/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{n}{ + <-> alias * Junicode-TOsF/m/n }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{x}{scsl}{ - <-> ssub * Junicode-TOsF/x/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{m}{sl}{ + <-> ssub * Junicode-TOsF/m/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{scsl}{ - <-> ssub * Junicode-TOsF/expanded/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{sl}{ + <-> ssub * Junicode-TOsF/regular/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{x}{sl}{ - <-> ssub * Junicode-TOsF/x/it +\DeclareFontShape{OT1}{Junicode-TOsF}{m}{scsl}{ + <-> ssub * Junicode-TOsF/m/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{expanded}{sl}{ - <-> ssub * Junicode-TOsF/expanded/it +\DeclareFontShape{OT1}{Junicode-TOsF}{regular}{scsl}{ + <-> ssub * Junicode-TOsF/regular/scit }{} % ---- mediumsemiexpanded ---- -\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemiexpanded}{sc}{ - <-> \Junicode@@scale Junicode-SmExpMedium-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-ot1 }{} \DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemiexpanded}{n}{ @@ -418,145 +418,196 @@ <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemiexpanded}{sc}{ + <-> \Junicode@@scale Junicode-SmExpMedium-tosf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-TOsF/mediumsemiexpanded/it }{} \DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemiexpanded}{scsl}{ <-> ssub * Junicode-TOsF/mediumsemiexpanded/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-TOsF/mediumsemiexpanded/it + +% ---- medium ---- + +\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{sc}{ + <-> \Junicode@@scale Junicode-Medium-tosf-sc-ot1 }{} +\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{n}{ + <-> \Junicode@@scale Junicode-Medium-tosf-ot1 +}{} -% ---- sbsx = semiboldsemiexpanded ---- +\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{scit}{ + <-> \Junicode@@scale Junicode-MediumItalic-tosf-sc-ot1 +}{} -\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{it}{ + <-> \Junicode@@scale Junicode-MediumItalic-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{sc}{ - <-> alias * Junicode-TOsF/sbsx/sc +\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{sl}{ + <-> ssub * Junicode-TOsF/medium/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{medium}{scsl}{ + <-> ssub * Junicode-TOsF/medium/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-TOsF/sbsx/n + +% ---- bx = boldexpanded ---- + +\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{sc}{ + <-> \Junicode@@scale Junicode-ExpBold-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{sc}{ + <-> alias * Junicode-TOsF/bx/sc }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{scit}{ - <-> alias * Junicode-TOsF/sbsx/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{scit}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{scit}{ + <-> alias * Junicode-TOsF/bx/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{it}{ - <-> alias * Junicode-TOsF/sbsx/it +\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{n}{ + <-> \Junicode@@scale Junicode-ExpBold-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{scsl}{ - <-> ssub * Junicode-TOsF/sbsx/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{n}{ + <-> alias * Junicode-TOsF/bx/n }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/semiboldsemiexpanded/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{sl}{ - <-> ssub * Junicode-TOsF/sbsx/it +\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{it}{ + <-> alias * Junicode-TOsF/bx/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{sl}{ - <-> ssub * Junicode-TOsF/semiboldsemiexpanded/it +\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{sl}{ + <-> ssub * Junicode-TOsF/bx/it }{} +\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{sl}{ + <-> ssub * Junicode-TOsF/boldexpanded/it +}{} -% ---- mediumexpanded ---- +\DeclareFontShape{OT1}{Junicode-TOsF}{bx}{scsl}{ + <-> ssub * Junicode-TOsF/bx/scit +}{} -\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{sc}{ - <-> \Junicode@@scale Junicode-ExpMedium-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{boldexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/boldexpanded/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{n}{ - <-> \Junicode@@scale Junicode-ExpMedium-tosf-ot1 + +% ---- sx = semiexpanded ---- + +\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{scit}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{it}{ + <-> alias * Junicode-TOsF/sx/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/mediumexpanded/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{n}{ + <-> alias * Junicode-TOsF/sx/n }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{mediumexpanded}{sl}{ - <-> ssub * Junicode-TOsF/mediumexpanded/it +\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpItalic-tosf-sc-ot1 }{} +\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{scit}{ + <-> alias * Junicode-TOsF/sx/scit +}{} -% ---- sbx = semiboldexpanded ---- +\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{sc}{ + <-> \Junicode@@scale Junicode-SmExp-tosf-sc-ot1 +}{} -\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{it}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{sc}{ + <-> alias * Junicode-TOsF/sx/sc }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{it}{ - <-> alias * Junicode-TOsF/sbx/it +\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{sl}{ + <-> ssub * Junicode-TOsF/sx/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{scit}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{sl}{ + <-> ssub * Junicode-TOsF/semiexpanded/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{scit}{ - <-> alias * Junicode-TOsF/sbx/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{sx}{scsl}{ + <-> ssub * Junicode-TOsF/sx/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{semiexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/semiexpanded/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{n}{ - <-> alias * Junicode-TOsF/sbx/n + +% ---- l = light ---- + +\DeclareFontShape{OT1}{Junicode-TOsF}{l}{sc}{ + <-> \Junicode@@scale Junicode-Light-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{sc}{ - <-> \Junicode@@scale Junicode-ExpSmBold-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{light}{sc}{ + <-> alias * Junicode-TOsF/l/sc }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{sc}{ - <-> alias * Junicode-TOsF/sbx/sc +\DeclareFontShape{OT1}{Junicode-TOsF}{l}{it}{ + <-> \Junicode@@scale Junicode-LightItalic-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{scsl}{ - <-> ssub * Junicode-TOsF/sbx/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{light}{it}{ + <-> alias * Junicode-TOsF/l/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/semiboldexpanded/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{l}{n}{ + <-> \Junicode@@scale Junicode-Light-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{sbx}{sl}{ - <-> ssub * Junicode-TOsF/sbx/it +\DeclareFontShape{OT1}{Junicode-TOsF}{light}{n}{ + <-> alias * Junicode-TOsF/l/n }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldexpanded}{sl}{ - <-> ssub * Junicode-TOsF/semiboldexpanded/it +\DeclareFontShape{OT1}{Junicode-TOsF}{l}{scit}{ + <-> \Junicode@@scale Junicode-LightItalic-tosf-sc-ot1 +}{} + +\DeclareFontShape{OT1}{Junicode-TOsF}{light}{scit}{ + <-> alias * Junicode-TOsF/l/scit +}{} + +\DeclareFontShape{OT1}{Junicode-TOsF}{l}{sl}{ + <-> ssub * Junicode-TOsF/l/it +}{} + +\DeclareFontShape{OT1}{Junicode-TOsF}{light}{sl}{ + <-> ssub * Junicode-TOsF/light/it +}{} + +\DeclareFontShape{OT1}{Junicode-TOsF}{l}{scsl}{ + <-> ssub * Junicode-TOsF/l/scit +}{} + +\DeclareFontShape{OT1}{Junicode-TOsF}{light}{scsl}{ + <-> ssub * Junicode-TOsF/light/scit }{} @@ -566,36 +617,28 @@ <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemicondensed}{scit}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-sc-ot1 -}{} - \DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemicondensed}{n}{ <-> \Junicode@@scale Junicode-SmCondMedium-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemicondensed}{sc}{ - <-> \Junicode@@scale Junicode-SmCondMedium-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemicondensed}{scit}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemicondensed}{scsl}{ - <-> ssub * Junicode-TOsF/mediumsemicondensed/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemicondensed}{sc}{ + <-> \Junicode@@scale Junicode-SmCondMedium-tosf-sc-ot1 }{} \DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemicondensed}{sl}{ <-> ssub * Junicode-TOsF/mediumsemicondensed/it }{} - -% ---- sb = semibold ---- - -\DeclareFontShape{OT1}{Junicode-TOsF}{sb}{n}{ - <-> \Junicode@@scale Junicode-SmBold-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{mediumsemicondensed}{scsl}{ + <-> ssub * Junicode-TOsF/mediumsemicondensed/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semibold}{n}{ - <-> alias * Junicode-TOsF/sb/n -}{} + +% ---- sb = semibold ---- \DeclareFontShape{OT1}{Junicode-TOsF}{sb}{sc}{ <-> \Junicode@@scale Junicode-SmBold-tosf-sc-ot1 @@ -605,12 +648,12 @@ <-> alias * Junicode-TOsF/sb/sc }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{sb}{it}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{sb}{n}{ + <-> \Junicode@@scale Junicode-SmBold-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semibold}{it}{ - <-> alias * Junicode-TOsF/sb/it +\DeclareFontShape{OT1}{Junicode-TOsF}{semibold}{n}{ + <-> alias * Junicode-TOsF/sb/n }{} \DeclareFontShape{OT1}{Junicode-TOsF}{sb}{scit}{ @@ -621,12 +664,12 @@ <-> alias * Junicode-TOsF/sb/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{sb}{scsl}{ - <-> ssub * Junicode-TOsF/sb/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{sb}{it}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semibold}{scsl}{ - <-> ssub * Junicode-TOsF/semibold/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{semibold}{it}{ + <-> alias * Junicode-TOsF/sb/it }{} \DeclareFontShape{OT1}{Junicode-TOsF}{sb}{sl}{ @@ -637,66 +680,50 @@ <-> ssub * Junicode-TOsF/semibold/it }{} - -% ---- sc = semicondensed ---- - -\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{it}{ - <-> \Junicode@@scale Junicode-SmCondItalic-tosf-ot1 -}{} - -\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{it}{ - <-> alias * Junicode-TOsF/sc/it -}{} - -\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondItalic-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{sb}{scsl}{ + <-> ssub * Junicode-TOsF/sb/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{scit}{ - <-> alias * Junicode-TOsF/sc/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{semibold}{scsl}{ + <-> ssub * Junicode-TOsF/semibold/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{n}{ - <-> \Junicode@@scale Junicode-SmCond-tosf-ot1 -}{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{n}{ - <-> alias * Junicode-TOsF/sc/n -}{} +% ---- mediumcondensed ---- -\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{sc}{ - <-> \Junicode@@scale Junicode-SmCond-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{sc}{ + <-> \Junicode@@scale Junicode-CondMedium-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{sc}{ - <-> alias * Junicode-TOsF/sc/sc +\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{scsl}{ - <-> ssub * Junicode-TOsF/sc/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{scit}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{scsl}{ - <-> ssub * Junicode-TOsF/semicondensed/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{sl}{ - <-> ssub * Junicode-TOsF/sc/it +\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{sl}{ + <-> ssub * Junicode-TOsF/mediumcondensed/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{sl}{ - <-> ssub * Junicode-TOsF/semicondensed/it +\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{scsl}{ + <-> ssub * Junicode-TOsF/mediumcondensed/scit }{} % ---- bsx = boldsemiexpanded ---- -\DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpBold-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{boldsemiexpanded}{scit}{ - <-> alias * Junicode-TOsF/bsx/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{boldsemiexpanded}{sc}{ + <-> alias * Junicode-TOsF/bsx/sc }{} \DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{it}{ @@ -707,14 +734,6 @@ <-> alias * Junicode-TOsF/bsx/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpBold-tosf-sc-ot1 -}{} - -\DeclareFontShape{OT1}{Junicode-TOsF}{boldsemiexpanded}{sc}{ - <-> alias * Junicode-TOsF/bsx/sc -}{} - \DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{n}{ <-> \Junicode@@scale Junicode-SmExpBold-tosf-ot1 }{} @@ -723,12 +742,12 @@ <-> alias * Junicode-TOsF/bsx/n }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{scsl}{ - <-> ssub * Junicode-TOsF/bsx/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{boldsemiexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/boldsemiexpanded/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{boldsemiexpanded}{scit}{ + <-> alias * Junicode-TOsF/bsx/scit }{} \DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{sl}{ @@ -739,133 +758,114 @@ <-> ssub * Junicode-TOsF/boldsemiexpanded/it }{} - -% ---- lc = lightcondensed ---- - -\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{sc}{ - <-> \Junicode@@scale Junicode-CondLight-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{bsx}{scsl}{ + <-> ssub * Junicode-TOsF/bsx/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{sc}{ - <-> alias * Junicode-TOsF/lc/sc +\DeclareFontShape{OT1}{Junicode-TOsF}{boldsemiexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/boldsemiexpanded/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-tosf-ot1 -}{} -\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{n}{ - <-> alias * Junicode-TOsF/lc/n -}{} +% ---- sbsx = semiboldsemiexpanded ---- -\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{scit}{ - <-> \Junicode@@scale Junicode-CondLightItalic-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{scit}{ - <-> alias * Junicode-TOsF/lc/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-TOsF/sbsx/n }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{it}{ - <-> alias * Junicode-TOsF/lc/it +\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{scit}{ + <-> alias * Junicode-TOsF/sbsx/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{scsl}{ - <-> ssub * Junicode-TOsF/lc/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{scsl}{ - <-> ssub * Junicode-TOsF/lightcondensed/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{it}{ + <-> alias * Junicode-TOsF/sbsx/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{lc}{sl}{ - <-> ssub * Junicode-TOsF/lc/it +\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{lightcondensed}{sl}{ - <-> ssub * Junicode-TOsF/lightcondensed/it +\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{sc}{ + <-> alias * Junicode-TOsF/sbsx/sc }{} - -% ---- b = bold ---- - -\DeclareFontShape{OT1}{Junicode-TOsF}{b}{sc}{ - <-> \Junicode@@scale Junicode-Bold-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{sl}{ + <-> ssub * Junicode-TOsF/sbsx/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{sc}{ - <-> alias * Junicode-TOsF/b/sc +\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{sl}{ + <-> ssub * Junicode-TOsF/semiboldsemiexpanded/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{b}{n}{ - <-> \Junicode@@scale Junicode-Bold-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{sbsx}{scsl}{ + <-> ssub * Junicode-TOsF/sbsx/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{n}{ - <-> alias * Junicode-TOsF/b/n +\DeclareFontShape{OT1}{Junicode-TOsF}{semiboldsemiexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/semiboldsemiexpanded/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{b}{scit}{ - <-> \Junicode@@scale Junicode-BoldItalic-tosf-sc-ot1 -}{} -\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{scit}{ - <-> alias * Junicode-TOsF/b/scit -}{} +% ---- sc = semicondensed ---- -\DeclareFontShape{OT1}{Junicode-TOsF}{b}{it}{ - <-> \Junicode@@scale Junicode-BoldItalic-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{sc}{ + <-> \Junicode@@scale Junicode-SmCond-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{it}{ - <-> alias * Junicode-TOsF/b/it +\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{sc}{ + <-> alias * Junicode-TOsF/sc/sc }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{b}{scsl}{ - <-> ssub * Junicode-TOsF/b/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{it}{ + <-> \Junicode@@scale Junicode-SmCondItalic-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{scsl}{ - <-> ssub * Junicode-TOsF/bold/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{it}{ + <-> alias * Junicode-TOsF/sc/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{b}{sl}{ - <-> ssub * Junicode-TOsF/b/it +\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondItalic-tosf-sc-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{bold}{sl}{ - <-> ssub * Junicode-TOsF/bold/it +\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{scit}{ + <-> alias * Junicode-TOsF/sc/scit }{} - -% ---- mediumcondensed ---- - -\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{scit}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{n}{ + <-> \Junicode@@scale Junicode-SmCond-tosf-ot1 }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{n}{ + <-> alias * Junicode-TOsF/sc/n }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{sc}{ - <-> \Junicode@@scale Junicode-CondMedium-tosf-sc-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{sl}{ + <-> ssub * Junicode-TOsF/sc/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-tosf-ot1 +\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{sl}{ + <-> ssub * Junicode-TOsF/semicondensed/it }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{scsl}{ - <-> ssub * Junicode-TOsF/mediumcondensed/scit +\DeclareFontShape{OT1}{Junicode-TOsF}{sc}{scsl}{ + <-> ssub * Junicode-TOsF/sc/scit }{} -\DeclareFontShape{OT1}{Junicode-TOsF}{mediumcondensed}{sl}{ - <-> ssub * Junicode-TOsF/mediumcondensed/it +\DeclareFontShape{OT1}{Junicode-TOsF}{semicondensed}{scsl}{ + <-> ssub * Junicode-TOsF/semicondensed/scit }{} diff --git a/Master/texmf-dist/tex/latex/junicode/T1Junicode-Inf.fd b/Master/texmf-dist/tex/latex/junicode/T1Junicode-Inf.fd index 847a5511252..8aa4e98b72b 100644 --- a/Master/texmf-dist/tex/latex/junicode/T1Junicode-Inf.fd +++ b/Master/texmf-dist/tex/latex/junicode/T1Junicode-Inf.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{T1Junicode-Inf.fd} - [2024/06/03 (autoinst) Font definitions for T1/Junicode-Inf.] + [2024/07/21 (autoinst) Font definitions for T1/Junicode-Inf.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,146 +20,85 @@ \DeclareFontFamily{T1}{Junicode-Inf}{} -% ---- sbsx = semiboldsemiexpanded ---- - -\DeclareFontShape{T1}{Junicode-Inf}{sbsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-inf-t1 -}{} - -\DeclareFontShape{T1}{Junicode-Inf}{semiboldsemiexpanded}{it}{ - <-> alias * Junicode-Inf/sbsx/it -}{} - -\DeclareFontShape{T1}{Junicode-Inf}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-inf-t1 -}{} - -\DeclareFontShape{T1}{Junicode-Inf}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-Inf/sbsx/n -}{} - -\DeclareFontShape{T1}{Junicode-Inf}{sbsx}{sl}{ - <-> ssub * Junicode-Inf/sbsx/it -}{} - -\DeclareFontShape{T1}{Junicode-Inf}{semiboldsemiexpanded}{sl}{ - <-> ssub * Junicode-Inf/semiboldsemiexpanded/it -}{} - - -% ---- mediumexpanded ---- - -\DeclareFontShape{T1}{Junicode-Inf}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-inf-t1 -}{} +% ---- lc = lightcondensed ---- -\DeclareFontShape{T1}{Junicode-Inf}{mediumexpanded}{n}{ - <-> \Junicode@@scale Junicode-ExpMedium-inf-t1 +\DeclareFontShape{T1}{Junicode-Inf}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-inf-t1 }{} -\DeclareFontShape{T1}{Junicode-Inf}{mediumexpanded}{sl}{ - <-> ssub * Junicode-Inf/mediumexpanded/it +\DeclareFontShape{T1}{Junicode-Inf}{lightcondensed}{n}{ + <-> alias * Junicode-Inf/lc/n }{} - -% ---- mediumsemiexpanded ---- - -\DeclareFontShape{T1}{Junicode-Inf}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-inf-t1 +\DeclareFontShape{T1}{Junicode-Inf}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-inf-t1 }{} -\DeclareFontShape{T1}{Junicode-Inf}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-inf-t1 +\DeclareFontShape{T1}{Junicode-Inf}{lightcondensed}{it}{ + <-> alias * Junicode-Inf/lc/it }{} -\DeclareFontShape{T1}{Junicode-Inf}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-Inf/mediumsemiexpanded/it +\DeclareFontShape{T1}{Junicode-Inf}{lc}{sl}{ + <-> ssub * Junicode-Inf/lc/it }{} - -% ---- sx = semiexpanded ---- - -\DeclareFontShape{T1}{Junicode-Inf}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-inf-t1 +\DeclareFontShape{T1}{Junicode-Inf}{lightcondensed}{sl}{ + <-> ssub * Junicode-Inf/lightcondensed/it }{} -\DeclareFontShape{T1}{Junicode-Inf}{semiexpanded}{n}{ - <-> alias * Junicode-Inf/sx/n -}{} -\DeclareFontShape{T1}{Junicode-Inf}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-inf-t1 -}{} +% ---- medium ---- -\DeclareFontShape{T1}{Junicode-Inf}{semiexpanded}{it}{ - <-> alias * Junicode-Inf/sx/it +\DeclareFontShape{T1}{Junicode-Inf}{medium}{it}{ + <-> \Junicode@@scale Junicode-MediumItalic-inf-t1 }{} -\DeclareFontShape{T1}{Junicode-Inf}{sx}{sl}{ - <-> ssub * Junicode-Inf/sx/it +\DeclareFontShape{T1}{Junicode-Inf}{medium}{n}{ + <-> \Junicode@@scale Junicode-Medium-inf-t1 }{} -\DeclareFontShape{T1}{Junicode-Inf}{semiexpanded}{sl}{ - <-> ssub * Junicode-Inf/semiexpanded/it +\DeclareFontShape{T1}{Junicode-Inf}{medium}{sl}{ + <-> ssub * Junicode-Inf/medium/it }{} -% ---- c = condensed ---- - -\DeclareFontShape{T1}{Junicode-Inf}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-inf-t1 -}{} - -\DeclareFontShape{T1}{Junicode-Inf}{condensed}{it}{ - <-> alias * Junicode-Inf/c/it -}{} +% ---- bx = boldexpanded ---- -\DeclareFontShape{T1}{Junicode-Inf}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-inf-t1 +\DeclareFontShape{T1}{Junicode-Inf}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-inf-t1 }{} -\DeclareFontShape{T1}{Junicode-Inf}{condensed}{n}{ - <-> alias * Junicode-Inf/c/n +\DeclareFontShape{T1}{Junicode-Inf}{boldexpanded}{it}{ + <-> alias * Junicode-Inf/bx/it }{} -\DeclareFontShape{T1}{Junicode-Inf}{c}{sl}{ - <-> ssub * Junicode-Inf/c/it +\DeclareFontShape{T1}{Junicode-Inf}{bx}{n}{ + <-> \Junicode@@scale Junicode-ExpBold-inf-t1 }{} -\DeclareFontShape{T1}{Junicode-Inf}{condensed}{sl}{ - <-> ssub * Junicode-Inf/condensed/it +\DeclareFontShape{T1}{Junicode-Inf}{boldexpanded}{n}{ + <-> alias * Junicode-Inf/bx/n }{} - -% ---- x = expanded ---- - -\DeclareFontShape{T1}{Junicode-Inf}{x}{it}{ - <-> \Junicode@@scale Junicode-ExpItalic-inf-t1 +\DeclareFontShape{T1}{Junicode-Inf}{bx}{sl}{ + <-> ssub * Junicode-Inf/bx/it }{} -\DeclareFontShape{T1}{Junicode-Inf}{expanded}{it}{ - <-> alias * Junicode-Inf/x/it +\DeclareFontShape{T1}{Junicode-Inf}{boldexpanded}{sl}{ + <-> ssub * Junicode-Inf/boldexpanded/it }{} -\DeclareFontShape{T1}{Junicode-Inf}{x}{n}{ - <-> \Junicode@@scale Junicode-Exp-inf-t1 -}{} -\DeclareFontShape{T1}{Junicode-Inf}{expanded}{n}{ - <-> alias * Junicode-Inf/x/n -}{} +% ---- m = regular ---- -\DeclareFontShape{T1}{Junicode-Inf}{x}{sl}{ - <-> ssub * Junicode-Inf/x/it +\DeclareFontShape{T1}{Junicode-Inf}{m}{it}{ + <-> \Junicode@@scale Junicode-Italic-inf-t1 }{} -\DeclareFontShape{T1}{Junicode-Inf}{expanded}{sl}{ - <-> ssub * Junicode-Inf/expanded/it +\DeclareFontShape{T1}{Junicode-Inf}{regular}{it}{ + <-> alias * Junicode-Inf/m/it }{} - -% ---- m = regular ---- - \DeclareFontShape{T1}{Junicode-Inf}{m}{n}{ <-> \Junicode@@scale Junicode-Regular-inf-t1 }{} @@ -168,14 +107,6 @@ <-> alias * Junicode-Inf/m/n }{} -\DeclareFontShape{T1}{Junicode-Inf}{m}{it}{ - <-> \Junicode@@scale Junicode-Italic-inf-t1 -}{} - -\DeclareFontShape{T1}{Junicode-Inf}{regular}{it}{ - <-> alias * Junicode-Inf/m/it -}{} - \DeclareFontShape{T1}{Junicode-Inf}{m}{sl}{ <-> ssub * Junicode-Inf/m/it }{} @@ -185,45 +116,18 @@ }{} -% ---- lsc = lightsemicondensed ---- - -\DeclareFontShape{T1}{Junicode-Inf}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-inf-t1 -}{} - -\DeclareFontShape{T1}{Junicode-Inf}{lightsemicondensed}{n}{ - <-> alias * Junicode-Inf/lsc/n -}{} - -\DeclareFontShape{T1}{Junicode-Inf}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-inf-t1 -}{} - -\DeclareFontShape{T1}{Junicode-Inf}{lightsemicondensed}{it}{ - <-> alias * Junicode-Inf/lsc/it -}{} - -\DeclareFontShape{T1}{Junicode-Inf}{lsc}{sl}{ - <-> ssub * Junicode-Inf/lsc/it -}{} - -\DeclareFontShape{T1}{Junicode-Inf}{lightsemicondensed}{sl}{ - <-> ssub * Junicode-Inf/lightsemicondensed/it -}{} - - -% ---- medium ---- +% ---- mediumsemiexpanded ---- -\DeclareFontShape{T1}{Junicode-Inf}{medium}{it}{ - <-> \Junicode@@scale Junicode-MediumItalic-inf-t1 +\DeclareFontShape{T1}{Junicode-Inf}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-inf-t1 }{} -\DeclareFontShape{T1}{Junicode-Inf}{medium}{n}{ - <-> \Junicode@@scale Junicode-Medium-inf-t1 +\DeclareFontShape{T1}{Junicode-Inf}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-inf-t1 }{} -\DeclareFontShape{T1}{Junicode-Inf}{medium}{sl}{ - <-> ssub * Junicode-Inf/medium/it +\DeclareFontShape{T1}{Junicode-Inf}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-Inf/mediumsemiexpanded/it }{} @@ -254,30 +158,45 @@ }{} -% ---- bx = boldexpanded ---- +% ---- sx = semiexpanded ---- -\DeclareFontShape{T1}{Junicode-Inf}{bx}{n}{ - <-> \Junicode@@scale Junicode-ExpBold-inf-t1 +\DeclareFontShape{T1}{Junicode-Inf}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-inf-t1 }{} -\DeclareFontShape{T1}{Junicode-Inf}{boldexpanded}{n}{ - <-> alias * Junicode-Inf/bx/n +\DeclareFontShape{T1}{Junicode-Inf}{semiexpanded}{it}{ + <-> alias * Junicode-Inf/sx/it }{} -\DeclareFontShape{T1}{Junicode-Inf}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-inf-t1 +\DeclareFontShape{T1}{Junicode-Inf}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-inf-t1 }{} -\DeclareFontShape{T1}{Junicode-Inf}{boldexpanded}{it}{ - <-> alias * Junicode-Inf/bx/it +\DeclareFontShape{T1}{Junicode-Inf}{semiexpanded}{n}{ + <-> alias * Junicode-Inf/sx/n }{} -\DeclareFontShape{T1}{Junicode-Inf}{bx}{sl}{ - <-> ssub * Junicode-Inf/bx/it +\DeclareFontShape{T1}{Junicode-Inf}{sx}{sl}{ + <-> ssub * Junicode-Inf/sx/it }{} -\DeclareFontShape{T1}{Junicode-Inf}{boldexpanded}{sl}{ - <-> ssub * Junicode-Inf/boldexpanded/it +\DeclareFontShape{T1}{Junicode-Inf}{semiexpanded}{sl}{ + <-> ssub * Junicode-Inf/semiexpanded/it +}{} + + +% ---- mediumsemicondensed ---- + +\DeclareFontShape{T1}{Junicode-Inf}{mediumsemicondensed}{it}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-inf-t1 +}{} + +\DeclareFontShape{T1}{Junicode-Inf}{mediumsemicondensed}{n}{ + <-> \Junicode@@scale Junicode-SmCondMedium-inf-t1 +}{} + +\DeclareFontShape{T1}{Junicode-Inf}{mediumsemicondensed}{sl}{ + <-> ssub * Junicode-Inf/mediumsemicondensed/it }{} @@ -296,84 +215,84 @@ }{} -% ---- b = bold ---- +% ---- sb = semibold ---- -\DeclareFontShape{T1}{Junicode-Inf}{b}{n}{ - <-> \Junicode@@scale Junicode-Bold-inf-t1 +\DeclareFontShape{T1}{Junicode-Inf}{sb}{it}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-inf-t1 }{} -\DeclareFontShape{T1}{Junicode-Inf}{bold}{n}{ - <-> alias * Junicode-Inf/b/n +\DeclareFontShape{T1}{Junicode-Inf}{semibold}{it}{ + <-> alias * Junicode-Inf/sb/it }{} -\DeclareFontShape{T1}{Junicode-Inf}{b}{it}{ - <-> \Junicode@@scale Junicode-BoldItalic-inf-t1 +\DeclareFontShape{T1}{Junicode-Inf}{sb}{n}{ + <-> \Junicode@@scale Junicode-SmBold-inf-t1 }{} -\DeclareFontShape{T1}{Junicode-Inf}{bold}{it}{ - <-> alias * Junicode-Inf/b/it +\DeclareFontShape{T1}{Junicode-Inf}{semibold}{n}{ + <-> alias * Junicode-Inf/sb/n }{} -\DeclareFontShape{T1}{Junicode-Inf}{b}{sl}{ - <-> ssub * Junicode-Inf/b/it +\DeclareFontShape{T1}{Junicode-Inf}{sb}{sl}{ + <-> ssub * Junicode-Inf/sb/it }{} -\DeclareFontShape{T1}{Junicode-Inf}{bold}{sl}{ - <-> ssub * Junicode-Inf/bold/it +\DeclareFontShape{T1}{Junicode-Inf}{semibold}{sl}{ + <-> ssub * Junicode-Inf/semibold/it }{} -% ---- bsx = boldsemiexpanded ---- +% ---- sbsx = semiboldsemiexpanded ---- -\DeclareFontShape{T1}{Junicode-Inf}{bsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpBold-inf-t1 +\DeclareFontShape{T1}{Junicode-Inf}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-inf-t1 }{} -\DeclareFontShape{T1}{Junicode-Inf}{boldsemiexpanded}{n}{ - <-> alias * Junicode-Inf/bsx/n +\DeclareFontShape{T1}{Junicode-Inf}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-Inf/sbsx/n }{} -\DeclareFontShape{T1}{Junicode-Inf}{bsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-inf-t1 +\DeclareFontShape{T1}{Junicode-Inf}{sbsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-inf-t1 }{} -\DeclareFontShape{T1}{Junicode-Inf}{boldsemiexpanded}{it}{ - <-> alias * Junicode-Inf/bsx/it +\DeclareFontShape{T1}{Junicode-Inf}{semiboldsemiexpanded}{it}{ + <-> alias * Junicode-Inf/sbsx/it }{} -\DeclareFontShape{T1}{Junicode-Inf}{bsx}{sl}{ - <-> ssub * Junicode-Inf/bsx/it +\DeclareFontShape{T1}{Junicode-Inf}{sbsx}{sl}{ + <-> ssub * Junicode-Inf/sbsx/it }{} -\DeclareFontShape{T1}{Junicode-Inf}{boldsemiexpanded}{sl}{ - <-> ssub * Junicode-Inf/boldsemiexpanded/it +\DeclareFontShape{T1}{Junicode-Inf}{semiboldsemiexpanded}{sl}{ + <-> ssub * Junicode-Inf/semiboldsemiexpanded/it }{} -% ---- lc = lightcondensed ---- +% ---- bsx = boldsemiexpanded ---- -\DeclareFontShape{T1}{Junicode-Inf}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-inf-t1 +\DeclareFontShape{T1}{Junicode-Inf}{bsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpBold-inf-t1 }{} -\DeclareFontShape{T1}{Junicode-Inf}{lightcondensed}{n}{ - <-> alias * Junicode-Inf/lc/n +\DeclareFontShape{T1}{Junicode-Inf}{boldsemiexpanded}{n}{ + <-> alias * Junicode-Inf/bsx/n }{} -\DeclareFontShape{T1}{Junicode-Inf}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-inf-t1 +\DeclareFontShape{T1}{Junicode-Inf}{bsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-inf-t1 }{} -\DeclareFontShape{T1}{Junicode-Inf}{lightcondensed}{it}{ - <-> alias * Junicode-Inf/lc/it +\DeclareFontShape{T1}{Junicode-Inf}{boldsemiexpanded}{it}{ + <-> alias * Junicode-Inf/bsx/it }{} -\DeclareFontShape{T1}{Junicode-Inf}{lc}{sl}{ - <-> ssub * Junicode-Inf/lc/it +\DeclareFontShape{T1}{Junicode-Inf}{bsx}{sl}{ + <-> ssub * Junicode-Inf/bsx/it }{} -\DeclareFontShape{T1}{Junicode-Inf}{lightcondensed}{sl}{ - <-> ssub * Junicode-Inf/lightcondensed/it +\DeclareFontShape{T1}{Junicode-Inf}{boldsemiexpanded}{sl}{ + <-> ssub * Junicode-Inf/boldsemiexpanded/it }{} @@ -404,50 +323,43 @@ }{} -% ---- sb = semibold ---- +% ---- c = condensed ---- -\DeclareFontShape{T1}{Junicode-Inf}{sb}{n}{ - <-> \Junicode@@scale Junicode-SmBold-inf-t1 +\DeclareFontShape{T1}{Junicode-Inf}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-inf-t1 }{} -\DeclareFontShape{T1}{Junicode-Inf}{semibold}{n}{ - <-> alias * Junicode-Inf/sb/n +\DeclareFontShape{T1}{Junicode-Inf}{condensed}{it}{ + <-> alias * Junicode-Inf/c/it }{} -\DeclareFontShape{T1}{Junicode-Inf}{sb}{it}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-inf-t1 +\DeclareFontShape{T1}{Junicode-Inf}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-inf-t1 }{} -\DeclareFontShape{T1}{Junicode-Inf}{semibold}{it}{ - <-> alias * Junicode-Inf/sb/it +\DeclareFontShape{T1}{Junicode-Inf}{condensed}{n}{ + <-> alias * Junicode-Inf/c/n }{} -\DeclareFontShape{T1}{Junicode-Inf}{sb}{sl}{ - <-> ssub * Junicode-Inf/sb/it +\DeclareFontShape{T1}{Junicode-Inf}{c}{sl}{ + <-> ssub * Junicode-Inf/c/it }{} -\DeclareFontShape{T1}{Junicode-Inf}{semibold}{sl}{ - <-> ssub * Junicode-Inf/semibold/it +\DeclareFontShape{T1}{Junicode-Inf}{condensed}{sl}{ + <-> ssub * Junicode-Inf/condensed/it }{} -% ---- mediumsemicondensed ---- - -\DeclareFontShape{T1}{Junicode-Inf}{mediumsemicondensed}{n}{ - <-> \Junicode@@scale Junicode-SmCondMedium-inf-t1 -}{} +% ---- sbx = semiboldexpanded ---- -\DeclareFontShape{T1}{Junicode-Inf}{mediumsemicondensed}{it}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-inf-t1 +\DeclareFontShape{T1}{Junicode-Inf}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-inf-t1 }{} -\DeclareFontShape{T1}{Junicode-Inf}{mediumsemicondensed}{sl}{ - <-> ssub * Junicode-Inf/mediumsemicondensed/it +\DeclareFontShape{T1}{Junicode-Inf}{semiboldexpanded}{n}{ + <-> alias * Junicode-Inf/sbx/n }{} - -% ---- sbx = semiboldexpanded ---- - \DeclareFontShape{T1}{Junicode-Inf}{sbx}{it}{ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-inf-t1 }{} @@ -456,14 +368,6 @@ <-> alias * Junicode-Inf/sbx/it }{} -\DeclareFontShape{T1}{Junicode-Inf}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-inf-t1 -}{} - -\DeclareFontShape{T1}{Junicode-Inf}{semiboldexpanded}{n}{ - <-> alias * Junicode-Inf/sbx/n -}{} - \DeclareFontShape{T1}{Junicode-Inf}{sbx}{sl}{ <-> ssub * Junicode-Inf/sbx/it }{} @@ -473,6 +377,102 @@ }{} +% ---- b = bold ---- + +\DeclareFontShape{T1}{Junicode-Inf}{b}{it}{ + <-> \Junicode@@scale Junicode-BoldItalic-inf-t1 +}{} + +\DeclareFontShape{T1}{Junicode-Inf}{bold}{it}{ + <-> alias * Junicode-Inf/b/it +}{} + +\DeclareFontShape{T1}{Junicode-Inf}{b}{n}{ + <-> \Junicode@@scale Junicode-Bold-inf-t1 +}{} + +\DeclareFontShape{T1}{Junicode-Inf}{bold}{n}{ + <-> alias * Junicode-Inf/b/n +}{} + +\DeclareFontShape{T1}{Junicode-Inf}{b}{sl}{ + <-> ssub * Junicode-Inf/b/it +}{} + +\DeclareFontShape{T1}{Junicode-Inf}{bold}{sl}{ + <-> ssub * Junicode-Inf/bold/it +}{} + + +% ---- x = expanded ---- + +\DeclareFontShape{T1}{Junicode-Inf}{x}{n}{ + <-> \Junicode@@scale Junicode-Exp-inf-t1 +}{} + +\DeclareFontShape{T1}{Junicode-Inf}{expanded}{n}{ + <-> alias * Junicode-Inf/x/n +}{} + +\DeclareFontShape{T1}{Junicode-Inf}{x}{it}{ + <-> \Junicode@@scale Junicode-ExpItalic-inf-t1 +}{} + +\DeclareFontShape{T1}{Junicode-Inf}{expanded}{it}{ + <-> alias * Junicode-Inf/x/it +}{} + +\DeclareFontShape{T1}{Junicode-Inf}{x}{sl}{ + <-> ssub * Junicode-Inf/x/it +}{} + +\DeclareFontShape{T1}{Junicode-Inf}{expanded}{sl}{ + <-> ssub * Junicode-Inf/expanded/it +}{} + + +% ---- mediumexpanded ---- + +\DeclareFontShape{T1}{Junicode-Inf}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-inf-t1 +}{} + +\DeclareFontShape{T1}{Junicode-Inf}{mediumexpanded}{n}{ + <-> \Junicode@@scale Junicode-ExpMedium-inf-t1 +}{} + +\DeclareFontShape{T1}{Junicode-Inf}{mediumexpanded}{sl}{ + <-> ssub * Junicode-Inf/mediumexpanded/it +}{} + + +% ---- lsc = lightsemicondensed ---- + +\DeclareFontShape{T1}{Junicode-Inf}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-inf-t1 +}{} + +\DeclareFontShape{T1}{Junicode-Inf}{lightsemicondensed}{n}{ + <-> alias * Junicode-Inf/lsc/n +}{} + +\DeclareFontShape{T1}{Junicode-Inf}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-inf-t1 +}{} + +\DeclareFontShape{T1}{Junicode-Inf}{lightsemicondensed}{it}{ + <-> alias * Junicode-Inf/lsc/it +}{} + +\DeclareFontShape{T1}{Junicode-Inf}{lsc}{sl}{ + <-> ssub * Junicode-Inf/lsc/it +}{} + +\DeclareFontShape{T1}{Junicode-Inf}{lightsemicondensed}{sl}{ + <-> ssub * Junicode-Inf/lightsemicondensed/it +}{} + + % ---- Extra 'ssub' rules to map 'bx' to 'b' ---- \endinput diff --git a/Master/texmf-dist/tex/latex/junicode/T1Junicode-LF.fd b/Master/texmf-dist/tex/latex/junicode/T1Junicode-LF.fd index e694d9fc06b..96a93a875c1 100644 --- a/Master/texmf-dist/tex/latex/junicode/T1Junicode-LF.fd +++ b/Master/texmf-dist/tex/latex/junicode/T1Junicode-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{T1Junicode-LF.fd} - [2024/06/03 (autoinst) Font definitions for T1/Junicode-LF.] + [2024/07/21 (autoinst) Font definitions for T1/Junicode-LF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,178 +20,167 @@ \DeclareFontFamily{T1}{Junicode-LF}{} -% ---- sbsx = semiboldsemiexpanded ---- +% ---- c = condensed ---- -\DeclareFontShape{T1}{Junicode-LF}{sbsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{c}{scit}{ + <-> \Junicode@@scale Junicode-CondItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{semiboldsemiexpanded}{scit}{ - <-> alias * Junicode-LF/sbsx/scit +\DeclareFontShape{T1}{Junicode-LF}{condensed}{scit}{ + <-> alias * Junicode-LF/c/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{sbsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{semiboldsemiexpanded}{it}{ - <-> alias * Junicode-LF/sbsx/it +\DeclareFontShape{T1}{Junicode-LF}{condensed}{n}{ + <-> alias * Junicode-LF/c/n }{} -\DeclareFontShape{T1}{Junicode-LF}{sbsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{semiboldsemiexpanded}{sc}{ - <-> alias * Junicode-LF/sbsx/sc +\DeclareFontShape{T1}{Junicode-LF}{condensed}{it}{ + <-> alias * Junicode-LF/c/it }{} -\DeclareFontShape{T1}{Junicode-LF}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{c}{sc}{ + <-> \Junicode@@scale Junicode-Cond-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-LF/sbsx/n +\DeclareFontShape{T1}{Junicode-LF}{condensed}{sc}{ + <-> alias * Junicode-LF/c/sc }{} -\DeclareFontShape{T1}{Junicode-LF}{sbsx}{scsl}{ - <-> ssub * Junicode-LF/sbsx/scit +\DeclareFontShape{T1}{Junicode-LF}{c}{sl}{ + <-> ssub * Junicode-LF/c/it }{} -\DeclareFontShape{T1}{Junicode-LF}{semiboldsemiexpanded}{scsl}{ - <-> ssub * Junicode-LF/semiboldsemiexpanded/scit +\DeclareFontShape{T1}{Junicode-LF}{condensed}{sl}{ + <-> ssub * Junicode-LF/condensed/it }{} -\DeclareFontShape{T1}{Junicode-LF}{sbsx}{sl}{ - <-> ssub * Junicode-LF/sbsx/it +\DeclareFontShape{T1}{Junicode-LF}{c}{scsl}{ + <-> ssub * Junicode-LF/c/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{semiboldsemiexpanded}{sl}{ - <-> ssub * Junicode-LF/semiboldsemiexpanded/it +\DeclareFontShape{T1}{Junicode-LF}{condensed}{scsl}{ + <-> ssub * Junicode-LF/condensed/scit }{} -% ---- mediumexpanded ---- +% ---- sbx = semiboldexpanded ---- -\DeclareFontShape{T1}{Junicode-LF}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{sbx}{sc}{ + <-> \Junicode@@scale Junicode-ExpSmBold-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{mediumexpanded}{scit}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{semiboldexpanded}{sc}{ + <-> alias * Junicode-LF/sbx/sc }{} -\DeclareFontShape{T1}{Junicode-LF}{mediumexpanded}{n}{ - <-> \Junicode@@scale Junicode-ExpMedium-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{sbx}{it}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{mediumexpanded}{sc}{ - <-> \Junicode@@scale Junicode-ExpMedium-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{semiboldexpanded}{it}{ + <-> alias * Junicode-LF/sbx/it }{} -\DeclareFontShape{T1}{Junicode-LF}{mediumexpanded}{scsl}{ - <-> ssub * Junicode-LF/mediumexpanded/scit +\DeclareFontShape{T1}{Junicode-LF}{sbx}{scit}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{mediumexpanded}{sl}{ - <-> ssub * Junicode-LF/mediumexpanded/it +\DeclareFontShape{T1}{Junicode-LF}{semiboldexpanded}{scit}{ + <-> alias * Junicode-LF/sbx/scit }{} - -% ---- mediumsemiexpanded ---- - -\DeclareFontShape{T1}{Junicode-LF}{mediumsemiexpanded}{scit}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{semiboldexpanded}{n}{ + <-> alias * Junicode-LF/sbx/n }{} -\DeclareFontShape{T1}{Junicode-LF}{mediumsemiexpanded}{sc}{ - <-> \Junicode@@scale Junicode-SmExpMedium-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{sbx}{sl}{ + <-> ssub * Junicode-LF/sbx/it }{} -\DeclareFontShape{T1}{Junicode-LF}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{semiboldexpanded}{sl}{ + <-> ssub * Junicode-LF/semiboldexpanded/it }{} -\DeclareFontShape{T1}{Junicode-LF}{mediumsemiexpanded}{scsl}{ - <-> ssub * Junicode-LF/mediumsemiexpanded/scit +\DeclareFontShape{T1}{Junicode-LF}{sbx}{scsl}{ + <-> ssub * Junicode-LF/sbx/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-LF/mediumsemiexpanded/it +\DeclareFontShape{T1}{Junicode-LF}{semiboldexpanded}{scsl}{ + <-> ssub * Junicode-LF/semiboldexpanded/scit }{} -% ---- sx = semiexpanded ---- +% ---- b = bold ---- -\DeclareFontShape{T1}{Junicode-LF}{sx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpItalic-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{b}{scit}{ + <-> \Junicode@@scale Junicode-BoldItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{semiexpanded}{scit}{ - <-> alias * Junicode-LF/sx/scit +\DeclareFontShape{T1}{Junicode-LF}{bold}{scit}{ + <-> alias * Junicode-LF/b/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{b}{n}{ + <-> \Junicode@@scale Junicode-Bold-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{semiexpanded}{it}{ - <-> alias * Junicode-LF/sx/it +\DeclareFontShape{T1}{Junicode-LF}{bold}{n}{ + <-> alias * Junicode-LF/b/n }{} -\DeclareFontShape{T1}{Junicode-LF}{sx}{sc}{ - <-> \Junicode@@scale Junicode-SmExp-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{b}{it}{ + <-> \Junicode@@scale Junicode-BoldItalic-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{semiexpanded}{sc}{ - <-> alias * Junicode-LF/sx/sc +\DeclareFontShape{T1}{Junicode-LF}{bold}{it}{ + <-> alias * Junicode-LF/b/it }{} -\DeclareFontShape{T1}{Junicode-LF}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{b}{sc}{ + <-> \Junicode@@scale Junicode-Bold-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{semiexpanded}{n}{ - <-> alias * Junicode-LF/sx/n +\DeclareFontShape{T1}{Junicode-LF}{bold}{sc}{ + <-> alias * Junicode-LF/b/sc }{} -\DeclareFontShape{T1}{Junicode-LF}{sx}{scsl}{ - <-> ssub * Junicode-LF/sx/scit +\DeclareFontShape{T1}{Junicode-LF}{b}{sl}{ + <-> ssub * Junicode-LF/b/it }{} -\DeclareFontShape{T1}{Junicode-LF}{semiexpanded}{scsl}{ - <-> ssub * Junicode-LF/semiexpanded/scit +\DeclareFontShape{T1}{Junicode-LF}{bold}{sl}{ + <-> ssub * Junicode-LF/bold/it }{} -\DeclareFontShape{T1}{Junicode-LF}{sx}{sl}{ - <-> ssub * Junicode-LF/sx/it +\DeclareFontShape{T1}{Junicode-LF}{b}{scsl}{ + <-> ssub * Junicode-LF/b/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{semiexpanded}{sl}{ - <-> ssub * Junicode-LF/semiexpanded/it +\DeclareFontShape{T1}{Junicode-LF}{bold}{scsl}{ + <-> ssub * Junicode-LF/bold/scit }{} % ---- x = expanded ---- -\DeclareFontShape{T1}{Junicode-LF}{x}{it}{ - <-> \Junicode@@scale Junicode-ExpItalic-lf-t1 -}{} - -\DeclareFontShape{T1}{Junicode-LF}{expanded}{it}{ - <-> alias * Junicode-LF/x/it -}{} - -\DeclareFontShape{T1}{Junicode-LF}{x}{scit}{ - <-> \Junicode@@scale Junicode-ExpItalic-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{x}{sc}{ + <-> \Junicode@@scale Junicode-Exp-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{expanded}{scit}{ - <-> alias * Junicode-LF/x/scit +\DeclareFontShape{T1}{Junicode-LF}{expanded}{sc}{ + <-> alias * Junicode-LF/x/sc }{} \DeclareFontShape{T1}{Junicode-LF}{x}{n}{ @@ -202,20 +191,20 @@ <-> alias * Junicode-LF/x/n }{} -\DeclareFontShape{T1}{Junicode-LF}{x}{sc}{ - <-> \Junicode@@scale Junicode-Exp-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{x}{scit}{ + <-> \Junicode@@scale Junicode-ExpItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{expanded}{sc}{ - <-> alias * Junicode-LF/x/sc +\DeclareFontShape{T1}{Junicode-LF}{expanded}{scit}{ + <-> alias * Junicode-LF/x/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{x}{scsl}{ - <-> ssub * Junicode-LF/x/scit +\DeclareFontShape{T1}{Junicode-LF}{x}{it}{ + <-> \Junicode@@scale Junicode-ExpItalic-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{expanded}{scsl}{ - <-> ssub * Junicode-LF/expanded/scit +\DeclareFontShape{T1}{Junicode-LF}{expanded}{it}{ + <-> alias * Junicode-LF/x/it }{} \DeclareFontShape{T1}{Junicode-LF}{x}{sl}{ @@ -226,166 +215,146 @@ <-> ssub * Junicode-LF/expanded/it }{} - -% ---- c = condensed ---- - -\DeclareFontShape{T1}{Junicode-LF}{c}{scit}{ - <-> \Junicode@@scale Junicode-CondItalic-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{x}{scsl}{ + <-> ssub * Junicode-LF/x/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{condensed}{scit}{ - <-> alias * Junicode-LF/c/scit +\DeclareFontShape{T1}{Junicode-LF}{expanded}{scsl}{ + <-> ssub * Junicode-LF/expanded/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-lf-t1 -}{} -\DeclareFontShape{T1}{Junicode-LF}{condensed}{it}{ - <-> alias * Junicode-LF/c/it -}{} +% ---- lsc = lightsemicondensed ---- -\DeclareFontShape{T1}{Junicode-LF}{c}{sc}{ - <-> \Junicode@@scale Junicode-Cond-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{condensed}{sc}{ - <-> alias * Junicode-LF/c/sc +\DeclareFontShape{T1}{Junicode-LF}{lightsemicondensed}{it}{ + <-> alias * Junicode-LF/lsc/it }{} -\DeclareFontShape{T1}{Junicode-LF}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{condensed}{n}{ - <-> alias * Junicode-LF/c/n +\DeclareFontShape{T1}{Junicode-LF}{lightsemicondensed}{n}{ + <-> alias * Junicode-LF/lsc/n }{} -\DeclareFontShape{T1}{Junicode-LF}{c}{scsl}{ - <-> ssub * Junicode-LF/c/scit +\DeclareFontShape{T1}{Junicode-LF}{lsc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{condensed}{scsl}{ - <-> ssub * Junicode-LF/condensed/scit +\DeclareFontShape{T1}{Junicode-LF}{lightsemicondensed}{scit}{ + <-> alias * Junicode-LF/lsc/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{c}{sl}{ - <-> ssub * Junicode-LF/c/it +\DeclareFontShape{T1}{Junicode-LF}{lsc}{sc}{ + <-> \Junicode@@scale Junicode-SmCondLight-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{condensed}{sl}{ - <-> ssub * Junicode-LF/condensed/it +\DeclareFontShape{T1}{Junicode-LF}{lightsemicondensed}{sc}{ + <-> alias * Junicode-LF/lsc/sc }{} - -% ---- m = regular ---- - -\DeclareFontShape{T1}{Junicode-LF}{m}{it}{ - <-> \Junicode@@scale Junicode-Italic-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{lsc}{sl}{ + <-> ssub * Junicode-LF/lsc/it }{} -\DeclareFontShape{T1}{Junicode-LF}{regular}{it}{ - <-> alias * Junicode-LF/m/it +\DeclareFontShape{T1}{Junicode-LF}{lightsemicondensed}{sl}{ + <-> ssub * Junicode-LF/lightsemicondensed/it }{} -\DeclareFontShape{T1}{Junicode-LF}{m}{scit}{ - <-> \Junicode@@scale Junicode-Italic-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{lsc}{scsl}{ + <-> ssub * Junicode-LF/lsc/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{regular}{scit}{ - <-> alias * Junicode-LF/m/scit +\DeclareFontShape{T1}{Junicode-LF}{lightsemicondensed}{scsl}{ + <-> ssub * Junicode-LF/lightsemicondensed/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{m}{n}{ - <-> \Junicode@@scale Junicode-Regular-lf-t1 -}{} -\DeclareFontShape{T1}{Junicode-LF}{regular}{n}{ - <-> alias * Junicode-LF/m/n -}{} +% ---- mediumexpanded ---- -\DeclareFontShape{T1}{Junicode-LF}{m}{sc}{ - <-> \Junicode@@scale Junicode-Regular-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{mediumexpanded}{scit}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{regular}{sc}{ - <-> alias * Junicode-LF/m/sc +\DeclareFontShape{T1}{Junicode-LF}{mediumexpanded}{n}{ + <-> \Junicode@@scale Junicode-ExpMedium-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{m}{scsl}{ - <-> ssub * Junicode-LF/m/scit +\DeclareFontShape{T1}{Junicode-LF}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{regular}{scsl}{ - <-> ssub * Junicode-LF/regular/scit +\DeclareFontShape{T1}{Junicode-LF}{mediumexpanded}{sc}{ + <-> \Junicode@@scale Junicode-ExpMedium-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{m}{sl}{ - <-> ssub * Junicode-LF/m/it +\DeclareFontShape{T1}{Junicode-LF}{mediumexpanded}{sl}{ + <-> ssub * Junicode-LF/mediumexpanded/it }{} -\DeclareFontShape{T1}{Junicode-LF}{regular}{sl}{ - <-> ssub * Junicode-LF/regular/it +\DeclareFontShape{T1}{Junicode-LF}{mediumexpanded}{scsl}{ + <-> ssub * Junicode-LF/mediumexpanded/scit }{} -% ---- lsc = lightsemicondensed ---- +% ---- bx = boldexpanded ---- -\DeclareFontShape{T1}{Junicode-LF}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{bx}{sc}{ + <-> \Junicode@@scale Junicode-ExpBold-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{lightsemicondensed}{n}{ - <-> alias * Junicode-LF/lsc/n +\DeclareFontShape{T1}{Junicode-LF}{boldexpanded}{sc}{ + <-> alias * Junicode-LF/bx/sc }{} -\DeclareFontShape{T1}{Junicode-LF}{lsc}{sc}{ - <-> \Junicode@@scale Junicode-SmCondLight-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{lightsemicondensed}{sc}{ - <-> alias * Junicode-LF/lsc/sc +\DeclareFontShape{T1}{Junicode-LF}{boldexpanded}{it}{ + <-> alias * Junicode-LF/bx/it }{} -\DeclareFontShape{T1}{Junicode-LF}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{bx}{scit}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{lightsemicondensed}{it}{ - <-> alias * Junicode-LF/lsc/it +\DeclareFontShape{T1}{Junicode-LF}{boldexpanded}{scit}{ + <-> alias * Junicode-LF/bx/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{lsc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{bx}{n}{ + <-> \Junicode@@scale Junicode-ExpBold-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{lightsemicondensed}{scit}{ - <-> alias * Junicode-LF/lsc/scit +\DeclareFontShape{T1}{Junicode-LF}{boldexpanded}{n}{ + <-> alias * Junicode-LF/bx/n }{} -\DeclareFontShape{T1}{Junicode-LF}{lsc}{scsl}{ - <-> ssub * Junicode-LF/lsc/scit +\DeclareFontShape{T1}{Junicode-LF}{bx}{sl}{ + <-> ssub * Junicode-LF/bx/it }{} -\DeclareFontShape{T1}{Junicode-LF}{lightsemicondensed}{scsl}{ - <-> ssub * Junicode-LF/lightsemicondensed/scit +\DeclareFontShape{T1}{Junicode-LF}{boldexpanded}{sl}{ + <-> ssub * Junicode-LF/boldexpanded/it }{} -\DeclareFontShape{T1}{Junicode-LF}{lsc}{sl}{ - <-> ssub * Junicode-LF/lsc/it +\DeclareFontShape{T1}{Junicode-LF}{bx}{scsl}{ + <-> ssub * Junicode-LF/bx/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{lightsemicondensed}{sl}{ - <-> ssub * Junicode-LF/lightsemicondensed/it +\DeclareFontShape{T1}{Junicode-LF}{boldexpanded}{scsl}{ + <-> ssub * Junicode-LF/boldexpanded/scit }{} % ---- medium ---- -\DeclareFontShape{T1}{Junicode-LF}{medium}{it}{ - <-> \Junicode@@scale Junicode-MediumItalic-lf-t1 -}{} - \DeclareFontShape{T1}{Junicode-LF}{medium}{scit}{ <-> \Junicode@@scale Junicode-MediumItalic-lf-sc-t1 }{} @@ -394,298 +363,356 @@ <-> \Junicode@@scale Junicode-Medium-lf-t1 }{} +\DeclareFontShape{T1}{Junicode-LF}{medium}{it}{ + <-> \Junicode@@scale Junicode-MediumItalic-lf-t1 +}{} + \DeclareFontShape{T1}{Junicode-LF}{medium}{sc}{ <-> \Junicode@@scale Junicode-Medium-lf-sc-t1 }{} +\DeclareFontShape{T1}{Junicode-LF}{medium}{sl}{ + <-> ssub * Junicode-LF/medium/it +}{} + \DeclareFontShape{T1}{Junicode-LF}{medium}{scsl}{ <-> ssub * Junicode-LF/medium/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{medium}{sl}{ - <-> ssub * Junicode-LF/medium/it + +% ---- m = regular ---- + +\DeclareFontShape{T1}{Junicode-LF}{m}{it}{ + <-> \Junicode@@scale Junicode-Italic-lf-t1 }{} +\DeclareFontShape{T1}{Junicode-LF}{regular}{it}{ + <-> alias * Junicode-LF/m/it +}{} -% ---- l = light ---- +\DeclareFontShape{T1}{Junicode-LF}{m}{n}{ + <-> \Junicode@@scale Junicode-Regular-lf-t1 +}{} -\DeclareFontShape{T1}{Junicode-LF}{l}{sc}{ - <-> \Junicode@@scale Junicode-Light-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{regular}{n}{ + <-> alias * Junicode-LF/m/n }{} -\DeclareFontShape{T1}{Junicode-LF}{light}{sc}{ - <-> alias * Junicode-LF/l/sc +\DeclareFontShape{T1}{Junicode-LF}{m}{scit}{ + <-> \Junicode@@scale Junicode-Italic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{l}{n}{ - <-> \Junicode@@scale Junicode-Light-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{regular}{scit}{ + <-> alias * Junicode-LF/m/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{light}{n}{ - <-> alias * Junicode-LF/l/n +\DeclareFontShape{T1}{Junicode-LF}{m}{sc}{ + <-> \Junicode@@scale Junicode-Regular-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{l}{scit}{ - <-> \Junicode@@scale Junicode-LightItalic-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{regular}{sc}{ + <-> alias * Junicode-LF/m/sc }{} -\DeclareFontShape{T1}{Junicode-LF}{light}{scit}{ - <-> alias * Junicode-LF/l/scit +\DeclareFontShape{T1}{Junicode-LF}{m}{sl}{ + <-> ssub * Junicode-LF/m/it }{} -\DeclareFontShape{T1}{Junicode-LF}{l}{it}{ - <-> \Junicode@@scale Junicode-LightItalic-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{regular}{sl}{ + <-> ssub * Junicode-LF/regular/it }{} -\DeclareFontShape{T1}{Junicode-LF}{light}{it}{ - <-> alias * Junicode-LF/l/it +\DeclareFontShape{T1}{Junicode-LF}{m}{scsl}{ + <-> ssub * Junicode-LF/m/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{l}{scsl}{ - <-> ssub * Junicode-LF/l/scit +\DeclareFontShape{T1}{Junicode-LF}{regular}{scsl}{ + <-> ssub * Junicode-LF/regular/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{light}{scsl}{ - <-> ssub * Junicode-LF/light/scit + +% ---- mediumsemiexpanded ---- + +\DeclareFontShape{T1}{Junicode-LF}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{l}{sl}{ - <-> ssub * Junicode-LF/l/it +\DeclareFontShape{T1}{Junicode-LF}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{light}{sl}{ - <-> ssub * Junicode-LF/light/it +\DeclareFontShape{T1}{Junicode-LF}{mediumsemiexpanded}{scit}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-sc-t1 +}{} + +\DeclareFontShape{T1}{Junicode-LF}{mediumsemiexpanded}{sc}{ + <-> \Junicode@@scale Junicode-SmExpMedium-lf-sc-t1 }{} +\DeclareFontShape{T1}{Junicode-LF}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-LF/mediumsemiexpanded/it +}{} -% ---- bx = boldexpanded ---- +\DeclareFontShape{T1}{Junicode-LF}{mediumsemiexpanded}{scsl}{ + <-> ssub * Junicode-LF/mediumsemiexpanded/scit +}{} -\DeclareFontShape{T1}{Junicode-LF}{bx}{scit}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-sc-t1 + +% ---- lc = lightcondensed ---- + +\DeclareFontShape{T1}{Junicode-LF}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{boldexpanded}{scit}{ - <-> alias * Junicode-LF/bx/scit +\DeclareFontShape{T1}{Junicode-LF}{lightcondensed}{it}{ + <-> alias * Junicode-LF/lc/it }{} -\DeclareFontShape{T1}{Junicode-LF}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{lc}{scit}{ + <-> \Junicode@@scale Junicode-CondLightItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{boldexpanded}{it}{ - <-> alias * Junicode-LF/bx/it +\DeclareFontShape{T1}{Junicode-LF}{lightcondensed}{scit}{ + <-> alias * Junicode-LF/lc/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{bx}{sc}{ - <-> \Junicode@@scale Junicode-ExpBold-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{boldexpanded}{sc}{ - <-> alias * Junicode-LF/bx/sc +\DeclareFontShape{T1}{Junicode-LF}{lightcondensed}{n}{ + <-> alias * Junicode-LF/lc/n }{} -\DeclareFontShape{T1}{Junicode-LF}{bx}{n}{ - <-> \Junicode@@scale Junicode-ExpBold-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{lc}{sc}{ + <-> \Junicode@@scale Junicode-CondLight-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{boldexpanded}{n}{ - <-> alias * Junicode-LF/bx/n +\DeclareFontShape{T1}{Junicode-LF}{lightcondensed}{sc}{ + <-> alias * Junicode-LF/lc/sc }{} -\DeclareFontShape{T1}{Junicode-LF}{bx}{scsl}{ - <-> ssub * Junicode-LF/bx/scit +\DeclareFontShape{T1}{Junicode-LF}{lc}{sl}{ + <-> ssub * Junicode-LF/lc/it }{} -\DeclareFontShape{T1}{Junicode-LF}{boldexpanded}{scsl}{ - <-> ssub * Junicode-LF/boldexpanded/scit +\DeclareFontShape{T1}{Junicode-LF}{lightcondensed}{sl}{ + <-> ssub * Junicode-LF/lightcondensed/it }{} -\DeclareFontShape{T1}{Junicode-LF}{bx}{sl}{ - <-> ssub * Junicode-LF/bx/it +\DeclareFontShape{T1}{Junicode-LF}{lc}{scsl}{ + <-> ssub * Junicode-LF/lc/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{boldexpanded}{sl}{ - <-> ssub * Junicode-LF/boldexpanded/it +\DeclareFontShape{T1}{Junicode-LF}{lightcondensed}{scsl}{ + <-> ssub * Junicode-LF/lightcondensed/scit }{} -% ---- mediumcondensed ---- +% ---- mediumsemicondensed ---- -\DeclareFontShape{T1}{Junicode-LF}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{mediumsemicondensed}{sc}{ + <-> \Junicode@@scale Junicode-SmCondMedium-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{mediumcondensed}{scit}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{mediumsemicondensed}{it}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{mediumsemicondensed}{scit}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{mediumcondensed}{sc}{ - <-> \Junicode@@scale Junicode-CondMedium-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{mediumsemicondensed}{n}{ + <-> \Junicode@@scale Junicode-SmCondMedium-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{mediumcondensed}{scsl}{ - <-> ssub * Junicode-LF/mediumcondensed/scit +\DeclareFontShape{T1}{Junicode-LF}{mediumsemicondensed}{sl}{ + <-> ssub * Junicode-LF/mediumsemicondensed/it }{} -\DeclareFontShape{T1}{Junicode-LF}{mediumcondensed}{sl}{ - <-> ssub * Junicode-LF/mediumcondensed/it +\DeclareFontShape{T1}{Junicode-LF}{mediumsemicondensed}{scsl}{ + <-> ssub * Junicode-LF/mediumsemicondensed/scit }{} -% ---- b = bold ---- +% ---- l = light ---- -\DeclareFontShape{T1}{Junicode-LF}{b}{n}{ - <-> \Junicode@@scale Junicode-Bold-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{l}{sc}{ + <-> \Junicode@@scale Junicode-Light-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{bold}{n}{ - <-> alias * Junicode-LF/b/n +\DeclareFontShape{T1}{Junicode-LF}{light}{sc}{ + <-> alias * Junicode-LF/l/sc }{} -\DeclareFontShape{T1}{Junicode-LF}{b}{sc}{ - <-> \Junicode@@scale Junicode-Bold-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{l}{n}{ + <-> \Junicode@@scale Junicode-Light-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{bold}{sc}{ - <-> alias * Junicode-LF/b/sc +\DeclareFontShape{T1}{Junicode-LF}{light}{n}{ + <-> alias * Junicode-LF/l/n }{} -\DeclareFontShape{T1}{Junicode-LF}{b}{it}{ - <-> \Junicode@@scale Junicode-BoldItalic-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{l}{scit}{ + <-> \Junicode@@scale Junicode-LightItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{bold}{it}{ - <-> alias * Junicode-LF/b/it +\DeclareFontShape{T1}{Junicode-LF}{light}{scit}{ + <-> alias * Junicode-LF/l/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{b}{scit}{ - <-> \Junicode@@scale Junicode-BoldItalic-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{l}{it}{ + <-> \Junicode@@scale Junicode-LightItalic-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{bold}{scit}{ - <-> alias * Junicode-LF/b/scit +\DeclareFontShape{T1}{Junicode-LF}{light}{it}{ + <-> alias * Junicode-LF/l/it }{} -\DeclareFontShape{T1}{Junicode-LF}{b}{scsl}{ - <-> ssub * Junicode-LF/b/scit +\DeclareFontShape{T1}{Junicode-LF}{l}{sl}{ + <-> ssub * Junicode-LF/l/it }{} -\DeclareFontShape{T1}{Junicode-LF}{bold}{scsl}{ - <-> ssub * Junicode-LF/bold/scit +\DeclareFontShape{T1}{Junicode-LF}{light}{sl}{ + <-> ssub * Junicode-LF/light/it }{} -\DeclareFontShape{T1}{Junicode-LF}{b}{sl}{ - <-> ssub * Junicode-LF/b/it +\DeclareFontShape{T1}{Junicode-LF}{l}{scsl}{ + <-> ssub * Junicode-LF/l/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{bold}{sl}{ - <-> ssub * Junicode-LF/bold/it +\DeclareFontShape{T1}{Junicode-LF}{light}{scsl}{ + <-> ssub * Junicode-LF/light/scit }{} -% ---- bsx = boldsemiexpanded ---- +% ---- sx = semiexpanded ---- -\DeclareFontShape{T1}{Junicode-LF}{bsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpBold-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{sx}{sc}{ + <-> \Junicode@@scale Junicode-SmExp-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{boldsemiexpanded}{sc}{ - <-> alias * Junicode-LF/bsx/sc +\DeclareFontShape{T1}{Junicode-LF}{semiexpanded}{sc}{ + <-> alias * Junicode-LF/sx/sc }{} -\DeclareFontShape{T1}{Junicode-LF}{bsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpBold-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{sx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{boldsemiexpanded}{n}{ - <-> alias * Junicode-LF/bsx/n +\DeclareFontShape{T1}{Junicode-LF}{semiexpanded}{scit}{ + <-> alias * Junicode-LF/sx/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{bsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{boldsemiexpanded}{scit}{ - <-> alias * Junicode-LF/bsx/scit +\DeclareFontShape{T1}{Junicode-LF}{semiexpanded}{n}{ + <-> alias * Junicode-LF/sx/n }{} -\DeclareFontShape{T1}{Junicode-LF}{bsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{boldsemiexpanded}{it}{ - <-> alias * Junicode-LF/bsx/it +\DeclareFontShape{T1}{Junicode-LF}{semiexpanded}{it}{ + <-> alias * Junicode-LF/sx/it }{} -\DeclareFontShape{T1}{Junicode-LF}{bsx}{scsl}{ - <-> ssub * Junicode-LF/bsx/scit +\DeclareFontShape{T1}{Junicode-LF}{sx}{sl}{ + <-> ssub * Junicode-LF/sx/it }{} -\DeclareFontShape{T1}{Junicode-LF}{boldsemiexpanded}{scsl}{ - <-> ssub * Junicode-LF/boldsemiexpanded/scit +\DeclareFontShape{T1}{Junicode-LF}{semiexpanded}{sl}{ + <-> ssub * Junicode-LF/semiexpanded/it }{} -\DeclareFontShape{T1}{Junicode-LF}{bsx}{sl}{ - <-> ssub * Junicode-LF/bsx/it +\DeclareFontShape{T1}{Junicode-LF}{sx}{scsl}{ + <-> ssub * Junicode-LF/sx/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{boldsemiexpanded}{sl}{ - <-> ssub * Junicode-LF/boldsemiexpanded/it +\DeclareFontShape{T1}{Junicode-LF}{semiexpanded}{scsl}{ + <-> ssub * Junicode-LF/semiexpanded/scit }{} -% ---- lc = lightcondensed ---- +% ---- mediumcondensed ---- -\DeclareFontShape{T1}{Junicode-LF}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{mediumcondensed}{sc}{ + <-> \Junicode@@scale Junicode-CondMedium-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{lightcondensed}{n}{ - <-> alias * Junicode-LF/lc/n +\DeclareFontShape{T1}{Junicode-LF}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{lc}{sc}{ - <-> \Junicode@@scale Junicode-CondLight-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{mediumcondensed}{scit}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{lightcondensed}{sc}{ - <-> alias * Junicode-LF/lc/sc +\DeclareFontShape{T1}{Junicode-LF}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{mediumcondensed}{sl}{ + <-> ssub * Junicode-LF/mediumcondensed/it }{} -\DeclareFontShape{T1}{Junicode-LF}{lightcondensed}{it}{ - <-> alias * Junicode-LF/lc/it +\DeclareFontShape{T1}{Junicode-LF}{mediumcondensed}{scsl}{ + <-> ssub * Junicode-LF/mediumcondensed/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{lc}{scit}{ - <-> \Junicode@@scale Junicode-CondLightItalic-lf-sc-t1 + +% ---- sb = semibold ---- + +\DeclareFontShape{T1}{Junicode-LF}{sb}{n}{ + <-> \Junicode@@scale Junicode-SmBold-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{lightcondensed}{scit}{ - <-> alias * Junicode-LF/lc/scit +\DeclareFontShape{T1}{Junicode-LF}{semibold}{n}{ + <-> alias * Junicode-LF/sb/n }{} -\DeclareFontShape{T1}{Junicode-LF}{lc}{scsl}{ - <-> ssub * Junicode-LF/lc/scit +\DeclareFontShape{T1}{Junicode-LF}{sb}{scit}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{lightcondensed}{scsl}{ - <-> ssub * Junicode-LF/lightcondensed/scit +\DeclareFontShape{T1}{Junicode-LF}{semibold}{scit}{ + <-> alias * Junicode-LF/sb/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{lc}{sl}{ - <-> ssub * Junicode-LF/lc/it +\DeclareFontShape{T1}{Junicode-LF}{sb}{it}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{lightcondensed}{sl}{ - <-> ssub * Junicode-LF/lightcondensed/it +\DeclareFontShape{T1}{Junicode-LF}{semibold}{it}{ + <-> alias * Junicode-LF/sb/it +}{} + +\DeclareFontShape{T1}{Junicode-LF}{sb}{sc}{ + <-> \Junicode@@scale Junicode-SmBold-lf-sc-t1 +}{} + +\DeclareFontShape{T1}{Junicode-LF}{semibold}{sc}{ + <-> alias * Junicode-LF/sb/sc +}{} + +\DeclareFontShape{T1}{Junicode-LF}{sb}{sl}{ + <-> ssub * Junicode-LF/sb/it +}{} + +\DeclareFontShape{T1}{Junicode-LF}{semibold}{sl}{ + <-> ssub * Junicode-LF/semibold/it +}{} + +\DeclareFontShape{T1}{Junicode-LF}{sb}{scsl}{ + <-> ssub * Junicode-LF/sb/scit +}{} + +\DeclareFontShape{T1}{Junicode-LF}{semibold}{scsl}{ + <-> ssub * Junicode-LF/semibold/scit }{} @@ -699,12 +726,12 @@ <-> alias * Junicode-LF/sc/n }{} -\DeclareFontShape{T1}{Junicode-LF}{sc}{sc}{ - <-> \Junicode@@scale Junicode-SmCond-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{sc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{semicondensed}{sc}{ - <-> alias * Junicode-LF/sc/sc +\DeclareFontShape{T1}{Junicode-LF}{semicondensed}{scit}{ + <-> alias * Junicode-LF/sc/scit }{} \DeclareFontShape{T1}{Junicode-LF}{sc}{it}{ @@ -715,20 +742,12 @@ <-> alias * Junicode-LF/sc/it }{} -\DeclareFontShape{T1}{Junicode-LF}{sc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondItalic-lf-sc-t1 -}{} - -\DeclareFontShape{T1}{Junicode-LF}{semicondensed}{scit}{ - <-> alias * Junicode-LF/sc/scit -}{} - -\DeclareFontShape{T1}{Junicode-LF}{sc}{scsl}{ - <-> ssub * Junicode-LF/sc/scit +\DeclareFontShape{T1}{Junicode-LF}{sc}{sc}{ + <-> \Junicode@@scale Junicode-SmCond-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{semicondensed}{scsl}{ - <-> ssub * Junicode-LF/semicondensed/scit +\DeclareFontShape{T1}{Junicode-LF}{semicondensed}{sc}{ + <-> alias * Junicode-LF/sc/sc }{} \DeclareFontShape{T1}{Junicode-LF}{sc}{sl}{ @@ -739,133 +758,114 @@ <-> ssub * Junicode-LF/semicondensed/it }{} - -% ---- sb = semibold ---- - -\DeclareFontShape{T1}{Junicode-LF}{sb}{sc}{ - <-> \Junicode@@scale Junicode-SmBold-lf-sc-t1 -}{} - -\DeclareFontShape{T1}{Junicode-LF}{semibold}{sc}{ - <-> alias * Junicode-LF/sb/sc -}{} - -\DeclareFontShape{T1}{Junicode-LF}{sb}{n}{ - <-> \Junicode@@scale Junicode-SmBold-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{sc}{scsl}{ + <-> ssub * Junicode-LF/sc/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{semibold}{n}{ - <-> alias * Junicode-LF/sb/n +\DeclareFontShape{T1}{Junicode-LF}{semicondensed}{scsl}{ + <-> ssub * Junicode-LF/semicondensed/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{sb}{scit}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-lf-sc-t1 -}{} -\DeclareFontShape{T1}{Junicode-LF}{semibold}{scit}{ - <-> alias * Junicode-LF/sb/scit -}{} +% ---- bsx = boldsemiexpanded ---- -\DeclareFontShape{T1}{Junicode-LF}{sb}{it}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{bsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{semibold}{it}{ - <-> alias * Junicode-LF/sb/it +\DeclareFontShape{T1}{Junicode-LF}{boldsemiexpanded}{it}{ + <-> alias * Junicode-LF/bsx/it }{} -\DeclareFontShape{T1}{Junicode-LF}{sb}{scsl}{ - <-> ssub * Junicode-LF/sb/scit +\DeclareFontShape{T1}{Junicode-LF}{bsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpBold-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{semibold}{scsl}{ - <-> ssub * Junicode-LF/semibold/scit +\DeclareFontShape{T1}{Junicode-LF}{boldsemiexpanded}{n}{ + <-> alias * Junicode-LF/bsx/n }{} -\DeclareFontShape{T1}{Junicode-LF}{sb}{sl}{ - <-> ssub * Junicode-LF/sb/it +\DeclareFontShape{T1}{Junicode-LF}{bsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{semibold}{sl}{ - <-> ssub * Junicode-LF/semibold/it +\DeclareFontShape{T1}{Junicode-LF}{boldsemiexpanded}{scit}{ + <-> alias * Junicode-LF/bsx/scit }{} - -% ---- mediumsemicondensed ---- - -\DeclareFontShape{T1}{Junicode-LF}{mediumsemicondensed}{scit}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{bsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpBold-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{mediumsemicondensed}{it}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{boldsemiexpanded}{sc}{ + <-> alias * Junicode-LF/bsx/sc }{} -\DeclareFontShape{T1}{Junicode-LF}{mediumsemicondensed}{sc}{ - <-> \Junicode@@scale Junicode-SmCondMedium-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{bsx}{sl}{ + <-> ssub * Junicode-LF/bsx/it }{} -\DeclareFontShape{T1}{Junicode-LF}{mediumsemicondensed}{n}{ - <-> \Junicode@@scale Junicode-SmCondMedium-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{boldsemiexpanded}{sl}{ + <-> ssub * Junicode-LF/boldsemiexpanded/it }{} -\DeclareFontShape{T1}{Junicode-LF}{mediumsemicondensed}{scsl}{ - <-> ssub * Junicode-LF/mediumsemicondensed/scit +\DeclareFontShape{T1}{Junicode-LF}{bsx}{scsl}{ + <-> ssub * Junicode-LF/bsx/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{mediumsemicondensed}{sl}{ - <-> ssub * Junicode-LF/mediumsemicondensed/it +\DeclareFontShape{T1}{Junicode-LF}{boldsemiexpanded}{scsl}{ + <-> ssub * Junicode-LF/boldsemiexpanded/scit }{} -% ---- sbx = semiboldexpanded ---- +% ---- sbsx = semiboldsemiexpanded ---- -\DeclareFontShape{T1}{Junicode-LF}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{semiboldexpanded}{n}{ - <-> alias * Junicode-LF/sbx/n +\DeclareFontShape{T1}{Junicode-LF}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-LF/sbsx/n }{} -\DeclareFontShape{T1}{Junicode-LF}{sbx}{sc}{ - <-> \Junicode@@scale Junicode-ExpSmBold-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{sbsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{semiboldexpanded}{sc}{ - <-> alias * Junicode-LF/sbx/sc +\DeclareFontShape{T1}{Junicode-LF}{semiboldsemiexpanded}{scit}{ + <-> alias * Junicode-LF/sbsx/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{sbx}{it}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-t1 +\DeclareFontShape{T1}{Junicode-LF}{sbsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{semiboldexpanded}{it}{ - <-> alias * Junicode-LF/sbx/it +\DeclareFontShape{T1}{Junicode-LF}{semiboldsemiexpanded}{it}{ + <-> alias * Junicode-LF/sbsx/it }{} -\DeclareFontShape{T1}{Junicode-LF}{sbx}{scit}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-sc-t1 +\DeclareFontShape{T1}{Junicode-LF}{sbsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-lf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-LF}{semiboldexpanded}{scit}{ - <-> alias * Junicode-LF/sbx/scit +\DeclareFontShape{T1}{Junicode-LF}{semiboldsemiexpanded}{sc}{ + <-> alias * Junicode-LF/sbsx/sc }{} -\DeclareFontShape{T1}{Junicode-LF}{sbx}{scsl}{ - <-> ssub * Junicode-LF/sbx/scit +\DeclareFontShape{T1}{Junicode-LF}{sbsx}{sl}{ + <-> ssub * Junicode-LF/sbsx/it }{} -\DeclareFontShape{T1}{Junicode-LF}{semiboldexpanded}{scsl}{ - <-> ssub * Junicode-LF/semiboldexpanded/scit +\DeclareFontShape{T1}{Junicode-LF}{semiboldsemiexpanded}{sl}{ + <-> ssub * Junicode-LF/semiboldsemiexpanded/it }{} -\DeclareFontShape{T1}{Junicode-LF}{sbx}{sl}{ - <-> ssub * Junicode-LF/sbx/it +\DeclareFontShape{T1}{Junicode-LF}{sbsx}{scsl}{ + <-> ssub * Junicode-LF/sbsx/scit }{} -\DeclareFontShape{T1}{Junicode-LF}{semiboldexpanded}{sl}{ - <-> ssub * Junicode-LF/semiboldexpanded/it +\DeclareFontShape{T1}{Junicode-LF}{semiboldsemiexpanded}{scsl}{ + <-> ssub * Junicode-LF/semiboldsemiexpanded/scit }{} diff --git a/Master/texmf-dist/tex/latex/junicode/T1Junicode-OsF.fd b/Master/texmf-dist/tex/latex/junicode/T1Junicode-OsF.fd index 6af4216213e..0055076c6d7 100644 --- a/Master/texmf-dist/tex/latex/junicode/T1Junicode-OsF.fd +++ b/Master/texmf-dist/tex/latex/junicode/T1Junicode-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{T1Junicode-OsF.fd} - [2024/06/03 (autoinst) Font definitions for T1/Junicode-OsF.] + [2024/07/21 (autoinst) Font definitions for T1/Junicode-OsF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,234 +20,312 @@ \DeclareFontFamily{T1}{Junicode-OsF}{} -% ---- mediumsemicondensed ---- +% ---- b = bold ---- -\DeclareFontShape{T1}{Junicode-OsF}{mediumsemicondensed}{sc}{ - <-> \Junicode@@scale Junicode-SmCondMedium-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{b}{sc}{ + <-> \Junicode@@scale Junicode-Bold-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{mediumsemicondensed}{n}{ - <-> \Junicode@@scale Junicode-SmCondMedium-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{bold}{sc}{ + <-> alias * Junicode-OsF/b/sc }{} -\DeclareFontShape{T1}{Junicode-OsF}{mediumsemicondensed}{scit}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{b}{scit}{ + <-> \Junicode@@scale Junicode-BoldItalic-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{mediumsemicondensed}{it}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{bold}{scit}{ + <-> alias * Junicode-OsF/b/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{mediumsemicondensed}{scsl}{ - <-> ssub * Junicode-OsF/mediumsemicondensed/scit +\DeclareFontShape{T1}{Junicode-OsF}{b}{n}{ + <-> \Junicode@@scale Junicode-Bold-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{mediumsemicondensed}{sl}{ - <-> ssub * Junicode-OsF/mediumsemicondensed/it +\DeclareFontShape{T1}{Junicode-OsF}{bold}{n}{ + <-> alias * Junicode-OsF/b/n }{} +\DeclareFontShape{T1}{Junicode-OsF}{b}{it}{ + <-> \Junicode@@scale Junicode-BoldItalic-osf-t1 +}{} -% ---- sbx = semiboldexpanded ---- +\DeclareFontShape{T1}{Junicode-OsF}{bold}{it}{ + <-> alias * Junicode-OsF/b/it +}{} -\DeclareFontShape{T1}{Junicode-OsF}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{b}{sl}{ + <-> ssub * Junicode-OsF/b/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{semiboldexpanded}{n}{ - <-> alias * Junicode-OsF/sbx/n +\DeclareFontShape{T1}{Junicode-OsF}{bold}{sl}{ + <-> ssub * Junicode-OsF/bold/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{sbx}{sc}{ - <-> \Junicode@@scale Junicode-ExpSmBold-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{b}{scsl}{ + <-> ssub * Junicode-OsF/b/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{semiboldexpanded}{sc}{ - <-> alias * Junicode-OsF/sbx/sc +\DeclareFontShape{T1}{Junicode-OsF}{bold}{scsl}{ + <-> ssub * Junicode-OsF/bold/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{sbx}{it}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-t1 + +% ---- x = expanded ---- + +\DeclareFontShape{T1}{Junicode-OsF}{x}{sc}{ + <-> \Junicode@@scale Junicode-Exp-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{semiboldexpanded}{it}{ - <-> alias * Junicode-OsF/sbx/it +\DeclareFontShape{T1}{Junicode-OsF}{expanded}{sc}{ + <-> alias * Junicode-OsF/x/sc }{} -\DeclareFontShape{T1}{Junicode-OsF}{sbx}{scit}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{x}{it}{ + <-> \Junicode@@scale Junicode-ExpItalic-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{semiboldexpanded}{scit}{ - <-> alias * Junicode-OsF/sbx/scit +\DeclareFontShape{T1}{Junicode-OsF}{expanded}{it}{ + <-> alias * Junicode-OsF/x/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{sbx}{scsl}{ - <-> ssub * Junicode-OsF/sbx/scit +\DeclareFontShape{T1}{Junicode-OsF}{x}{scit}{ + <-> \Junicode@@scale Junicode-ExpItalic-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{semiboldexpanded}{scsl}{ - <-> ssub * Junicode-OsF/semiboldexpanded/scit +\DeclareFontShape{T1}{Junicode-OsF}{expanded}{scit}{ + <-> alias * Junicode-OsF/x/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{sbx}{sl}{ - <-> ssub * Junicode-OsF/sbx/it +\DeclareFontShape{T1}{Junicode-OsF}{x}{n}{ + <-> \Junicode@@scale Junicode-Exp-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{semiboldexpanded}{sl}{ - <-> ssub * Junicode-OsF/semiboldexpanded/it +\DeclareFontShape{T1}{Junicode-OsF}{expanded}{n}{ + <-> alias * Junicode-OsF/x/n }{} +\DeclareFontShape{T1}{Junicode-OsF}{x}{sl}{ + <-> ssub * Junicode-OsF/x/it +}{} -% ---- lc = lightcondensed ---- +\DeclareFontShape{T1}{Junicode-OsF}{expanded}{sl}{ + <-> ssub * Junicode-OsF/expanded/it +}{} -\DeclareFontShape{T1}{Junicode-OsF}{lc}{sc}{ - <-> \Junicode@@scale Junicode-CondLight-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{x}{scsl}{ + <-> ssub * Junicode-OsF/x/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{lightcondensed}{sc}{ - <-> alias * Junicode-OsF/lc/sc +\DeclareFontShape{T1}{Junicode-OsF}{expanded}{scsl}{ + <-> ssub * Junicode-OsF/expanded/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-osf-t1 + +% ---- lsc = lightsemicondensed ---- + +\DeclareFontShape{T1}{Junicode-OsF}{lsc}{sc}{ + <-> \Junicode@@scale Junicode-SmCondLight-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{lightcondensed}{n}{ - <-> alias * Junicode-OsF/lc/n +\DeclareFontShape{T1}{Junicode-OsF}{lightsemicondensed}{sc}{ + <-> alias * Junicode-OsF/lsc/sc }{} -\DeclareFontShape{T1}{Junicode-OsF}{lc}{scit}{ - <-> \Junicode@@scale Junicode-CondLightItalic-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{lsc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{lightcondensed}{scit}{ - <-> alias * Junicode-OsF/lc/scit +\DeclareFontShape{T1}{Junicode-OsF}{lightsemicondensed}{scit}{ + <-> alias * Junicode-OsF/lsc/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{lightcondensed}{it}{ - <-> alias * Junicode-OsF/lc/it +\DeclareFontShape{T1}{Junicode-OsF}{lightsemicondensed}{n}{ + <-> alias * Junicode-OsF/lsc/n }{} -\DeclareFontShape{T1}{Junicode-OsF}{lc}{scsl}{ - <-> ssub * Junicode-OsF/lc/scit +\DeclareFontShape{T1}{Junicode-OsF}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{lightcondensed}{scsl}{ - <-> ssub * Junicode-OsF/lightcondensed/scit +\DeclareFontShape{T1}{Junicode-OsF}{lightsemicondensed}{it}{ + <-> alias * Junicode-OsF/lsc/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{lc}{sl}{ - <-> ssub * Junicode-OsF/lc/it +\DeclareFontShape{T1}{Junicode-OsF}{lsc}{sl}{ + <-> ssub * Junicode-OsF/lsc/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{lightcondensed}{sl}{ - <-> ssub * Junicode-OsF/lightcondensed/it +\DeclareFontShape{T1}{Junicode-OsF}{lightsemicondensed}{sl}{ + <-> ssub * Junicode-OsF/lightsemicondensed/it }{} +\DeclareFontShape{T1}{Junicode-OsF}{lsc}{scsl}{ + <-> ssub * Junicode-OsF/lsc/scit +}{} -% ---- bsx = boldsemiexpanded ---- +\DeclareFontShape{T1}{Junicode-OsF}{lightsemicondensed}{scsl}{ + <-> ssub * Junicode-OsF/lightsemicondensed/scit +}{} -\DeclareFontShape{T1}{Junicode-OsF}{bsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-sc-t1 + +% ---- mediumexpanded ---- + +\DeclareFontShape{T1}{Junicode-OsF}{mediumexpanded}{sc}{ + <-> \Junicode@@scale Junicode-ExpMedium-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{boldsemiexpanded}{scit}{ - <-> alias * Junicode-OsF/bsx/scit +\DeclareFontShape{T1}{Junicode-OsF}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{bsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{mediumexpanded}{n}{ + <-> \Junicode@@scale Junicode-ExpMedium-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{boldsemiexpanded}{it}{ - <-> alias * Junicode-OsF/bsx/it +\DeclareFontShape{T1}{Junicode-OsF}{mediumexpanded}{scit}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{bsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpBold-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{mediumexpanded}{sl}{ + <-> ssub * Junicode-OsF/mediumexpanded/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{boldsemiexpanded}{sc}{ - <-> alias * Junicode-OsF/bsx/sc +\DeclareFontShape{T1}{Junicode-OsF}{mediumexpanded}{scsl}{ + <-> ssub * Junicode-OsF/mediumexpanded/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{bsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpBold-osf-t1 + +% ---- c = condensed ---- + +\DeclareFontShape{T1}{Junicode-OsF}{c}{sc}{ + <-> \Junicode@@scale Junicode-Cond-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{boldsemiexpanded}{n}{ - <-> alias * Junicode-OsF/bsx/n +\DeclareFontShape{T1}{Junicode-OsF}{condensed}{sc}{ + <-> alias * Junicode-OsF/c/sc }{} -\DeclareFontShape{T1}{Junicode-OsF}{bsx}{scsl}{ - <-> ssub * Junicode-OsF/bsx/scit +\DeclareFontShape{T1}{Junicode-OsF}{c}{scit}{ + <-> \Junicode@@scale Junicode-CondItalic-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{boldsemiexpanded}{scsl}{ - <-> ssub * Junicode-OsF/boldsemiexpanded/scit +\DeclareFontShape{T1}{Junicode-OsF}{condensed}{scit}{ + <-> alias * Junicode-OsF/c/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{bsx}{sl}{ - <-> ssub * Junicode-OsF/bsx/it +\DeclareFontShape{T1}{Junicode-OsF}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{boldsemiexpanded}{sl}{ - <-> ssub * Junicode-OsF/boldsemiexpanded/it +\DeclareFontShape{T1}{Junicode-OsF}{condensed}{n}{ + <-> alias * Junicode-OsF/c/n }{} +\DeclareFontShape{T1}{Junicode-OsF}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-osf-t1 +}{} -% ---- sc = semicondensed ---- +\DeclareFontShape{T1}{Junicode-OsF}{condensed}{it}{ + <-> alias * Junicode-OsF/c/it +}{} -\DeclareFontShape{T1}{Junicode-OsF}{sc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondItalic-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{c}{sl}{ + <-> ssub * Junicode-OsF/c/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{semicondensed}{scit}{ - <-> alias * Junicode-OsF/sc/scit +\DeclareFontShape{T1}{Junicode-OsF}{condensed}{sl}{ + <-> ssub * Junicode-OsF/condensed/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{sc}{it}{ - <-> \Junicode@@scale Junicode-SmCondItalic-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{c}{scsl}{ + <-> ssub * Junicode-OsF/c/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{semicondensed}{it}{ - <-> alias * Junicode-OsF/sc/it +\DeclareFontShape{T1}{Junicode-OsF}{condensed}{scsl}{ + <-> ssub * Junicode-OsF/condensed/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{sc}{sc}{ - <-> \Junicode@@scale Junicode-SmCond-osf-sc-t1 + +% ---- sbx = semiboldexpanded ---- + +\DeclareFontShape{T1}{Junicode-OsF}{sbx}{it}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{semicondensed}{sc}{ - <-> alias * Junicode-OsF/sc/sc +\DeclareFontShape{T1}{Junicode-OsF}{semiboldexpanded}{it}{ + <-> alias * Junicode-OsF/sbx/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{sc}{n}{ - <-> \Junicode@@scale Junicode-SmCond-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{sbx}{scit}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{semicondensed}{n}{ - <-> alias * Junicode-OsF/sc/n +\DeclareFontShape{T1}{Junicode-OsF}{semiboldexpanded}{scit}{ + <-> alias * Junicode-OsF/sbx/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{sc}{scsl}{ - <-> ssub * Junicode-OsF/sc/scit +\DeclareFontShape{T1}{Junicode-OsF}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{semicondensed}{scsl}{ - <-> ssub * Junicode-OsF/semicondensed/scit +\DeclareFontShape{T1}{Junicode-OsF}{semiboldexpanded}{n}{ + <-> alias * Junicode-OsF/sbx/n }{} -\DeclareFontShape{T1}{Junicode-OsF}{sc}{sl}{ - <-> ssub * Junicode-OsF/sc/it +\DeclareFontShape{T1}{Junicode-OsF}{sbx}{sc}{ + <-> \Junicode@@scale Junicode-ExpSmBold-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{semicondensed}{sl}{ - <-> ssub * Junicode-OsF/semicondensed/it +\DeclareFontShape{T1}{Junicode-OsF}{semiboldexpanded}{sc}{ + <-> alias * Junicode-OsF/sbx/sc +}{} + +\DeclareFontShape{T1}{Junicode-OsF}{sbx}{sl}{ + <-> ssub * Junicode-OsF/sbx/it +}{} + +\DeclareFontShape{T1}{Junicode-OsF}{semiboldexpanded}{sl}{ + <-> ssub * Junicode-OsF/semiboldexpanded/it +}{} + +\DeclareFontShape{T1}{Junicode-OsF}{sbx}{scsl}{ + <-> ssub * Junicode-OsF/sbx/scit +}{} + +\DeclareFontShape{T1}{Junicode-OsF}{semiboldexpanded}{scsl}{ + <-> ssub * Junicode-OsF/semiboldexpanded/scit +}{} + + +% ---- mediumcondensed ---- + +\DeclareFontShape{T1}{Junicode-OsF}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-osf-t1 +}{} + +\DeclareFontShape{T1}{Junicode-OsF}{mediumcondensed}{scit}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-osf-sc-t1 +}{} + +\DeclareFontShape{T1}{Junicode-OsF}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-osf-t1 +}{} + +\DeclareFontShape{T1}{Junicode-OsF}{mediumcondensed}{sc}{ + <-> \Junicode@@scale Junicode-CondMedium-osf-sc-t1 +}{} + +\DeclareFontShape{T1}{Junicode-OsF}{mediumcondensed}{sl}{ + <-> ssub * Junicode-OsF/mediumcondensed/it +}{} + +\DeclareFontShape{T1}{Junicode-OsF}{mediumcondensed}{scsl}{ + <-> ssub * Junicode-OsF/mediumcondensed/scit }{} @@ -261,6 +339,14 @@ <-> alias * Junicode-OsF/sb/scit }{} +\DeclareFontShape{T1}{Junicode-OsF}{sb}{n}{ + <-> \Junicode@@scale Junicode-SmBold-osf-t1 +}{} + +\DeclareFontShape{T1}{Junicode-OsF}{semibold}{n}{ + <-> alias * Junicode-OsF/sb/n +}{} + \DeclareFontShape{T1}{Junicode-OsF}{sb}{it}{ <-> \Junicode@@scale Junicode-SmBoldItalic-osf-t1 }{} @@ -277,12 +363,12 @@ <-> alias * Junicode-OsF/sb/sc }{} -\DeclareFontShape{T1}{Junicode-OsF}{sb}{n}{ - <-> \Junicode@@scale Junicode-SmBold-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{sb}{sl}{ + <-> ssub * Junicode-OsF/sb/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{semibold}{n}{ - <-> alias * Junicode-OsF/sb/n +\DeclareFontShape{T1}{Junicode-OsF}{semibold}{sl}{ + <-> ssub * Junicode-OsF/semibold/it }{} \DeclareFontShape{T1}{Junicode-OsF}{sb}{scsl}{ @@ -293,154 +379,162 @@ <-> ssub * Junicode-OsF/semibold/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{sb}{sl}{ - <-> ssub * Junicode-OsF/sb/it + +% ---- sc = semicondensed ---- + +\DeclareFontShape{T1}{Junicode-OsF}{sc}{sc}{ + <-> \Junicode@@scale Junicode-SmCond-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{semibold}{sl}{ - <-> ssub * Junicode-OsF/semibold/it +\DeclareFontShape{T1}{Junicode-OsF}{semicondensed}{sc}{ + <-> alias * Junicode-OsF/sc/sc }{} +\DeclareFontShape{T1}{Junicode-OsF}{sc}{it}{ + <-> \Junicode@@scale Junicode-SmCondItalic-osf-t1 +}{} -% ---- b = bold ---- +\DeclareFontShape{T1}{Junicode-OsF}{semicondensed}{it}{ + <-> alias * Junicode-OsF/sc/it +}{} -\DeclareFontShape{T1}{Junicode-OsF}{b}{it}{ - <-> \Junicode@@scale Junicode-BoldItalic-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{sc}{n}{ + <-> \Junicode@@scale Junicode-SmCond-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{bold}{it}{ - <-> alias * Junicode-OsF/b/it +\DeclareFontShape{T1}{Junicode-OsF}{semicondensed}{n}{ + <-> alias * Junicode-OsF/sc/n }{} -\DeclareFontShape{T1}{Junicode-OsF}{b}{scit}{ - <-> \Junicode@@scale Junicode-BoldItalic-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{sc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondItalic-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{bold}{scit}{ - <-> alias * Junicode-OsF/b/scit +\DeclareFontShape{T1}{Junicode-OsF}{semicondensed}{scit}{ + <-> alias * Junicode-OsF/sc/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{b}{n}{ - <-> \Junicode@@scale Junicode-Bold-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{sc}{sl}{ + <-> ssub * Junicode-OsF/sc/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{bold}{n}{ - <-> alias * Junicode-OsF/b/n +\DeclareFontShape{T1}{Junicode-OsF}{semicondensed}{sl}{ + <-> ssub * Junicode-OsF/semicondensed/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{b}{sc}{ - <-> \Junicode@@scale Junicode-Bold-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{sc}{scsl}{ + <-> ssub * Junicode-OsF/sc/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{bold}{sc}{ - <-> alias * Junicode-OsF/b/sc +\DeclareFontShape{T1}{Junicode-OsF}{semicondensed}{scsl}{ + <-> ssub * Junicode-OsF/semicondensed/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{b}{scsl}{ - <-> ssub * Junicode-OsF/b/scit + +% ---- sbsx = semiboldsemiexpanded ---- + +\DeclareFontShape{T1}{Junicode-OsF}{sbsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{bold}{scsl}{ - <-> ssub * Junicode-OsF/bold/scit +\DeclareFontShape{T1}{Junicode-OsF}{semiboldsemiexpanded}{it}{ + <-> alias * Junicode-OsF/sbsx/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{b}{sl}{ - <-> ssub * Junicode-OsF/b/it +\DeclareFontShape{T1}{Junicode-OsF}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{bold}{sl}{ - <-> ssub * Junicode-OsF/bold/it +\DeclareFontShape{T1}{Junicode-OsF}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-OsF/sbsx/n }{} +\DeclareFontShape{T1}{Junicode-OsF}{sbsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-sc-t1 +}{} -% ---- mediumcondensed ---- +\DeclareFontShape{T1}{Junicode-OsF}{semiboldsemiexpanded}{scit}{ + <-> alias * Junicode-OsF/sbsx/scit +}{} -\DeclareFontShape{T1}{Junicode-OsF}{mediumcondensed}{sc}{ - <-> \Junicode@@scale Junicode-CondMedium-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{sbsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{semiboldsemiexpanded}{sc}{ + <-> alias * Junicode-OsF/sbsx/sc }{} -\DeclareFontShape{T1}{Junicode-OsF}{mediumcondensed}{scit}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{sbsx}{sl}{ + <-> ssub * Junicode-OsF/sbsx/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{semiboldsemiexpanded}{sl}{ + <-> ssub * Junicode-OsF/semiboldsemiexpanded/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{mediumcondensed}{scsl}{ - <-> ssub * Junicode-OsF/mediumcondensed/scit +\DeclareFontShape{T1}{Junicode-OsF}{sbsx}{scsl}{ + <-> ssub * Junicode-OsF/sbsx/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{mediumcondensed}{sl}{ - <-> ssub * Junicode-OsF/mediumcondensed/it +\DeclareFontShape{T1}{Junicode-OsF}{semiboldsemiexpanded}{scsl}{ + <-> ssub * Junicode-OsF/semiboldsemiexpanded/scit }{} -% ---- l = light ---- +% ---- bsx = boldsemiexpanded ---- -\DeclareFontShape{T1}{Junicode-OsF}{l}{sc}{ - <-> \Junicode@@scale Junicode-Light-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{bsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpBold-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{light}{sc}{ - <-> alias * Junicode-OsF/l/sc +\DeclareFontShape{T1}{Junicode-OsF}{boldsemiexpanded}{sc}{ + <-> alias * Junicode-OsF/bsx/sc }{} -\DeclareFontShape{T1}{Junicode-OsF}{l}{n}{ - <-> \Junicode@@scale Junicode-Light-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{bsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{light}{n}{ - <-> alias * Junicode-OsF/l/n +\DeclareFontShape{T1}{Junicode-OsF}{boldsemiexpanded}{scit}{ + <-> alias * Junicode-OsF/bsx/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{l}{scit}{ - <-> \Junicode@@scale Junicode-LightItalic-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{bsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpBold-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{light}{scit}{ - <-> alias * Junicode-OsF/l/scit +\DeclareFontShape{T1}{Junicode-OsF}{boldsemiexpanded}{n}{ + <-> alias * Junicode-OsF/bsx/n }{} -\DeclareFontShape{T1}{Junicode-OsF}{l}{it}{ - <-> \Junicode@@scale Junicode-LightItalic-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{bsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{light}{it}{ - <-> alias * Junicode-OsF/l/it +\DeclareFontShape{T1}{Junicode-OsF}{boldsemiexpanded}{it}{ + <-> alias * Junicode-OsF/bsx/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{l}{scsl}{ - <-> ssub * Junicode-OsF/l/scit +\DeclareFontShape{T1}{Junicode-OsF}{bsx}{sl}{ + <-> ssub * Junicode-OsF/bsx/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{light}{scsl}{ - <-> ssub * Junicode-OsF/light/scit +\DeclareFontShape{T1}{Junicode-OsF}{boldsemiexpanded}{sl}{ + <-> ssub * Junicode-OsF/boldsemiexpanded/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{l}{sl}{ - <-> ssub * Junicode-OsF/l/it +\DeclareFontShape{T1}{Junicode-OsF}{bsx}{scsl}{ + <-> ssub * Junicode-OsF/bsx/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{light}{sl}{ - <-> ssub * Junicode-OsF/light/it +\DeclareFontShape{T1}{Junicode-OsF}{boldsemiexpanded}{scsl}{ + <-> ssub * Junicode-OsF/boldsemiexpanded/scit }{} % ---- bx = boldexpanded ---- -\DeclareFontShape{T1}{Junicode-OsF}{bx}{sc}{ - <-> \Junicode@@scale Junicode-ExpBold-osf-sc-t1 -}{} - -\DeclareFontShape{T1}{Junicode-OsF}{boldexpanded}{sc}{ - <-> alias * Junicode-OsF/bx/sc -}{} - \DeclareFontShape{T1}{Junicode-OsF}{bx}{n}{ <-> \Junicode@@scale Junicode-ExpBold-osf-t1 }{} @@ -465,12 +559,12 @@ <-> alias * Junicode-OsF/bx/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{bx}{scsl}{ - <-> ssub * Junicode-OsF/bx/scit +\DeclareFontShape{T1}{Junicode-OsF}{bx}{sc}{ + <-> \Junicode@@scale Junicode-ExpBold-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{boldexpanded}{scsl}{ - <-> ssub * Junicode-OsF/boldexpanded/scit +\DeclareFontShape{T1}{Junicode-OsF}{boldexpanded}{sc}{ + <-> alias * Junicode-OsF/bx/sc }{} \DeclareFontShape{T1}{Junicode-OsF}{bx}{sl}{ @@ -481,55 +575,12 @@ <-> ssub * Junicode-OsF/boldexpanded/it }{} - -% ---- m = regular ---- - -\DeclareFontShape{T1}{Junicode-OsF}{m}{it}{ - <-> \Junicode@@scale Junicode-Italic-osf-t1 -}{} - -\DeclareFontShape{T1}{Junicode-OsF}{regular}{it}{ - <-> alias * Junicode-OsF/m/it -}{} - -\DeclareFontShape{T1}{Junicode-OsF}{m}{scit}{ - <-> \Junicode@@scale Junicode-Italic-osf-sc-t1 -}{} - -\DeclareFontShape{T1}{Junicode-OsF}{regular}{scit}{ - <-> alias * Junicode-OsF/m/scit -}{} - -\DeclareFontShape{T1}{Junicode-OsF}{m}{n}{ - <-> \Junicode@@scale Junicode-Regular-osf-t1 -}{} - -\DeclareFontShape{T1}{Junicode-OsF}{regular}{n}{ - <-> alias * Junicode-OsF/m/n -}{} - -\DeclareFontShape{T1}{Junicode-OsF}{m}{sc}{ - <-> \Junicode@@scale Junicode-Regular-osf-sc-t1 -}{} - -\DeclareFontShape{T1}{Junicode-OsF}{regular}{sc}{ - <-> alias * Junicode-OsF/m/sc -}{} - -\DeclareFontShape{T1}{Junicode-OsF}{m}{scsl}{ - <-> ssub * Junicode-OsF/m/scit -}{} - -\DeclareFontShape{T1}{Junicode-OsF}{regular}{scsl}{ - <-> ssub * Junicode-OsF/regular/scit -}{} - -\DeclareFontShape{T1}{Junicode-OsF}{m}{sl}{ - <-> ssub * Junicode-OsF/m/it +\DeclareFontShape{T1}{Junicode-OsF}{bx}{scsl}{ + <-> ssub * Junicode-OsF/bx/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{regular}{sl}{ - <-> ssub * Junicode-OsF/regular/it +\DeclareFontShape{T1}{Junicode-OsF}{boldexpanded}{scsl}{ + <-> ssub * Junicode-OsF/boldexpanded/scit }{} @@ -539,333 +590,282 @@ <-> \Junicode@@scale Junicode-MediumItalic-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{medium}{scit}{ - <-> \Junicode@@scale Junicode-MediumItalic-osf-sc-t1 -}{} - \DeclareFontShape{T1}{Junicode-OsF}{medium}{n}{ <-> \Junicode@@scale Junicode-Medium-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{medium}{sc}{ - <-> \Junicode@@scale Junicode-Medium-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{medium}{scit}{ + <-> \Junicode@@scale Junicode-MediumItalic-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{medium}{scsl}{ - <-> ssub * Junicode-OsF/medium/scit +\DeclareFontShape{T1}{Junicode-OsF}{medium}{sc}{ + <-> \Junicode@@scale Junicode-Medium-osf-sc-t1 }{} \DeclareFontShape{T1}{Junicode-OsF}{medium}{sl}{ <-> ssub * Junicode-OsF/medium/it }{} - -% ---- lsc = lightsemicondensed ---- - -\DeclareFontShape{T1}{Junicode-OsF}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{medium}{scsl}{ + <-> ssub * Junicode-OsF/medium/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{lightsemicondensed}{it}{ - <-> alias * Junicode-OsF/lsc/it -}{} -\DeclareFontShape{T1}{Junicode-OsF}{lsc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-sc-t1 -}{} - -\DeclareFontShape{T1}{Junicode-OsF}{lightsemicondensed}{scit}{ - <-> alias * Junicode-OsF/lsc/scit -}{} +% ---- m = regular ---- -\DeclareFontShape{T1}{Junicode-OsF}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{m}{it}{ + <-> \Junicode@@scale Junicode-Italic-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{lightsemicondensed}{n}{ - <-> alias * Junicode-OsF/lsc/n +\DeclareFontShape{T1}{Junicode-OsF}{regular}{it}{ + <-> alias * Junicode-OsF/m/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{lsc}{sc}{ - <-> \Junicode@@scale Junicode-SmCondLight-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{m}{n}{ + <-> \Junicode@@scale Junicode-Regular-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{lightsemicondensed}{sc}{ - <-> alias * Junicode-OsF/lsc/sc +\DeclareFontShape{T1}{Junicode-OsF}{regular}{n}{ + <-> alias * Junicode-OsF/m/n }{} -\DeclareFontShape{T1}{Junicode-OsF}{lsc}{scsl}{ - <-> ssub * Junicode-OsF/lsc/scit +\DeclareFontShape{T1}{Junicode-OsF}{m}{scit}{ + <-> \Junicode@@scale Junicode-Italic-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{lightsemicondensed}{scsl}{ - <-> ssub * Junicode-OsF/lightsemicondensed/scit +\DeclareFontShape{T1}{Junicode-OsF}{regular}{scit}{ + <-> alias * Junicode-OsF/m/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{lsc}{sl}{ - <-> ssub * Junicode-OsF/lsc/it +\DeclareFontShape{T1}{Junicode-OsF}{m}{sc}{ + <-> \Junicode@@scale Junicode-Regular-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{lightsemicondensed}{sl}{ - <-> ssub * Junicode-OsF/lightsemicondensed/it +\DeclareFontShape{T1}{Junicode-OsF}{regular}{sc}{ + <-> alias * Junicode-OsF/m/sc }{} - -% ---- c = condensed ---- - -\DeclareFontShape{T1}{Junicode-OsF}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{m}{sl}{ + <-> ssub * Junicode-OsF/m/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{condensed}{it}{ - <-> alias * Junicode-OsF/c/it +\DeclareFontShape{T1}{Junicode-OsF}{regular}{sl}{ + <-> ssub * Junicode-OsF/regular/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{c}{scit}{ - <-> \Junicode@@scale Junicode-CondItalic-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{m}{scsl}{ + <-> ssub * Junicode-OsF/m/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{condensed}{scit}{ - <-> alias * Junicode-OsF/c/scit +\DeclareFontShape{T1}{Junicode-OsF}{regular}{scsl}{ + <-> ssub * Junicode-OsF/regular/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-osf-t1 -}{} -\DeclareFontShape{T1}{Junicode-OsF}{condensed}{n}{ - <-> alias * Junicode-OsF/c/n -}{} +% ---- mediumsemiexpanded ---- -\DeclareFontShape{T1}{Junicode-OsF}{c}{sc}{ - <-> \Junicode@@scale Junicode-Cond-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{mediumsemiexpanded}{sc}{ + <-> \Junicode@@scale Junicode-SmExpMedium-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{condensed}{sc}{ - <-> alias * Junicode-OsF/c/sc +\DeclareFontShape{T1}{Junicode-OsF}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{c}{scsl}{ - <-> ssub * Junicode-OsF/c/scit +\DeclareFontShape{T1}{Junicode-OsF}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{condensed}{scsl}{ - <-> ssub * Junicode-OsF/condensed/scit +\DeclareFontShape{T1}{Junicode-OsF}{mediumsemiexpanded}{scit}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{c}{sl}{ - <-> ssub * Junicode-OsF/c/it +\DeclareFontShape{T1}{Junicode-OsF}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-OsF/mediumsemiexpanded/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{condensed}{sl}{ - <-> ssub * Junicode-OsF/condensed/it +\DeclareFontShape{T1}{Junicode-OsF}{mediumsemiexpanded}{scsl}{ + <-> ssub * Junicode-OsF/mediumsemiexpanded/scit }{} -% ---- x = expanded ---- +% ---- lc = lightcondensed ---- -\DeclareFontShape{T1}{Junicode-OsF}{x}{it}{ - <-> \Junicode@@scale Junicode-ExpItalic-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{expanded}{it}{ - <-> alias * Junicode-OsF/x/it +\DeclareFontShape{T1}{Junicode-OsF}{lightcondensed}{it}{ + <-> alias * Junicode-OsF/lc/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{x}{scit}{ - <-> \Junicode@@scale Junicode-ExpItalic-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{lc}{scit}{ + <-> \Junicode@@scale Junicode-CondLightItalic-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{expanded}{scit}{ - <-> alias * Junicode-OsF/x/scit +\DeclareFontShape{T1}{Junicode-OsF}{lightcondensed}{scit}{ + <-> alias * Junicode-OsF/lc/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{x}{n}{ - <-> \Junicode@@scale Junicode-Exp-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{expanded}{n}{ - <-> alias * Junicode-OsF/x/n +\DeclareFontShape{T1}{Junicode-OsF}{lightcondensed}{n}{ + <-> alias * Junicode-OsF/lc/n }{} -\DeclareFontShape{T1}{Junicode-OsF}{x}{sc}{ - <-> \Junicode@@scale Junicode-Exp-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{lc}{sc}{ + <-> \Junicode@@scale Junicode-CondLight-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{expanded}{sc}{ - <-> alias * Junicode-OsF/x/sc +\DeclareFontShape{T1}{Junicode-OsF}{lightcondensed}{sc}{ + <-> alias * Junicode-OsF/lc/sc }{} -\DeclareFontShape{T1}{Junicode-OsF}{x}{scsl}{ - <-> ssub * Junicode-OsF/x/scit +\DeclareFontShape{T1}{Junicode-OsF}{lc}{sl}{ + <-> ssub * Junicode-OsF/lc/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{expanded}{scsl}{ - <-> ssub * Junicode-OsF/expanded/scit +\DeclareFontShape{T1}{Junicode-OsF}{lightcondensed}{sl}{ + <-> ssub * Junicode-OsF/lightcondensed/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{x}{sl}{ - <-> ssub * Junicode-OsF/x/it +\DeclareFontShape{T1}{Junicode-OsF}{lc}{scsl}{ + <-> ssub * Junicode-OsF/lc/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{expanded}{sl}{ - <-> ssub * Junicode-OsF/expanded/it +\DeclareFontShape{T1}{Junicode-OsF}{lightcondensed}{scsl}{ + <-> ssub * Junicode-OsF/lightcondensed/scit }{} -% ---- sx = semiexpanded ---- - -\DeclareFontShape{T1}{Junicode-OsF}{sx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpItalic-osf-sc-t1 -}{} - -\DeclareFontShape{T1}{Junicode-OsF}{semiexpanded}{scit}{ - <-> alias * Junicode-OsF/sx/scit -}{} +% ---- mediumsemicondensed ---- -\DeclareFontShape{T1}{Junicode-OsF}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{mediumsemicondensed}{sc}{ + <-> \Junicode@@scale Junicode-SmCondMedium-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{semiexpanded}{it}{ - <-> alias * Junicode-OsF/sx/it +\DeclareFontShape{T1}{Junicode-OsF}{mediumsemicondensed}{n}{ + <-> \Junicode@@scale Junicode-SmCondMedium-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{sx}{sc}{ - <-> \Junicode@@scale Junicode-SmExp-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{mediumsemicondensed}{scit}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{semiexpanded}{sc}{ - <-> alias * Junicode-OsF/sx/sc +\DeclareFontShape{T1}{Junicode-OsF}{mediumsemicondensed}{it}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{mediumsemicondensed}{sl}{ + <-> ssub * Junicode-OsF/mediumsemicondensed/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{semiexpanded}{n}{ - <-> alias * Junicode-OsF/sx/n +\DeclareFontShape{T1}{Junicode-OsF}{mediumsemicondensed}{scsl}{ + <-> ssub * Junicode-OsF/mediumsemicondensed/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{sx}{scsl}{ - <-> ssub * Junicode-OsF/sx/scit -}{} -\DeclareFontShape{T1}{Junicode-OsF}{semiexpanded}{scsl}{ - <-> ssub * Junicode-OsF/semiexpanded/scit -}{} +% ---- l = light ---- -\DeclareFontShape{T1}{Junicode-OsF}{sx}{sl}{ - <-> ssub * Junicode-OsF/sx/it +\DeclareFontShape{T1}{Junicode-OsF}{l}{sc}{ + <-> \Junicode@@scale Junicode-Light-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{semiexpanded}{sl}{ - <-> ssub * Junicode-OsF/semiexpanded/it +\DeclareFontShape{T1}{Junicode-OsF}{light}{sc}{ + <-> alias * Junicode-OsF/l/sc }{} - -% ---- mediumexpanded ---- - -\DeclareFontShape{T1}{Junicode-OsF}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{l}{it}{ + <-> \Junicode@@scale Junicode-LightItalic-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{mediumexpanded}{scit}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{light}{it}{ + <-> alias * Junicode-OsF/l/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{mediumexpanded}{n}{ - <-> \Junicode@@scale Junicode-ExpMedium-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{l}{n}{ + <-> \Junicode@@scale Junicode-Light-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{mediumexpanded}{sc}{ - <-> \Junicode@@scale Junicode-ExpMedium-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{light}{n}{ + <-> alias * Junicode-OsF/l/n }{} -\DeclareFontShape{T1}{Junicode-OsF}{mediumexpanded}{scsl}{ - <-> ssub * Junicode-OsF/mediumexpanded/scit +\DeclareFontShape{T1}{Junicode-OsF}{l}{scit}{ + <-> \Junicode@@scale Junicode-LightItalic-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{mediumexpanded}{sl}{ - <-> ssub * Junicode-OsF/mediumexpanded/it +\DeclareFontShape{T1}{Junicode-OsF}{light}{scit}{ + <-> alias * Junicode-OsF/l/scit }{} - -% ---- sbsx = semiboldsemiexpanded ---- - -\DeclareFontShape{T1}{Junicode-OsF}{sbsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{l}{sl}{ + <-> ssub * Junicode-OsF/l/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{semiboldsemiexpanded}{scit}{ - <-> alias * Junicode-OsF/sbsx/scit +\DeclareFontShape{T1}{Junicode-OsF}{light}{sl}{ + <-> ssub * Junicode-OsF/light/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{sbsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{l}{scsl}{ + <-> ssub * Junicode-OsF/l/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{semiboldsemiexpanded}{it}{ - <-> alias * Junicode-OsF/sbsx/it +\DeclareFontShape{T1}{Junicode-OsF}{light}{scsl}{ + <-> ssub * Junicode-OsF/light/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{sbsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-osf-sc-t1 -}{} -\DeclareFontShape{T1}{Junicode-OsF}{semiboldsemiexpanded}{sc}{ - <-> alias * Junicode-OsF/sbsx/sc -}{} +% ---- sx = semiexpanded ---- -\DeclareFontShape{T1}{Junicode-OsF}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{sx}{sc}{ + <-> \Junicode@@scale Junicode-SmExp-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-OsF/sbsx/n +\DeclareFontShape{T1}{Junicode-OsF}{semiexpanded}{sc}{ + <-> alias * Junicode-OsF/sx/sc }{} -\DeclareFontShape{T1}{Junicode-OsF}{sbsx}{scsl}{ - <-> ssub * Junicode-OsF/sbsx/scit +\DeclareFontShape{T1}{Junicode-OsF}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{semiboldsemiexpanded}{scsl}{ - <-> ssub * Junicode-OsF/semiboldsemiexpanded/scit +\DeclareFontShape{T1}{Junicode-OsF}{semiexpanded}{n}{ + <-> alias * Junicode-OsF/sx/n }{} -\DeclareFontShape{T1}{Junicode-OsF}{sbsx}{sl}{ - <-> ssub * Junicode-OsF/sbsx/it +\DeclareFontShape{T1}{Junicode-OsF}{sx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpItalic-osf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{semiboldsemiexpanded}{sl}{ - <-> ssub * Junicode-OsF/semiboldsemiexpanded/it +\DeclareFontShape{T1}{Junicode-OsF}{semiexpanded}{scit}{ + <-> alias * Junicode-OsF/sx/scit }{} - -% ---- mediumsemiexpanded ---- - -\DeclareFontShape{T1}{Junicode-OsF}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-osf-t1 }{} -\DeclareFontShape{T1}{Junicode-OsF}{mediumsemiexpanded}{sc}{ - <-> \Junicode@@scale Junicode-SmExpMedium-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{semiexpanded}{it}{ + <-> alias * Junicode-OsF/sx/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-t1 +\DeclareFontShape{T1}{Junicode-OsF}{sx}{sl}{ + <-> ssub * Junicode-OsF/sx/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{mediumsemiexpanded}{scit}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-sc-t1 +\DeclareFontShape{T1}{Junicode-OsF}{semiexpanded}{sl}{ + <-> ssub * Junicode-OsF/semiexpanded/it }{} -\DeclareFontShape{T1}{Junicode-OsF}{mediumsemiexpanded}{scsl}{ - <-> ssub * Junicode-OsF/mediumsemiexpanded/scit +\DeclareFontShape{T1}{Junicode-OsF}{sx}{scsl}{ + <-> ssub * Junicode-OsF/sx/scit }{} -\DeclareFontShape{T1}{Junicode-OsF}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-OsF/mediumsemiexpanded/it +\DeclareFontShape{T1}{Junicode-OsF}{semiexpanded}{scsl}{ + <-> ssub * Junicode-OsF/semiexpanded/scit }{} diff --git a/Master/texmf-dist/tex/latex/junicode/T1Junicode-Sup.fd b/Master/texmf-dist/tex/latex/junicode/T1Junicode-Sup.fd index dd152bd085e..86903276ad1 100644 --- a/Master/texmf-dist/tex/latex/junicode/T1Junicode-Sup.fd +++ b/Master/texmf-dist/tex/latex/junicode/T1Junicode-Sup.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{T1Junicode-Sup.fd} - [2024/06/03 (autoinst) Font definitions for T1/Junicode-Sup.] + [2024/07/21 (autoinst) Font definitions for T1/Junicode-Sup.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,126 +20,111 @@ \DeclareFontFamily{T1}{Junicode-Sup}{} -% ---- sx = semiexpanded ---- +% ---- c = condensed ---- -\DeclareFontShape{T1}{Junicode-Sup}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-sup-t1 +\DeclareFontShape{T1}{Junicode-Sup}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-sup-t1 }{} -\DeclareFontShape{T1}{Junicode-Sup}{semiexpanded}{n}{ - <-> alias * Junicode-Sup/sx/n +\DeclareFontShape{T1}{Junicode-Sup}{condensed}{n}{ + <-> alias * Junicode-Sup/c/n }{} -\DeclareFontShape{T1}{Junicode-Sup}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-sup-t1 +\DeclareFontShape{T1}{Junicode-Sup}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-sup-t1 }{} -\DeclareFontShape{T1}{Junicode-Sup}{semiexpanded}{it}{ - <-> alias * Junicode-Sup/sx/it +\DeclareFontShape{T1}{Junicode-Sup}{condensed}{it}{ + <-> alias * Junicode-Sup/c/it }{} -\DeclareFontShape{T1}{Junicode-Sup}{sx}{sl}{ - <-> ssub * Junicode-Sup/sx/it +\DeclareFontShape{T1}{Junicode-Sup}{c}{sl}{ + <-> ssub * Junicode-Sup/c/it }{} -\DeclareFontShape{T1}{Junicode-Sup}{semiexpanded}{sl}{ - <-> ssub * Junicode-Sup/semiexpanded/it +\DeclareFontShape{T1}{Junicode-Sup}{condensed}{sl}{ + <-> ssub * Junicode-Sup/condensed/it }{} -% ---- x = expanded ---- - -\DeclareFontShape{T1}{Junicode-Sup}{x}{n}{ - <-> \Junicode@@scale Junicode-Exp-sup-t1 -}{} +% ---- sbx = semiboldexpanded ---- -\DeclareFontShape{T1}{Junicode-Sup}{expanded}{n}{ - <-> alias * Junicode-Sup/x/n +\DeclareFontShape{T1}{Junicode-Sup}{sbx}{it}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-sup-t1 }{} -\DeclareFontShape{T1}{Junicode-Sup}{x}{it}{ - <-> \Junicode@@scale Junicode-ExpItalic-sup-t1 +\DeclareFontShape{T1}{Junicode-Sup}{semiboldexpanded}{it}{ + <-> alias * Junicode-Sup/sbx/it }{} -\DeclareFontShape{T1}{Junicode-Sup}{expanded}{it}{ - <-> alias * Junicode-Sup/x/it +\DeclareFontShape{T1}{Junicode-Sup}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-sup-t1 }{} -\DeclareFontShape{T1}{Junicode-Sup}{x}{sl}{ - <-> ssub * Junicode-Sup/x/it +\DeclareFontShape{T1}{Junicode-Sup}{semiboldexpanded}{n}{ + <-> alias * Junicode-Sup/sbx/n }{} -\DeclareFontShape{T1}{Junicode-Sup}{expanded}{sl}{ - <-> ssub * Junicode-Sup/expanded/it +\DeclareFontShape{T1}{Junicode-Sup}{sbx}{sl}{ + <-> ssub * Junicode-Sup/sbx/it }{} - -% ---- c = condensed ---- - -\DeclareFontShape{T1}{Junicode-Sup}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-sup-t1 +\DeclareFontShape{T1}{Junicode-Sup}{semiboldexpanded}{sl}{ + <-> ssub * Junicode-Sup/semiboldexpanded/it }{} -\DeclareFontShape{T1}{Junicode-Sup}{condensed}{n}{ - <-> alias * Junicode-Sup/c/n -}{} -\DeclareFontShape{T1}{Junicode-Sup}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-sup-t1 -}{} +% ---- x = expanded ---- -\DeclareFontShape{T1}{Junicode-Sup}{condensed}{it}{ - <-> alias * Junicode-Sup/c/it +\DeclareFontShape{T1}{Junicode-Sup}{x}{n}{ + <-> \Junicode@@scale Junicode-Exp-sup-t1 }{} -\DeclareFontShape{T1}{Junicode-Sup}{c}{sl}{ - <-> ssub * Junicode-Sup/c/it +\DeclareFontShape{T1}{Junicode-Sup}{expanded}{n}{ + <-> alias * Junicode-Sup/x/n }{} -\DeclareFontShape{T1}{Junicode-Sup}{condensed}{sl}{ - <-> ssub * Junicode-Sup/condensed/it +\DeclareFontShape{T1}{Junicode-Sup}{x}{it}{ + <-> \Junicode@@scale Junicode-ExpItalic-sup-t1 }{} - -% ---- mediumsemiexpanded ---- - -\DeclareFontShape{T1}{Junicode-Sup}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-sup-t1 +\DeclareFontShape{T1}{Junicode-Sup}{expanded}{it}{ + <-> alias * Junicode-Sup/x/it }{} -\DeclareFontShape{T1}{Junicode-Sup}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-sup-t1 +\DeclareFontShape{T1}{Junicode-Sup}{x}{sl}{ + <-> ssub * Junicode-Sup/x/it }{} -\DeclareFontShape{T1}{Junicode-Sup}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-Sup/mediumsemiexpanded/it +\DeclareFontShape{T1}{Junicode-Sup}{expanded}{sl}{ + <-> ssub * Junicode-Sup/expanded/it }{} -% ---- sbsx = semiboldsemiexpanded ---- +% ---- b = bold ---- -\DeclareFontShape{T1}{Junicode-Sup}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-sup-t1 +\DeclareFontShape{T1}{Junicode-Sup}{b}{it}{ + <-> \Junicode@@scale Junicode-BoldItalic-sup-t1 }{} -\DeclareFontShape{T1}{Junicode-Sup}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-Sup/sbsx/n +\DeclareFontShape{T1}{Junicode-Sup}{bold}{it}{ + <-> alias * Junicode-Sup/b/it }{} -\DeclareFontShape{T1}{Junicode-Sup}{sbsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-sup-t1 +\DeclareFontShape{T1}{Junicode-Sup}{b}{n}{ + <-> \Junicode@@scale Junicode-Bold-sup-t1 }{} -\DeclareFontShape{T1}{Junicode-Sup}{semiboldsemiexpanded}{it}{ - <-> alias * Junicode-Sup/sbsx/it +\DeclareFontShape{T1}{Junicode-Sup}{bold}{n}{ + <-> alias * Junicode-Sup/b/n }{} -\DeclareFontShape{T1}{Junicode-Sup}{sbsx}{sl}{ - <-> ssub * Junicode-Sup/sbsx/it +\DeclareFontShape{T1}{Junicode-Sup}{b}{sl}{ + <-> ssub * Junicode-Sup/b/it }{} -\DeclareFontShape{T1}{Junicode-Sup}{semiboldsemiexpanded}{sl}{ - <-> ssub * Junicode-Sup/semiboldsemiexpanded/it +\DeclareFontShape{T1}{Junicode-Sup}{bold}{sl}{ + <-> ssub * Junicode-Sup/bold/it }{} @@ -158,84 +143,99 @@ }{} -% ---- bx = boldexpanded ---- +% ---- lsc = lightsemicondensed ---- -\DeclareFontShape{T1}{Junicode-Sup}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-sup-t1 +\DeclareFontShape{T1}{Junicode-Sup}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-sup-t1 }{} -\DeclareFontShape{T1}{Junicode-Sup}{boldexpanded}{it}{ - <-> alias * Junicode-Sup/bx/it +\DeclareFontShape{T1}{Junicode-Sup}{lightsemicondensed}{it}{ + <-> alias * Junicode-Sup/lsc/it }{} -\DeclareFontShape{T1}{Junicode-Sup}{bx}{n}{ - <-> \Junicode@@scale Junicode-ExpBold-sup-t1 +\DeclareFontShape{T1}{Junicode-Sup}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-sup-t1 }{} -\DeclareFontShape{T1}{Junicode-Sup}{boldexpanded}{n}{ - <-> alias * Junicode-Sup/bx/n +\DeclareFontShape{T1}{Junicode-Sup}{lightsemicondensed}{n}{ + <-> alias * Junicode-Sup/lsc/n }{} -\DeclareFontShape{T1}{Junicode-Sup}{bx}{sl}{ - <-> ssub * Junicode-Sup/bx/it +\DeclareFontShape{T1}{Junicode-Sup}{lsc}{sl}{ + <-> ssub * Junicode-Sup/lsc/it }{} -\DeclareFontShape{T1}{Junicode-Sup}{boldexpanded}{sl}{ - <-> ssub * Junicode-Sup/boldexpanded/it +\DeclareFontShape{T1}{Junicode-Sup}{lightsemicondensed}{sl}{ + <-> ssub * Junicode-Sup/lightsemicondensed/it }{} -% ---- l = light ---- +% ---- lc = lightcondensed ---- -\DeclareFontShape{T1}{Junicode-Sup}{l}{n}{ - <-> \Junicode@@scale Junicode-Light-sup-t1 +\DeclareFontShape{T1}{Junicode-Sup}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-sup-t1 }{} -\DeclareFontShape{T1}{Junicode-Sup}{light}{n}{ - <-> alias * Junicode-Sup/l/n +\DeclareFontShape{T1}{Junicode-Sup}{lightcondensed}{it}{ + <-> alias * Junicode-Sup/lc/it }{} -\DeclareFontShape{T1}{Junicode-Sup}{l}{it}{ - <-> \Junicode@@scale Junicode-LightItalic-sup-t1 +\DeclareFontShape{T1}{Junicode-Sup}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-sup-t1 }{} -\DeclareFontShape{T1}{Junicode-Sup}{light}{it}{ - <-> alias * Junicode-Sup/l/it +\DeclareFontShape{T1}{Junicode-Sup}{lightcondensed}{n}{ + <-> alias * Junicode-Sup/lc/n }{} -\DeclareFontShape{T1}{Junicode-Sup}{l}{sl}{ - <-> ssub * Junicode-Sup/l/it +\DeclareFontShape{T1}{Junicode-Sup}{lc}{sl}{ + <-> ssub * Junicode-Sup/lc/it }{} -\DeclareFontShape{T1}{Junicode-Sup}{light}{sl}{ - <-> ssub * Junicode-Sup/light/it +\DeclareFontShape{T1}{Junicode-Sup}{lightcondensed}{sl}{ + <-> ssub * Junicode-Sup/lightcondensed/it }{} -% ---- lsc = lightsemicondensed ---- +% ---- m = regular ---- -\DeclareFontShape{T1}{Junicode-Sup}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-sup-t1 +\DeclareFontShape{T1}{Junicode-Sup}{m}{it}{ + <-> \Junicode@@scale Junicode-Italic-sup-t1 }{} -\DeclareFontShape{T1}{Junicode-Sup}{lightsemicondensed}{n}{ - <-> alias * Junicode-Sup/lsc/n +\DeclareFontShape{T1}{Junicode-Sup}{regular}{it}{ + <-> alias * Junicode-Sup/m/it }{} -\DeclareFontShape{T1}{Junicode-Sup}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-sup-t1 +\DeclareFontShape{T1}{Junicode-Sup}{m}{n}{ + <-> \Junicode@@scale Junicode-Regular-sup-t1 }{} -\DeclareFontShape{T1}{Junicode-Sup}{lightsemicondensed}{it}{ - <-> alias * Junicode-Sup/lsc/it +\DeclareFontShape{T1}{Junicode-Sup}{regular}{n}{ + <-> alias * Junicode-Sup/m/n }{} -\DeclareFontShape{T1}{Junicode-Sup}{lsc}{sl}{ - <-> ssub * Junicode-Sup/lsc/it +\DeclareFontShape{T1}{Junicode-Sup}{m}{sl}{ + <-> ssub * Junicode-Sup/m/it }{} -\DeclareFontShape{T1}{Junicode-Sup}{lightsemicondensed}{sl}{ - <-> ssub * Junicode-Sup/lightsemicondensed/it +\DeclareFontShape{T1}{Junicode-Sup}{regular}{sl}{ + <-> ssub * Junicode-Sup/regular/it +}{} + + +% ---- mediumsemiexpanded ---- + +\DeclareFontShape{T1}{Junicode-Sup}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-sup-t1 +}{} + +\DeclareFontShape{T1}{Junicode-Sup}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-sup-t1 +}{} + +\DeclareFontShape{T1}{Junicode-Sup}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-Sup/mediumsemiexpanded/it }{} @@ -254,99 +254,84 @@ }{} -% ---- m = regular ---- - -\DeclareFontShape{T1}{Junicode-Sup}{m}{it}{ - <-> \Junicode@@scale Junicode-Italic-sup-t1 -}{} +% ---- bx = boldexpanded ---- -\DeclareFontShape{T1}{Junicode-Sup}{regular}{it}{ - <-> alias * Junicode-Sup/m/it +\DeclareFontShape{T1}{Junicode-Sup}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-sup-t1 }{} -\DeclareFontShape{T1}{Junicode-Sup}{m}{n}{ - <-> \Junicode@@scale Junicode-Regular-sup-t1 +\DeclareFontShape{T1}{Junicode-Sup}{boldexpanded}{it}{ + <-> alias * Junicode-Sup/bx/it }{} -\DeclareFontShape{T1}{Junicode-Sup}{regular}{n}{ - <-> alias * Junicode-Sup/m/n +\DeclareFontShape{T1}{Junicode-Sup}{bx}{n}{ + <-> \Junicode@@scale Junicode-ExpBold-sup-t1 }{} -\DeclareFontShape{T1}{Junicode-Sup}{m}{sl}{ - <-> ssub * Junicode-Sup/m/it +\DeclareFontShape{T1}{Junicode-Sup}{boldexpanded}{n}{ + <-> alias * Junicode-Sup/bx/n }{} -\DeclareFontShape{T1}{Junicode-Sup}{regular}{sl}{ - <-> ssub * Junicode-Sup/regular/it +\DeclareFontShape{T1}{Junicode-Sup}{bx}{sl}{ + <-> ssub * Junicode-Sup/bx/it }{} - -% ---- b = bold ---- - -\DeclareFontShape{T1}{Junicode-Sup}{b}{it}{ - <-> \Junicode@@scale Junicode-BoldItalic-sup-t1 +\DeclareFontShape{T1}{Junicode-Sup}{boldexpanded}{sl}{ + <-> ssub * Junicode-Sup/boldexpanded/it }{} -\DeclareFontShape{T1}{Junicode-Sup}{bold}{it}{ - <-> alias * Junicode-Sup/b/it -}{} -\DeclareFontShape{T1}{Junicode-Sup}{b}{n}{ - <-> \Junicode@@scale Junicode-Bold-sup-t1 -}{} +% ---- sx = semiexpanded ---- -\DeclareFontShape{T1}{Junicode-Sup}{bold}{n}{ - <-> alias * Junicode-Sup/b/n +\DeclareFontShape{T1}{Junicode-Sup}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-sup-t1 }{} -\DeclareFontShape{T1}{Junicode-Sup}{b}{sl}{ - <-> ssub * Junicode-Sup/b/it +\DeclareFontShape{T1}{Junicode-Sup}{semiexpanded}{n}{ + <-> alias * Junicode-Sup/sx/n }{} -\DeclareFontShape{T1}{Junicode-Sup}{bold}{sl}{ - <-> ssub * Junicode-Sup/bold/it +\DeclareFontShape{T1}{Junicode-Sup}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-sup-t1 }{} - -% ---- mediumcondensed ---- - -\DeclareFontShape{T1}{Junicode-Sup}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-sup-t1 +\DeclareFontShape{T1}{Junicode-Sup}{semiexpanded}{it}{ + <-> alias * Junicode-Sup/sx/it }{} -\DeclareFontShape{T1}{Junicode-Sup}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-sup-t1 +\DeclareFontShape{T1}{Junicode-Sup}{sx}{sl}{ + <-> ssub * Junicode-Sup/sx/it }{} -\DeclareFontShape{T1}{Junicode-Sup}{mediumcondensed}{sl}{ - <-> ssub * Junicode-Sup/mediumcondensed/it +\DeclareFontShape{T1}{Junicode-Sup}{semiexpanded}{sl}{ + <-> ssub * Junicode-Sup/semiexpanded/it }{} -% ---- sbx = semiboldexpanded ---- +% ---- l = light ---- -\DeclareFontShape{T1}{Junicode-Sup}{sbx}{it}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-sup-t1 +\DeclareFontShape{T1}{Junicode-Sup}{l}{n}{ + <-> \Junicode@@scale Junicode-Light-sup-t1 }{} -\DeclareFontShape{T1}{Junicode-Sup}{semiboldexpanded}{it}{ - <-> alias * Junicode-Sup/sbx/it +\DeclareFontShape{T1}{Junicode-Sup}{light}{n}{ + <-> alias * Junicode-Sup/l/n }{} -\DeclareFontShape{T1}{Junicode-Sup}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-sup-t1 +\DeclareFontShape{T1}{Junicode-Sup}{l}{it}{ + <-> \Junicode@@scale Junicode-LightItalic-sup-t1 }{} -\DeclareFontShape{T1}{Junicode-Sup}{semiboldexpanded}{n}{ - <-> alias * Junicode-Sup/sbx/n +\DeclareFontShape{T1}{Junicode-Sup}{light}{it}{ + <-> alias * Junicode-Sup/l/it }{} -\DeclareFontShape{T1}{Junicode-Sup}{sbx}{sl}{ - <-> ssub * Junicode-Sup/sbx/it +\DeclareFontShape{T1}{Junicode-Sup}{l}{sl}{ + <-> ssub * Junicode-Sup/l/it }{} -\DeclareFontShape{T1}{Junicode-Sup}{semiboldexpanded}{sl}{ - <-> ssub * Junicode-Sup/semiboldexpanded/it +\DeclareFontShape{T1}{Junicode-Sup}{light}{sl}{ + <-> ssub * Junicode-Sup/light/it }{} @@ -367,14 +352,6 @@ % ---- sb = semibold ---- -\DeclareFontShape{T1}{Junicode-Sup}{sb}{it}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-sup-t1 -}{} - -\DeclareFontShape{T1}{Junicode-Sup}{semibold}{it}{ - <-> alias * Junicode-Sup/sb/it -}{} - \DeclareFontShape{T1}{Junicode-Sup}{sb}{n}{ <-> \Junicode@@scale Junicode-SmBold-sup-t1 }{} @@ -383,6 +360,14 @@ <-> alias * Junicode-Sup/sb/n }{} +\DeclareFontShape{T1}{Junicode-Sup}{sb}{it}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-sup-t1 +}{} + +\DeclareFontShape{T1}{Junicode-Sup}{semibold}{it}{ + <-> alias * Junicode-Sup/sb/it +}{} + \DeclareFontShape{T1}{Junicode-Sup}{sb}{sl}{ <-> ssub * Junicode-Sup/sb/it }{} @@ -392,43 +377,50 @@ }{} -% ---- sc = semicondensed ---- +% ---- mediumcondensed ---- -\DeclareFontShape{T1}{Junicode-Sup}{sc}{n}{ - <-> \Junicode@@scale Junicode-SmCond-sup-t1 +\DeclareFontShape{T1}{Junicode-Sup}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-sup-t1 }{} -\DeclareFontShape{T1}{Junicode-Sup}{semicondensed}{n}{ - <-> alias * Junicode-Sup/sc/n +\DeclareFontShape{T1}{Junicode-Sup}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-sup-t1 }{} -\DeclareFontShape{T1}{Junicode-Sup}{sc}{it}{ - <-> \Junicode@@scale Junicode-SmCondItalic-sup-t1 +\DeclareFontShape{T1}{Junicode-Sup}{mediumcondensed}{sl}{ + <-> ssub * Junicode-Sup/mediumcondensed/it }{} -\DeclareFontShape{T1}{Junicode-Sup}{semicondensed}{it}{ - <-> alias * Junicode-Sup/sc/it -}{} -\DeclareFontShape{T1}{Junicode-Sup}{sc}{sl}{ - <-> ssub * Junicode-Sup/sc/it +% ---- sbsx = semiboldsemiexpanded ---- + +\DeclareFontShape{T1}{Junicode-Sup}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-sup-t1 }{} -\DeclareFontShape{T1}{Junicode-Sup}{semicondensed}{sl}{ - <-> ssub * Junicode-Sup/semicondensed/it +\DeclareFontShape{T1}{Junicode-Sup}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-Sup/sbsx/n }{} +\DeclareFontShape{T1}{Junicode-Sup}{sbsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-sup-t1 +}{} -% ---- bsx = boldsemiexpanded ---- +\DeclareFontShape{T1}{Junicode-Sup}{semiboldsemiexpanded}{it}{ + <-> alias * Junicode-Sup/sbsx/it +}{} -\DeclareFontShape{T1}{Junicode-Sup}{bsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpBold-sup-t1 +\DeclareFontShape{T1}{Junicode-Sup}{sbsx}{sl}{ + <-> ssub * Junicode-Sup/sbsx/it }{} -\DeclareFontShape{T1}{Junicode-Sup}{boldsemiexpanded}{n}{ - <-> alias * Junicode-Sup/bsx/n +\DeclareFontShape{T1}{Junicode-Sup}{semiboldsemiexpanded}{sl}{ + <-> ssub * Junicode-Sup/semiboldsemiexpanded/it }{} + +% ---- bsx = boldsemiexpanded ---- + \DeclareFontShape{T1}{Junicode-Sup}{bsx}{it}{ <-> \Junicode@@scale Junicode-SmExpBoldItalic-sup-t1 }{} @@ -437,6 +429,14 @@ <-> alias * Junicode-Sup/bsx/it }{} +\DeclareFontShape{T1}{Junicode-Sup}{bsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpBold-sup-t1 +}{} + +\DeclareFontShape{T1}{Junicode-Sup}{boldsemiexpanded}{n}{ + <-> alias * Junicode-Sup/bsx/n +}{} + \DeclareFontShape{T1}{Junicode-Sup}{bsx}{sl}{ <-> ssub * Junicode-Sup/bsx/it }{} @@ -446,30 +446,30 @@ }{} -% ---- lc = lightcondensed ---- +% ---- sc = semicondensed ---- -\DeclareFontShape{T1}{Junicode-Sup}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-sup-t1 +\DeclareFontShape{T1}{Junicode-Sup}{sc}{it}{ + <-> \Junicode@@scale Junicode-SmCondItalic-sup-t1 }{} -\DeclareFontShape{T1}{Junicode-Sup}{lightcondensed}{n}{ - <-> alias * Junicode-Sup/lc/n +\DeclareFontShape{T1}{Junicode-Sup}{semicondensed}{it}{ + <-> alias * Junicode-Sup/sc/it }{} -\DeclareFontShape{T1}{Junicode-Sup}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-sup-t1 +\DeclareFontShape{T1}{Junicode-Sup}{sc}{n}{ + <-> \Junicode@@scale Junicode-SmCond-sup-t1 }{} -\DeclareFontShape{T1}{Junicode-Sup}{lightcondensed}{it}{ - <-> alias * Junicode-Sup/lc/it +\DeclareFontShape{T1}{Junicode-Sup}{semicondensed}{n}{ + <-> alias * Junicode-Sup/sc/n }{} -\DeclareFontShape{T1}{Junicode-Sup}{lc}{sl}{ - <-> ssub * Junicode-Sup/lc/it +\DeclareFontShape{T1}{Junicode-Sup}{sc}{sl}{ + <-> ssub * Junicode-Sup/sc/it }{} -\DeclareFontShape{T1}{Junicode-Sup}{lightcondensed}{sl}{ - <-> ssub * Junicode-Sup/lightcondensed/it +\DeclareFontShape{T1}{Junicode-Sup}{semicondensed}{sl}{ + <-> ssub * Junicode-Sup/semicondensed/it }{} diff --git a/Master/texmf-dist/tex/latex/junicode/T1Junicode-TLF.fd b/Master/texmf-dist/tex/latex/junicode/T1Junicode-TLF.fd index 1cf635bb8fe..014b2b6c696 100644 --- a/Master/texmf-dist/tex/latex/junicode/T1Junicode-TLF.fd +++ b/Master/texmf-dist/tex/latex/junicode/T1Junicode-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{T1Junicode-TLF.fd} - [2024/06/03 (autoinst) Font definitions for T1/Junicode-TLF.] + [2024/07/21 (autoinst) Font definitions for T1/Junicode-TLF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,656 +20,632 @@ \DeclareFontFamily{T1}{Junicode-TLF}{} -% ---- sbx = semiboldexpanded ---- +% ---- l = light ---- -\DeclareFontShape{T1}{Junicode-TLF}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{l}{sc}{ + <-> \Junicode@@scale Junicode-Light-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{semiboldexpanded}{n}{ - <-> alias * Junicode-TLF/sbx/n +\DeclareFontShape{T1}{Junicode-TLF}{light}{sc}{ + <-> alias * Junicode-TLF/l/sc }{} -\DeclareFontShape{T1}{Junicode-TLF}{sbx}{sc}{ - <-> \Junicode@@scale Junicode-ExpSmBold-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{l}{it}{ + <-> \Junicode@@scale Junicode-LightItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{semiboldexpanded}{sc}{ - <-> alias * Junicode-TLF/sbx/sc +\DeclareFontShape{T1}{Junicode-TLF}{light}{it}{ + <-> alias * Junicode-TLF/l/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{sbx}{it}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{l}{n}{ + <-> \Junicode@@scale Junicode-Light-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{semiboldexpanded}{it}{ - <-> alias * Junicode-TLF/sbx/it +\DeclareFontShape{T1}{Junicode-TLF}{light}{n}{ + <-> alias * Junicode-TLF/l/n }{} -\DeclareFontShape{T1}{Junicode-TLF}{sbx}{scit}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{l}{scit}{ + <-> \Junicode@@scale Junicode-LightItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{semiboldexpanded}{scit}{ - <-> alias * Junicode-TLF/sbx/scit +\DeclareFontShape{T1}{Junicode-TLF}{light}{scit}{ + <-> alias * Junicode-TLF/l/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{sbx}{scsl}{ - <-> ssub * Junicode-TLF/sbx/scit +\DeclareFontShape{T1}{Junicode-TLF}{l}{sl}{ + <-> ssub * Junicode-TLF/l/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{semiboldexpanded}{scsl}{ - <-> ssub * Junicode-TLF/semiboldexpanded/scit +\DeclareFontShape{T1}{Junicode-TLF}{light}{sl}{ + <-> ssub * Junicode-TLF/light/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{sbx}{sl}{ - <-> ssub * Junicode-TLF/sbx/it +\DeclareFontShape{T1}{Junicode-TLF}{l}{scsl}{ + <-> ssub * Junicode-TLF/l/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{semiboldexpanded}{sl}{ - <-> ssub * Junicode-TLF/semiboldexpanded/it +\DeclareFontShape{T1}{Junicode-TLF}{light}{scsl}{ + <-> ssub * Junicode-TLF/light/scit }{} -% ---- mediumsemicondensed ---- +% ---- sx = semiexpanded ---- -\DeclareFontShape{T1}{Junicode-TLF}{mediumsemicondensed}{n}{ - <-> \Junicode@@scale Junicode-SmCondMedium-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{sx}{sc}{ + <-> \Junicode@@scale Junicode-SmExp-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{mediumsemicondensed}{sc}{ - <-> \Junicode@@scale Junicode-SmCondMedium-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{semiexpanded}{sc}{ + <-> alias * Junicode-TLF/sx/sc }{} -\DeclareFontShape{T1}{Junicode-TLF}{mediumsemicondensed}{it}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{mediumsemicondensed}{scit}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{semiexpanded}{it}{ + <-> alias * Junicode-TLF/sx/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{mediumsemicondensed}{scsl}{ - <-> ssub * Junicode-TLF/mediumsemicondensed/scit +\DeclareFontShape{T1}{Junicode-TLF}{sx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{mediumsemicondensed}{sl}{ - <-> ssub * Junicode-TLF/mediumsemicondensed/it +\DeclareFontShape{T1}{Junicode-TLF}{semiexpanded}{scit}{ + <-> alias * Junicode-TLF/sx/scit }{} - -% ---- sc = semicondensed ---- - -\DeclareFontShape{T1}{Junicode-TLF}{sc}{sc}{ - <-> \Junicode@@scale Junicode-SmCond-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{semicondensed}{sc}{ - <-> alias * Junicode-TLF/sc/sc +\DeclareFontShape{T1}{Junicode-TLF}{semiexpanded}{n}{ + <-> alias * Junicode-TLF/sx/n }{} -\DeclareFontShape{T1}{Junicode-TLF}{sc}{n}{ - <-> \Junicode@@scale Junicode-SmCond-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{sx}{sl}{ + <-> ssub * Junicode-TLF/sx/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{semicondensed}{n}{ - <-> alias * Junicode-TLF/sc/n +\DeclareFontShape{T1}{Junicode-TLF}{semiexpanded}{sl}{ + <-> ssub * Junicode-TLF/semiexpanded/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{sc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondItalic-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{sx}{scsl}{ + <-> ssub * Junicode-TLF/sx/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{semicondensed}{scit}{ - <-> alias * Junicode-TLF/sc/scit +\DeclareFontShape{T1}{Junicode-TLF}{semiexpanded}{scsl}{ + <-> ssub * Junicode-TLF/semiexpanded/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{sc}{it}{ - <-> \Junicode@@scale Junicode-SmCondItalic-tlf-t1 + +% ---- mediumsemicondensed ---- + +\DeclareFontShape{T1}{Junicode-TLF}{mediumsemicondensed}{n}{ + <-> \Junicode@@scale Junicode-SmCondMedium-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{semicondensed}{it}{ - <-> alias * Junicode-TLF/sc/it +\DeclareFontShape{T1}{Junicode-TLF}{mediumsemicondensed}{scit}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{sc}{scsl}{ - <-> ssub * Junicode-TLF/sc/scit +\DeclareFontShape{T1}{Junicode-TLF}{mediumsemicondensed}{it}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{semicondensed}{scsl}{ - <-> ssub * Junicode-TLF/semicondensed/scit +\DeclareFontShape{T1}{Junicode-TLF}{mediumsemicondensed}{sc}{ + <-> \Junicode@@scale Junicode-SmCondMedium-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{sc}{sl}{ - <-> ssub * Junicode-TLF/sc/it +\DeclareFontShape{T1}{Junicode-TLF}{mediumsemicondensed}{sl}{ + <-> ssub * Junicode-TLF/mediumsemicondensed/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{semicondensed}{sl}{ - <-> ssub * Junicode-TLF/semicondensed/it +\DeclareFontShape{T1}{Junicode-TLF}{mediumsemicondensed}{scsl}{ + <-> ssub * Junicode-TLF/mediumsemicondensed/scit }{} -% ---- sb = semibold ---- +% ---- lc = lightcondensed ---- -\DeclareFontShape{T1}{Junicode-TLF}{sb}{it}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{lc}{sc}{ + <-> \Junicode@@scale Junicode-CondLight-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{semibold}{it}{ - <-> alias * Junicode-TLF/sb/it +\DeclareFontShape{T1}{Junicode-TLF}{lightcondensed}{sc}{ + <-> alias * Junicode-TLF/lc/sc }{} -\DeclareFontShape{T1}{Junicode-TLF}{sb}{scit}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{semibold}{scit}{ - <-> alias * Junicode-TLF/sb/scit +\DeclareFontShape{T1}{Junicode-TLF}{lightcondensed}{it}{ + <-> alias * Junicode-TLF/lc/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{sb}{n}{ - <-> \Junicode@@scale Junicode-SmBold-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{semibold}{n}{ - <-> alias * Junicode-TLF/sb/n +\DeclareFontShape{T1}{Junicode-TLF}{lightcondensed}{n}{ + <-> alias * Junicode-TLF/lc/n }{} -\DeclareFontShape{T1}{Junicode-TLF}{sb}{sc}{ - <-> \Junicode@@scale Junicode-SmBold-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{lc}{scit}{ + <-> \Junicode@@scale Junicode-CondLightItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{semibold}{sc}{ - <-> alias * Junicode-TLF/sb/sc +\DeclareFontShape{T1}{Junicode-TLF}{lightcondensed}{scit}{ + <-> alias * Junicode-TLF/lc/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{sb}{scsl}{ - <-> ssub * Junicode-TLF/sb/scit +\DeclareFontShape{T1}{Junicode-TLF}{lc}{sl}{ + <-> ssub * Junicode-TLF/lc/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{semibold}{scsl}{ - <-> ssub * Junicode-TLF/semibold/scit +\DeclareFontShape{T1}{Junicode-TLF}{lightcondensed}{sl}{ + <-> ssub * Junicode-TLF/lightcondensed/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{sb}{sl}{ - <-> ssub * Junicode-TLF/sb/it +\DeclareFontShape{T1}{Junicode-TLF}{lc}{scsl}{ + <-> ssub * Junicode-TLF/lc/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{semibold}{sl}{ - <-> ssub * Junicode-TLF/semibold/it +\DeclareFontShape{T1}{Junicode-TLF}{lightcondensed}{scsl}{ + <-> ssub * Junicode-TLF/lightcondensed/scit }{} -% ---- bsx = boldsemiexpanded ---- +% ---- bx = boldexpanded ---- -\DeclareFontShape{T1}{Junicode-TLF}{bsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpBold-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{bx}{scit}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{boldsemiexpanded}{n}{ - <-> alias * Junicode-TLF/bsx/n +\DeclareFontShape{T1}{Junicode-TLF}{boldexpanded}{scit}{ + <-> alias * Junicode-TLF/bx/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{bsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpBold-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{bx}{n}{ + <-> \Junicode@@scale Junicode-ExpBold-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{boldsemiexpanded}{sc}{ - <-> alias * Junicode-TLF/bsx/sc +\DeclareFontShape{T1}{Junicode-TLF}{boldexpanded}{n}{ + <-> alias * Junicode-TLF/bx/n }{} -\DeclareFontShape{T1}{Junicode-TLF}{bsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{boldsemiexpanded}{it}{ - <-> alias * Junicode-TLF/bsx/it +\DeclareFontShape{T1}{Junicode-TLF}{boldexpanded}{it}{ + <-> alias * Junicode-TLF/bx/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{bsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{bx}{sc}{ + <-> \Junicode@@scale Junicode-ExpBold-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{boldsemiexpanded}{scit}{ - <-> alias * Junicode-TLF/bsx/scit +\DeclareFontShape{T1}{Junicode-TLF}{boldexpanded}{sc}{ + <-> alias * Junicode-TLF/bx/sc }{} -\DeclareFontShape{T1}{Junicode-TLF}{bsx}{scsl}{ - <-> ssub * Junicode-TLF/bsx/scit +\DeclareFontShape{T1}{Junicode-TLF}{bx}{sl}{ + <-> ssub * Junicode-TLF/bx/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{boldsemiexpanded}{scsl}{ - <-> ssub * Junicode-TLF/boldsemiexpanded/scit +\DeclareFontShape{T1}{Junicode-TLF}{boldexpanded}{sl}{ + <-> ssub * Junicode-TLF/boldexpanded/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{bsx}{sl}{ - <-> ssub * Junicode-TLF/bsx/it +\DeclareFontShape{T1}{Junicode-TLF}{bx}{scsl}{ + <-> ssub * Junicode-TLF/bx/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{boldsemiexpanded}{sl}{ - <-> ssub * Junicode-TLF/boldsemiexpanded/it +\DeclareFontShape{T1}{Junicode-TLF}{boldexpanded}{scsl}{ + <-> ssub * Junicode-TLF/boldexpanded/scit }{} -% ---- lc = lightcondensed ---- - -\DeclareFontShape{T1}{Junicode-TLF}{lc}{sc}{ - <-> \Junicode@@scale Junicode-CondLight-tlf-sc-t1 -}{} - -\DeclareFontShape{T1}{Junicode-TLF}{lightcondensed}{sc}{ - <-> alias * Junicode-TLF/lc/sc -}{} +% ---- medium ---- -\DeclareFontShape{T1}{Junicode-TLF}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{medium}{sc}{ + <-> \Junicode@@scale Junicode-Medium-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{lightcondensed}{n}{ - <-> alias * Junicode-TLF/lc/n +\DeclareFontShape{T1}{Junicode-TLF}{medium}{it}{ + <-> \Junicode@@scale Junicode-MediumItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{lc}{scit}{ - <-> \Junicode@@scale Junicode-CondLightItalic-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{medium}{n}{ + <-> \Junicode@@scale Junicode-Medium-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{lightcondensed}{scit}{ - <-> alias * Junicode-TLF/lc/scit +\DeclareFontShape{T1}{Junicode-TLF}{medium}{scit}{ + <-> \Junicode@@scale Junicode-MediumItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{medium}{sl}{ + <-> ssub * Junicode-TLF/medium/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{lightcondensed}{it}{ - <-> alias * Junicode-TLF/lc/it +\DeclareFontShape{T1}{Junicode-TLF}{medium}{scsl}{ + <-> ssub * Junicode-TLF/medium/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{lc}{scsl}{ - <-> ssub * Junicode-TLF/lc/scit -}{} -\DeclareFontShape{T1}{Junicode-TLF}{lightcondensed}{scsl}{ - <-> ssub * Junicode-TLF/lightcondensed/scit -}{} +% ---- mediumsemiexpanded ---- -\DeclareFontShape{T1}{Junicode-TLF}{lc}{sl}{ - <-> ssub * Junicode-TLF/lc/it +\DeclareFontShape{T1}{Junicode-TLF}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{lightcondensed}{sl}{ - <-> ssub * Junicode-TLF/lightcondensed/it +\DeclareFontShape{T1}{Junicode-TLF}{mediumsemiexpanded}{scit}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-sc-t1 }{} - -% ---- b = bold ---- - -\DeclareFontShape{T1}{Junicode-TLF}{b}{n}{ - <-> \Junicode@@scale Junicode-Bold-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{bold}{n}{ - <-> alias * Junicode-TLF/b/n +\DeclareFontShape{T1}{Junicode-TLF}{mediumsemiexpanded}{sc}{ + <-> \Junicode@@scale Junicode-SmExpMedium-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{b}{sc}{ - <-> \Junicode@@scale Junicode-Bold-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-TLF/mediumsemiexpanded/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{bold}{sc}{ - <-> alias * Junicode-TLF/b/sc +\DeclareFontShape{T1}{Junicode-TLF}{mediumsemiexpanded}{scsl}{ + <-> ssub * Junicode-TLF/mediumsemiexpanded/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{b}{it}{ - <-> \Junicode@@scale Junicode-BoldItalic-tlf-t1 -}{} -\DeclareFontShape{T1}{Junicode-TLF}{bold}{it}{ - <-> alias * Junicode-TLF/b/it -}{} +% ---- m = regular ---- -\DeclareFontShape{T1}{Junicode-TLF}{b}{scit}{ - <-> \Junicode@@scale Junicode-BoldItalic-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{m}{sc}{ + <-> \Junicode@@scale Junicode-Regular-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{bold}{scit}{ - <-> alias * Junicode-TLF/b/scit +\DeclareFontShape{T1}{Junicode-TLF}{regular}{sc}{ + <-> alias * Junicode-TLF/m/sc }{} -\DeclareFontShape{T1}{Junicode-TLF}{b}{scsl}{ - <-> ssub * Junicode-TLF/b/scit +\DeclareFontShape{T1}{Junicode-TLF}{m}{it}{ + <-> \Junicode@@scale Junicode-Italic-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{bold}{scsl}{ - <-> ssub * Junicode-TLF/bold/scit +\DeclareFontShape{T1}{Junicode-TLF}{regular}{it}{ + <-> alias * Junicode-TLF/m/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{b}{sl}{ - <-> ssub * Junicode-TLF/b/it +\DeclareFontShape{T1}{Junicode-TLF}{m}{n}{ + <-> \Junicode@@scale Junicode-Regular-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{bold}{sl}{ - <-> ssub * Junicode-TLF/bold/it +\DeclareFontShape{T1}{Junicode-TLF}{regular}{n}{ + <-> alias * Junicode-TLF/m/n }{} - -% ---- mediumcondensed ---- - -\DeclareFontShape{T1}{Junicode-TLF}{mediumcondensed}{scit}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{m}{scit}{ + <-> \Junicode@@scale Junicode-Italic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{regular}{scit}{ + <-> alias * Junicode-TLF/m/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{mediumcondensed}{sc}{ - <-> \Junicode@@scale Junicode-CondMedium-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{m}{sl}{ + <-> ssub * Junicode-TLF/m/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{regular}{sl}{ + <-> ssub * Junicode-TLF/regular/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{mediumcondensed}{scsl}{ - <-> ssub * Junicode-TLF/mediumcondensed/scit +\DeclareFontShape{T1}{Junicode-TLF}{m}{scsl}{ + <-> ssub * Junicode-TLF/m/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{mediumcondensed}{sl}{ - <-> ssub * Junicode-TLF/mediumcondensed/it +\DeclareFontShape{T1}{Junicode-TLF}{regular}{scsl}{ + <-> ssub * Junicode-TLF/regular/scit }{} -% ---- bx = boldexpanded ---- +% ---- sbsx = semiboldsemiexpanded ---- -\DeclareFontShape{T1}{Junicode-TLF}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{boldexpanded}{it}{ - <-> alias * Junicode-TLF/bx/it +\DeclareFontShape{T1}{Junicode-TLF}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-TLF/sbsx/n }{} -\DeclareFontShape{T1}{Junicode-TLF}{bx}{scit}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{sbsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{boldexpanded}{scit}{ - <-> alias * Junicode-TLF/bx/scit +\DeclareFontShape{T1}{Junicode-TLF}{semiboldsemiexpanded}{scit}{ + <-> alias * Junicode-TLF/sbsx/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{bx}{n}{ - <-> \Junicode@@scale Junicode-ExpBold-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{sbsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{boldexpanded}{n}{ - <-> alias * Junicode-TLF/bx/n +\DeclareFontShape{T1}{Junicode-TLF}{semiboldsemiexpanded}{it}{ + <-> alias * Junicode-TLF/sbsx/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{bx}{sc}{ - <-> \Junicode@@scale Junicode-ExpBold-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{sbsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{boldexpanded}{sc}{ - <-> alias * Junicode-TLF/bx/sc +\DeclareFontShape{T1}{Junicode-TLF}{semiboldsemiexpanded}{sc}{ + <-> alias * Junicode-TLF/sbsx/sc }{} -\DeclareFontShape{T1}{Junicode-TLF}{bx}{scsl}{ - <-> ssub * Junicode-TLF/bx/scit +\DeclareFontShape{T1}{Junicode-TLF}{sbsx}{sl}{ + <-> ssub * Junicode-TLF/sbsx/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{boldexpanded}{scsl}{ - <-> ssub * Junicode-TLF/boldexpanded/scit +\DeclareFontShape{T1}{Junicode-TLF}{semiboldsemiexpanded}{sl}{ + <-> ssub * Junicode-TLF/semiboldsemiexpanded/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{bx}{sl}{ - <-> ssub * Junicode-TLF/bx/it +\DeclareFontShape{T1}{Junicode-TLF}{sbsx}{scsl}{ + <-> ssub * Junicode-TLF/sbsx/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{boldexpanded}{sl}{ - <-> ssub * Junicode-TLF/boldexpanded/it +\DeclareFontShape{T1}{Junicode-TLF}{semiboldsemiexpanded}{scsl}{ + <-> ssub * Junicode-TLF/semiboldsemiexpanded/scit }{} -% ---- l = light ---- +% ---- bsx = boldsemiexpanded ---- -\DeclareFontShape{T1}{Junicode-TLF}{l}{it}{ - <-> \Junicode@@scale Junicode-LightItalic-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{bsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpBold-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{light}{it}{ - <-> alias * Junicode-TLF/l/it +\DeclareFontShape{T1}{Junicode-TLF}{boldsemiexpanded}{n}{ + <-> alias * Junicode-TLF/bsx/n }{} -\DeclareFontShape{T1}{Junicode-TLF}{l}{scit}{ - <-> \Junicode@@scale Junicode-LightItalic-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{bsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{light}{scit}{ - <-> alias * Junicode-TLF/l/scit +\DeclareFontShape{T1}{Junicode-TLF}{boldsemiexpanded}{scit}{ + <-> alias * Junicode-TLF/bsx/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{l}{n}{ - <-> \Junicode@@scale Junicode-Light-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{bsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{light}{n}{ - <-> alias * Junicode-TLF/l/n +\DeclareFontShape{T1}{Junicode-TLF}{boldsemiexpanded}{it}{ + <-> alias * Junicode-TLF/bsx/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{l}{sc}{ - <-> \Junicode@@scale Junicode-Light-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{bsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpBold-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{light}{sc}{ - <-> alias * Junicode-TLF/l/sc +\DeclareFontShape{T1}{Junicode-TLF}{boldsemiexpanded}{sc}{ + <-> alias * Junicode-TLF/bsx/sc }{} -\DeclareFontShape{T1}{Junicode-TLF}{l}{scsl}{ - <-> ssub * Junicode-TLF/l/scit +\DeclareFontShape{T1}{Junicode-TLF}{bsx}{sl}{ + <-> ssub * Junicode-TLF/bsx/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{light}{scsl}{ - <-> ssub * Junicode-TLF/light/scit +\DeclareFontShape{T1}{Junicode-TLF}{boldsemiexpanded}{sl}{ + <-> ssub * Junicode-TLF/boldsemiexpanded/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{l}{sl}{ - <-> ssub * Junicode-TLF/l/it +\DeclareFontShape{T1}{Junicode-TLF}{bsx}{scsl}{ + <-> ssub * Junicode-TLF/bsx/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{light}{sl}{ - <-> ssub * Junicode-TLF/light/it +\DeclareFontShape{T1}{Junicode-TLF}{boldsemiexpanded}{scsl}{ + <-> ssub * Junicode-TLF/boldsemiexpanded/scit }{} -% ---- medium ---- +% ---- sc = semicondensed ---- -\DeclareFontShape{T1}{Junicode-TLF}{medium}{sc}{ - <-> \Junicode@@scale Junicode-Medium-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{sc}{n}{ + <-> \Junicode@@scale Junicode-SmCond-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{medium}{n}{ - <-> \Junicode@@scale Junicode-Medium-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{semicondensed}{n}{ + <-> alias * Junicode-TLF/sc/n }{} -\DeclareFontShape{T1}{Junicode-TLF}{medium}{scit}{ - <-> \Junicode@@scale Junicode-MediumItalic-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{sc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{medium}{it}{ - <-> \Junicode@@scale Junicode-MediumItalic-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{semicondensed}{scit}{ + <-> alias * Junicode-TLF/sc/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{medium}{scsl}{ - <-> ssub * Junicode-TLF/medium/scit +\DeclareFontShape{T1}{Junicode-TLF}{sc}{it}{ + <-> \Junicode@@scale Junicode-SmCondItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{medium}{sl}{ - <-> ssub * Junicode-TLF/medium/it +\DeclareFontShape{T1}{Junicode-TLF}{semicondensed}{it}{ + <-> alias * Junicode-TLF/sc/it }{} - -% ---- lsc = lightsemicondensed ---- - -\DeclareFontShape{T1}{Junicode-TLF}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{sc}{sc}{ + <-> \Junicode@@scale Junicode-SmCond-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{lightsemicondensed}{it}{ - <-> alias * Junicode-TLF/lsc/it +\DeclareFontShape{T1}{Junicode-TLF}{semicondensed}{sc}{ + <-> alias * Junicode-TLF/sc/sc }{} -\DeclareFontShape{T1}{Junicode-TLF}{lsc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{sc}{sl}{ + <-> ssub * Junicode-TLF/sc/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{lightsemicondensed}{scit}{ - <-> alias * Junicode-TLF/lsc/scit +\DeclareFontShape{T1}{Junicode-TLF}{semicondensed}{sl}{ + <-> ssub * Junicode-TLF/semicondensed/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{sc}{scsl}{ + <-> ssub * Junicode-TLF/sc/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{lightsemicondensed}{n}{ - <-> alias * Junicode-TLF/lsc/n +\DeclareFontShape{T1}{Junicode-TLF}{semicondensed}{scsl}{ + <-> ssub * Junicode-TLF/semicondensed/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{lsc}{sc}{ - <-> \Junicode@@scale Junicode-SmCondLight-tlf-sc-t1 + +% ---- mediumcondensed ---- + +\DeclareFontShape{T1}{Junicode-TLF}{mediumcondensed}{sc}{ + <-> \Junicode@@scale Junicode-CondMedium-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{lightsemicondensed}{sc}{ - <-> alias * Junicode-TLF/lsc/sc +\DeclareFontShape{T1}{Junicode-TLF}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{lsc}{scsl}{ - <-> ssub * Junicode-TLF/lsc/scit +\DeclareFontShape{T1}{Junicode-TLF}{mediumcondensed}{scit}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{lightsemicondensed}{scsl}{ - <-> ssub * Junicode-TLF/lightsemicondensed/scit +\DeclareFontShape{T1}{Junicode-TLF}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{lsc}{sl}{ - <-> ssub * Junicode-TLF/lsc/it +\DeclareFontShape{T1}{Junicode-TLF}{mediumcondensed}{sl}{ + <-> ssub * Junicode-TLF/mediumcondensed/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{lightsemicondensed}{sl}{ - <-> ssub * Junicode-TLF/lightsemicondensed/it +\DeclareFontShape{T1}{Junicode-TLF}{mediumcondensed}{scsl}{ + <-> ssub * Junicode-TLF/mediumcondensed/scit }{} -% ---- m = regular ---- +% ---- sb = semibold ---- -\DeclareFontShape{T1}{Junicode-TLF}{m}{sc}{ - <-> \Junicode@@scale Junicode-Regular-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{sb}{sc}{ + <-> \Junicode@@scale Junicode-SmBold-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{regular}{sc}{ - <-> alias * Junicode-TLF/m/sc +\DeclareFontShape{T1}{Junicode-TLF}{semibold}{sc}{ + <-> alias * Junicode-TLF/sb/sc }{} -\DeclareFontShape{T1}{Junicode-TLF}{m}{n}{ - <-> \Junicode@@scale Junicode-Regular-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{sb}{n}{ + <-> \Junicode@@scale Junicode-SmBold-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{regular}{n}{ - <-> alias * Junicode-TLF/m/n +\DeclareFontShape{T1}{Junicode-TLF}{semibold}{n}{ + <-> alias * Junicode-TLF/sb/n }{} -\DeclareFontShape{T1}{Junicode-TLF}{m}{scit}{ - <-> \Junicode@@scale Junicode-Italic-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{sb}{scit}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{regular}{scit}{ - <-> alias * Junicode-TLF/m/scit +\DeclareFontShape{T1}{Junicode-TLF}{semibold}{scit}{ + <-> alias * Junicode-TLF/sb/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{m}{it}{ - <-> \Junicode@@scale Junicode-Italic-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{sb}{it}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{regular}{it}{ - <-> alias * Junicode-TLF/m/it +\DeclareFontShape{T1}{Junicode-TLF}{semibold}{it}{ + <-> alias * Junicode-TLF/sb/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{m}{scsl}{ - <-> ssub * Junicode-TLF/m/scit +\DeclareFontShape{T1}{Junicode-TLF}{sb}{sl}{ + <-> ssub * Junicode-TLF/sb/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{regular}{scsl}{ - <-> ssub * Junicode-TLF/regular/scit +\DeclareFontShape{T1}{Junicode-TLF}{semibold}{sl}{ + <-> ssub * Junicode-TLF/semibold/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{m}{sl}{ - <-> ssub * Junicode-TLF/m/it +\DeclareFontShape{T1}{Junicode-TLF}{sb}{scsl}{ + <-> ssub * Junicode-TLF/sb/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{regular}{sl}{ - <-> ssub * Junicode-TLF/regular/it +\DeclareFontShape{T1}{Junicode-TLF}{semibold}{scsl}{ + <-> ssub * Junicode-TLF/semibold/scit }{} -% ---- x = expanded ---- +% ---- sbx = semiboldexpanded ---- -\DeclareFontShape{T1}{Junicode-TLF}{x}{scit}{ - <-> \Junicode@@scale Junicode-ExpItalic-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{sbx}{it}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{expanded}{scit}{ - <-> alias * Junicode-TLF/x/scit +\DeclareFontShape{T1}{Junicode-TLF}{semiboldexpanded}{it}{ + <-> alias * Junicode-TLF/sbx/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{x}{it}{ - <-> \Junicode@@scale Junicode-ExpItalic-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{sbx}{scit}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{expanded}{it}{ - <-> alias * Junicode-TLF/x/it +\DeclareFontShape{T1}{Junicode-TLF}{semiboldexpanded}{scit}{ + <-> alias * Junicode-TLF/sbx/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{x}{sc}{ - <-> \Junicode@@scale Junicode-Exp-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{expanded}{sc}{ - <-> alias * Junicode-TLF/x/sc +\DeclareFontShape{T1}{Junicode-TLF}{semiboldexpanded}{n}{ + <-> alias * Junicode-TLF/sbx/n }{} -\DeclareFontShape{T1}{Junicode-TLF}{x}{n}{ - <-> \Junicode@@scale Junicode-Exp-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{sbx}{sc}{ + <-> \Junicode@@scale Junicode-ExpSmBold-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{expanded}{n}{ - <-> alias * Junicode-TLF/x/n +\DeclareFontShape{T1}{Junicode-TLF}{semiboldexpanded}{sc}{ + <-> alias * Junicode-TLF/sbx/sc }{} -\DeclareFontShape{T1}{Junicode-TLF}{x}{scsl}{ - <-> ssub * Junicode-TLF/x/scit +\DeclareFontShape{T1}{Junicode-TLF}{sbx}{sl}{ + <-> ssub * Junicode-TLF/sbx/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{expanded}{scsl}{ - <-> ssub * Junicode-TLF/expanded/scit +\DeclareFontShape{T1}{Junicode-TLF}{semiboldexpanded}{sl}{ + <-> ssub * Junicode-TLF/semiboldexpanded/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{x}{sl}{ - <-> ssub * Junicode-TLF/x/it +\DeclareFontShape{T1}{Junicode-TLF}{sbx}{scsl}{ + <-> ssub * Junicode-TLF/sbx/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{expanded}{sl}{ - <-> ssub * Junicode-TLF/expanded/it +\DeclareFontShape{T1}{Junicode-TLF}{semiboldexpanded}{scsl}{ + <-> ssub * Junicode-TLF/semiboldexpanded/scit }{} % ---- c = condensed ---- -\DeclareFontShape{T1}{Junicode-TLF}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{c}{sc}{ + <-> \Junicode@@scale Junicode-Cond-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{condensed}{it}{ - <-> alias * Junicode-TLF/c/it +\DeclareFontShape{T1}{Junicode-TLF}{condensed}{sc}{ + <-> alias * Junicode-TLF/c/sc }{} \DeclareFontShape{T1}{Junicode-TLF}{c}{scit}{ @@ -688,12 +664,20 @@ <-> alias * Junicode-TLF/c/n }{} -\DeclareFontShape{T1}{Junicode-TLF}{c}{sc}{ - <-> \Junicode@@scale Junicode-Cond-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{condensed}{sc}{ - <-> alias * Junicode-TLF/c/sc +\DeclareFontShape{T1}{Junicode-TLF}{condensed}{it}{ + <-> alias * Junicode-TLF/c/it +}{} + +\DeclareFontShape{T1}{Junicode-TLF}{c}{sl}{ + <-> ssub * Junicode-TLF/c/it +}{} + +\DeclareFontShape{T1}{Junicode-TLF}{condensed}{sl}{ + <-> ssub * Junicode-TLF/condensed/it }{} \DeclareFontShape{T1}{Junicode-TLF}{c}{scsl}{ @@ -704,168 +688,184 @@ <-> ssub * Junicode-TLF/condensed/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{c}{sl}{ - <-> ssub * Junicode-TLF/c/it -}{} -\DeclareFontShape{T1}{Junicode-TLF}{condensed}{sl}{ - <-> ssub * Junicode-TLF/condensed/it -}{} +% ---- mediumexpanded ---- +\DeclareFontShape{T1}{Junicode-TLF}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-t1 +}{} -% ---- sx = semiexpanded ---- +\DeclareFontShape{T1}{Junicode-TLF}{mediumexpanded}{scit}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-sc-t1 +}{} -\DeclareFontShape{T1}{Junicode-TLF}{sx}{sc}{ - <-> \Junicode@@scale Junicode-SmExp-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{mediumexpanded}{n}{ + <-> \Junicode@@scale Junicode-ExpMedium-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{semiexpanded}{sc}{ - <-> alias * Junicode-TLF/sx/sc +\DeclareFontShape{T1}{Junicode-TLF}{mediumexpanded}{sc}{ + <-> \Junicode@@scale Junicode-ExpMedium-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{mediumexpanded}{sl}{ + <-> ssub * Junicode-TLF/mediumexpanded/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{semiexpanded}{n}{ - <-> alias * Junicode-TLF/sx/n +\DeclareFontShape{T1}{Junicode-TLF}{mediumexpanded}{scsl}{ + <-> ssub * Junicode-TLF/mediumexpanded/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{sx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpItalic-tlf-sc-t1 + +% ---- lsc = lightsemicondensed ---- + +\DeclareFontShape{T1}{Junicode-TLF}{lsc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{semiexpanded}{scit}{ - <-> alias * Junicode-TLF/sx/scit +\DeclareFontShape{T1}{Junicode-TLF}{lightsemicondensed}{scit}{ + <-> alias * Junicode-TLF/lsc/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{semiexpanded}{it}{ - <-> alias * Junicode-TLF/sx/it +\DeclareFontShape{T1}{Junicode-TLF}{lightsemicondensed}{n}{ + <-> alias * Junicode-TLF/lsc/n }{} -\DeclareFontShape{T1}{Junicode-TLF}{sx}{scsl}{ - <-> ssub * Junicode-TLF/sx/scit +\DeclareFontShape{T1}{Junicode-TLF}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{semiexpanded}{scsl}{ - <-> ssub * Junicode-TLF/semiexpanded/scit +\DeclareFontShape{T1}{Junicode-TLF}{lightsemicondensed}{it}{ + <-> alias * Junicode-TLF/lsc/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{sx}{sl}{ - <-> ssub * Junicode-TLF/sx/it +\DeclareFontShape{T1}{Junicode-TLF}{lsc}{sc}{ + <-> \Junicode@@scale Junicode-SmCondLight-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{semiexpanded}{sl}{ - <-> ssub * Junicode-TLF/semiexpanded/it +\DeclareFontShape{T1}{Junicode-TLF}{lightsemicondensed}{sc}{ + <-> alias * Junicode-TLF/lsc/sc }{} +\DeclareFontShape{T1}{Junicode-TLF}{lsc}{sl}{ + <-> ssub * Junicode-TLF/lsc/it +}{} -% ---- mediumsemiexpanded ---- +\DeclareFontShape{T1}{Junicode-TLF}{lightsemicondensed}{sl}{ + <-> ssub * Junicode-TLF/lightsemicondensed/it +}{} -\DeclareFontShape{T1}{Junicode-TLF}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{lsc}{scsl}{ + <-> ssub * Junicode-TLF/lsc/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{mediumsemiexpanded}{sc}{ - <-> \Junicode@@scale Junicode-SmExpMedium-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{lightsemicondensed}{scsl}{ + <-> ssub * Junicode-TLF/lightsemicondensed/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-t1 + +% ---- b = bold ---- + +\DeclareFontShape{T1}{Junicode-TLF}{b}{scit}{ + <-> \Junicode@@scale Junicode-BoldItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{mediumsemiexpanded}{scit}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{bold}{scit}{ + <-> alias * Junicode-TLF/b/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{mediumsemiexpanded}{scsl}{ - <-> ssub * Junicode-TLF/mediumsemiexpanded/scit +\DeclareFontShape{T1}{Junicode-TLF}{b}{n}{ + <-> \Junicode@@scale Junicode-Bold-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-TLF/mediumsemiexpanded/it +\DeclareFontShape{T1}{Junicode-TLF}{bold}{n}{ + <-> alias * Junicode-TLF/b/n }{} +\DeclareFontShape{T1}{Junicode-TLF}{b}{it}{ + <-> \Junicode@@scale Junicode-BoldItalic-tlf-t1 +}{} -% ---- mediumexpanded ---- +\DeclareFontShape{T1}{Junicode-TLF}{bold}{it}{ + <-> alias * Junicode-TLF/b/it +}{} -\DeclareFontShape{T1}{Junicode-TLF}{mediumexpanded}{n}{ - <-> \Junicode@@scale Junicode-ExpMedium-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{b}{sc}{ + <-> \Junicode@@scale Junicode-Bold-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{mediumexpanded}{sc}{ - <-> \Junicode@@scale Junicode-ExpMedium-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{bold}{sc}{ + <-> alias * Junicode-TLF/b/sc }{} -\DeclareFontShape{T1}{Junicode-TLF}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{b}{sl}{ + <-> ssub * Junicode-TLF/b/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{mediumexpanded}{scit}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{bold}{sl}{ + <-> ssub * Junicode-TLF/bold/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{mediumexpanded}{scsl}{ - <-> ssub * Junicode-TLF/mediumexpanded/scit +\DeclareFontShape{T1}{Junicode-TLF}{b}{scsl}{ + <-> ssub * Junicode-TLF/b/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{mediumexpanded}{sl}{ - <-> ssub * Junicode-TLF/mediumexpanded/it +\DeclareFontShape{T1}{Junicode-TLF}{bold}{scsl}{ + <-> ssub * Junicode-TLF/bold/scit }{} -% ---- sbsx = semiboldsemiexpanded ---- +% ---- x = expanded ---- -\DeclareFontShape{T1}{Junicode-TLF}{sbsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{x}{scit}{ + <-> \Junicode@@scale Junicode-ExpItalic-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{semiboldsemiexpanded}{scit}{ - <-> alias * Junicode-TLF/sbsx/scit +\DeclareFontShape{T1}{Junicode-TLF}{expanded}{scit}{ + <-> alias * Junicode-TLF/x/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{sbsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{x}{n}{ + <-> \Junicode@@scale Junicode-Exp-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{semiboldsemiexpanded}{it}{ - <-> alias * Junicode-TLF/sbsx/it +\DeclareFontShape{T1}{Junicode-TLF}{expanded}{n}{ + <-> alias * Junicode-TLF/x/n }{} -\DeclareFontShape{T1}{Junicode-TLF}{sbsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-sc-t1 +\DeclareFontShape{T1}{Junicode-TLF}{x}{it}{ + <-> \Junicode@@scale Junicode-ExpItalic-tlf-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{semiboldsemiexpanded}{sc}{ - <-> alias * Junicode-TLF/sbsx/sc +\DeclareFontShape{T1}{Junicode-TLF}{expanded}{it}{ + <-> alias * Junicode-TLF/x/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-t1 +\DeclareFontShape{T1}{Junicode-TLF}{x}{sc}{ + <-> \Junicode@@scale Junicode-Exp-tlf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TLF}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-TLF/sbsx/n +\DeclareFontShape{T1}{Junicode-TLF}{expanded}{sc}{ + <-> alias * Junicode-TLF/x/sc }{} -\DeclareFontShape{T1}{Junicode-TLF}{sbsx}{scsl}{ - <-> ssub * Junicode-TLF/sbsx/scit +\DeclareFontShape{T1}{Junicode-TLF}{x}{sl}{ + <-> ssub * Junicode-TLF/x/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{semiboldsemiexpanded}{scsl}{ - <-> ssub * Junicode-TLF/semiboldsemiexpanded/scit +\DeclareFontShape{T1}{Junicode-TLF}{expanded}{sl}{ + <-> ssub * Junicode-TLF/expanded/it }{} -\DeclareFontShape{T1}{Junicode-TLF}{sbsx}{sl}{ - <-> ssub * Junicode-TLF/sbsx/it +\DeclareFontShape{T1}{Junicode-TLF}{x}{scsl}{ + <-> ssub * Junicode-TLF/x/scit }{} -\DeclareFontShape{T1}{Junicode-TLF}{semiboldsemiexpanded}{sl}{ - <-> ssub * Junicode-TLF/semiboldsemiexpanded/it +\DeclareFontShape{T1}{Junicode-TLF}{expanded}{scsl}{ + <-> ssub * Junicode-TLF/expanded/scit }{} diff --git a/Master/texmf-dist/tex/latex/junicode/T1Junicode-TOsF.fd b/Master/texmf-dist/tex/latex/junicode/T1Junicode-TOsF.fd index a2fcfe44b24..18e9f6fd8bd 100644 --- a/Master/texmf-dist/tex/latex/junicode/T1Junicode-TOsF.fd +++ b/Master/texmf-dist/tex/latex/junicode/T1Junicode-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{T1Junicode-TOsF.fd} - [2024/06/03 (autoinst) Font definitions for T1/Junicode-TOsF.] + [2024/07/21 (autoinst) Font definitions for T1/Junicode-TOsF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,852 +20,852 @@ \DeclareFontFamily{T1}{Junicode-TOsF}{} -% ---- lsc = lightsemicondensed ---- +% ---- mediumcondensed ---- -\DeclareFontShape{T1}{Junicode-TOsF}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{mediumcondensed}{sc}{ + <-> \Junicode@@scale Junicode-CondMedium-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{lightsemicondensed}{it}{ - <-> alias * Junicode-TOsF/lsc/it +\DeclareFontShape{T1}{Junicode-TOsF}{mediumcondensed}{scit}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{lsc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{lightsemicondensed}{scit}{ - <-> alias * Junicode-TOsF/lsc/scit +\DeclareFontShape{T1}{Junicode-TOsF}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{mediumcondensed}{sl}{ + <-> ssub * Junicode-TOsF/mediumcondensed/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{lightsemicondensed}{n}{ - <-> alias * Junicode-TOsF/lsc/n +\DeclareFontShape{T1}{Junicode-TOsF}{mediumcondensed}{scsl}{ + <-> ssub * Junicode-TOsF/mediumcondensed/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{lsc}{sc}{ - <-> \Junicode@@scale Junicode-SmCondLight-tosf-sc-t1 -}{} -\DeclareFontShape{T1}{Junicode-TOsF}{lightsemicondensed}{sc}{ - <-> alias * Junicode-TOsF/lsc/sc -}{} +% ---- sb = semibold ---- -\DeclareFontShape{T1}{Junicode-TOsF}{lsc}{scsl}{ - <-> ssub * Junicode-TOsF/lsc/scit +\DeclareFontShape{T1}{Junicode-TOsF}{sb}{sc}{ + <-> \Junicode@@scale Junicode-SmBold-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{lightsemicondensed}{scsl}{ - <-> ssub * Junicode-TOsF/lightsemicondensed/scit +\DeclareFontShape{T1}{Junicode-TOsF}{semibold}{sc}{ + <-> alias * Junicode-TOsF/sb/sc }{} -\DeclareFontShape{T1}{Junicode-TOsF}{lsc}{sl}{ - <-> ssub * Junicode-TOsF/lsc/it +\DeclareFontShape{T1}{Junicode-TOsF}{sb}{it}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{lightsemicondensed}{sl}{ - <-> ssub * Junicode-TOsF/lightsemicondensed/it +\DeclareFontShape{T1}{Junicode-TOsF}{semibold}{it}{ + <-> alias * Junicode-TOsF/sb/it }{} +\DeclareFontShape{T1}{Junicode-TOsF}{sb}{scit}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-sc-t1 +}{} -% ---- medium ---- +\DeclareFontShape{T1}{Junicode-TOsF}{semibold}{scit}{ + <-> alias * Junicode-TOsF/sb/scit +}{} -\DeclareFontShape{T1}{Junicode-TOsF}{medium}{it}{ - <-> \Junicode@@scale Junicode-MediumItalic-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{sb}{n}{ + <-> \Junicode@@scale Junicode-SmBold-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{medium}{scit}{ - <-> \Junicode@@scale Junicode-MediumItalic-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{semibold}{n}{ + <-> alias * Junicode-TOsF/sb/n }{} -\DeclareFontShape{T1}{Junicode-TOsF}{medium}{n}{ - <-> \Junicode@@scale Junicode-Medium-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{sb}{sl}{ + <-> ssub * Junicode-TOsF/sb/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{medium}{sc}{ - <-> \Junicode@@scale Junicode-Medium-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{semibold}{sl}{ + <-> ssub * Junicode-TOsF/semibold/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{medium}{scsl}{ - <-> ssub * Junicode-TOsF/medium/scit +\DeclareFontShape{T1}{Junicode-TOsF}{sb}{scsl}{ + <-> ssub * Junicode-TOsF/sb/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{medium}{sl}{ - <-> ssub * Junicode-TOsF/medium/it +\DeclareFontShape{T1}{Junicode-TOsF}{semibold}{scsl}{ + <-> ssub * Junicode-TOsF/semibold/scit }{} -% ---- m = regular ---- +% ---- sc = semicondensed ---- -\DeclareFontShape{T1}{Junicode-TOsF}{m}{it}{ - <-> \Junicode@@scale Junicode-Italic-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{sc}{it}{ + <-> \Junicode@@scale Junicode-SmCondItalic-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{regular}{it}{ - <-> alias * Junicode-TOsF/m/it +\DeclareFontShape{T1}{Junicode-TOsF}{semicondensed}{it}{ + <-> alias * Junicode-TOsF/sc/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{m}{scit}{ - <-> \Junicode@@scale Junicode-Italic-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{sc}{n}{ + <-> \Junicode@@scale Junicode-SmCond-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{regular}{scit}{ - <-> alias * Junicode-TOsF/m/scit +\DeclareFontShape{T1}{Junicode-TOsF}{semicondensed}{n}{ + <-> alias * Junicode-TOsF/sc/n }{} -\DeclareFontShape{T1}{Junicode-TOsF}{m}{n}{ - <-> \Junicode@@scale Junicode-Regular-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{sc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{regular}{n}{ - <-> alias * Junicode-TOsF/m/n +\DeclareFontShape{T1}{Junicode-TOsF}{semicondensed}{scit}{ + <-> alias * Junicode-TOsF/sc/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{m}{sc}{ - <-> \Junicode@@scale Junicode-Regular-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{sc}{sc}{ + <-> \Junicode@@scale Junicode-SmCond-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{regular}{sc}{ - <-> alias * Junicode-TOsF/m/sc +\DeclareFontShape{T1}{Junicode-TOsF}{semicondensed}{sc}{ + <-> alias * Junicode-TOsF/sc/sc }{} -\DeclareFontShape{T1}{Junicode-TOsF}{m}{scsl}{ - <-> ssub * Junicode-TOsF/m/scit +\DeclareFontShape{T1}{Junicode-TOsF}{sc}{sl}{ + <-> ssub * Junicode-TOsF/sc/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{regular}{scsl}{ - <-> ssub * Junicode-TOsF/regular/scit +\DeclareFontShape{T1}{Junicode-TOsF}{semicondensed}{sl}{ + <-> ssub * Junicode-TOsF/semicondensed/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{m}{sl}{ - <-> ssub * Junicode-TOsF/m/it +\DeclareFontShape{T1}{Junicode-TOsF}{sc}{scsl}{ + <-> ssub * Junicode-TOsF/sc/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{regular}{sl}{ - <-> ssub * Junicode-TOsF/regular/it +\DeclareFontShape{T1}{Junicode-TOsF}{semicondensed}{scsl}{ + <-> ssub * Junicode-TOsF/semicondensed/scit }{} -% ---- bx = boldexpanded ---- +% ---- bsx = boldsemiexpanded ---- -\DeclareFontShape{T1}{Junicode-TOsF}{bx}{n}{ - <-> \Junicode@@scale Junicode-ExpBold-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{bsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpBold-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{boldexpanded}{n}{ - <-> alias * Junicode-TOsF/bx/n +\DeclareFontShape{T1}{Junicode-TOsF}{boldsemiexpanded}{sc}{ + <-> alias * Junicode-TOsF/bsx/sc }{} -\DeclareFontShape{T1}{Junicode-TOsF}{bx}{sc}{ - <-> \Junicode@@scale Junicode-ExpBold-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{bsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{boldexpanded}{sc}{ - <-> alias * Junicode-TOsF/bx/sc +\DeclareFontShape{T1}{Junicode-TOsF}{boldsemiexpanded}{scit}{ + <-> alias * Junicode-TOsF/bsx/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{bsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpBold-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{boldexpanded}{it}{ - <-> alias * Junicode-TOsF/bx/it +\DeclareFontShape{T1}{Junicode-TOsF}{boldsemiexpanded}{n}{ + <-> alias * Junicode-TOsF/bsx/n }{} -\DeclareFontShape{T1}{Junicode-TOsF}{bx}{scit}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{bsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{boldexpanded}{scit}{ - <-> alias * Junicode-TOsF/bx/scit +\DeclareFontShape{T1}{Junicode-TOsF}{boldsemiexpanded}{it}{ + <-> alias * Junicode-TOsF/bsx/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{bx}{scsl}{ - <-> ssub * Junicode-TOsF/bx/scit +\DeclareFontShape{T1}{Junicode-TOsF}{bsx}{sl}{ + <-> ssub * Junicode-TOsF/bsx/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{boldexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/boldexpanded/scit +\DeclareFontShape{T1}{Junicode-TOsF}{boldsemiexpanded}{sl}{ + <-> ssub * Junicode-TOsF/boldsemiexpanded/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{bx}{sl}{ - <-> ssub * Junicode-TOsF/bx/it +\DeclareFontShape{T1}{Junicode-TOsF}{bsx}{scsl}{ + <-> ssub * Junicode-TOsF/bsx/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{boldexpanded}{sl}{ - <-> ssub * Junicode-TOsF/boldexpanded/it +\DeclareFontShape{T1}{Junicode-TOsF}{boldsemiexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/boldsemiexpanded/scit }{} -% ---- l = light ---- +% ---- sbsx = semiboldsemiexpanded ---- -\DeclareFontShape{T1}{Junicode-TOsF}{l}{n}{ - <-> \Junicode@@scale Junicode-Light-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{sbsx}{sc}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{light}{n}{ - <-> alias * Junicode-TOsF/l/n +\DeclareFontShape{T1}{Junicode-TOsF}{semiboldsemiexpanded}{sc}{ + <-> alias * Junicode-TOsF/sbsx/sc }{} -\DeclareFontShape{T1}{Junicode-TOsF}{l}{sc}{ - <-> \Junicode@@scale Junicode-Light-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{sbsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{light}{sc}{ - <-> alias * Junicode-TOsF/l/sc +\DeclareFontShape{T1}{Junicode-TOsF}{semiboldsemiexpanded}{it}{ + <-> alias * Junicode-TOsF/sbsx/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{l}{it}{ - <-> \Junicode@@scale Junicode-LightItalic-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{light}{it}{ - <-> alias * Junicode-TOsF/l/it +\DeclareFontShape{T1}{Junicode-TOsF}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-TOsF/sbsx/n }{} -\DeclareFontShape{T1}{Junicode-TOsF}{l}{scit}{ - <-> \Junicode@@scale Junicode-LightItalic-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{sbsx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{light}{scit}{ - <-> alias * Junicode-TOsF/l/scit +\DeclareFontShape{T1}{Junicode-TOsF}{semiboldsemiexpanded}{scit}{ + <-> alias * Junicode-TOsF/sbsx/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{l}{scsl}{ - <-> ssub * Junicode-TOsF/l/scit +\DeclareFontShape{T1}{Junicode-TOsF}{sbsx}{sl}{ + <-> ssub * Junicode-TOsF/sbsx/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{light}{scsl}{ - <-> ssub * Junicode-TOsF/light/scit +\DeclareFontShape{T1}{Junicode-TOsF}{semiboldsemiexpanded}{sl}{ + <-> ssub * Junicode-TOsF/semiboldsemiexpanded/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{l}{sl}{ - <-> ssub * Junicode-TOsF/l/it +\DeclareFontShape{T1}{Junicode-TOsF}{sbsx}{scsl}{ + <-> ssub * Junicode-TOsF/sbsx/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{light}{sl}{ - <-> ssub * Junicode-TOsF/light/it +\DeclareFontShape{T1}{Junicode-TOsF}{semiboldsemiexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/semiboldsemiexpanded/scit }{} -% ---- mediumsemiexpanded ---- +% ---- medium ---- -\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{medium}{sc}{ + <-> \Junicode@@scale Junicode-Medium-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemiexpanded}{scit}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{medium}{it}{ + <-> \Junicode@@scale Junicode-MediumItalic-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{medium}{n}{ + <-> \Junicode@@scale Junicode-Medium-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemiexpanded}{sc}{ - <-> \Junicode@@scale Junicode-SmExpMedium-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{medium}{scit}{ + <-> \Junicode@@scale Junicode-MediumItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemiexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/mediumsemiexpanded/scit +\DeclareFontShape{T1}{Junicode-TOsF}{medium}{sl}{ + <-> ssub * Junicode-TOsF/medium/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-TOsF/mediumsemiexpanded/it +\DeclareFontShape{T1}{Junicode-TOsF}{medium}{scsl}{ + <-> ssub * Junicode-TOsF/medium/scit }{} -% ---- sbsx = semiboldsemiexpanded ---- +% ---- bx = boldexpanded ---- -\DeclareFontShape{T1}{Junicode-TOsF}{sbsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{bx}{sc}{ + <-> \Junicode@@scale Junicode-ExpBold-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semiboldsemiexpanded}{sc}{ - <-> alias * Junicode-TOsF/sbsx/sc +\DeclareFontShape{T1}{Junicode-TOsF}{boldexpanded}{sc}{ + <-> alias * Junicode-TOsF/bx/sc }{} -\DeclareFontShape{T1}{Junicode-TOsF}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{bx}{scit}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-TOsF/sbsx/n +\DeclareFontShape{T1}{Junicode-TOsF}{boldexpanded}{scit}{ + <-> alias * Junicode-TOsF/bx/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{sbsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{bx}{n}{ + <-> \Junicode@@scale Junicode-ExpBold-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semiboldsemiexpanded}{scit}{ - <-> alias * Junicode-TOsF/sbsx/scit +\DeclareFontShape{T1}{Junicode-TOsF}{boldexpanded}{n}{ + <-> alias * Junicode-TOsF/bx/n }{} -\DeclareFontShape{T1}{Junicode-TOsF}{sbsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semiboldsemiexpanded}{it}{ - <-> alias * Junicode-TOsF/sbsx/it +\DeclareFontShape{T1}{Junicode-TOsF}{boldexpanded}{it}{ + <-> alias * Junicode-TOsF/bx/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{sbsx}{scsl}{ - <-> ssub * Junicode-TOsF/sbsx/scit +\DeclareFontShape{T1}{Junicode-TOsF}{bx}{sl}{ + <-> ssub * Junicode-TOsF/bx/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semiboldsemiexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/semiboldsemiexpanded/scit +\DeclareFontShape{T1}{Junicode-TOsF}{boldexpanded}{sl}{ + <-> ssub * Junicode-TOsF/boldexpanded/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{sbsx}{sl}{ - <-> ssub * Junicode-TOsF/sbsx/it +\DeclareFontShape{T1}{Junicode-TOsF}{bx}{scsl}{ + <-> ssub * Junicode-TOsF/bx/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semiboldsemiexpanded}{sl}{ - <-> ssub * Junicode-TOsF/semiboldsemiexpanded/it +\DeclareFontShape{T1}{Junicode-TOsF}{boldexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/boldexpanded/scit }{} -% ---- mediumexpanded ---- +% ---- m = regular ---- -\DeclareFontShape{T1}{Junicode-TOsF}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{m}{sc}{ + <-> \Junicode@@scale Junicode-Regular-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{mediumexpanded}{scit}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{regular}{sc}{ + <-> alias * Junicode-TOsF/m/sc }{} -\DeclareFontShape{T1}{Junicode-TOsF}{mediumexpanded}{n}{ - <-> \Junicode@@scale Junicode-ExpMedium-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{m}{it}{ + <-> \Junicode@@scale Junicode-Italic-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{mediumexpanded}{sc}{ - <-> \Junicode@@scale Junicode-ExpMedium-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{regular}{it}{ + <-> alias * Junicode-TOsF/m/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{mediumexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/mediumexpanded/scit +\DeclareFontShape{T1}{Junicode-TOsF}{m}{n}{ + <-> \Junicode@@scale Junicode-Regular-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{mediumexpanded}{sl}{ - <-> ssub * Junicode-TOsF/mediumexpanded/it +\DeclareFontShape{T1}{Junicode-TOsF}{regular}{n}{ + <-> alias * Junicode-TOsF/m/n }{} - -% ---- sx = semiexpanded ---- - -\DeclareFontShape{T1}{Junicode-TOsF}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{m}{scit}{ + <-> \Junicode@@scale Junicode-Italic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semiexpanded}{n}{ - <-> alias * Junicode-TOsF/sx/n +\DeclareFontShape{T1}{Junicode-TOsF}{regular}{scit}{ + <-> alias * Junicode-TOsF/m/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{sx}{sc}{ - <-> \Junicode@@scale Junicode-SmExp-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{m}{sl}{ + <-> ssub * Junicode-TOsF/m/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semiexpanded}{sc}{ - <-> alias * Junicode-TOsF/sx/sc +\DeclareFontShape{T1}{Junicode-TOsF}{regular}{sl}{ + <-> ssub * Junicode-TOsF/regular/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{m}{scsl}{ + <-> ssub * Junicode-TOsF/m/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semiexpanded}{it}{ - <-> alias * Junicode-TOsF/sx/it +\DeclareFontShape{T1}{Junicode-TOsF}{regular}{scsl}{ + <-> ssub * Junicode-TOsF/regular/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{sx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpItalic-tosf-sc-t1 -}{} -\DeclareFontShape{T1}{Junicode-TOsF}{semiexpanded}{scit}{ - <-> alias * Junicode-TOsF/sx/scit -}{} +% ---- mediumsemiexpanded ---- -\DeclareFontShape{T1}{Junicode-TOsF}{sx}{scsl}{ - <-> ssub * Junicode-TOsF/sx/scit +\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semiexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/semiexpanded/scit +\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{sx}{sl}{ - <-> ssub * Junicode-TOsF/sx/it +\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemiexpanded}{scit}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semiexpanded}{sl}{ - <-> ssub * Junicode-TOsF/semiexpanded/it +\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemiexpanded}{sc}{ + <-> \Junicode@@scale Junicode-SmExpMedium-tosf-sc-t1 }{} - -% ---- x = expanded ---- - -\DeclareFontShape{T1}{Junicode-TOsF}{x}{scit}{ - <-> \Junicode@@scale Junicode-ExpItalic-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-TOsF/mediumsemiexpanded/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{expanded}{scit}{ - <-> alias * Junicode-TOsF/x/scit +\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemiexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/mediumsemiexpanded/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{x}{it}{ - <-> \Junicode@@scale Junicode-ExpItalic-tosf-t1 -}{} -\DeclareFontShape{T1}{Junicode-TOsF}{expanded}{it}{ - <-> alias * Junicode-TOsF/x/it -}{} +% ---- lc = lightcondensed ---- -\DeclareFontShape{T1}{Junicode-TOsF}{x}{sc}{ - <-> \Junicode@@scale Junicode-Exp-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{expanded}{sc}{ - <-> alias * Junicode-TOsF/x/sc +\DeclareFontShape{T1}{Junicode-TOsF}{lightcondensed}{it}{ + <-> alias * Junicode-TOsF/lc/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{x}{n}{ - <-> \Junicode@@scale Junicode-Exp-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{lc}{scit}{ + <-> \Junicode@@scale Junicode-CondLightItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{expanded}{n}{ - <-> alias * Junicode-TOsF/x/n +\DeclareFontShape{T1}{Junicode-TOsF}{lightcondensed}{scit}{ + <-> alias * Junicode-TOsF/lc/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{x}{scsl}{ - <-> ssub * Junicode-TOsF/x/scit +\DeclareFontShape{T1}{Junicode-TOsF}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{expanded}{scsl}{ - <-> ssub * Junicode-TOsF/expanded/scit +\DeclareFontShape{T1}{Junicode-TOsF}{lightcondensed}{n}{ + <-> alias * Junicode-TOsF/lc/n }{} -\DeclareFontShape{T1}{Junicode-TOsF}{x}{sl}{ - <-> ssub * Junicode-TOsF/x/it +\DeclareFontShape{T1}{Junicode-TOsF}{lc}{sc}{ + <-> \Junicode@@scale Junicode-CondLight-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{expanded}{sl}{ - <-> ssub * Junicode-TOsF/expanded/it +\DeclareFontShape{T1}{Junicode-TOsF}{lightcondensed}{sc}{ + <-> alias * Junicode-TOsF/lc/sc }{} - -% ---- c = condensed ---- - -\DeclareFontShape{T1}{Junicode-TOsF}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{lc}{sl}{ + <-> ssub * Junicode-TOsF/lc/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{condensed}{n}{ - <-> alias * Junicode-TOsF/c/n +\DeclareFontShape{T1}{Junicode-TOsF}{lightcondensed}{sl}{ + <-> ssub * Junicode-TOsF/lightcondensed/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{c}{sc}{ - <-> \Junicode@@scale Junicode-Cond-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{lc}{scsl}{ + <-> ssub * Junicode-TOsF/lc/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{condensed}{sc}{ - <-> alias * Junicode-TOsF/c/sc +\DeclareFontShape{T1}{Junicode-TOsF}{lightcondensed}{scsl}{ + <-> ssub * Junicode-TOsF/lightcondensed/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-tosf-t1 -}{} -\DeclareFontShape{T1}{Junicode-TOsF}{condensed}{it}{ - <-> alias * Junicode-TOsF/c/it -}{} +% ---- mediumsemicondensed ---- -\DeclareFontShape{T1}{Junicode-TOsF}{c}{scit}{ - <-> \Junicode@@scale Junicode-CondItalic-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemicondensed}{sc}{ + <-> \Junicode@@scale Junicode-SmCondMedium-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{condensed}{scit}{ - <-> alias * Junicode-TOsF/c/scit +\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemicondensed}{it}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{c}{scsl}{ - <-> ssub * Junicode-TOsF/c/scit +\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemicondensed}{n}{ + <-> \Junicode@@scale Junicode-SmCondMedium-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{condensed}{scsl}{ - <-> ssub * Junicode-TOsF/condensed/scit +\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemicondensed}{scit}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{c}{sl}{ - <-> ssub * Junicode-TOsF/c/it +\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemicondensed}{sl}{ + <-> ssub * Junicode-TOsF/mediumsemicondensed/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{condensed}{sl}{ - <-> ssub * Junicode-TOsF/condensed/it +\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemicondensed}{scsl}{ + <-> ssub * Junicode-TOsF/mediumsemicondensed/scit }{} -% ---- sc = semicondensed ---- +% ---- l = light ---- -\DeclareFontShape{T1}{Junicode-TOsF}{sc}{n}{ - <-> \Junicode@@scale Junicode-SmCond-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{l}{n}{ + <-> \Junicode@@scale Junicode-Light-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semicondensed}{n}{ - <-> alias * Junicode-TOsF/sc/n +\DeclareFontShape{T1}{Junicode-TOsF}{light}{n}{ + <-> alias * Junicode-TOsF/l/n }{} -\DeclareFontShape{T1}{Junicode-TOsF}{sc}{sc}{ - <-> \Junicode@@scale Junicode-SmCond-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{l}{scit}{ + <-> \Junicode@@scale Junicode-LightItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semicondensed}{sc}{ - <-> alias * Junicode-TOsF/sc/sc +\DeclareFontShape{T1}{Junicode-TOsF}{light}{scit}{ + <-> alias * Junicode-TOsF/l/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{sc}{it}{ - <-> \Junicode@@scale Junicode-SmCondItalic-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{l}{it}{ + <-> \Junicode@@scale Junicode-LightItalic-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semicondensed}{it}{ - <-> alias * Junicode-TOsF/sc/it +\DeclareFontShape{T1}{Junicode-TOsF}{light}{it}{ + <-> alias * Junicode-TOsF/l/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{sc}{scit}{ - <-> \Junicode@@scale Junicode-SmCondItalic-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{l}{sc}{ + <-> \Junicode@@scale Junicode-Light-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semicondensed}{scit}{ - <-> alias * Junicode-TOsF/sc/scit +\DeclareFontShape{T1}{Junicode-TOsF}{light}{sc}{ + <-> alias * Junicode-TOsF/l/sc }{} -\DeclareFontShape{T1}{Junicode-TOsF}{sc}{scsl}{ - <-> ssub * Junicode-TOsF/sc/scit +\DeclareFontShape{T1}{Junicode-TOsF}{l}{sl}{ + <-> ssub * Junicode-TOsF/l/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semicondensed}{scsl}{ - <-> ssub * Junicode-TOsF/semicondensed/scit +\DeclareFontShape{T1}{Junicode-TOsF}{light}{sl}{ + <-> ssub * Junicode-TOsF/light/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{sc}{sl}{ - <-> ssub * Junicode-TOsF/sc/it +\DeclareFontShape{T1}{Junicode-TOsF}{l}{scsl}{ + <-> ssub * Junicode-TOsF/l/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semicondensed}{sl}{ - <-> ssub * Junicode-TOsF/semicondensed/it +\DeclareFontShape{T1}{Junicode-TOsF}{light}{scsl}{ + <-> ssub * Junicode-TOsF/light/scit }{} -% ---- sb = semibold ---- +% ---- sx = semiexpanded ---- -\DeclareFontShape{T1}{Junicode-TOsF}{sb}{scit}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semibold}{scit}{ - <-> alias * Junicode-TOsF/sb/scit +\DeclareFontShape{T1}{Junicode-TOsF}{semiexpanded}{it}{ + <-> alias * Junicode-TOsF/sx/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{sb}{it}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semibold}{it}{ - <-> alias * Junicode-TOsF/sb/it +\DeclareFontShape{T1}{Junicode-TOsF}{semiexpanded}{n}{ + <-> alias * Junicode-TOsF/sx/n }{} -\DeclareFontShape{T1}{Junicode-TOsF}{sb}{sc}{ - <-> \Junicode@@scale Junicode-SmBold-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{sx}{scit}{ + <-> \Junicode@@scale Junicode-SmExpItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semibold}{sc}{ - <-> alias * Junicode-TOsF/sb/sc +\DeclareFontShape{T1}{Junicode-TOsF}{semiexpanded}{scit}{ + <-> alias * Junicode-TOsF/sx/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{sb}{n}{ - <-> \Junicode@@scale Junicode-SmBold-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{sx}{sc}{ + <-> \Junicode@@scale Junicode-SmExp-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semibold}{n}{ - <-> alias * Junicode-TOsF/sb/n +\DeclareFontShape{T1}{Junicode-TOsF}{semiexpanded}{sc}{ + <-> alias * Junicode-TOsF/sx/sc }{} -\DeclareFontShape{T1}{Junicode-TOsF}{sb}{scsl}{ - <-> ssub * Junicode-TOsF/sb/scit +\DeclareFontShape{T1}{Junicode-TOsF}{sx}{sl}{ + <-> ssub * Junicode-TOsF/sx/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semibold}{scsl}{ - <-> ssub * Junicode-TOsF/semibold/scit +\DeclareFontShape{T1}{Junicode-TOsF}{semiexpanded}{sl}{ + <-> ssub * Junicode-TOsF/semiexpanded/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{sb}{sl}{ - <-> ssub * Junicode-TOsF/sb/it +\DeclareFontShape{T1}{Junicode-TOsF}{sx}{scsl}{ + <-> ssub * Junicode-TOsF/sx/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semibold}{sl}{ - <-> ssub * Junicode-TOsF/semibold/it +\DeclareFontShape{T1}{Junicode-TOsF}{semiexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/semiexpanded/scit }{} -% ---- bsx = boldsemiexpanded ---- +% ---- b = bold ---- -\DeclareFontShape{T1}{Junicode-TOsF}{bsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{b}{sc}{ + <-> \Junicode@@scale Junicode-Bold-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{boldsemiexpanded}{it}{ - <-> alias * Junicode-TOsF/bsx/it +\DeclareFontShape{T1}{Junicode-TOsF}{bold}{sc}{ + <-> alias * Junicode-TOsF/b/sc }{} -\DeclareFontShape{T1}{Junicode-TOsF}{bsx}{scit}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{b}{scit}{ + <-> \Junicode@@scale Junicode-BoldItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{boldsemiexpanded}{scit}{ - <-> alias * Junicode-TOsF/bsx/scit +\DeclareFontShape{T1}{Junicode-TOsF}{bold}{scit}{ + <-> alias * Junicode-TOsF/b/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{bsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpBold-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{b}{n}{ + <-> \Junicode@@scale Junicode-Bold-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{boldsemiexpanded}{n}{ - <-> alias * Junicode-TOsF/bsx/n +\DeclareFontShape{T1}{Junicode-TOsF}{bold}{n}{ + <-> alias * Junicode-TOsF/b/n }{} -\DeclareFontShape{T1}{Junicode-TOsF}{bsx}{sc}{ - <-> \Junicode@@scale Junicode-SmExpBold-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{b}{it}{ + <-> \Junicode@@scale Junicode-BoldItalic-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{boldsemiexpanded}{sc}{ - <-> alias * Junicode-TOsF/bsx/sc +\DeclareFontShape{T1}{Junicode-TOsF}{bold}{it}{ + <-> alias * Junicode-TOsF/b/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{bsx}{scsl}{ - <-> ssub * Junicode-TOsF/bsx/scit +\DeclareFontShape{T1}{Junicode-TOsF}{b}{sl}{ + <-> ssub * Junicode-TOsF/b/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{boldsemiexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/boldsemiexpanded/scit +\DeclareFontShape{T1}{Junicode-TOsF}{bold}{sl}{ + <-> ssub * Junicode-TOsF/bold/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{bsx}{sl}{ - <-> ssub * Junicode-TOsF/bsx/it +\DeclareFontShape{T1}{Junicode-TOsF}{b}{scsl}{ + <-> ssub * Junicode-TOsF/b/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{boldsemiexpanded}{sl}{ - <-> ssub * Junicode-TOsF/boldsemiexpanded/it +\DeclareFontShape{T1}{Junicode-TOsF}{bold}{scsl}{ + <-> ssub * Junicode-TOsF/bold/scit }{} -% ---- lc = lightcondensed ---- +% ---- x = expanded ---- -\DeclareFontShape{T1}{Junicode-TOsF}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{x}{it}{ + <-> \Junicode@@scale Junicode-ExpItalic-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{lightcondensed}{n}{ - <-> alias * Junicode-TOsF/lc/n +\DeclareFontShape{T1}{Junicode-TOsF}{expanded}{it}{ + <-> alias * Junicode-TOsF/x/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{lc}{sc}{ - <-> \Junicode@@scale Junicode-CondLight-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{x}{n}{ + <-> \Junicode@@scale Junicode-Exp-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{lightcondensed}{sc}{ - <-> alias * Junicode-TOsF/lc/sc +\DeclareFontShape{T1}{Junicode-TOsF}{expanded}{n}{ + <-> alias * Junicode-TOsF/x/n }{} -\DeclareFontShape{T1}{Junicode-TOsF}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{x}{scit}{ + <-> \Junicode@@scale Junicode-ExpItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{lightcondensed}{it}{ - <-> alias * Junicode-TOsF/lc/it +\DeclareFontShape{T1}{Junicode-TOsF}{expanded}{scit}{ + <-> alias * Junicode-TOsF/x/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{lc}{scit}{ - <-> \Junicode@@scale Junicode-CondLightItalic-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{x}{sc}{ + <-> \Junicode@@scale Junicode-Exp-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{lightcondensed}{scit}{ - <-> alias * Junicode-TOsF/lc/scit +\DeclareFontShape{T1}{Junicode-TOsF}{expanded}{sc}{ + <-> alias * Junicode-TOsF/x/sc }{} -\DeclareFontShape{T1}{Junicode-TOsF}{lc}{scsl}{ - <-> ssub * Junicode-TOsF/lc/scit +\DeclareFontShape{T1}{Junicode-TOsF}{x}{sl}{ + <-> ssub * Junicode-TOsF/x/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{lightcondensed}{scsl}{ - <-> ssub * Junicode-TOsF/lightcondensed/scit +\DeclareFontShape{T1}{Junicode-TOsF}{expanded}{sl}{ + <-> ssub * Junicode-TOsF/expanded/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{lc}{sl}{ - <-> ssub * Junicode-TOsF/lc/it +\DeclareFontShape{T1}{Junicode-TOsF}{x}{scsl}{ + <-> ssub * Junicode-TOsF/x/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{lightcondensed}{sl}{ - <-> ssub * Junicode-TOsF/lightcondensed/it +\DeclareFontShape{T1}{Junicode-TOsF}{expanded}{scsl}{ + <-> ssub * Junicode-TOsF/expanded/scit }{} -% ---- sbx = semiboldexpanded ---- +% ---- lsc = lightsemicondensed ---- -\DeclareFontShape{T1}{Junicode-TOsF}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{lsc}{sc}{ + <-> \Junicode@@scale Junicode-SmCondLight-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semiboldexpanded}{n}{ - <-> alias * Junicode-TOsF/sbx/n +\DeclareFontShape{T1}{Junicode-TOsF}{lightsemicondensed}{sc}{ + <-> alias * Junicode-TOsF/lsc/sc }{} -\DeclareFontShape{T1}{Junicode-TOsF}{sbx}{sc}{ - <-> \Junicode@@scale Junicode-ExpSmBold-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semiboldexpanded}{sc}{ - <-> alias * Junicode-TOsF/sbx/sc +\DeclareFontShape{T1}{Junicode-TOsF}{lightsemicondensed}{n}{ + <-> alias * Junicode-TOsF/lsc/n }{} -\DeclareFontShape{T1}{Junicode-TOsF}{sbx}{it}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{lsc}{scit}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semiboldexpanded}{it}{ - <-> alias * Junicode-TOsF/sbx/it +\DeclareFontShape{T1}{Junicode-TOsF}{lightsemicondensed}{scit}{ + <-> alias * Junicode-TOsF/lsc/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{sbx}{scit}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semiboldexpanded}{scit}{ - <-> alias * Junicode-TOsF/sbx/scit +\DeclareFontShape{T1}{Junicode-TOsF}{lightsemicondensed}{it}{ + <-> alias * Junicode-TOsF/lsc/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{sbx}{scsl}{ - <-> ssub * Junicode-TOsF/sbx/scit +\DeclareFontShape{T1}{Junicode-TOsF}{lsc}{sl}{ + <-> ssub * Junicode-TOsF/lsc/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semiboldexpanded}{scsl}{ - <-> ssub * Junicode-TOsF/semiboldexpanded/scit +\DeclareFontShape{T1}{Junicode-TOsF}{lightsemicondensed}{sl}{ + <-> ssub * Junicode-TOsF/lightsemicondensed/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{sbx}{sl}{ - <-> ssub * Junicode-TOsF/sbx/it +\DeclareFontShape{T1}{Junicode-TOsF}{lsc}{scsl}{ + <-> ssub * Junicode-TOsF/lsc/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{semiboldexpanded}{sl}{ - <-> ssub * Junicode-TOsF/semiboldexpanded/it +\DeclareFontShape{T1}{Junicode-TOsF}{lightsemicondensed}{scsl}{ + <-> ssub * Junicode-TOsF/lightsemicondensed/scit }{} -% ---- mediumsemicondensed ---- +% ---- mediumexpanded ---- -\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemicondensed}{sc}{ - <-> \Junicode@@scale Junicode-SmCondMedium-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{mediumexpanded}{scit}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemicondensed}{n}{ - <-> \Junicode@@scale Junicode-SmCondMedium-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{mediumexpanded}{n}{ + <-> \Junicode@@scale Junicode-ExpMedium-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemicondensed}{scit}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemicondensed}{it}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{mediumexpanded}{sc}{ + <-> \Junicode@@scale Junicode-ExpMedium-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemicondensed}{scsl}{ - <-> ssub * Junicode-TOsF/mediumsemicondensed/scit +\DeclareFontShape{T1}{Junicode-TOsF}{mediumexpanded}{sl}{ + <-> ssub * Junicode-TOsF/mediumexpanded/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{mediumsemicondensed}{sl}{ - <-> ssub * Junicode-TOsF/mediumsemicondensed/it +\DeclareFontShape{T1}{Junicode-TOsF}{mediumexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/mediumexpanded/scit }{} -% ---- mediumcondensed ---- +% ---- c = condensed ---- -\DeclareFontShape{T1}{Junicode-TOsF}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{mediumcondensed}{scit}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{condensed}{it}{ + <-> alias * Junicode-TOsF/c/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{c}{scit}{ + <-> \Junicode@@scale Junicode-CondItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{mediumcondensed}{sc}{ - <-> \Junicode@@scale Junicode-CondMedium-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{condensed}{scit}{ + <-> alias * Junicode-TOsF/c/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{mediumcondensed}{scsl}{ - <-> ssub * Junicode-TOsF/mediumcondensed/scit +\DeclareFontShape{T1}{Junicode-TOsF}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{mediumcondensed}{sl}{ - <-> ssub * Junicode-TOsF/mediumcondensed/it +\DeclareFontShape{T1}{Junicode-TOsF}{condensed}{n}{ + <-> alias * Junicode-TOsF/c/n }{} +\DeclareFontShape{T1}{Junicode-TOsF}{c}{sc}{ + <-> \Junicode@@scale Junicode-Cond-tosf-sc-t1 +}{} -% ---- b = bold ---- +\DeclareFontShape{T1}{Junicode-TOsF}{condensed}{sc}{ + <-> alias * Junicode-TOsF/c/sc +}{} -\DeclareFontShape{T1}{Junicode-TOsF}{b}{n}{ - <-> \Junicode@@scale Junicode-Bold-tosf-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{c}{sl}{ + <-> ssub * Junicode-TOsF/c/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{bold}{n}{ - <-> alias * Junicode-TOsF/b/n +\DeclareFontShape{T1}{Junicode-TOsF}{condensed}{sl}{ + <-> ssub * Junicode-TOsF/condensed/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{b}{sc}{ - <-> \Junicode@@scale Junicode-Bold-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{c}{scsl}{ + <-> ssub * Junicode-TOsF/c/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{bold}{sc}{ - <-> alias * Junicode-TOsF/b/sc +\DeclareFontShape{T1}{Junicode-TOsF}{condensed}{scsl}{ + <-> ssub * Junicode-TOsF/condensed/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{b}{it}{ - <-> \Junicode@@scale Junicode-BoldItalic-tosf-t1 + +% ---- sbx = semiboldexpanded ---- + +\DeclareFontShape{T1}{Junicode-TOsF}{sbx}{it}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{bold}{it}{ - <-> alias * Junicode-TOsF/b/it +\DeclareFontShape{T1}{Junicode-TOsF}{semiboldexpanded}{it}{ + <-> alias * Junicode-TOsF/sbx/it }{} -\DeclareFontShape{T1}{Junicode-TOsF}{b}{scit}{ - <-> \Junicode@@scale Junicode-BoldItalic-tosf-sc-t1 +\DeclareFontShape{T1}{Junicode-TOsF}{sbx}{scit}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{bold}{scit}{ - <-> alias * Junicode-TOsF/b/scit +\DeclareFontShape{T1}{Junicode-TOsF}{semiboldexpanded}{scit}{ + <-> alias * Junicode-TOsF/sbx/scit }{} -\DeclareFontShape{T1}{Junicode-TOsF}{b}{scsl}{ - <-> ssub * Junicode-TOsF/b/scit +\DeclareFontShape{T1}{Junicode-TOsF}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-tosf-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{bold}{scsl}{ - <-> ssub * Junicode-TOsF/bold/scit +\DeclareFontShape{T1}{Junicode-TOsF}{semiboldexpanded}{n}{ + <-> alias * Junicode-TOsF/sbx/n }{} -\DeclareFontShape{T1}{Junicode-TOsF}{b}{sl}{ - <-> ssub * Junicode-TOsF/b/it +\DeclareFontShape{T1}{Junicode-TOsF}{sbx}{sc}{ + <-> \Junicode@@scale Junicode-ExpSmBold-tosf-sc-t1 }{} -\DeclareFontShape{T1}{Junicode-TOsF}{bold}{sl}{ - <-> ssub * Junicode-TOsF/bold/it +\DeclareFontShape{T1}{Junicode-TOsF}{semiboldexpanded}{sc}{ + <-> alias * Junicode-TOsF/sbx/sc +}{} + +\DeclareFontShape{T1}{Junicode-TOsF}{sbx}{sl}{ + <-> ssub * Junicode-TOsF/sbx/it +}{} + +\DeclareFontShape{T1}{Junicode-TOsF}{semiboldexpanded}{sl}{ + <-> ssub * Junicode-TOsF/semiboldexpanded/it +}{} + +\DeclareFontShape{T1}{Junicode-TOsF}{sbx}{scsl}{ + <-> ssub * Junicode-TOsF/sbx/scit +}{} + +\DeclareFontShape{T1}{Junicode-TOsF}{semiboldexpanded}{scsl}{ + <-> ssub * Junicode-TOsF/semiboldexpanded/scit }{} diff --git a/Master/texmf-dist/tex/latex/junicode/TS1Junicode-LF.fd b/Master/texmf-dist/tex/latex/junicode/TS1Junicode-LF.fd index 1e3cb0a31c4..80b213adcbd 100644 --- a/Master/texmf-dist/tex/latex/junicode/TS1Junicode-LF.fd +++ b/Master/texmf-dist/tex/latex/junicode/TS1Junicode-LF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{TS1Junicode-LF.fd} - [2024/06/03 (autoinst) Font definitions for TS1/Junicode-LF.] + [2024/07/21 (autoinst) Font definitions for TS1/Junicode-LF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,89 +20,70 @@ \DeclareFontFamily{TS1}{Junicode-LF}{} -% ---- l = light ---- +% ---- sbx = semiboldexpanded ---- -\DeclareFontShape{TS1}{Junicode-LF}{l}{n}{ - <-> \Junicode@@scale Junicode-Light-lf-ts1 +\DeclareFontShape{TS1}{Junicode-LF}{sbx}{it}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-LF}{light}{n}{ - <-> alias * Junicode-LF/l/n +\DeclareFontShape{TS1}{Junicode-LF}{semiboldexpanded}{it}{ + <-> alias * Junicode-LF/sbx/it }{} -\DeclareFontShape{TS1}{Junicode-LF}{l}{it}{ - <-> \Junicode@@scale Junicode-LightItalic-lf-ts1 +\DeclareFontShape{TS1}{Junicode-LF}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-lf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-LF}{light}{it}{ - <-> alias * Junicode-LF/l/it +\DeclareFontShape{TS1}{Junicode-LF}{semiboldexpanded}{n}{ + <-> alias * Junicode-LF/sbx/n }{} -\DeclareFontShape{TS1}{Junicode-LF}{l}{sl}{ - <-> ssub * Junicode-LF/l/it +\DeclareFontShape{TS1}{Junicode-LF}{sbx}{sl}{ + <-> ssub * Junicode-LF/sbx/it }{} -\DeclareFontShape{TS1}{Junicode-LF}{light}{sl}{ - <-> ssub * Junicode-LF/light/it +\DeclareFontShape{TS1}{Junicode-LF}{semiboldexpanded}{sl}{ + <-> ssub * Junicode-LF/semiboldexpanded/it }{} -% ---- bx = boldexpanded ---- - -\DeclareFontShape{TS1}{Junicode-LF}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-ts1 -}{} - -\DeclareFontShape{TS1}{Junicode-LF}{boldexpanded}{it}{ - <-> alias * Junicode-LF/bx/it -}{} +% ---- c = condensed ---- -\DeclareFontShape{TS1}{Junicode-LF}{bx}{n}{ - <-> \Junicode@@scale Junicode-ExpBold-lf-ts1 +\DeclareFontShape{TS1}{Junicode-LF}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-lf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-LF}{boldexpanded}{n}{ - <-> alias * Junicode-LF/bx/n +\DeclareFontShape{TS1}{Junicode-LF}{condensed}{it}{ + <-> alias * Junicode-LF/c/it }{} -\DeclareFontShape{TS1}{Junicode-LF}{bx}{sl}{ - <-> ssub * Junicode-LF/bx/it +\DeclareFontShape{TS1}{Junicode-LF}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-lf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-LF}{boldexpanded}{sl}{ - <-> ssub * Junicode-LF/boldexpanded/it +\DeclareFontShape{TS1}{Junicode-LF}{condensed}{n}{ + <-> alias * Junicode-LF/c/n }{} - -% ---- m = regular ---- - -\DeclareFontShape{TS1}{Junicode-LF}{m}{it}{ - <-> \Junicode@@scale Junicode-Italic-lf-ts1 +\DeclareFontShape{TS1}{Junicode-LF}{c}{sl}{ + <-> ssub * Junicode-LF/c/it }{} -\DeclareFontShape{TS1}{Junicode-LF}{regular}{it}{ - <-> alias * Junicode-LF/m/it +\DeclareFontShape{TS1}{Junicode-LF}{condensed}{sl}{ + <-> ssub * Junicode-LF/condensed/it }{} -\DeclareFontShape{TS1}{Junicode-LF}{m}{n}{ - <-> \Junicode@@scale Junicode-Regular-lf-ts1 -}{} -\DeclareFontShape{TS1}{Junicode-LF}{regular}{n}{ - <-> alias * Junicode-LF/m/n -}{} +% ---- lsc = lightsemicondensed ---- -\DeclareFontShape{TS1}{Junicode-LF}{m}{sl}{ - <-> ssub * Junicode-LF/m/it +\DeclareFontShape{TS1}{Junicode-LF}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-LF}{regular}{sl}{ - <-> ssub * Junicode-LF/regular/it +\DeclareFontShape{TS1}{Junicode-LF}{lightsemicondensed}{it}{ + <-> alias * Junicode-LF/lsc/it }{} - -% ---- lsc = lightsemicondensed ---- - \DeclareFontShape{TS1}{Junicode-LF}{lsc}{n}{ <-> \Junicode@@scale Junicode-SmCondLight-lf-ts1 }{} @@ -111,14 +92,6 @@ <-> alias * Junicode-LF/lsc/n }{} -\DeclareFontShape{TS1}{Junicode-LF}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-lf-ts1 -}{} - -\DeclareFontShape{TS1}{Junicode-LF}{lightsemicondensed}{it}{ - <-> alias * Junicode-LF/lsc/it -}{} - \DeclareFontShape{TS1}{Junicode-LF}{lsc}{sl}{ <-> ssub * Junicode-LF/lsc/it }{} @@ -128,58 +101,50 @@ }{} -% ---- medium ---- +% ---- mediumexpanded ---- -\DeclareFontShape{TS1}{Junicode-LF}{medium}{it}{ - <-> \Junicode@@scale Junicode-MediumItalic-lf-ts1 +\DeclareFontShape{TS1}{Junicode-LF}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-LF}{medium}{n}{ - <-> \Junicode@@scale Junicode-Medium-lf-ts1 +\DeclareFontShape{TS1}{Junicode-LF}{mediumexpanded}{n}{ + <-> \Junicode@@scale Junicode-ExpMedium-lf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-LF}{medium}{sl}{ - <-> ssub * Junicode-LF/medium/it +\DeclareFontShape{TS1}{Junicode-LF}{mediumexpanded}{sl}{ + <-> ssub * Junicode-LF/mediumexpanded/it }{} -% ---- sx = semiexpanded ---- +% ---- b = bold ---- -\DeclareFontShape{TS1}{Junicode-LF}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-lf-ts1 +\DeclareFontShape{TS1}{Junicode-LF}{b}{it}{ + <-> \Junicode@@scale Junicode-BoldItalic-lf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-LF}{semiexpanded}{it}{ - <-> alias * Junicode-LF/sx/it +\DeclareFontShape{TS1}{Junicode-LF}{bold}{it}{ + <-> alias * Junicode-LF/b/it }{} -\DeclareFontShape{TS1}{Junicode-LF}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-lf-ts1 +\DeclareFontShape{TS1}{Junicode-LF}{b}{n}{ + <-> \Junicode@@scale Junicode-Bold-lf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-LF}{semiexpanded}{n}{ - <-> alias * Junicode-LF/sx/n +\DeclareFontShape{TS1}{Junicode-LF}{bold}{n}{ + <-> alias * Junicode-LF/b/n }{} -\DeclareFontShape{TS1}{Junicode-LF}{sx}{sl}{ - <-> ssub * Junicode-LF/sx/it +\DeclareFontShape{TS1}{Junicode-LF}{b}{sl}{ + <-> ssub * Junicode-LF/b/it }{} -\DeclareFontShape{TS1}{Junicode-LF}{semiexpanded}{sl}{ - <-> ssub * Junicode-LF/semiexpanded/it +\DeclareFontShape{TS1}{Junicode-LF}{bold}{sl}{ + <-> ssub * Junicode-LF/bold/it }{} % ---- x = expanded ---- -\DeclareFontShape{TS1}{Junicode-LF}{x}{n}{ - <-> \Junicode@@scale Junicode-Exp-lf-ts1 -}{} - -\DeclareFontShape{TS1}{Junicode-LF}{expanded}{n}{ - <-> alias * Junicode-LF/x/n -}{} - \DeclareFontShape{TS1}{Junicode-LF}{x}{it}{ <-> \Junicode@@scale Junicode-ExpItalic-lf-ts1 }{} @@ -188,6 +153,14 @@ <-> alias * Junicode-LF/x/it }{} +\DeclareFontShape{TS1}{Junicode-LF}{x}{n}{ + <-> \Junicode@@scale Junicode-Exp-lf-ts1 +}{} + +\DeclareFontShape{TS1}{Junicode-LF}{expanded}{n}{ + <-> alias * Junicode-LF/x/n +}{} + \DeclareFontShape{TS1}{Junicode-LF}{x}{sl}{ <-> ssub * Junicode-LF/x/it }{} @@ -197,156 +170,156 @@ }{} -% ---- c = condensed ---- - -\DeclareFontShape{TS1}{Junicode-LF}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-lf-ts1 -}{} - -\DeclareFontShape{TS1}{Junicode-LF}{condensed}{n}{ - <-> alias * Junicode-LF/c/n -}{} - -\DeclareFontShape{TS1}{Junicode-LF}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-lf-ts1 -}{} +% ---- mediumsemicondensed ---- -\DeclareFontShape{TS1}{Junicode-LF}{condensed}{it}{ - <-> alias * Junicode-LF/c/it +\DeclareFontShape{TS1}{Junicode-LF}{mediumsemicondensed}{n}{ + <-> \Junicode@@scale Junicode-SmCondMedium-lf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-LF}{c}{sl}{ - <-> ssub * Junicode-LF/c/it +\DeclareFontShape{TS1}{Junicode-LF}{mediumsemicondensed}{it}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-LF}{condensed}{sl}{ - <-> ssub * Junicode-LF/condensed/it +\DeclareFontShape{TS1}{Junicode-LF}{mediumsemicondensed}{sl}{ + <-> ssub * Junicode-LF/mediumsemicondensed/it }{} -% ---- sbsx = semiboldsemiexpanded ---- +% ---- l = light ---- -\DeclareFontShape{TS1}{Junicode-LF}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-lf-ts1 +\DeclareFontShape{TS1}{Junicode-LF}{l}{n}{ + <-> \Junicode@@scale Junicode-Light-lf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-LF}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-LF/sbsx/n +\DeclareFontShape{TS1}{Junicode-LF}{light}{n}{ + <-> alias * Junicode-LF/l/n }{} -\DeclareFontShape{TS1}{Junicode-LF}{sbsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-ts1 +\DeclareFontShape{TS1}{Junicode-LF}{l}{it}{ + <-> \Junicode@@scale Junicode-LightItalic-lf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-LF}{semiboldsemiexpanded}{it}{ - <-> alias * Junicode-LF/sbsx/it +\DeclareFontShape{TS1}{Junicode-LF}{light}{it}{ + <-> alias * Junicode-LF/l/it }{} -\DeclareFontShape{TS1}{Junicode-LF}{sbsx}{sl}{ - <-> ssub * Junicode-LF/sbsx/it +\DeclareFontShape{TS1}{Junicode-LF}{l}{sl}{ + <-> ssub * Junicode-LF/l/it }{} -\DeclareFontShape{TS1}{Junicode-LF}{semiboldsemiexpanded}{sl}{ - <-> ssub * Junicode-LF/semiboldsemiexpanded/it +\DeclareFontShape{TS1}{Junicode-LF}{light}{sl}{ + <-> ssub * Junicode-LF/light/it }{} -% ---- mediumexpanded ---- +% ---- sx = semiexpanded ---- -\DeclareFontShape{TS1}{Junicode-LF}{mediumexpanded}{n}{ - <-> \Junicode@@scale Junicode-ExpMedium-lf-ts1 +\DeclareFontShape{TS1}{Junicode-LF}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-lf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-LF}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-lf-ts1 +\DeclareFontShape{TS1}{Junicode-LF}{semiexpanded}{it}{ + <-> alias * Junicode-LF/sx/it }{} -\DeclareFontShape{TS1}{Junicode-LF}{mediumexpanded}{sl}{ - <-> ssub * Junicode-LF/mediumexpanded/it +\DeclareFontShape{TS1}{Junicode-LF}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-lf-ts1 }{} - -% ---- mediumsemiexpanded ---- - -\DeclareFontShape{TS1}{Junicode-LF}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-lf-ts1 +\DeclareFontShape{TS1}{Junicode-LF}{semiexpanded}{n}{ + <-> alias * Junicode-LF/sx/n }{} -\DeclareFontShape{TS1}{Junicode-LF}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-ts1 +\DeclareFontShape{TS1}{Junicode-LF}{sx}{sl}{ + <-> ssub * Junicode-LF/sx/it }{} -\DeclareFontShape{TS1}{Junicode-LF}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-LF/mediumsemiexpanded/it +\DeclareFontShape{TS1}{Junicode-LF}{semiexpanded}{sl}{ + <-> ssub * Junicode-LF/semiexpanded/it }{} -% ---- mediumsemicondensed ---- +% ---- medium ---- -\DeclareFontShape{TS1}{Junicode-LF}{mediumsemicondensed}{n}{ - <-> \Junicode@@scale Junicode-SmCondMedium-lf-ts1 +\DeclareFontShape{TS1}{Junicode-LF}{medium}{it}{ + <-> \Junicode@@scale Junicode-MediumItalic-lf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-LF}{mediumsemicondensed}{it}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-lf-ts1 +\DeclareFontShape{TS1}{Junicode-LF}{medium}{n}{ + <-> \Junicode@@scale Junicode-Medium-lf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-LF}{mediumsemicondensed}{sl}{ - <-> ssub * Junicode-LF/mediumsemicondensed/it +\DeclareFontShape{TS1}{Junicode-LF}{medium}{sl}{ + <-> ssub * Junicode-LF/medium/it }{} -% ---- sbx = semiboldexpanded ---- +% ---- bx = boldexpanded ---- -\DeclareFontShape{TS1}{Junicode-LF}{sbx}{it}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-lf-ts1 +\DeclareFontShape{TS1}{Junicode-LF}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-lf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-LF}{semiboldexpanded}{it}{ - <-> alias * Junicode-LF/sbx/it +\DeclareFontShape{TS1}{Junicode-LF}{boldexpanded}{it}{ + <-> alias * Junicode-LF/bx/it }{} -\DeclareFontShape{TS1}{Junicode-LF}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-lf-ts1 +\DeclareFontShape{TS1}{Junicode-LF}{bx}{n}{ + <-> \Junicode@@scale Junicode-ExpBold-lf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-LF}{semiboldexpanded}{n}{ - <-> alias * Junicode-LF/sbx/n +\DeclareFontShape{TS1}{Junicode-LF}{boldexpanded}{n}{ + <-> alias * Junicode-LF/bx/n }{} -\DeclareFontShape{TS1}{Junicode-LF}{sbx}{sl}{ - <-> ssub * Junicode-LF/sbx/it +\DeclareFontShape{TS1}{Junicode-LF}{bx}{sl}{ + <-> ssub * Junicode-LF/bx/it }{} -\DeclareFontShape{TS1}{Junicode-LF}{semiboldexpanded}{sl}{ - <-> ssub * Junicode-LF/semiboldexpanded/it +\DeclareFontShape{TS1}{Junicode-LF}{boldexpanded}{sl}{ + <-> ssub * Junicode-LF/boldexpanded/it }{} -% ---- bsx = boldsemiexpanded ---- +% ---- m = regular ---- -\DeclareFontShape{TS1}{Junicode-LF}{bsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpBold-lf-ts1 +\DeclareFontShape{TS1}{Junicode-LF}{m}{n}{ + <-> \Junicode@@scale Junicode-Regular-lf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-LF}{boldsemiexpanded}{n}{ - <-> alias * Junicode-LF/bsx/n +\DeclareFontShape{TS1}{Junicode-LF}{regular}{n}{ + <-> alias * Junicode-LF/m/n }{} -\DeclareFontShape{TS1}{Junicode-LF}{bsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-ts1 +\DeclareFontShape{TS1}{Junicode-LF}{m}{it}{ + <-> \Junicode@@scale Junicode-Italic-lf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-LF}{boldsemiexpanded}{it}{ - <-> alias * Junicode-LF/bsx/it +\DeclareFontShape{TS1}{Junicode-LF}{regular}{it}{ + <-> alias * Junicode-LF/m/it }{} -\DeclareFontShape{TS1}{Junicode-LF}{bsx}{sl}{ - <-> ssub * Junicode-LF/bsx/it +\DeclareFontShape{TS1}{Junicode-LF}{m}{sl}{ + <-> ssub * Junicode-LF/m/it }{} -\DeclareFontShape{TS1}{Junicode-LF}{boldsemiexpanded}{sl}{ - <-> ssub * Junicode-LF/boldsemiexpanded/it +\DeclareFontShape{TS1}{Junicode-LF}{regular}{sl}{ + <-> ssub * Junicode-LF/regular/it +}{} + + +% ---- mediumsemiexpanded ---- + +\DeclareFontShape{TS1}{Junicode-LF}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-lf-ts1 +}{} + +\DeclareFontShape{TS1}{Junicode-LF}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-lf-ts1 +}{} + +\DeclareFontShape{TS1}{Junicode-LF}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-LF/mediumsemiexpanded/it }{} @@ -404,75 +377,102 @@ }{} -% ---- sb = semibold ---- +% ---- sbsx = semiboldsemiexpanded ---- -\DeclareFontShape{TS1}{Junicode-LF}{sb}{it}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-lf-ts1 +\DeclareFontShape{TS1}{Junicode-LF}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-lf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-LF}{semibold}{it}{ - <-> alias * Junicode-LF/sb/it +\DeclareFontShape{TS1}{Junicode-LF}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-LF/sbsx/n }{} -\DeclareFontShape{TS1}{Junicode-LF}{sb}{n}{ - <-> \Junicode@@scale Junicode-SmBold-lf-ts1 +\DeclareFontShape{TS1}{Junicode-LF}{sbsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-lf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-LF}{semibold}{n}{ - <-> alias * Junicode-LF/sb/n +\DeclareFontShape{TS1}{Junicode-LF}{semiboldsemiexpanded}{it}{ + <-> alias * Junicode-LF/sbsx/it }{} -\DeclareFontShape{TS1}{Junicode-LF}{sb}{sl}{ - <-> ssub * Junicode-LF/sb/it +\DeclareFontShape{TS1}{Junicode-LF}{sbsx}{sl}{ + <-> ssub * Junicode-LF/sbsx/it }{} -\DeclareFontShape{TS1}{Junicode-LF}{semibold}{sl}{ - <-> ssub * Junicode-LF/semibold/it +\DeclareFontShape{TS1}{Junicode-LF}{semiboldsemiexpanded}{sl}{ + <-> ssub * Junicode-LF/semiboldsemiexpanded/it }{} -% ---- b = bold ---- +% ---- bsx = boldsemiexpanded ---- -\DeclareFontShape{TS1}{Junicode-LF}{b}{n}{ - <-> \Junicode@@scale Junicode-Bold-lf-ts1 +\DeclareFontShape{TS1}{Junicode-LF}{bsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpBold-lf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-LF}{bold}{n}{ - <-> alias * Junicode-LF/b/n +\DeclareFontShape{TS1}{Junicode-LF}{boldsemiexpanded}{n}{ + <-> alias * Junicode-LF/bsx/n }{} -\DeclareFontShape{TS1}{Junicode-LF}{b}{it}{ - <-> \Junicode@@scale Junicode-BoldItalic-lf-ts1 +\DeclareFontShape{TS1}{Junicode-LF}{bsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-lf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-LF}{bold}{it}{ - <-> alias * Junicode-LF/b/it +\DeclareFontShape{TS1}{Junicode-LF}{boldsemiexpanded}{it}{ + <-> alias * Junicode-LF/bsx/it }{} -\DeclareFontShape{TS1}{Junicode-LF}{b}{sl}{ - <-> ssub * Junicode-LF/b/it +\DeclareFontShape{TS1}{Junicode-LF}{bsx}{sl}{ + <-> ssub * Junicode-LF/bsx/it }{} -\DeclareFontShape{TS1}{Junicode-LF}{bold}{sl}{ - <-> ssub * Junicode-LF/bold/it +\DeclareFontShape{TS1}{Junicode-LF}{boldsemiexpanded}{sl}{ + <-> ssub * Junicode-LF/boldsemiexpanded/it }{} % ---- mediumcondensed ---- -\DeclareFontShape{TS1}{Junicode-LF}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-lf-ts1 -}{} - \DeclareFontShape{TS1}{Junicode-LF}{mediumcondensed}{it}{ <-> \Junicode@@scale Junicode-CondMediumItalic-lf-ts1 }{} +\DeclareFontShape{TS1}{Junicode-LF}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-lf-ts1 +}{} + \DeclareFontShape{TS1}{Junicode-LF}{mediumcondensed}{sl}{ <-> ssub * Junicode-LF/mediumcondensed/it }{} +% ---- sb = semibold ---- + +\DeclareFontShape{TS1}{Junicode-LF}{sb}{n}{ + <-> \Junicode@@scale Junicode-SmBold-lf-ts1 +}{} + +\DeclareFontShape{TS1}{Junicode-LF}{semibold}{n}{ + <-> alias * Junicode-LF/sb/n +}{} + +\DeclareFontShape{TS1}{Junicode-LF}{sb}{it}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-lf-ts1 +}{} + +\DeclareFontShape{TS1}{Junicode-LF}{semibold}{it}{ + <-> alias * Junicode-LF/sb/it +}{} + +\DeclareFontShape{TS1}{Junicode-LF}{sb}{sl}{ + <-> ssub * Junicode-LF/sb/it +}{} + +\DeclareFontShape{TS1}{Junicode-LF}{semibold}{sl}{ + <-> ssub * Junicode-LF/semibold/it +}{} + + % ---- Extra 'ssub' rules to map 'bx' to 'b' ---- \endinput diff --git a/Master/texmf-dist/tex/latex/junicode/TS1Junicode-OsF.fd b/Master/texmf-dist/tex/latex/junicode/TS1Junicode-OsF.fd index 8c49fdb846e..6f9d7fe6c58 100644 --- a/Master/texmf-dist/tex/latex/junicode/TS1Junicode-OsF.fd +++ b/Master/texmf-dist/tex/latex/junicode/TS1Junicode-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{TS1Junicode-OsF.fd} - [2024/06/03 (autoinst) Font definitions for TS1/Junicode-OsF.] + [2024/07/21 (autoinst) Font definitions for TS1/Junicode-OsF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,31 +20,35 @@ \DeclareFontFamily{TS1}{Junicode-OsF}{} -% ---- mediumsemicondensed ---- +% ---- c = condensed ---- -\DeclareFontShape{TS1}{Junicode-OsF}{mediumsemicondensed}{it}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{mediumsemicondensed}{n}{ - <-> \Junicode@@scale Junicode-SmCondMedium-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{condensed}{n}{ + <-> alias * Junicode-OsF/c/n }{} -\DeclareFontShape{TS1}{Junicode-OsF}{mediumsemicondensed}{sl}{ - <-> ssub * Junicode-OsF/mediumsemicondensed/it +\DeclareFontShape{TS1}{Junicode-OsF}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-osf-ts1 }{} +\DeclareFontShape{TS1}{Junicode-OsF}{condensed}{it}{ + <-> alias * Junicode-OsF/c/it +}{} -% ---- sbx = semiboldexpanded ---- - -\DeclareFontShape{TS1}{Junicode-OsF}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{c}{sl}{ + <-> ssub * Junicode-OsF/c/it }{} -\DeclareFontShape{TS1}{Junicode-OsF}{semiboldexpanded}{n}{ - <-> alias * Junicode-OsF/sbx/n +\DeclareFontShape{TS1}{Junicode-OsF}{condensed}{sl}{ + <-> ssub * Junicode-OsF/condensed/it }{} + +% ---- sbx = semiboldexpanded ---- + \DeclareFontShape{TS1}{Junicode-OsF}{sbx}{it}{ <-> \Junicode@@scale Junicode-ExpSmBoldItalic-osf-ts1 }{} @@ -53,6 +57,14 @@ <-> alias * Junicode-OsF/sbx/it }{} +\DeclareFontShape{TS1}{Junicode-OsF}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Junicode-OsF}{semiboldexpanded}{n}{ + <-> alias * Junicode-OsF/sbx/n +}{} + \DeclareFontShape{TS1}{Junicode-OsF}{sbx}{sl}{ <-> ssub * Junicode-OsF/sbx/it }{} @@ -62,180 +74,168 @@ }{} -% ---- bsx = boldsemiexpanded ---- +% ---- x = expanded ---- -\DeclareFontShape{TS1}{Junicode-OsF}{bsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{x}{it}{ + <-> \Junicode@@scale Junicode-ExpItalic-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{boldsemiexpanded}{it}{ - <-> alias * Junicode-OsF/bsx/it +\DeclareFontShape{TS1}{Junicode-OsF}{expanded}{it}{ + <-> alias * Junicode-OsF/x/it }{} -\DeclareFontShape{TS1}{Junicode-OsF}{bsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpBold-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{x}{n}{ + <-> \Junicode@@scale Junicode-Exp-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{boldsemiexpanded}{n}{ - <-> alias * Junicode-OsF/bsx/n +\DeclareFontShape{TS1}{Junicode-OsF}{expanded}{n}{ + <-> alias * Junicode-OsF/x/n }{} -\DeclareFontShape{TS1}{Junicode-OsF}{bsx}{sl}{ - <-> ssub * Junicode-OsF/bsx/it +\DeclareFontShape{TS1}{Junicode-OsF}{x}{sl}{ + <-> ssub * Junicode-OsF/x/it }{} -\DeclareFontShape{TS1}{Junicode-OsF}{boldsemiexpanded}{sl}{ - <-> ssub * Junicode-OsF/boldsemiexpanded/it +\DeclareFontShape{TS1}{Junicode-OsF}{expanded}{sl}{ + <-> ssub * Junicode-OsF/expanded/it }{} -% ---- lc = lightcondensed ---- - -\DeclareFontShape{TS1}{Junicode-OsF}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-osf-ts1 -}{} +% ---- b = bold ---- -\DeclareFontShape{TS1}{Junicode-OsF}{lightcondensed}{n}{ - <-> alias * Junicode-OsF/lc/n +\DeclareFontShape{TS1}{Junicode-OsF}{b}{n}{ + <-> \Junicode@@scale Junicode-Bold-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{bold}{n}{ + <-> alias * Junicode-OsF/b/n }{} -\DeclareFontShape{TS1}{Junicode-OsF}{lightcondensed}{it}{ - <-> alias * Junicode-OsF/lc/it +\DeclareFontShape{TS1}{Junicode-OsF}{b}{it}{ + <-> \Junicode@@scale Junicode-BoldItalic-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{lc}{sl}{ - <-> ssub * Junicode-OsF/lc/it +\DeclareFontShape{TS1}{Junicode-OsF}{bold}{it}{ + <-> alias * Junicode-OsF/b/it }{} -\DeclareFontShape{TS1}{Junicode-OsF}{lightcondensed}{sl}{ - <-> ssub * Junicode-OsF/lightcondensed/it +\DeclareFontShape{TS1}{Junicode-OsF}{b}{sl}{ + <-> ssub * Junicode-OsF/b/it }{} - -% ---- sb = semibold ---- - -\DeclareFontShape{TS1}{Junicode-OsF}{sb}{n}{ - <-> \Junicode@@scale Junicode-SmBold-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{bold}{sl}{ + <-> ssub * Junicode-OsF/bold/it }{} -\DeclareFontShape{TS1}{Junicode-OsF}{semibold}{n}{ - <-> alias * Junicode-OsF/sb/n -}{} -\DeclareFontShape{TS1}{Junicode-OsF}{sb}{it}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-osf-ts1 -}{} +% ---- mediumexpanded ---- -\DeclareFontShape{TS1}{Junicode-OsF}{semibold}{it}{ - <-> alias * Junicode-OsF/sb/it +\DeclareFontShape{TS1}{Junicode-OsF}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{sb}{sl}{ - <-> ssub * Junicode-OsF/sb/it +\DeclareFontShape{TS1}{Junicode-OsF}{mediumexpanded}{n}{ + <-> \Junicode@@scale Junicode-ExpMedium-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{semibold}{sl}{ - <-> ssub * Junicode-OsF/semibold/it +\DeclareFontShape{TS1}{Junicode-OsF}{mediumexpanded}{sl}{ + <-> ssub * Junicode-OsF/mediumexpanded/it }{} -% ---- sc = semicondensed ---- +% ---- lsc = lightsemicondensed ---- -\DeclareFontShape{TS1}{Junicode-OsF}{sc}{it}{ - <-> \Junicode@@scale Junicode-SmCondItalic-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{semicondensed}{it}{ - <-> alias * Junicode-OsF/sc/it +\DeclareFontShape{TS1}{Junicode-OsF}{lightsemicondensed}{it}{ + <-> alias * Junicode-OsF/lsc/it }{} -\DeclareFontShape{TS1}{Junicode-OsF}{sc}{n}{ - <-> \Junicode@@scale Junicode-SmCond-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{semicondensed}{n}{ - <-> alias * Junicode-OsF/sc/n +\DeclareFontShape{TS1}{Junicode-OsF}{lightsemicondensed}{n}{ + <-> alias * Junicode-OsF/lsc/n }{} -\DeclareFontShape{TS1}{Junicode-OsF}{sc}{sl}{ - <-> ssub * Junicode-OsF/sc/it +\DeclareFontShape{TS1}{Junicode-OsF}{lsc}{sl}{ + <-> ssub * Junicode-OsF/lsc/it }{} -\DeclareFontShape{TS1}{Junicode-OsF}{semicondensed}{sl}{ - <-> ssub * Junicode-OsF/semicondensed/it +\DeclareFontShape{TS1}{Junicode-OsF}{lightsemicondensed}{sl}{ + <-> ssub * Junicode-OsF/lightsemicondensed/it }{} -% ---- b = bold ---- +% ---- lc = lightcondensed ---- -\DeclareFontShape{TS1}{Junicode-OsF}{b}{n}{ - <-> \Junicode@@scale Junicode-Bold-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{bold}{n}{ - <-> alias * Junicode-OsF/b/n +\DeclareFontShape{TS1}{Junicode-OsF}{lightcondensed}{n}{ + <-> alias * Junicode-OsF/lc/n }{} -\DeclareFontShape{TS1}{Junicode-OsF}{b}{it}{ - <-> \Junicode@@scale Junicode-BoldItalic-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{bold}{it}{ - <-> alias * Junicode-OsF/b/it +\DeclareFontShape{TS1}{Junicode-OsF}{lightcondensed}{it}{ + <-> alias * Junicode-OsF/lc/it }{} -\DeclareFontShape{TS1}{Junicode-OsF}{b}{sl}{ - <-> ssub * Junicode-OsF/b/it +\DeclareFontShape{TS1}{Junicode-OsF}{lc}{sl}{ + <-> ssub * Junicode-OsF/lc/it }{} -\DeclareFontShape{TS1}{Junicode-OsF}{bold}{sl}{ - <-> ssub * Junicode-OsF/bold/it +\DeclareFontShape{TS1}{Junicode-OsF}{lightcondensed}{sl}{ + <-> ssub * Junicode-OsF/lightcondensed/it }{} -% ---- mediumcondensed ---- +% ---- m = regular ---- -\DeclareFontShape{TS1}{Junicode-OsF}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{m}{it}{ + <-> \Junicode@@scale Junicode-Italic-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{regular}{it}{ + <-> alias * Junicode-OsF/m/it }{} -\DeclareFontShape{TS1}{Junicode-OsF}{mediumcondensed}{sl}{ - <-> ssub * Junicode-OsF/mediumcondensed/it +\DeclareFontShape{TS1}{Junicode-OsF}{m}{n}{ + <-> \Junicode@@scale Junicode-Regular-osf-ts1 }{} - -% ---- l = light ---- - -\DeclareFontShape{TS1}{Junicode-OsF}{l}{it}{ - <-> \Junicode@@scale Junicode-LightItalic-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{regular}{n}{ + <-> alias * Junicode-OsF/m/n }{} -\DeclareFontShape{TS1}{Junicode-OsF}{light}{it}{ - <-> alias * Junicode-OsF/l/it +\DeclareFontShape{TS1}{Junicode-OsF}{m}{sl}{ + <-> ssub * Junicode-OsF/m/it }{} -\DeclareFontShape{TS1}{Junicode-OsF}{l}{n}{ - <-> \Junicode@@scale Junicode-Light-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{regular}{sl}{ + <-> ssub * Junicode-OsF/regular/it }{} -\DeclareFontShape{TS1}{Junicode-OsF}{light}{n}{ - <-> alias * Junicode-OsF/l/n + +% ---- mediumsemiexpanded ---- + +\DeclareFontShape{TS1}{Junicode-OsF}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{l}{sl}{ - <-> ssub * Junicode-OsF/l/it +\DeclareFontShape{TS1}{Junicode-OsF}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{light}{sl}{ - <-> ssub * Junicode-OsF/light/it +\DeclareFontShape{TS1}{Junicode-OsF}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-OsF/mediumsemiexpanded/it }{} @@ -266,173 +266,169 @@ }{} -% ---- m = regular ---- +% ---- medium ---- -\DeclareFontShape{TS1}{Junicode-OsF}{m}{n}{ - <-> \Junicode@@scale Junicode-Regular-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{medium}{n}{ + <-> \Junicode@@scale Junicode-Medium-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{regular}{n}{ - <-> alias * Junicode-OsF/m/n +\DeclareFontShape{TS1}{Junicode-OsF}{medium}{it}{ + <-> \Junicode@@scale Junicode-MediumItalic-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{m}{it}{ - <-> \Junicode@@scale Junicode-Italic-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{medium}{sl}{ + <-> ssub * Junicode-OsF/medium/it }{} -\DeclareFontShape{TS1}{Junicode-OsF}{regular}{it}{ - <-> alias * Junicode-OsF/m/it -}{} -\DeclareFontShape{TS1}{Junicode-OsF}{m}{sl}{ - <-> ssub * Junicode-OsF/m/it -}{} +% ---- sx = semiexpanded ---- -\DeclareFontShape{TS1}{Junicode-OsF}{regular}{sl}{ - <-> ssub * Junicode-OsF/regular/it +\DeclareFontShape{TS1}{Junicode-OsF}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-osf-ts1 }{} +\DeclareFontShape{TS1}{Junicode-OsF}{semiexpanded}{it}{ + <-> alias * Junicode-OsF/sx/it +}{} -% ---- medium ---- +\DeclareFontShape{TS1}{Junicode-OsF}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-osf-ts1 +}{} -\DeclareFontShape{TS1}{Junicode-OsF}{medium}{it}{ - <-> \Junicode@@scale Junicode-MediumItalic-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{semiexpanded}{n}{ + <-> alias * Junicode-OsF/sx/n }{} -\DeclareFontShape{TS1}{Junicode-OsF}{medium}{n}{ - <-> \Junicode@@scale Junicode-Medium-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{sx}{sl}{ + <-> ssub * Junicode-OsF/sx/it }{} -\DeclareFontShape{TS1}{Junicode-OsF}{medium}{sl}{ - <-> ssub * Junicode-OsF/medium/it +\DeclareFontShape{TS1}{Junicode-OsF}{semiexpanded}{sl}{ + <-> ssub * Junicode-OsF/semiexpanded/it }{} -% ---- lsc = lightsemicondensed ---- +% ---- l = light ---- -\DeclareFontShape{TS1}{Junicode-OsF}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{l}{n}{ + <-> \Junicode@@scale Junicode-Light-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{lightsemicondensed}{n}{ - <-> alias * Junicode-OsF/lsc/n +\DeclareFontShape{TS1}{Junicode-OsF}{light}{n}{ + <-> alias * Junicode-OsF/l/n }{} -\DeclareFontShape{TS1}{Junicode-OsF}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{l}{it}{ + <-> \Junicode@@scale Junicode-LightItalic-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{lightsemicondensed}{it}{ - <-> alias * Junicode-OsF/lsc/it +\DeclareFontShape{TS1}{Junicode-OsF}{light}{it}{ + <-> alias * Junicode-OsF/l/it }{} -\DeclareFontShape{TS1}{Junicode-OsF}{lsc}{sl}{ - <-> ssub * Junicode-OsF/lsc/it +\DeclareFontShape{TS1}{Junicode-OsF}{l}{sl}{ + <-> ssub * Junicode-OsF/l/it }{} -\DeclareFontShape{TS1}{Junicode-OsF}{lightsemicondensed}{sl}{ - <-> ssub * Junicode-OsF/lightsemicondensed/it +\DeclareFontShape{TS1}{Junicode-OsF}{light}{sl}{ + <-> ssub * Junicode-OsF/light/it }{} -% ---- c = condensed ---- +% ---- mediumsemicondensed ---- -\DeclareFontShape{TS1}{Junicode-OsF}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{mediumsemicondensed}{n}{ + <-> \Junicode@@scale Junicode-SmCondMedium-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{condensed}{it}{ - <-> alias * Junicode-OsF/c/it +\DeclareFontShape{TS1}{Junicode-OsF}{mediumsemicondensed}{it}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{mediumsemicondensed}{sl}{ + <-> ssub * Junicode-OsF/mediumsemicondensed/it }{} -\DeclareFontShape{TS1}{Junicode-OsF}{condensed}{n}{ - <-> alias * Junicode-OsF/c/n -}{} -\DeclareFontShape{TS1}{Junicode-OsF}{c}{sl}{ - <-> ssub * Junicode-OsF/c/it -}{} +% ---- sb = semibold ---- -\DeclareFontShape{TS1}{Junicode-OsF}{condensed}{sl}{ - <-> ssub * Junicode-OsF/condensed/it +\DeclareFontShape{TS1}{Junicode-OsF}{sb}{n}{ + <-> \Junicode@@scale Junicode-SmBold-osf-ts1 }{} +\DeclareFontShape{TS1}{Junicode-OsF}{semibold}{n}{ + <-> alias * Junicode-OsF/sb/n +}{} -% ---- x = expanded ---- +\DeclareFontShape{TS1}{Junicode-OsF}{sb}{it}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-osf-ts1 +}{} -\DeclareFontShape{TS1}{Junicode-OsF}{x}{it}{ - <-> \Junicode@@scale Junicode-ExpItalic-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{semibold}{it}{ + <-> alias * Junicode-OsF/sb/it }{} -\DeclareFontShape{TS1}{Junicode-OsF}{expanded}{it}{ - <-> alias * Junicode-OsF/x/it +\DeclareFontShape{TS1}{Junicode-OsF}{sb}{sl}{ + <-> ssub * Junicode-OsF/sb/it }{} -\DeclareFontShape{TS1}{Junicode-OsF}{x}{n}{ - <-> \Junicode@@scale Junicode-Exp-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{semibold}{sl}{ + <-> ssub * Junicode-OsF/semibold/it }{} -\DeclareFontShape{TS1}{Junicode-OsF}{expanded}{n}{ - <-> alias * Junicode-OsF/x/n + +% ---- mediumcondensed ---- + +\DeclareFontShape{TS1}{Junicode-OsF}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{x}{sl}{ - <-> ssub * Junicode-OsF/x/it +\DeclareFontShape{TS1}{Junicode-OsF}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{expanded}{sl}{ - <-> ssub * Junicode-OsF/expanded/it +\DeclareFontShape{TS1}{Junicode-OsF}{mediumcondensed}{sl}{ + <-> ssub * Junicode-OsF/mediumcondensed/it }{} -% ---- sx = semiexpanded ---- +% ---- bsx = boldsemiexpanded ---- -\DeclareFontShape{TS1}{Junicode-OsF}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{bsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{semiexpanded}{it}{ - <-> alias * Junicode-OsF/sx/it +\DeclareFontShape{TS1}{Junicode-OsF}{boldsemiexpanded}{it}{ + <-> alias * Junicode-OsF/bsx/it }{} -\DeclareFontShape{TS1}{Junicode-OsF}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{bsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpBold-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{semiexpanded}{n}{ - <-> alias * Junicode-OsF/sx/n +\DeclareFontShape{TS1}{Junicode-OsF}{boldsemiexpanded}{n}{ + <-> alias * Junicode-OsF/bsx/n }{} -\DeclareFontShape{TS1}{Junicode-OsF}{sx}{sl}{ - <-> ssub * Junicode-OsF/sx/it +\DeclareFontShape{TS1}{Junicode-OsF}{bsx}{sl}{ + <-> ssub * Junicode-OsF/bsx/it }{} -\DeclareFontShape{TS1}{Junicode-OsF}{semiexpanded}{sl}{ - <-> ssub * Junicode-OsF/semiexpanded/it +\DeclareFontShape{TS1}{Junicode-OsF}{boldsemiexpanded}{sl}{ + <-> ssub * Junicode-OsF/boldsemiexpanded/it }{} -% ---- mediumexpanded ---- - -\DeclareFontShape{TS1}{Junicode-OsF}{mediumexpanded}{n}{ - <-> \Junicode@@scale Junicode-ExpMedium-osf-ts1 -}{} +% ---- sbsx = semiboldsemiexpanded ---- -\DeclareFontShape{TS1}{Junicode-OsF}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{mediumexpanded}{sl}{ - <-> ssub * Junicode-OsF/mediumexpanded/it +\DeclareFontShape{TS1}{Junicode-OsF}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-OsF/sbsx/n }{} - -% ---- sbsx = semiboldsemiexpanded ---- - \DeclareFontShape{TS1}{Junicode-OsF}{sbsx}{it}{ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-osf-ts1 }{} @@ -441,14 +437,6 @@ <-> alias * Junicode-OsF/sbsx/it }{} -\DeclareFontShape{TS1}{Junicode-OsF}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-osf-ts1 -}{} - -\DeclareFontShape{TS1}{Junicode-OsF}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-OsF/sbsx/n -}{} - \DeclareFontShape{TS1}{Junicode-OsF}{sbsx}{sl}{ <-> ssub * Junicode-OsF/sbsx/it }{} @@ -458,18 +446,30 @@ }{} -% ---- mediumsemiexpanded ---- +% ---- sc = semicondensed ---- -\DeclareFontShape{TS1}{Junicode-OsF}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{sc}{n}{ + <-> \Junicode@@scale Junicode-SmCond-osf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-OsF}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-osf-ts1 +\DeclareFontShape{TS1}{Junicode-OsF}{semicondensed}{n}{ + <-> alias * Junicode-OsF/sc/n }{} -\DeclareFontShape{TS1}{Junicode-OsF}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-OsF/mediumsemiexpanded/it +\DeclareFontShape{TS1}{Junicode-OsF}{sc}{it}{ + <-> \Junicode@@scale Junicode-SmCondItalic-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Junicode-OsF}{semicondensed}{it}{ + <-> alias * Junicode-OsF/sc/it +}{} + +\DeclareFontShape{TS1}{Junicode-OsF}{sc}{sl}{ + <-> ssub * Junicode-OsF/sc/it +}{} + +\DeclareFontShape{TS1}{Junicode-OsF}{semicondensed}{sl}{ + <-> ssub * Junicode-OsF/semicondensed/it }{} diff --git a/Master/texmf-dist/tex/latex/junicode/TS1Junicode-TLF.fd b/Master/texmf-dist/tex/latex/junicode/TS1Junicode-TLF.fd index 8ff70a59bb5..9d106c1467d 100644 --- a/Master/texmf-dist/tex/latex/junicode/TS1Junicode-TLF.fd +++ b/Master/texmf-dist/tex/latex/junicode/TS1Junicode-TLF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{TS1Junicode-TLF.fd} - [2024/06/03 (autoinst) Font definitions for TS1/Junicode-TLF.] + [2024/07/21 (autoinst) Font definitions for TS1/Junicode-TLF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,104 +20,85 @@ \DeclareFontFamily{TS1}{Junicode-TLF}{} -% ---- sx = semiexpanded ---- - -\DeclareFontShape{TS1}{Junicode-TLF}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-tlf-ts1 -}{} +% ---- sb = semibold ---- -\DeclareFontShape{TS1}{Junicode-TLF}{semiexpanded}{n}{ - <-> alias * Junicode-TLF/sx/n +\DeclareFontShape{TS1}{Junicode-TLF}{sb}{it}{ + <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{semibold}{it}{ + <-> alias * Junicode-TLF/sb/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{semiexpanded}{it}{ - <-> alias * Junicode-TLF/sx/it +\DeclareFontShape{TS1}{Junicode-TLF}{sb}{n}{ + <-> \Junicode@@scale Junicode-SmBold-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{sx}{sl}{ - <-> ssub * Junicode-TLF/sx/it +\DeclareFontShape{TS1}{Junicode-TLF}{semibold}{n}{ + <-> alias * Junicode-TLF/sb/n }{} -\DeclareFontShape{TS1}{Junicode-TLF}{semiexpanded}{sl}{ - <-> ssub * Junicode-TLF/semiexpanded/it +\DeclareFontShape{TS1}{Junicode-TLF}{sb}{sl}{ + <-> ssub * Junicode-TLF/sb/it }{} - -% ---- x = expanded ---- - -\DeclareFontShape{TS1}{Junicode-TLF}{x}{it}{ - <-> \Junicode@@scale Junicode-ExpItalic-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{semibold}{sl}{ + <-> ssub * Junicode-TLF/semibold/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{expanded}{it}{ - <-> alias * Junicode-TLF/x/it -}{} -\DeclareFontShape{TS1}{Junicode-TLF}{x}{n}{ - <-> \Junicode@@scale Junicode-Exp-tlf-ts1 -}{} +% ---- mediumcondensed ---- -\DeclareFontShape{TS1}{Junicode-TLF}{expanded}{n}{ - <-> alias * Junicode-TLF/x/n +\DeclareFontShape{TS1}{Junicode-TLF}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{x}{sl}{ - <-> ssub * Junicode-TLF/x/it +\DeclareFontShape{TS1}{Junicode-TLF}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{expanded}{sl}{ - <-> ssub * Junicode-TLF/expanded/it +\DeclareFontShape{TS1}{Junicode-TLF}{mediumcondensed}{sl}{ + <-> ssub * Junicode-TLF/mediumcondensed/it }{} -% ---- c = condensed ---- +% ---- bsx = boldsemiexpanded ---- -\DeclareFontShape{TS1}{Junicode-TLF}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{bsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpBold-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{condensed}{n}{ - <-> alias * Junicode-TLF/c/n +\DeclareFontShape{TS1}{Junicode-TLF}{boldsemiexpanded}{n}{ + <-> alias * Junicode-TLF/bsx/n }{} -\DeclareFontShape{TS1}{Junicode-TLF}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{bsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{condensed}{it}{ - <-> alias * Junicode-TLF/c/it +\DeclareFontShape{TS1}{Junicode-TLF}{boldsemiexpanded}{it}{ + <-> alias * Junicode-TLF/bsx/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{c}{sl}{ - <-> ssub * Junicode-TLF/c/it +\DeclareFontShape{TS1}{Junicode-TLF}{bsx}{sl}{ + <-> ssub * Junicode-TLF/bsx/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{condensed}{sl}{ - <-> ssub * Junicode-TLF/condensed/it +\DeclareFontShape{TS1}{Junicode-TLF}{boldsemiexpanded}{sl}{ + <-> ssub * Junicode-TLF/boldsemiexpanded/it }{} -% ---- mediumsemiexpanded ---- - -\DeclareFontShape{TS1}{Junicode-TLF}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-tlf-ts1 -}{} +% ---- sbsx = semiboldsemiexpanded ---- -\DeclareFontShape{TS1}{Junicode-TLF}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-TLF/mediumsemiexpanded/it +\DeclareFontShape{TS1}{Junicode-TLF}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-TLF/sbsx/n }{} - -% ---- sbsx = semiboldsemiexpanded ---- - \DeclareFontShape{TS1}{Junicode-TLF}{sbsx}{it}{ <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tlf-ts1 }{} @@ -126,14 +107,6 @@ <-> alias * Junicode-TLF/sbsx/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-tlf-ts1 -}{} - -\DeclareFontShape{TS1}{Junicode-TLF}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-TLF/sbsx/n -}{} - \DeclareFontShape{TS1}{Junicode-TLF}{sbsx}{sl}{ <-> ssub * Junicode-TLF/sbsx/it }{} @@ -143,333 +116,360 @@ }{} -% ---- mediumexpanded ---- +% ---- sc = semicondensed ---- -\DeclareFontShape{TS1}{Junicode-TLF}{mediumexpanded}{n}{ - <-> \Junicode@@scale Junicode-ExpMedium-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{sc}{it}{ + <-> \Junicode@@scale Junicode-SmCondItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{semicondensed}{it}{ + <-> alias * Junicode-TLF/sc/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{mediumexpanded}{sl}{ - <-> ssub * Junicode-TLF/mediumexpanded/it +\DeclareFontShape{TS1}{Junicode-TLF}{sc}{n}{ + <-> \Junicode@@scale Junicode-SmCond-tlf-ts1 }{} +\DeclareFontShape{TS1}{Junicode-TLF}{semicondensed}{n}{ + <-> alias * Junicode-TLF/sc/n +}{} -% ---- bx = boldexpanded ---- +\DeclareFontShape{TS1}{Junicode-TLF}{sc}{sl}{ + <-> ssub * Junicode-TLF/sc/it +}{} -\DeclareFontShape{TS1}{Junicode-TLF}{bx}{n}{ - <-> \Junicode@@scale Junicode-ExpBold-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{semicondensed}{sl}{ + <-> ssub * Junicode-TLF/semicondensed/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{boldexpanded}{n}{ - <-> alias * Junicode-TLF/bx/n + +% ---- lc = lightcondensed ---- + +\DeclareFontShape{TS1}{Junicode-TLF}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{lightcondensed}{n}{ + <-> alias * Junicode-TLF/lc/n }{} -\DeclareFontShape{TS1}{Junicode-TLF}{boldexpanded}{it}{ - <-> alias * Junicode-TLF/bx/it +\DeclareFontShape{TS1}{Junicode-TLF}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{bx}{sl}{ - <-> ssub * Junicode-TLF/bx/it +\DeclareFontShape{TS1}{Junicode-TLF}{lightcondensed}{it}{ + <-> alias * Junicode-TLF/lc/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{boldexpanded}{sl}{ - <-> ssub * Junicode-TLF/boldexpanded/it +\DeclareFontShape{TS1}{Junicode-TLF}{lc}{sl}{ + <-> ssub * Junicode-TLF/lc/it }{} +\DeclareFontShape{TS1}{Junicode-TLF}{lightcondensed}{sl}{ + <-> ssub * Junicode-TLF/lightcondensed/it +}{} -% ---- l = light ---- -\DeclareFontShape{TS1}{Junicode-TLF}{l}{it}{ - <-> \Junicode@@scale Junicode-LightItalic-tlf-ts1 +% ---- m = regular ---- + +\DeclareFontShape{TS1}{Junicode-TLF}{m}{it}{ + <-> \Junicode@@scale Junicode-Italic-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{light}{it}{ - <-> alias * Junicode-TLF/l/it +\DeclareFontShape{TS1}{Junicode-TLF}{regular}{it}{ + <-> alias * Junicode-TLF/m/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{l}{n}{ - <-> \Junicode@@scale Junicode-Light-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{m}{n}{ + <-> \Junicode@@scale Junicode-Regular-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{light}{n}{ - <-> alias * Junicode-TLF/l/n +\DeclareFontShape{TS1}{Junicode-TLF}{regular}{n}{ + <-> alias * Junicode-TLF/m/n }{} -\DeclareFontShape{TS1}{Junicode-TLF}{l}{sl}{ - <-> ssub * Junicode-TLF/l/it +\DeclareFontShape{TS1}{Junicode-TLF}{m}{sl}{ + <-> ssub * Junicode-TLF/m/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{light}{sl}{ - <-> ssub * Junicode-TLF/light/it +\DeclareFontShape{TS1}{Junicode-TLF}{regular}{sl}{ + <-> ssub * Junicode-TLF/regular/it }{} -% ---- lsc = lightsemicondensed ---- +% ---- mediumsemiexpanded ---- -\DeclareFontShape{TS1}{Junicode-TLF}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{lightsemicondensed}{n}{ - <-> alias * Junicode-TLF/lsc/n +\DeclareFontShape{TS1}{Junicode-TLF}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-TLF/mediumsemiexpanded/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{lightsemicondensed}{it}{ - <-> alias * Junicode-TLF/lsc/it + +% ---- bx = boldexpanded ---- + +\DeclareFontShape{TS1}{Junicode-TLF}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{lsc}{sl}{ - <-> ssub * Junicode-TLF/lsc/it +\DeclareFontShape{TS1}{Junicode-TLF}{boldexpanded}{it}{ + <-> alias * Junicode-TLF/bx/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{lightsemicondensed}{sl}{ - <-> ssub * Junicode-TLF/lightsemicondensed/it +\DeclareFontShape{TS1}{Junicode-TLF}{bx}{n}{ + <-> \Junicode@@scale Junicode-ExpBold-tlf-ts1 }{} +\DeclareFontShape{TS1}{Junicode-TLF}{boldexpanded}{n}{ + <-> alias * Junicode-TLF/bx/n +}{} -% ---- medium ---- +\DeclareFontShape{TS1}{Junicode-TLF}{bx}{sl}{ + <-> ssub * Junicode-TLF/bx/it +}{} -\DeclareFontShape{TS1}{Junicode-TLF}{medium}{it}{ - <-> \Junicode@@scale Junicode-MediumItalic-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{boldexpanded}{sl}{ + <-> ssub * Junicode-TLF/boldexpanded/it }{} + +% ---- medium ---- + \DeclareFontShape{TS1}{Junicode-TLF}{medium}{n}{ <-> \Junicode@@scale Junicode-Medium-tlf-ts1 }{} +\DeclareFontShape{TS1}{Junicode-TLF}{medium}{it}{ + <-> \Junicode@@scale Junicode-MediumItalic-tlf-ts1 +}{} + \DeclareFontShape{TS1}{Junicode-TLF}{medium}{sl}{ <-> ssub * Junicode-TLF/medium/it }{} -% ---- m = regular ---- +% ---- sx = semiexpanded ---- -\DeclareFontShape{TS1}{Junicode-TLF}{m}{n}{ - <-> \Junicode@@scale Junicode-Regular-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{regular}{n}{ - <-> alias * Junicode-TLF/m/n +\DeclareFontShape{TS1}{Junicode-TLF}{semiexpanded}{n}{ + <-> alias * Junicode-TLF/sx/n }{} -\DeclareFontShape{TS1}{Junicode-TLF}{m}{it}{ - <-> \Junicode@@scale Junicode-Italic-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{regular}{it}{ - <-> alias * Junicode-TLF/m/it +\DeclareFontShape{TS1}{Junicode-TLF}{semiexpanded}{it}{ + <-> alias * Junicode-TLF/sx/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{m}{sl}{ - <-> ssub * Junicode-TLF/m/it +\DeclareFontShape{TS1}{Junicode-TLF}{sx}{sl}{ + <-> ssub * Junicode-TLF/sx/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{regular}{sl}{ - <-> ssub * Junicode-TLF/regular/it +\DeclareFontShape{TS1}{Junicode-TLF}{semiexpanded}{sl}{ + <-> ssub * Junicode-TLF/semiexpanded/it }{} -% ---- b = bold ---- +% ---- l = light ---- -\DeclareFontShape{TS1}{Junicode-TLF}{b}{n}{ - <-> \Junicode@@scale Junicode-Bold-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{l}{it}{ + <-> \Junicode@@scale Junicode-LightItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{bold}{n}{ - <-> alias * Junicode-TLF/b/n +\DeclareFontShape{TS1}{Junicode-TLF}{light}{it}{ + <-> alias * Junicode-TLF/l/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{b}{it}{ - <-> \Junicode@@scale Junicode-BoldItalic-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{l}{n}{ + <-> \Junicode@@scale Junicode-Light-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{bold}{it}{ - <-> alias * Junicode-TLF/b/it +\DeclareFontShape{TS1}{Junicode-TLF}{light}{n}{ + <-> alias * Junicode-TLF/l/n }{} -\DeclareFontShape{TS1}{Junicode-TLF}{b}{sl}{ - <-> ssub * Junicode-TLF/b/it +\DeclareFontShape{TS1}{Junicode-TLF}{l}{sl}{ + <-> ssub * Junicode-TLF/l/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{bold}{sl}{ - <-> ssub * Junicode-TLF/bold/it +\DeclareFontShape{TS1}{Junicode-TLF}{light}{sl}{ + <-> ssub * Junicode-TLF/light/it }{} -% ---- mediumcondensed ---- +% ---- mediumsemicondensed ---- -\DeclareFontShape{TS1}{Junicode-TLF}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{mediumsemicondensed}{n}{ + <-> \Junicode@@scale Junicode-SmCondMedium-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{mediumsemicondensed}{it}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{mediumcondensed}{sl}{ - <-> ssub * Junicode-TLF/mediumcondensed/it +\DeclareFontShape{TS1}{Junicode-TLF}{mediumsemicondensed}{sl}{ + <-> ssub * Junicode-TLF/mediumsemicondensed/it }{} -% ---- sbx = semiboldexpanded ---- +% ---- x = expanded ---- -\DeclareFontShape{TS1}{Junicode-TLF}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{x}{it}{ + <-> \Junicode@@scale Junicode-ExpItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{semiboldexpanded}{n}{ - <-> alias * Junicode-TLF/sbx/n +\DeclareFontShape{TS1}{Junicode-TLF}{expanded}{it}{ + <-> alias * Junicode-TLF/x/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{sbx}{it}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{x}{n}{ + <-> \Junicode@@scale Junicode-Exp-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{semiboldexpanded}{it}{ - <-> alias * Junicode-TLF/sbx/it +\DeclareFontShape{TS1}{Junicode-TLF}{expanded}{n}{ + <-> alias * Junicode-TLF/x/n }{} -\DeclareFontShape{TS1}{Junicode-TLF}{sbx}{sl}{ - <-> ssub * Junicode-TLF/sbx/it +\DeclareFontShape{TS1}{Junicode-TLF}{x}{sl}{ + <-> ssub * Junicode-TLF/x/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{semiboldexpanded}{sl}{ - <-> ssub * Junicode-TLF/semiboldexpanded/it +\DeclareFontShape{TS1}{Junicode-TLF}{expanded}{sl}{ + <-> ssub * Junicode-TLF/expanded/it }{} -% ---- mediumsemicondensed ---- +% ---- b = bold ---- -\DeclareFontShape{TS1}{Junicode-TLF}{mediumsemicondensed}{n}{ - <-> \Junicode@@scale Junicode-SmCondMedium-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{b}{n}{ + <-> \Junicode@@scale Junicode-Bold-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{mediumsemicondensed}{it}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{bold}{n}{ + <-> alias * Junicode-TLF/b/n }{} -\DeclareFontShape{TS1}{Junicode-TLF}{mediumsemicondensed}{sl}{ - <-> ssub * Junicode-TLF/mediumsemicondensed/it +\DeclareFontShape{TS1}{Junicode-TLF}{b}{it}{ + <-> \Junicode@@scale Junicode-BoldItalic-tlf-ts1 }{} - -% ---- sc = semicondensed ---- - -\DeclareFontShape{TS1}{Junicode-TLF}{sc}{it}{ - <-> \Junicode@@scale Junicode-SmCondItalic-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{bold}{it}{ + <-> alias * Junicode-TLF/b/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{semicondensed}{it}{ - <-> alias * Junicode-TLF/sc/it +\DeclareFontShape{TS1}{Junicode-TLF}{b}{sl}{ + <-> ssub * Junicode-TLF/b/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{sc}{n}{ - <-> \Junicode@@scale Junicode-SmCond-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{bold}{sl}{ + <-> ssub * Junicode-TLF/bold/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{semicondensed}{n}{ - <-> alias * Junicode-TLF/sc/n + +% ---- mediumexpanded ---- + +\DeclareFontShape{TS1}{Junicode-TLF}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{sc}{sl}{ - <-> ssub * Junicode-TLF/sc/it +\DeclareFontShape{TS1}{Junicode-TLF}{mediumexpanded}{n}{ + <-> \Junicode@@scale Junicode-ExpMedium-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{semicondensed}{sl}{ - <-> ssub * Junicode-TLF/semicondensed/it +\DeclareFontShape{TS1}{Junicode-TLF}{mediumexpanded}{sl}{ + <-> ssub * Junicode-TLF/mediumexpanded/it }{} -% ---- sb = semibold ---- +% ---- lsc = lightsemicondensed ---- -\DeclareFontShape{TS1}{Junicode-TLF}{sb}{n}{ - <-> \Junicode@@scale Junicode-SmBold-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{semibold}{n}{ - <-> alias * Junicode-TLF/sb/n +\DeclareFontShape{TS1}{Junicode-TLF}{lightsemicondensed}{it}{ + <-> alias * Junicode-TLF/lsc/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{sb}{it}{ - <-> \Junicode@@scale Junicode-SmBoldItalic-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{semibold}{it}{ - <-> alias * Junicode-TLF/sb/it +\DeclareFontShape{TS1}{Junicode-TLF}{lightsemicondensed}{n}{ + <-> alias * Junicode-TLF/lsc/n }{} -\DeclareFontShape{TS1}{Junicode-TLF}{sb}{sl}{ - <-> ssub * Junicode-TLF/sb/it +\DeclareFontShape{TS1}{Junicode-TLF}{lsc}{sl}{ + <-> ssub * Junicode-TLF/lsc/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{semibold}{sl}{ - <-> ssub * Junicode-TLF/semibold/it +\DeclareFontShape{TS1}{Junicode-TLF}{lightsemicondensed}{sl}{ + <-> ssub * Junicode-TLF/lightsemicondensed/it }{} -% ---- bsx = boldsemiexpanded ---- +% ---- c = condensed ---- -\DeclareFontShape{TS1}{Junicode-TLF}{bsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpBoldItalic-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{boldsemiexpanded}{it}{ - <-> alias * Junicode-TLF/bsx/it +\DeclareFontShape{TS1}{Junicode-TLF}{condensed}{n}{ + <-> alias * Junicode-TLF/c/n }{} -\DeclareFontShape{TS1}{Junicode-TLF}{bsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpBold-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{boldsemiexpanded}{n}{ - <-> alias * Junicode-TLF/bsx/n +\DeclareFontShape{TS1}{Junicode-TLF}{condensed}{it}{ + <-> alias * Junicode-TLF/c/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{bsx}{sl}{ - <-> ssub * Junicode-TLF/bsx/it +\DeclareFontShape{TS1}{Junicode-TLF}{c}{sl}{ + <-> ssub * Junicode-TLF/c/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{boldsemiexpanded}{sl}{ - <-> ssub * Junicode-TLF/boldsemiexpanded/it +\DeclareFontShape{TS1}{Junicode-TLF}{condensed}{sl}{ + <-> ssub * Junicode-TLF/condensed/it }{} -% ---- lc = lightcondensed ---- +% ---- sbx = semiboldexpanded ---- -\DeclareFontShape{TS1}{Junicode-TLF}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{lightcondensed}{n}{ - <-> alias * Junicode-TLF/lc/n +\DeclareFontShape{TS1}{Junicode-TLF}{semiboldexpanded}{n}{ + <-> alias * Junicode-TLF/sbx/n }{} -\DeclareFontShape{TS1}{Junicode-TLF}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-tlf-ts1 +\DeclareFontShape{TS1}{Junicode-TLF}{sbx}{it}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tlf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TLF}{lightcondensed}{it}{ - <-> alias * Junicode-TLF/lc/it +\DeclareFontShape{TS1}{Junicode-TLF}{semiboldexpanded}{it}{ + <-> alias * Junicode-TLF/sbx/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{lc}{sl}{ - <-> ssub * Junicode-TLF/lc/it +\DeclareFontShape{TS1}{Junicode-TLF}{sbx}{sl}{ + <-> ssub * Junicode-TLF/sbx/it }{} -\DeclareFontShape{TS1}{Junicode-TLF}{lightcondensed}{sl}{ - <-> ssub * Junicode-TLF/lightcondensed/it +\DeclareFontShape{TS1}{Junicode-TLF}{semiboldexpanded}{sl}{ + <-> ssub * Junicode-TLF/semiboldexpanded/it }{} diff --git a/Master/texmf-dist/tex/latex/junicode/TS1Junicode-TOsF.fd b/Master/texmf-dist/tex/latex/junicode/TS1Junicode-TOsF.fd index 02b2f8fbda9..73d254e1220 100644 --- a/Master/texmf-dist/tex/latex/junicode/TS1Junicode-TOsF.fd +++ b/Master/texmf-dist/tex/latex/junicode/TS1Junicode-TOsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2024/06/03 +%% Generated by autoinst on 2024/07/21 %% \ProvidesFile{TS1Junicode-TOsF.fd} - [2024/06/03 (autoinst) Font definitions for TS1/Junicode-TOsF.] + [2024/07/21 (autoinst) Font definitions for TS1/Junicode-TOsF.] \ifcsname s@fct@alias\endcsname\else \gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo} @@ -20,16 +20,23 @@ \DeclareFontFamily{TS1}{Junicode-TOsF}{} -% ---- sb = semibold ---- +% ---- mediumcondensed ---- -\DeclareFontShape{TS1}{Junicode-TOsF}{sb}{n}{ - <-> \Junicode@@scale Junicode-SmBold-tosf-ts1 +\DeclareFontShape{TS1}{Junicode-TOsF}{mediumcondensed}{it}{ + <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{semibold}{n}{ - <-> alias * Junicode-TOsF/sb/n +\DeclareFontShape{TS1}{Junicode-TOsF}{mediumcondensed}{n}{ + <-> \Junicode@@scale Junicode-CondMedium-tosf-ts1 }{} +\DeclareFontShape{TS1}{Junicode-TOsF}{mediumcondensed}{sl}{ + <-> ssub * Junicode-TOsF/mediumcondensed/it +}{} + + +% ---- sb = semibold ---- + \DeclareFontShape{TS1}{Junicode-TOsF}{sb}{it}{ <-> \Junicode@@scale Junicode-SmBoldItalic-tosf-ts1 }{} @@ -38,6 +45,14 @@ <-> alias * Junicode-TOsF/sb/it }{} +\DeclareFontShape{TS1}{Junicode-TOsF}{sb}{n}{ + <-> \Junicode@@scale Junicode-SmBold-tosf-ts1 +}{} + +\DeclareFontShape{TS1}{Junicode-TOsF}{semibold}{n}{ + <-> alias * Junicode-TOsF/sb/n +}{} + \DeclareFontShape{TS1}{Junicode-TOsF}{sb}{sl}{ <-> ssub * Junicode-TOsF/sb/it }{} @@ -74,33 +89,6 @@ }{} -% ---- lc = lightcondensed ---- - -\DeclareFontShape{TS1}{Junicode-TOsF}{lc}{n}{ - <-> \Junicode@@scale Junicode-CondLight-tosf-ts1 -}{} - -\DeclareFontShape{TS1}{Junicode-TOsF}{lightcondensed}{n}{ - <-> alias * Junicode-TOsF/lc/n -}{} - -\DeclareFontShape{TS1}{Junicode-TOsF}{lc}{it}{ - <-> \Junicode@@scale Junicode-CondLightItalic-tosf-ts1 -}{} - -\DeclareFontShape{TS1}{Junicode-TOsF}{lightcondensed}{it}{ - <-> alias * Junicode-TOsF/lc/it -}{} - -\DeclareFontShape{TS1}{Junicode-TOsF}{lc}{sl}{ - <-> ssub * Junicode-TOsF/lc/it -}{} - -\DeclareFontShape{TS1}{Junicode-TOsF}{lightcondensed}{sl}{ - <-> ssub * Junicode-TOsF/lightcondensed/it -}{} - - % ---- bsx = boldsemiexpanded ---- \DeclareFontShape{TS1}{Junicode-TOsF}{bsx}{n}{ @@ -128,87 +116,30 @@ }{} -% ---- sbx = semiboldexpanded ---- - -\DeclareFontShape{TS1}{Junicode-TOsF}{sbx}{it}{ - <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-ts1 -}{} - -\DeclareFontShape{TS1}{Junicode-TOsF}{semiboldexpanded}{it}{ - <-> alias * Junicode-TOsF/sbx/it -}{} - -\DeclareFontShape{TS1}{Junicode-TOsF}{sbx}{n}{ - <-> \Junicode@@scale Junicode-ExpSmBold-tosf-ts1 -}{} - -\DeclareFontShape{TS1}{Junicode-TOsF}{semiboldexpanded}{n}{ - <-> alias * Junicode-TOsF/sbx/n -}{} - -\DeclareFontShape{TS1}{Junicode-TOsF}{sbx}{sl}{ - <-> ssub * Junicode-TOsF/sbx/it -}{} - -\DeclareFontShape{TS1}{Junicode-TOsF}{semiboldexpanded}{sl}{ - <-> ssub * Junicode-TOsF/semiboldexpanded/it -}{} - - -% ---- mediumsemicondensed ---- - -\DeclareFontShape{TS1}{Junicode-TOsF}{mediumsemicondensed}{n}{ - <-> \Junicode@@scale Junicode-SmCondMedium-tosf-ts1 -}{} - -\DeclareFontShape{TS1}{Junicode-TOsF}{mediumsemicondensed}{it}{ - <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-ts1 -}{} - -\DeclareFontShape{TS1}{Junicode-TOsF}{mediumsemicondensed}{sl}{ - <-> ssub * Junicode-TOsF/mediumsemicondensed/it -}{} - - -% ---- mediumcondensed ---- - -\DeclareFontShape{TS1}{Junicode-TOsF}{mediumcondensed}{it}{ - <-> \Junicode@@scale Junicode-CondMediumItalic-tosf-ts1 -}{} - -\DeclareFontShape{TS1}{Junicode-TOsF}{mediumcondensed}{n}{ - <-> \Junicode@@scale Junicode-CondMedium-tosf-ts1 -}{} - -\DeclareFontShape{TS1}{Junicode-TOsF}{mediumcondensed}{sl}{ - <-> ssub * Junicode-TOsF/mediumcondensed/it -}{} - - -% ---- b = bold ---- +% ---- sbsx = semiboldsemiexpanded ---- -\DeclareFontShape{TS1}{Junicode-TOsF}{b}{n}{ - <-> \Junicode@@scale Junicode-Bold-tosf-ts1 +\DeclareFontShape{TS1}{Junicode-TOsF}{sbsx}{it}{ + <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{bold}{n}{ - <-> alias * Junicode-TOsF/b/n +\DeclareFontShape{TS1}{Junicode-TOsF}{semiboldsemiexpanded}{it}{ + <-> alias * Junicode-TOsF/sbsx/it }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{b}{it}{ - <-> \Junicode@@scale Junicode-BoldItalic-tosf-ts1 +\DeclareFontShape{TS1}{Junicode-TOsF}{sbsx}{n}{ + <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{bold}{it}{ - <-> alias * Junicode-TOsF/b/it +\DeclareFontShape{TS1}{Junicode-TOsF}{semiboldsemiexpanded}{n}{ + <-> alias * Junicode-TOsF/sbsx/n }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{b}{sl}{ - <-> ssub * Junicode-TOsF/b/it +\DeclareFontShape{TS1}{Junicode-TOsF}{sbsx}{sl}{ + <-> ssub * Junicode-TOsF/sbsx/it }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{bold}{sl}{ - <-> ssub * Junicode-TOsF/bold/it +\DeclareFontShape{TS1}{Junicode-TOsF}{semiboldsemiexpanded}{sl}{ + <-> ssub * Junicode-TOsF/semiboldsemiexpanded/it }{} @@ -227,30 +158,30 @@ }{} -% ---- lsc = lightsemicondensed ---- +% ---- bx = boldexpanded ---- -\DeclareFontShape{TS1}{Junicode-TOsF}{lsc}{n}{ - <-> \Junicode@@scale Junicode-SmCondLight-tosf-ts1 +\DeclareFontShape{TS1}{Junicode-TOsF}{bx}{it}{ + <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{lightsemicondensed}{n}{ - <-> alias * Junicode-TOsF/lsc/n +\DeclareFontShape{TS1}{Junicode-TOsF}{boldexpanded}{it}{ + <-> alias * Junicode-TOsF/bx/it }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{lsc}{it}{ - <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-ts1 +\DeclareFontShape{TS1}{Junicode-TOsF}{bx}{n}{ + <-> \Junicode@@scale Junicode-ExpBold-tosf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{lightsemicondensed}{it}{ - <-> alias * Junicode-TOsF/lsc/it +\DeclareFontShape{TS1}{Junicode-TOsF}{boldexpanded}{n}{ + <-> alias * Junicode-TOsF/bx/n }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{lsc}{sl}{ - <-> ssub * Junicode-TOsF/lsc/it +\DeclareFontShape{TS1}{Junicode-TOsF}{bx}{sl}{ + <-> ssub * Junicode-TOsF/bx/it }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{lightsemicondensed}{sl}{ - <-> ssub * Junicode-TOsF/lightsemicondensed/it +\DeclareFontShape{TS1}{Junicode-TOsF}{boldexpanded}{sl}{ + <-> ssub * Junicode-TOsF/boldexpanded/it }{} @@ -281,30 +212,60 @@ }{} -% ---- bx = boldexpanded ---- +% ---- mediumsemiexpanded ---- -\DeclareFontShape{TS1}{Junicode-TOsF}{bx}{it}{ - <-> \Junicode@@scale Junicode-ExpBoldItalic-tosf-ts1 +\DeclareFontShape{TS1}{Junicode-TOsF}{mediumsemiexpanded}{it}{ + <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{boldexpanded}{it}{ - <-> alias * Junicode-TOsF/bx/it +\DeclareFontShape{TS1}{Junicode-TOsF}{mediumsemiexpanded}{n}{ + <-> \Junicode@@scale Junicode-SmExpMedium-tosf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{bx}{n}{ - <-> \Junicode@@scale Junicode-ExpBold-tosf-ts1 +\DeclareFontShape{TS1}{Junicode-TOsF}{mediumsemiexpanded}{sl}{ + <-> ssub * Junicode-TOsF/mediumsemiexpanded/it }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{boldexpanded}{n}{ - <-> alias * Junicode-TOsF/bx/n + +% ---- lc = lightcondensed ---- + +\DeclareFontShape{TS1}{Junicode-TOsF}{lc}{n}{ + <-> \Junicode@@scale Junicode-CondLight-tosf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{bx}{sl}{ - <-> ssub * Junicode-TOsF/bx/it +\DeclareFontShape{TS1}{Junicode-TOsF}{lightcondensed}{n}{ + <-> alias * Junicode-TOsF/lc/n }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{boldexpanded}{sl}{ - <-> ssub * Junicode-TOsF/boldexpanded/it +\DeclareFontShape{TS1}{Junicode-TOsF}{lc}{it}{ + <-> \Junicode@@scale Junicode-CondLightItalic-tosf-ts1 +}{} + +\DeclareFontShape{TS1}{Junicode-TOsF}{lightcondensed}{it}{ + <-> alias * Junicode-TOsF/lc/it +}{} + +\DeclareFontShape{TS1}{Junicode-TOsF}{lc}{sl}{ + <-> ssub * Junicode-TOsF/lc/it +}{} + +\DeclareFontShape{TS1}{Junicode-TOsF}{lightcondensed}{sl}{ + <-> ssub * Junicode-TOsF/lightcondensed/it +}{} + + +% ---- mediumsemicondensed ---- + +\DeclareFontShape{TS1}{Junicode-TOsF}{mediumsemicondensed}{n}{ + <-> \Junicode@@scale Junicode-SmCondMedium-tosf-ts1 +}{} + +\DeclareFontShape{TS1}{Junicode-TOsF}{mediumsemicondensed}{it}{ + <-> \Junicode@@scale Junicode-SmCondMediumItalic-tosf-ts1 +}{} + +\DeclareFontShape{TS1}{Junicode-TOsF}{mediumsemicondensed}{sl}{ + <-> ssub * Junicode-TOsF/mediumsemicondensed/it }{} @@ -335,141 +296,180 @@ }{} -% ---- mediumsemiexpanded ---- +% ---- sx = semiexpanded ---- -\DeclareFontShape{TS1}{Junicode-TOsF}{mediumsemiexpanded}{it}{ - <-> \Junicode@@scale Junicode-SmExpMediumItalic-tosf-ts1 +\DeclareFontShape{TS1}{Junicode-TOsF}{sx}{it}{ + <-> \Junicode@@scale Junicode-SmExpItalic-tosf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{mediumsemiexpanded}{n}{ - <-> \Junicode@@scale Junicode-SmExpMedium-tosf-ts1 +\DeclareFontShape{TS1}{Junicode-TOsF}{semiexpanded}{it}{ + <-> alias * Junicode-TOsF/sx/it }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{mediumsemiexpanded}{sl}{ - <-> ssub * Junicode-TOsF/mediumsemiexpanded/it +\DeclareFontShape{TS1}{Junicode-TOsF}{sx}{n}{ + <-> \Junicode@@scale Junicode-SmExp-tosf-ts1 }{} +\DeclareFontShape{TS1}{Junicode-TOsF}{semiexpanded}{n}{ + <-> alias * Junicode-TOsF/sx/n +}{} -% ---- mediumexpanded ---- +\DeclareFontShape{TS1}{Junicode-TOsF}{sx}{sl}{ + <-> ssub * Junicode-TOsF/sx/it +}{} -\DeclareFontShape{TS1}{Junicode-TOsF}{mediumexpanded}{it}{ - <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-ts1 +\DeclareFontShape{TS1}{Junicode-TOsF}{semiexpanded}{sl}{ + <-> ssub * Junicode-TOsF/semiexpanded/it }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{mediumexpanded}{n}{ - <-> \Junicode@@scale Junicode-ExpMedium-tosf-ts1 + +% ---- b = bold ---- + +\DeclareFontShape{TS1}{Junicode-TOsF}{b}{n}{ + <-> \Junicode@@scale Junicode-Bold-tosf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{mediumexpanded}{sl}{ - <-> ssub * Junicode-TOsF/mediumexpanded/it +\DeclareFontShape{TS1}{Junicode-TOsF}{bold}{n}{ + <-> alias * Junicode-TOsF/b/n }{} +\DeclareFontShape{TS1}{Junicode-TOsF}{b}{it}{ + <-> \Junicode@@scale Junicode-BoldItalic-tosf-ts1 +}{} -% ---- sbsx = semiboldsemiexpanded ---- +\DeclareFontShape{TS1}{Junicode-TOsF}{bold}{it}{ + <-> alias * Junicode-TOsF/b/it +}{} -\DeclareFontShape{TS1}{Junicode-TOsF}{sbsx}{it}{ - <-> \Junicode@@scale Junicode-SmExpSmBoldItalic-tosf-ts1 +\DeclareFontShape{TS1}{Junicode-TOsF}{b}{sl}{ + <-> ssub * Junicode-TOsF/b/it }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{semiboldsemiexpanded}{it}{ - <-> alias * Junicode-TOsF/sbsx/it +\DeclareFontShape{TS1}{Junicode-TOsF}{bold}{sl}{ + <-> ssub * Junicode-TOsF/bold/it }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{sbsx}{n}{ - <-> \Junicode@@scale Junicode-SmExpSmBold-tosf-ts1 + +% ---- x = expanded ---- + +\DeclareFontShape{TS1}{Junicode-TOsF}{x}{n}{ + <-> \Junicode@@scale Junicode-Exp-tosf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{semiboldsemiexpanded}{n}{ - <-> alias * Junicode-TOsF/sbsx/n +\DeclareFontShape{TS1}{Junicode-TOsF}{expanded}{n}{ + <-> alias * Junicode-TOsF/x/n }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{sbsx}{sl}{ - <-> ssub * Junicode-TOsF/sbsx/it +\DeclareFontShape{TS1}{Junicode-TOsF}{x}{it}{ + <-> \Junicode@@scale Junicode-ExpItalic-tosf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{semiboldsemiexpanded}{sl}{ - <-> ssub * Junicode-TOsF/semiboldsemiexpanded/it +\DeclareFontShape{TS1}{Junicode-TOsF}{expanded}{it}{ + <-> alias * Junicode-TOsF/x/it }{} +\DeclareFontShape{TS1}{Junicode-TOsF}{x}{sl}{ + <-> ssub * Junicode-TOsF/x/it +}{} -% ---- c = condensed ---- +\DeclareFontShape{TS1}{Junicode-TOsF}{expanded}{sl}{ + <-> ssub * Junicode-TOsF/expanded/it +}{} -\DeclareFontShape{TS1}{Junicode-TOsF}{c}{n}{ - <-> \Junicode@@scale Junicode-Cond-tosf-ts1 + +% ---- lsc = lightsemicondensed ---- + +\DeclareFontShape{TS1}{Junicode-TOsF}{lsc}{it}{ + <-> \Junicode@@scale Junicode-SmCondLightItalic-tosf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{condensed}{n}{ - <-> alias * Junicode-TOsF/c/n +\DeclareFontShape{TS1}{Junicode-TOsF}{lightsemicondensed}{it}{ + <-> alias * Junicode-TOsF/lsc/it }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{c}{it}{ - <-> \Junicode@@scale Junicode-CondItalic-tosf-ts1 +\DeclareFontShape{TS1}{Junicode-TOsF}{lsc}{n}{ + <-> \Junicode@@scale Junicode-SmCondLight-tosf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{condensed}{it}{ - <-> alias * Junicode-TOsF/c/it +\DeclareFontShape{TS1}{Junicode-TOsF}{lightsemicondensed}{n}{ + <-> alias * Junicode-TOsF/lsc/n }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{c}{sl}{ - <-> ssub * Junicode-TOsF/c/it +\DeclareFontShape{TS1}{Junicode-TOsF}{lsc}{sl}{ + <-> ssub * Junicode-TOsF/lsc/it }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{condensed}{sl}{ - <-> ssub * Junicode-TOsF/condensed/it +\DeclareFontShape{TS1}{Junicode-TOsF}{lightsemicondensed}{sl}{ + <-> ssub * Junicode-TOsF/lightsemicondensed/it }{} -% ---- x = expanded ---- +% ---- mediumexpanded ---- -\DeclareFontShape{TS1}{Junicode-TOsF}{x}{it}{ - <-> \Junicode@@scale Junicode-ExpItalic-tosf-ts1 +\DeclareFontShape{TS1}{Junicode-TOsF}{mediumexpanded}{it}{ + <-> \Junicode@@scale Junicode-ExpMediumItalic-tosf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{expanded}{it}{ - <-> alias * Junicode-TOsF/x/it +\DeclareFontShape{TS1}{Junicode-TOsF}{mediumexpanded}{n}{ + <-> \Junicode@@scale Junicode-ExpMedium-tosf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{x}{n}{ - <-> \Junicode@@scale Junicode-Exp-tosf-ts1 +\DeclareFontShape{TS1}{Junicode-TOsF}{mediumexpanded}{sl}{ + <-> ssub * Junicode-TOsF/mediumexpanded/it }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{expanded}{n}{ - <-> alias * Junicode-TOsF/x/n + +% ---- c = condensed ---- + +\DeclareFontShape{TS1}{Junicode-TOsF}{c}{it}{ + <-> \Junicode@@scale Junicode-CondItalic-tosf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{x}{sl}{ - <-> ssub * Junicode-TOsF/x/it +\DeclareFontShape{TS1}{Junicode-TOsF}{condensed}{it}{ + <-> alias * Junicode-TOsF/c/it }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{expanded}{sl}{ - <-> ssub * Junicode-TOsF/expanded/it +\DeclareFontShape{TS1}{Junicode-TOsF}{c}{n}{ + <-> \Junicode@@scale Junicode-Cond-tosf-ts1 }{} +\DeclareFontShape{TS1}{Junicode-TOsF}{condensed}{n}{ + <-> alias * Junicode-TOsF/c/n +}{} -% ---- sx = semiexpanded ---- +\DeclareFontShape{TS1}{Junicode-TOsF}{c}{sl}{ + <-> ssub * Junicode-TOsF/c/it +}{} -\DeclareFontShape{TS1}{Junicode-TOsF}{sx}{it}{ - <-> \Junicode@@scale Junicode-SmExpItalic-tosf-ts1 +\DeclareFontShape{TS1}{Junicode-TOsF}{condensed}{sl}{ + <-> ssub * Junicode-TOsF/condensed/it }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{semiexpanded}{it}{ - <-> alias * Junicode-TOsF/sx/it + +% ---- sbx = semiboldexpanded ---- + +\DeclareFontShape{TS1}{Junicode-TOsF}{sbx}{it}{ + <-> \Junicode@@scale Junicode-ExpSmBoldItalic-tosf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{sx}{n}{ - <-> \Junicode@@scale Junicode-SmExp-tosf-ts1 +\DeclareFontShape{TS1}{Junicode-TOsF}{semiboldexpanded}{it}{ + <-> alias * Junicode-TOsF/sbx/it }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{semiexpanded}{n}{ - <-> alias * Junicode-TOsF/sx/n +\DeclareFontShape{TS1}{Junicode-TOsF}{sbx}{n}{ + <-> \Junicode@@scale Junicode-ExpSmBold-tosf-ts1 }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{sx}{sl}{ - <-> ssub * Junicode-TOsF/sx/it +\DeclareFontShape{TS1}{Junicode-TOsF}{semiboldexpanded}{n}{ + <-> alias * Junicode-TOsF/sbx/n }{} -\DeclareFontShape{TS1}{Junicode-TOsF}{semiexpanded}{sl}{ - <-> ssub * Junicode-TOsF/semiexpanded/it +\DeclareFontShape{TS1}{Junicode-TOsF}{sbx}{sl}{ + <-> ssub * Junicode-TOsF/sbx/it +}{} + +\DeclareFontShape{TS1}{Junicode-TOsF}{semiboldexpanded}{sl}{ + <-> ssub * Junicode-TOsF/semiboldexpanded/it }{} diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex index 95e0590b7bb..54aa898cc98 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-07-20}% \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..6f417c325c5 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-07-20}% \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..512497e7a09 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-07-20}% \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..10c4ecbc700 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-07-20}% \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..000b6dcb41c 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-07-20}{}{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..4d4876f5607 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-07-20}{} {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/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/lni/lni.cls b/Master/texmf-dist/tex/latex/lni/lni.cls index 14eb413f8aa..8e8c9fae7e2 100644 --- a/Master/texmf-dist/tex/latex/lni/lni.cls +++ b/Master/texmf-dist/tex/latex/lni/lni.cls @@ -14,7 +14,7 @@ %% --------| ----------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{lni} - [2024/07/01 v1.9 Official class for submissions to the ``Lecture Notes + [2024/07/23 v1.10 Official class for submissions to the ``Lecture Notes in Informatics''] \RequirePackage{iftex}\ifluatex\else\pdfoutput=1\fi% \def\@clearglobaloption#1{% @@ -291,7 +291,7 @@ \RequirePackage[hang]{footmisc} \setlength{\footnotemargin}{1em} \long\def\@makefntext#1{% - \def\@makefnmark{\rlap{\normalfont\@thefnmark}}% + \def\@makefnmark{\rlap{\normalfont\textsuperscript{\@thefnmark}}}% \ifFN@hangfoot \bgroup \setbox\@tempboxa\hbox{% @@ -380,9 +380,9 @@ \newcommand{\@multiaffil}[1]{% \ifcsundef{@emailsandorcids#1}{\csgdef{@emailsandorcids#1}{}}{}% \ifcsempty{@emailsandorcids#1}% - {\csgappto{@emailsandorcids#1}{% + {\protected@csxappto{@emailsandorcids#1}{% \if\relax\@currEmail\relax\else\email{\@currEmail}\fi\if\relax\@currOrcid\relax\else,\ \orcid{\@currOrcid}\fi}}% - {\csgappto{@emailsandorcids#1}{% + {\protected@csxappto{@emailsandorcids#1}{% \if\relax\@currEmail\relax\else;\ \email{\@currEmail}\fi\if\relax\@currOrcid\relax\else,\ \orcid{\@currOrcid}\fi}}% } @@ -678,6 +678,7 @@ \renewcommand{\headrulewidth}{0.4pt} %Linie unter Kopfzeile \fi% \RequirePackage{url} +\urlstyle{same} \g@addto@macro{\UrlBreaks}{\UrlOrds} \RequirePackage{xspace} \AddToHook{env/document/begin}[lni/loadhyperref]{% 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/mathastext/mathastext.sty b/Master/texmf-dist/tex/latex/mathastext/mathastext.sty index 2ab9b2fa91b..4ff41f668ac 100644 --- a/Master/texmf-dist/tex/latex/mathastext/mathastext.sty +++ b/Master/texmf-dist/tex/latex/mathastext/mathastext.sty @@ -23,7 +23,7 @@ %%---------------------------------------------------------------- %% Package: mathastext %% Info: Use the text font in math mode (JFB) -%% Version: 1.4a 2024/07/20 +%% Version: 1.4b 2024/07/27 %% License: LPPL 1.3c (http://www.latex-project.org/lppl/lppl-1-3c.txt) %% Copyright (C) 2011-2019, 2022-2024 Jean-Francois Burnol %% <jfbu at free dot fr> @@ -33,7 +33,7 @@ %%---------------------------------------------------------------- \NeedsTeXFormat{LaTeX2e}[2020/02/02] \ProvidesPackage {mathastext} - [2024/07/20 v1.4a Use the text font in math mode (JFB)] + [2024/07/27 v1.4b Use the text font in math mode (JFB)] \def\mst@infoline#1{\immediate\write\m@ne {(\space\space\space mathastext:\space\space\space) #1}} \immediate\write\m@ne{} @@ -162,6 +162,8 @@ \DeclareOption{nodigits}{\mst@nodigitstrue} \newif\ifmst@defaultimath \DeclareOption{defaultimath}{\mst@defaultimathtrue} +\newif\ifmst@noletters + \DeclareOption{noletters}{\mst@noletterstrue\ExecuteOptions{nohbar,defaultimath}} \newif\ifmst@mathaccents \DeclareOption{mathaccents}{\mst@mathaccentstrue} \newif\ifmst@unimathaccents @@ -230,7 +232,12 @@ defaultbf,defaultit,defaultsf,defaulttt}} \newif\ifmst@subdued \DeclareOption{subdued}{\mst@subduedtrue} \newif\ifmst@everymath - \DeclareOption{everymath}{\mst@everymathtrue} + \DeclareOption{everymath}{\mst@everymathtrue +\PackageWarningNoLine{mathastext}{% + `everymath\string' will be removed at next major release.\MessageBreak + Please report to the author the circumstances\MessageBreak + which mandated its use in the present document}% +} \def\mst@unicodeminus {2013} \def\mst@checkoption #1unicodeminus#2\mst@#3\mst@@ {\ifx\\#3\\\PackageWarningNoLine{mathastext} @@ -853,6 +860,11 @@ defaultbf,defaultit,defaultsf,defaulttt}} \let\MathastextupGreek\MTupGreek \newcommand*\MTgreekfont[1]{\def\mst@greekfont{#1}} \let\Mathastextgreekfont\MTgreekfont +\ifmst@noletters + \let\MTmathactiveletters\@empty + \let\MTmathactiveLetters\@empty + \let\MTmathstandardletters\@empty +\else \def\mst@DeclareMathLetter#1#2#3#4#5{% \DeclareMathSymbol {#1}{\mathalpha}{mtletterfont}{`#1}% \DeclareMathSymbol {#4}{\mathalpha}{mtletterfont}{`#1}% @@ -937,6 +949,7 @@ defaultbf,defaultit,defaultsf,defaulttt}} \mst@mathdeactivate@lowercase \mst@mathdeactivate@uppercase }% +\fi \newcommand*\MTicinmath{% \MTmathactiveletters \def\mst@itcorr{\ifnum\fam=\m@ne\/\fi}% @@ -960,6 +973,8 @@ defaultbf,defaultit,defaultsf,defaulttt}} \@namedef{mst@before@#1}{}% \@namedef{mst@after@#1}{}% } +\let\MTmathactivedigits\empty +\let\MTmathstandarddigits\empty \ifmst@nodigits\else \def\mst@font@tbu{mtoperatorfont}% \ifmst@symboldigits \def\mst@font@tbu{mtpsymbol}\fi @@ -974,8 +989,6 @@ defaultbf,defaultit,defaultsf,defaulttt}} \DeclareMathSymbol{7}{\mathalpha}{\mst@font@tbu}{`7}% \DeclareMathSymbol{8}{\mathalpha}{\mst@font@tbu}{`8}% \DeclareMathSymbol{9}{\mathalpha}{\mst@font@tbu}{`9}% - \let\MTmathactivedigits\relax - \let\MTmathstandarddigits\relax \ifmst@activedigits \def\mst@DeclareMathDigit #1#2#3{% \DeclareMathSymbol{#3}{\mathalpha}{\mst@font@tbu}{`#1}% @@ -993,17 +1006,17 @@ defaultbf,defaultit,defaultsf,defaulttt}} \expandafter\mst@tmp\csname MTcommanddigit\romannumeral\mst@tmp\endcsname{}% }% }% - \newcommand*\MTmathactivedigits{\mst@OnlyIfNotSubdued\mst@mathactivatedigits}% + \def\MTmathactivedigits{\mst@OnlyIfNotSubdued\mst@mathactivatedigits}% \MTmathactivedigits \ifmst@everymath - \newcommand*\MTmathstandarddigits{% + \def\MTmathstandarddigits{% \@tfor\mst@tmp:=0123456789\do{% \expandafter\mathcode\expandafter`\mst@tmp =\csname MTmathchardigit\romannumeral\mst@tmp\endcsname }% }% \else - \newcommand*\MTmathstandarddigits{% + \def\MTmathstandarddigits{% \@tfor\mst@tmp:=0123456789\do{% \expandafter\mathcode\expandafter`\mst@tmp =\csname MTmathchardigit\romannumeral\mst@tmp\endcsname @@ -1027,8 +1040,8 @@ defaultbf,defaultit,defaultsf,defaulttt}} \DeclareMathSymbol{\mst@varfam@question}{\mathalpha}{\mst@font@tbu}{"3F}% \expandafter\mst@addtodo@nonletters\string?\mathclose\mst@varfam@question \fi -\newcommand*\MTnormalasterisk{} -\newcommand*\MTactiveasterisk{} +\let\MTnormalasterisk\empty +\let\MTactiveasterisk\empty \ifmst@asterisk\mst@infoline{asterisk: \string\ast\space and *} \ifmst@symbolmisc \protected\def\mst@bin@ast{\mathbin{\mathchoice @@ -2358,21 +2371,31 @@ defaultbf,defaultit,defaultsf,defaulttt}} \SetSymbolFont{mtletterfont}{#2}{#3}{#4}{#5}{\mst@ltsh}% \immediate\write\m@ne{}% \PackageInfo{mathastext}% - {Latin letters in math version `#2\string'\MessageBreak + {\ifmst@noletters + \else + Latin letters in math version `#2\string'\MessageBreak declared\on@line\MessageBreak will use the font #3/#4/#5/\mst@ltsh \ifmst@frenchmath\space(uppercase: #6)\fi\MessageBreak + \fi Other characters (digits, ...) and \protect\log-like names\MessageBreak - will be in `#6\string' shape\@gobble}% + \ifmst@noletters + will use the font #3/#4/#5/#6% + \else + will be in `#6\string' shape% + \fi\@gobble}% \immediate\write\m@ne{}% \expandafter\edef\csname mst@ltshape@\mst@version\endcsname{\mst@ltsh}% \else \SetSymbolFont{mtletterfont}{#2}{#3}{#4}{#5}{#6}% + \ifmst@noletters + \else \immediate\write\m@ne{}% \PackageInfo{mathastext}% {Latin letters in math version `#2\string'\MessageBreak declared\on@line\MessageBreak will use the fonts #3/#4/#5(\mst@bold)/#6\@gobble}% + \fi \immediate\write\m@ne{}% \expandafter\edef\csname mst@ltshape@\mst@version\endcsname{#6}% \fi @@ -2380,13 +2403,20 @@ defaultbf,defaultit,defaultsf,defaulttt}} \SetSymbolFont{mtletterfont}{#2}{#3}{#4}{#5}{#1}% \immediate\write\m@ne{}% \PackageInfo{mathastext}% - {Latin letters in math version `#2\string'\MessageBreak + {\ifmst@noletters + \else + Latin letters in math version `#2\string'\MessageBreak declared\on@line\MessageBreak will use the font #3/#4/#5/#1% \ifmst@frenchmath\space(uppercase: #6)\fi\MessageBreak + \fi Other characters (digits, ...) and \protect\log-like names\MessageBreak - will be in `#6\string' shape\@gobble}% + \ifmst@noletters + will use the font #3/#4/#5/#6% + \else + will be in `#6\string' shape% + \fi\@gobble}% \immediate\write\m@ne{}% \expandafter\edef\csname mst@ltshape@\mst@version\endcsname{#1}% \fi 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/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/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/pagelayout/pagelayout.cls b/Master/texmf-dist/tex/latex/pagelayout/pagelayout.cls index 8e7d3616aef..655ed59bd2b 100644 --- a/Master/texmf-dist/tex/latex/pagelayout/pagelayout.cls +++ b/Master/texmf-dist/tex/latex/pagelayout/pagelayout.cls @@ -13,8 +13,8 @@ %% \NeedsTeXFormat{LaTeX2e}[2020/10/01] -\ProvidesClass{pagelayout}[2024/01/17 Layout graphic rich documents] -\def\pagelayoutversion{1.1.0} +\ProvidesClass{pagelayout}[2024/07/31 Layout graphic rich documents] +\def\pagelayoutversion{1.1.1} % packages \RequirePackage{pgfopts} @@ -372,7 +372,11 @@ \pal@outermargin=\ifdim\pal@gridoutermargin=\pal@undefdim\pal@gridmargin\else\pal@gridoutermargin\fi \height=\dimexpr\pal@pageheight - \pal@topmargin - \pal@bottommargin\relax - \width=\dimexpr\pal@pagewidth - \pal@innermargin - \pal@outermargin\relax + \ifpal@isdoublepage + \width=\dimexpr2\pal@pagewidth - 2\pal@outermargin\relax + \else + \width=\dimexpr\pal@pagewidth - \pal@innermargin - \pal@outermargin\relax + \fi \ifdim\dimexpr\pal@gridoptionheight\relax=\pal@undefdim \else \pal@gridheightdiff=\dimexpr0.5\height - 0.5\dimexpr\pal@gridoptionheight\relax\relax 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..68272c9b162 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-08-17 v0.96j 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..eb3c8e4b86e 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-08-17}{0.96j} + {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..7929a7ae13c 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-08-17 v0.96j % 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..23634ecb9ee 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-08-17}{} {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..7058f285cd8 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-08-17}{} {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..df51df34d7d 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-08-17}{} {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..c7f70a83868 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-08-17}{} {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..5936e320450 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-08-17}{} {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..67567a9b56b 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-08-17}{} {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..8e472778520 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-08-17}{0.96j}% {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..783ba92c910 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-08-17}{0.96j} {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..458a1d95bd3 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-08-17}{0.96j} {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} @@ -1508,6 +1510,9 @@ { 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}{} + %A-2u ============== \prop_new:c { g__pdfmeta_standard_pdf/A-2U_prop } \prop_gset_eq:cc { g__pdfmeta_standard_pdf/A-2U_prop } @@ -1808,6 +1813,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 +1832,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 +1965,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 +2295,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..ce1dbc393f7 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-08-17}{0.96j} {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..5fce11f19d5 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-08-17 v0.96j patch xcolor for l3color] \@ifundefined{color_set:nn}{\RequirePackage{l3color}}{} \ExplSyntaxOn 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 new file mode 100644 index 00000000000..23006e89c57 --- /dev/null +++ b/Master/texmf-dist/tex/latex/pgfplotsthemebeamer/pgfplotsthemebeamer.sty @@ -0,0 +1,37 @@ +% !TeX root = ./testing/test.tex +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% The pgfplotsthemebeamer package +% Using colours from the current beamer theme in pgfplots +% Maintained by samcarter +% +% Project repository and bug tracker: +% https://github.com/samcarter/pgfplotstheme-beamer +% +% Released under the LaTeX Project Public License v1.3c or later +% See http://www.latex-project.org/lppl.txt +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\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}{} +} + +% setting up colours +\RequirePackage{pgfplots} +\pgfplotsset{ + beamercolors/.style={ + cycle multi list={ + mark=*\\mark=x\\mark=square*\\mark=o\\mark=+\\mark=square\\\nextlist + structure.fg\\alerted text.fg\\example text.fg\\ + } + } +} + +% making beamercolors default if package is loaded with `all` option +\DeclareOption{all}{ + \pgfplotsset{beamercolors} +} +\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/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/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index 91b0c3f8394..96a1d832947 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty @@ -28,7 +28,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2024/05/11 v2.25.6a reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2024/07/23 v2.25.7 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -2244,7 +2244,6 @@ \renewcommand{\thestanzaR}{% \textbf{\arabic{stanzaR}}% } -\newif\ifl@dusedbabel \patchcmd{\bbl@set@language}% {\select@language{\languagename}}% {\edef\languagename{#1}\select@language{\languagename}}% @@ -2256,11 +2255,9 @@ \gdef\theledlanguageR{} \AtBeginDocument{% - \@ifundefined{xpg@main@language}{% + \@ifpackageloaded{babel}{% \@ifundefined{bbl@main@language}{% - \l@dusedbabelfalse }{% - \l@dusedbabeltrue \let\l@doldselectlanguage\selectlanguage \let\l@doldbbl@set@language\bbl@set@language \renewcommand{\selectlanguage}[1]{% @@ -2276,23 +2273,26 @@ \gdef\theledlanguageL{\bbl@main@language}% \gdef\theledlanguageR{\bbl@main@language}% }% - } - {% - \@ifpackagelater{polyglossia}{2022/04/10}{}{\led@err@polyglossiaTooOld}% - \let\old@otherlanguage\otherlanguage% - \renewcommand{\otherlanguage}[2][]{% - \selectlanguage[#1]{#2}% - \xpg@set@language@only@aux[#1]{#2}% - \ifledRcol \gdef\theledlanguageR{#2}% - \else \gdef\theledlanguageL{#2}% - \fi}% + }{}% + \@ifpackageloaded{polyglossia}{% + \@ifpackagelater{polyglossia}{2024/07/15}{}{\led@err@polyglossiaTooOld}% \renewcommand{\l@duselanguage}[1]{% \csuse{no\languagename @numbers}% - \expandafter\@select@language\expandafter{#1}% + \selectlanguage*{#1}% }% - \xdef\theledlanguageL{\xpg@main@language}% - \xdef\theledlanguageR{\xpg@main@language}% - }% + \AddToHook{env/Leftside/begin}{% + \AddToHookNext{cmd/polyglossia@language@switched/after}{% + \xdef\theledlanguageL{\languagename}% + }% + }% + \AddToHook{env/Rightside/begin}{% + \AddToHookNext{cmd/polyglossia@language@switched/after}{% + \xdef\theledlanguageR{\languagename}% + }% + }% + \xdef\theledlanguageL{\mainlanguagename}% + \xdef\theledlanguageR{\mainlanguagename}% + }{}% }% \newcount\l@dc@maxchunks \newcommand{\maxchunks}[1]{\l@dc@maxchunks=#1} 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/se2thesis/se2colors.sty b/Master/texmf-dist/tex/latex/se2thesis/se2colors.sty index a11d6f6325c..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-06-25} {4.2.0} +\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 adaf3be8b75..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-06-25} {4.2.0} +\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 0b93beca7d5..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-06-25} {4.2.0} +\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 9ce66446581..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-06-25} {4.2.0} +\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 0a68a9ef062..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/06/25] +\ProvideDictionaryFor{English}{se2translations}[2024/08/12] \ProvideDictTranslation{abstract}{abstract} \ProvideDictTranslation{Abstract}{Abstract} \ProvideDictTranslation{acknowledgement}{acknowledgement} @@ -57,10 +57,10 @@ \ProvideDictTranslation{External}{External Examiner} \ProvideDictTranslation{degreeprogramme}{programme} \ProvideDictTranslation{Degreeprogramme}{Programme} -\ProvideDictTranslation{Bachelor-thesis}{Bachelor Thesis} -\ProvideDictTranslation{Bachelor-thesis-proposal}{Bachelor Thesis Proposal} -\ProvideDictTranslation{Master-thesis}{Master Thesis} -\ProvideDictTranslation{Master-thesis-proposal}{Master Thesis Proposal} +\ProvideDictTranslation{Bachelor-thesis}{Bachelor's Thesis} +\ProvideDictTranslation{Bachelor-thesis-proposal}{Bachelor's Thesis Proposal} +\ProvideDictTranslation{Master-thesis}{Master's Thesis} +\ProvideDictTranslation{Master-thesis-proposal}{Master's Thesis Proposal} \ProvideDictTranslation{PhD-thesis}{PhD Thesis} \ProvideDictTranslation{PhD-thesis-proposal}{PhD Thesis Proposal} \ProvideDictTranslation{date}{date} diff --git a/Master/texmf-dist/tex/latex/se2thesis/se2translations-german.trsl b/Master/texmf-dist/tex/latex/se2thesis/se2translations-german.trsl index c4b8dda368f..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/06/25] +\ProvideDictionaryFor{German}{se2translations}[2024/08/12] \ProvideDictTranslation{abstract}{Zusammenfassung} \ProvideDictTranslation{Abstract}{Zusammenfassung} \ProvideDictTranslation{acknowledgement}{Danksagung} diff --git a/Master/texmf-dist/tex/latex/sillypage/sillypage.sty b/Master/texmf-dist/tex/latex/sillypage/sillypage.sty index 2c304af0505..a78ae795dc8 100644 --- a/Master/texmf-dist/tex/latex/sillypage/sillypage.sty +++ b/Master/texmf-dist/tex/latex/sillypage/sillypage.sty @@ -22,8 +22,8 @@ %% and version 1.3c or later is part of all distributions of LaTeX version %% 2005/12/01 or later. %% -\def\sillypageDate{2023-03-04} -\def\sillypageVersion{1.6} +\def\sillypageDate{2024-07-23} +\def\sillypageVersion{1.7} \ProvidesExplPackage {sillypage} {\sillypageDate} {\sillypageVersion} {The silly walk as page numbering style} @@ -36,19 +36,45 @@ \newcommand*\@silly { \__silly_step:n } \cs_new:Npn \__silly_step:n #1 { + \UseTaggingSocket{__silly/begin}{#1} + \SuspendTagging{__silly} \__silly_step_aux:eN { \int_eval:n { \int_mod:nn { #1-1 } { \silly@steps } +1 } } \c_false_bool + \ResumeTagging{__silly} + \UseTaggingSocket{__silly/end} } \NewDocumentCommand \sillynumeral { m } { \__silly_numeral:n {#1} } \newcommand*\@sillynumeral { \__silly_numeral:n } \cs_new:Npn \__silly_numeral:n #1 { + \UseTaggingSocket{__silly/begin}{#1} + \SuspendTagging{__silly} \exp_args:Ne \str_map_function:nN { \int_to_base:nn {#1} { 12 } } \__silly_numeral_aux:n + \ResumeTagging{__silly} + \UseTaggingSocket{__silly/end} } \cs_new:Npn \__silly_numeral_aux:n #1 { \__silly_step_aux:eN { "\char_uppercase:N #1+1 } \c_true_bool } + +\NewSocket{tagsupport/__silly/begin}{1} +\NewSocket{tagsupport/__silly/end}{0} +\NewSocketPlug{tagsupport/__silly/begin}{tagged} + { + \mode_leave_vertical: + \tag_mc_end_push: + \tag_struct_begin:n {tag=Span} + \tag_mc_begin:n {actualtext=#1} + } +\NewSocketPlug{tagsupport/__silly/end}{tagged} + { + \tag_mc_end: + \tag_struct_end: + \tag_mc_begin_pop:n{} + } +\AssignSocketPlug{tagsupport/__silly/begin}{tagged} +\AssignSocketPlug{tagsupport/__silly/end}{tagged} \cs_new:Npn \__silly_step_aux:nN #1 #2 { \cs_if_exist_use:cF { texorpdfstring } { \use_i:nn } diff --git a/Master/texmf-dist/tex/latex/simpleicons/simpleicons.sty b/Master/texmf-dist/tex/latex/simpleicons/simpleicons.sty index bcbe536096d..b0fbbe1e841 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/12 13.1.0 Simple Icons 13.1.0 Logos] +\ProvidesPackage{simpleicons}[2024/08/23 13.6.0 Simple Icons 13.6.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 e0ea8e79ccc..986c93445ca 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-pdftex.tex +++ b/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-pdftex.tex @@ -1076,2079 +1076,2088 @@ \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@gmailicon\endcsname {\simpleiconsmapfive\symbol{53}} - \expandafter\def\csname simpleicon@gnomeicon\endcsname {\simpleiconsmapfive\symbol{54}} - \expandafter\def\csname simpleicon@gnometerminalicon\endcsname {\simpleiconsmapfive\symbol{55}} - \expandafter\def\csname simpleicon@gnuicon\endcsname {\simpleiconsmapfive\symbol{56}} - \expandafter\def\csname simpleicon@gnubashicon\endcsname {\simpleiconsmapfive\symbol{57}} - \expandafter\def\csname simpleicon@gnuemacsicon\endcsname {\simpleiconsmapfive\symbol{58}} - \expandafter\def\csname simpleicon@gnuicecaticon\endcsname {\simpleiconsmapfive\symbol{59}} - \expandafter\def\csname simpleicon@gnuprivacyguardicon\endcsname {\simpleiconsmapfive\symbol{60}} - \expandafter\def\csname simpleicon@gnusocialicon\endcsname {\simpleiconsmapfive\symbol{61}} - \expandafter\def\csname simpleicon@goicon\endcsname {\simpleiconsmapfive\symbol{62}} - \expandafter\def\csname simpleicon@gocdicon\endcsname {\simpleiconsmapfive\symbol{63}} - \expandafter\def\csname simpleicon@godaddyicon\endcsname {\simpleiconsmapfive\symbol{64}} - \expandafter\def\csname simpleicon@godotengineicon\endcsname {\simpleiconsmapfive\symbol{65}} - \expandafter\def\csname simpleicon@gofundmeicon\endcsname {\simpleiconsmapfive\symbol{66}} - \expandafter\def\csname simpleicon@gogdotcomicon\endcsname {\simpleiconsmapfive\symbol{67}} - \expandafter\def\csname simpleicon@gojekicon\endcsname {\simpleiconsmapfive\symbol{68}} - \expandafter\def\csname simpleicon@golandicon\endcsname {\simpleiconsmapfive\symbol{69}} - \expandafter\def\csname simpleicon@goldenlineicon\endcsname {\simpleiconsmapfive\symbol{70}} - \expandafter\def\csname simpleicon@goldmansachsicon\endcsname {\simpleiconsmapfive\symbol{71}} - \expandafter\def\csname simpleicon@goodreadsicon\endcsname {\simpleiconsmapfive\symbol{72}} - \expandafter\def\csname simpleicon@googleicon\endcsname {\simpleiconsmapfive\symbol{73}} - \expandafter\def\csname simpleicon@googleadmobicon\endcsname {\simpleiconsmapfive\symbol{74}} - \expandafter\def\csname simpleicon@googleadsicon\endcsname {\simpleiconsmapfive\symbol{75}} - \expandafter\def\csname simpleicon@googleadsenseicon\endcsname {\simpleiconsmapfive\symbol{76}} - \expandafter\def\csname simpleicon@googleanalyticsicon\endcsname {\simpleiconsmapfive\symbol{77}} - \expandafter\def\csname simpleicon@googleappsscripticon\endcsname {\simpleiconsmapfive\symbol{78}} - \expandafter\def\csname simpleicon@googleassistanticon\endcsname {\simpleiconsmapfive\symbol{79}} - \expandafter\def\csname simpleicon@googleauthenticatoricon\endcsname {\simpleiconsmapfive\symbol{80}} - \expandafter\def\csname simpleicon@googlebigqueryicon\endcsname {\simpleiconsmapfive\symbol{81}} - \expandafter\def\csname simpleicon@googlebigtableicon\endcsname {\simpleiconsmapfive\symbol{82}} - \expandafter\def\csname simpleicon@googlecalendaricon\endcsname {\simpleiconsmapfive\symbol{83}} - \expandafter\def\csname simpleicon@googlecampaignmanager360icon\endcsname {\simpleiconsmapfive\symbol{84}} - \expandafter\def\csname simpleicon@googlecardboardicon\endcsname {\simpleiconsmapfive\symbol{85}} - \expandafter\def\csname simpleicon@googlechaticon\endcsname {\simpleiconsmapfive\symbol{86}} - \expandafter\def\csname simpleicon@googlechromeicon\endcsname {\simpleiconsmapfive\symbol{87}} - \expandafter\def\csname simpleicon@googlechronicleicon\endcsname {\simpleiconsmapfive\symbol{88}} - \expandafter\def\csname simpleicon@googleclassroomicon\endcsname {\simpleiconsmapfive\symbol{89}} - \expandafter\def\csname simpleicon@googlecloudicon\endcsname {\simpleiconsmapfive\symbol{90}} - \expandafter\def\csname simpleicon@googlecloudcomposericon\endcsname {\simpleiconsmapfive\symbol{91}} - \expandafter\def\csname simpleicon@googlecloudspannericon\endcsname {\simpleiconsmapfive\symbol{92}} - \expandafter\def\csname simpleicon@googlecloudstorageicon\endcsname {\simpleiconsmapfive\symbol{93}} - \expandafter\def\csname simpleicon@googlecolabicon\endcsname {\simpleiconsmapfive\symbol{94}} - \expandafter\def\csname simpleicon@googlecontaineroptimizedosicon\endcsname {\simpleiconsmapfive\symbol{95}} - \expandafter\def\csname simpleicon@googledataflowicon\endcsname {\simpleiconsmapfive\symbol{96}} - \expandafter\def\csname simpleicon@googledataprocicon\endcsname {\simpleiconsmapfive\symbol{97}} - \expandafter\def\csname simpleicon@googledatastudioicon\endcsname {\simpleiconsmapfive\symbol{98}} - \expandafter\def\csname simpleicon@googledisplayandvideo360icon\endcsname {\simpleiconsmapfive\symbol{99}} - \expandafter\def\csname simpleicon@googledocsicon\endcsname {\simpleiconsmapfive\symbol{100}} - \expandafter\def\csname simpleicon@googledriveicon\endcsname {\simpleiconsmapfive\symbol{101}} - \expandafter\def\csname simpleicon@googleearthicon\endcsname {\simpleiconsmapfive\symbol{102}} - \expandafter\def\csname simpleicon@googleearthengineicon\endcsname {\simpleiconsmapfive\symbol{103}} - \expandafter\def\csname simpleicon@googlefiticon\endcsname {\simpleiconsmapfive\symbol{104}} - \expandafter\def\csname simpleicon@googlefontsicon\endcsname {\simpleiconsmapfive\symbol{105}} - \expandafter\def\csname simpleicon@googleformsicon\endcsname {\simpleiconsmapfive\symbol{106}} - \expandafter\def\csname simpleicon@googlegeminiicon\endcsname {\simpleiconsmapfive\symbol{107}} - \expandafter\def\csname simpleicon@googlehomeicon\endcsname {\simpleiconsmapfive\symbol{108}} - \expandafter\def\csname simpleicon@googlekeepicon\endcsname {\simpleiconsmapfive\symbol{109}} - \expandafter\def\csname simpleicon@googlelensicon\endcsname {\simpleiconsmapfive\symbol{110}} - \expandafter\def\csname simpleicon@googlemapsicon\endcsname {\simpleiconsmapfive\symbol{111}} - \expandafter\def\csname simpleicon@googlemarketingplatformicon\endcsname {\simpleiconsmapfive\symbol{112}} - \expandafter\def\csname simpleicon@googlemeeticon\endcsname {\simpleiconsmapfive\symbol{113}} - \expandafter\def\csname simpleicon@googlemessagesicon\endcsname {\simpleiconsmapfive\symbol{114}} - \expandafter\def\csname simpleicon@googlenearbyicon\endcsname {\simpleiconsmapfive\symbol{115}} - \expandafter\def\csname simpleicon@googlenewsicon\endcsname {\simpleiconsmapfive\symbol{116}} - \expandafter\def\csname simpleicon@googlepayicon\endcsname {\simpleiconsmapfive\symbol{117}} - \expandafter\def\csname simpleicon@googlephotosicon\endcsname {\simpleiconsmapfive\symbol{118}} - \expandafter\def\csname simpleicon@googleplayicon\endcsname {\simpleiconsmapfive\symbol{119}} - \expandafter\def\csname simpleicon@googlepubsubicon\endcsname {\simpleiconsmapfive\symbol{120}} - \expandafter\def\csname simpleicon@googlescholaricon\endcsname {\simpleiconsmapfive\symbol{121}} - \expandafter\def\csname simpleicon@googlesearchconsoleicon\endcsname {\simpleiconsmapfive\symbol{122}} - \expandafter\def\csname simpleicon@googlesheetsicon\endcsname {\simpleiconsmapfive\symbol{123}} - \expandafter\def\csname simpleicon@googleslidesicon\endcsname {\simpleiconsmapfive\symbol{124}} - \expandafter\def\csname simpleicon@googlestreetviewicon\endcsname {\simpleiconsmapfive\symbol{125}} - \expandafter\def\csname simpleicon@googletagmanagericon\endcsname {\simpleiconsmapfive\symbol{126}} - \expandafter\def\csname simpleicon@googletasksicon\endcsname {\simpleiconsmapfive\symbol{127}} - \expandafter\def\csname simpleicon@googletranslateicon\endcsname {\simpleiconsmapfive\symbol{128}} - \expandafter\def\csname simpleicon@gotomeetingicon\endcsname {\simpleiconsmapfive\symbol{129}} - \expandafter\def\csname simpleicon@grabicon\endcsname {\simpleiconsmapfive\symbol{130}} - \expandafter\def\csname simpleicon@gradleicon\endcsname {\simpleiconsmapfive\symbol{131}} - \expandafter\def\csname simpleicon@gradleplaypublishericon\endcsname {\simpleiconsmapfive\symbol{132}} - \expandafter\def\csname simpleicon@grafanaicon\endcsname {\simpleiconsmapfive\symbol{133}} - \expandafter\def\csname simpleicon@grammarlyicon\endcsname {\simpleiconsmapfive\symbol{134}} - \expandafter\def\csname simpleicon@grandfraisicon\endcsname {\simpleiconsmapfive\symbol{135}} - \expandafter\def\csname simpleicon@grapheneosicon\endcsname {\simpleiconsmapfive\symbol{136}} - \expandafter\def\csname simpleicon@graphiteicon\endcsname {\simpleiconsmapfive\symbol{137}} - \expandafter\def\csname simpleicon@graphqlicon\endcsname {\simpleiconsmapfive\symbol{138}} - \expandafter\def\csname simpleicon@gravicon\endcsname {\simpleiconsmapfive\symbol{139}} - \expandafter\def\csname simpleicon@gravataricon\endcsname {\simpleiconsmapfive\symbol{140}} - \expandafter\def\csname simpleicon@graylogicon\endcsname {\simpleiconsmapfive\symbol{141}} - \expandafter\def\csname simpleicon@greasyforkicon\endcsname {\simpleiconsmapfive\symbol{142}} - \expandafter\def\csname simpleicon@greatlearningicon\endcsname {\simpleiconsmapfive\symbol{143}} - \expandafter\def\csname simpleicon@greenhouseicon\endcsname {\simpleiconsmapfive\symbol{144}} - \expandafter\def\csname simpleicon@greensockicon\endcsname {\simpleiconsmapfive\symbol{145}} - \expandafter\def\csname simpleicon@griddotaiicon\endcsname {\simpleiconsmapfive\symbol{146}} - \expandafter\def\csname simpleicon@gridsomeicon\endcsname {\simpleiconsmapfive\symbol{147}} - \expandafter\def\csname simpleicon@groupmeicon\endcsname {\simpleiconsmapfive\symbol{148}} - \expandafter\def\csname simpleicon@grouponicon\endcsname {\simpleiconsmapfive\symbol{149}} - \expandafter\def\csname simpleicon@grubhubicon\endcsname {\simpleiconsmapfive\symbol{150}} - \expandafter\def\csname simpleicon@grunticon\endcsname {\simpleiconsmapfive\symbol{151}} - \expandafter\def\csname simpleicon@gskicon\endcsname {\simpleiconsmapfive\symbol{152}} - \expandafter\def\csname simpleicon@gsmarenadotcomicon\endcsname {\simpleiconsmapfive\symbol{153}} - \expandafter\def\csname simpleicon@gstreamericon\endcsname {\simpleiconsmapfive\symbol{154}} - \expandafter\def\csname simpleicon@gtkicon\endcsname {\simpleiconsmapfive\symbol{155}} - \expandafter\def\csname simpleicon@guangzhoumetroicon\endcsname {\simpleiconsmapfive\symbol{156}} - \expandafter\def\csname simpleicon@guildedicon\endcsname {\simpleiconsmapfive\symbol{157}} - \expandafter\def\csname simpleicon@gulpicon\endcsname {\simpleiconsmapfive\symbol{158}} - \expandafter\def\csname simpleicon@gumroadicon\endcsname {\simpleiconsmapfive\symbol{159}} - \expandafter\def\csname simpleicon@gumtreeicon\endcsname {\simpleiconsmapfive\symbol{160}} - \expandafter\def\csname simpleicon@gunicornicon\endcsname {\simpleiconsmapfive\symbol{161}} - \expandafter\def\csname simpleicon@gurobiicon\endcsname {\simpleiconsmapfive\symbol{162}} - \expandafter\def\csname simpleicon@gustoicon\endcsname {\simpleiconsmapfive\symbol{163}} - \expandafter\def\csname simpleicon@gutenbergicon\endcsname {\simpleiconsmapfive\symbol{164}} - \expandafter\def\csname simpleicon@h3icon\endcsname {\simpleiconsmapfive\symbol{165}} - \expandafter\def\csname simpleicon@habricon\endcsname {\simpleiconsmapfive\symbol{166}} - \expandafter\def\csname simpleicon@hackadayicon\endcsname {\simpleiconsmapfive\symbol{167}} - \expandafter\def\csname simpleicon@hackclubicon\endcsname {\simpleiconsmapfive\symbol{168}} - \expandafter\def\csname simpleicon@hackerearthicon\endcsname {\simpleiconsmapfive\symbol{169}} - \expandafter\def\csname simpleicon@hackernoonicon\endcsname {\simpleiconsmapfive\symbol{170}} - \expandafter\def\csname simpleicon@hackeroneicon\endcsname {\simpleiconsmapfive\symbol{171}} - \expandafter\def\csname simpleicon@hackerrankicon\endcsname {\simpleiconsmapfive\symbol{172}} - \expandafter\def\csname simpleicon@hackstericon\endcsname {\simpleiconsmapfive\symbol{173}} - \expandafter\def\csname simpleicon@hacktheboxicon\endcsname {\simpleiconsmapfive\symbol{174}} - \expandafter\def\csname simpleicon@halicon\endcsname {\simpleiconsmapfive\symbol{175}} - \expandafter\def\csname simpleicon@handlebarsdotjsicon\endcsname {\simpleiconsmapfive\symbol{176}} - \expandafter\def\csname simpleicon@handmicon\endcsname {\simpleiconsmapfive\symbol{177}} - \expandafter\def\csname simpleicon@handshakeicon\endcsname {\simpleiconsmapfive\symbol{178}} - \expandafter\def\csname simpleicon@handshakeprotocolicon\endcsname {\simpleiconsmapfive\symbol{179}} - \expandafter\def\csname simpleicon@happycowicon\endcsname {\simpleiconsmapfive\symbol{180}} - \expandafter\def\csname simpleicon@harboricon\endcsname {\simpleiconsmapfive\symbol{181}} - \expandafter\def\csname simpleicon@harmonyosicon\endcsname {\simpleiconsmapfive\symbol{182}} - \expandafter\def\csname simpleicon@hashicorpicon\endcsname {\simpleiconsmapfive\symbol{183}} - \expandafter\def\csname simpleicon@hashnodeicon\endcsname {\simpleiconsmapfive\symbol{184}} - \expandafter\def\csname simpleicon@haskellicon\endcsname {\simpleiconsmapfive\symbol{185}} - \expandafter\def\csname simpleicon@hasuraicon\endcsname {\simpleiconsmapfive\symbol{186}} - \expandafter\def\csname simpleicon@hatenabookmarkicon\endcsname {\simpleiconsmapfive\symbol{187}} - \expandafter\def\csname simpleicon@haveibeenpwnedicon\endcsname {\simpleiconsmapfive\symbol{188}} - \expandafter\def\csname simpleicon@haxeicon\endcsname {\simpleiconsmapfive\symbol{189}} - \expandafter\def\csname simpleicon@hboicon\endcsname {\simpleiconsmapfive\symbol{190}} - \expandafter\def\csname simpleicon@hclicon\endcsname {\simpleiconsmapfive\symbol{191}} - \expandafter\def\csname simpleicon@hdfcbankicon\endcsname {\simpleiconsmapfive\symbol{192}} - \expandafter\def\csname simpleicon@headlessuiicon\endcsname {\simpleiconsmapfive\symbol{193}} - \expandafter\def\csname simpleicon@headphonezoneicon\endcsname {\simpleiconsmapfive\symbol{194}} - \expandafter\def\csname simpleicon@headspaceicon\endcsname {\simpleiconsmapfive\symbol{195}} - \expandafter\def\csname simpleicon@hearthicon\endcsname {\simpleiconsmapfive\symbol{196}} - \expandafter\def\csname simpleicon@hearthisdotaticon\endcsname {\simpleiconsmapfive\symbol{197}} - \expandafter\def\csname simpleicon@hederaicon\endcsname {\simpleiconsmapfive\symbol{198}} - \expandafter\def\csname simpleicon@heliumicon\endcsname {\simpleiconsmapfive\symbol{199}} - \expandafter\def\csname simpleicon@hellofreshicon\endcsname {\simpleiconsmapfive\symbol{200}} - \expandafter\def\csname simpleicon@hellyhansenicon\endcsname {\simpleiconsmapfive\symbol{201}} - \expandafter\def\csname simpleicon@helmicon\endcsname {\simpleiconsmapfive\symbol{202}} - \expandafter\def\csname simpleicon@helpdeskicon\endcsname {\simpleiconsmapfive\symbol{203}} - \expandafter\def\csname simpleicon@helpscouticon\endcsname {\simpleiconsmapfive\symbol{204}} - \expandafter\def\csname simpleicon@hepsiemlakicon\endcsname {\simpleiconsmapfive\symbol{205}} - \expandafter\def\csname simpleicon@hereicon\endcsname {\simpleiconsmapfive\symbol{206}} - \expandafter\def\csname simpleicon@herokuicon\endcsname {\simpleiconsmapfive\symbol{207}} - \expandafter\def\csname simpleicon@hetznericon\endcsname {\simpleiconsmapfive\symbol{208}} - \expandafter\def\csname simpleicon@hevyicon\endcsname {\simpleiconsmapfive\symbol{209}} - \expandafter\def\csname simpleicon@hexleticon\endcsname {\simpleiconsmapfive\symbol{210}} - \expandafter\def\csname simpleicon@hexoicon\endcsname {\simpleiconsmapfive\symbol{211}} - \expandafter\def\csname simpleicon@heyicon\endcsname {\simpleiconsmapfive\symbol{212}} - \expandafter\def\csname simpleicon@hibernateicon\endcsname {\simpleiconsmapfive\symbol{213}} - \expandafter\def\csname simpleicon@hibobicon\endcsname {\simpleiconsmapfive\symbol{214}} - \expandafter\def\csname simpleicon@hiltonicon\endcsname {\simpleiconsmapfive\symbol{215}} - \expandafter\def\csname simpleicon@hiltonhotelsandresortsicon\endcsname {\simpleiconsmapfive\symbol{216}} - \expandafter\def\csname simpleicon@hitachiicon\endcsname {\simpleiconsmapfive\symbol{217}} - \expandafter\def\csname simpleicon@hiveicon\endcsname {\simpleiconsmapfive\symbol{218}} - \expandafter\def\csname simpleicon@hiveblockchainicon\endcsname {\simpleiconsmapfive\symbol{219}} - \expandafter\def\csname simpleicon@hivemqicon\endcsname {\simpleiconsmapfive\symbol{220}} - \expandafter\def\csname simpleicon@homarricon\endcsname {\simpleiconsmapfive\symbol{221}} - \expandafter\def\csname simpleicon@homeadvisoricon\endcsname {\simpleiconsmapfive\symbol{222}} - \expandafter\def\csname simpleicon@homeassistanticon\endcsname {\simpleiconsmapfive\symbol{223}} - \expandafter\def\csname simpleicon@homeassistantcommunitystoreicon\endcsname {\simpleiconsmapfive\symbol{224}} - \expandafter\def\csname simpleicon@homebrewicon\endcsname {\simpleiconsmapfive\symbol{225}} - \expandafter\def\csname simpleicon@homebridgeicon\endcsname {\simpleiconsmapfive\symbol{226}} - \expandafter\def\csname simpleicon@homepageicon\endcsname {\simpleiconsmapfive\symbol{227}} - \expandafter\def\csname simpleicon@homifyicon\endcsname {\simpleiconsmapfive\symbol{228}} - \expandafter\def\csname simpleicon@hondaicon\endcsname {\simpleiconsmapfive\symbol{229}} - \expandafter\def\csname simpleicon@honeyicon\endcsname {\simpleiconsmapfive\symbol{230}} - \expandafter\def\csname simpleicon@honoicon\endcsname {\simpleiconsmapfive\symbol{231}} - \expandafter\def\csname simpleicon@honoricon\endcsname {\simpleiconsmapfive\symbol{232}} - \expandafter\def\csname simpleicon@hootsuiteicon\endcsname {\simpleiconsmapfive\symbol{233}} - \expandafter\def\csname simpleicon@hoppscotchicon\endcsname {\simpleiconsmapfive\symbol{234}} - \expandafter\def\csname simpleicon@hostingericon\endcsname {\simpleiconsmapfive\symbol{235}} - \expandafter\def\csname simpleicon@hotelsdotcomicon\endcsname {\simpleiconsmapfive\symbol{236}} - \expandafter\def\csname simpleicon@hotjaricon\endcsname {\simpleiconsmapfive\symbol{237}} - \expandafter\def\csname simpleicon@hotwireicon\endcsname {\simpleiconsmapfive\symbol{238}} - \expandafter\def\csname simpleicon@houdiniicon\endcsname {\simpleiconsmapfive\symbol{239}} - \expandafter\def\csname simpleicon@houzzicon\endcsname {\simpleiconsmapfive\symbol{240}} - \expandafter\def\csname simpleicon@hpicon\endcsname {\simpleiconsmapfive\symbol{241}} - \expandafter\def\csname simpleicon@hsbcicon\endcsname {\simpleiconsmapfive\symbol{242}} - \expandafter\def\csname simpleicon@html5icon\endcsname {\simpleiconsmapfive\symbol{243}} - \expandafter\def\csname simpleicon@htmlacademyicon\endcsname {\simpleiconsmapfive\symbol{244}} - \expandafter\def\csname simpleicon@htmxicon\endcsname {\simpleiconsmapfive\symbol{245}} - \expandafter\def\csname simpleicon@htopicon\endcsname {\simpleiconsmapfive\symbol{246}} - \expandafter\def\csname simpleicon@httpieicon\endcsname {\simpleiconsmapfive\symbol{247}} - \expandafter\def\csname simpleicon@huaweiicon\endcsname {\simpleiconsmapfive\symbol{248}} - \expandafter\def\csname simpleicon@hubspoticon\endcsname {\simpleiconsmapfive\symbol{249}} - \expandafter\def\csname simpleicon@huggingfaceicon\endcsname {\simpleiconsmapfive\symbol{250}} - \expandafter\def\csname simpleicon@hugoicon\endcsname {\simpleiconsmapfive\symbol{251}} - \expandafter\def\csname simpleicon@humblebundleicon\endcsname {\simpleiconsmapfive\symbol{252}} - \expandafter\def\csname simpleicon@hungryjacksicon\endcsname {\simpleiconsmapfive\symbol{253}} - \expandafter\def\csname simpleicon@husqvarnaicon\endcsname {\simpleiconsmapfive\symbol{254}} - \expandafter\def\csname simpleicon@hypericon\endcsname {\simpleiconsmapfive\symbol{255}} - \expandafter\def\csname simpleicon@hyperskillicon\endcsname {\simpleiconsmapsix\symbol{0}} - \expandafter\def\csname simpleicon@hypothesisicon\endcsname {\simpleiconsmapsix\symbol{1}} - \expandafter\def\csname simpleicon@hyprlandicon\endcsname {\simpleiconsmapsix\symbol{2}} - \expandafter\def\csname simpleicon@hyundaiicon\endcsname {\simpleiconsmapsix\symbol{3}} - \expandafter\def\csname simpleicon@i18nexticon\endcsname {\simpleiconsmapsix\symbol{4}} - \expandafter\def\csname simpleicon@i3icon\endcsname {\simpleiconsmapsix\symbol{5}} - \expandafter\def\csname simpleicon@iataicon\endcsname {\simpleiconsmapsix\symbol{6}} - \expandafter\def\csname simpleicon@ibeaconicon\endcsname {\simpleiconsmapsix\symbol{7}} - \expandafter\def\csname simpleicon@iberiaicon\endcsname {\simpleiconsmapsix\symbol{8}} - \expandafter\def\csname simpleicon@icedicon\endcsname {\simpleiconsmapsix\symbol{9}} - \expandafter\def\csname simpleicon@icelandicon\endcsname {\simpleiconsmapsix\symbol{10}} - \expandafter\def\csname simpleicon@icicibankicon\endcsname {\simpleiconsmapsix\symbol{11}} - \expandafter\def\csname simpleicon@icingaicon\endcsname {\simpleiconsmapsix\symbol{12}} - \expandafter\def\csname simpleicon@icloudicon\endcsname {\simpleiconsmapsix\symbol{13}} - \expandafter\def\csname simpleicon@icomoonicon\endcsname {\simpleiconsmapsix\symbol{14}} - \expandafter\def\csname simpleicon@iconicon\endcsname {\simpleiconsmapsix\symbol{15}} - \expandafter\def\csname simpleicon@iconfindericon\endcsname {\simpleiconsmapsix\symbol{16}} - \expandafter\def\csname simpleicon@iconifyicon\endcsname {\simpleiconsmapsix\symbol{17}} - \expandafter\def\csname simpleicon@iconjaricon\endcsname {\simpleiconsmapsix\symbol{18}} - \expandafter\def\csname simpleicon@icons8icon\endcsname {\simpleiconsmapsix\symbol{19}} - \expandafter\def\csname simpleicon@icqicon\endcsname {\simpleiconsmapsix\symbol{20}} - \expandafter\def\csname simpleicon@ieeeicon\endcsname {\simpleiconsmapsix\symbol{21}} - \expandafter\def\csname simpleicon@ifixiticon\endcsname {\simpleiconsmapsix\symbol{22}} - \expandafter\def\csname simpleicon@ifoodicon\endcsname {\simpleiconsmapsix\symbol{23}} - \expandafter\def\csname simpleicon@ifttticon\endcsname {\simpleiconsmapsix\symbol{24}} - \expandafter\def\csname simpleicon@igdbicon\endcsname {\simpleiconsmapsix\symbol{25}} - \expandafter\def\csname simpleicon@ignicon\endcsname {\simpleiconsmapsix\symbol{26}} - \expandafter\def\csname simpleicon@iheartradioicon\endcsname {\simpleiconsmapsix\symbol{27}} - \expandafter\def\csname simpleicon@ikeaicon\endcsname {\simpleiconsmapsix\symbol{28}} - \expandafter\def\csname simpleicon@iledefrancemobilitesicon\endcsname {\simpleiconsmapsix\symbol{29}} - \expandafter\def\csname simpleicon@imagedotscicon\endcsname {\simpleiconsmapsix\symbol{30}} - \expandafter\def\csname simpleicon@imagejicon\endcsname {\simpleiconsmapsix\symbol{31}} - \expandafter\def\csname simpleicon@imdbicon\endcsname {\simpleiconsmapsix\symbol{32}} - \expandafter\def\csname simpleicon@imessageicon\endcsname {\simpleiconsmapsix\symbol{33}} - \expandafter\def\csname simpleicon@imguricon\endcsname {\simpleiconsmapsix\symbol{34}} - \expandafter\def\csname simpleicon@immericon\endcsname {\simpleiconsmapsix\symbol{35}} - \expandafter\def\csname simpleicon@immichicon\endcsname {\simpleiconsmapsix\symbol{36}} - \expandafter\def\csname simpleicon@imouicon\endcsname {\simpleiconsmapsix\symbol{37}} - \expandafter\def\csname simpleicon@improvmxicon\endcsname {\simpleiconsmapsix\symbol{38}} - \expandafter\def\csname simpleicon@indeedicon\endcsname {\simpleiconsmapsix\symbol{39}} - \expandafter\def\csname simpleicon@indiansuperleagueicon\endcsname {\simpleiconsmapsix\symbol{40}} - \expandafter\def\csname simpleicon@indiehackersicon\endcsname {\simpleiconsmapsix\symbol{41}} - \expandafter\def\csname simpleicon@indigoicon\endcsname {\simpleiconsmapsix\symbol{42}} - \expandafter\def\csname simpleicon@inertiaicon\endcsname {\simpleiconsmapsix\symbol{43}} - \expandafter\def\csname simpleicon@infinitiicon\endcsname {\simpleiconsmapsix\symbol{44}} - \expandafter\def\csname simpleicon@influxdbicon\endcsname {\simpleiconsmapsix\symbol{45}} - \expandafter\def\csname simpleicon@infomaniakicon\endcsname {\simpleiconsmapsix\symbol{46}} - \expandafter\def\csname simpleicon@infoqicon\endcsname {\simpleiconsmapsix\symbol{47}} - \expandafter\def\csname simpleicon@informaticaicon\endcsname {\simpleiconsmapsix\symbol{48}} - \expandafter\def\csname simpleicon@infosysicon\endcsname {\simpleiconsmapsix\symbol{49}} - \expandafter\def\csname simpleicon@infracosticon\endcsname {\simpleiconsmapsix\symbol{50}} - \expandafter\def\csname simpleicon@ingressicon\endcsname {\simpleiconsmapsix\symbol{51}} - \expandafter\def\csname simpleicon@inkdropicon\endcsname {\simpleiconsmapsix\symbol{52}} - \expandafter\def\csname simpleicon@inkscapeicon\endcsname {\simpleiconsmapsix\symbol{53}} - \expandafter\def\csname simpleicon@inoreadericon\endcsname {\simpleiconsmapsix\symbol{54}} - \expandafter\def\csname simpleicon@insomniaicon\endcsname {\simpleiconsmapsix\symbol{55}} - \expandafter\def\csname simpleicon@inspireicon\endcsname {\simpleiconsmapsix\symbol{56}} - \expandafter\def\csname simpleicon@insta360icon\endcsname {\simpleiconsmapsix\symbol{57}} - \expandafter\def\csname simpleicon@instacarticon\endcsname {\simpleiconsmapsix\symbol{58}} - \expandafter\def\csname simpleicon@instagramicon\endcsname {\simpleiconsmapsix\symbol{59}} - \expandafter\def\csname simpleicon@instapapericon\endcsname {\simpleiconsmapsix\symbol{60}} - \expandafter\def\csname simpleicon@instatusicon\endcsname {\simpleiconsmapsix\symbol{61}} - \expandafter\def\csname simpleicon@instructablesicon\endcsname {\simpleiconsmapsix\symbol{62}} - \expandafter\def\csname simpleicon@instructureicon\endcsname {\simpleiconsmapsix\symbol{63}} - \expandafter\def\csname simpleicon@intelicon\endcsname {\simpleiconsmapsix\symbol{64}} - \expandafter\def\csname simpleicon@intellijideaicon\endcsname {\simpleiconsmapsix\symbol{65}} - \expandafter\def\csname simpleicon@interactiondesignfoundationicon\endcsname {\simpleiconsmapsix\symbol{66}} - \expandafter\def\csname simpleicon@interactjsicon\endcsname {\simpleiconsmapsix\symbol{67}} - \expandafter\def\csname simpleicon@interbaseicon\endcsname {\simpleiconsmapsix\symbol{68}} - \expandafter\def\csname simpleicon@intercomicon\endcsname {\simpleiconsmapsix\symbol{69}} - \expandafter\def\csname simpleicon@intermarcheicon\endcsname {\simpleiconsmapsix\symbol{70}} - \expandafter\def\csname simpleicon@internetarchiveicon\endcsname {\simpleiconsmapsix\symbol{71}} - \expandafter\def\csname simpleicon@internetcomputericon\endcsname {\simpleiconsmapsix\symbol{72}} - \expandafter\def\csname simpleicon@intigritiicon\endcsname {\simpleiconsmapsix\symbol{73}} - \expandafter\def\csname simpleicon@intuiticon\endcsname {\simpleiconsmapsix\symbol{74}} - \expandafter\def\csname simpleicon@invisionicon\endcsname {\simpleiconsmapsix\symbol{75}} - \expandafter\def\csname simpleicon@invoiceninjaicon\endcsname {\simpleiconsmapsix\symbol{76}} - \expandafter\def\csname simpleicon@iobrokericon\endcsname {\simpleiconsmapsix\symbol{77}} - \expandafter\def\csname simpleicon@ionicicon\endcsname {\simpleiconsmapsix\symbol{78}} - \expandafter\def\csname simpleicon@ionosicon\endcsname {\simpleiconsmapsix\symbol{79}} - \expandafter\def\csname simpleicon@iosicon\endcsname {\simpleiconsmapsix\symbol{80}} - \expandafter\def\csname simpleicon@iotaicon\endcsname {\simpleiconsmapsix\symbol{81}} - \expandafter\def\csname simpleicon@ipfsicon\endcsname {\simpleiconsmapsix\symbol{82}} - \expandafter\def\csname simpleicon@irisicon\endcsname {\simpleiconsmapsix\symbol{83}} - \expandafter\def\csname simpleicon@iroboticon\endcsname {\simpleiconsmapsix\symbol{84}} - \expandafter\def\csname simpleicon@isc2icon\endcsname {\simpleiconsmapsix\symbol{85}} - \expandafter\def\csname simpleicon@issuuicon\endcsname {\simpleiconsmapsix\symbol{86}} - \expandafter\def\csname simpleicon@istioicon\endcsname {\simpleiconsmapsix\symbol{87}} - \expandafter\def\csname simpleicon@itchdotioicon\endcsname {\simpleiconsmapsix\symbol{88}} - \expandafter\def\csname simpleicon@iterm2icon\endcsname {\simpleiconsmapsix\symbol{89}} - \expandafter\def\csname simpleicon@itunesicon\endcsname {\simpleiconsmapsix\symbol{90}} - \expandafter\def\csname simpleicon@itvxicon\endcsname {\simpleiconsmapsix\symbol{91}} - \expandafter\def\csname simpleicon@ivecoicon\endcsname {\simpleiconsmapsix\symbol{92}} - \expandafter\def\csname simpleicon@jabbericon\endcsname {\simpleiconsmapsix\symbol{93}} - \expandafter\def\csname simpleicon@jaegericon\endcsname {\simpleiconsmapsix\symbol{94}} - \expandafter\def\csname simpleicon@jaguaricon\endcsname {\simpleiconsmapsix\symbol{95}} - \expandafter\def\csname simpleicon@jamboardicon\endcsname {\simpleiconsmapsix\symbol{96}} - \expandafter\def\csname simpleicon@jamesonicon\endcsname {\simpleiconsmapsix\symbol{97}} - \expandafter\def\csname simpleicon@jamstackicon\endcsname {\simpleiconsmapsix\symbol{98}} - \expandafter\def\csname simpleicon@jasmineicon\endcsname {\simpleiconsmapsix\symbol{99}} - \expandafter\def\csname simpleicon@javascripticon\endcsname {\simpleiconsmapsix\symbol{100}} - \expandafter\def\csname simpleicon@jblicon\endcsname {\simpleiconsmapsix\symbol{101}} - \expandafter\def\csname simpleicon@jcbicon\endcsname {\simpleiconsmapsix\symbol{102}} - \expandafter\def\csname simpleicon@jeepicon\endcsname {\simpleiconsmapsix\symbol{103}} - \expandafter\def\csname simpleicon@jekyllicon\endcsname {\simpleiconsmapsix\symbol{104}} - \expandafter\def\csname simpleicon@jellyfinicon\endcsname {\simpleiconsmapsix\symbol{105}} - \expandafter\def\csname simpleicon@jenkinsicon\endcsname {\simpleiconsmapsix\symbol{106}} - \expandafter\def\csname simpleicon@jesticon\endcsname {\simpleiconsmapsix\symbol{107}} - \expandafter\def\csname simpleicon@jeticon\endcsname {\simpleiconsmapsix\symbol{108}} - \expandafter\def\csname simpleicon@jetblueicon\endcsname {\simpleiconsmapsix\symbol{109}} - \expandafter\def\csname simpleicon@jetbrainsicon\endcsname {\simpleiconsmapsix\symbol{110}} - \expandafter\def\csname simpleicon@jetpackcomposeicon\endcsname {\simpleiconsmapsix\symbol{111}} - \expandafter\def\csname simpleicon@jfrogicon\endcsname {\simpleiconsmapsix\symbol{112}} - \expandafter\def\csname simpleicon@jfrogpipelinesicon\endcsname {\simpleiconsmapsix\symbol{113}} - \expandafter\def\csname simpleicon@jhipstericon\endcsname {\simpleiconsmapsix\symbol{114}} - \expandafter\def\csname simpleicon@jinjaicon\endcsname {\simpleiconsmapsix\symbol{115}} - \expandafter\def\csname simpleicon@jiraicon\endcsname {\simpleiconsmapsix\symbol{116}} - \expandafter\def\csname simpleicon@jirasoftwareicon\endcsname {\simpleiconsmapsix\symbol{117}} - \expandafter\def\csname simpleicon@jitpackicon\endcsname {\simpleiconsmapsix\symbol{118}} - \expandafter\def\csname simpleicon@jitsiicon\endcsname {\simpleiconsmapsix\symbol{119}} - \expandafter\def\csname simpleicon@johndeereicon\endcsname {\simpleiconsmapsix\symbol{120}} - \expandafter\def\csname simpleicon@joomlaicon\endcsname {\simpleiconsmapsix\symbol{121}} - \expandafter\def\csname simpleicon@joplinicon\endcsname {\simpleiconsmapsix\symbol{122}} - \expandafter\def\csname simpleicon@jordanicon\endcsname {\simpleiconsmapsix\symbol{123}} - \expandafter\def\csname simpleicon@jouavicon\endcsname {\simpleiconsmapsix\symbol{124}} - \expandafter\def\csname simpleicon@jovianicon\endcsname {\simpleiconsmapsix\symbol{125}} - \expandafter\def\csname simpleicon@jpegicon\endcsname {\simpleiconsmapsix\symbol{126}} - \expandafter\def\csname simpleicon@jqueryicon\endcsname {\simpleiconsmapsix\symbol{127}} - \expandafter\def\csname simpleicon@jrgroupicon\endcsname {\simpleiconsmapsix\symbol{128}} - \expandafter\def\csname simpleicon@jsdelivricon\endcsname {\simpleiconsmapsix\symbol{129}} - \expandafter\def\csname simpleicon@jsfiddleicon\endcsname {\simpleiconsmapsix\symbol{130}} - \expandafter\def\csname simpleicon@jsonicon\endcsname {\simpleiconsmapsix\symbol{131}} - \expandafter\def\csname simpleicon@jsonwebtokensicon\endcsname {\simpleiconsmapsix\symbol{132}} - \expandafter\def\csname simpleicon@jsricon\endcsname {\simpleiconsmapsix\symbol{133}} - \expandafter\def\csname simpleicon@jssicon\endcsname {\simpleiconsmapsix\symbol{134}} - \expandafter\def\csname simpleicon@juceicon\endcsname {\simpleiconsmapsix\symbol{135}} - \expandafter\def\csname simpleicon@juejinicon\endcsname {\simpleiconsmapsix\symbol{136}} - \expandafter\def\csname simpleicon@jukeicon\endcsname {\simpleiconsmapsix\symbol{137}} - \expandafter\def\csname simpleicon@juliaicon\endcsname {\simpleiconsmapsix\symbol{138}} - \expandafter\def\csname simpleicon@junipernetworksicon\endcsname {\simpleiconsmapsix\symbol{139}} - \expandafter\def\csname simpleicon@junit5icon\endcsname {\simpleiconsmapsix\symbol{140}} - \expandafter\def\csname simpleicon@jupytericon\endcsname {\simpleiconsmapsix\symbol{141}} - \expandafter\def\csname simpleicon@justeaticon\endcsname {\simpleiconsmapsix\symbol{142}} - \expandafter\def\csname simpleicon@justgivingicon\endcsname {\simpleiconsmapsix\symbol{143}} - \expandafter\def\csname simpleicon@k3sicon\endcsname {\simpleiconsmapsix\symbol{144}} - \expandafter\def\csname simpleicon@k6icon\endcsname {\simpleiconsmapsix\symbol{145}} - \expandafter\def\csname simpleicon@kaggleicon\endcsname {\simpleiconsmapsix\symbol{146}} - \expandafter\def\csname simpleicon@kagiicon\endcsname {\simpleiconsmapsix\symbol{147}} - \expandafter\def\csname simpleicon@kahooticon\endcsname {\simpleiconsmapsix\symbol{148}} - \expandafter\def\csname simpleicon@kaiosicon\endcsname {\simpleiconsmapsix\symbol{149}} - \expandafter\def\csname simpleicon@kakaoicon\endcsname {\simpleiconsmapsix\symbol{150}} - \expandafter\def\csname simpleicon@kakaotalkicon\endcsname {\simpleiconsmapsix\symbol{151}} - \expandafter\def\csname simpleicon@kalilinuxicon\endcsname {\simpleiconsmapsix\symbol{152}} - \expandafter\def\csname simpleicon@kamailioicon\endcsname {\simpleiconsmapsix\symbol{153}} - \expandafter\def\csname simpleicon@kanikoicon\endcsname {\simpleiconsmapsix\symbol{154}} - \expandafter\def\csname simpleicon@karlsruherverkehrsverbundicon\endcsname {\simpleiconsmapsix\symbol{155}} - \expandafter\def\csname simpleicon@kasasmarticon\endcsname {\simpleiconsmapsix\symbol{156}} - \expandafter\def\csname simpleicon@kashflowicon\endcsname {\simpleiconsmapsix\symbol{157}} - \expandafter\def\csname simpleicon@kasperskyicon\endcsname {\simpleiconsmapsix\symbol{158}} - \expandafter\def\csname simpleicon@katacodaicon\endcsname {\simpleiconsmapsix\symbol{159}} - \expandafter\def\csname simpleicon@katanaicon\endcsname {\simpleiconsmapsix\symbol{160}} - \expandafter\def\csname simpleicon@kauflandicon\endcsname {\simpleiconsmapsix\symbol{161}} - \expandafter\def\csname simpleicon@kdeicon\endcsname {\simpleiconsmapsix\symbol{162}} - \expandafter\def\csname simpleicon@kdenliveicon\endcsname {\simpleiconsmapsix\symbol{163}} - \expandafter\def\csname simpleicon@kedroicon\endcsname {\simpleiconsmapsix\symbol{164}} - \expandafter\def\csname simpleicon@keeneticicon\endcsname {\simpleiconsmapsix\symbol{165}} - \expandafter\def\csname simpleicon@keepachangelogicon\endcsname {\simpleiconsmapsix\symbol{166}} - \expandafter\def\csname simpleicon@keepassxcicon\endcsname {\simpleiconsmapsix\symbol{167}} - \expandafter\def\csname simpleicon@kenticoicon\endcsname {\simpleiconsmapsix\symbol{168}} - \expandafter\def\csname simpleicon@kerasicon\endcsname {\simpleiconsmapsix\symbol{169}} - \expandafter\def\csname simpleicon@keybaseicon\endcsname {\simpleiconsmapsix\symbol{170}} - \expandafter\def\csname simpleicon@keycdnicon\endcsname {\simpleiconsmapsix\symbol{171}} - \expandafter\def\csname simpleicon@keycloakicon\endcsname {\simpleiconsmapsix\symbol{172}} - \expandafter\def\csname simpleicon@keystoneicon\endcsname {\simpleiconsmapsix\symbol{173}} - \expandafter\def\csname simpleicon@kfcicon\endcsname {\simpleiconsmapsix\symbol{174}} - \expandafter\def\csname simpleicon@khanacademyicon\endcsname {\simpleiconsmapsix\symbol{175}} - \expandafter\def\csname simpleicon@khronosgroupicon\endcsname {\simpleiconsmapsix\symbol{176}} - \expandafter\def\csname simpleicon@kiaicon\endcsname {\simpleiconsmapsix\symbol{177}} - \expandafter\def\csname simpleicon@kibanaicon\endcsname {\simpleiconsmapsix\symbol{178}} - \expandafter\def\csname simpleicon@kicadicon\endcsname {\simpleiconsmapsix\symbol{179}} - \expandafter\def\csname simpleicon@kickicon\endcsname {\simpleiconsmapsix\symbol{180}} - \expandafter\def\csname simpleicon@kickstartericon\endcsname {\simpleiconsmapsix\symbol{181}} - \expandafter\def\csname simpleicon@kikicon\endcsname {\simpleiconsmapsix\symbol{182}} - \expandafter\def\csname simpleicon@kingstontechnologyicon\endcsname {\simpleiconsmapsix\symbol{183}} - \expandafter\def\csname simpleicon@kinopoiskicon\endcsname {\simpleiconsmapsix\symbol{184}} - \expandafter\def\csname simpleicon@kinstaicon\endcsname {\simpleiconsmapsix\symbol{185}} - \expandafter\def\csname simpleicon@kirbyicon\endcsname {\simpleiconsmapsix\symbol{186}} - \expandafter\def\csname simpleicon@kiticon\endcsname {\simpleiconsmapsix\symbol{187}} - \expandafter\def\csname simpleicon@kitsuicon\endcsname {\simpleiconsmapsix\symbol{188}} - \expandafter\def\csname simpleicon@klarnaicon\endcsname {\simpleiconsmapsix\symbol{189}} - \expandafter\def\csname simpleicon@klmicon\endcsname {\simpleiconsmapsix\symbol{190}} - \expandafter\def\csname simpleicon@klookicon\endcsname {\simpleiconsmapsix\symbol{191}} - \expandafter\def\csname simpleicon@knativeicon\endcsname {\simpleiconsmapsix\symbol{192}} - \expandafter\def\csname simpleicon@knexdotjsicon\endcsname {\simpleiconsmapsix\symbol{193}} - \expandafter\def\csname simpleicon@knimeicon\endcsname {\simpleiconsmapsix\symbol{194}} - \expandafter\def\csname simpleicon@knipicon\endcsname {\simpleiconsmapsix\symbol{195}} - \expandafter\def\csname simpleicon@knowledgebaseicon\endcsname {\simpleiconsmapsix\symbol{196}} - \expandafter\def\csname simpleicon@knownicon\endcsname {\simpleiconsmapsix\symbol{197}} - \expandafter\def\csname simpleicon@koaicon\endcsname {\simpleiconsmapsix\symbol{198}} - \expandafter\def\csname simpleicon@kocicon\endcsname {\simpleiconsmapsix\symbol{199}} - \expandafter\def\csname simpleicon@kodakicon\endcsname {\simpleiconsmapsix\symbol{200}} - \expandafter\def\csname simpleicon@kodiicon\endcsname {\simpleiconsmapsix\symbol{201}} - \expandafter\def\csname simpleicon@koenigseggicon\endcsname {\simpleiconsmapsix\symbol{202}} - \expandafter\def\csname simpleicon@kofaxicon\endcsname {\simpleiconsmapsix\symbol{203}} - \expandafter\def\csname simpleicon@kofiicon\endcsname {\simpleiconsmapsix\symbol{204}} - \expandafter\def\csname simpleicon@komooticon\endcsname {\simpleiconsmapsix\symbol{205}} - \expandafter\def\csname simpleicon@konamiicon\endcsname {\simpleiconsmapsix\symbol{206}} - \expandafter\def\csname simpleicon@kongicon\endcsname {\simpleiconsmapsix\symbol{207}} - \expandafter\def\csname simpleicon@kongregateicon\endcsname {\simpleiconsmapsix\symbol{208}} - \expandafter\def\csname simpleicon@konvaicon\endcsname {\simpleiconsmapsix\symbol{209}} - \expandafter\def\csname simpleicon@kotlinicon\endcsname {\simpleiconsmapsix\symbol{210}} - \expandafter\def\csname simpleicon@koyebicon\endcsname {\simpleiconsmapsix\symbol{211}} - \expandafter\def\csname simpleicon@kritaicon\endcsname {\simpleiconsmapsix\symbol{212}} - \expandafter\def\csname simpleicon@ktmicon\endcsname {\simpleiconsmapsix\symbol{213}} - \expandafter\def\csname simpleicon@ktoricon\endcsname {\simpleiconsmapsix\symbol{214}} - \expandafter\def\csname simpleicon@kuaishouicon\endcsname {\simpleiconsmapsix\symbol{215}} - \expandafter\def\csname simpleicon@kubernetesicon\endcsname {\simpleiconsmapsix\symbol{216}} - \expandafter\def\csname simpleicon@kubuntuicon\endcsname {\simpleiconsmapsix\symbol{217}} - \expandafter\def\csname simpleicon@kucoinicon\endcsname {\simpleiconsmapsix\symbol{218}} - \expandafter\def\csname simpleicon@kumaicon\endcsname {\simpleiconsmapsix\symbol{219}} - \expandafter\def\csname simpleicon@kununuicon\endcsname {\simpleiconsmapsix\symbol{220}} - \expandafter\def\csname simpleicon@kuulaicon\endcsname {\simpleiconsmapsix\symbol{221}} - \expandafter\def\csname simpleicon@kxicon\endcsname {\simpleiconsmapsix\symbol{222}} - \expandafter\def\csname simpleicon@kyoceraicon\endcsname {\simpleiconsmapsix\symbol{223}} - \expandafter\def\csname simpleicon@labviewicon\endcsname {\simpleiconsmapsix\symbol{224}} - \expandafter\def\csname simpleicon@ladaicon\endcsname {\simpleiconsmapsix\symbol{225}} - \expandafter\def\csname simpleicon@lamborghiniicon\endcsname {\simpleiconsmapsix\symbol{226}} - \expandafter\def\csname simpleicon@landrovericon\endcsname {\simpleiconsmapsix\symbol{227}} - \expandafter\def\csname simpleicon@langchainicon\endcsname {\simpleiconsmapsix\symbol{228}} - \expandafter\def\csname simpleicon@lapceicon\endcsname {\simpleiconsmapsix\symbol{229}} - \expandafter\def\csname simpleicon@laragonicon\endcsname {\simpleiconsmapsix\symbol{230}} - \expandafter\def\csname simpleicon@laravelicon\endcsname {\simpleiconsmapsix\symbol{231}} - \expandafter\def\csname simpleicon@laravelhorizonicon\endcsname {\simpleiconsmapsix\symbol{232}} - \expandafter\def\csname simpleicon@laravelnovaicon\endcsname {\simpleiconsmapsix\symbol{233}} - \expandafter\def\csname simpleicon@lastdotfmicon\endcsname {\simpleiconsmapsix\symbol{234}} - \expandafter\def\csname simpleicon@lastpassicon\endcsname {\simpleiconsmapsix\symbol{235}} - \expandafter\def\csname simpleicon@latexicon\endcsname {\simpleiconsmapsix\symbol{236}} - \expandafter\def\csname simpleicon@launchpadicon\endcsname {\simpleiconsmapsix\symbol{237}} - \expandafter\def\csname simpleicon@lazarusicon\endcsname {\simpleiconsmapsix\symbol{238}} - \expandafter\def\csname simpleicon@lazyvimicon\endcsname {\simpleiconsmapsix\symbol{239}} - \expandafter\def\csname simpleicon@lbryicon\endcsname {\simpleiconsmapsix\symbol{240}} - \expandafter\def\csname simpleicon@leaderpriceicon\endcsname {\simpleiconsmapsix\symbol{241}} - \expandafter\def\csname simpleicon@leafleticon\endcsname {\simpleiconsmapsix\symbol{242}} - \expandafter\def\csname simpleicon@leagueoflegendsicon\endcsname {\simpleiconsmapsix\symbol{243}} - \expandafter\def\csname simpleicon@leanpubicon\endcsname {\simpleiconsmapsix\symbol{244}} - \expandafter\def\csname simpleicon@leetcodeicon\endcsname {\simpleiconsmapsix\symbol{245}} - \expandafter\def\csname simpleicon@legacygamesicon\endcsname {\simpleiconsmapsix\symbol{246}} - \expandafter\def\csname simpleicon@leicaicon\endcsname {\simpleiconsmapsix\symbol{247}} - \expandafter\def\csname simpleicon@lemmyicon\endcsname {\simpleiconsmapsix\symbol{248}} - \expandafter\def\csname simpleicon@lemonsqueezyicon\endcsname {\simpleiconsmapsix\symbol{249}} - \expandafter\def\csname simpleicon@lenovoicon\endcsname {\simpleiconsmapsix\symbol{250}} - \expandafter\def\csname simpleicon@lensicon\endcsname {\simpleiconsmapsix\symbol{251}} - \expandafter\def\csname simpleicon@leptosicon\endcsname {\simpleiconsmapsix\symbol{252}} - \expandafter\def\csname simpleicon@lequipeicon\endcsname {\simpleiconsmapsix\symbol{253}} - \expandafter\def\csname simpleicon@lernaicon\endcsname {\simpleiconsmapsix\symbol{254}} - \expandafter\def\csname simpleicon@leroymerlinicon\endcsname {\simpleiconsmapsix\symbol{255}} - \expandafter\def\csname simpleicon@leslibrairesicon\endcsname {\simpleiconsmapseven\symbol{0}} - \expandafter\def\csname simpleicon@lessicon\endcsname {\simpleiconsmapseven\symbol{1}} - \expandafter\def\csname simpleicon@letsencrypticon\endcsname {\simpleiconsmapseven\symbol{2}} - \expandafter\def\csname simpleicon@letterboxdicon\endcsname {\simpleiconsmapseven\symbol{3}} - \expandafter\def\csname simpleicon@levelsdotfyiicon\endcsname {\simpleiconsmapseven\symbol{4}} - \expandafter\def\csname simpleicon@lgicon\endcsname {\simpleiconsmapseven\symbol{5}} - \expandafter\def\csname simpleicon@liberadotchaticon\endcsname {\simpleiconsmapseven\symbol{6}} - \expandafter\def\csname simpleicon@liberapayicon\endcsname {\simpleiconsmapseven\symbol{7}} - \expandafter\def\csname simpleicon@librariesdotioicon\endcsname {\simpleiconsmapseven\symbol{8}} - \expandafter\def\csname simpleicon@librarythingicon\endcsname {\simpleiconsmapseven\symbol{9}} - \expandafter\def\csname simpleicon@libreofficeicon\endcsname {\simpleiconsmapseven\symbol{10}} - \expandafter\def\csname simpleicon@libreofficebaseicon\endcsname {\simpleiconsmapseven\symbol{11}} - \expandafter\def\csname simpleicon@libreofficecalcicon\endcsname {\simpleiconsmapseven\symbol{12}} - \expandafter\def\csname simpleicon@libreofficedrawicon\endcsname {\simpleiconsmapseven\symbol{13}} - \expandafter\def\csname simpleicon@libreofficeimpressicon\endcsname {\simpleiconsmapseven\symbol{14}} - \expandafter\def\csname simpleicon@libreofficemathicon\endcsname {\simpleiconsmapseven\symbol{15}} - \expandafter\def\csname simpleicon@libreofficewritericon\endcsname {\simpleiconsmapseven\symbol{16}} - \expandafter\def\csname simpleicon@librewolficon\endcsname {\simpleiconsmapseven\symbol{17}} - \expandafter\def\csname simpleicon@libuvicon\endcsname {\simpleiconsmapseven\symbol{18}} - \expandafter\def\csname simpleicon@lichessicon\endcsname {\simpleiconsmapseven\symbol{19}} - \expandafter\def\csname simpleicon@lidlicon\endcsname {\simpleiconsmapseven\symbol{20}} - \expandafter\def\csname simpleicon@lifxicon\endcsname {\simpleiconsmapseven\symbol{21}} - \expandafter\def\csname simpleicon@lightburnicon\endcsname {\simpleiconsmapseven\symbol{22}} - \expandafter\def\csname simpleicon@lighthouseicon\endcsname {\simpleiconsmapseven\symbol{23}} - \expandafter\def\csname simpleicon@lightningicon\endcsname {\simpleiconsmapseven\symbol{24}} - \expandafter\def\csname simpleicon@limesurveyicon\endcsname {\simpleiconsmapseven\symbol{25}} - \expandafter\def\csname simpleicon@lineicon\endcsname {\simpleiconsmapseven\symbol{26}} - \expandafter\def\csname simpleicon@lineageosicon\endcsname {\simpleiconsmapseven\symbol{27}} - \expandafter\def\csname simpleicon@linearicon\endcsname {\simpleiconsmapseven\symbol{28}} - \expandafter\def\csname simpleicon@liningicon\endcsname {\simpleiconsmapseven\symbol{29}} - \expandafter\def\csname simpleicon@linkedinicon\endcsname {\simpleiconsmapseven\symbol{30}} - \expandafter\def\csname simpleicon@linkerdicon\endcsname {\simpleiconsmapseven\symbol{31}} - \expandafter\def\csname simpleicon@linkfireicon\endcsname {\simpleiconsmapseven\symbol{32}} - \expandafter\def\csname simpleicon@linksysicon\endcsname {\simpleiconsmapseven\symbol{33}} - \expandafter\def\csname simpleicon@linktreeicon\endcsname {\simpleiconsmapseven\symbol{34}} - \expandafter\def\csname simpleicon@lintcodeicon\endcsname {\simpleiconsmapseven\symbol{35}} - \expandafter\def\csname simpleicon@linuxicon\endcsname {\simpleiconsmapseven\symbol{36}} - \expandafter\def\csname simpleicon@linuxcontainersicon\endcsname {\simpleiconsmapseven\symbol{37}} - \expandafter\def\csname simpleicon@linuxfoundationicon\endcsname {\simpleiconsmapseven\symbol{38}} - \expandafter\def\csname simpleicon@linuxminticon\endcsname {\simpleiconsmapseven\symbol{39}} - \expandafter\def\csname simpleicon@linuxprofessionalinstituteicon\endcsname {\simpleiconsmapseven\symbol{40}} - \expandafter\def\csname simpleicon@linuxservericon\endcsname {\simpleiconsmapseven\symbol{41}} - \expandafter\def\csname simpleicon@lionairicon\endcsname {\simpleiconsmapseven\symbol{42}} - \expandafter\def\csname simpleicon@liquibaseicon\endcsname {\simpleiconsmapseven\symbol{43}} - \expandafter\def\csname simpleicon@listmonkicon\endcsname {\simpleiconsmapseven\symbol{44}} - \expandafter\def\csname simpleicon@liticon\endcsname {\simpleiconsmapseven\symbol{45}} - \expandafter\def\csname simpleicon@litecoinicon\endcsname {\simpleiconsmapseven\symbol{46}} - \expandafter\def\csname simpleicon@litiengineicon\endcsname {\simpleiconsmapseven\symbol{47}} - \expandafter\def\csname simpleicon@livechaticon\endcsname {\simpleiconsmapseven\symbol{48}} - \expandafter\def\csname simpleicon@livejournalicon\endcsname {\simpleiconsmapseven\symbol{49}} - \expandafter\def\csname simpleicon@livewireicon\endcsname {\simpleiconsmapseven\symbol{50}} - \expandafter\def\csname simpleicon@llvmicon\endcsname {\simpleiconsmapseven\symbol{51}} - \expandafter\def\csname simpleicon@lmmsicon\endcsname {\simpleiconsmapseven\symbol{52}} - \expandafter\def\csname simpleicon@localicon\endcsname {\simpleiconsmapseven\symbol{53}} - \expandafter\def\csname simpleicon@lodashicon\endcsname {\simpleiconsmapseven\symbol{54}} - \expandafter\def\csname simpleicon@logitechicon\endcsname {\simpleiconsmapseven\symbol{55}} - \expandafter\def\csname simpleicon@logitechgicon\endcsname {\simpleiconsmapseven\symbol{56}} - \expandafter\def\csname simpleicon@logmeinicon\endcsname {\simpleiconsmapseven\symbol{57}} - \expandafter\def\csname simpleicon@logseqicon\endcsname {\simpleiconsmapseven\symbol{58}} - \expandafter\def\csname simpleicon@logstashicon\endcsname {\simpleiconsmapseven\symbol{59}} - \expandafter\def\csname simpleicon@lookericon\endcsname {\simpleiconsmapseven\symbol{60}} - \expandafter\def\csname simpleicon@loomicon\endcsname {\simpleiconsmapseven\symbol{61}} - \expandafter\def\csname simpleicon@loopicon\endcsname {\simpleiconsmapseven\symbol{62}} - \expandafter\def\csname simpleicon@loopbackicon\endcsname {\simpleiconsmapseven\symbol{63}} - \expandafter\def\csname simpleicon@lootcrateicon\endcsname {\simpleiconsmapseven\symbol{64}} - \expandafter\def\csname simpleicon@lospecicon\endcsname {\simpleiconsmapseven\symbol{65}} - \expandafter\def\csname simpleicon@lotpolishairlinesicon\endcsname {\simpleiconsmapseven\symbol{66}} - \expandafter\def\csname simpleicon@ltspiceicon\endcsname {\simpleiconsmapseven\symbol{67}} - \expandafter\def\csname simpleicon@luaicon\endcsname {\simpleiconsmapseven\symbol{68}} - \expandafter\def\csname simpleicon@lubuntuicon\endcsname {\simpleiconsmapseven\symbol{69}} - \expandafter\def\csname simpleicon@luciaicon\endcsname {\simpleiconsmapseven\symbol{70}} - \expandafter\def\csname simpleicon@lucidicon\endcsname {\simpleiconsmapseven\symbol{71}} - \expandafter\def\csname simpleicon@ludwigicon\endcsname {\simpleiconsmapseven\symbol{72}} - \expandafter\def\csname simpleicon@lufthansaicon\endcsname {\simpleiconsmapseven\symbol{73}} - \expandafter\def\csname simpleicon@lumenicon\endcsname {\simpleiconsmapseven\symbol{74}} - \expandafter\def\csname simpleicon@lunacyicon\endcsname {\simpleiconsmapseven\symbol{75}} - \expandafter\def\csname simpleicon@lutrisicon\endcsname {\simpleiconsmapseven\symbol{76}} - \expandafter\def\csname simpleicon@lydiaicon\endcsname {\simpleiconsmapseven\symbol{77}} - \expandafter\def\csname simpleicon@lyfticon\endcsname {\simpleiconsmapseven\symbol{78}} - \expandafter\def\csname simpleicon@maasicon\endcsname {\simpleiconsmapseven\symbol{79}} - \expandafter\def\csname simpleicon@macosicon\endcsname {\simpleiconsmapseven\symbol{80}} - \expandafter\def\csname simpleicon@macpawicon\endcsname {\simpleiconsmapseven\symbol{81}} - \expandafter\def\csname simpleicon@macysicon\endcsname {\simpleiconsmapseven\symbol{82}} - \expandafter\def\csname simpleicon@magasinsuicon\endcsname {\simpleiconsmapseven\symbol{83}} - \expandafter\def\csname simpleicon@magentoicon\endcsname {\simpleiconsmapseven\symbol{84}} - \expandafter\def\csname simpleicon@magicicon\endcsname {\simpleiconsmapseven\symbol{85}} - \expandafter\def\csname simpleicon@magiskicon\endcsname {\simpleiconsmapseven\symbol{86}} - \expandafter\def\csname simpleicon@mahindraicon\endcsname {\simpleiconsmapseven\symbol{87}} - \expandafter\def\csname simpleicon@mailchimpicon\endcsname {\simpleiconsmapseven\symbol{88}} - \expandafter\def\csname simpleicon@maildotcomicon\endcsname {\simpleiconsmapseven\symbol{89}} - \expandafter\def\csname simpleicon@maildotruicon\endcsname {\simpleiconsmapseven\symbol{90}} - \expandafter\def\csname simpleicon@mailgunicon\endcsname {\simpleiconsmapseven\symbol{91}} - \expandafter\def\csname simpleicon@mailtrapicon\endcsname {\simpleiconsmapseven\symbol{92}} - \expandafter\def\csname simpleicon@mainwpicon\endcsname {\simpleiconsmapseven\symbol{93}} - \expandafter\def\csname simpleicon@majorleaguehackingicon\endcsname {\simpleiconsmapseven\symbol{94}} - \expandafter\def\csname simpleicon@makeicon\endcsname {\simpleiconsmapseven\symbol{95}} - \expandafter\def\csname simpleicon@makerboticon\endcsname {\simpleiconsmapseven\symbol{96}} - \expandafter\def\csname simpleicon@malticon\endcsname {\simpleiconsmapseven\symbol{97}} - \expandafter\def\csname simpleicon@malwarebytesicon\endcsname {\simpleiconsmapseven\symbol{98}} - \expandafter\def\csname simpleicon@mambauiicon\endcsname {\simpleiconsmapseven\symbol{99}} - \expandafter\def\csname simpleicon@mampicon\endcsname {\simpleiconsmapseven\symbol{100}} - \expandafter\def\csname simpleicon@manicon\endcsname {\simpleiconsmapseven\symbol{101}} - \expandafter\def\csname simpleicon@manageiqicon\endcsname {\simpleiconsmapseven\symbol{102}} - \expandafter\def\csname simpleicon@manjaroicon\endcsname {\simpleiconsmapseven\symbol{103}} - \expandafter\def\csname simpleicon@mantineicon\endcsname {\simpleiconsmapseven\symbol{104}} - \expandafter\def\csname simpleicon@mapboxicon\endcsname {\simpleiconsmapseven\symbol{105}} - \expandafter\def\csname simpleicon@maplibreicon\endcsname {\simpleiconsmapseven\symbol{106}} - \expandafter\def\csname simpleicon@mariadbicon\endcsname {\simpleiconsmapseven\symbol{107}} - \expandafter\def\csname simpleicon@mariadbfoundationicon\endcsname {\simpleiconsmapseven\symbol{108}} - \expandafter\def\csname simpleicon@markdownicon\endcsname {\simpleiconsmapseven\symbol{109}} - \expandafter\def\csname simpleicon@marketoicon\endcsname {\simpleiconsmapseven\symbol{110}} - \expandafter\def\csname simpleicon@markoicon\endcsname {\simpleiconsmapseven\symbol{111}} - \expandafter\def\csname simpleicon@marriotticon\endcsname {\simpleiconsmapseven\symbol{112}} - \expandafter\def\csname simpleicon@marvelappicon\endcsname {\simpleiconsmapseven\symbol{113}} - \expandafter\def\csname simpleicon@maseratiicon\endcsname {\simpleiconsmapseven\symbol{114}} - \expandafter\def\csname simpleicon@mastercardicon\endcsname {\simpleiconsmapseven\symbol{115}} - \expandafter\def\csname simpleicon@mastercomfigicon\endcsname {\simpleiconsmapseven\symbol{116}} - \expandafter\def\csname simpleicon@mastodonicon\endcsname {\simpleiconsmapseven\symbol{117}} - \expandafter\def\csname simpleicon@materialdesignicon\endcsname {\simpleiconsmapseven\symbol{118}} - \expandafter\def\csname simpleicon@materialdesigniconsicon\endcsname {\simpleiconsmapseven\symbol{119}} - \expandafter\def\csname simpleicon@materialformkdocsicon\endcsname {\simpleiconsmapseven\symbol{120}} - \expandafter\def\csname simpleicon@matillionicon\endcsname {\simpleiconsmapseven\symbol{121}} - \expandafter\def\csname simpleicon@matomoicon\endcsname {\simpleiconsmapseven\symbol{122}} - \expandafter\def\csname simpleicon@matrixicon\endcsname {\simpleiconsmapseven\symbol{123}} - \expandafter\def\csname simpleicon@matterdotjsicon\endcsname {\simpleiconsmapseven\symbol{124}} - \expandafter\def\csname simpleicon@mattermosticon\endcsname {\simpleiconsmapseven\symbol{125}} - \expandafter\def\csname simpleicon@matterneticon\endcsname {\simpleiconsmapseven\symbol{126}} - \expandafter\def\csname simpleicon@mauticicon\endcsname {\simpleiconsmapseven\symbol{127}} - \expandafter\def\csname simpleicon@maxicon\endcsname {\simpleiconsmapseven\symbol{128}} - \expandafter\def\csname simpleicon@maxplanckgesellschafticon\endcsname {\simpleiconsmapseven\symbol{129}} - \expandafter\def\csname simpleicon@maytagicon\endcsname {\simpleiconsmapseven\symbol{130}} - \expandafter\def\csname simpleicon@mazdaicon\endcsname {\simpleiconsmapseven\symbol{131}} - \expandafter\def\csname simpleicon@mcafeeicon\endcsname {\simpleiconsmapseven\symbol{132}} - \expandafter\def\csname simpleicon@mcdonaldsicon\endcsname {\simpleiconsmapseven\symbol{133}} - \expandafter\def\csname simpleicon@mclarenicon\endcsname {\simpleiconsmapseven\symbol{134}} - \expandafter\def\csname simpleicon@mdbookicon\endcsname {\simpleiconsmapseven\symbol{135}} - \expandafter\def\csname simpleicon@mdnwebdocsicon\endcsname {\simpleiconsmapseven\symbol{136}} - \expandafter\def\csname simpleicon@mdxicon\endcsname {\simpleiconsmapseven\symbol{137}} - \expandafter\def\csname simpleicon@mediafireicon\endcsname {\simpleiconsmapseven\symbol{138}} - \expandafter\def\csname simpleicon@mediamarkticon\endcsname {\simpleiconsmapseven\symbol{139}} - \expandafter\def\csname simpleicon@mediatekicon\endcsname {\simpleiconsmapseven\symbol{140}} - \expandafter\def\csname simpleicon@medibangpainticon\endcsname {\simpleiconsmapseven\symbol{141}} - \expandafter\def\csname simpleicon@mediumicon\endcsname {\simpleiconsmapseven\symbol{142}} - \expandafter\def\csname simpleicon@medusaicon\endcsname {\simpleiconsmapseven\symbol{143}} - \expandafter\def\csname simpleicon@meetupicon\endcsname {\simpleiconsmapseven\symbol{144}} - \expandafter\def\csname simpleicon@megaicon\endcsname {\simpleiconsmapseven\symbol{145}} - \expandafter\def\csname simpleicon@meilisearchicon\endcsname {\simpleiconsmapseven\symbol{146}} - \expandafter\def\csname simpleicon@meituanicon\endcsname {\simpleiconsmapseven\symbol{147}} - \expandafter\def\csname simpleicon@meizuicon\endcsname {\simpleiconsmapseven\symbol{148}} - \expandafter\def\csname simpleicon@mendeleyicon\endcsname {\simpleiconsmapseven\symbol{149}} - \expandafter\def\csname simpleicon@mentorcruiseicon\endcsname {\simpleiconsmapseven\symbol{150}} - \expandafter\def\csname simpleicon@mercadopagoicon\endcsname {\simpleiconsmapseven\symbol{151}} - \expandafter\def\csname simpleicon@mercedesicon\endcsname {\simpleiconsmapseven\symbol{152}} - \expandafter\def\csname simpleicon@merckicon\endcsname {\simpleiconsmapseven\symbol{153}} - \expandafter\def\csname simpleicon@mercurialicon\endcsname {\simpleiconsmapseven\symbol{154}} - \expandafter\def\csname simpleicon@mermaidicon\endcsname {\simpleiconsmapseven\symbol{155}} - \expandafter\def\csname simpleicon@messengericon\endcsname {\simpleiconsmapseven\symbol{156}} - \expandafter\def\csname simpleicon@metaicon\endcsname {\simpleiconsmapseven\symbol{157}} - \expandafter\def\csname simpleicon@metabaseicon\endcsname {\simpleiconsmapseven\symbol{158}} - \expandafter\def\csname simpleicon@metacriticicon\endcsname {\simpleiconsmapseven\symbol{159}} - \expandafter\def\csname simpleicon@metafiltericon\endcsname {\simpleiconsmapseven\symbol{160}} - \expandafter\def\csname simpleicon@metasploiticon\endcsname {\simpleiconsmapseven\symbol{161}} - \expandafter\def\csname simpleicon@meteoricon\endcsname {\simpleiconsmapseven\symbol{162}} - \expandafter\def\csname simpleicon@metroicon\endcsname {\simpleiconsmapseven\symbol{163}} - \expandafter\def\csname simpleicon@metrodelaciudaddemexicoicon\endcsname {\simpleiconsmapseven\symbol{164}} - \expandafter\def\csname simpleicon@metrodemadridicon\endcsname {\simpleiconsmapseven\symbol{165}} - \expandafter\def\csname simpleicon@metrodeparisicon\endcsname {\simpleiconsmapseven\symbol{166}} - \expandafter\def\csname simpleicon@meweicon\endcsname {\simpleiconsmapseven\symbol{167}} - \expandafter\def\csname simpleicon@mgicon\endcsname {\simpleiconsmapseven\symbol{168}} - \expandafter\def\csname simpleicon@microbiticon\endcsname {\simpleiconsmapseven\symbol{169}} - \expandafter\def\csname simpleicon@microdotblogicon\endcsname {\simpleiconsmapseven\symbol{170}} - \expandafter\def\csname simpleicon@microeditoricon\endcsname {\simpleiconsmapseven\symbol{171}} - \expandafter\def\csname simpleicon@microgeneticsicon\endcsname {\simpleiconsmapseven\symbol{172}} - \expandafter\def\csname simpleicon@micropythonicon\endcsname {\simpleiconsmapseven\symbol{173}} - \expandafter\def\csname simpleicon@microstationicon\endcsname {\simpleiconsmapseven\symbol{174}} - \expandafter\def\csname simpleicon@microstrategyicon\endcsname {\simpleiconsmapseven\symbol{175}} - \expandafter\def\csname simpleicon@midiicon\endcsname {\simpleiconsmapseven\symbol{176}} - \expandafter\def\csname simpleicon@migaduicon\endcsname {\simpleiconsmapseven\symbol{177}} - \expandafter\def\csname simpleicon@mikrotikicon\endcsname {\simpleiconsmapseven\symbol{178}} - \expandafter\def\csname simpleicon@milanoteicon\endcsname {\simpleiconsmapseven\symbol{179}} - \expandafter\def\csname simpleicon@milvusicon\endcsname {\simpleiconsmapseven\symbol{180}} - \expandafter\def\csname simpleicon@mindsicon\endcsname {\simpleiconsmapseven\symbol{181}} - \expandafter\def\csname simpleicon@minetesticon\endcsname {\simpleiconsmapseven\symbol{182}} - \expandafter\def\csname simpleicon@miniicon\endcsname {\simpleiconsmapseven\symbol{183}} - \expandafter\def\csname simpleicon@minioicon\endcsname {\simpleiconsmapseven\symbol{184}} - \expandafter\def\csname simpleicon@mintlifyicon\endcsname {\simpleiconsmapseven\symbol{185}} - \expandafter\def\csname simpleicon@minutemailericon\endcsname {\simpleiconsmapseven\symbol{186}} - \expandafter\def\csname simpleicon@mirahezeicon\endcsname {\simpleiconsmapseven\symbol{187}} - \expandafter\def\csname simpleicon@miroicon\endcsname {\simpleiconsmapseven\symbol{188}} - \expandafter\def\csname simpleicon@misskeyicon\endcsname {\simpleiconsmapseven\symbol{189}} - \expandafter\def\csname simpleicon@mitsubishiicon\endcsname {\simpleiconsmapseven\symbol{190}} - \expandafter\def\csname simpleicon@mixicon\endcsname {\simpleiconsmapseven\symbol{191}} - \expandafter\def\csname simpleicon@mixcloudicon\endcsname {\simpleiconsmapseven\symbol{192}} - \expandafter\def\csname simpleicon@mixpanelicon\endcsname {\simpleiconsmapseven\symbol{193}} - \expandafter\def\csname simpleicon@mlbicon\endcsname {\simpleiconsmapseven\symbol{194}} - \expandafter\def\csname simpleicon@mlflowicon\endcsname {\simpleiconsmapseven\symbol{195}} - \expandafter\def\csname simpleicon@mobxicon\endcsname {\simpleiconsmapseven\symbol{196}} - \expandafter\def\csname simpleicon@mobxstatetreeicon\endcsname {\simpleiconsmapseven\symbol{197}} - \expandafter\def\csname simpleicon@mochaicon\endcsname {\simpleiconsmapseven\symbol{198}} - \expandafter\def\csname simpleicon@mockserviceworkericon\endcsname {\simpleiconsmapseven\symbol{199}} - \expandafter\def\csname simpleicon@modalicon\endcsname {\simpleiconsmapseven\symbol{200}} - \expandafter\def\csname simpleicon@modinicon\endcsname {\simpleiconsmapseven\symbol{201}} - \expandafter\def\csname simpleicon@modrinthicon\endcsname {\simpleiconsmapseven\symbol{202}} - \expandafter\def\csname simpleicon@modxicon\endcsname {\simpleiconsmapseven\symbol{203}} - \expandafter\def\csname simpleicon@moleculericon\endcsname {\simpleiconsmapseven\symbol{204}} - \expandafter\def\csname simpleicon@momenteoicon\endcsname {\simpleiconsmapseven\symbol{205}} - \expandafter\def\csname simpleicon@moneroicon\endcsname {\simpleiconsmapseven\symbol{206}} - \expandafter\def\csname simpleicon@moneygramicon\endcsname {\simpleiconsmapseven\symbol{207}} - \expandafter\def\csname simpleicon@mongodbicon\endcsname {\simpleiconsmapseven\symbol{208}} - \expandafter\def\csname simpleicon@mongooseicon\endcsname {\simpleiconsmapseven\symbol{209}} - \expandafter\def\csname simpleicon@mongoosedotwsicon\endcsname {\simpleiconsmapseven\symbol{210}} - \expandafter\def\csname simpleicon@monicaicon\endcsname {\simpleiconsmapseven\symbol{211}} - \expandafter\def\csname simpleicon@monkeytieicon\endcsname {\simpleiconsmapseven\symbol{212}} - \expandafter\def\csname simpleicon@monkeytypeicon\endcsname {\simpleiconsmapseven\symbol{213}} - \expandafter\def\csname simpleicon@monogameicon\endcsname {\simpleiconsmapseven\symbol{214}} - \expandafter\def\csname simpleicon@monoprixicon\endcsname {\simpleiconsmapseven\symbol{215}} - \expandafter\def\csname simpleicon@monstericon\endcsname {\simpleiconsmapseven\symbol{216}} - \expandafter\def\csname simpleicon@monzoicon\endcsname {\simpleiconsmapseven\symbol{217}} - \expandafter\def\csname simpleicon@mooicon\endcsname {\simpleiconsmapseven\symbol{218}} - \expandafter\def\csname simpleicon@moodleicon\endcsname {\simpleiconsmapseven\symbol{219}} - \expandafter\def\csname simpleicon@moonrepoicon\endcsname {\simpleiconsmapseven\symbol{220}} - \expandafter\def\csname simpleicon@moqicon\endcsname {\simpleiconsmapseven\symbol{221}} - \expandafter\def\csname simpleicon@moqupsicon\endcsname {\simpleiconsmapseven\symbol{222}} - \expandafter\def\csname simpleicon@morrisonsicon\endcsname {\simpleiconsmapseven\symbol{223}} - \expandafter\def\csname simpleicon@moscowmetroicon\endcsname {\simpleiconsmapseven\symbol{224}} - \expandafter\def\csname simpleicon@motorolaicon\endcsname {\simpleiconsmapseven\symbol{225}} - \expandafter\def\csname simpleicon@mozillaicon\endcsname {\simpleiconsmapseven\symbol{226}} - \expandafter\def\csname simpleicon@mpvicon\endcsname {\simpleiconsmapseven\symbol{227}} - \expandafter\def\csname simpleicon@mqtticon\endcsname {\simpleiconsmapseven\symbol{228}} - \expandafter\def\csname simpleicon@msiicon\endcsname {\simpleiconsmapseven\symbol{229}} - \expandafter\def\csname simpleicon@msibusinessicon\endcsname {\simpleiconsmapseven\symbol{230}} - \expandafter\def\csname simpleicon@mtaicon\endcsname {\simpleiconsmapseven\symbol{231}} - \expandafter\def\csname simpleicon@mtricon\endcsname {\simpleiconsmapseven\symbol{232}} - \expandafter\def\csname simpleicon@mubiicon\endcsname {\simpleiconsmapseven\symbol{233}} - \expandafter\def\csname simpleicon@muiicon\endcsname {\simpleiconsmapseven\symbol{234}} - \expandafter\def\csname simpleicon@mulesofticon\endcsname {\simpleiconsmapseven\symbol{235}} - \expandafter\def\csname simpleicon@mullericon\endcsname {\simpleiconsmapseven\symbol{236}} - \expandafter\def\csname simpleicon@multisimicon\endcsname {\simpleiconsmapseven\symbol{237}} - \expandafter\def\csname simpleicon@mumbleicon\endcsname {\simpleiconsmapseven\symbol{238}} - \expandafter\def\csname simpleicon@muoicon\endcsname {\simpleiconsmapseven\symbol{239}} - \expandafter\def\csname simpleicon@muralicon\endcsname {\simpleiconsmapseven\symbol{240}} - \expandafter\def\csname simpleicon@musescoreicon\endcsname {\simpleiconsmapseven\symbol{241}} - \expandafter\def\csname simpleicon@musicbrainzicon\endcsname {\simpleiconsmapseven\symbol{242}} - \expandafter\def\csname simpleicon@mxlinuxicon\endcsname {\simpleiconsmapseven\symbol{243}} - \expandafter\def\csname simpleicon@myanimelisticon\endcsname {\simpleiconsmapseven\symbol{244}} - \expandafter\def\csname simpleicon@mygeticon\endcsname {\simpleiconsmapseven\symbol{245}} - \expandafter\def\csname simpleicon@myobicon\endcsname {\simpleiconsmapseven\symbol{246}} - \expandafter\def\csname simpleicon@myspaceicon\endcsname {\simpleiconsmapseven\symbol{247}} - \expandafter\def\csname simpleicon@mysqlicon\endcsname {\simpleiconsmapseven\symbol{248}} - \expandafter\def\csname simpleicon@n26icon\endcsname {\simpleiconsmapseven\symbol{249}} - \expandafter\def\csname simpleicon@n8nicon\endcsname {\simpleiconsmapseven\symbol{250}} - \expandafter\def\csname simpleicon@namebaseicon\endcsname {\simpleiconsmapseven\symbol{251}} - \expandafter\def\csname simpleicon@namecheapicon\endcsname {\simpleiconsmapseven\symbol{252}} - \expandafter\def\csname simpleicon@namemcicon\endcsname {\simpleiconsmapseven\symbol{253}} - \expandafter\def\csname simpleicon@namesiloicon\endcsname {\simpleiconsmapseven\symbol{254}} - \expandafter\def\csname simpleicon@namuwikiicon\endcsname {\simpleiconsmapseven\symbol{255}} - \expandafter\def\csname simpleicon@nanoicon\endcsname {\simpleiconsmapeight\symbol{0}} - \expandafter\def\csname simpleicon@nasaicon\endcsname {\simpleiconsmapeight\symbol{1}} - \expandafter\def\csname simpleicon@nationalgridicon\endcsname {\simpleiconsmapeight\symbol{2}} - \expandafter\def\csname simpleicon@nationalrailicon\endcsname {\simpleiconsmapeight\symbol{3}} - \expandafter\def\csname simpleicon@nativescripticon\endcsname {\simpleiconsmapeight\symbol{4}} - \expandafter\def\csname simpleicon@natsdotioicon\endcsname {\simpleiconsmapeight\symbol{5}} - \expandafter\def\csname simpleicon@navericon\endcsname {\simpleiconsmapeight\symbol{6}} - \expandafter\def\csname simpleicon@nbaicon\endcsname {\simpleiconsmapeight\symbol{7}} - \expandafter\def\csname simpleicon@nbbicon\endcsname {\simpleiconsmapeight\symbol{8}} - \expandafter\def\csname simpleicon@nbcicon\endcsname {\simpleiconsmapeight\symbol{9}} - \expandafter\def\csname simpleicon@ndricon\endcsname {\simpleiconsmapeight\symbol{10}} - \expandafter\def\csname simpleicon@nearicon\endcsname {\simpleiconsmapeight\symbol{11}} - \expandafter\def\csname simpleicon@necicon\endcsname {\simpleiconsmapeight\symbol{12}} - \expandafter\def\csname simpleicon@neo4jicon\endcsname {\simpleiconsmapeight\symbol{13}} - \expandafter\def\csname simpleicon@neovimicon\endcsname {\simpleiconsmapeight\symbol{14}} - \expandafter\def\csname simpleicon@neptuneicon\endcsname {\simpleiconsmapeight\symbol{15}} - \expandafter\def\csname simpleicon@nestjsicon\endcsname {\simpleiconsmapeight\symbol{16}} - \expandafter\def\csname simpleicon@netappicon\endcsname {\simpleiconsmapeight\symbol{17}} - \expandafter\def\csname simpleicon@netbsdicon\endcsname {\simpleiconsmapeight\symbol{18}} - \expandafter\def\csname simpleicon@netcupicon\endcsname {\simpleiconsmapeight\symbol{19}} - \expandafter\def\csname simpleicon@netdataicon\endcsname {\simpleiconsmapeight\symbol{20}} - \expandafter\def\csname simpleicon@neteasecloudmusicicon\endcsname {\simpleiconsmapeight\symbol{21}} - \expandafter\def\csname simpleicon@netflixicon\endcsname {\simpleiconsmapeight\symbol{22}} - \expandafter\def\csname simpleicon@netgearicon\endcsname {\simpleiconsmapeight\symbol{23}} - \expandafter\def\csname simpleicon@netlifyicon\endcsname {\simpleiconsmapeight\symbol{24}} - \expandafter\def\csname simpleicon@netteicon\endcsname {\simpleiconsmapeight\symbol{25}} - \expandafter\def\csname simpleicon@nettoicon\endcsname {\simpleiconsmapeight\symbol{26}} - \expandafter\def\csname simpleicon@neutralinojsicon\endcsname {\simpleiconsmapeight\symbol{27}} - \expandafter\def\csname simpleicon@newbalanceicon\endcsname {\simpleiconsmapeight\symbol{28}} - \expandafter\def\csname simpleicon@neweggicon\endcsname {\simpleiconsmapeight\symbol{29}} - \expandafter\def\csname simpleicon@newjapanprowrestlingicon\endcsname {\simpleiconsmapeight\symbol{30}} - \expandafter\def\csname simpleicon@newrelicicon\endcsname {\simpleiconsmapeight\symbol{31}} - \expandafter\def\csname simpleicon@newyorktimesicon\endcsname {\simpleiconsmapeight\symbol{32}} - \expandafter\def\csname simpleicon@nextbilliondotaiicon\endcsname {\simpleiconsmapeight\symbol{33}} - \expandafter\def\csname simpleicon@nextcloudicon\endcsname {\simpleiconsmapeight\symbol{34}} - \expandafter\def\csname simpleicon@nextdnsicon\endcsname {\simpleiconsmapeight\symbol{35}} - \expandafter\def\csname simpleicon@nextdooricon\endcsname {\simpleiconsmapeight\symbol{36}} - \expandafter\def\csname simpleicon@nextdotjsicon\endcsname {\simpleiconsmapeight\symbol{37}} - \expandafter\def\csname simpleicon@nextraicon\endcsname {\simpleiconsmapeight\symbol{38}} - \expandafter\def\csname simpleicon@nextuiicon\endcsname {\simpleiconsmapeight\symbol{39}} - \expandafter\def\csname simpleicon@nexusmodsicon\endcsname {\simpleiconsmapeight\symbol{40}} - \expandafter\def\csname simpleicon@nfcicon\endcsname {\simpleiconsmapeight\symbol{41}} - \expandafter\def\csname simpleicon@nginxicon\endcsname {\simpleiconsmapeight\symbol{42}} - \expandafter\def\csname simpleicon@nginxproxymanagericon\endcsname {\simpleiconsmapeight\symbol{43}} - \expandafter\def\csname simpleicon@ngrokicon\endcsname {\simpleiconsmapeight\symbol{44}} - \expandafter\def\csname simpleicon@ngrxicon\endcsname {\simpleiconsmapeight\symbol{45}} - \expandafter\def\csname simpleicon@nhlicon\endcsname {\simpleiconsmapeight\symbol{46}} - \expandafter\def\csname simpleicon@nicehashicon\endcsname {\simpleiconsmapeight\symbol{47}} - \expandafter\def\csname simpleicon@niconicoicon\endcsname {\simpleiconsmapeight\symbol{48}} - \expandafter\def\csname simpleicon@nikeicon\endcsname {\simpleiconsmapeight\symbol{49}} - \expandafter\def\csname simpleicon@nikonicon\endcsname {\simpleiconsmapeight\symbol{50}} - \expandafter\def\csname simpleicon@nimicon\endcsname {\simpleiconsmapeight\symbol{51}} - \expandafter\def\csname simpleicon@nintendoicon\endcsname {\simpleiconsmapeight\symbol{52}} - \expandafter\def\csname simpleicon@nintendo3dsicon\endcsname {\simpleiconsmapeight\symbol{53}} - \expandafter\def\csname simpleicon@nintendogamecubeicon\endcsname {\simpleiconsmapeight\symbol{54}} - \expandafter\def\csname simpleicon@nintendoswitchicon\endcsname {\simpleiconsmapeight\symbol{55}} - \expandafter\def\csname simpleicon@nissanicon\endcsname {\simpleiconsmapeight\symbol{56}} - \expandafter\def\csname simpleicon@nixosicon\endcsname {\simpleiconsmapeight\symbol{57}} - \expandafter\def\csname simpleicon@nodedotjsicon\endcsname {\simpleiconsmapeight\symbol{58}} - \expandafter\def\csname simpleicon@nodemonicon\endcsname {\simpleiconsmapeight\symbol{59}} - \expandafter\def\csname simpleicon@noderedicon\endcsname {\simpleiconsmapeight\symbol{60}} - \expandafter\def\csname simpleicon@nokiaicon\endcsname {\simpleiconsmapeight\symbol{61}} - \expandafter\def\csname simpleicon@nomadicon\endcsname {\simpleiconsmapeight\symbol{62}} - \expandafter\def\csname simpleicon@norcoicon\endcsname {\simpleiconsmapeight\symbol{63}} - \expandafter\def\csname simpleicon@nordicsemiconductoricon\endcsname {\simpleiconsmapeight\symbol{64}} - \expandafter\def\csname simpleicon@nordvpnicon\endcsname {\simpleiconsmapeight\symbol{65}} - \expandafter\def\csname simpleicon@normalizedotcssicon\endcsname {\simpleiconsmapeight\symbol{66}} - \expandafter\def\csname simpleicon@nortonicon\endcsname {\simpleiconsmapeight\symbol{67}} - \expandafter\def\csname simpleicon@norwegianicon\endcsname {\simpleiconsmapeight\symbol{68}} - \expandafter\def\csname simpleicon@notepadplusplusicon\endcsname {\simpleiconsmapeight\symbol{69}} - \expandafter\def\csname simpleicon@notionicon\endcsname {\simpleiconsmapeight\symbol{70}} - \expandafter\def\csname simpleicon@notisticon\endcsname {\simpleiconsmapeight\symbol{71}} - \expandafter\def\csname simpleicon@nounprojecticon\endcsname {\simpleiconsmapeight\symbol{72}} - \expandafter\def\csname simpleicon@novuicon\endcsname {\simpleiconsmapeight\symbol{73}} - \expandafter\def\csname simpleicon@nowicon\endcsname {\simpleiconsmapeight\symbol{74}} - \expandafter\def\csname simpleicon@npmicon\endcsname {\simpleiconsmapeight\symbol{75}} - \expandafter\def\csname simpleicon@nrwlicon\endcsname {\simpleiconsmapeight\symbol{76}} - \expandafter\def\csname simpleicon@nsisicon\endcsname {\simpleiconsmapeight\symbol{77}} - \expandafter\def\csname simpleicon@ntfyicon\endcsname {\simpleiconsmapeight\symbol{78}} - \expandafter\def\csname simpleicon@nubankicon\endcsname {\simpleiconsmapeight\symbol{79}} - \expandafter\def\csname simpleicon@nucleoicon\endcsname {\simpleiconsmapeight\symbol{80}} - \expandafter\def\csname simpleicon@nugeticon\endcsname {\simpleiconsmapeight\symbol{81}} - \expandafter\def\csname simpleicon@nukeicon\endcsname {\simpleiconsmapeight\symbol{82}} - \expandafter\def\csname simpleicon@numbaicon\endcsname {\simpleiconsmapeight\symbol{83}} - \expandafter\def\csname simpleicon@numpyicon\endcsname {\simpleiconsmapeight\symbol{84}} - \expandafter\def\csname simpleicon@nunjucksicon\endcsname {\simpleiconsmapeight\symbol{85}} - \expandafter\def\csname simpleicon@nushellicon\endcsname {\simpleiconsmapeight\symbol{86}} - \expandafter\def\csname simpleicon@nutanixicon\endcsname {\simpleiconsmapeight\symbol{87}} - \expandafter\def\csname simpleicon@nuxtdotjsicon\endcsname {\simpleiconsmapeight\symbol{88}} - \expandafter\def\csname simpleicon@nvidiaicon\endcsname {\simpleiconsmapeight\symbol{89}} - \expandafter\def\csname simpleicon@nvmicon\endcsname {\simpleiconsmapeight\symbol{90}} - \expandafter\def\csname simpleicon@nxicon\endcsname {\simpleiconsmapeight\symbol{91}} - \expandafter\def\csname simpleicon@nxpicon\endcsname {\simpleiconsmapeight\symbol{92}} - \expandafter\def\csname simpleicon@nzxticon\endcsname {\simpleiconsmapeight\symbol{93}} - \expandafter\def\csname simpleicon@observableicon\endcsname {\simpleiconsmapeight\symbol{94}} - \expandafter\def\csname simpleicon@obsidianicon\endcsname {\simpleiconsmapeight\symbol{95}} - \expandafter\def\csname simpleicon@obsstudioicon\endcsname {\simpleiconsmapeight\symbol{96}} - \expandafter\def\csname simpleicon@ocamlicon\endcsname {\simpleiconsmapeight\symbol{97}} - \expandafter\def\csname simpleicon@oclificon\endcsname {\simpleiconsmapeight\symbol{98}} - \expandafter\def\csname simpleicon@octanerendericon\endcsname {\simpleiconsmapeight\symbol{99}} - \expandafter\def\csname simpleicon@octaveicon\endcsname {\simpleiconsmapeight\symbol{100}} - \expandafter\def\csname simpleicon@octobercmsicon\endcsname {\simpleiconsmapeight\symbol{101}} - \expandafter\def\csname simpleicon@octoprinticon\endcsname {\simpleiconsmapeight\symbol{102}} - \expandafter\def\csname simpleicon@octopusdeployicon\endcsname {\simpleiconsmapeight\symbol{103}} - \expandafter\def\csname simpleicon@oculusicon\endcsname {\simpleiconsmapeight\symbol{104}} - \expandafter\def\csname simpleicon@odnoklassnikiicon\endcsname {\simpleiconsmapeight\symbol{105}} - \expandafter\def\csname simpleicon@odooicon\endcsname {\simpleiconsmapeight\symbol{106}} - \expandafter\def\csname simpleicon@odyseeicon\endcsname {\simpleiconsmapeight\symbol{107}} - \expandafter\def\csname simpleicon@ohdearicon\endcsname {\simpleiconsmapeight\symbol{108}} - \expandafter\def\csname simpleicon@okcupidicon\endcsname {\simpleiconsmapeight\symbol{109}} - \expandafter\def\csname simpleicon@oktaicon\endcsname {\simpleiconsmapeight\symbol{110}} - \expandafter\def\csname simpleicon@oneplusicon\endcsname {\simpleiconsmapeight\symbol{111}} - \expandafter\def\csname simpleicon@onlyfansicon\endcsname {\simpleiconsmapeight\symbol{112}} - \expandafter\def\csname simpleicon@onlyofficeicon\endcsname {\simpleiconsmapeight\symbol{113}} - \expandafter\def\csname simpleicon@onnxicon\endcsname {\simpleiconsmapeight\symbol{114}} - \expandafter\def\csname simpleicon@onstaricon\endcsname {\simpleiconsmapeight\symbol{115}} - \expandafter\def\csname simpleicon@opelicon\endcsname {\simpleiconsmapeight\symbol{116}} - \expandafter\def\csname simpleicon@openaccessicon\endcsname {\simpleiconsmapeight\symbol{117}} - \expandafter\def\csname simpleicon@openaiicon\endcsname {\simpleiconsmapeight\symbol{118}} - \expandafter\def\csname simpleicon@openaigymicon\endcsname {\simpleiconsmapeight\symbol{119}} - \expandafter\def\csname simpleicon@openapiinitiativeicon\endcsname {\simpleiconsmapeight\symbol{120}} - \expandafter\def\csname simpleicon@openbadgesicon\endcsname {\simpleiconsmapeight\symbol{121}} - \expandafter\def\csname simpleicon@openbsdicon\endcsname {\simpleiconsmapeight\symbol{122}} - \expandafter\def\csname simpleicon@openbugbountyicon\endcsname {\simpleiconsmapeight\symbol{123}} - \expandafter\def\csname simpleicon@opencollectiveicon\endcsname {\simpleiconsmapeight\symbol{124}} - \expandafter\def\csname simpleicon@opencontainersinitiativeicon\endcsname {\simpleiconsmapeight\symbol{125}} - \expandafter\def\csname simpleicon@opencvicon\endcsname {\simpleiconsmapeight\symbol{126}} - \expandafter\def\csname simpleicon@openfaasicon\endcsname {\simpleiconsmapeight\symbol{127}} - \expandafter\def\csname simpleicon@openglicon\endcsname {\simpleiconsmapeight\symbol{128}} - \expandafter\def\csname simpleicon@openhabicon\endcsname {\simpleiconsmapeight\symbol{129}} - \expandafter\def\csname simpleicon@openidicon\endcsname {\simpleiconsmapeight\symbol{130}} - \expandafter\def\csname simpleicon@openjdkicon\endcsname {\simpleiconsmapeight\symbol{131}} - \expandafter\def\csname simpleicon@openjsfoundationicon\endcsname {\simpleiconsmapeight\symbol{132}} - \expandafter\def\csname simpleicon@openlayersicon\endcsname {\simpleiconsmapeight\symbol{133}} - \expandafter\def\csname simpleicon@openmediavaulticon\endcsname {\simpleiconsmapeight\symbol{134}} - \expandafter\def\csname simpleicon@openminedicon\endcsname {\simpleiconsmapeight\symbol{135}} - \expandafter\def\csname simpleicon@opennebulaicon\endcsname {\simpleiconsmapeight\symbol{136}} - \expandafter\def\csname simpleicon@openprojecticon\endcsname {\simpleiconsmapeight\symbol{137}} - \expandafter\def\csname simpleicon@openscadicon\endcsname {\simpleiconsmapeight\symbol{138}} - \expandafter\def\csname simpleicon@openseaicon\endcsname {\simpleiconsmapeight\symbol{139}} - \expandafter\def\csname simpleicon@opensearchicon\endcsname {\simpleiconsmapeight\symbol{140}} - \expandafter\def\csname simpleicon@opensourcehardwareicon\endcsname {\simpleiconsmapeight\symbol{141}} - \expandafter\def\csname simpleicon@opensourceinitiativeicon\endcsname {\simpleiconsmapeight\symbol{142}} - \expandafter\def\csname simpleicon@opensslicon\endcsname {\simpleiconsmapeight\symbol{143}} - \expandafter\def\csname simpleicon@openstackicon\endcsname {\simpleiconsmapeight\symbol{144}} - \expandafter\def\csname simpleicon@openstreetmapicon\endcsname {\simpleiconsmapeight\symbol{145}} - \expandafter\def\csname simpleicon@opensuseicon\endcsname {\simpleiconsmapeight\symbol{146}} - \expandafter\def\csname simpleicon@opentelemetryicon\endcsname {\simpleiconsmapeight\symbol{147}} - \expandafter\def\csname simpleicon@opentexticon\endcsname {\simpleiconsmapeight\symbol{148}} - \expandafter\def\csname simpleicon@opentofuicon\endcsname {\simpleiconsmapeight\symbol{149}} - \expandafter\def\csname simpleicon@openverseicon\endcsname {\simpleiconsmapeight\symbol{150}} - \expandafter\def\csname simpleicon@openvpnicon\endcsname {\simpleiconsmapeight\symbol{151}} - \expandafter\def\csname simpleicon@openwrticon\endcsname {\simpleiconsmapeight\symbol{152}} - \expandafter\def\csname simpleicon@openzeppelinicon\endcsname {\simpleiconsmapeight\symbol{153}} - \expandafter\def\csname simpleicon@openzfsicon\endcsname {\simpleiconsmapeight\symbol{154}} - \expandafter\def\csname simpleicon@operaicon\endcsname {\simpleiconsmapeight\symbol{155}} - \expandafter\def\csname simpleicon@operagxicon\endcsname {\simpleiconsmapeight\symbol{156}} - \expandafter\def\csname simpleicon@opnsenseicon\endcsname {\simpleiconsmapeight\symbol{157}} - \expandafter\def\csname simpleicon@oppoicon\endcsname {\simpleiconsmapeight\symbol{158}} - \expandafter\def\csname simpleicon@opsgenieicon\endcsname {\simpleiconsmapeight\symbol{159}} - \expandafter\def\csname simpleicon@opslevelicon\endcsname {\simpleiconsmapeight\symbol{160}} - \expandafter\def\csname simpleicon@optimismicon\endcsname {\simpleiconsmapeight\symbol{161}} - \expandafter\def\csname simpleicon@oracleicon\endcsname {\simpleiconsmapeight\symbol{162}} - \expandafter\def\csname simpleicon@orangeicon\endcsname {\simpleiconsmapeight\symbol{163}} - \expandafter\def\csname simpleicon@orcidicon\endcsname {\simpleiconsmapeight\symbol{164}} - \expandafter\def\csname simpleicon@oreillyicon\endcsname {\simpleiconsmapeight\symbol{165}} - \expandafter\def\csname simpleicon@orgicon\endcsname {\simpleiconsmapeight\symbol{166}} - \expandafter\def\csname simpleicon@organicmapsicon\endcsname {\simpleiconsmapeight\symbol{167}} - \expandafter\def\csname simpleicon@originicon\endcsname {\simpleiconsmapeight\symbol{168}} - \expandafter\def\csname simpleicon@osanoicon\endcsname {\simpleiconsmapeight\symbol{169}} - \expandafter\def\csname simpleicon@osficon\endcsname {\simpleiconsmapeight\symbol{170}} - \expandafter\def\csname simpleicon@osgeoicon\endcsname {\simpleiconsmapeight\symbol{171}} - \expandafter\def\csname simpleicon@oshkoshicon\endcsname {\simpleiconsmapeight\symbol{172}} - \expandafter\def\csname simpleicon@osmcicon\endcsname {\simpleiconsmapeight\symbol{173}} - \expandafter\def\csname simpleicon@osuicon\endcsname {\simpleiconsmapeight\symbol{174}} - \expandafter\def\csname simpleicon@ottoicon\endcsname {\simpleiconsmapeight\symbol{175}} - \expandafter\def\csname simpleicon@overcasticon\endcsname {\simpleiconsmapeight\symbol{176}} - \expandafter\def\csname simpleicon@overleaficon\endcsname {\simpleiconsmapeight\symbol{177}} - \expandafter\def\csname simpleicon@ovhicon\endcsname {\simpleiconsmapeight\symbol{178}} - \expandafter\def\csname simpleicon@owaspicon\endcsname {\simpleiconsmapeight\symbol{179}} - \expandafter\def\csname simpleicon@owncloudicon\endcsname {\simpleiconsmapeight\symbol{180}} - \expandafter\def\csname simpleicon@oxygenicon\endcsname {\simpleiconsmapeight\symbol{181}} - \expandafter\def\csname simpleicon@oyoicon\endcsname {\simpleiconsmapeight\symbol{182}} - \expandafter\def\csname simpleicon@p5dotjsicon\endcsname {\simpleiconsmapeight\symbol{183}} - \expandafter\def\csname simpleicon@packagisticon\endcsname {\simpleiconsmapeight\symbol{184}} - \expandafter\def\csname simpleicon@packericon\endcsname {\simpleiconsmapeight\symbol{185}} - \expandafter\def\csname simpleicon@packticon\endcsname {\simpleiconsmapeight\symbol{186}} - \expandafter\def\csname simpleicon@paddleicon\endcsname {\simpleiconsmapeight\symbol{187}} - \expandafter\def\csname simpleicon@paddlepaddleicon\endcsname {\simpleiconsmapeight\symbol{188}} - \expandafter\def\csname simpleicon@paddypowericon\endcsname {\simpleiconsmapeight\symbol{189}} - \expandafter\def\csname simpleicon@pagekiticon\endcsname {\simpleiconsmapeight\symbol{190}} - \expandafter\def\csname simpleicon@pagerdutyicon\endcsname {\simpleiconsmapeight\symbol{191}} - \expandafter\def\csname simpleicon@pagespeedinsightsicon\endcsname {\simpleiconsmapeight\symbol{192}} - \expandafter\def\csname simpleicon@pagseguroicon\endcsname {\simpleiconsmapeight\symbol{193}} - \expandafter\def\csname simpleicon@palantiricon\endcsname {\simpleiconsmapeight\symbol{194}} - \expandafter\def\csname simpleicon@paloaltonetworksicon\endcsname {\simpleiconsmapeight\symbol{195}} - \expandafter\def\csname simpleicon@paloaltosoftwareicon\endcsname {\simpleiconsmapeight\symbol{196}} - \expandafter\def\csname simpleicon@panasonicicon\endcsname {\simpleiconsmapeight\symbol{197}} - \expandafter\def\csname simpleicon@pandasicon\endcsname {\simpleiconsmapeight\symbol{198}} - \expandafter\def\csname simpleicon@pandoraicon\endcsname {\simpleiconsmapeight\symbol{199}} - \expandafter\def\csname simpleicon@pantheonicon\endcsname {\simpleiconsmapeight\symbol{200}} - \expandafter\def\csname simpleicon@paperlessngxicon\endcsname {\simpleiconsmapeight\symbol{201}} - \expandafter\def\csname simpleicon@paperspaceicon\endcsname {\simpleiconsmapeight\symbol{202}} - \expandafter\def\csname simpleicon@paperswithcodeicon\endcsname {\simpleiconsmapeight\symbol{203}} - \expandafter\def\csname simpleicon@paramountplusicon\endcsname {\simpleiconsmapeight\symbol{204}} - \expandafter\def\csname simpleicon@paritysubstrateicon\endcsname {\simpleiconsmapeight\symbol{205}} - \expandafter\def\csname simpleicon@parrotsecurityicon\endcsname {\simpleiconsmapeight\symbol{206}} - \expandafter\def\csname simpleicon@parsedotlyicon\endcsname {\simpleiconsmapeight\symbol{207}} - \expandafter\def\csname simpleicon@passporticon\endcsname {\simpleiconsmapeight\symbol{208}} - \expandafter\def\csname simpleicon@pastebinicon\endcsname {\simpleiconsmapeight\symbol{209}} - \expandafter\def\csname simpleicon@patreonicon\endcsname {\simpleiconsmapeight\symbol{210}} - \expandafter\def\csname simpleicon@paychexicon\endcsname {\simpleiconsmapeight\symbol{211}} - \expandafter\def\csname simpleicon@payhipicon\endcsname {\simpleiconsmapeight\symbol{212}} - \expandafter\def\csname simpleicon@payloadcmsicon\endcsname {\simpleiconsmapeight\symbol{213}} - \expandafter\def\csname simpleicon@payoneericon\endcsname {\simpleiconsmapeight\symbol{214}} - \expandafter\def\csname simpleicon@paypalicon\endcsname {\simpleiconsmapeight\symbol{215}} - \expandafter\def\csname simpleicon@paytmicon\endcsname {\simpleiconsmapeight\symbol{216}} - \expandafter\def\csname simpleicon@pcgamingwikiicon\endcsname {\simpleiconsmapeight\symbol{217}} - \expandafter\def\csname simpleicon@pdmicon\endcsname {\simpleiconsmapeight\symbol{218}} - \expandafter\def\csname simpleicon@pdqicon\endcsname {\simpleiconsmapeight\symbol{219}} - \expandafter\def\csname simpleicon@peakdesignicon\endcsname {\simpleiconsmapeight\symbol{220}} - \expandafter\def\csname simpleicon@pearsonicon\endcsname {\simpleiconsmapeight\symbol{221}} - \expandafter\def\csname simpleicon@peerlisticon\endcsname {\simpleiconsmapeight\symbol{222}} - \expandafter\def\csname simpleicon@peertubeicon\endcsname {\simpleiconsmapeight\symbol{223}} - \expandafter\def\csname simpleicon@pegasusairlinesicon\endcsname {\simpleiconsmapeight\symbol{224}} - \expandafter\def\csname simpleicon@pelicanicon\endcsname {\simpleiconsmapeight\symbol{225}} - \expandafter\def\csname simpleicon@pelotonicon\endcsname {\simpleiconsmapeight\symbol{226}} - \expandafter\def\csname simpleicon@pennyicon\endcsname {\simpleiconsmapeight\symbol{227}} - \expandafter\def\csname simpleicon@penpoticon\endcsname {\simpleiconsmapeight\symbol{228}} - \expandafter\def\csname simpleicon@percyicon\endcsname {\simpleiconsmapeight\symbol{229}} - \expandafter\def\csname simpleicon@perforceicon\endcsname {\simpleiconsmapeight\symbol{230}} - \expandafter\def\csname simpleicon@perlicon\endcsname {\simpleiconsmapeight\symbol{231}} - \expandafter\def\csname simpleicon@perplexityicon\endcsname {\simpleiconsmapeight\symbol{232}} - \expandafter\def\csname simpleicon@persistenticon\endcsname {\simpleiconsmapeight\symbol{233}} - \expandafter\def\csname simpleicon@personioicon\endcsname {\simpleiconsmapeight\symbol{234}} - \expandafter\def\csname simpleicon@petsathomeicon\endcsname {\simpleiconsmapeight\symbol{235}} - \expandafter\def\csname simpleicon@peugeoticon\endcsname {\simpleiconsmapeight\symbol{236}} - \expandafter\def\csname simpleicon@pexelsicon\endcsname {\simpleiconsmapeight\symbol{237}} - \expandafter\def\csname simpleicon@pfsenseicon\endcsname {\simpleiconsmapeight\symbol{238}} - \expandafter\def\csname simpleicon@phabricatoricon\endcsname {\simpleiconsmapeight\symbol{239}} - \expandafter\def\csname simpleicon@philipshueicon\endcsname {\simpleiconsmapeight\symbol{240}} - \expandafter\def\csname simpleicon@phoenixframeworkicon\endcsname {\simpleiconsmapeight\symbol{241}} - \expandafter\def\csname simpleicon@phonepeicon\endcsname {\simpleiconsmapeight\symbol{242}} - \expandafter\def\csname simpleicon@phosphoriconsicon\endcsname {\simpleiconsmapeight\symbol{243}} - \expandafter\def\csname simpleicon@photobucketicon\endcsname {\simpleiconsmapeight\symbol{244}} - \expandafter\def\csname simpleicon@photocrowdicon\endcsname {\simpleiconsmapeight\symbol{245}} - \expandafter\def\csname simpleicon@photonicon\endcsname {\simpleiconsmapeight\symbol{246}} - \expandafter\def\csname simpleicon@photopeaicon\endcsname {\simpleiconsmapeight\symbol{247}} - \expandafter\def\csname simpleicon@phpicon\endcsname {\simpleiconsmapeight\symbol{248}} - \expandafter\def\csname simpleicon@phpmyadminicon\endcsname {\simpleiconsmapeight\symbol{249}} - \expandafter\def\csname simpleicon@phpstormicon\endcsname {\simpleiconsmapeight\symbol{250}} - \expandafter\def\csname simpleicon@piaggiogroupicon\endcsname {\simpleiconsmapeight\symbol{251}} - \expandafter\def\csname simpleicon@piaproicon\endcsname {\simpleiconsmapeight\symbol{252}} - \expandafter\def\csname simpleicon@picardsurgelesicon\endcsname {\simpleiconsmapeight\symbol{253}} - \expandafter\def\csname simpleicon@picartodottvicon\endcsname {\simpleiconsmapeight\symbol{254}} - \expandafter\def\csname simpleicon@picnicicon\endcsname {\simpleiconsmapeight\symbol{255}} - \expandafter\def\csname simpleicon@picpayicon\endcsname {\simpleiconsmapnine\symbol{0}} - \expandafter\def\csname simpleicon@picrewicon\endcsname {\simpleiconsmapnine\symbol{1}} - \expandafter\def\csname simpleicon@picxyicon\endcsname {\simpleiconsmapnine\symbol{2}} - \expandafter\def\csname simpleicon@piholeicon\endcsname {\simpleiconsmapnine\symbol{3}} - \expandafter\def\csname simpleicon@pimcoreicon\endcsname {\simpleiconsmapnine\symbol{4}} - \expandafter\def\csname simpleicon@pinboardicon\endcsname {\simpleiconsmapnine\symbol{5}} - \expandafter\def\csname simpleicon@pinescripticon\endcsname {\simpleiconsmapnine\symbol{6}} - \expandafter\def\csname simpleicon@pinetworkicon\endcsname {\simpleiconsmapnine\symbol{7}} - \expandafter\def\csname simpleicon@pingdomicon\endcsname {\simpleiconsmapnine\symbol{8}} - \expandafter\def\csname simpleicon@pinoicon\endcsname {\simpleiconsmapnine\symbol{9}} - \expandafter\def\csname simpleicon@pinteresticon\endcsname {\simpleiconsmapnine\symbol{10}} - \expandafter\def\csname simpleicon@pioneerdjicon\endcsname {\simpleiconsmapnine\symbol{11}} - \expandafter\def\csname simpleicon@pipedicon\endcsname {\simpleiconsmapnine\symbol{12}} - \expandafter\def\csname simpleicon@pipxicon\endcsname {\simpleiconsmapnine\symbol{13}} - \expandafter\def\csname simpleicon@pivotaltrackericon\endcsname {\simpleiconsmapnine\symbol{14}} - \expandafter\def\csname simpleicon@piwigoicon\endcsname {\simpleiconsmapnine\symbol{15}} - \expandafter\def\csname simpleicon@pixicon\endcsname {\simpleiconsmapnine\symbol{16}} - \expandafter\def\csname simpleicon@pixabayicon\endcsname {\simpleiconsmapnine\symbol{17}} - \expandafter\def\csname simpleicon@pixelfedicon\endcsname {\simpleiconsmapnine\symbol{18}} - \expandafter\def\csname simpleicon@pixivicon\endcsname {\simpleiconsmapnine\symbol{19}} - \expandafter\def\csname simpleicon@pixlricon\endcsname {\simpleiconsmapnine\symbol{20}} - \expandafter\def\csname simpleicon@pkgsrcicon\endcsname {\simpleiconsmapnine\symbol{21}} - \expandafter\def\csname simpleicon@planeticon\endcsname {\simpleiconsmapnine\symbol{22}} - \expandafter\def\csname simpleicon@planetscaleicon\endcsname {\simpleiconsmapnine\symbol{23}} - \expandafter\def\csname simpleicon@plangridicon\endcsname {\simpleiconsmapnine\symbol{24}} - \expandafter\def\csname simpleicon@platformdotshicon\endcsname {\simpleiconsmapnine\symbol{25}} - \expandafter\def\csname simpleicon@platformioicon\endcsname {\simpleiconsmapnine\symbol{26}} - \expandafter\def\csname simpleicon@platziicon\endcsname {\simpleiconsmapnine\symbol{27}} - \expandafter\def\csname simpleicon@plausibleanalyticsicon\endcsname {\simpleiconsmapnine\symbol{28}} - \expandafter\def\csname simpleicon@playcanvasicon\endcsname {\simpleiconsmapnine\symbol{29}} - \expandafter\def\csname simpleicon@playerdotmeicon\endcsname {\simpleiconsmapnine\symbol{30}} - \expandafter\def\csname simpleicon@playerfmicon\endcsname {\simpleiconsmapnine\symbol{31}} - \expandafter\def\csname simpleicon@playstationicon\endcsname {\simpleiconsmapnine\symbol{32}} - \expandafter\def\csname simpleicon@playstation2icon\endcsname {\simpleiconsmapnine\symbol{33}} - \expandafter\def\csname simpleicon@playstation3icon\endcsname {\simpleiconsmapnine\symbol{34}} - \expandafter\def\csname simpleicon@playstation4icon\endcsname {\simpleiconsmapnine\symbol{35}} - \expandafter\def\csname simpleicon@playstation5icon\endcsname {\simpleiconsmapnine\symbol{36}} - \expandafter\def\csname simpleicon@playstationportableicon\endcsname {\simpleiconsmapnine\symbol{37}} - \expandafter\def\csname simpleicon@playstationvitaicon\endcsname {\simpleiconsmapnine\symbol{38}} - \expandafter\def\csname simpleicon@pleromaicon\endcsname {\simpleiconsmapnine\symbol{39}} - \expandafter\def\csname simpleicon@pleskicon\endcsname {\simpleiconsmapnine\symbol{40}} - \expandafter\def\csname simpleicon@plexicon\endcsname {\simpleiconsmapnine\symbol{41}} - \expandafter\def\csname simpleicon@plotlyicon\endcsname {\simpleiconsmapnine\symbol{42}} - \expandafter\def\csname simpleicon@plumeicon\endcsname {\simpleiconsmapnine\symbol{43}} - \expandafter\def\csname simpleicon@pluralsighticon\endcsname {\simpleiconsmapnine\symbol{44}} - \expandafter\def\csname simpleicon@plurkicon\endcsname {\simpleiconsmapnine\symbol{45}} - \expandafter\def\csname simpleicon@pluscodesicon\endcsname {\simpleiconsmapnine\symbol{46}} - \expandafter\def\csname simpleicon@pm2icon\endcsname {\simpleiconsmapnine\symbol{47}} - \expandafter\def\csname simpleicon@pnpmicon\endcsname {\simpleiconsmapnine\symbol{48}} - \expandafter\def\csname simpleicon@pocketicon\endcsname {\simpleiconsmapnine\symbol{49}} - \expandafter\def\csname simpleicon@pocketbaseicon\endcsname {\simpleiconsmapnine\symbol{50}} - \expandafter\def\csname simpleicon@pocketcastsicon\endcsname {\simpleiconsmapnine\symbol{51}} - \expandafter\def\csname simpleicon@podcastaddicticon\endcsname {\simpleiconsmapnine\symbol{52}} - \expandafter\def\csname simpleicon@podcastindexicon\endcsname {\simpleiconsmapnine\symbol{53}} - \expandafter\def\csname simpleicon@podmanicon\endcsname {\simpleiconsmapnine\symbol{54}} - \expandafter\def\csname simpleicon@poeicon\endcsname {\simpleiconsmapnine\symbol{55}} - \expandafter\def\csname simpleicon@poetryicon\endcsname {\simpleiconsmapnine\symbol{56}} - \expandafter\def\csname simpleicon@pointyicon\endcsname {\simpleiconsmapnine\symbol{57}} - \expandafter\def\csname simpleicon@pokemonicon\endcsname {\simpleiconsmapnine\symbol{58}} - \expandafter\def\csname simpleicon@polarsicon\endcsname {\simpleiconsmapnine\symbol{59}} - \expandafter\def\csname simpleicon@polestaricon\endcsname {\simpleiconsmapnine\symbol{60}} - \expandafter\def\csname simpleicon@polkadoticon\endcsname {\simpleiconsmapnine\symbol{61}} - \expandafter\def\csname simpleicon@polyicon\endcsname {\simpleiconsmapnine\symbol{62}} - \expandafter\def\csname simpleicon@polygonicon\endcsname {\simpleiconsmapnine\symbol{63}} - \expandafter\def\csname simpleicon@polymerprojecticon\endcsname {\simpleiconsmapnine\symbol{64}} - \expandafter\def\csname simpleicon@polyworkicon\endcsname {\simpleiconsmapnine\symbol{65}} - \expandafter\def\csname simpleicon@pond5icon\endcsname {\simpleiconsmapnine\symbol{66}} - \expandafter\def\csname simpleicon@poposicon\endcsname {\simpleiconsmapnine\symbol{67}} - \expandafter\def\csname simpleicon@porkbunicon\endcsname {\simpleiconsmapnine\symbol{68}} - \expandafter\def\csname simpleicon@porscheicon\endcsname {\simpleiconsmapnine\symbol{69}} - \expandafter\def\csname simpleicon@portainericon\endcsname {\simpleiconsmapnine\symbol{70}} - \expandafter\def\csname simpleicon@portswiggericon\endcsname {\simpleiconsmapnine\symbol{71}} - \expandafter\def\csname simpleicon@positicon\endcsname {\simpleiconsmapnine\symbol{72}} - \expandafter\def\csname simpleicon@postcssicon\endcsname {\simpleiconsmapnine\symbol{73}} - \expandafter\def\csname simpleicon@postgresqlicon\endcsname {\simpleiconsmapnine\symbol{74}} - \expandafter\def\csname simpleicon@posthogicon\endcsname {\simpleiconsmapnine\symbol{75}} - \expandafter\def\csname simpleicon@postmanicon\endcsname {\simpleiconsmapnine\symbol{76}} - \expandafter\def\csname simpleicon@postmatesicon\endcsname {\simpleiconsmapnine\symbol{77}} - \expandafter\def\csname simpleicon@powersicon\endcsname {\simpleiconsmapnine\symbol{78}} - \expandafter\def\csname simpleicon@prdotcoicon\endcsname {\simpleiconsmapnine\symbol{79}} - \expandafter\def\csname simpleicon@preacticon\endcsname {\simpleiconsmapnine\symbol{80}} - \expandafter\def\csname simpleicon@precommiticon\endcsname {\simpleiconsmapnine\symbol{81}} - \expandafter\def\csname simpleicon@prefecticon\endcsname {\simpleiconsmapnine\symbol{82}} - \expandafter\def\csname simpleicon@premierleagueicon\endcsname {\simpleiconsmapnine\symbol{83}} - \expandafter\def\csname simpleicon@prepbytesicon\endcsname {\simpleiconsmapnine\symbol{84}} - \expandafter\def\csname simpleicon@prestashopicon\endcsname {\simpleiconsmapnine\symbol{85}} - \expandafter\def\csname simpleicon@prestoicon\endcsname {\simpleiconsmapnine\symbol{86}} - \expandafter\def\csname simpleicon@prettiericon\endcsname {\simpleiconsmapnine\symbol{87}} - \expandafter\def\csname simpleicon@pretzelicon\endcsname {\simpleiconsmapnine\symbol{88}} - \expandafter\def\csname simpleicon@preventionicon\endcsname {\simpleiconsmapnine\symbol{89}} - \expandafter\def\csname simpleicon@preziicon\endcsname {\simpleiconsmapnine\symbol{90}} - \expandafter\def\csname simpleicon@primeicon\endcsname {\simpleiconsmapnine\symbol{91}} - \expandafter\def\csname simpleicon@primengicon\endcsname {\simpleiconsmapnine\symbol{92}} - \expandafter\def\csname simpleicon@primereacticon\endcsname {\simpleiconsmapnine\symbol{93}} - \expandafter\def\csname simpleicon@primevideoicon\endcsname {\simpleiconsmapnine\symbol{94}} - \expandafter\def\csname simpleicon@printablesicon\endcsname {\simpleiconsmapnine\symbol{95}} - \expandafter\def\csname simpleicon@prismaicon\endcsname {\simpleiconsmapnine\symbol{96}} - \expandafter\def\csname simpleicon@prismicicon\endcsname {\simpleiconsmapnine\symbol{97}} - \expandafter\def\csname simpleicon@privatedivisionicon\endcsname {\simpleiconsmapnine\symbol{98}} - \expandafter\def\csname simpleicon@privateinternetaccessicon\endcsname {\simpleiconsmapnine\symbol{99}} - \expandafter\def\csname simpleicon@proboticon\endcsname {\simpleiconsmapnine\symbol{100}} - \expandafter\def\csname simpleicon@processingfoundationicon\endcsname {\simpleiconsmapnine\symbol{101}} - \expandafter\def\csname simpleicon@processwireicon\endcsname {\simpleiconsmapnine\symbol{102}} - \expandafter\def\csname simpleicon@producthunticon\endcsname {\simpleiconsmapnine\symbol{103}} - \expandafter\def\csname simpleicon@progateicon\endcsname {\simpleiconsmapnine\symbol{104}} - \expandafter\def\csname simpleicon@progressicon\endcsname {\simpleiconsmapnine\symbol{105}} - \expandafter\def\csname simpleicon@prometheusicon\endcsname {\simpleiconsmapnine\symbol{106}} - \expandafter\def\csname simpleicon@pronounsdotpageicon\endcsname {\simpleiconsmapnine\symbol{107}} - \expandafter\def\csname simpleicon@prosiebenicon\endcsname {\simpleiconsmapnine\symbol{108}} - \expandafter\def\csname simpleicon@proteusicon\endcsname {\simpleiconsmapnine\symbol{109}} - \expandafter\def\csname simpleicon@protocolsdotioicon\endcsname {\simpleiconsmapnine\symbol{110}} - \expandafter\def\csname simpleicon@protodotioicon\endcsname {\simpleiconsmapnine\symbol{111}} - \expandafter\def\csname simpleicon@protonicon\endcsname {\simpleiconsmapnine\symbol{112}} - \expandafter\def\csname simpleicon@protoncalendaricon\endcsname {\simpleiconsmapnine\symbol{113}} - \expandafter\def\csname simpleicon@protondbicon\endcsname {\simpleiconsmapnine\symbol{114}} - \expandafter\def\csname simpleicon@protondriveicon\endcsname {\simpleiconsmapnine\symbol{115}} - \expandafter\def\csname simpleicon@protonmailicon\endcsname {\simpleiconsmapnine\symbol{116}} - \expandafter\def\csname simpleicon@protonvpnicon\endcsname {\simpleiconsmapnine\symbol{117}} - \expandafter\def\csname simpleicon@protoolsicon\endcsname {\simpleiconsmapnine\symbol{118}} - \expandafter\def\csname simpleicon@protractoricon\endcsname {\simpleiconsmapnine\symbol{119}} - \expandafter\def\csname simpleicon@proxmoxicon\endcsname {\simpleiconsmapnine\symbol{120}} - \expandafter\def\csname simpleicon@pterodactylicon\endcsname {\simpleiconsmapnine\symbol{121}} - \expandafter\def\csname simpleicon@pubgicon\endcsname {\simpleiconsmapnine\symbol{122}} - \expandafter\def\csname simpleicon@publonsicon\endcsname {\simpleiconsmapnine\symbol{123}} - \expandafter\def\csname simpleicon@pubmedicon\endcsname {\simpleiconsmapnine\symbol{124}} - \expandafter\def\csname simpleicon@pugicon\endcsname {\simpleiconsmapnine\symbol{125}} - \expandafter\def\csname simpleicon@pulumiicon\endcsname {\simpleiconsmapnine\symbol{126}} - \expandafter\def\csname simpleicon@pumaicon\endcsname {\simpleiconsmapnine\symbol{127}} - \expandafter\def\csname simpleicon@puppeticon\endcsname {\simpleiconsmapnine\symbol{128}} - \expandafter\def\csname simpleicon@puppeteericon\endcsname {\simpleiconsmapnine\symbol{129}} - \expandafter\def\csname simpleicon@purescripticon\endcsname {\simpleiconsmapnine\symbol{130}} - \expandafter\def\csname simpleicon@purgecssicon\endcsname {\simpleiconsmapnine\symbol{131}} - \expandafter\def\csname simpleicon@purismicon\endcsname {\simpleiconsmapnine\symbol{132}} - \expandafter\def\csname simpleicon@pushbulleticon\endcsname {\simpleiconsmapnine\symbol{133}} - \expandafter\def\csname simpleicon@pushericon\endcsname {\simpleiconsmapnine\symbol{134}} - \expandafter\def\csname simpleicon@pwaicon\endcsname {\simpleiconsmapnine\symbol{135}} - \expandafter\def\csname simpleicon@pycharmicon\endcsname {\simpleiconsmapnine\symbol{136}} - \expandafter\def\csname simpleicon@pycqaicon\endcsname {\simpleiconsmapnine\symbol{137}} - \expandafter\def\csname simpleicon@pydanticicon\endcsname {\simpleiconsmapnine\symbol{138}} - \expandafter\def\csname simpleicon@pygicon\endcsname {\simpleiconsmapnine\symbol{139}} - \expandafter\def\csname simpleicon@pypiicon\endcsname {\simpleiconsmapnine\symbol{140}} - \expandafter\def\csname simpleicon@pypyicon\endcsname {\simpleiconsmapnine\symbol{141}} - \expandafter\def\csname simpleicon@pyscaffoldicon\endcsname {\simpleiconsmapnine\symbol{142}} - \expandafter\def\csname simpleicon@pysyfticon\endcsname {\simpleiconsmapnine\symbol{143}} - \expandafter\def\csname simpleicon@pytesticon\endcsname {\simpleiconsmapnine\symbol{144}} - \expandafter\def\csname simpleicon@pythonicon\endcsname {\simpleiconsmapnine\symbol{145}} - \expandafter\def\csname simpleicon@pythonanywhereicon\endcsname {\simpleiconsmapnine\symbol{146}} - \expandafter\def\csname simpleicon@pytorchicon\endcsname {\simpleiconsmapnine\symbol{147}} - \expandafter\def\csname simpleicon@pyupicon\endcsname {\simpleiconsmapnine\symbol{148}} - \expandafter\def\csname simpleicon@qantasicon\endcsname {\simpleiconsmapnine\symbol{149}} - \expandafter\def\csname simpleicon@qaseicon\endcsname {\simpleiconsmapnine\symbol{150}} - \expandafter\def\csname simpleicon@qatarairwaysicon\endcsname {\simpleiconsmapnine\symbol{151}} - \expandafter\def\csname simpleicon@qbittorrenticon\endcsname {\simpleiconsmapnine\symbol{152}} - \expandafter\def\csname simpleicon@qemuicon\endcsname {\simpleiconsmapnine\symbol{153}} - \expandafter\def\csname simpleicon@qgisicon\endcsname {\simpleiconsmapnine\symbol{154}} - \expandafter\def\csname simpleicon@qiicon\endcsname {\simpleiconsmapnine\symbol{155}} - \expandafter\def\csname simpleicon@qiitaicon\endcsname {\simpleiconsmapnine\symbol{156}} - \expandafter\def\csname simpleicon@qiskiticon\endcsname {\simpleiconsmapnine\symbol{157}} - \expandafter\def\csname simpleicon@qiwiicon\endcsname {\simpleiconsmapnine\symbol{158}} - \expandafter\def\csname simpleicon@qlikicon\endcsname {\simpleiconsmapnine\symbol{159}} - \expandafter\def\csname simpleicon@qmkicon\endcsname {\simpleiconsmapnine\symbol{160}} - \expandafter\def\csname simpleicon@qnapicon\endcsname {\simpleiconsmapnine\symbol{161}} - \expandafter\def\csname simpleicon@qticon\endcsname {\simpleiconsmapnine\symbol{162}} - \expandafter\def\csname simpleicon@qualcommicon\endcsname {\simpleiconsmapnine\symbol{163}} - \expandafter\def\csname simpleicon@qualtricsicon\endcsname {\simpleiconsmapnine\symbol{164}} - \expandafter\def\csname simpleicon@qualysicon\endcsname {\simpleiconsmapnine\symbol{165}} - \expandafter\def\csname simpleicon@quantcasticon\endcsname {\simpleiconsmapnine\symbol{166}} - \expandafter\def\csname simpleicon@quantconnecticon\endcsname {\simpleiconsmapnine\symbol{167}} - \expandafter\def\csname simpleicon@quarkusicon\endcsname {\simpleiconsmapnine\symbol{168}} - \expandafter\def\csname simpleicon@quartoicon\endcsname {\simpleiconsmapnine\symbol{169}} - \expandafter\def\csname simpleicon@quasaricon\endcsname {\simpleiconsmapnine\symbol{170}} - \expandafter\def\csname simpleicon@qubesosicon\endcsname {\simpleiconsmapnine\symbol{171}} - \expandafter\def\csname simpleicon@questicon\endcsname {\simpleiconsmapnine\symbol{172}} - \expandafter\def\csname simpleicon@quickbooksicon\endcsname {\simpleiconsmapnine\symbol{173}} - \expandafter\def\csname simpleicon@quicklookicon\endcsname {\simpleiconsmapnine\symbol{174}} - \expandafter\def\csname simpleicon@quicktimeicon\endcsname {\simpleiconsmapnine\symbol{175}} - \expandafter\def\csname simpleicon@quicktypeicon\endcsname {\simpleiconsmapnine\symbol{176}} - \expandafter\def\csname simpleicon@quipicon\endcsname {\simpleiconsmapnine\symbol{177}} - \expandafter\def\csname simpleicon@quizleticon\endcsname {\simpleiconsmapnine\symbol{178}} - \expandafter\def\csname simpleicon@quoraicon\endcsname {\simpleiconsmapnine\symbol{179}} - \expandafter\def\csname simpleicon@qwanticon\endcsname {\simpleiconsmapnine\symbol{180}} - \expandafter\def\csname simpleicon@qwikicon\endcsname {\simpleiconsmapnine\symbol{181}} - \expandafter\def\csname simpleicon@qwiklabsicon\endcsname {\simpleiconsmapnine\symbol{182}} - \expandafter\def\csname simpleicon@qzoneicon\endcsname {\simpleiconsmapnine\symbol{183}} - \expandafter\def\csname simpleicon@ricon\endcsname {\simpleiconsmapnine\symbol{184}} - \expandafter\def\csname simpleicon@r3icon\endcsname {\simpleiconsmapnine\symbol{185}} - \expandafter\def\csname simpleicon@rabbitmqicon\endcsname {\simpleiconsmapnine\symbol{186}} - \expandafter\def\csname simpleicon@racketicon\endcsname {\simpleiconsmapnine\symbol{187}} - \expandafter\def\csname simpleicon@radaricon\endcsname {\simpleiconsmapnine\symbol{188}} - \expandafter\def\csname simpleicon@radarricon\endcsname {\simpleiconsmapnine\symbol{189}} - \expandafter\def\csname simpleicon@radiopublicicon\endcsname {\simpleiconsmapnine\symbol{190}} - \expandafter\def\csname simpleicon@radixuiicon\endcsname {\simpleiconsmapnine\symbol{191}} - \expandafter\def\csname simpleicon@radstudioicon\endcsname {\simpleiconsmapnine\symbol{192}} - \expandafter\def\csname simpleicon@railwayicon\endcsname {\simpleiconsmapnine\symbol{193}} - \expandafter\def\csname simpleicon@rainmetericon\endcsname {\simpleiconsmapnine\symbol{194}} - \expandafter\def\csname simpleicon@rakutenicon\endcsname {\simpleiconsmapnine\symbol{195}} - \expandafter\def\csname simpleicon@ramicon\endcsname {\simpleiconsmapnine\symbol{196}} - \expandafter\def\csname simpleicon@ranchericon\endcsname {\simpleiconsmapnine\symbol{197}} - \expandafter\def\csname simpleicon@rapidicon\endcsname {\simpleiconsmapnine\symbol{198}} - \expandafter\def\csname simpleicon@raribleicon\endcsname {\simpleiconsmapnine\symbol{199}} - \expandafter\def\csname simpleicon@rasaicon\endcsname {\simpleiconsmapnine\symbol{200}} - \expandafter\def\csname simpleicon@raspberrypiicon\endcsname {\simpleiconsmapnine\symbol{201}} - \expandafter\def\csname simpleicon@ravelryicon\endcsname {\simpleiconsmapnine\symbol{202}} - \expandafter\def\csname simpleicon@rayicon\endcsname {\simpleiconsmapnine\symbol{203}} - \expandafter\def\csname simpleicon@raycasticon\endcsname {\simpleiconsmapnine\symbol{204}} - \expandafter\def\csname simpleicon@raylibicon\endcsname {\simpleiconsmapnine\symbol{205}} - \expandafter\def\csname simpleicon@razericon\endcsname {\simpleiconsmapnine\symbol{206}} - \expandafter\def\csname simpleicon@razorpayicon\endcsname {\simpleiconsmapnine\symbol{207}} - \expandafter\def\csname simpleicon@rcloneicon\endcsname {\simpleiconsmapnine\symbol{208}} - \expandafter\def\csname simpleicon@reacticon\endcsname {\simpleiconsmapnine\symbol{209}} - \expandafter\def\csname simpleicon@reactbootstrapicon\endcsname {\simpleiconsmapnine\symbol{210}} - \expandafter\def\csname simpleicon@reacthookformicon\endcsname {\simpleiconsmapnine\symbol{211}} - \expandafter\def\csname simpleicon@reactiveresumeicon\endcsname {\simpleiconsmapnine\symbol{212}} - \expandafter\def\csname simpleicon@reactivexicon\endcsname {\simpleiconsmapnine\symbol{213}} - \expandafter\def\csname simpleicon@reactosicon\endcsname {\simpleiconsmapnine\symbol{214}} - \expandafter\def\csname simpleicon@reactqueryicon\endcsname {\simpleiconsmapnine\symbol{215}} - \expandafter\def\csname simpleicon@reactroutericon\endcsname {\simpleiconsmapnine\symbol{216}} - \expandafter\def\csname simpleicon@reacttableicon\endcsname {\simpleiconsmapnine\symbol{217}} - \expandafter\def\csname simpleicon@readdotcvicon\endcsname {\simpleiconsmapnine\symbol{218}} - \expandafter\def\csname simpleicon@readmeicon\endcsname {\simpleiconsmapnine\symbol{219}} - \expandafter\def\csname simpleicon@readthedocsicon\endcsname {\simpleiconsmapnine\symbol{220}} - \expandafter\def\csname simpleicon@realmicon\endcsname {\simpleiconsmapnine\symbol{221}} - \expandafter\def\csname simpleicon@reasonicon\endcsname {\simpleiconsmapnine\symbol{222}} - \expandafter\def\csname simpleicon@reasonstudiosicon\endcsname {\simpleiconsmapnine\symbol{223}} - \expandafter\def\csname simpleicon@recoilicon\endcsname {\simpleiconsmapnine\symbol{224}} - \expandafter\def\csname simpleicon@redicon\endcsname {\simpleiconsmapnine\symbol{225}} - \expandafter\def\csname simpleicon@redashicon\endcsname {\simpleiconsmapnine\symbol{226}} - \expandafter\def\csname simpleicon@redbubbleicon\endcsname {\simpleiconsmapnine\symbol{227}} - \expandafter\def\csname simpleicon@redbullicon\endcsname {\simpleiconsmapnine\symbol{228}} - \expandafter\def\csname simpleicon@redditicon\endcsname {\simpleiconsmapnine\symbol{229}} - \expandafter\def\csname simpleicon@redhaticon\endcsname {\simpleiconsmapnine\symbol{230}} - \expandafter\def\csname simpleicon@redhatopenshifticon\endcsname {\simpleiconsmapnine\symbol{231}} - \expandafter\def\csname simpleicon@redisicon\endcsname {\simpleiconsmapnine\symbol{232}} - \expandafter\def\csname simpleicon@redmineicon\endcsname {\simpleiconsmapnine\symbol{233}} - \expandafter\def\csname simpleicon@redoxicon\endcsname {\simpleiconsmapnine\symbol{234}} - \expandafter\def\csname simpleicon@redsysicon\endcsname {\simpleiconsmapnine\symbol{235}} - \expandafter\def\csname simpleicon@reduxicon\endcsname {\simpleiconsmapnine\symbol{236}} - \expandafter\def\csname simpleicon@reduxsagaicon\endcsname {\simpleiconsmapnine\symbol{237}} - \expandafter\def\csname simpleicon@redwoodjsicon\endcsname {\simpleiconsmapnine\symbol{238}} - \expandafter\def\csname simpleicon@reebokicon\endcsname {\simpleiconsmapnine\symbol{239}} - \expandafter\def\csname simpleicon@refineicon\endcsname {\simpleiconsmapnine\symbol{240}} - \expandafter\def\csname simpleicon@relayicon\endcsname {\simpleiconsmapnine\symbol{241}} - \expandafter\def\csname simpleicon@relianceindustrieslimitedicon\endcsname {\simpleiconsmapnine\symbol{242}} - \expandafter\def\csname simpleicon@remarkicon\endcsname {\simpleiconsmapnine\symbol{243}} - \expandafter\def\csname simpleicon@remedyentertainmenticon\endcsname {\simpleiconsmapnine\symbol{244}} - \expandafter\def\csname simpleicon@remixicon\endcsname {\simpleiconsmapnine\symbol{245}} - \expandafter\def\csname simpleicon@removedotbgicon\endcsname {\simpleiconsmapnine\symbol{246}} - \expandafter\def\csname simpleicon@renaulticon\endcsname {\simpleiconsmapnine\symbol{247}} - \expandafter\def\csname simpleicon@rendericon\endcsname {\simpleiconsmapnine\symbol{248}} - \expandafter\def\csname simpleicon@renovateicon\endcsname {\simpleiconsmapnine\symbol{249}} - \expandafter\def\csname simpleicon@renpyicon\endcsname {\simpleiconsmapnine\symbol{250}} - \expandafter\def\csname simpleicon@renrenicon\endcsname {\simpleiconsmapnine\symbol{251}} - \expandafter\def\csname simpleicon@repliticon\endcsname {\simpleiconsmapnine\symbol{252}} - \expandafter\def\csname simpleicon@republicofgamersicon\endcsname {\simpleiconsmapnine\symbol{253}} - \expandafter\def\csname simpleicon@rescripticon\endcsname {\simpleiconsmapnine\symbol{254}} - \expandafter\def\csname simpleicon@rescuetimeicon\endcsname {\simpleiconsmapnine\symbol{255}} - \expandafter\def\csname simpleicon@researchgateicon\endcsname {\simpleiconsmaponezero\symbol{0}} - \expandafter\def\csname simpleicon@resendicon\endcsname {\simpleiconsmaponezero\symbol{1}} - \expandafter\def\csname simpleicon@resharpericon\endcsname {\simpleiconsmaponezero\symbol{2}} - \expandafter\def\csname simpleicon@resurrectionremixosicon\endcsname {\simpleiconsmaponezero\symbol{3}} - \expandafter\def\csname simpleicon@retoolicon\endcsname {\simpleiconsmaponezero\symbol{4}} - \expandafter\def\csname simpleicon@retroarchicon\endcsname {\simpleiconsmaponezero\symbol{5}} - \expandafter\def\csname simpleicon@retropieicon\endcsname {\simpleiconsmaponezero\symbol{6}} - \expandafter\def\csname simpleicon@revancedicon\endcsname {\simpleiconsmaponezero\symbol{7}} - \expandafter\def\csname simpleicon@revealdotjsicon\endcsname {\simpleiconsmaponezero\symbol{8}} - \expandafter\def\csname simpleicon@reverbnationicon\endcsname {\simpleiconsmaponezero\symbol{9}} - \expandafter\def\csname simpleicon@revoltdotchaticon\endcsname {\simpleiconsmaponezero\symbol{10}} - \expandafter\def\csname simpleicon@revoluticon\endcsname {\simpleiconsmaponezero\symbol{11}} - \expandafter\def\csname simpleicon@revueicon\endcsname {\simpleiconsmaponezero\symbol{12}} - \expandafter\def\csname simpleicon@reweicon\endcsname {\simpleiconsmaponezero\symbol{13}} - \expandafter\def\csname simpleicon@rezgoicon\endcsname {\simpleiconsmaponezero\symbol{14}} - \expandafter\def\csname simpleicon@rhinocerosicon\endcsname {\simpleiconsmaponezero\symbol{15}} - \expandafter\def\csname simpleicon@richicon\endcsname {\simpleiconsmaponezero\symbol{16}} - \expandafter\def\csname simpleicon@ridericon\endcsname {\simpleiconsmaponezero\symbol{17}} - \expandafter\def\csname simpleicon@rimacautomobiliicon\endcsname {\simpleiconsmaponezero\symbol{18}} - \expandafter\def\csname simpleicon@rimeicon\endcsname {\simpleiconsmaponezero\symbol{19}} - \expandafter\def\csname simpleicon@ringicon\endcsname {\simpleiconsmaponezero\symbol{20}} - \expandafter\def\csname simpleicon@riotgamesicon\endcsname {\simpleiconsmaponezero\symbol{21}} - \expandafter\def\csname simpleicon@rippleicon\endcsname {\simpleiconsmaponezero\symbol{22}} - \expandafter\def\csname simpleicon@riscvicon\endcsname {\simpleiconsmaponezero\symbol{23}} - \expandafter\def\csname simpleicon@riseupicon\endcsname {\simpleiconsmaponezero\symbol{24}} - \expandafter\def\csname simpleicon@ritzcarltonicon\endcsname {\simpleiconsmaponezero\symbol{25}} - \expandafter\def\csname simpleicon@riveicon\endcsname {\simpleiconsmaponezero\symbol{26}} - \expandafter\def\csname simpleicon@roadmapdotshicon\endcsname {\simpleiconsmaponezero\symbol{27}} - \expandafter\def\csname simpleicon@roamresearchicon\endcsname {\simpleiconsmaponezero\symbol{28}} - \expandafter\def\csname simpleicon@robinhoodicon\endcsname {\simpleiconsmaponezero\symbol{29}} - \expandafter\def\csname simpleicon@robloxicon\endcsname {\simpleiconsmaponezero\symbol{30}} - \expandafter\def\csname simpleicon@robloxstudioicon\endcsname {\simpleiconsmaponezero\symbol{31}} - \expandafter\def\csname simpleicon@robotframeworkicon\endcsname {\simpleiconsmaponezero\symbol{32}} - \expandafter\def\csname simpleicon@rocketicon\endcsname {\simpleiconsmaponezero\symbol{33}} - \expandafter\def\csname simpleicon@rocketdotchaticon\endcsname {\simpleiconsmaponezero\symbol{34}} - \expandafter\def\csname simpleicon@rocksdbicon\endcsname {\simpleiconsmaponezero\symbol{35}} - \expandafter\def\csname simpleicon@rockstargamesicon\endcsname {\simpleiconsmaponezero\symbol{36}} - \expandafter\def\csname simpleicon@rockwellautomationicon\endcsname {\simpleiconsmaponezero\symbol{37}} - \expandafter\def\csname simpleicon@rockylinuxicon\endcsname {\simpleiconsmaponezero\symbol{38}} - \expandafter\def\csname simpleicon@rokuicon\endcsname {\simpleiconsmaponezero\symbol{39}} - \expandafter\def\csname simpleicon@roll20icon\endcsname {\simpleiconsmaponezero\symbol{40}} - \expandafter\def\csname simpleicon@rollsroyceicon\endcsname {\simpleiconsmaponezero\symbol{41}} - \expandafter\def\csname simpleicon@rollupdotjsicon\endcsname {\simpleiconsmaponezero\symbol{42}} - \expandafter\def\csname simpleicon@roonicon\endcsname {\simpleiconsmaponezero\symbol{43}} - \expandafter\def\csname simpleicon@rootmeicon\endcsname {\simpleiconsmaponezero\symbol{44}} - \expandafter\def\csname simpleicon@rootsicon\endcsname {\simpleiconsmaponezero\symbol{45}} - \expandafter\def\csname simpleicon@rootsbedrockicon\endcsname {\simpleiconsmaponezero\symbol{46}} - \expandafter\def\csname simpleicon@rootssageicon\endcsname {\simpleiconsmaponezero\symbol{47}} - \expandafter\def\csname simpleicon@rosicon\endcsname {\simpleiconsmaponezero\symbol{48}} - \expandafter\def\csname simpleicon@rossmannicon\endcsname {\simpleiconsmaponezero\symbol{49}} - \expandafter\def\csname simpleicon@rotaryinternationalicon\endcsname {\simpleiconsmaponezero\symbol{50}} - \expandafter\def\csname simpleicon@rottentomatoesicon\endcsname {\simpleiconsmaponezero\symbol{51}} - \expandafter\def\csname simpleicon@roundcubeicon\endcsname {\simpleiconsmaponezero\symbol{52}} - \expandafter\def\csname simpleicon@rsocketicon\endcsname {\simpleiconsmaponezero\symbol{53}} - \expandafter\def\csname simpleicon@rssicon\endcsname {\simpleiconsmaponezero\symbol{54}} - \expandafter\def\csname simpleicon@rstudioideicon\endcsname {\simpleiconsmaponezero\symbol{55}} - \expandafter\def\csname simpleicon@rteicon\endcsname {\simpleiconsmaponezero\symbol{56}} - \expandafter\def\csname simpleicon@rtlicon\endcsname {\simpleiconsmaponezero\symbol{57}} - \expandafter\def\csname simpleicon@rtlzweiicon\endcsname {\simpleiconsmaponezero\symbol{58}} - \expandafter\def\csname simpleicon@rtmicon\endcsname {\simpleiconsmaponezero\symbol{59}} - \expandafter\def\csname simpleicon@rubocopicon\endcsname {\simpleiconsmaponezero\symbol{60}} - \expandafter\def\csname simpleicon@rubyicon\endcsname {\simpleiconsmaponezero\symbol{61}} - \expandafter\def\csname simpleicon@rubygemsicon\endcsname {\simpleiconsmaponezero\symbol{62}} - \expandafter\def\csname simpleicon@rubymineicon\endcsname {\simpleiconsmaponezero\symbol{63}} - \expandafter\def\csname simpleicon@rubyonrailsicon\endcsname {\simpleiconsmaponezero\symbol{64}} - \expandafter\def\csname simpleicon@rubysinatraicon\endcsname {\simpleiconsmaponezero\symbol{65}} - \expandafter\def\csname simpleicon@rufficon\endcsname {\simpleiconsmaponezero\symbol{66}} - \expandafter\def\csname simpleicon@rumahwebicon\endcsname {\simpleiconsmaponezero\symbol{67}} - \expandafter\def\csname simpleicon@rumbleicon\endcsname {\simpleiconsmaponezero\symbol{68}} - \expandafter\def\csname simpleicon@rundeckicon\endcsname {\simpleiconsmaponezero\symbol{69}} - \expandafter\def\csname simpleicon@runkeepericon\endcsname {\simpleiconsmaponezero\symbol{70}} - \expandafter\def\csname simpleicon@runkiticon\endcsname {\simpleiconsmaponezero\symbol{71}} - \expandafter\def\csname simpleicon@runrundotiticon\endcsname {\simpleiconsmaponezero\symbol{72}} - \expandafter\def\csname simpleicon@rusticon\endcsname {\simpleiconsmaponezero\symbol{73}} - \expandafter\def\csname simpleicon@rustdeskicon\endcsname {\simpleiconsmaponezero\symbol{74}} - \expandafter\def\csname simpleicon@rxdbicon\endcsname {\simpleiconsmaponezero\symbol{75}} - \expandafter\def\csname simpleicon@ryanairicon\endcsname {\simpleiconsmaponezero\symbol{76}} - \expandafter\def\csname simpleicon@ryeicon\endcsname {\simpleiconsmaponezero\symbol{77}} - \expandafter\def\csname simpleicon@s7airlinesicon\endcsname {\simpleiconsmaponezero\symbol{78}} - \expandafter\def\csname simpleicon@sabanciicon\endcsname {\simpleiconsmaponezero\symbol{79}} - \expandafter\def\csname simpleicon@safariicon\endcsname {\simpleiconsmaponezero\symbol{80}} - \expandafter\def\csname simpleicon@sageicon\endcsname {\simpleiconsmaponezero\symbol{81}} - \expandafter\def\csname simpleicon@sahibindenicon\endcsname {\simpleiconsmaponezero\symbol{82}} - \expandafter\def\csname simpleicon@sailfishosicon\endcsname {\simpleiconsmaponezero\symbol{83}} - \expandafter\def\csname simpleicon@sailsdotjsicon\endcsname {\simpleiconsmaponezero\symbol{84}} - \expandafter\def\csname simpleicon@salesforceicon\endcsname {\simpleiconsmaponezero\symbol{85}} - \expandafter\def\csname simpleicon@sallaicon\endcsname {\simpleiconsmaponezero\symbol{86}} - \expandafter\def\csname simpleicon@saltprojecticon\endcsname {\simpleiconsmaponezero\symbol{87}} - \expandafter\def\csname simpleicon@samsclubicon\endcsname {\simpleiconsmaponezero\symbol{88}} - \expandafter\def\csname simpleicon@samsungicon\endcsname {\simpleiconsmaponezero\symbol{89}} - \expandafter\def\csname simpleicon@samsungpayicon\endcsname {\simpleiconsmaponezero\symbol{90}} - \expandafter\def\csname simpleicon@sandiskicon\endcsname {\simpleiconsmaponezero\symbol{91}} - \expandafter\def\csname simpleicon@sanfranciscomunicipalrailwayicon\endcsname {\simpleiconsmaponezero\symbol{92}} - \expandafter\def\csname simpleicon@sanicicon\endcsname {\simpleiconsmaponezero\symbol{93}} - \expandafter\def\csname simpleicon@sanityicon\endcsname {\simpleiconsmaponezero\symbol{94}} - \expandafter\def\csname simpleicon@saopaulometroicon\endcsname {\simpleiconsmaponezero\symbol{95}} - \expandafter\def\csname simpleicon@sapicon\endcsname {\simpleiconsmaponezero\symbol{96}} - \expandafter\def\csname simpleicon@sartoriusicon\endcsname {\simpleiconsmaponezero\symbol{97}} - \expandafter\def\csname simpleicon@sassicon\endcsname {\simpleiconsmaponezero\symbol{98}} - \expandafter\def\csname simpleicon@sat1icon\endcsname {\simpleiconsmaponezero\symbol{99}} - \expandafter\def\csname simpleicon@satelliteicon\endcsname {\simpleiconsmaponezero\symbol{100}} - \expandafter\def\csname simpleicon@saturnicon\endcsname {\simpleiconsmaponezero\symbol{101}} - \expandafter\def\csname simpleicon@saucelabsicon\endcsname {\simpleiconsmaponezero\symbol{102}} - \expandafter\def\csname simpleicon@saudiaicon\endcsname {\simpleiconsmaponezero\symbol{103}} - \expandafter\def\csname simpleicon@scalaicon\endcsname {\simpleiconsmaponezero\symbol{104}} - \expandafter\def\csname simpleicon@scalewayicon\endcsname {\simpleiconsmaponezero\symbol{105}} - \expandafter\def\csname simpleicon@scaniaicon\endcsname {\simpleiconsmaponezero\symbol{106}} - \expandafter\def\csname simpleicon@schneiderelectricicon\endcsname {\simpleiconsmaponezero\symbol{107}} - \expandafter\def\csname simpleicon@scikitlearnicon\endcsname {\simpleiconsmaponezero\symbol{108}} - \expandafter\def\csname simpleicon@scilabicon\endcsname {\simpleiconsmaponezero\symbol{109}} - \expandafter\def\csname simpleicon@scipyicon\endcsname {\simpleiconsmaponezero\symbol{110}} - \expandafter\def\csname simpleicon@scopusicon\endcsname {\simpleiconsmaponezero\symbol{111}} - \expandafter\def\csname simpleicon@scpfoundationicon\endcsname {\simpleiconsmaponezero\symbol{112}} - \expandafter\def\csname simpleicon@scrapboxicon\endcsname {\simpleiconsmaponezero\symbol{113}} - \expandafter\def\csname simpleicon@scrapyicon\endcsname {\simpleiconsmaponezero\symbol{114}} - \expandafter\def\csname simpleicon@scratchicon\endcsname {\simpleiconsmaponezero\symbol{115}} - \expandafter\def\csname simpleicon@screencastifyicon\endcsname {\simpleiconsmaponezero\symbol{116}} - \expandafter\def\csname simpleicon@scribdicon\endcsname {\simpleiconsmaponezero\symbol{117}} - \expandafter\def\csname simpleicon@scrimbaicon\endcsname {\simpleiconsmaponezero\symbol{118}} - \expandafter\def\csname simpleicon@scrollrevealicon\endcsname {\simpleiconsmaponezero\symbol{119}} - \expandafter\def\csname simpleicon@scrumallianceicon\endcsname {\simpleiconsmaponezero\symbol{120}} - \expandafter\def\csname simpleicon@scrutinizerciicon\endcsname {\simpleiconsmaponezero\symbol{121}} - \expandafter\def\csname simpleicon@scylladbicon\endcsname {\simpleiconsmaponezero\symbol{122}} - \expandafter\def\csname simpleicon@seagateicon\endcsname {\simpleiconsmaponezero\symbol{123}} - \expandafter\def\csname simpleicon@searxngicon\endcsname {\simpleiconsmaponezero\symbol{124}} - \expandafter\def\csname simpleicon@seaticon\endcsname {\simpleiconsmaponezero\symbol{125}} - \expandafter\def\csname simpleicon@seatgeekicon\endcsname {\simpleiconsmaponezero\symbol{126}} - \expandafter\def\csname simpleicon@securityscorecardicon\endcsname {\simpleiconsmaponezero\symbol{127}} - \expandafter\def\csname simpleicon@sefariaicon\endcsname {\simpleiconsmaponezero\symbol{128}} - \expandafter\def\csname simpleicon@segaicon\endcsname {\simpleiconsmaponezero\symbol{129}} - \expandafter\def\csname simpleicon@seleniumicon\endcsname {\simpleiconsmaponezero\symbol{130}} - \expandafter\def\csname simpleicon@sellfyicon\endcsname {\simpleiconsmaponezero\symbol{131}} - \expandafter\def\csname simpleicon@semanticreleaseicon\endcsname {\simpleiconsmaponezero\symbol{132}} - \expandafter\def\csname simpleicon@semanticscholaricon\endcsname {\simpleiconsmaponezero\symbol{133}} - \expandafter\def\csname simpleicon@semanticuiicon\endcsname {\simpleiconsmaponezero\symbol{134}} - \expandafter\def\csname simpleicon@semanticuireacticon\endcsname {\simpleiconsmaponezero\symbol{135}} - \expandafter\def\csname simpleicon@semanticwebicon\endcsname {\simpleiconsmaponezero\symbol{136}} - \expandafter\def\csname simpleicon@semaphoreciicon\endcsname {\simpleiconsmaponezero\symbol{137}} - \expandafter\def\csname simpleicon@semrushicon\endcsname {\simpleiconsmaponezero\symbol{138}} - \expandafter\def\csname simpleicon@semvericon\endcsname {\simpleiconsmaponezero\symbol{139}} - \expandafter\def\csname simpleicon@senchaicon\endcsname {\simpleiconsmaponezero\symbol{140}} - \expandafter\def\csname simpleicon@sennheisericon\endcsname {\simpleiconsmaponezero\symbol{141}} - \expandafter\def\csname simpleicon@sensuicon\endcsname {\simpleiconsmaponezero\symbol{142}} - \expandafter\def\csname simpleicon@sentryicon\endcsname {\simpleiconsmaponezero\symbol{143}} - \expandafter\def\csname simpleicon@sepaicon\endcsname {\simpleiconsmaponezero\symbol{144}} - \expandafter\def\csname simpleicon@sequelizeicon\endcsname {\simpleiconsmaponezero\symbol{145}} - \expandafter\def\csname simpleicon@serverfaulticon\endcsname {\simpleiconsmaponezero\symbol{146}} - \expandafter\def\csname simpleicon@serverlessicon\endcsname {\simpleiconsmaponezero\symbol{147}} - \expandafter\def\csname simpleicon@sessionicon\endcsname {\simpleiconsmaponezero\symbol{148}} - \expandafter\def\csname simpleicon@sessionizeicon\endcsname {\simpleiconsmaponezero\symbol{149}} - \expandafter\def\csname simpleicon@setappicon\endcsname {\simpleiconsmaponezero\symbol{150}} - \expandafter\def\csname simpleicon@sfmlicon\endcsname {\simpleiconsmaponezero\symbol{151}} - \expandafter\def\csname simpleicon@shadcnuiicon\endcsname {\simpleiconsmaponezero\symbol{152}} - \expandafter\def\csname simpleicon@shadowicon\endcsname {\simpleiconsmaponezero\symbol{153}} - \expandafter\def\csname simpleicon@shanghaimetroicon\endcsname {\simpleiconsmaponezero\symbol{154}} - \expandafter\def\csname simpleicon@sharexicon\endcsname {\simpleiconsmaponezero\symbol{155}} - \expandafter\def\csname simpleicon@sharpicon\endcsname {\simpleiconsmaponezero\symbol{156}} - \expandafter\def\csname simpleicon@shazamicon\endcsname {\simpleiconsmaponezero\symbol{157}} - \expandafter\def\csname simpleicon@shellicon\endcsname {\simpleiconsmaponezero\symbol{158}} - \expandafter\def\csname simpleicon@shellyicon\endcsname {\simpleiconsmaponezero\symbol{159}} - \expandafter\def\csname simpleicon@shenzhenmetroicon\endcsname {\simpleiconsmaponezero\symbol{160}} - \expandafter\def\csname simpleicon@shieldsdotioicon\endcsname {\simpleiconsmaponezero\symbol{161}} - \expandafter\def\csname simpleicon@shikimoriicon\endcsname {\simpleiconsmaponezero\symbol{162}} - \expandafter\def\csname simpleicon@shopeeicon\endcsname {\simpleiconsmaponezero\symbol{163}} - \expandafter\def\csname simpleicon@shopifyicon\endcsname {\simpleiconsmaponezero\symbol{164}} - \expandafter\def\csname simpleicon@shopwareicon\endcsname {\simpleiconsmaponezero\symbol{165}} - \expandafter\def\csname simpleicon@shortcuticon\endcsname {\simpleiconsmaponezero\symbol{166}} - \expandafter\def\csname simpleicon@showpadicon\endcsname {\simpleiconsmaponezero\symbol{167}} - \expandafter\def\csname simpleicon@showtimeicon\endcsname {\simpleiconsmaponezero\symbol{168}} - \expandafter\def\csname simpleicon@showwcaseicon\endcsname {\simpleiconsmaponezero\symbol{169}} - \expandafter\def\csname simpleicon@shutterstockicon\endcsname {\simpleiconsmaponezero\symbol{170}} - \expandafter\def\csname simpleicon@sidekiqicon\endcsname {\simpleiconsmaponezero\symbol{171}} - \expandafter\def\csname simpleicon@sidequesticon\endcsname {\simpleiconsmaponezero\symbol{172}} - \expandafter\def\csname simpleicon@siemensicon\endcsname {\simpleiconsmaponezero\symbol{173}} - \expandafter\def\csname simpleicon@sifiveicon\endcsname {\simpleiconsmaponezero\symbol{174}} - \expandafter\def\csname simpleicon@signalicon\endcsname {\simpleiconsmaponezero\symbol{175}} - \expandafter\def\csname simpleicon@similarwebicon\endcsname {\simpleiconsmaponezero\symbol{176}} - \expandafter\def\csname simpleicon@simklicon\endcsname {\simpleiconsmaponezero\symbol{177}} - \expandafter\def\csname simpleicon@simpleanalyticsicon\endcsname {\simpleiconsmaponezero\symbol{178}} - \expandafter\def\csname simpleicon@simpleiconsicon\endcsname {\simpleiconsmaponezero\symbol{179}} - \expandafter\def\csname simpleicon@simpleloginicon\endcsname {\simpleiconsmaponezero\symbol{180}} - \expandafter\def\csname simpleicon@simplenoteicon\endcsname {\simpleiconsmaponezero\symbol{181}} - \expandafter\def\csname simpleicon@sinaweiboicon\endcsname {\simpleiconsmaponezero\symbol{182}} - \expandafter\def\csname simpleicon@singaporeairlinesicon\endcsname {\simpleiconsmaponezero\symbol{183}} - \expandafter\def\csname simpleicon@singlestoreicon\endcsname {\simpleiconsmaponezero\symbol{184}} - \expandafter\def\csname simpleicon@sitecoreicon\endcsname {\simpleiconsmaponezero\symbol{185}} - \expandafter\def\csname simpleicon@sitepointicon\endcsname {\simpleiconsmaponezero\symbol{186}} - \expandafter\def\csname simpleicon@siyuanicon\endcsname {\simpleiconsmaponezero\symbol{187}} - \expandafter\def\csname simpleicon@skaffoldicon\endcsname {\simpleiconsmaponezero\symbol{188}} - \expandafter\def\csname simpleicon@sketchicon\endcsname {\simpleiconsmaponezero\symbol{189}} - \expandafter\def\csname simpleicon@sketchfabicon\endcsname {\simpleiconsmaponezero\symbol{190}} - \expandafter\def\csname simpleicon@sketchupicon\endcsname {\simpleiconsmaponezero\symbol{191}} - \expandafter\def\csname simpleicon@skillshareicon\endcsname {\simpleiconsmaponezero\symbol{192}} - \expandafter\def\csname simpleicon@skodaicon\endcsname {\simpleiconsmaponezero\symbol{193}} - \expandafter\def\csname simpleicon@skyicon\endcsname {\simpleiconsmaponezero\symbol{194}} - \expandafter\def\csname simpleicon@skypackicon\endcsname {\simpleiconsmaponezero\symbol{195}} - \expandafter\def\csname simpleicon@skyrockicon\endcsname {\simpleiconsmaponezero\symbol{196}} - \expandafter\def\csname simpleicon@slackicon\endcsname {\simpleiconsmaponezero\symbol{197}} - \expandafter\def\csname simpleicon@slackwareicon\endcsname {\simpleiconsmaponezero\symbol{198}} - \expandafter\def\csname simpleicon@slashdoticon\endcsname {\simpleiconsmaponezero\symbol{199}} - \expandafter\def\csname simpleicon@slickpicicon\endcsname {\simpleiconsmaponezero\symbol{200}} - \expandafter\def\csname simpleicon@slidesicon\endcsname {\simpleiconsmaponezero\symbol{201}} - \expandafter\def\csname simpleicon@slideshareicon\endcsname {\simpleiconsmaponezero\symbol{202}} - \expandafter\def\csname simpleicon@slinticon\endcsname {\simpleiconsmaponezero\symbol{203}} - \expandafter\def\csname simpleicon@smarticon\endcsname {\simpleiconsmaponezero\symbol{204}} - \expandafter\def\csname simpleicon@smartthingsicon\endcsname {\simpleiconsmaponezero\symbol{205}} - \expandafter\def\csname simpleicon@smashdotggicon\endcsname {\simpleiconsmaponezero\symbol{206}} - \expandafter\def\csname simpleicon@smashingmagazineicon\endcsname {\simpleiconsmaponezero\symbol{207}} - \expandafter\def\csname simpleicon@smrticon\endcsname {\simpleiconsmaponezero\symbol{208}} - \expandafter\def\csname simpleicon@smugmugicon\endcsname {\simpleiconsmaponezero\symbol{209}} - \expandafter\def\csname simpleicon@snapchaticon\endcsname {\simpleiconsmaponezero\symbol{210}} - \expandafter\def\csname simpleicon@snapcrafticon\endcsname {\simpleiconsmaponezero\symbol{211}} - \expandafter\def\csname simpleicon@sncficon\endcsname {\simpleiconsmaponezero\symbol{212}} - \expandafter\def\csname simpleicon@snorticon\endcsname {\simpleiconsmaponezero\symbol{213}} - \expandafter\def\csname simpleicon@snowflakeicon\endcsname {\simpleiconsmaponezero\symbol{214}} - \expandafter\def\csname simpleicon@snowpackicon\endcsname {\simpleiconsmaponezero\symbol{215}} - \expandafter\def\csname simpleicon@snykicon\endcsname {\simpleiconsmaponezero\symbol{216}} - \expandafter\def\csname simpleicon@socialbladeicon\endcsname {\simpleiconsmaponezero\symbol{217}} - \expandafter\def\csname simpleicon@society6icon\endcsname {\simpleiconsmaponezero\symbol{218}} - \expandafter\def\csname simpleicon@socketdotioicon\endcsname {\simpleiconsmaponezero\symbol{219}} - \expandafter\def\csname simpleicon@softpediaicon\endcsname {\simpleiconsmaponezero\symbol{220}} - \expandafter\def\csname simpleicon@sogouicon\endcsname {\simpleiconsmaponezero\symbol{221}} - \expandafter\def\csname simpleicon@solanaicon\endcsname {\simpleiconsmaponezero\symbol{222}} - \expandafter\def\csname simpleicon@solidicon\endcsname {\simpleiconsmaponezero\symbol{223}} - \expandafter\def\csname simpleicon@solidityicon\endcsname {\simpleiconsmaponezero\symbol{224}} - \expandafter\def\csname simpleicon@sololearnicon\endcsname {\simpleiconsmaponezero\symbol{225}} - \expandafter\def\csname simpleicon@solusicon\endcsname {\simpleiconsmaponezero\symbol{226}} - \expandafter\def\csname simpleicon@sonaricon\endcsname {\simpleiconsmaponezero\symbol{227}} - \expandafter\def\csname simpleicon@sonarcloudicon\endcsname {\simpleiconsmaponezero\symbol{228}} - \expandafter\def\csname simpleicon@sonarlinticon\endcsname {\simpleiconsmaponezero\symbol{229}} - \expandafter\def\csname simpleicon@sonarqubeicon\endcsname {\simpleiconsmaponezero\symbol{230}} - \expandafter\def\csname simpleicon@sonarricon\endcsname {\simpleiconsmaponezero\symbol{231}} - \expandafter\def\csname simpleicon@sonatypeicon\endcsname {\simpleiconsmaponezero\symbol{232}} - \expandafter\def\csname simpleicon@songkickicon\endcsname {\simpleiconsmaponezero\symbol{233}} - \expandafter\def\csname simpleicon@songodaicon\endcsname {\simpleiconsmaponezero\symbol{234}} - \expandafter\def\csname simpleicon@sonicwallicon\endcsname {\simpleiconsmaponezero\symbol{235}} - \expandafter\def\csname simpleicon@sonosicon\endcsname {\simpleiconsmaponezero\symbol{236}} - \expandafter\def\csname simpleicon@sonyicon\endcsname {\simpleiconsmaponezero\symbol{237}} - \expandafter\def\csname simpleicon@sorianaicon\endcsname {\simpleiconsmaponezero\symbol{238}} - \expandafter\def\csname simpleicon@soundchartsicon\endcsname {\simpleiconsmaponezero\symbol{239}} - \expandafter\def\csname simpleicon@soundcloudicon\endcsname {\simpleiconsmaponezero\symbol{240}} - \expandafter\def\csname simpleicon@sourceengineicon\endcsname {\simpleiconsmaponezero\symbol{241}} - \expandafter\def\csname simpleicon@sourceforgeicon\endcsname {\simpleiconsmaponezero\symbol{242}} - \expandafter\def\csname simpleicon@sourcehuticon\endcsname {\simpleiconsmaponezero\symbol{243}} - \expandafter\def\csname simpleicon@sourcetreeicon\endcsname {\simpleiconsmaponezero\symbol{244}} - \expandafter\def\csname simpleicon@southwestairlinesicon\endcsname {\simpleiconsmaponezero\symbol{245}} - \expandafter\def\csname simpleicon@spacemacsicon\endcsname {\simpleiconsmaponezero\symbol{246}} - \expandafter\def\csname simpleicon@spaceshipicon\endcsname {\simpleiconsmaponezero\symbol{247}} - \expandafter\def\csname simpleicon@spacexicon\endcsname {\simpleiconsmaponezero\symbol{248}} - \expandafter\def\csname simpleicon@spacyicon\endcsname {\simpleiconsmaponezero\symbol{249}} - \expandafter\def\csname simpleicon@sparkaricon\endcsname {\simpleiconsmaponezero\symbol{250}} - \expandafter\def\csname simpleicon@sparkasseicon\endcsname {\simpleiconsmaponezero\symbol{251}} - \expandafter\def\csname simpleicon@sparkfunicon\endcsname {\simpleiconsmaponezero\symbol{252}} - \expandafter\def\csname simpleicon@sparkposticon\endcsname {\simpleiconsmaponezero\symbol{253}} - \expandafter\def\csname simpleicon@spdxicon\endcsname {\simpleiconsmaponezero\symbol{254}} - \expandafter\def\csname simpleicon@speakerdeckicon\endcsname {\simpleiconsmaponezero\symbol{255}} - \expandafter\def\csname simpleicon@spectrumicon\endcsname {\simpleiconsmaponeone\symbol{0}} - \expandafter\def\csname simpleicon@speedtesticon\endcsname {\simpleiconsmaponeone\symbol{1}} - \expandafter\def\csname simpleicon@speedypageicon\endcsname {\simpleiconsmaponeone\symbol{2}} - \expandafter\def\csname simpleicon@sphinxicon\endcsname {\simpleiconsmaponeone\symbol{3}} - \expandafter\def\csname simpleicon@spigotmcicon\endcsname {\simpleiconsmaponeone\symbol{4}} - \expandafter\def\csname simpleicon@spineicon\endcsname {\simpleiconsmaponeone\symbol{5}} - \expandafter\def\csname simpleicon@spinnakericon\endcsname {\simpleiconsmaponeone\symbol{6}} - \expandafter\def\csname simpleicon@spinrillaicon\endcsname {\simpleiconsmaponeone\symbol{7}} - \expandafter\def\csname simpleicon@splunkicon\endcsname {\simpleiconsmaponeone\symbol{8}} - \expandafter\def\csname simpleicon@spojicon\endcsname {\simpleiconsmaponeone\symbol{9}} - \expandafter\def\csname simpleicon@spondicon\endcsname {\simpleiconsmaponeone\symbol{10}} - \expandafter\def\csname simpleicon@spotifyicon\endcsname {\simpleiconsmaponeone\symbol{11}} - \expandafter\def\csname simpleicon@spotlighticon\endcsname {\simpleiconsmaponeone\symbol{12}} - \expandafter\def\csname simpleicon@spreadshirticon\endcsname {\simpleiconsmaponeone\symbol{13}} - \expandafter\def\csname simpleicon@spreakericon\endcsname {\simpleiconsmaponeone\symbol{14}} - \expandafter\def\csname simpleicon@springicon\endcsname {\simpleiconsmaponeone\symbol{15}} - \expandafter\def\csname simpleicon@springcreatorsicon\endcsname {\simpleiconsmaponeone\symbol{16}} - \expandafter\def\csname simpleicon@springbooticon\endcsname {\simpleiconsmaponeone\symbol{17}} - \expandafter\def\csname simpleicon@springsecurityicon\endcsname {\simpleiconsmaponeone\symbol{18}} - \expandafter\def\csname simpleicon@spyderideicon\endcsname {\simpleiconsmaponeone\symbol{19}} - \expandafter\def\csname simpleicon@sqlalchemyicon\endcsname {\simpleiconsmaponeone\symbol{20}} - \expandafter\def\csname simpleicon@sqliteicon\endcsname {\simpleiconsmaponeone\symbol{21}} - \expandafter\def\csname simpleicon@squareicon\endcsname {\simpleiconsmaponeone\symbol{22}} - \expandafter\def\csname simpleicon@squareenixicon\endcsname {\simpleiconsmaponeone\symbol{23}} - \expandafter\def\csname simpleicon@squarespaceicon\endcsname {\simpleiconsmaponeone\symbol{24}} - \expandafter\def\csname simpleicon@srgssricon\endcsname {\simpleiconsmaponeone\symbol{25}} - \expandafter\def\csname simpleicon@ssrnicon\endcsname {\simpleiconsmaponeone\symbol{26}} - \expandafter\def\csname simpleicon@ssticon\endcsname {\simpleiconsmaponeone\symbol{27}} - \expandafter\def\csname simpleicon@stackbiticon\endcsname {\simpleiconsmaponeone\symbol{28}} - \expandafter\def\csname simpleicon@stackblitzicon\endcsname {\simpleiconsmaponeone\symbol{29}} - \expandafter\def\csname simpleicon@stackediticon\endcsname {\simpleiconsmaponeone\symbol{30}} - \expandafter\def\csname simpleicon@stackexchangeicon\endcsname {\simpleiconsmaponeone\symbol{31}} - \expandafter\def\csname simpleicon@stackhawkicon\endcsname {\simpleiconsmaponeone\symbol{32}} - \expandafter\def\csname simpleicon@stackoverflowicon\endcsname {\simpleiconsmaponeone\symbol{33}} - \expandafter\def\csname simpleicon@stackpathicon\endcsname {\simpleiconsmaponeone\symbol{34}} - \expandafter\def\csname simpleicon@stackshareicon\endcsname {\simpleiconsmaponeone\symbol{35}} - \expandafter\def\csname simpleicon@stadiaicon\endcsname {\simpleiconsmaponeone\symbol{36}} - \expandafter\def\csname simpleicon@staffbaseicon\endcsname {\simpleiconsmaponeone\symbol{37}} - \expandafter\def\csname simpleicon@stagetimericon\endcsname {\simpleiconsmaponeone\symbol{38}} - \expandafter\def\csname simpleicon@standardjsicon\endcsname {\simpleiconsmaponeone\symbol{39}} - \expandafter\def\csname simpleicon@standardresumeicon\endcsname {\simpleiconsmaponeone\symbol{40}} - \expandafter\def\csname simpleicon@starbucksicon\endcsname {\simpleiconsmaponeone\symbol{41}} - \expandafter\def\csname simpleicon@stardockicon\endcsname {\simpleiconsmaponeone\symbol{42}} - \expandafter\def\csname simpleicon@starlingbankicon\endcsname {\simpleiconsmaponeone\symbol{43}} - \expandafter\def\csname simpleicon@starshipicon\endcsname {\simpleiconsmaponeone\symbol{44}} - \expandafter\def\csname simpleicon@startrekicon\endcsname {\simpleiconsmaponeone\symbol{45}} - \expandafter\def\csname simpleicon@starzicon\endcsname {\simpleiconsmaponeone\symbol{46}} - \expandafter\def\csname simpleicon@statamicicon\endcsname {\simpleiconsmaponeone\symbol{47}} - \expandafter\def\csname simpleicon@statistaicon\endcsname {\simpleiconsmaponeone\symbol{48}} - \expandafter\def\csname simpleicon@statuspageicon\endcsname {\simpleiconsmaponeone\symbol{49}} - \expandafter\def\csname simpleicon@statuspalicon\endcsname {\simpleiconsmaponeone\symbol{50}} - \expandafter\def\csname simpleicon@steamicon\endcsname {\simpleiconsmaponeone\symbol{51}} - \expandafter\def\csname simpleicon@steamdbicon\endcsname {\simpleiconsmaponeone\symbol{52}} - \expandafter\def\csname simpleicon@steamdeckicon\endcsname {\simpleiconsmaponeone\symbol{53}} - \expandafter\def\csname simpleicon@steamworksicon\endcsname {\simpleiconsmaponeone\symbol{54}} - \expandafter\def\csname simpleicon@steelseriesicon\endcsname {\simpleiconsmaponeone\symbol{55}} - \expandafter\def\csname simpleicon@steemicon\endcsname {\simpleiconsmaponeone\symbol{56}} - \expandafter\def\csname simpleicon@steemiticon\endcsname {\simpleiconsmaponeone\symbol{57}} - \expandafter\def\csname simpleicon@steinbergicon\endcsname {\simpleiconsmaponeone\symbol{58}} - \expandafter\def\csname simpleicon@stellaricon\endcsname {\simpleiconsmaponeone\symbol{59}} - \expandafter\def\csname simpleicon@stencilicon\endcsname {\simpleiconsmaponeone\symbol{60}} - \expandafter\def\csname simpleicon@stencylicon\endcsname {\simpleiconsmaponeone\symbol{61}} - \expandafter\def\csname simpleicon@stimulusicon\endcsname {\simpleiconsmaponeone\symbol{62}} - \expandafter\def\csname simpleicon@stitchericon\endcsname {\simpleiconsmaponeone\symbol{63}} - \expandafter\def\csname simpleicon@stmicroelectronicsicon\endcsname {\simpleiconsmaponeone\symbol{64}} - \expandafter\def\csname simpleicon@stockxicon\endcsname {\simpleiconsmaponeone\symbol{65}} - \expandafter\def\csname simpleicon@stopstalkicon\endcsname {\simpleiconsmaponeone\symbol{66}} - \expandafter\def\csname simpleicon@storyblokicon\endcsname {\simpleiconsmaponeone\symbol{67}} - \expandafter\def\csname simpleicon@storybookicon\endcsname {\simpleiconsmaponeone\symbol{68}} - \expandafter\def\csname simpleicon@strapiicon\endcsname {\simpleiconsmaponeone\symbol{69}} - \expandafter\def\csname simpleicon@stravaicon\endcsname {\simpleiconsmaponeone\symbol{70}} - \expandafter\def\csname simpleicon@streamlabsicon\endcsname {\simpleiconsmaponeone\symbol{71}} - \expandafter\def\csname simpleicon@streamliticon\endcsname {\simpleiconsmaponeone\symbol{72}} - \expandafter\def\csname simpleicon@streamrunnersicon\endcsname {\simpleiconsmaponeone\symbol{73}} - \expandafter\def\csname simpleicon@stripeicon\endcsname {\simpleiconsmaponeone\symbol{74}} - \expandafter\def\csname simpleicon@strongswanicon\endcsname {\simpleiconsmaponeone\symbol{75}} - \expandafter\def\csname simpleicon@strykericon\endcsname {\simpleiconsmaponeone\symbol{76}} - \expandafter\def\csname simpleicon@stubhubicon\endcsname {\simpleiconsmaponeone\symbol{77}} - \expandafter\def\csname simpleicon@studio3ticon\endcsname {\simpleiconsmaponeone\symbol{78}} - \expandafter\def\csname simpleicon@studyverseicon\endcsname {\simpleiconsmaponeone\symbol{79}} - \expandafter\def\csname simpleicon@styledcomponentsicon\endcsname {\simpleiconsmaponeone\symbol{80}} - \expandafter\def\csname simpleicon@stylelinticon\endcsname {\simpleiconsmaponeone\symbol{81}} - \expandafter\def\csname simpleicon@styleshareicon\endcsname {\simpleiconsmaponeone\symbol{82}} - \expandafter\def\csname simpleicon@stylusicon\endcsname {\simpleiconsmaponeone\symbol{83}} - \expandafter\def\csname simpleicon@subaruicon\endcsname {\simpleiconsmaponeone\symbol{84}} - \expandafter\def\csname simpleicon@sublimetexticon\endcsname {\simpleiconsmaponeone\symbol{85}} - \expandafter\def\csname simpleicon@substackicon\endcsname {\simpleiconsmaponeone\symbol{86}} - \expandafter\def\csname simpleicon@subtitleediticon\endcsname {\simpleiconsmaponeone\symbol{87}} - \expandafter\def\csname simpleicon@subversionicon\endcsname {\simpleiconsmaponeone\symbol{88}} - \expandafter\def\csname simpleicon@sucklessicon\endcsname {\simpleiconsmaponeone\symbol{89}} - \expandafter\def\csname simpleicon@sumologicicon\endcsname {\simpleiconsmaponeone\symbol{90}} - \expandafter\def\csname simpleicon@sunoicon\endcsname {\simpleiconsmaponeone\symbol{91}} - \expandafter\def\csname simpleicon@sunriseicon\endcsname {\simpleiconsmaponeone\symbol{92}} - \expandafter\def\csname simpleicon@supabaseicon\endcsname {\simpleiconsmaponeone\symbol{93}} - \expandafter\def\csname simpleicon@supercreaseicon\endcsname {\simpleiconsmaponeone\symbol{94}} - \expandafter\def\csname simpleicon@supermicroicon\endcsname {\simpleiconsmaponeone\symbol{95}} - \expandafter\def\csname simpleicon@superusericon\endcsname {\simpleiconsmaponeone\symbol{96}} - \expandafter\def\csname simpleicon@surrealdbicon\endcsname {\simpleiconsmaponeone\symbol{97}} - \expandafter\def\csname simpleicon@surveymonkeyicon\endcsname {\simpleiconsmaponeone\symbol{98}} - \expandafter\def\csname simpleicon@suseicon\endcsname {\simpleiconsmaponeone\symbol{99}} - \expandafter\def\csname simpleicon@suzukiicon\endcsname {\simpleiconsmaponeone\symbol{100}} - \expandafter\def\csname simpleicon@svelteicon\endcsname {\simpleiconsmaponeone\symbol{101}} - \expandafter\def\csname simpleicon@svgicon\endcsname {\simpleiconsmaponeone\symbol{102}} - \expandafter\def\csname simpleicon@svgdotjsicon\endcsname {\simpleiconsmaponeone\symbol{103}} - \expandafter\def\csname simpleicon@svgoicon\endcsname {\simpleiconsmaponeone\symbol{104}} - \expandafter\def\csname simpleicon@swaggericon\endcsname {\simpleiconsmaponeone\symbol{105}} - \expandafter\def\csname simpleicon@swarmicon\endcsname {\simpleiconsmaponeone\symbol{106}} - \expandafter\def\csname simpleicon@swcicon\endcsname {\simpleiconsmaponeone\symbol{107}} - \expandafter\def\csname simpleicon@swifticon\endcsname {\simpleiconsmaponeone\symbol{108}} - \expandafter\def\csname simpleicon@swiggyicon\endcsname {\simpleiconsmaponeone\symbol{109}} - \expandafter\def\csname simpleicon@swipericon\endcsname {\simpleiconsmaponeone\symbol{110}} - \expandafter\def\csname simpleicon@swricon\endcsname {\simpleiconsmaponeone\symbol{111}} - \expandafter\def\csname simpleicon@symantecicon\endcsname {\simpleiconsmaponeone\symbol{112}} - \expandafter\def\csname simpleicon@symbolabicon\endcsname {\simpleiconsmaponeone\symbol{113}} - \expandafter\def\csname simpleicon@symfonyicon\endcsname {\simpleiconsmaponeone\symbol{114}} - \expandafter\def\csname simpleicon@symphonyicon\endcsname {\simpleiconsmaponeone\symbol{115}} - \expandafter\def\csname simpleicon@sympyicon\endcsname {\simpleiconsmaponeone\symbol{116}} - \expandafter\def\csname simpleicon@syncthingicon\endcsname {\simpleiconsmaponeone\symbol{117}} - \expandafter\def\csname simpleicon@synologyicon\endcsname {\simpleiconsmaponeone\symbol{118}} - \expandafter\def\csname simpleicon@system76icon\endcsname {\simpleiconsmaponeone\symbol{119}} - \expandafter\def\csname simpleicon@tabelogicon\endcsname {\simpleiconsmaponeone\symbol{120}} - \expandafter\def\csname simpleicon@tableauicon\endcsname {\simpleiconsmaponeone\symbol{121}} - \expandafter\def\csname simpleicon@tablecheckicon\endcsname {\simpleiconsmaponeone\symbol{122}} - \expandafter\def\csname simpleicon@tacobellicon\endcsname {\simpleiconsmaponeone\symbol{123}} - \expandafter\def\csname simpleicon@tadoicon\endcsname {\simpleiconsmaponeone\symbol{124}} - \expandafter\def\csname simpleicon@taichigraphicsicon\endcsname {\simpleiconsmaponeone\symbol{125}} - \expandafter\def\csname simpleicon@taichilangicon\endcsname {\simpleiconsmaponeone\symbol{126}} - \expandafter\def\csname simpleicon@tailsicon\endcsname {\simpleiconsmaponeone\symbol{127}} - \expandafter\def\csname simpleicon@tailscaleicon\endcsname {\simpleiconsmaponeone\symbol{128}} - \expandafter\def\csname simpleicon@tailwindcssicon\endcsname {\simpleiconsmaponeone\symbol{129}} - \expandafter\def\csname simpleicon@taipyicon\endcsname {\simpleiconsmaponeone\symbol{130}} - \expandafter\def\csname simpleicon@taketwointeractivesoftwareicon\endcsname {\simpleiconsmaponeone\symbol{131}} - \expandafter\def\csname simpleicon@talendicon\endcsname {\simpleiconsmaponeone\symbol{132}} - \expandafter\def\csname simpleicon@talenthouseicon\endcsname {\simpleiconsmaponeone\symbol{133}} - \expandafter\def\csname simpleicon@talosicon\endcsname {\simpleiconsmaponeone\symbol{134}} - \expandafter\def\csname simpleicon@tamiyaicon\endcsname {\simpleiconsmaponeone\symbol{135}} - \expandafter\def\csname simpleicon@tampermonkeyicon\endcsname {\simpleiconsmaponeone\symbol{136}} - \expandafter\def\csname simpleicon@taobaoicon\endcsname {\simpleiconsmaponeone\symbol{137}} - \expandafter\def\csname simpleicon@tapasicon\endcsname {\simpleiconsmaponeone\symbol{138}} - \expandafter\def\csname simpleicon@targeticon\endcsname {\simpleiconsmaponeone\symbol{139}} - \expandafter\def\csname simpleicon@taskicon\endcsname {\simpleiconsmaponeone\symbol{140}} - \expandafter\def\csname simpleicon@tasmotaicon\endcsname {\simpleiconsmaponeone\symbol{141}} - \expandafter\def\csname simpleicon@tataicon\endcsname {\simpleiconsmaponeone\symbol{142}} - \expandafter\def\csname simpleicon@tauriicon\endcsname {\simpleiconsmaponeone\symbol{143}} - \expandafter\def\csname simpleicon@taxbuzzicon\endcsname {\simpleiconsmaponeone\symbol{144}} - \expandafter\def\csname simpleicon@tcsicon\endcsname {\simpleiconsmaponeone\symbol{145}} - \expandafter\def\csname simpleicon@tealicon\endcsname {\simpleiconsmaponeone\symbol{146}} - \expandafter\def\csname simpleicon@teamcityicon\endcsname {\simpleiconsmaponeone\symbol{147}} - \expandafter\def\csname simpleicon@teamspeakicon\endcsname {\simpleiconsmaponeone\symbol{148}} - \expandafter\def\csname simpleicon@teamviewericon\endcsname {\simpleiconsmaponeone\symbol{149}} - \expandafter\def\csname simpleicon@techcrunchicon\endcsname {\simpleiconsmaponeone\symbol{150}} - \expandafter\def\csname simpleicon@tedicon\endcsname {\simpleiconsmaponeone\symbol{151}} - \expandafter\def\csname simpleicon@teepublicicon\endcsname {\simpleiconsmaponeone\symbol{152}} - \expandafter\def\csname simpleicon@teespringicon\endcsname {\simpleiconsmaponeone\symbol{153}} - \expandafter\def\csname simpleicon@tektonicon\endcsname {\simpleiconsmaponeone\symbol{154}} - \expandafter\def\csname simpleicon@tele5icon\endcsname {\simpleiconsmaponeone\symbol{155}} - \expandafter\def\csname simpleicon@telegramicon\endcsname {\simpleiconsmaponeone\symbol{156}} - \expandafter\def\csname simpleicon@telegraphicon\endcsname {\simpleiconsmaponeone\symbol{157}} - \expandafter\def\csname simpleicon@telequebecicon\endcsname {\simpleiconsmaponeone\symbol{158}} - \expandafter\def\csname simpleicon@temporalicon\endcsname {\simpleiconsmaponeone\symbol{159}} - \expandafter\def\csname simpleicon@tencentqqicon\endcsname {\simpleiconsmaponeone\symbol{160}} - \expandafter\def\csname simpleicon@tensorflowicon\endcsname {\simpleiconsmaponeone\symbol{161}} - \expandafter\def\csname simpleicon@teradataicon\endcsname {\simpleiconsmaponeone\symbol{162}} - \expandafter\def\csname simpleicon@teratailicon\endcsname {\simpleiconsmaponeone\symbol{163}} - \expandafter\def\csname simpleicon@termiusicon\endcsname {\simpleiconsmaponeone\symbol{164}} - \expandafter\def\csname simpleicon@terraformicon\endcsname {\simpleiconsmaponeone\symbol{165}} - \expandafter\def\csname simpleicon@tescoicon\endcsname {\simpleiconsmaponeone\symbol{166}} - \expandafter\def\csname simpleicon@teslaicon\endcsname {\simpleiconsmaponeone\symbol{167}} - \expandafter\def\csname simpleicon@testcafeicon\endcsname {\simpleiconsmaponeone\symbol{168}} - \expandafter\def\csname simpleicon@testinicon\endcsname {\simpleiconsmaponeone\symbol{169}} - \expandafter\def\csname simpleicon@testinglibraryicon\endcsname {\simpleiconsmaponeone\symbol{170}} - \expandafter\def\csname simpleicon@testrailicon\endcsname {\simpleiconsmaponeone\symbol{171}} - \expandafter\def\csname simpleicon@tethericon\endcsname {\simpleiconsmaponeone\symbol{172}} - \expandafter\def\csname simpleicon@textpatternicon\endcsname {\simpleiconsmaponeone\symbol{173}} - \expandafter\def\csname simpleicon@tgaicon\endcsname {\simpleiconsmaponeone\symbol{174}} - \expandafter\def\csname simpleicon@thangsicon\endcsname {\simpleiconsmaponeone\symbol{175}} - \expandafter\def\csname simpleicon@thealgorithmsicon\endcsname {\simpleiconsmaponeone\symbol{176}} - \expandafter\def\csname simpleicon@theboringcompanyicon\endcsname {\simpleiconsmaponeone\symbol{177}} - \expandafter\def\csname simpleicon@theconversationicon\endcsname {\simpleiconsmaponeone\symbol{178}} - \expandafter\def\csname simpleicon@thefinalsicon\endcsname {\simpleiconsmaponeone\symbol{179}} - \expandafter\def\csname simpleicon@theirishtimesicon\endcsname {\simpleiconsmaponeone\symbol{180}} - \expandafter\def\csname simpleicon@themightyicon\endcsname {\simpleiconsmaponeone\symbol{181}} - \expandafter\def\csname simpleicon@themodelsresourceicon\endcsname {\simpleiconsmaponeone\symbol{182}} - \expandafter\def\csname simpleicon@themoviedatabaseicon\endcsname {\simpleiconsmaponeone\symbol{183}} - \expandafter\def\csname simpleicon@thenorthfaceicon\endcsname {\simpleiconsmaponeone\symbol{184}} - \expandafter\def\csname simpleicon@theodinprojecticon\endcsname {\simpleiconsmaponeone\symbol{185}} - \expandafter\def\csname simpleicon@theregistericon\endcsname {\simpleiconsmaponeone\symbol{186}} - \expandafter\def\csname simpleicon@thesoundsresourceicon\endcsname {\simpleiconsmaponeone\symbol{187}} - \expandafter\def\csname simpleicon@thespritersresourceicon\endcsname {\simpleiconsmaponeone\symbol{188}} - \expandafter\def\csname simpleicon@thewashingtonposticon\endcsname {\simpleiconsmaponeone\symbol{189}} - \expandafter\def\csname simpleicon@thingiverseicon\endcsname {\simpleiconsmaponeone\symbol{190}} - \expandafter\def\csname simpleicon@thinkpadicon\endcsname {\simpleiconsmaponeone\symbol{191}} - \expandafter\def\csname simpleicon@thirdwebicon\endcsname {\simpleiconsmaponeone\symbol{192}} - \expandafter\def\csname simpleicon@threadlessicon\endcsname {\simpleiconsmaponeone\symbol{193}} - \expandafter\def\csname simpleicon@threadsicon\endcsname {\simpleiconsmaponeone\symbol{194}} - \expandafter\def\csname simpleicon@threedotjsicon\endcsname {\simpleiconsmaponeone\symbol{195}} - \expandafter\def\csname simpleicon@threemaicon\endcsname {\simpleiconsmaponeone\symbol{196}} - \expandafter\def\csname simpleicon@thumbtackicon\endcsname {\simpleiconsmaponeone\symbol{197}} - \expandafter\def\csname simpleicon@thunderbirdicon\endcsname {\simpleiconsmaponeone\symbol{198}} - \expandafter\def\csname simpleicon@thunderstoreicon\endcsname {\simpleiconsmaponeone\symbol{199}} - \expandafter\def\csname simpleicon@thurgauerkantonalbankicon\endcsname {\simpleiconsmaponeone\symbol{200}} - \expandafter\def\csname simpleicon@thymeleaficon\endcsname {\simpleiconsmaponeone\symbol{201}} - \expandafter\def\csname simpleicon@ticketmastericon\endcsname {\simpleiconsmaponeone\symbol{202}} - \expandafter\def\csname simpleicon@ticktickicon\endcsname {\simpleiconsmaponeone\symbol{203}} - \expandafter\def\csname simpleicon@tidalicon\endcsname {\simpleiconsmaponeone\symbol{204}} - \expandafter\def\csname simpleicon@tiddlywikiicon\endcsname {\simpleiconsmaponeone\symbol{205}} - \expandafter\def\csname simpleicon@tideicon\endcsname {\simpleiconsmaponeone\symbol{206}} - \expandafter\def\csname simpleicon@tidyverseicon\endcsname {\simpleiconsmaponeone\symbol{207}} - \expandafter\def\csname simpleicon@tietoevryicon\endcsname {\simpleiconsmaponeone\symbol{208}} - \expandafter\def\csname simpleicon@tiktokicon\endcsname {\simpleiconsmaponeone\symbol{209}} - \expandafter\def\csname simpleicon@tildapublishingicon\endcsname {\simpleiconsmaponeone\symbol{210}} - \expandafter\def\csname simpleicon@tileicon\endcsname {\simpleiconsmaponeone\symbol{211}} - \expandafter\def\csname simpleicon@timescaleicon\endcsname {\simpleiconsmaponeone\symbol{212}} - \expandafter\def\csname simpleicon@tinaicon\endcsname {\simpleiconsmaponeone\symbol{213}} - \expandafter\def\csname simpleicon@tindericon\endcsname {\simpleiconsmaponeone\symbol{214}} - \expandafter\def\csname simpleicon@tindieicon\endcsname {\simpleiconsmaponeone\symbol{215}} - \expandafter\def\csname simpleicon@tinkercadicon\endcsname {\simpleiconsmaponeone\symbol{216}} - \expandafter\def\csname simpleicon@tinygradicon\endcsname {\simpleiconsmaponeone\symbol{217}} - \expandafter\def\csname simpleicon@tinylettericon\endcsname {\simpleiconsmaponeone\symbol{218}} - \expandafter\def\csname simpleicon@tistoryicon\endcsname {\simpleiconsmaponeone\symbol{219}} - \expandafter\def\csname simpleicon@tldrawicon\endcsname {\simpleiconsmaponeone\symbol{220}} - \expandafter\def\csname simpleicon@tmobileicon\endcsname {\simpleiconsmaponeone\symbol{221}} - \expandafter\def\csname simpleicon@tmuxicon\endcsname {\simpleiconsmaponeone\symbol{222}} - \expandafter\def\csname simpleicon@todoisticon\endcsname {\simpleiconsmaponeone\symbol{223}} - \expandafter\def\csname simpleicon@togglicon\endcsname {\simpleiconsmaponeone\symbol{224}} - \expandafter\def\csname simpleicon@toggltrackicon\endcsname {\simpleiconsmaponeone\symbol{225}} - \expandafter\def\csname simpleicon@tokyometroicon\endcsname {\simpleiconsmaponeone\symbol{226}} - \expandafter\def\csname simpleicon@tollicon\endcsname {\simpleiconsmaponeone\symbol{227}} - \expandafter\def\csname simpleicon@tomlicon\endcsname {\simpleiconsmaponeone\symbol{228}} - \expandafter\def\csname simpleicon@tomorrowlandicon\endcsname {\simpleiconsmaponeone\symbol{229}} - \expandafter\def\csname simpleicon@tonicon\endcsname {\simpleiconsmaponeone\symbol{230}} - \expandafter\def\csname simpleicon@topcodericon\endcsname {\simpleiconsmaponeone\symbol{231}} - \expandafter\def\csname simpleicon@topdotggicon\endcsname {\simpleiconsmaponeone\symbol{232}} - \expandafter\def\csname simpleicon@toptalicon\endcsname {\simpleiconsmaponeone\symbol{233}} - \expandafter\def\csname simpleicon@torbrowsericon\endcsname {\simpleiconsmaponeone\symbol{234}} - \expandafter\def\csname simpleicon@torprojecticon\endcsname {\simpleiconsmaponeone\symbol{235}} - \expandafter\def\csname simpleicon@toshibaicon\endcsname {\simpleiconsmaponeone\symbol{236}} - \expandafter\def\csname simpleicon@totvsicon\endcsname {\simpleiconsmaponeone\symbol{237}} - \expandafter\def\csname simpleicon@tourboxicon\endcsname {\simpleiconsmaponeone\symbol{238}} - \expandafter\def\csname simpleicon@towericon\endcsname {\simpleiconsmaponeone\symbol{239}} - \expandafter\def\csname simpleicon@toyotaicon\endcsname {\simpleiconsmaponeone\symbol{240}} - \expandafter\def\csname simpleicon@tplinkicon\endcsname {\simpleiconsmaponeone\symbol{241}} - \expandafter\def\csname simpleicon@tqdmicon\endcsname {\simpleiconsmaponeone\symbol{242}} - \expandafter\def\csname simpleicon@traccaricon\endcsname {\simpleiconsmaponeone\symbol{243}} - \expandafter\def\csname simpleicon@tradingviewicon\endcsname {\simpleiconsmaponeone\symbol{244}} - \expandafter\def\csname simpleicon@traefikmeshicon\endcsname {\simpleiconsmaponeone\symbol{245}} - \expandafter\def\csname simpleicon@traefikproxyicon\endcsname {\simpleiconsmaponeone\symbol{246}} - \expandafter\def\csname simpleicon@trailforksicon\endcsname {\simpleiconsmaponeone\symbol{247}} - \expandafter\def\csname simpleicon@trainerroadicon\endcsname {\simpleiconsmaponeone\symbol{248}} - \expandafter\def\csname simpleicon@trakticon\endcsname {\simpleiconsmaponeone\symbol{249}} - \expandafter\def\csname simpleicon@transifexicon\endcsname {\simpleiconsmaponeone\symbol{250}} - \expandafter\def\csname simpleicon@transmissionicon\endcsname {\simpleiconsmaponeone\symbol{251}} - \expandafter\def\csname simpleicon@transportforirelandicon\endcsname {\simpleiconsmaponeone\symbol{252}} - \expandafter\def\csname simpleicon@transportforlondonicon\endcsname {\simpleiconsmaponeone\symbol{253}} - \expandafter\def\csname simpleicon@travisciicon\endcsname {\simpleiconsmaponeone\symbol{254}} - \expandafter\def\csname simpleicon@treehouseicon\endcsname {\simpleiconsmaponeone\symbol{255}} - \expandafter\def\csname simpleicon@trelloicon\endcsname {\simpleiconsmaponetwo\symbol{0}} - \expandafter\def\csname simpleicon@trendmicroicon\endcsname {\simpleiconsmaponetwo\symbol{1}} - \expandafter\def\csname simpleicon@treyarchicon\endcsname {\simpleiconsmaponetwo\symbol{2}} - \expandafter\def\csname simpleicon@tricentisicon\endcsname {\simpleiconsmaponetwo\symbol{3}} - \expandafter\def\csname simpleicon@triliumicon\endcsname {\simpleiconsmaponetwo\symbol{4}} - \expandafter\def\csname simpleicon@trillericon\endcsname {\simpleiconsmaponetwo\symbol{5}} - \expandafter\def\csname simpleicon@trillertvicon\endcsname {\simpleiconsmaponetwo\symbol{6}} - \expandafter\def\csname simpleicon@trinoicon\endcsname {\simpleiconsmaponetwo\symbol{7}} - \expandafter\def\csname simpleicon@tripadvisoricon\endcsname {\simpleiconsmaponetwo\symbol{8}} - \expandafter\def\csname simpleicon@tripdotcomicon\endcsname {\simpleiconsmaponetwo\symbol{9}} - \expandafter\def\csname simpleicon@trivagoicon\endcsname {\simpleiconsmaponetwo\symbol{10}} - \expandafter\def\csname simpleicon@trivyicon\endcsname {\simpleiconsmaponetwo\symbol{11}} - \expandafter\def\csname simpleicon@troveicon\endcsname {\simpleiconsmaponetwo\symbol{12}} - \expandafter\def\csname simpleicon@trpcicon\endcsname {\simpleiconsmaponetwo\symbol{13}} - \expandafter\def\csname simpleicon@truenasicon\endcsname {\simpleiconsmaponetwo\symbol{14}} - \expandafter\def\csname simpleicon@trueupicon\endcsname {\simpleiconsmaponetwo\symbol{15}} - \expandafter\def\csname simpleicon@truliaicon\endcsname {\simpleiconsmaponetwo\symbol{16}} - \expandafter\def\csname simpleicon@trustedshopsicon\endcsname {\simpleiconsmaponetwo\symbol{17}} - \expandafter\def\csname simpleicon@trustpiloticon\endcsname {\simpleiconsmaponetwo\symbol{18}} - \expandafter\def\csname simpleicon@tryhackmeicon\endcsname {\simpleiconsmaponetwo\symbol{19}} - \expandafter\def\csname simpleicon@tryitonlineicon\endcsname {\simpleiconsmaponetwo\symbol{20}} - \expandafter\def\csname simpleicon@tsnodeicon\endcsname {\simpleiconsmaponetwo\symbol{21}} - \expandafter\def\csname simpleicon@tubiicon\endcsname {\simpleiconsmaponetwo\symbol{22}} - \expandafter\def\csname simpleicon@tuiicon\endcsname {\simpleiconsmaponetwo\symbol{23}} - \expandafter\def\csname simpleicon@tumblricon\endcsname {\simpleiconsmaponetwo\symbol{24}} - \expandafter\def\csname simpleicon@tuneinicon\endcsname {\simpleiconsmaponetwo\symbol{25}} - \expandafter\def\csname simpleicon@turboicon\endcsname {\simpleiconsmaponetwo\symbol{26}} - \expandafter\def\csname simpleicon@turborepoicon\endcsname {\simpleiconsmaponetwo\symbol{27}} - \expandafter\def\csname simpleicon@turbosquidicon\endcsname {\simpleiconsmaponetwo\symbol{28}} - \expandafter\def\csname simpleicon@turkishairlinesicon\endcsname {\simpleiconsmaponetwo\symbol{29}} - \expandafter\def\csname simpleicon@tursoicon\endcsname {\simpleiconsmaponetwo\symbol{30}} - \expandafter\def\csname simpleicon@tutanotaicon\endcsname {\simpleiconsmaponetwo\symbol{31}} - \expandafter\def\csname simpleicon@tv4playicon\endcsname {\simpleiconsmaponetwo\symbol{32}} - \expandafter\def\csname simpleicon@tvtimeicon\endcsname {\simpleiconsmaponetwo\symbol{33}} - \expandafter\def\csname simpleicon@twilioicon\endcsname {\simpleiconsmaponetwo\symbol{34}} - \expandafter\def\csname simpleicon@twinklyicon\endcsname {\simpleiconsmaponetwo\symbol{35}} - \expandafter\def\csname simpleicon@twinmotionicon\endcsname {\simpleiconsmaponetwo\symbol{36}} - \expandafter\def\csname simpleicon@twitchicon\endcsname {\simpleiconsmaponetwo\symbol{37}} - \expandafter\def\csname simpleicon@typeformicon\endcsname {\simpleiconsmaponetwo\symbol{38}} - \expandafter\def\csname simpleicon@typeormicon\endcsname {\simpleiconsmaponetwo\symbol{39}} - \expandafter\def\csname simpleicon@typericon\endcsname {\simpleiconsmaponetwo\symbol{40}} - \expandafter\def\csname simpleicon@typescripticon\endcsname {\simpleiconsmaponetwo\symbol{41}} - \expandafter\def\csname simpleicon@typo3icon\endcsname {\simpleiconsmaponetwo\symbol{42}} - \expandafter\def\csname simpleicon@typsticon\endcsname {\simpleiconsmaponetwo\symbol{43}} - \expandafter\def\csname simpleicon@ubericon\endcsname {\simpleiconsmaponetwo\symbol{44}} - \expandafter\def\csname simpleicon@ubereatsicon\endcsname {\simpleiconsmaponetwo\symbol{45}} - \expandafter\def\csname simpleicon@ubiquitiicon\endcsname {\simpleiconsmaponetwo\symbol{46}} - \expandafter\def\csname simpleicon@ubisofticon\endcsname {\simpleiconsmaponetwo\symbol{47}} - \expandafter\def\csname simpleicon@ublockoriginicon\endcsname {\simpleiconsmaponetwo\symbol{48}} - \expandafter\def\csname simpleicon@ubuntuicon\endcsname {\simpleiconsmaponetwo\symbol{49}} - \expandafter\def\csname simpleicon@ubuntumateicon\endcsname {\simpleiconsmaponetwo\symbol{50}} - \expandafter\def\csname simpleicon@udacityicon\endcsname {\simpleiconsmaponetwo\symbol{51}} - \expandafter\def\csname simpleicon@udemyicon\endcsname {\simpleiconsmaponetwo\symbol{52}} - \expandafter\def\csname simpleicon@ufcicon\endcsname {\simpleiconsmaponetwo\symbol{53}} - \expandafter\def\csname simpleicon@uikiticon\endcsname {\simpleiconsmaponetwo\symbol{54}} - \expandafter\def\csname simpleicon@uipathicon\endcsname {\simpleiconsmaponetwo\symbol{55}} - \expandafter\def\csname simpleicon@ululeicon\endcsname {\simpleiconsmaponetwo\symbol{56}} - \expandafter\def\csname simpleicon@umamiicon\endcsname {\simpleiconsmaponetwo\symbol{57}} - \expandafter\def\csname simpleicon@umbracoicon\endcsname {\simpleiconsmaponetwo\symbol{58}} - \expandafter\def\csname simpleicon@umlicon\endcsname {\simpleiconsmaponetwo\symbol{59}} - \expandafter\def\csname simpleicon@unacademyicon\endcsname {\simpleiconsmaponetwo\symbol{60}} - \expandafter\def\csname simpleicon@underarmouricon\endcsname {\simpleiconsmaponetwo\symbol{61}} - \expandafter\def\csname simpleicon@underscoredotjsicon\endcsname {\simpleiconsmaponetwo\symbol{62}} - \expandafter\def\csname simpleicon@undertaleicon\endcsname {\simpleiconsmaponetwo\symbol{63}} - \expandafter\def\csname simpleicon@unicodeicon\endcsname {\simpleiconsmaponetwo\symbol{64}} - \expandafter\def\csname simpleicon@unilevericon\endcsname {\simpleiconsmaponetwo\symbol{65}} - \expandafter\def\csname simpleicon@uniqloicon\endcsname {\simpleiconsmaponetwo\symbol{66}} - \expandafter\def\csname simpleicon@uniqlojaicon\endcsname {\simpleiconsmaponetwo\symbol{67}} - \expandafter\def\csname simpleicon@unitedairlinesicon\endcsname {\simpleiconsmaponetwo\symbol{68}} - \expandafter\def\csname simpleicon@unitednationsicon\endcsname {\simpleiconsmaponetwo\symbol{69}} - \expandafter\def\csname simpleicon@unityicon\endcsname {\simpleiconsmaponetwo\symbol{70}} - \expandafter\def\csname simpleicon@unjsicon\endcsname {\simpleiconsmaponetwo\symbol{71}} - \expandafter\def\csname simpleicon@unlicenseicon\endcsname {\simpleiconsmaponetwo\symbol{72}} - \expandafter\def\csname simpleicon@unocssicon\endcsname {\simpleiconsmaponetwo\symbol{73}} - \expandafter\def\csname simpleicon@unpkgicon\endcsname {\simpleiconsmaponetwo\symbol{74}} - \expandafter\def\csname simpleicon@unraidicon\endcsname {\simpleiconsmaponetwo\symbol{75}} - \expandafter\def\csname simpleicon@unrealengineicon\endcsname {\simpleiconsmaponetwo\symbol{76}} - \expandafter\def\csname simpleicon@unsplashicon\endcsname {\simpleiconsmaponetwo\symbol{77}} - \expandafter\def\csname simpleicon@untappdicon\endcsname {\simpleiconsmaponetwo\symbol{78}} - \expandafter\def\csname simpleicon@upcloudicon\endcsname {\simpleiconsmaponetwo\symbol{79}} - \expandafter\def\csname simpleicon@upholdicon\endcsname {\simpleiconsmaponetwo\symbol{80}} - \expandafter\def\csname simpleicon@uplabsicon\endcsname {\simpleiconsmaponetwo\symbol{81}} - \expandafter\def\csname simpleicon@upptimeicon\endcsname {\simpleiconsmaponetwo\symbol{82}} - \expandafter\def\csname simpleicon@upsicon\endcsname {\simpleiconsmaponetwo\symbol{83}} - \expandafter\def\csname simpleicon@upstashicon\endcsname {\simpleiconsmaponetwo\symbol{84}} - \expandafter\def\csname simpleicon@uptimekumaicon\endcsname {\simpleiconsmaponetwo\symbol{85}} - \expandafter\def\csname simpleicon@uptoboxicon\endcsname {\simpleiconsmaponetwo\symbol{86}} - \expandafter\def\csname simpleicon@upworkicon\endcsname {\simpleiconsmaponetwo\symbol{87}} - \expandafter\def\csname simpleicon@uspsicon\endcsname {\simpleiconsmaponetwo\symbol{88}} - \expandafter\def\csname simpleicon@utorrenticon\endcsname {\simpleiconsmaponetwo\symbol{89}} - \expandafter\def\csname simpleicon@vicon\endcsname {\simpleiconsmaponetwo\symbol{90}} - \expandafter\def\csname simpleicon@v2exicon\endcsname {\simpleiconsmaponetwo\symbol{91}} - \expandafter\def\csname simpleicon@v8icon\endcsname {\simpleiconsmaponetwo\symbol{92}} - \expandafter\def\csname simpleicon@vaadinicon\endcsname {\simpleiconsmaponetwo\symbol{93}} - \expandafter\def\csname simpleicon@vagranticon\endcsname {\simpleiconsmaponetwo\symbol{94}} - \expandafter\def\csname simpleicon@valaicon\endcsname {\simpleiconsmaponetwo\symbol{95}} - \expandafter\def\csname simpleicon@valoranticon\endcsname {\simpleiconsmaponetwo\symbol{96}} - \expandafter\def\csname simpleicon@valveicon\endcsname {\simpleiconsmaponetwo\symbol{97}} - \expandafter\def\csname simpleicon@vaporicon\endcsname {\simpleiconsmaponetwo\symbol{98}} - \expandafter\def\csname simpleicon@vaulticon\endcsname {\simpleiconsmaponetwo\symbol{99}} - \expandafter\def\csname simpleicon@vaultwardenicon\endcsname {\simpleiconsmaponetwo\symbol{100}} - \expandafter\def\csname simpleicon@vauxhallicon\endcsname {\simpleiconsmaponetwo\symbol{101}} - \expandafter\def\csname simpleicon@vbulletinicon\endcsname {\simpleiconsmaponetwo\symbol{102}} - \expandafter\def\csname simpleicon@vectaryicon\endcsname {\simpleiconsmaponetwo\symbol{103}} - \expandafter\def\csname simpleicon@vectorlogozoneicon\endcsname {\simpleiconsmaponetwo\symbol{104}} - \expandafter\def\csname simpleicon@vectorworksicon\endcsname {\simpleiconsmaponetwo\symbol{105}} - \expandafter\def\csname simpleicon@veeamicon\endcsname {\simpleiconsmaponetwo\symbol{106}} - \expandafter\def\csname simpleicon@veedicon\endcsname {\simpleiconsmaponetwo\symbol{107}} - \expandafter\def\csname simpleicon@veepeeicon\endcsname {\simpleiconsmaponetwo\symbol{108}} - \expandafter\def\csname simpleicon@vegaicon\endcsname {\simpleiconsmaponetwo\symbol{109}} - \expandafter\def\csname simpleicon@vegasicon\endcsname {\simpleiconsmaponetwo\symbol{110}} - \expandafter\def\csname simpleicon@velogicon\endcsname {\simpleiconsmaponetwo\symbol{111}} - \expandafter\def\csname simpleicon@venmoicon\endcsname {\simpleiconsmaponetwo\symbol{112}} - \expandafter\def\csname simpleicon@vercelicon\endcsname {\simpleiconsmaponetwo\symbol{113}} - \expandafter\def\csname simpleicon@verdaccioicon\endcsname {\simpleiconsmaponetwo\symbol{114}} - \expandafter\def\csname simpleicon@veritasicon\endcsname {\simpleiconsmaponetwo\symbol{115}} - \expandafter\def\csname simpleicon@verizonicon\endcsname {\simpleiconsmaponetwo\symbol{116}} - \expandafter\def\csname simpleicon@vespaicon\endcsname {\simpleiconsmaponetwo\symbol{117}} - \expandafter\def\csname simpleicon@vexxhosticon\endcsname {\simpleiconsmaponetwo\symbol{118}} - \expandafter\def\csname simpleicon@vfairsicon\endcsname {\simpleiconsmaponetwo\symbol{119}} - \expandafter\def\csname simpleicon@viadeoicon\endcsname {\simpleiconsmaponetwo\symbol{120}} - \expandafter\def\csname simpleicon@viaplayicon\endcsname {\simpleiconsmaponetwo\symbol{121}} - \expandafter\def\csname simpleicon@vibericon\endcsname {\simpleiconsmaponetwo\symbol{122}} - \expandafter\def\csname simpleicon@vibloicon\endcsname {\simpleiconsmaponetwo\symbol{123}} - \expandafter\def\csname simpleicon@victoriametricsicon\endcsname {\simpleiconsmaponetwo\symbol{124}} - \expandafter\def\csname simpleicon@victronenergyicon\endcsname {\simpleiconsmaponetwo\symbol{125}} - \expandafter\def\csname simpleicon@vimicon\endcsname {\simpleiconsmaponetwo\symbol{126}} - \expandafter\def\csname simpleicon@vimeoicon\endcsname {\simpleiconsmaponetwo\symbol{127}} - \expandafter\def\csname simpleicon@vimeolivestreamicon\endcsname {\simpleiconsmaponetwo\symbol{128}} - \expandafter\def\csname simpleicon@virginicon\endcsname {\simpleiconsmaponetwo\symbol{129}} - \expandafter\def\csname simpleicon@virginatlanticicon\endcsname {\simpleiconsmaponetwo\symbol{130}} - \expandafter\def\csname simpleicon@virginmediaicon\endcsname {\simpleiconsmaponetwo\symbol{131}} - \expandafter\def\csname simpleicon@virtualboxicon\endcsname {\simpleiconsmaponetwo\symbol{132}} - \expandafter\def\csname simpleicon@virustotalicon\endcsname {\simpleiconsmaponetwo\symbol{133}} - \expandafter\def\csname simpleicon@visaicon\endcsname {\simpleiconsmaponetwo\symbol{134}} - \expandafter\def\csname simpleicon@visxicon\endcsname {\simpleiconsmaponetwo\symbol{135}} - \expandafter\def\csname simpleicon@viteicon\endcsname {\simpleiconsmaponetwo\symbol{136}} - \expandafter\def\csname simpleicon@vitepressicon\endcsname {\simpleiconsmaponetwo\symbol{137}} - \expandafter\def\csname simpleicon@vitessicon\endcsname {\simpleiconsmaponetwo\symbol{138}} - \expandafter\def\csname simpleicon@vitesticon\endcsname {\simpleiconsmaponetwo\symbol{139}} - \expandafter\def\csname simpleicon@vivaldiicon\endcsname {\simpleiconsmaponetwo\symbol{140}} - \expandafter\def\csname simpleicon@vivawalleticon\endcsname {\simpleiconsmaponetwo\symbol{141}} - \expandafter\def\csname simpleicon@vivinoicon\endcsname {\simpleiconsmaponetwo\symbol{142}} - \expandafter\def\csname simpleicon@vivinticon\endcsname {\simpleiconsmaponetwo\symbol{143}} - \expandafter\def\csname simpleicon@vivoicon\endcsname {\simpleiconsmaponetwo\symbol{144}} - \expandafter\def\csname simpleicon@vkicon\endcsname {\simpleiconsmaponetwo\symbol{145}} - \expandafter\def\csname simpleicon@vlcmediaplayericon\endcsname {\simpleiconsmaponetwo\symbol{146}} - \expandafter\def\csname simpleicon@vmwareicon\endcsname {\simpleiconsmaponetwo\symbol{147}} - \expandafter\def\csname simpleicon@vodafoneicon\endcsname {\simpleiconsmaponetwo\symbol{148}} - \expandafter\def\csname simpleicon@voidlinuxicon\endcsname {\simpleiconsmaponetwo\symbol{149}} - \expandafter\def\csname simpleicon@voipdotmsicon\endcsname {\simpleiconsmaponetwo\symbol{150}} - \expandafter\def\csname simpleicon@volkswagenicon\endcsname {\simpleiconsmaponetwo\symbol{151}} - \expandafter\def\csname simpleicon@volvoicon\endcsname {\simpleiconsmaponetwo\symbol{152}} - \expandafter\def\csname simpleicon@vonageicon\endcsname {\simpleiconsmaponetwo\symbol{153}} - \expandafter\def\csname simpleicon@vorondesignicon\endcsname {\simpleiconsmaponetwo\symbol{154}} - \expandafter\def\csname simpleicon@vowpalwabbiticon\endcsname {\simpleiconsmaponetwo\symbol{155}} - \expandafter\def\csname simpleicon@voxicon\endcsname {\simpleiconsmaponetwo\symbol{156}} - \expandafter\def\csname simpleicon@vscoicon\endcsname {\simpleiconsmaponetwo\symbol{157}} - \expandafter\def\csname simpleicon@vscodiumicon\endcsname {\simpleiconsmaponetwo\symbol{158}} - \expandafter\def\csname simpleicon@vtexicon\endcsname {\simpleiconsmaponetwo\symbol{159}} - \expandafter\def\csname simpleicon@vuedotjsicon\endcsname {\simpleiconsmaponetwo\symbol{160}} - \expandafter\def\csname simpleicon@vuetifyicon\endcsname {\simpleiconsmaponetwo\symbol{161}} - \expandafter\def\csname simpleicon@vulkanicon\endcsname {\simpleiconsmaponetwo\symbol{162}} - \expandafter\def\csname simpleicon@vultricon\endcsname {\simpleiconsmaponetwo\symbol{163}} - \expandafter\def\csname simpleicon@vyondicon\endcsname {\simpleiconsmaponetwo\symbol{164}} - \expandafter\def\csname simpleicon@w3schoolsicon\endcsname {\simpleiconsmaponetwo\symbol{165}} - \expandafter\def\csname simpleicon@wacomicon\endcsname {\simpleiconsmaponetwo\symbol{166}} - \expandafter\def\csname simpleicon@wagmiicon\endcsname {\simpleiconsmaponetwo\symbol{167}} - \expandafter\def\csname simpleicon@wagtailicon\endcsname {\simpleiconsmaponetwo\symbol{168}} - \expandafter\def\csname simpleicon@wailsicon\endcsname {\simpleiconsmaponetwo\symbol{169}} - \expandafter\def\csname simpleicon@wakatimeicon\endcsname {\simpleiconsmaponetwo\symbol{170}} - \expandafter\def\csname simpleicon@walkmanicon\endcsname {\simpleiconsmaponetwo\symbol{171}} - \expandafter\def\csname simpleicon@wallabagicon\endcsname {\simpleiconsmaponetwo\symbol{172}} - \expandafter\def\csname simpleicon@walletconnecticon\endcsname {\simpleiconsmaponetwo\symbol{173}} - \expandafter\def\csname simpleicon@walmarticon\endcsname {\simpleiconsmaponetwo\symbol{174}} - \expandafter\def\csname simpleicon@wantedlyicon\endcsname {\simpleiconsmaponetwo\symbol{175}} - \expandafter\def\csname simpleicon@wappalyzericon\endcsname {\simpleiconsmaponetwo\symbol{176}} - \expandafter\def\csname simpleicon@warnerbrosicon\endcsname {\simpleiconsmaponetwo\symbol{177}} - \expandafter\def\csname simpleicon@warpicon\endcsname {\simpleiconsmaponetwo\symbol{178}} - \expandafter\def\csname simpleicon@wasabiicon\endcsname {\simpleiconsmaponetwo\symbol{179}} - \expandafter\def\csname simpleicon@wasmcloudicon\endcsname {\simpleiconsmaponetwo\symbol{180}} - \expandafter\def\csname simpleicon@wasmericon\endcsname {\simpleiconsmaponetwo\symbol{181}} - \expandafter\def\csname simpleicon@watchtowericon\endcsname {\simpleiconsmaponetwo\symbol{182}} - \expandafter\def\csname simpleicon@wattpadicon\endcsname {\simpleiconsmaponetwo\symbol{183}} - \expandafter\def\csname simpleicon@waylandicon\endcsname {\simpleiconsmaponetwo\symbol{184}} - \expandafter\def\csname simpleicon@wazeicon\endcsname {\simpleiconsmaponetwo\symbol{185}} - \expandafter\def\csname simpleicon@wazirxicon\endcsname {\simpleiconsmaponetwo\symbol{186}} - \expandafter\def\csname simpleicon@wearosicon\endcsname {\simpleiconsmaponetwo\symbol{187}} - \expandafter\def\csname simpleicon@weasylicon\endcsname {\simpleiconsmaponetwo\symbol{188}} - \expandafter\def\csname simpleicon@web3dotjsicon\endcsname {\simpleiconsmaponetwo\symbol{189}} - \expandafter\def\csname simpleicon@webassemblyicon\endcsname {\simpleiconsmaponetwo\symbol{190}} - \expandafter\def\csname simpleicon@webauthnicon\endcsname {\simpleiconsmaponetwo\symbol{191}} - \expandafter\def\csname simpleicon@webcomponentsdotorgicon\endcsname {\simpleiconsmaponetwo\symbol{192}} - \expandafter\def\csname simpleicon@webdriverioicon\endcsname {\simpleiconsmaponetwo\symbol{193}} - \expandafter\def\csname simpleicon@webexicon\endcsname {\simpleiconsmaponetwo\symbol{194}} - \expandafter\def\csname simpleicon@webflowicon\endcsname {\simpleiconsmaponetwo\symbol{195}} - \expandafter\def\csname simpleicon@webglicon\endcsname {\simpleiconsmaponetwo\symbol{196}} - \expandafter\def\csname simpleicon@webgpuicon\endcsname {\simpleiconsmaponetwo\symbol{197}} - \expandafter\def\csname simpleicon@weblateicon\endcsname {\simpleiconsmaponetwo\symbol{198}} - \expandafter\def\csname simpleicon@webminicon\endcsname {\simpleiconsmaponetwo\symbol{199}} - \expandafter\def\csname simpleicon@webmoneyicon\endcsname {\simpleiconsmaponetwo\symbol{200}} - \expandafter\def\csname simpleicon@webpackicon\endcsname {\simpleiconsmaponetwo\symbol{201}} - \expandafter\def\csname simpleicon@webrtcicon\endcsname {\simpleiconsmaponetwo\symbol{202}} - \expandafter\def\csname simpleicon@webstormicon\endcsname {\simpleiconsmaponetwo\symbol{203}} - \expandafter\def\csname simpleicon@webtoonicon\endcsname {\simpleiconsmaponetwo\symbol{204}} - \expandafter\def\csname simpleicon@webtreesicon\endcsname {\simpleiconsmaponetwo\symbol{205}} - \expandafter\def\csname simpleicon@wechaticon\endcsname {\simpleiconsmaponetwo\symbol{206}} - \expandafter\def\csname simpleicon@wegameicon\endcsname {\simpleiconsmaponetwo\symbol{207}} - \expandafter\def\csname simpleicon@weightsandbiasesicon\endcsname {\simpleiconsmaponetwo\symbol{208}} - \expandafter\def\csname simpleicon@welcometothejungleicon\endcsname {\simpleiconsmaponetwo\symbol{209}} - \expandafter\def\csname simpleicon@wellfoundicon\endcsname {\simpleiconsmaponetwo\symbol{210}} - \expandafter\def\csname simpleicon@wellsfargoicon\endcsname {\simpleiconsmaponetwo\symbol{211}} - \expandafter\def\csname simpleicon@wemoicon\endcsname {\simpleiconsmaponetwo\symbol{212}} - \expandafter\def\csname simpleicon@westerndigitalicon\endcsname {\simpleiconsmaponetwo\symbol{213}} - \expandafter\def\csname simpleicon@westernunionicon\endcsname {\simpleiconsmaponetwo\symbol{214}} - \expandafter\def\csname simpleicon@wetransfericon\endcsname {\simpleiconsmaponetwo\symbol{215}} - \expandafter\def\csname simpleicon@weztermicon\endcsname {\simpleiconsmaponetwo\symbol{216}} - \expandafter\def\csname simpleicon@wgpuicon\endcsname {\simpleiconsmaponetwo\symbol{217}} - \expandafter\def\csname simpleicon@whatsappicon\endcsname {\simpleiconsmaponetwo\symbol{218}} - \expandafter\def\csname simpleicon@wheniworkicon\endcsname {\simpleiconsmaponetwo\symbol{219}} - \expandafter\def\csname simpleicon@wiiicon\endcsname {\simpleiconsmaponetwo\symbol{220}} - \expandafter\def\csname simpleicon@wiiuicon\endcsname {\simpleiconsmaponetwo\symbol{221}} - \expandafter\def\csname simpleicon@wikidataicon\endcsname {\simpleiconsmaponetwo\symbol{222}} - \expandafter\def\csname simpleicon@wikidotggicon\endcsname {\simpleiconsmaponetwo\symbol{223}} - \expandafter\def\csname simpleicon@wikidotjsicon\endcsname {\simpleiconsmaponetwo\symbol{224}} - \expandafter\def\csname simpleicon@wikimediacommonsicon\endcsname {\simpleiconsmaponetwo\symbol{225}} - \expandafter\def\csname simpleicon@wikimediafoundationicon\endcsname {\simpleiconsmaponetwo\symbol{226}} - \expandafter\def\csname simpleicon@wikipediaicon\endcsname {\simpleiconsmaponetwo\symbol{227}} - \expandafter\def\csname simpleicon@wikiquoteicon\endcsname {\simpleiconsmaponetwo\symbol{228}} - \expandafter\def\csname simpleicon@wikivoyageicon\endcsname {\simpleiconsmaponetwo\symbol{229}} - \expandafter\def\csname simpleicon@winampicon\endcsname {\simpleiconsmaponetwo\symbol{230}} - \expandafter\def\csname simpleicon@wiproicon\endcsname {\simpleiconsmaponetwo\symbol{231}} - \expandafter\def\csname simpleicon@wireicon\endcsname {\simpleiconsmaponetwo\symbol{232}} - \expandafter\def\csname simpleicon@wireguardicon\endcsname {\simpleiconsmaponetwo\symbol{233}} - \expandafter\def\csname simpleicon@wiresharkicon\endcsname {\simpleiconsmaponetwo\symbol{234}} - \expandafter\def\csname simpleicon@wiseicon\endcsname {\simpleiconsmaponetwo\symbol{235}} - \expandafter\def\csname simpleicon@wishicon\endcsname {\simpleiconsmaponetwo\symbol{236}} - \expandafter\def\csname simpleicon@wistiaicon\endcsname {\simpleiconsmaponetwo\symbol{237}} - \expandafter\def\csname simpleicon@wixicon\endcsname {\simpleiconsmaponetwo\symbol{238}} - \expandafter\def\csname simpleicon@wizzairicon\endcsname {\simpleiconsmaponetwo\symbol{239}} - \expandafter\def\csname simpleicon@wolframicon\endcsname {\simpleiconsmaponetwo\symbol{240}} - \expandafter\def\csname simpleicon@wolframlanguageicon\endcsname {\simpleiconsmaponetwo\symbol{241}} - \expandafter\def\csname simpleicon@wolframmathematicaicon\endcsname {\simpleiconsmaponetwo\symbol{242}} - \expandafter\def\csname simpleicon@wondershareicon\endcsname {\simpleiconsmaponetwo\symbol{243}} - \expandafter\def\csname simpleicon@wondersharefilmoraicon\endcsname {\simpleiconsmaponetwo\symbol{244}} - \expandafter\def\csname simpleicon@wooicon\endcsname {\simpleiconsmaponetwo\symbol{245}} - \expandafter\def\csname simpleicon@woocommerceicon\endcsname {\simpleiconsmaponetwo\symbol{246}} - \expandafter\def\csname simpleicon@wordpressicon\endcsname {\simpleiconsmaponetwo\symbol{247}} - \expandafter\def\csname simpleicon@workplaceicon\endcsname {\simpleiconsmaponetwo\symbol{248}} - \expandafter\def\csname simpleicon@worldhealthorganizationicon\endcsname {\simpleiconsmaponetwo\symbol{249}} - \expandafter\def\csname simpleicon@wpengineicon\endcsname {\simpleiconsmaponetwo\symbol{250}} - \expandafter\def\csname simpleicon@wpexplorericon\endcsname {\simpleiconsmaponetwo\symbol{251}} - \expandafter\def\csname simpleicon@wprocketicon\endcsname {\simpleiconsmaponetwo\symbol{252}} - \expandafter\def\csname simpleicon@writedotasicon\endcsname {\simpleiconsmaponetwo\symbol{253}} - \expandafter\def\csname simpleicon@wweicon\endcsname {\simpleiconsmaponetwo\symbol{254}} - \expandafter\def\csname simpleicon@wwiseicon\endcsname {\simpleiconsmaponetwo\symbol{255}} - \expandafter\def\csname simpleicon@wykopicon\endcsname {\simpleiconsmaponethree\symbol{0}} - \expandafter\def\csname simpleicon@wyzeicon\endcsname {\simpleiconsmaponethree\symbol{1}} - \expandafter\def\csname simpleicon@xicon\endcsname {\simpleiconsmaponethree\symbol{2}} - \expandafter\def\csname simpleicon@xamppicon\endcsname {\simpleiconsmaponethree\symbol{3}} - \expandafter\def\csname simpleicon@xcodeicon\endcsname {\simpleiconsmaponethree\symbol{4}} - \expandafter\def\csname simpleicon@xdadevelopersicon\endcsname {\simpleiconsmaponethree\symbol{5}} - \expandafter\def\csname simpleicon@xdotorgicon\endcsname {\simpleiconsmaponethree\symbol{6}} - \expandafter\def\csname simpleicon@xenditicon\endcsname {\simpleiconsmaponethree\symbol{7}} - \expandafter\def\csname simpleicon@xeroicon\endcsname {\simpleiconsmaponethree\symbol{8}} - \expandafter\def\csname simpleicon@xfceicon\endcsname {\simpleiconsmaponethree\symbol{9}} - \expandafter\def\csname simpleicon@xiaohongshuicon\endcsname {\simpleiconsmaponethree\symbol{10}} - \expandafter\def\csname simpleicon@xiaomiicon\endcsname {\simpleiconsmaponethree\symbol{11}} - \expandafter\def\csname simpleicon@xingicon\endcsname {\simpleiconsmaponethree\symbol{12}} - \expandafter\def\csname simpleicon@xmppicon\endcsname {\simpleiconsmaponethree\symbol{13}} - \expandafter\def\csname simpleicon@xoicon\endcsname {\simpleiconsmaponethree\symbol{14}} - \expandafter\def\csname simpleicon@xrpicon\endcsname {\simpleiconsmaponethree\symbol{15}} - \expandafter\def\csname simpleicon@xspliticon\endcsname {\simpleiconsmaponethree\symbol{16}} - \expandafter\def\csname simpleicon@xstateicon\endcsname {\simpleiconsmaponethree\symbol{17}} - \expandafter\def\csname simpleicon@yabaiicon\endcsname {\simpleiconsmaponethree\symbol{18}} - \expandafter\def\csname simpleicon@yaleicon\endcsname {\simpleiconsmaponethree\symbol{19}} - \expandafter\def\csname simpleicon@yamahacorporationicon\endcsname {\simpleiconsmaponethree\symbol{20}} - \expandafter\def\csname simpleicon@yamahamotorcorporationicon\endcsname {\simpleiconsmaponethree\symbol{21}} - \expandafter\def\csname simpleicon@yamlicon\endcsname {\simpleiconsmaponethree\symbol{22}} - \expandafter\def\csname simpleicon@yandexcloudicon\endcsname {\simpleiconsmaponethree\symbol{23}} - \expandafter\def\csname simpleicon@yarnicon\endcsname {\simpleiconsmaponethree\symbol{24}} - \expandafter\def\csname simpleicon@ycombinatoricon\endcsname {\simpleiconsmaponethree\symbol{25}} - \expandafter\def\csname simpleicon@yelpicon\endcsname {\simpleiconsmaponethree\symbol{26}} - \expandafter\def\csname simpleicon@yetiicon\endcsname {\simpleiconsmaponethree\symbol{27}} - \expandafter\def\csname simpleicon@yoasticon\endcsname {\simpleiconsmaponethree\symbol{28}} - \expandafter\def\csname simpleicon@youtubeicon\endcsname {\simpleiconsmaponethree\symbol{29}} - \expandafter\def\csname simpleicon@youtubegamingicon\endcsname {\simpleiconsmaponethree\symbol{30}} - \expandafter\def\csname simpleicon@youtubekidsicon\endcsname {\simpleiconsmaponethree\symbol{31}} - \expandafter\def\csname simpleicon@youtubemusicicon\endcsname {\simpleiconsmaponethree\symbol{32}} - \expandafter\def\csname simpleicon@youtubeshortsicon\endcsname {\simpleiconsmaponethree\symbol{33}} - \expandafter\def\csname simpleicon@youtubestudioicon\endcsname {\simpleiconsmaponethree\symbol{34}} - \expandafter\def\csname simpleicon@youtubetvicon\endcsname {\simpleiconsmaponethree\symbol{35}} - \expandafter\def\csname simpleicon@yricon\endcsname {\simpleiconsmaponethree\symbol{36}} - \expandafter\def\csname simpleicon@yubicoicon\endcsname {\simpleiconsmaponethree\symbol{37}} - \expandafter\def\csname simpleicon@yunohosticon\endcsname {\simpleiconsmaponethree\symbol{38}} - \expandafter\def\csname simpleicon@zabkaicon\endcsname {\simpleiconsmaponethree\symbol{39}} - \expandafter\def\csname simpleicon@zaimicon\endcsname {\simpleiconsmaponethree\symbol{40}} - \expandafter\def\csname simpleicon@zalandoicon\endcsname {\simpleiconsmaponethree\symbol{41}} - \expandafter\def\csname simpleicon@zaloicon\endcsname {\simpleiconsmaponethree\symbol{42}} - \expandafter\def\csname simpleicon@zapicon\endcsname {\simpleiconsmaponethree\symbol{43}} - \expandafter\def\csname simpleicon@zapiericon\endcsname {\simpleiconsmaponethree\symbol{44}} - \expandafter\def\csname simpleicon@zaraicon\endcsname {\simpleiconsmaponethree\symbol{45}} - \expandafter\def\csname simpleicon@zazzleicon\endcsname {\simpleiconsmaponethree\symbol{46}} - \expandafter\def\csname simpleicon@zcashicon\endcsname {\simpleiconsmaponethree\symbol{47}} - \expandafter\def\csname simpleicon@zcoolicon\endcsname {\simpleiconsmaponethree\symbol{48}} - \expandafter\def\csname simpleicon@zdficon\endcsname {\simpleiconsmaponethree\symbol{49}} - \expandafter\def\csname simpleicon@zebpayicon\endcsname {\simpleiconsmaponethree\symbol{50}} - \expandafter\def\csname simpleicon@zebratechnologiesicon\endcsname {\simpleiconsmaponethree\symbol{51}} - \expandafter\def\csname simpleicon@zedindustriesicon\endcsname {\simpleiconsmaponethree\symbol{52}} - \expandafter\def\csname simpleicon@zelleicon\endcsname {\simpleiconsmaponethree\symbol{53}} - \expandafter\def\csname simpleicon@zendicon\endcsname {\simpleiconsmaponethree\symbol{54}} - \expandafter\def\csname simpleicon@zendeskicon\endcsname {\simpleiconsmaponethree\symbol{55}} - \expandafter\def\csname simpleicon@zennicon\endcsname {\simpleiconsmaponethree\symbol{56}} - \expandafter\def\csname simpleicon@zenodoicon\endcsname {\simpleiconsmaponethree\symbol{57}} - \expandafter\def\csname simpleicon@zensaricon\endcsname {\simpleiconsmaponethree\symbol{58}} - \expandafter\def\csname simpleicon@zerodhaicon\endcsname {\simpleiconsmaponethree\symbol{59}} - \expandafter\def\csname simpleicon@zerplyicon\endcsname {\simpleiconsmaponethree\symbol{60}} - \expandafter\def\csname simpleicon@zettlricon\endcsname {\simpleiconsmaponethree\symbol{61}} - \expandafter\def\csname simpleicon@zhihuicon\endcsname {\simpleiconsmaponethree\symbol{62}} - \expandafter\def\csname simpleicon@zigicon\endcsname {\simpleiconsmaponethree\symbol{63}} - \expandafter\def\csname simpleicon@zigbeeicon\endcsname {\simpleiconsmaponethree\symbol{64}} - \expandafter\def\csname simpleicon@zigbee2mqtticon\endcsname {\simpleiconsmaponethree\symbol{65}} - \expandafter\def\csname simpleicon@ziggoicon\endcsname {\simpleiconsmaponethree\symbol{66}} - \expandafter\def\csname simpleicon@zilchicon\endcsname {\simpleiconsmaponethree\symbol{67}} - \expandafter\def\csname simpleicon@zillowicon\endcsname {\simpleiconsmaponethree\symbol{68}} - \expandafter\def\csname simpleicon@zincsearchicon\endcsname {\simpleiconsmaponethree\symbol{69}} - \expandafter\def\csname simpleicon@zingaticon\endcsname {\simpleiconsmaponethree\symbol{70}} - \expandafter\def\csname simpleicon@zodicon\endcsname {\simpleiconsmaponethree\symbol{71}} - \expandafter\def\csname simpleicon@zohoicon\endcsname {\simpleiconsmaponethree\symbol{72}} - \expandafter\def\csname simpleicon@zoipericon\endcsname {\simpleiconsmaponethree\symbol{73}} - \expandafter\def\csname simpleicon@zomatoicon\endcsname {\simpleiconsmaponethree\symbol{74}} - \expandafter\def\csname simpleicon@zoomicon\endcsname {\simpleiconsmaponethree\symbol{75}} - \expandafter\def\csname simpleicon@zorinicon\endcsname {\simpleiconsmaponethree\symbol{76}} - \expandafter\def\csname simpleicon@zoteroicon\endcsname {\simpleiconsmaponethree\symbol{77}} - \expandafter\def\csname simpleicon@zshicon\endcsname {\simpleiconsmaponethree\symbol{78}} - \expandafter\def\csname simpleicon@zulipicon\endcsname {\simpleiconsmaponethree\symbol{79}} - \expandafter\def\csname simpleicon@zyteicon\endcsname {\simpleiconsmaponethree\symbol{80}}
\ No newline at end of file + \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@languagetoolicon\endcsname {\simpleiconsmapsix\symbol{230}} + \expandafter\def\csname simpleicon@lapceicon\endcsname {\simpleiconsmapsix\symbol{231}} + \expandafter\def\csname simpleicon@laragonicon\endcsname {\simpleiconsmapsix\symbol{232}} + \expandafter\def\csname simpleicon@laravelicon\endcsname {\simpleiconsmapsix\symbol{233}} + \expandafter\def\csname simpleicon@laravelhorizonicon\endcsname {\simpleiconsmapsix\symbol{234}} + \expandafter\def\csname simpleicon@laravelnovaicon\endcsname {\simpleiconsmapsix\symbol{235}} + \expandafter\def\csname simpleicon@lastdotfmicon\endcsname {\simpleiconsmapsix\symbol{236}} + \expandafter\def\csname simpleicon@lastpassicon\endcsname {\simpleiconsmapsix\symbol{237}} + \expandafter\def\csname simpleicon@latexicon\endcsname {\simpleiconsmapsix\symbol{238}} + \expandafter\def\csname simpleicon@launchpadicon\endcsname {\simpleiconsmapsix\symbol{239}} + \expandafter\def\csname simpleicon@lazarusicon\endcsname {\simpleiconsmapsix\symbol{240}} + \expandafter\def\csname simpleicon@lazyvimicon\endcsname {\simpleiconsmapsix\symbol{241}} + \expandafter\def\csname simpleicon@lbryicon\endcsname {\simpleiconsmapsix\symbol{242}} + \expandafter\def\csname simpleicon@leaderpriceicon\endcsname {\simpleiconsmapsix\symbol{243}} + \expandafter\def\csname simpleicon@leafleticon\endcsname {\simpleiconsmapsix\symbol{244}} + \expandafter\def\csname simpleicon@leagueoflegendsicon\endcsname {\simpleiconsmapsix\symbol{245}} + \expandafter\def\csname simpleicon@leanpubicon\endcsname {\simpleiconsmapsix\symbol{246}} + \expandafter\def\csname simpleicon@leetcodeicon\endcsname {\simpleiconsmapsix\symbol{247}} + \expandafter\def\csname simpleicon@legacygamesicon\endcsname {\simpleiconsmapsix\symbol{248}} + \expandafter\def\csname simpleicon@leicaicon\endcsname {\simpleiconsmapsix\symbol{249}} + \expandafter\def\csname simpleicon@lemmyicon\endcsname {\simpleiconsmapsix\symbol{250}} + \expandafter\def\csname simpleicon@lemonsqueezyicon\endcsname {\simpleiconsmapsix\symbol{251}} + \expandafter\def\csname simpleicon@lenovoicon\endcsname {\simpleiconsmapsix\symbol{252}} + \expandafter\def\csname simpleicon@lensicon\endcsname {\simpleiconsmapsix\symbol{253}} + \expandafter\def\csname simpleicon@leptosicon\endcsname {\simpleiconsmapsix\symbol{254}} + \expandafter\def\csname simpleicon@lequipeicon\endcsname {\simpleiconsmapsix\symbol{255}} + \expandafter\def\csname simpleicon@lernaicon\endcsname {\simpleiconsmapseven\symbol{0}} + \expandafter\def\csname simpleicon@leroymerlinicon\endcsname {\simpleiconsmapseven\symbol{1}} + \expandafter\def\csname simpleicon@leslibrairesicon\endcsname {\simpleiconsmapseven\symbol{2}} + \expandafter\def\csname simpleicon@lessicon\endcsname {\simpleiconsmapseven\symbol{3}} + \expandafter\def\csname simpleicon@letsencrypticon\endcsname {\simpleiconsmapseven\symbol{4}} + \expandafter\def\csname simpleicon@letterboxdicon\endcsname {\simpleiconsmapseven\symbol{5}} + \expandafter\def\csname simpleicon@levelsdotfyiicon\endcsname {\simpleiconsmapseven\symbol{6}} + \expandafter\def\csname simpleicon@lgicon\endcsname {\simpleiconsmapseven\symbol{7}} + \expandafter\def\csname simpleicon@liberadotchaticon\endcsname {\simpleiconsmapseven\symbol{8}} + \expandafter\def\csname simpleicon@liberapayicon\endcsname {\simpleiconsmapseven\symbol{9}} + \expandafter\def\csname simpleicon@librariesdotioicon\endcsname {\simpleiconsmapseven\symbol{10}} + \expandafter\def\csname simpleicon@librarythingicon\endcsname {\simpleiconsmapseven\symbol{11}} + \expandafter\def\csname simpleicon@libreofficeicon\endcsname {\simpleiconsmapseven\symbol{12}} + \expandafter\def\csname simpleicon@libreofficebaseicon\endcsname {\simpleiconsmapseven\symbol{13}} + \expandafter\def\csname simpleicon@libreofficecalcicon\endcsname {\simpleiconsmapseven\symbol{14}} + \expandafter\def\csname simpleicon@libreofficedrawicon\endcsname {\simpleiconsmapseven\symbol{15}} + \expandafter\def\csname simpleicon@libreofficeimpressicon\endcsname {\simpleiconsmapseven\symbol{16}} + \expandafter\def\csname simpleicon@libreofficemathicon\endcsname {\simpleiconsmapseven\symbol{17}} + \expandafter\def\csname simpleicon@libreofficewritericon\endcsname {\simpleiconsmapseven\symbol{18}} + \expandafter\def\csname simpleicon@librewolficon\endcsname {\simpleiconsmapseven\symbol{19}} + \expandafter\def\csname simpleicon@libuvicon\endcsname {\simpleiconsmapseven\symbol{20}} + \expandafter\def\csname simpleicon@lichessicon\endcsname {\simpleiconsmapseven\symbol{21}} + \expandafter\def\csname simpleicon@lidlicon\endcsname {\simpleiconsmapseven\symbol{22}} + \expandafter\def\csname simpleicon@lifxicon\endcsname {\simpleiconsmapseven\symbol{23}} + \expandafter\def\csname simpleicon@lightburnicon\endcsname {\simpleiconsmapseven\symbol{24}} + \expandafter\def\csname simpleicon@lighthouseicon\endcsname {\simpleiconsmapseven\symbol{25}} + \expandafter\def\csname simpleicon@lightningicon\endcsname {\simpleiconsmapseven\symbol{26}} + \expandafter\def\csname simpleicon@limesurveyicon\endcsname {\simpleiconsmapseven\symbol{27}} + \expandafter\def\csname simpleicon@lineicon\endcsname {\simpleiconsmapseven\symbol{28}} + \expandafter\def\csname simpleicon@lineageosicon\endcsname {\simpleiconsmapseven\symbol{29}} + \expandafter\def\csname simpleicon@linearicon\endcsname {\simpleiconsmapseven\symbol{30}} + \expandafter\def\csname simpleicon@liningicon\endcsname {\simpleiconsmapseven\symbol{31}} + \expandafter\def\csname simpleicon@linkedinicon\endcsname {\simpleiconsmapseven\symbol{32}} + \expandafter\def\csname simpleicon@linkerdicon\endcsname {\simpleiconsmapseven\symbol{33}} + \expandafter\def\csname simpleicon@linkfireicon\endcsname {\simpleiconsmapseven\symbol{34}} + \expandafter\def\csname simpleicon@linksysicon\endcsname {\simpleiconsmapseven\symbol{35}} + \expandafter\def\csname simpleicon@linktreeicon\endcsname {\simpleiconsmapseven\symbol{36}} + \expandafter\def\csname simpleicon@lintcodeicon\endcsname {\simpleiconsmapseven\symbol{37}} + \expandafter\def\csname simpleicon@linuxicon\endcsname {\simpleiconsmapseven\symbol{38}} + \expandafter\def\csname simpleicon@linuxcontainersicon\endcsname {\simpleiconsmapseven\symbol{39}} + \expandafter\def\csname simpleicon@linuxfoundationicon\endcsname {\simpleiconsmapseven\symbol{40}} + \expandafter\def\csname simpleicon@linuxminticon\endcsname {\simpleiconsmapseven\symbol{41}} + \expandafter\def\csname simpleicon@linuxprofessionalinstituteicon\endcsname {\simpleiconsmapseven\symbol{42}} + \expandafter\def\csname simpleicon@linuxservericon\endcsname {\simpleiconsmapseven\symbol{43}} + \expandafter\def\csname simpleicon@lionairicon\endcsname {\simpleiconsmapseven\symbol{44}} + \expandafter\def\csname simpleicon@liquibaseicon\endcsname {\simpleiconsmapseven\symbol{45}} + \expandafter\def\csname simpleicon@listmonkicon\endcsname {\simpleiconsmapseven\symbol{46}} + \expandafter\def\csname simpleicon@liticon\endcsname {\simpleiconsmapseven\symbol{47}} + \expandafter\def\csname simpleicon@litecoinicon\endcsname {\simpleiconsmapseven\symbol{48}} + \expandafter\def\csname simpleicon@literalicon\endcsname {\simpleiconsmapseven\symbol{49}} + \expandafter\def\csname simpleicon@litiengineicon\endcsname {\simpleiconsmapseven\symbol{50}} + \expandafter\def\csname simpleicon@livechaticon\endcsname {\simpleiconsmapseven\symbol{51}} + \expandafter\def\csname simpleicon@livejournalicon\endcsname {\simpleiconsmapseven\symbol{52}} + \expandafter\def\csname simpleicon@livewireicon\endcsname {\simpleiconsmapseven\symbol{53}} + \expandafter\def\csname simpleicon@llvmicon\endcsname {\simpleiconsmapseven\symbol{54}} + \expandafter\def\csname simpleicon@lmmsicon\endcsname {\simpleiconsmapseven\symbol{55}} + \expandafter\def\csname simpleicon@lobstersicon\endcsname {\simpleiconsmapseven\symbol{56}} + \expandafter\def\csname simpleicon@localicon\endcsname {\simpleiconsmapseven\symbol{57}} + \expandafter\def\csname simpleicon@lodashicon\endcsname {\simpleiconsmapseven\symbol{58}} + \expandafter\def\csname simpleicon@logitechicon\endcsname {\simpleiconsmapseven\symbol{59}} + \expandafter\def\csname simpleicon@logitechgicon\endcsname {\simpleiconsmapseven\symbol{60}} + \expandafter\def\csname simpleicon@logmeinicon\endcsname {\simpleiconsmapseven\symbol{61}} + \expandafter\def\csname simpleicon@logseqicon\endcsname {\simpleiconsmapseven\symbol{62}} + \expandafter\def\csname simpleicon@logstashicon\endcsname {\simpleiconsmapseven\symbol{63}} + \expandafter\def\csname simpleicon@lookericon\endcsname {\simpleiconsmapseven\symbol{64}} + \expandafter\def\csname simpleicon@loomicon\endcsname {\simpleiconsmapseven\symbol{65}} + \expandafter\def\csname simpleicon@loopicon\endcsname {\simpleiconsmapseven\symbol{66}} + \expandafter\def\csname simpleicon@loopbackicon\endcsname {\simpleiconsmapseven\symbol{67}} + \expandafter\def\csname simpleicon@lootcrateicon\endcsname {\simpleiconsmapseven\symbol{68}} + \expandafter\def\csname simpleicon@lospecicon\endcsname {\simpleiconsmapseven\symbol{69}} + \expandafter\def\csname simpleicon@lotpolishairlinesicon\endcsname {\simpleiconsmapseven\symbol{70}} + \expandafter\def\csname simpleicon@ltspiceicon\endcsname {\simpleiconsmapseven\symbol{71}} + \expandafter\def\csname simpleicon@luaicon\endcsname {\simpleiconsmapseven\symbol{72}} + \expandafter\def\csname simpleicon@lubuntuicon\endcsname {\simpleiconsmapseven\symbol{73}} + \expandafter\def\csname simpleicon@luciaicon\endcsname {\simpleiconsmapseven\symbol{74}} + \expandafter\def\csname simpleicon@lucidicon\endcsname {\simpleiconsmapseven\symbol{75}} + \expandafter\def\csname simpleicon@ludwigicon\endcsname {\simpleiconsmapseven\symbol{76}} + \expandafter\def\csname simpleicon@lufthansaicon\endcsname {\simpleiconsmapseven\symbol{77}} + \expandafter\def\csname simpleicon@lumenicon\endcsname {\simpleiconsmapseven\symbol{78}} + \expandafter\def\csname simpleicon@lunacyicon\endcsname {\simpleiconsmapseven\symbol{79}} + \expandafter\def\csname simpleicon@lutrisicon\endcsname {\simpleiconsmapseven\symbol{80}} + \expandafter\def\csname simpleicon@lydiaicon\endcsname {\simpleiconsmapseven\symbol{81}} + \expandafter\def\csname simpleicon@lyfticon\endcsname {\simpleiconsmapseven\symbol{82}} + \expandafter\def\csname simpleicon@maasicon\endcsname {\simpleiconsmapseven\symbol{83}} + \expandafter\def\csname simpleicon@macosicon\endcsname {\simpleiconsmapseven\symbol{84}} + \expandafter\def\csname simpleicon@macpawicon\endcsname {\simpleiconsmapseven\symbol{85}} + \expandafter\def\csname simpleicon@macysicon\endcsname {\simpleiconsmapseven\symbol{86}} + \expandafter\def\csname simpleicon@magasinsuicon\endcsname {\simpleiconsmapseven\symbol{87}} + \expandafter\def\csname simpleicon@magentoicon\endcsname {\simpleiconsmapseven\symbol{88}} + \expandafter\def\csname simpleicon@magicicon\endcsname {\simpleiconsmapseven\symbol{89}} + \expandafter\def\csname simpleicon@magiskicon\endcsname {\simpleiconsmapseven\symbol{90}} + \expandafter\def\csname simpleicon@mahindraicon\endcsname {\simpleiconsmapseven\symbol{91}} + \expandafter\def\csname simpleicon@mailchimpicon\endcsname {\simpleiconsmapseven\symbol{92}} + \expandafter\def\csname simpleicon@maildotcomicon\endcsname {\simpleiconsmapseven\symbol{93}} + \expandafter\def\csname simpleicon@maildotruicon\endcsname {\simpleiconsmapseven\symbol{94}} + \expandafter\def\csname simpleicon@mailgunicon\endcsname {\simpleiconsmapseven\symbol{95}} + \expandafter\def\csname simpleicon@mailtrapicon\endcsname {\simpleiconsmapseven\symbol{96}} + \expandafter\def\csname simpleicon@mainwpicon\endcsname {\simpleiconsmapseven\symbol{97}} + \expandafter\def\csname simpleicon@majorleaguehackingicon\endcsname {\simpleiconsmapseven\symbol{98}} + \expandafter\def\csname simpleicon@makeicon\endcsname {\simpleiconsmapseven\symbol{99}} + \expandafter\def\csname simpleicon@makerboticon\endcsname {\simpleiconsmapseven\symbol{100}} + \expandafter\def\csname simpleicon@malticon\endcsname {\simpleiconsmapseven\symbol{101}} + \expandafter\def\csname simpleicon@malwarebytesicon\endcsname {\simpleiconsmapseven\symbol{102}} + \expandafter\def\csname simpleicon@mambauiicon\endcsname {\simpleiconsmapseven\symbol{103}} + \expandafter\def\csname simpleicon@mampicon\endcsname {\simpleiconsmapseven\symbol{104}} + \expandafter\def\csname simpleicon@manicon\endcsname {\simpleiconsmapseven\symbol{105}} + \expandafter\def\csname simpleicon@manageiqicon\endcsname {\simpleiconsmapseven\symbol{106}} + \expandafter\def\csname simpleicon@manjaroicon\endcsname {\simpleiconsmapseven\symbol{107}} + \expandafter\def\csname simpleicon@mantineicon\endcsname {\simpleiconsmapseven\symbol{108}} + \expandafter\def\csname simpleicon@mapboxicon\endcsname {\simpleiconsmapseven\symbol{109}} + \expandafter\def\csname simpleicon@maplibreicon\endcsname {\simpleiconsmapseven\symbol{110}} + \expandafter\def\csname simpleicon@mariadbicon\endcsname {\simpleiconsmapseven\symbol{111}} + \expandafter\def\csname simpleicon@mariadbfoundationicon\endcsname {\simpleiconsmapseven\symbol{112}} + \expandafter\def\csname simpleicon@markdownicon\endcsname {\simpleiconsmapseven\symbol{113}} + \expandafter\def\csname simpleicon@marketoicon\endcsname {\simpleiconsmapseven\symbol{114}} + \expandafter\def\csname simpleicon@markoicon\endcsname {\simpleiconsmapseven\symbol{115}} + \expandafter\def\csname simpleicon@marriotticon\endcsname {\simpleiconsmapseven\symbol{116}} + \expandafter\def\csname simpleicon@marvelappicon\endcsname {\simpleiconsmapseven\symbol{117}} + \expandafter\def\csname simpleicon@maseratiicon\endcsname {\simpleiconsmapseven\symbol{118}} + \expandafter\def\csname simpleicon@mastercardicon\endcsname {\simpleiconsmapseven\symbol{119}} + \expandafter\def\csname simpleicon@mastercomfigicon\endcsname {\simpleiconsmapseven\symbol{120}} + \expandafter\def\csname simpleicon@mastodonicon\endcsname {\simpleiconsmapseven\symbol{121}} + \expandafter\def\csname simpleicon@materialdesignicon\endcsname {\simpleiconsmapseven\symbol{122}} + \expandafter\def\csname simpleicon@materialdesigniconsicon\endcsname {\simpleiconsmapseven\symbol{123}} + \expandafter\def\csname simpleicon@materialformkdocsicon\endcsname {\simpleiconsmapseven\symbol{124}} + \expandafter\def\csname simpleicon@matillionicon\endcsname {\simpleiconsmapseven\symbol{125}} + \expandafter\def\csname simpleicon@matomoicon\endcsname {\simpleiconsmapseven\symbol{126}} + \expandafter\def\csname simpleicon@matrixicon\endcsname {\simpleiconsmapseven\symbol{127}} + \expandafter\def\csname simpleicon@matterdotjsicon\endcsname {\simpleiconsmapseven\symbol{128}} + \expandafter\def\csname simpleicon@mattermosticon\endcsname {\simpleiconsmapseven\symbol{129}} + \expandafter\def\csname simpleicon@matterneticon\endcsname {\simpleiconsmapseven\symbol{130}} + \expandafter\def\csname simpleicon@mauticicon\endcsname {\simpleiconsmapseven\symbol{131}} + \expandafter\def\csname simpleicon@maxicon\endcsname {\simpleiconsmapseven\symbol{132}} + \expandafter\def\csname simpleicon@maxplanckgesellschafticon\endcsname {\simpleiconsmapseven\symbol{133}} + \expandafter\def\csname simpleicon@maytagicon\endcsname {\simpleiconsmapseven\symbol{134}} + \expandafter\def\csname simpleicon@mazdaicon\endcsname {\simpleiconsmapseven\symbol{135}} + \expandafter\def\csname simpleicon@mcafeeicon\endcsname {\simpleiconsmapseven\symbol{136}} + \expandafter\def\csname simpleicon@mcdonaldsicon\endcsname {\simpleiconsmapseven\symbol{137}} + \expandafter\def\csname simpleicon@mclarenicon\endcsname {\simpleiconsmapseven\symbol{138}} + \expandafter\def\csname simpleicon@mdbookicon\endcsname {\simpleiconsmapseven\symbol{139}} + \expandafter\def\csname simpleicon@mdnwebdocsicon\endcsname {\simpleiconsmapseven\symbol{140}} + \expandafter\def\csname simpleicon@mdxicon\endcsname {\simpleiconsmapseven\symbol{141}} + \expandafter\def\csname simpleicon@mediafireicon\endcsname {\simpleiconsmapseven\symbol{142}} + \expandafter\def\csname simpleicon@mediamarkticon\endcsname {\simpleiconsmapseven\symbol{143}} + \expandafter\def\csname simpleicon@mediatekicon\endcsname {\simpleiconsmapseven\symbol{144}} + \expandafter\def\csname simpleicon@medibangpainticon\endcsname {\simpleiconsmapseven\symbol{145}} + \expandafter\def\csname simpleicon@mediumicon\endcsname {\simpleiconsmapseven\symbol{146}} + \expandafter\def\csname simpleicon@medusaicon\endcsname {\simpleiconsmapseven\symbol{147}} + \expandafter\def\csname simpleicon@meetupicon\endcsname {\simpleiconsmapseven\symbol{148}} + \expandafter\def\csname simpleicon@megaicon\endcsname {\simpleiconsmapseven\symbol{149}} + \expandafter\def\csname simpleicon@meilisearchicon\endcsname {\simpleiconsmapseven\symbol{150}} + \expandafter\def\csname simpleicon@meituanicon\endcsname {\simpleiconsmapseven\symbol{151}} + \expandafter\def\csname simpleicon@meizuicon\endcsname {\simpleiconsmapseven\symbol{152}} + \expandafter\def\csname simpleicon@mendeleyicon\endcsname {\simpleiconsmapseven\symbol{153}} + \expandafter\def\csname simpleicon@mentorcruiseicon\endcsname {\simpleiconsmapseven\symbol{154}} + \expandafter\def\csname simpleicon@mercadopagoicon\endcsname {\simpleiconsmapseven\symbol{155}} + \expandafter\def\csname simpleicon@mercedesicon\endcsname {\simpleiconsmapseven\symbol{156}} + \expandafter\def\csname simpleicon@merckicon\endcsname {\simpleiconsmapseven\symbol{157}} + \expandafter\def\csname simpleicon@mercurialicon\endcsname {\simpleiconsmapseven\symbol{158}} + \expandafter\def\csname simpleicon@mermaidicon\endcsname {\simpleiconsmapseven\symbol{159}} + \expandafter\def\csname simpleicon@messengericon\endcsname {\simpleiconsmapseven\symbol{160}} + \expandafter\def\csname simpleicon@metaicon\endcsname {\simpleiconsmapseven\symbol{161}} + \expandafter\def\csname simpleicon@metabaseicon\endcsname {\simpleiconsmapseven\symbol{162}} + \expandafter\def\csname simpleicon@metacriticicon\endcsname {\simpleiconsmapseven\symbol{163}} + \expandafter\def\csname simpleicon@metafiltericon\endcsname {\simpleiconsmapseven\symbol{164}} + \expandafter\def\csname simpleicon@metasploiticon\endcsname {\simpleiconsmapseven\symbol{165}} + \expandafter\def\csname simpleicon@meteoricon\endcsname {\simpleiconsmapseven\symbol{166}} + \expandafter\def\csname simpleicon@metroicon\endcsname {\simpleiconsmapseven\symbol{167}} + \expandafter\def\csname simpleicon@metrodelaciudaddemexicoicon\endcsname {\simpleiconsmapseven\symbol{168}} + \expandafter\def\csname simpleicon@metrodemadridicon\endcsname {\simpleiconsmapseven\symbol{169}} + \expandafter\def\csname simpleicon@metrodeparisicon\endcsname {\simpleiconsmapseven\symbol{170}} + \expandafter\def\csname simpleicon@meweicon\endcsname {\simpleiconsmapseven\symbol{171}} + \expandafter\def\csname simpleicon@mgicon\endcsname {\simpleiconsmapseven\symbol{172}} + \expandafter\def\csname simpleicon@microbiticon\endcsname {\simpleiconsmapseven\symbol{173}} + \expandafter\def\csname simpleicon@microdotblogicon\endcsname {\simpleiconsmapseven\symbol{174}} + \expandafter\def\csname simpleicon@microeditoricon\endcsname {\simpleiconsmapseven\symbol{175}} + \expandafter\def\csname simpleicon@microgeneticsicon\endcsname {\simpleiconsmapseven\symbol{176}} + \expandafter\def\csname simpleicon@micropythonicon\endcsname {\simpleiconsmapseven\symbol{177}} + \expandafter\def\csname simpleicon@microstationicon\endcsname {\simpleiconsmapseven\symbol{178}} + \expandafter\def\csname simpleicon@microstrategyicon\endcsname {\simpleiconsmapseven\symbol{179}} + \expandafter\def\csname simpleicon@midiicon\endcsname {\simpleiconsmapseven\symbol{180}} + \expandafter\def\csname simpleicon@migaduicon\endcsname {\simpleiconsmapseven\symbol{181}} + \expandafter\def\csname simpleicon@mikrotikicon\endcsname {\simpleiconsmapseven\symbol{182}} + \expandafter\def\csname simpleicon@milanoteicon\endcsname {\simpleiconsmapseven\symbol{183}} + \expandafter\def\csname simpleicon@milvusicon\endcsname {\simpleiconsmapseven\symbol{184}} + \expandafter\def\csname simpleicon@mindsicon\endcsname {\simpleiconsmapseven\symbol{185}} + \expandafter\def\csname simpleicon@minetesticon\endcsname {\simpleiconsmapseven\symbol{186}} + \expandafter\def\csname simpleicon@mingww64icon\endcsname {\simpleiconsmapseven\symbol{187}} + \expandafter\def\csname simpleicon@miniicon\endcsname {\simpleiconsmapseven\symbol{188}} + \expandafter\def\csname simpleicon@minioicon\endcsname {\simpleiconsmapseven\symbol{189}} + \expandafter\def\csname simpleicon@mintlifyicon\endcsname {\simpleiconsmapseven\symbol{190}} + \expandafter\def\csname simpleicon@minutemailericon\endcsname {\simpleiconsmapseven\symbol{191}} + \expandafter\def\csname simpleicon@mirahezeicon\endcsname {\simpleiconsmapseven\symbol{192}} + \expandafter\def\csname simpleicon@miroicon\endcsname {\simpleiconsmapseven\symbol{193}} + \expandafter\def\csname simpleicon@misskeyicon\endcsname {\simpleiconsmapseven\symbol{194}} + \expandafter\def\csname simpleicon@mitsubishiicon\endcsname {\simpleiconsmapseven\symbol{195}} + \expandafter\def\csname simpleicon@mixicon\endcsname {\simpleiconsmapseven\symbol{196}} + \expandafter\def\csname simpleicon@mixcloudicon\endcsname {\simpleiconsmapseven\symbol{197}} + \expandafter\def\csname simpleicon@mixpanelicon\endcsname {\simpleiconsmapseven\symbol{198}} + \expandafter\def\csname simpleicon@mlbicon\endcsname {\simpleiconsmapseven\symbol{199}} + \expandafter\def\csname simpleicon@mlflowicon\endcsname {\simpleiconsmapseven\symbol{200}} + \expandafter\def\csname simpleicon@mobxicon\endcsname {\simpleiconsmapseven\symbol{201}} + \expandafter\def\csname simpleicon@mobxstatetreeicon\endcsname {\simpleiconsmapseven\symbol{202}} + \expandafter\def\csname simpleicon@mochaicon\endcsname {\simpleiconsmapseven\symbol{203}} + \expandafter\def\csname simpleicon@mockserviceworkericon\endcsname {\simpleiconsmapseven\symbol{204}} + \expandafter\def\csname simpleicon@modalicon\endcsname {\simpleiconsmapseven\symbol{205}} + \expandafter\def\csname simpleicon@modinicon\endcsname {\simpleiconsmapseven\symbol{206}} + \expandafter\def\csname simpleicon@modrinthicon\endcsname {\simpleiconsmapseven\symbol{207}} + \expandafter\def\csname simpleicon@modxicon\endcsname {\simpleiconsmapseven\symbol{208}} + \expandafter\def\csname simpleicon@moleculericon\endcsname {\simpleiconsmapseven\symbol{209}} + \expandafter\def\csname simpleicon@momenteoicon\endcsname {\simpleiconsmapseven\symbol{210}} + \expandafter\def\csname simpleicon@moneroicon\endcsname {\simpleiconsmapseven\symbol{211}} + \expandafter\def\csname simpleicon@moneygramicon\endcsname {\simpleiconsmapseven\symbol{212}} + \expandafter\def\csname simpleicon@mongodbicon\endcsname {\simpleiconsmapseven\symbol{213}} + \expandafter\def\csname simpleicon@mongooseicon\endcsname {\simpleiconsmapseven\symbol{214}} + \expandafter\def\csname simpleicon@mongoosedotwsicon\endcsname {\simpleiconsmapseven\symbol{215}} + \expandafter\def\csname simpleicon@monicaicon\endcsname {\simpleiconsmapseven\symbol{216}} + \expandafter\def\csname simpleicon@monkeytieicon\endcsname {\simpleiconsmapseven\symbol{217}} + \expandafter\def\csname simpleicon@monkeytypeicon\endcsname {\simpleiconsmapseven\symbol{218}} + \expandafter\def\csname simpleicon@monogameicon\endcsname {\simpleiconsmapseven\symbol{219}} + \expandafter\def\csname simpleicon@monoprixicon\endcsname {\simpleiconsmapseven\symbol{220}} + \expandafter\def\csname simpleicon@monstericon\endcsname {\simpleiconsmapseven\symbol{221}} + \expandafter\def\csname simpleicon@monzoicon\endcsname {\simpleiconsmapseven\symbol{222}} + \expandafter\def\csname simpleicon@mooicon\endcsname {\simpleiconsmapseven\symbol{223}} + \expandafter\def\csname simpleicon@moodleicon\endcsname {\simpleiconsmapseven\symbol{224}} + \expandafter\def\csname simpleicon@moonrepoicon\endcsname {\simpleiconsmapseven\symbol{225}} + \expandafter\def\csname simpleicon@moqicon\endcsname {\simpleiconsmapseven\symbol{226}} + \expandafter\def\csname simpleicon@moqupsicon\endcsname {\simpleiconsmapseven\symbol{227}} + \expandafter\def\csname simpleicon@morrisonsicon\endcsname {\simpleiconsmapseven\symbol{228}} + \expandafter\def\csname simpleicon@moscowmetroicon\endcsname {\simpleiconsmapseven\symbol{229}} + \expandafter\def\csname simpleicon@motorolaicon\endcsname {\simpleiconsmapseven\symbol{230}} + \expandafter\def\csname simpleicon@mozillaicon\endcsname {\simpleiconsmapseven\symbol{231}} + \expandafter\def\csname simpleicon@mpvicon\endcsname {\simpleiconsmapseven\symbol{232}} + \expandafter\def\csname simpleicon@mqtticon\endcsname {\simpleiconsmapseven\symbol{233}} + \expandafter\def\csname simpleicon@msiicon\endcsname {\simpleiconsmapseven\symbol{234}} + \expandafter\def\csname simpleicon@msibusinessicon\endcsname {\simpleiconsmapseven\symbol{235}} + \expandafter\def\csname simpleicon@mtaicon\endcsname {\simpleiconsmapseven\symbol{236}} + \expandafter\def\csname simpleicon@mtricon\endcsname {\simpleiconsmapseven\symbol{237}} + \expandafter\def\csname simpleicon@mubiicon\endcsname {\simpleiconsmapseven\symbol{238}} + \expandafter\def\csname simpleicon@muiicon\endcsname {\simpleiconsmapseven\symbol{239}} + \expandafter\def\csname simpleicon@mulesofticon\endcsname {\simpleiconsmapseven\symbol{240}} + \expandafter\def\csname simpleicon@mullericon\endcsname {\simpleiconsmapseven\symbol{241}} + \expandafter\def\csname simpleicon@multisimicon\endcsname {\simpleiconsmapseven\symbol{242}} + \expandafter\def\csname simpleicon@mumbleicon\endcsname {\simpleiconsmapseven\symbol{243}} + \expandafter\def\csname simpleicon@muoicon\endcsname {\simpleiconsmapseven\symbol{244}} + \expandafter\def\csname simpleicon@muralicon\endcsname {\simpleiconsmapseven\symbol{245}} + \expandafter\def\csname simpleicon@musescoreicon\endcsname {\simpleiconsmapseven\symbol{246}} + \expandafter\def\csname simpleicon@musicbrainzicon\endcsname {\simpleiconsmapseven\symbol{247}} + \expandafter\def\csname simpleicon@mxlinuxicon\endcsname {\simpleiconsmapseven\symbol{248}} + \expandafter\def\csname simpleicon@myanimelisticon\endcsname {\simpleiconsmapseven\symbol{249}} + \expandafter\def\csname simpleicon@mygeticon\endcsname {\simpleiconsmapseven\symbol{250}} + \expandafter\def\csname simpleicon@myobicon\endcsname {\simpleiconsmapseven\symbol{251}} + \expandafter\def\csname simpleicon@myspaceicon\endcsname {\simpleiconsmapseven\symbol{252}} + \expandafter\def\csname simpleicon@mysqlicon\endcsname {\simpleiconsmapseven\symbol{253}} + \expandafter\def\csname simpleicon@n26icon\endcsname {\simpleiconsmapseven\symbol{254}} + \expandafter\def\csname simpleicon@n8nicon\endcsname {\simpleiconsmapseven\symbol{255}} + \expandafter\def\csname simpleicon@namebaseicon\endcsname {\simpleiconsmapeight\symbol{0}} + \expandafter\def\csname simpleicon@namecheapicon\endcsname {\simpleiconsmapeight\symbol{1}} + \expandafter\def\csname simpleicon@namemcicon\endcsname {\simpleiconsmapeight\symbol{2}} + \expandafter\def\csname simpleicon@namesiloicon\endcsname {\simpleiconsmapeight\symbol{3}} + \expandafter\def\csname simpleicon@namuwikiicon\endcsname {\simpleiconsmapeight\symbol{4}} + \expandafter\def\csname simpleicon@nanoicon\endcsname {\simpleiconsmapeight\symbol{5}} + \expandafter\def\csname simpleicon@nasaicon\endcsname {\simpleiconsmapeight\symbol{6}} + \expandafter\def\csname simpleicon@nationalgridicon\endcsname {\simpleiconsmapeight\symbol{7}} + \expandafter\def\csname simpleicon@nationalrailicon\endcsname {\simpleiconsmapeight\symbol{8}} + \expandafter\def\csname simpleicon@nativescripticon\endcsname {\simpleiconsmapeight\symbol{9}} + \expandafter\def\csname simpleicon@natsdotioicon\endcsname {\simpleiconsmapeight\symbol{10}} + \expandafter\def\csname simpleicon@navericon\endcsname {\simpleiconsmapeight\symbol{11}} + \expandafter\def\csname simpleicon@nbaicon\endcsname {\simpleiconsmapeight\symbol{12}} + \expandafter\def\csname simpleicon@nbbicon\endcsname {\simpleiconsmapeight\symbol{13}} + \expandafter\def\csname simpleicon@nbcicon\endcsname {\simpleiconsmapeight\symbol{14}} + \expandafter\def\csname simpleicon@ndricon\endcsname {\simpleiconsmapeight\symbol{15}} + \expandafter\def\csname simpleicon@nearicon\endcsname {\simpleiconsmapeight\symbol{16}} + \expandafter\def\csname simpleicon@necicon\endcsname {\simpleiconsmapeight\symbol{17}} + \expandafter\def\csname simpleicon@neo4jicon\endcsname {\simpleiconsmapeight\symbol{18}} + \expandafter\def\csname simpleicon@neovimicon\endcsname {\simpleiconsmapeight\symbol{19}} + \expandafter\def\csname simpleicon@neptuneicon\endcsname {\simpleiconsmapeight\symbol{20}} + \expandafter\def\csname simpleicon@nestjsicon\endcsname {\simpleiconsmapeight\symbol{21}} + \expandafter\def\csname simpleicon@netappicon\endcsname {\simpleiconsmapeight\symbol{22}} + \expandafter\def\csname simpleicon@netbsdicon\endcsname {\simpleiconsmapeight\symbol{23}} + \expandafter\def\csname simpleicon@netcupicon\endcsname {\simpleiconsmapeight\symbol{24}} + \expandafter\def\csname simpleicon@netdataicon\endcsname {\simpleiconsmapeight\symbol{25}} + \expandafter\def\csname simpleicon@neteasecloudmusicicon\endcsname {\simpleiconsmapeight\symbol{26}} + \expandafter\def\csname simpleicon@netflixicon\endcsname {\simpleiconsmapeight\symbol{27}} + \expandafter\def\csname simpleicon@netgearicon\endcsname {\simpleiconsmapeight\symbol{28}} + \expandafter\def\csname simpleicon@netlifyicon\endcsname {\simpleiconsmapeight\symbol{29}} + \expandafter\def\csname simpleicon@netteicon\endcsname {\simpleiconsmapeight\symbol{30}} + \expandafter\def\csname simpleicon@nettoicon\endcsname {\simpleiconsmapeight\symbol{31}} + \expandafter\def\csname simpleicon@neutralinojsicon\endcsname {\simpleiconsmapeight\symbol{32}} + \expandafter\def\csname simpleicon@newbalanceicon\endcsname {\simpleiconsmapeight\symbol{33}} + \expandafter\def\csname simpleicon@neweggicon\endcsname {\simpleiconsmapeight\symbol{34}} + \expandafter\def\csname simpleicon@newjapanprowrestlingicon\endcsname {\simpleiconsmapeight\symbol{35}} + \expandafter\def\csname simpleicon@newrelicicon\endcsname {\simpleiconsmapeight\symbol{36}} + \expandafter\def\csname simpleicon@newyorktimesicon\endcsname {\simpleiconsmapeight\symbol{37}} + \expandafter\def\csname simpleicon@nextbilliondotaiicon\endcsname {\simpleiconsmapeight\symbol{38}} + \expandafter\def\csname simpleicon@nextcloudicon\endcsname {\simpleiconsmapeight\symbol{39}} + \expandafter\def\csname simpleicon@nextdnsicon\endcsname {\simpleiconsmapeight\symbol{40}} + \expandafter\def\csname simpleicon@nextdooricon\endcsname {\simpleiconsmapeight\symbol{41}} + \expandafter\def\csname simpleicon@nextdotjsicon\endcsname {\simpleiconsmapeight\symbol{42}} + \expandafter\def\csname simpleicon@nextraicon\endcsname {\simpleiconsmapeight\symbol{43}} + \expandafter\def\csname simpleicon@nextuiicon\endcsname {\simpleiconsmapeight\symbol{44}} + \expandafter\def\csname simpleicon@nexusmodsicon\endcsname {\simpleiconsmapeight\symbol{45}} + \expandafter\def\csname simpleicon@nfcicon\endcsname {\simpleiconsmapeight\symbol{46}} + \expandafter\def\csname simpleicon@nginxicon\endcsname {\simpleiconsmapeight\symbol{47}} + \expandafter\def\csname simpleicon@nginxproxymanagericon\endcsname {\simpleiconsmapeight\symbol{48}} + \expandafter\def\csname simpleicon@ngrokicon\endcsname {\simpleiconsmapeight\symbol{49}} + \expandafter\def\csname simpleicon@ngrxicon\endcsname {\simpleiconsmapeight\symbol{50}} + \expandafter\def\csname simpleicon@nhlicon\endcsname {\simpleiconsmapeight\symbol{51}} + \expandafter\def\csname simpleicon@nicehashicon\endcsname {\simpleiconsmapeight\symbol{52}} + \expandafter\def\csname simpleicon@niconicoicon\endcsname {\simpleiconsmapeight\symbol{53}} + \expandafter\def\csname simpleicon@nikeicon\endcsname {\simpleiconsmapeight\symbol{54}} + \expandafter\def\csname simpleicon@nikonicon\endcsname {\simpleiconsmapeight\symbol{55}} + \expandafter\def\csname simpleicon@nimicon\endcsname {\simpleiconsmapeight\symbol{56}} + \expandafter\def\csname simpleicon@nintendoicon\endcsname {\simpleiconsmapeight\symbol{57}} + \expandafter\def\csname simpleicon@nintendo3dsicon\endcsname {\simpleiconsmapeight\symbol{58}} + \expandafter\def\csname simpleicon@nintendogamecubeicon\endcsname {\simpleiconsmapeight\symbol{59}} + \expandafter\def\csname simpleicon@nintendoswitchicon\endcsname {\simpleiconsmapeight\symbol{60}} + \expandafter\def\csname simpleicon@nissanicon\endcsname {\simpleiconsmapeight\symbol{61}} + \expandafter\def\csname simpleicon@nixosicon\endcsname {\simpleiconsmapeight\symbol{62}} + \expandafter\def\csname simpleicon@nodedotjsicon\endcsname {\simpleiconsmapeight\symbol{63}} + \expandafter\def\csname simpleicon@nodemonicon\endcsname {\simpleiconsmapeight\symbol{64}} + \expandafter\def\csname simpleicon@noderedicon\endcsname {\simpleiconsmapeight\symbol{65}} + \expandafter\def\csname simpleicon@nokiaicon\endcsname {\simpleiconsmapeight\symbol{66}} + \expandafter\def\csname simpleicon@nomadicon\endcsname {\simpleiconsmapeight\symbol{67}} + \expandafter\def\csname simpleicon@norcoicon\endcsname {\simpleiconsmapeight\symbol{68}} + \expandafter\def\csname simpleicon@nordicsemiconductoricon\endcsname {\simpleiconsmapeight\symbol{69}} + \expandafter\def\csname simpleicon@nordvpnicon\endcsname {\simpleiconsmapeight\symbol{70}} + \expandafter\def\csname simpleicon@normalizedotcssicon\endcsname {\simpleiconsmapeight\symbol{71}} + \expandafter\def\csname simpleicon@nortonicon\endcsname {\simpleiconsmapeight\symbol{72}} + \expandafter\def\csname simpleicon@norwegianicon\endcsname {\simpleiconsmapeight\symbol{73}} + \expandafter\def\csname simpleicon@notepadplusplusicon\endcsname {\simpleiconsmapeight\symbol{74}} + \expandafter\def\csname simpleicon@notionicon\endcsname {\simpleiconsmapeight\symbol{75}} + \expandafter\def\csname simpleicon@notisticon\endcsname {\simpleiconsmapeight\symbol{76}} + \expandafter\def\csname simpleicon@nounprojecticon\endcsname {\simpleiconsmapeight\symbol{77}} + \expandafter\def\csname simpleicon@novuicon\endcsname {\simpleiconsmapeight\symbol{78}} + \expandafter\def\csname simpleicon@nowicon\endcsname {\simpleiconsmapeight\symbol{79}} + \expandafter\def\csname simpleicon@npmicon\endcsname {\simpleiconsmapeight\symbol{80}} + \expandafter\def\csname simpleicon@nrwlicon\endcsname {\simpleiconsmapeight\symbol{81}} + \expandafter\def\csname simpleicon@nsisicon\endcsname {\simpleiconsmapeight\symbol{82}} + \expandafter\def\csname simpleicon@ntfyicon\endcsname {\simpleiconsmapeight\symbol{83}} + \expandafter\def\csname simpleicon@nubankicon\endcsname {\simpleiconsmapeight\symbol{84}} + \expandafter\def\csname simpleicon@nucleoicon\endcsname {\simpleiconsmapeight\symbol{85}} + \expandafter\def\csname simpleicon@nugeticon\endcsname {\simpleiconsmapeight\symbol{86}} + \expandafter\def\csname simpleicon@nukeicon\endcsname {\simpleiconsmapeight\symbol{87}} + \expandafter\def\csname simpleicon@numbaicon\endcsname {\simpleiconsmapeight\symbol{88}} + \expandafter\def\csname simpleicon@numpyicon\endcsname {\simpleiconsmapeight\symbol{89}} + \expandafter\def\csname simpleicon@nunjucksicon\endcsname {\simpleiconsmapeight\symbol{90}} + \expandafter\def\csname simpleicon@nushellicon\endcsname {\simpleiconsmapeight\symbol{91}} + \expandafter\def\csname simpleicon@nutanixicon\endcsname {\simpleiconsmapeight\symbol{92}} + \expandafter\def\csname simpleicon@nuxtdotjsicon\endcsname {\simpleiconsmapeight\symbol{93}} + \expandafter\def\csname simpleicon@nvidiaicon\endcsname {\simpleiconsmapeight\symbol{94}} + \expandafter\def\csname simpleicon@nvmicon\endcsname {\simpleiconsmapeight\symbol{95}} + \expandafter\def\csname simpleicon@nxicon\endcsname {\simpleiconsmapeight\symbol{96}} + \expandafter\def\csname simpleicon@nxpicon\endcsname {\simpleiconsmapeight\symbol{97}} + \expandafter\def\csname simpleicon@nzxticon\endcsname {\simpleiconsmapeight\symbol{98}} + \expandafter\def\csname simpleicon@observableicon\endcsname {\simpleiconsmapeight\symbol{99}} + \expandafter\def\csname simpleicon@obsidianicon\endcsname {\simpleiconsmapeight\symbol{100}} + \expandafter\def\csname simpleicon@obsstudioicon\endcsname {\simpleiconsmapeight\symbol{101}} + \expandafter\def\csname simpleicon@ocamlicon\endcsname {\simpleiconsmapeight\symbol{102}} + \expandafter\def\csname simpleicon@oclificon\endcsname {\simpleiconsmapeight\symbol{103}} + \expandafter\def\csname simpleicon@octanerendericon\endcsname {\simpleiconsmapeight\symbol{104}} + \expandafter\def\csname simpleicon@octaveicon\endcsname {\simpleiconsmapeight\symbol{105}} + \expandafter\def\csname simpleicon@octobercmsicon\endcsname {\simpleiconsmapeight\symbol{106}} + \expandafter\def\csname simpleicon@octoprinticon\endcsname {\simpleiconsmapeight\symbol{107}} + \expandafter\def\csname simpleicon@octopusdeployicon\endcsname {\simpleiconsmapeight\symbol{108}} + \expandafter\def\csname simpleicon@oculusicon\endcsname {\simpleiconsmapeight\symbol{109}} + \expandafter\def\csname simpleicon@odnoklassnikiicon\endcsname {\simpleiconsmapeight\symbol{110}} + \expandafter\def\csname simpleicon@odooicon\endcsname {\simpleiconsmapeight\symbol{111}} + \expandafter\def\csname simpleicon@odyseeicon\endcsname {\simpleiconsmapeight\symbol{112}} + \expandafter\def\csname simpleicon@ohdearicon\endcsname {\simpleiconsmapeight\symbol{113}} + \expandafter\def\csname simpleicon@okcupidicon\endcsname {\simpleiconsmapeight\symbol{114}} + \expandafter\def\csname simpleicon@oktaicon\endcsname {\simpleiconsmapeight\symbol{115}} + \expandafter\def\csname simpleicon@ollamaicon\endcsname {\simpleiconsmapeight\symbol{116}} + \expandafter\def\csname simpleicon@oneplusicon\endcsname {\simpleiconsmapeight\symbol{117}} + \expandafter\def\csname simpleicon@onlyfansicon\endcsname {\simpleiconsmapeight\symbol{118}} + \expandafter\def\csname simpleicon@onlyofficeicon\endcsname {\simpleiconsmapeight\symbol{119}} + \expandafter\def\csname simpleicon@onnxicon\endcsname {\simpleiconsmapeight\symbol{120}} + \expandafter\def\csname simpleicon@onstaricon\endcsname {\simpleiconsmapeight\symbol{121}} + \expandafter\def\csname simpleicon@opelicon\endcsname {\simpleiconsmapeight\symbol{122}} + \expandafter\def\csname simpleicon@openaccessicon\endcsname {\simpleiconsmapeight\symbol{123}} + \expandafter\def\csname simpleicon@openaiicon\endcsname {\simpleiconsmapeight\symbol{124}} + \expandafter\def\csname simpleicon@openaigymicon\endcsname {\simpleiconsmapeight\symbol{125}} + \expandafter\def\csname simpleicon@openapiinitiativeicon\endcsname {\simpleiconsmapeight\symbol{126}} + \expandafter\def\csname simpleicon@openbadgesicon\endcsname {\simpleiconsmapeight\symbol{127}} + \expandafter\def\csname simpleicon@openbsdicon\endcsname {\simpleiconsmapeight\symbol{128}} + \expandafter\def\csname simpleicon@openbugbountyicon\endcsname {\simpleiconsmapeight\symbol{129}} + \expandafter\def\csname simpleicon@opencollectiveicon\endcsname {\simpleiconsmapeight\symbol{130}} + \expandafter\def\csname simpleicon@opencontainersinitiativeicon\endcsname {\simpleiconsmapeight\symbol{131}} + \expandafter\def\csname simpleicon@opencvicon\endcsname {\simpleiconsmapeight\symbol{132}} + \expandafter\def\csname simpleicon@openfaasicon\endcsname {\simpleiconsmapeight\symbol{133}} + \expandafter\def\csname simpleicon@openglicon\endcsname {\simpleiconsmapeight\symbol{134}} + \expandafter\def\csname simpleicon@openhabicon\endcsname {\simpleiconsmapeight\symbol{135}} + \expandafter\def\csname simpleicon@openidicon\endcsname {\simpleiconsmapeight\symbol{136}} + \expandafter\def\csname simpleicon@openjdkicon\endcsname {\simpleiconsmapeight\symbol{137}} + \expandafter\def\csname simpleicon@openjsfoundationicon\endcsname {\simpleiconsmapeight\symbol{138}} + \expandafter\def\csname simpleicon@openlayersicon\endcsname {\simpleiconsmapeight\symbol{139}} + \expandafter\def\csname simpleicon@openmediavaulticon\endcsname {\simpleiconsmapeight\symbol{140}} + \expandafter\def\csname simpleicon@openminedicon\endcsname {\simpleiconsmapeight\symbol{141}} + \expandafter\def\csname simpleicon@opennebulaicon\endcsname {\simpleiconsmapeight\symbol{142}} + \expandafter\def\csname simpleicon@openprojecticon\endcsname {\simpleiconsmapeight\symbol{143}} + \expandafter\def\csname simpleicon@openscadicon\endcsname {\simpleiconsmapeight\symbol{144}} + \expandafter\def\csname simpleicon@openseaicon\endcsname {\simpleiconsmapeight\symbol{145}} + \expandafter\def\csname simpleicon@opensearchicon\endcsname {\simpleiconsmapeight\symbol{146}} + \expandafter\def\csname simpleicon@opensourcehardwareicon\endcsname {\simpleiconsmapeight\symbol{147}} + \expandafter\def\csname simpleicon@opensourceinitiativeicon\endcsname {\simpleiconsmapeight\symbol{148}} + \expandafter\def\csname simpleicon@opensslicon\endcsname {\simpleiconsmapeight\symbol{149}} + \expandafter\def\csname simpleicon@openstackicon\endcsname {\simpleiconsmapeight\symbol{150}} + \expandafter\def\csname simpleicon@openstreetmapicon\endcsname {\simpleiconsmapeight\symbol{151}} + \expandafter\def\csname simpleicon@opensuseicon\endcsname {\simpleiconsmapeight\symbol{152}} + \expandafter\def\csname simpleicon@opentelemetryicon\endcsname {\simpleiconsmapeight\symbol{153}} + \expandafter\def\csname simpleicon@opentexticon\endcsname {\simpleiconsmapeight\symbol{154}} + \expandafter\def\csname simpleicon@opentofuicon\endcsname {\simpleiconsmapeight\symbol{155}} + \expandafter\def\csname simpleicon@openverseicon\endcsname {\simpleiconsmapeight\symbol{156}} + \expandafter\def\csname simpleicon@openvpnicon\endcsname {\simpleiconsmapeight\symbol{157}} + \expandafter\def\csname simpleicon@openwrticon\endcsname {\simpleiconsmapeight\symbol{158}} + \expandafter\def\csname simpleicon@openzeppelinicon\endcsname {\simpleiconsmapeight\symbol{159}} + \expandafter\def\csname simpleicon@openzfsicon\endcsname {\simpleiconsmapeight\symbol{160}} + \expandafter\def\csname simpleicon@operaicon\endcsname {\simpleiconsmapeight\symbol{161}} + \expandafter\def\csname simpleicon@operagxicon\endcsname {\simpleiconsmapeight\symbol{162}} + \expandafter\def\csname simpleicon@opnsenseicon\endcsname {\simpleiconsmapeight\symbol{163}} + \expandafter\def\csname simpleicon@oppoicon\endcsname {\simpleiconsmapeight\symbol{164}} + \expandafter\def\csname simpleicon@opsgenieicon\endcsname {\simpleiconsmapeight\symbol{165}} + \expandafter\def\csname simpleicon@opslevelicon\endcsname {\simpleiconsmapeight\symbol{166}} + \expandafter\def\csname simpleicon@optimismicon\endcsname {\simpleiconsmapeight\symbol{167}} + \expandafter\def\csname simpleicon@oracleicon\endcsname {\simpleiconsmapeight\symbol{168}} + \expandafter\def\csname simpleicon@orangeicon\endcsname {\simpleiconsmapeight\symbol{169}} + \expandafter\def\csname simpleicon@orcidicon\endcsname {\simpleiconsmapeight\symbol{170}} + \expandafter\def\csname simpleicon@oreillyicon\endcsname {\simpleiconsmapeight\symbol{171}} + \expandafter\def\csname simpleicon@orgicon\endcsname {\simpleiconsmapeight\symbol{172}} + \expandafter\def\csname simpleicon@organicmapsicon\endcsname {\simpleiconsmapeight\symbol{173}} + \expandafter\def\csname simpleicon@originicon\endcsname {\simpleiconsmapeight\symbol{174}} + \expandafter\def\csname simpleicon@osanoicon\endcsname {\simpleiconsmapeight\symbol{175}} + \expandafter\def\csname simpleicon@osficon\endcsname {\simpleiconsmapeight\symbol{176}} + \expandafter\def\csname simpleicon@osgeoicon\endcsname {\simpleiconsmapeight\symbol{177}} + \expandafter\def\csname simpleicon@oshkoshicon\endcsname {\simpleiconsmapeight\symbol{178}} + \expandafter\def\csname simpleicon@osmcicon\endcsname {\simpleiconsmapeight\symbol{179}} + \expandafter\def\csname simpleicon@osuicon\endcsname {\simpleiconsmapeight\symbol{180}} + \expandafter\def\csname simpleicon@ottoicon\endcsname {\simpleiconsmapeight\symbol{181}} + \expandafter\def\csname simpleicon@outlineicon\endcsname {\simpleiconsmapeight\symbol{182}} + \expandafter\def\csname simpleicon@overcasticon\endcsname {\simpleiconsmapeight\symbol{183}} + \expandafter\def\csname simpleicon@overleaficon\endcsname {\simpleiconsmapeight\symbol{184}} + \expandafter\def\csname simpleicon@ovhicon\endcsname {\simpleiconsmapeight\symbol{185}} + \expandafter\def\csname simpleicon@owaspicon\endcsname {\simpleiconsmapeight\symbol{186}} + \expandafter\def\csname simpleicon@owncloudicon\endcsname {\simpleiconsmapeight\symbol{187}} + \expandafter\def\csname simpleicon@oxygenicon\endcsname {\simpleiconsmapeight\symbol{188}} + \expandafter\def\csname simpleicon@oyoicon\endcsname {\simpleiconsmapeight\symbol{189}} + \expandafter\def\csname simpleicon@p5dotjsicon\endcsname {\simpleiconsmapeight\symbol{190}} + \expandafter\def\csname simpleicon@packagisticon\endcsname {\simpleiconsmapeight\symbol{191}} + \expandafter\def\csname simpleicon@packericon\endcsname {\simpleiconsmapeight\symbol{192}} + \expandafter\def\csname simpleicon@packticon\endcsname {\simpleiconsmapeight\symbol{193}} + \expandafter\def\csname simpleicon@paddleicon\endcsname {\simpleiconsmapeight\symbol{194}} + \expandafter\def\csname simpleicon@paddlepaddleicon\endcsname {\simpleiconsmapeight\symbol{195}} + \expandafter\def\csname simpleicon@paddypowericon\endcsname {\simpleiconsmapeight\symbol{196}} + \expandafter\def\csname simpleicon@pagekiticon\endcsname {\simpleiconsmapeight\symbol{197}} + \expandafter\def\csname simpleicon@pagerdutyicon\endcsname {\simpleiconsmapeight\symbol{198}} + \expandafter\def\csname simpleicon@pagespeedinsightsicon\endcsname {\simpleiconsmapeight\symbol{199}} + \expandafter\def\csname simpleicon@pagseguroicon\endcsname {\simpleiconsmapeight\symbol{200}} + \expandafter\def\csname simpleicon@palantiricon\endcsname {\simpleiconsmapeight\symbol{201}} + \expandafter\def\csname simpleicon@paloaltonetworksicon\endcsname {\simpleiconsmapeight\symbol{202}} + \expandafter\def\csname simpleicon@paloaltosoftwareicon\endcsname {\simpleiconsmapeight\symbol{203}} + \expandafter\def\csname simpleicon@panasonicicon\endcsname {\simpleiconsmapeight\symbol{204}} + \expandafter\def\csname simpleicon@pandasicon\endcsname {\simpleiconsmapeight\symbol{205}} + \expandafter\def\csname simpleicon@pandoraicon\endcsname {\simpleiconsmapeight\symbol{206}} + \expandafter\def\csname simpleicon@pantheonicon\endcsname {\simpleiconsmapeight\symbol{207}} + \expandafter\def\csname simpleicon@paperlessngxicon\endcsname {\simpleiconsmapeight\symbol{208}} + \expandafter\def\csname simpleicon@paperspaceicon\endcsname {\simpleiconsmapeight\symbol{209}} + \expandafter\def\csname simpleicon@paperswithcodeicon\endcsname {\simpleiconsmapeight\symbol{210}} + \expandafter\def\csname simpleicon@paramountplusicon\endcsname {\simpleiconsmapeight\symbol{211}} + \expandafter\def\csname simpleicon@paritysubstrateicon\endcsname {\simpleiconsmapeight\symbol{212}} + \expandafter\def\csname simpleicon@parrotsecurityicon\endcsname {\simpleiconsmapeight\symbol{213}} + \expandafter\def\csname simpleicon@parsedotlyicon\endcsname {\simpleiconsmapeight\symbol{214}} + \expandafter\def\csname simpleicon@passporticon\endcsname {\simpleiconsmapeight\symbol{215}} + \expandafter\def\csname simpleicon@pastebinicon\endcsname {\simpleiconsmapeight\symbol{216}} + \expandafter\def\csname simpleicon@patreonicon\endcsname {\simpleiconsmapeight\symbol{217}} + \expandafter\def\csname simpleicon@paychexicon\endcsname {\simpleiconsmapeight\symbol{218}} + \expandafter\def\csname simpleicon@payhipicon\endcsname {\simpleiconsmapeight\symbol{219}} + \expandafter\def\csname simpleicon@payloadcmsicon\endcsname {\simpleiconsmapeight\symbol{220}} + \expandafter\def\csname simpleicon@payoneericon\endcsname {\simpleiconsmapeight\symbol{221}} + \expandafter\def\csname simpleicon@paypalicon\endcsname {\simpleiconsmapeight\symbol{222}} + \expandafter\def\csname simpleicon@paytmicon\endcsname {\simpleiconsmapeight\symbol{223}} + \expandafter\def\csname simpleicon@pcgamingwikiicon\endcsname {\simpleiconsmapeight\symbol{224}} + \expandafter\def\csname simpleicon@pdmicon\endcsname {\simpleiconsmapeight\symbol{225}} + \expandafter\def\csname simpleicon@pdqicon\endcsname {\simpleiconsmapeight\symbol{226}} + \expandafter\def\csname simpleicon@peakdesignicon\endcsname {\simpleiconsmapeight\symbol{227}} + \expandafter\def\csname simpleicon@pearsonicon\endcsname {\simpleiconsmapeight\symbol{228}} + \expandafter\def\csname simpleicon@peerlisticon\endcsname {\simpleiconsmapeight\symbol{229}} + \expandafter\def\csname simpleicon@peertubeicon\endcsname {\simpleiconsmapeight\symbol{230}} + \expandafter\def\csname simpleicon@pegasusairlinesicon\endcsname {\simpleiconsmapeight\symbol{231}} + \expandafter\def\csname simpleicon@pelicanicon\endcsname {\simpleiconsmapeight\symbol{232}} + \expandafter\def\csname simpleicon@pelotonicon\endcsname {\simpleiconsmapeight\symbol{233}} + \expandafter\def\csname simpleicon@pennyicon\endcsname {\simpleiconsmapeight\symbol{234}} + \expandafter\def\csname simpleicon@penpoticon\endcsname {\simpleiconsmapeight\symbol{235}} + \expandafter\def\csname simpleicon@percyicon\endcsname {\simpleiconsmapeight\symbol{236}} + \expandafter\def\csname simpleicon@perforceicon\endcsname {\simpleiconsmapeight\symbol{237}} + \expandafter\def\csname simpleicon@perlicon\endcsname {\simpleiconsmapeight\symbol{238}} + \expandafter\def\csname simpleicon@perplexityicon\endcsname {\simpleiconsmapeight\symbol{239}} + \expandafter\def\csname simpleicon@persistenticon\endcsname {\simpleiconsmapeight\symbol{240}} + \expandafter\def\csname simpleicon@personioicon\endcsname {\simpleiconsmapeight\symbol{241}} + \expandafter\def\csname simpleicon@petsathomeicon\endcsname {\simpleiconsmapeight\symbol{242}} + \expandafter\def\csname simpleicon@peugeoticon\endcsname {\simpleiconsmapeight\symbol{243}} + \expandafter\def\csname simpleicon@pexelsicon\endcsname {\simpleiconsmapeight\symbol{244}} + \expandafter\def\csname simpleicon@pfsenseicon\endcsname {\simpleiconsmapeight\symbol{245}} + \expandafter\def\csname simpleicon@phabricatoricon\endcsname {\simpleiconsmapeight\symbol{246}} + \expandafter\def\csname simpleicon@philipshueicon\endcsname {\simpleiconsmapeight\symbol{247}} + \expandafter\def\csname simpleicon@phoenixframeworkicon\endcsname {\simpleiconsmapeight\symbol{248}} + \expandafter\def\csname simpleicon@phonepeicon\endcsname {\simpleiconsmapeight\symbol{249}} + \expandafter\def\csname simpleicon@phosphoriconsicon\endcsname {\simpleiconsmapeight\symbol{250}} + \expandafter\def\csname simpleicon@photobucketicon\endcsname {\simpleiconsmapeight\symbol{251}} + \expandafter\def\csname simpleicon@photocrowdicon\endcsname {\simpleiconsmapeight\symbol{252}} + \expandafter\def\csname simpleicon@photonicon\endcsname {\simpleiconsmapeight\symbol{253}} + \expandafter\def\csname simpleicon@photopeaicon\endcsname {\simpleiconsmapeight\symbol{254}} + \expandafter\def\csname simpleicon@phpicon\endcsname {\simpleiconsmapeight\symbol{255}} + \expandafter\def\csname simpleicon@phpmyadminicon\endcsname {\simpleiconsmapnine\symbol{0}} + \expandafter\def\csname simpleicon@phpstormicon\endcsname {\simpleiconsmapnine\symbol{1}} + \expandafter\def\csname simpleicon@piaggiogroupicon\endcsname {\simpleiconsmapnine\symbol{2}} + \expandafter\def\csname simpleicon@piaproicon\endcsname {\simpleiconsmapnine\symbol{3}} + \expandafter\def\csname simpleicon@picardsurgelesicon\endcsname {\simpleiconsmapnine\symbol{4}} + \expandafter\def\csname simpleicon@picartodottvicon\endcsname {\simpleiconsmapnine\symbol{5}} + \expandafter\def\csname simpleicon@picnicicon\endcsname {\simpleiconsmapnine\symbol{6}} + \expandafter\def\csname simpleicon@picpayicon\endcsname {\simpleiconsmapnine\symbol{7}} + \expandafter\def\csname simpleicon@picrewicon\endcsname {\simpleiconsmapnine\symbol{8}} + \expandafter\def\csname simpleicon@picxyicon\endcsname {\simpleiconsmapnine\symbol{9}} + \expandafter\def\csname simpleicon@piholeicon\endcsname {\simpleiconsmapnine\symbol{10}} + \expandafter\def\csname simpleicon@pimcoreicon\endcsname {\simpleiconsmapnine\symbol{11}} + \expandafter\def\csname simpleicon@pinboardicon\endcsname {\simpleiconsmapnine\symbol{12}} + \expandafter\def\csname simpleicon@pinescripticon\endcsname {\simpleiconsmapnine\symbol{13}} + \expandafter\def\csname simpleicon@pinetworkicon\endcsname {\simpleiconsmapnine\symbol{14}} + \expandafter\def\csname simpleicon@pingdomicon\endcsname {\simpleiconsmapnine\symbol{15}} + \expandafter\def\csname simpleicon@pinoicon\endcsname {\simpleiconsmapnine\symbol{16}} + \expandafter\def\csname simpleicon@pinteresticon\endcsname {\simpleiconsmapnine\symbol{17}} + \expandafter\def\csname simpleicon@pioneerdjicon\endcsname {\simpleiconsmapnine\symbol{18}} + \expandafter\def\csname simpleicon@pipedicon\endcsname {\simpleiconsmapnine\symbol{19}} + \expandafter\def\csname simpleicon@pipxicon\endcsname {\simpleiconsmapnine\symbol{20}} + \expandafter\def\csname simpleicon@pivotaltrackericon\endcsname {\simpleiconsmapnine\symbol{21}} + \expandafter\def\csname simpleicon@piwigoicon\endcsname {\simpleiconsmapnine\symbol{22}} + \expandafter\def\csname simpleicon@pixicon\endcsname {\simpleiconsmapnine\symbol{23}} + \expandafter\def\csname simpleicon@pixabayicon\endcsname {\simpleiconsmapnine\symbol{24}} + \expandafter\def\csname simpleicon@pixelfedicon\endcsname {\simpleiconsmapnine\symbol{25}} + \expandafter\def\csname simpleicon@pixivicon\endcsname {\simpleiconsmapnine\symbol{26}} + \expandafter\def\csname simpleicon@pixlricon\endcsname {\simpleiconsmapnine\symbol{27}} + \expandafter\def\csname simpleicon@pkgsrcicon\endcsname {\simpleiconsmapnine\symbol{28}} + \expandafter\def\csname simpleicon@planeticon\endcsname {\simpleiconsmapnine\symbol{29}} + \expandafter\def\csname simpleicon@planetscaleicon\endcsname {\simpleiconsmapnine\symbol{30}} + \expandafter\def\csname simpleicon@plangridicon\endcsname {\simpleiconsmapnine\symbol{31}} + \expandafter\def\csname simpleicon@platformdotshicon\endcsname {\simpleiconsmapnine\symbol{32}} + \expandafter\def\csname simpleicon@platformioicon\endcsname {\simpleiconsmapnine\symbol{33}} + \expandafter\def\csname simpleicon@platziicon\endcsname {\simpleiconsmapnine\symbol{34}} + \expandafter\def\csname simpleicon@plausibleanalyticsicon\endcsname {\simpleiconsmapnine\symbol{35}} + \expandafter\def\csname simpleicon@playcanvasicon\endcsname {\simpleiconsmapnine\symbol{36}} + \expandafter\def\csname simpleicon@playerdotmeicon\endcsname {\simpleiconsmapnine\symbol{37}} + \expandafter\def\csname simpleicon@playerfmicon\endcsname {\simpleiconsmapnine\symbol{38}} + \expandafter\def\csname simpleicon@playstationicon\endcsname {\simpleiconsmapnine\symbol{39}} + \expandafter\def\csname simpleicon@playstation2icon\endcsname {\simpleiconsmapnine\symbol{40}} + \expandafter\def\csname simpleicon@playstation3icon\endcsname {\simpleiconsmapnine\symbol{41}} + \expandafter\def\csname simpleicon@playstation4icon\endcsname {\simpleiconsmapnine\symbol{42}} + \expandafter\def\csname simpleicon@playstation5icon\endcsname {\simpleiconsmapnine\symbol{43}} + \expandafter\def\csname simpleicon@playstationportableicon\endcsname {\simpleiconsmapnine\symbol{44}} + \expandafter\def\csname simpleicon@playstationvitaicon\endcsname {\simpleiconsmapnine\symbol{45}} + \expandafter\def\csname simpleicon@pleromaicon\endcsname {\simpleiconsmapnine\symbol{46}} + \expandafter\def\csname simpleicon@pleskicon\endcsname {\simpleiconsmapnine\symbol{47}} + \expandafter\def\csname simpleicon@plexicon\endcsname {\simpleiconsmapnine\symbol{48}} + \expandafter\def\csname simpleicon@plotlyicon\endcsname {\simpleiconsmapnine\symbol{49}} + \expandafter\def\csname simpleicon@plumeicon\endcsname {\simpleiconsmapnine\symbol{50}} + \expandafter\def\csname simpleicon@pluralsighticon\endcsname {\simpleiconsmapnine\symbol{51}} + \expandafter\def\csname simpleicon@plurkicon\endcsname {\simpleiconsmapnine\symbol{52}} + \expandafter\def\csname simpleicon@pluscodesicon\endcsname {\simpleiconsmapnine\symbol{53}} + \expandafter\def\csname simpleicon@pm2icon\endcsname {\simpleiconsmapnine\symbol{54}} + \expandafter\def\csname simpleicon@pnpmicon\endcsname {\simpleiconsmapnine\symbol{55}} + \expandafter\def\csname simpleicon@pocketicon\endcsname {\simpleiconsmapnine\symbol{56}} + \expandafter\def\csname simpleicon@pocketbaseicon\endcsname {\simpleiconsmapnine\symbol{57}} + \expandafter\def\csname simpleicon@pocketcastsicon\endcsname {\simpleiconsmapnine\symbol{58}} + \expandafter\def\csname simpleicon@podcastaddicticon\endcsname {\simpleiconsmapnine\symbol{59}} + \expandafter\def\csname simpleicon@podcastindexicon\endcsname {\simpleiconsmapnine\symbol{60}} + \expandafter\def\csname simpleicon@podmanicon\endcsname {\simpleiconsmapnine\symbol{61}} + \expandafter\def\csname simpleicon@poeicon\endcsname {\simpleiconsmapnine\symbol{62}} + \expandafter\def\csname simpleicon@poetryicon\endcsname {\simpleiconsmapnine\symbol{63}} + \expandafter\def\csname simpleicon@pointyicon\endcsname {\simpleiconsmapnine\symbol{64}} + \expandafter\def\csname simpleicon@pokemonicon\endcsname {\simpleiconsmapnine\symbol{65}} + \expandafter\def\csname simpleicon@polarsicon\endcsname {\simpleiconsmapnine\symbol{66}} + \expandafter\def\csname simpleicon@polestaricon\endcsname {\simpleiconsmapnine\symbol{67}} + \expandafter\def\csname simpleicon@polkadoticon\endcsname {\simpleiconsmapnine\symbol{68}} + \expandafter\def\csname simpleicon@polyicon\endcsname {\simpleiconsmapnine\symbol{69}} + \expandafter\def\csname simpleicon@polygonicon\endcsname {\simpleiconsmapnine\symbol{70}} + \expandafter\def\csname simpleicon@polymerprojecticon\endcsname {\simpleiconsmapnine\symbol{71}} + \expandafter\def\csname simpleicon@polyworkicon\endcsname {\simpleiconsmapnine\symbol{72}} + \expandafter\def\csname simpleicon@pond5icon\endcsname {\simpleiconsmapnine\symbol{73}} + \expandafter\def\csname simpleicon@poposicon\endcsname {\simpleiconsmapnine\symbol{74}} + \expandafter\def\csname simpleicon@porkbunicon\endcsname {\simpleiconsmapnine\symbol{75}} + \expandafter\def\csname simpleicon@porscheicon\endcsname {\simpleiconsmapnine\symbol{76}} + \expandafter\def\csname simpleicon@portainericon\endcsname {\simpleiconsmapnine\symbol{77}} + \expandafter\def\csname simpleicon@portswiggericon\endcsname {\simpleiconsmapnine\symbol{78}} + \expandafter\def\csname simpleicon@positicon\endcsname {\simpleiconsmapnine\symbol{79}} + \expandafter\def\csname simpleicon@postcssicon\endcsname {\simpleiconsmapnine\symbol{80}} + \expandafter\def\csname simpleicon@postgresqlicon\endcsname {\simpleiconsmapnine\symbol{81}} + \expandafter\def\csname simpleicon@posthogicon\endcsname {\simpleiconsmapnine\symbol{82}} + \expandafter\def\csname simpleicon@postmanicon\endcsname {\simpleiconsmapnine\symbol{83}} + \expandafter\def\csname simpleicon@postmatesicon\endcsname {\simpleiconsmapnine\symbol{84}} + \expandafter\def\csname simpleicon@powersicon\endcsname {\simpleiconsmapnine\symbol{85}} + \expandafter\def\csname simpleicon@prdotcoicon\endcsname {\simpleiconsmapnine\symbol{86}} + \expandafter\def\csname simpleicon@preacticon\endcsname {\simpleiconsmapnine\symbol{87}} + \expandafter\def\csname simpleicon@precommiticon\endcsname {\simpleiconsmapnine\symbol{88}} + \expandafter\def\csname simpleicon@prefecticon\endcsname {\simpleiconsmapnine\symbol{89}} + \expandafter\def\csname simpleicon@premierleagueicon\endcsname {\simpleiconsmapnine\symbol{90}} + \expandafter\def\csname simpleicon@prepbytesicon\endcsname {\simpleiconsmapnine\symbol{91}} + \expandafter\def\csname simpleicon@prestashopicon\endcsname {\simpleiconsmapnine\symbol{92}} + \expandafter\def\csname simpleicon@prestoicon\endcsname {\simpleiconsmapnine\symbol{93}} + \expandafter\def\csname simpleicon@prettiericon\endcsname {\simpleiconsmapnine\symbol{94}} + \expandafter\def\csname simpleicon@pretzelicon\endcsname {\simpleiconsmapnine\symbol{95}} + \expandafter\def\csname simpleicon@preventionicon\endcsname {\simpleiconsmapnine\symbol{96}} + \expandafter\def\csname simpleicon@preziicon\endcsname {\simpleiconsmapnine\symbol{97}} + \expandafter\def\csname simpleicon@primeicon\endcsname {\simpleiconsmapnine\symbol{98}} + \expandafter\def\csname simpleicon@primengicon\endcsname {\simpleiconsmapnine\symbol{99}} + \expandafter\def\csname simpleicon@primereacticon\endcsname {\simpleiconsmapnine\symbol{100}} + \expandafter\def\csname simpleicon@primevideoicon\endcsname {\simpleiconsmapnine\symbol{101}} + \expandafter\def\csname simpleicon@printablesicon\endcsname {\simpleiconsmapnine\symbol{102}} + \expandafter\def\csname simpleicon@prismaicon\endcsname {\simpleiconsmapnine\symbol{103}} + \expandafter\def\csname simpleicon@prismicicon\endcsname {\simpleiconsmapnine\symbol{104}} + \expandafter\def\csname simpleicon@privatedivisionicon\endcsname {\simpleiconsmapnine\symbol{105}} + \expandafter\def\csname simpleicon@privateinternetaccessicon\endcsname {\simpleiconsmapnine\symbol{106}} + \expandafter\def\csname simpleicon@proboticon\endcsname {\simpleiconsmapnine\symbol{107}} + \expandafter\def\csname simpleicon@processingfoundationicon\endcsname {\simpleiconsmapnine\symbol{108}} + \expandafter\def\csname simpleicon@processwireicon\endcsname {\simpleiconsmapnine\symbol{109}} + \expandafter\def\csname simpleicon@producthunticon\endcsname {\simpleiconsmapnine\symbol{110}} + \expandafter\def\csname simpleicon@progateicon\endcsname {\simpleiconsmapnine\symbol{111}} + \expandafter\def\csname simpleicon@progressicon\endcsname {\simpleiconsmapnine\symbol{112}} + \expandafter\def\csname simpleicon@prometheusicon\endcsname {\simpleiconsmapnine\symbol{113}} + \expandafter\def\csname simpleicon@pronounsdotpageicon\endcsname {\simpleiconsmapnine\symbol{114}} + \expandafter\def\csname simpleicon@prosiebenicon\endcsname {\simpleiconsmapnine\symbol{115}} + \expandafter\def\csname simpleicon@proteusicon\endcsname {\simpleiconsmapnine\symbol{116}} + \expandafter\def\csname simpleicon@protocolsdotioicon\endcsname {\simpleiconsmapnine\symbol{117}} + \expandafter\def\csname simpleicon@protodotioicon\endcsname {\simpleiconsmapnine\symbol{118}} + \expandafter\def\csname simpleicon@protonicon\endcsname {\simpleiconsmapnine\symbol{119}} + \expandafter\def\csname simpleicon@protoncalendaricon\endcsname {\simpleiconsmapnine\symbol{120}} + \expandafter\def\csname simpleicon@protondbicon\endcsname {\simpleiconsmapnine\symbol{121}} + \expandafter\def\csname simpleicon@protondriveicon\endcsname {\simpleiconsmapnine\symbol{122}} + \expandafter\def\csname simpleicon@protonmailicon\endcsname {\simpleiconsmapnine\symbol{123}} + \expandafter\def\csname simpleicon@protonvpnicon\endcsname {\simpleiconsmapnine\symbol{124}} + \expandafter\def\csname simpleicon@protoolsicon\endcsname {\simpleiconsmapnine\symbol{125}} + \expandafter\def\csname simpleicon@protractoricon\endcsname {\simpleiconsmapnine\symbol{126}} + \expandafter\def\csname simpleicon@proxmoxicon\endcsname {\simpleiconsmapnine\symbol{127}} + \expandafter\def\csname simpleicon@pterodactylicon\endcsname {\simpleiconsmapnine\symbol{128}} + \expandafter\def\csname simpleicon@pubgicon\endcsname {\simpleiconsmapnine\symbol{129}} + \expandafter\def\csname simpleicon@publonsicon\endcsname {\simpleiconsmapnine\symbol{130}} + \expandafter\def\csname simpleicon@pubmedicon\endcsname {\simpleiconsmapnine\symbol{131}} + \expandafter\def\csname simpleicon@pugicon\endcsname {\simpleiconsmapnine\symbol{132}} + \expandafter\def\csname simpleicon@pulumiicon\endcsname {\simpleiconsmapnine\symbol{133}} + \expandafter\def\csname simpleicon@pumaicon\endcsname {\simpleiconsmapnine\symbol{134}} + \expandafter\def\csname simpleicon@puppeticon\endcsname {\simpleiconsmapnine\symbol{135}} + \expandafter\def\csname simpleicon@puppeteericon\endcsname {\simpleiconsmapnine\symbol{136}} + \expandafter\def\csname simpleicon@purescripticon\endcsname {\simpleiconsmapnine\symbol{137}} + \expandafter\def\csname simpleicon@purgecssicon\endcsname {\simpleiconsmapnine\symbol{138}} + \expandafter\def\csname simpleicon@purismicon\endcsname {\simpleiconsmapnine\symbol{139}} + \expandafter\def\csname simpleicon@pushbulleticon\endcsname {\simpleiconsmapnine\symbol{140}} + \expandafter\def\csname simpleicon@pushericon\endcsname {\simpleiconsmapnine\symbol{141}} + \expandafter\def\csname simpleicon@pwaicon\endcsname {\simpleiconsmapnine\symbol{142}} + \expandafter\def\csname simpleicon@pycharmicon\endcsname {\simpleiconsmapnine\symbol{143}} + \expandafter\def\csname simpleicon@pycqaicon\endcsname {\simpleiconsmapnine\symbol{144}} + \expandafter\def\csname simpleicon@pydanticicon\endcsname {\simpleiconsmapnine\symbol{145}} + \expandafter\def\csname simpleicon@pygicon\endcsname {\simpleiconsmapnine\symbol{146}} + \expandafter\def\csname simpleicon@pypiicon\endcsname {\simpleiconsmapnine\symbol{147}} + \expandafter\def\csname simpleicon@pypyicon\endcsname {\simpleiconsmapnine\symbol{148}} + \expandafter\def\csname simpleicon@pyscaffoldicon\endcsname {\simpleiconsmapnine\symbol{149}} + \expandafter\def\csname simpleicon@pysyfticon\endcsname {\simpleiconsmapnine\symbol{150}} + \expandafter\def\csname simpleicon@pytesticon\endcsname {\simpleiconsmapnine\symbol{151}} + \expandafter\def\csname simpleicon@pythonicon\endcsname {\simpleiconsmapnine\symbol{152}} + \expandafter\def\csname simpleicon@pythonanywhereicon\endcsname {\simpleiconsmapnine\symbol{153}} + \expandafter\def\csname simpleicon@pytorchicon\endcsname {\simpleiconsmapnine\symbol{154}} + \expandafter\def\csname simpleicon@pyupicon\endcsname {\simpleiconsmapnine\symbol{155}} + \expandafter\def\csname simpleicon@qantasicon\endcsname {\simpleiconsmapnine\symbol{156}} + \expandafter\def\csname simpleicon@qaseicon\endcsname {\simpleiconsmapnine\symbol{157}} + \expandafter\def\csname simpleicon@qatarairwaysicon\endcsname {\simpleiconsmapnine\symbol{158}} + \expandafter\def\csname simpleicon@qbittorrenticon\endcsname {\simpleiconsmapnine\symbol{159}} + \expandafter\def\csname simpleicon@qemuicon\endcsname {\simpleiconsmapnine\symbol{160}} + \expandafter\def\csname simpleicon@qgisicon\endcsname {\simpleiconsmapnine\symbol{161}} + \expandafter\def\csname simpleicon@qiicon\endcsname {\simpleiconsmapnine\symbol{162}} + \expandafter\def\csname simpleicon@qiitaicon\endcsname {\simpleiconsmapnine\symbol{163}} + \expandafter\def\csname simpleicon@qiskiticon\endcsname {\simpleiconsmapnine\symbol{164}} + \expandafter\def\csname simpleicon@qiwiicon\endcsname {\simpleiconsmapnine\symbol{165}} + \expandafter\def\csname simpleicon@qlikicon\endcsname {\simpleiconsmapnine\symbol{166}} + \expandafter\def\csname simpleicon@qmkicon\endcsname {\simpleiconsmapnine\symbol{167}} + \expandafter\def\csname simpleicon@qnapicon\endcsname {\simpleiconsmapnine\symbol{168}} + \expandafter\def\csname simpleicon@qticon\endcsname {\simpleiconsmapnine\symbol{169}} + \expandafter\def\csname simpleicon@qualcommicon\endcsname {\simpleiconsmapnine\symbol{170}} + \expandafter\def\csname simpleicon@qualtricsicon\endcsname {\simpleiconsmapnine\symbol{171}} + \expandafter\def\csname simpleicon@qualysicon\endcsname {\simpleiconsmapnine\symbol{172}} + \expandafter\def\csname simpleicon@quantcasticon\endcsname {\simpleiconsmapnine\symbol{173}} + \expandafter\def\csname simpleicon@quantconnecticon\endcsname {\simpleiconsmapnine\symbol{174}} + \expandafter\def\csname simpleicon@quarkusicon\endcsname {\simpleiconsmapnine\symbol{175}} + \expandafter\def\csname simpleicon@quartoicon\endcsname {\simpleiconsmapnine\symbol{176}} + \expandafter\def\csname simpleicon@quasaricon\endcsname {\simpleiconsmapnine\symbol{177}} + \expandafter\def\csname simpleicon@qubesosicon\endcsname {\simpleiconsmapnine\symbol{178}} + \expandafter\def\csname simpleicon@questicon\endcsname {\simpleiconsmapnine\symbol{179}} + \expandafter\def\csname simpleicon@quickbooksicon\endcsname {\simpleiconsmapnine\symbol{180}} + \expandafter\def\csname simpleicon@quicklookicon\endcsname {\simpleiconsmapnine\symbol{181}} + \expandafter\def\csname simpleicon@quicktimeicon\endcsname {\simpleiconsmapnine\symbol{182}} + \expandafter\def\csname simpleicon@quicktypeicon\endcsname {\simpleiconsmapnine\symbol{183}} + \expandafter\def\csname simpleicon@quipicon\endcsname {\simpleiconsmapnine\symbol{184}} + \expandafter\def\csname simpleicon@quizleticon\endcsname {\simpleiconsmapnine\symbol{185}} + \expandafter\def\csname simpleicon@quoraicon\endcsname {\simpleiconsmapnine\symbol{186}} + \expandafter\def\csname simpleicon@qwanticon\endcsname {\simpleiconsmapnine\symbol{187}} + \expandafter\def\csname simpleicon@qwikicon\endcsname {\simpleiconsmapnine\symbol{188}} + \expandafter\def\csname simpleicon@qwiklabsicon\endcsname {\simpleiconsmapnine\symbol{189}} + \expandafter\def\csname simpleicon@qzoneicon\endcsname {\simpleiconsmapnine\symbol{190}} + \expandafter\def\csname simpleicon@ricon\endcsname {\simpleiconsmapnine\symbol{191}} + \expandafter\def\csname simpleicon@r3icon\endcsname {\simpleiconsmapnine\symbol{192}} + \expandafter\def\csname simpleicon@rabbitmqicon\endcsname {\simpleiconsmapnine\symbol{193}} + \expandafter\def\csname simpleicon@racketicon\endcsname {\simpleiconsmapnine\symbol{194}} + \expandafter\def\csname simpleicon@radaricon\endcsname {\simpleiconsmapnine\symbol{195}} + \expandafter\def\csname simpleicon@radarricon\endcsname {\simpleiconsmapnine\symbol{196}} + \expandafter\def\csname simpleicon@radiopublicicon\endcsname {\simpleiconsmapnine\symbol{197}} + \expandafter\def\csname simpleicon@radixuiicon\endcsname {\simpleiconsmapnine\symbol{198}} + \expandafter\def\csname simpleicon@radstudioicon\endcsname {\simpleiconsmapnine\symbol{199}} + \expandafter\def\csname simpleicon@railwayicon\endcsname {\simpleiconsmapnine\symbol{200}} + \expandafter\def\csname simpleicon@rainmetericon\endcsname {\simpleiconsmapnine\symbol{201}} + \expandafter\def\csname simpleicon@rakutenicon\endcsname {\simpleiconsmapnine\symbol{202}} + \expandafter\def\csname simpleicon@ramicon\endcsname {\simpleiconsmapnine\symbol{203}} + \expandafter\def\csname simpleicon@ranchericon\endcsname {\simpleiconsmapnine\symbol{204}} + \expandafter\def\csname simpleicon@rapidicon\endcsname {\simpleiconsmapnine\symbol{205}} + \expandafter\def\csname simpleicon@raribleicon\endcsname {\simpleiconsmapnine\symbol{206}} + \expandafter\def\csname simpleicon@rasaicon\endcsname {\simpleiconsmapnine\symbol{207}} + \expandafter\def\csname simpleicon@raspberrypiicon\endcsname {\simpleiconsmapnine\symbol{208}} + \expandafter\def\csname simpleicon@ravelryicon\endcsname {\simpleiconsmapnine\symbol{209}} + \expandafter\def\csname simpleicon@rayicon\endcsname {\simpleiconsmapnine\symbol{210}} + \expandafter\def\csname simpleicon@raycasticon\endcsname {\simpleiconsmapnine\symbol{211}} + \expandafter\def\csname simpleicon@raylibicon\endcsname {\simpleiconsmapnine\symbol{212}} + \expandafter\def\csname simpleicon@razericon\endcsname {\simpleiconsmapnine\symbol{213}} + \expandafter\def\csname simpleicon@razorpayicon\endcsname {\simpleiconsmapnine\symbol{214}} + \expandafter\def\csname simpleicon@rcloneicon\endcsname {\simpleiconsmapnine\symbol{215}} + \expandafter\def\csname simpleicon@reacticon\endcsname {\simpleiconsmapnine\symbol{216}} + \expandafter\def\csname simpleicon@reactbootstrapicon\endcsname {\simpleiconsmapnine\symbol{217}} + \expandafter\def\csname simpleicon@reacthookformicon\endcsname {\simpleiconsmapnine\symbol{218}} + \expandafter\def\csname simpleicon@reactiveresumeicon\endcsname {\simpleiconsmapnine\symbol{219}} + \expandafter\def\csname simpleicon@reactivexicon\endcsname {\simpleiconsmapnine\symbol{220}} + \expandafter\def\csname simpleicon@reactosicon\endcsname {\simpleiconsmapnine\symbol{221}} + \expandafter\def\csname simpleicon@reactqueryicon\endcsname {\simpleiconsmapnine\symbol{222}} + \expandafter\def\csname simpleicon@reactroutericon\endcsname {\simpleiconsmapnine\symbol{223}} + \expandafter\def\csname simpleicon@reacttableicon\endcsname {\simpleiconsmapnine\symbol{224}} + \expandafter\def\csname simpleicon@readdotcvicon\endcsname {\simpleiconsmapnine\symbol{225}} + \expandafter\def\csname simpleicon@readmeicon\endcsname {\simpleiconsmapnine\symbol{226}} + \expandafter\def\csname simpleicon@readthedocsicon\endcsname {\simpleiconsmapnine\symbol{227}} + \expandafter\def\csname simpleicon@realmicon\endcsname {\simpleiconsmapnine\symbol{228}} + \expandafter\def\csname simpleicon@reasonicon\endcsname {\simpleiconsmapnine\symbol{229}} + \expandafter\def\csname simpleicon@reasonstudiosicon\endcsname {\simpleiconsmapnine\symbol{230}} + \expandafter\def\csname simpleicon@recoilicon\endcsname {\simpleiconsmapnine\symbol{231}} + \expandafter\def\csname simpleicon@redicon\endcsname {\simpleiconsmapnine\symbol{232}} + \expandafter\def\csname simpleicon@redashicon\endcsname {\simpleiconsmapnine\symbol{233}} + \expandafter\def\csname simpleicon@redbubbleicon\endcsname {\simpleiconsmapnine\symbol{234}} + \expandafter\def\csname simpleicon@redbullicon\endcsname {\simpleiconsmapnine\symbol{235}} + \expandafter\def\csname simpleicon@redditicon\endcsname {\simpleiconsmapnine\symbol{236}} + \expandafter\def\csname simpleicon@redhaticon\endcsname {\simpleiconsmapnine\symbol{237}} + \expandafter\def\csname simpleicon@redhatopenshifticon\endcsname {\simpleiconsmapnine\symbol{238}} + \expandafter\def\csname simpleicon@redisicon\endcsname {\simpleiconsmapnine\symbol{239}} + \expandafter\def\csname simpleicon@redmineicon\endcsname {\simpleiconsmapnine\symbol{240}} + \expandafter\def\csname simpleicon@redoxicon\endcsname {\simpleiconsmapnine\symbol{241}} + \expandafter\def\csname simpleicon@redsysicon\endcsname {\simpleiconsmapnine\symbol{242}} + \expandafter\def\csname simpleicon@reduxicon\endcsname {\simpleiconsmapnine\symbol{243}} + \expandafter\def\csname simpleicon@reduxsagaicon\endcsname {\simpleiconsmapnine\symbol{244}} + \expandafter\def\csname simpleicon@redwoodjsicon\endcsname {\simpleiconsmapnine\symbol{245}} + \expandafter\def\csname simpleicon@reebokicon\endcsname {\simpleiconsmapnine\symbol{246}} + \expandafter\def\csname simpleicon@refineicon\endcsname {\simpleiconsmapnine\symbol{247}} + \expandafter\def\csname simpleicon@relayicon\endcsname {\simpleiconsmapnine\symbol{248}} + \expandafter\def\csname simpleicon@relianceindustrieslimitedicon\endcsname {\simpleiconsmapnine\symbol{249}} + \expandafter\def\csname simpleicon@remarkicon\endcsname {\simpleiconsmapnine\symbol{250}} + \expandafter\def\csname simpleicon@remedyentertainmenticon\endcsname {\simpleiconsmapnine\symbol{251}} + \expandafter\def\csname simpleicon@remixicon\endcsname {\simpleiconsmapnine\symbol{252}} + \expandafter\def\csname simpleicon@removedotbgicon\endcsname {\simpleiconsmapnine\symbol{253}} + \expandafter\def\csname simpleicon@renaulticon\endcsname {\simpleiconsmapnine\symbol{254}} + \expandafter\def\csname simpleicon@rendericon\endcsname {\simpleiconsmapnine\symbol{255}} + \expandafter\def\csname simpleicon@renovateicon\endcsname {\simpleiconsmaponezero\symbol{0}} + \expandafter\def\csname simpleicon@renpyicon\endcsname {\simpleiconsmaponezero\symbol{1}} + \expandafter\def\csname simpleicon@renrenicon\endcsname {\simpleiconsmaponezero\symbol{2}} + \expandafter\def\csname simpleicon@repliticon\endcsname {\simpleiconsmaponezero\symbol{3}} + \expandafter\def\csname simpleicon@republicofgamersicon\endcsname {\simpleiconsmaponezero\symbol{4}} + \expandafter\def\csname simpleicon@rescripticon\endcsname {\simpleiconsmaponezero\symbol{5}} + \expandafter\def\csname simpleicon@rescuetimeicon\endcsname {\simpleiconsmaponezero\symbol{6}} + \expandafter\def\csname simpleicon@researchgateicon\endcsname {\simpleiconsmaponezero\symbol{7}} + \expandafter\def\csname simpleicon@resendicon\endcsname {\simpleiconsmaponezero\symbol{8}} + \expandafter\def\csname simpleicon@resharpericon\endcsname {\simpleiconsmaponezero\symbol{9}} + \expandafter\def\csname simpleicon@resurrectionremixosicon\endcsname {\simpleiconsmaponezero\symbol{10}} + \expandafter\def\csname simpleicon@retoolicon\endcsname {\simpleiconsmaponezero\symbol{11}} + \expandafter\def\csname simpleicon@retroarchicon\endcsname {\simpleiconsmaponezero\symbol{12}} + \expandafter\def\csname simpleicon@retropieicon\endcsname {\simpleiconsmaponezero\symbol{13}} + \expandafter\def\csname simpleicon@revancedicon\endcsname {\simpleiconsmaponezero\symbol{14}} + \expandafter\def\csname simpleicon@revealdotjsicon\endcsname {\simpleiconsmaponezero\symbol{15}} + \expandafter\def\csname simpleicon@reverbnationicon\endcsname {\simpleiconsmaponezero\symbol{16}} + \expandafter\def\csname simpleicon@revoltdotchaticon\endcsname {\simpleiconsmaponezero\symbol{17}} + \expandafter\def\csname simpleicon@revoluticon\endcsname {\simpleiconsmaponezero\symbol{18}} + \expandafter\def\csname simpleicon@revueicon\endcsname {\simpleiconsmaponezero\symbol{19}} + \expandafter\def\csname simpleicon@reweicon\endcsname {\simpleiconsmaponezero\symbol{20}} + \expandafter\def\csname simpleicon@rezgoicon\endcsname {\simpleiconsmaponezero\symbol{21}} + \expandafter\def\csname simpleicon@rhinocerosicon\endcsname {\simpleiconsmaponezero\symbol{22}} + \expandafter\def\csname simpleicon@richicon\endcsname {\simpleiconsmaponezero\symbol{23}} + \expandafter\def\csname simpleicon@ridericon\endcsname {\simpleiconsmaponezero\symbol{24}} + \expandafter\def\csname simpleicon@rimacautomobiliicon\endcsname {\simpleiconsmaponezero\symbol{25}} + \expandafter\def\csname simpleicon@rimeicon\endcsname {\simpleiconsmaponezero\symbol{26}} + \expandafter\def\csname simpleicon@ringicon\endcsname {\simpleiconsmaponezero\symbol{27}} + \expandafter\def\csname simpleicon@riotgamesicon\endcsname {\simpleiconsmaponezero\symbol{28}} + \expandafter\def\csname simpleicon@rippleicon\endcsname {\simpleiconsmaponezero\symbol{29}} + \expandafter\def\csname simpleicon@riscvicon\endcsname {\simpleiconsmaponezero\symbol{30}} + \expandafter\def\csname simpleicon@riseupicon\endcsname {\simpleiconsmaponezero\symbol{31}} + \expandafter\def\csname simpleicon@ritzcarltonicon\endcsname {\simpleiconsmaponezero\symbol{32}} + \expandafter\def\csname simpleicon@riveicon\endcsname {\simpleiconsmaponezero\symbol{33}} + \expandafter\def\csname simpleicon@roadmapdotshicon\endcsname {\simpleiconsmaponezero\symbol{34}} + \expandafter\def\csname simpleicon@roamresearchicon\endcsname {\simpleiconsmaponezero\symbol{35}} + \expandafter\def\csname simpleicon@robinhoodicon\endcsname {\simpleiconsmaponezero\symbol{36}} + \expandafter\def\csname simpleicon@robloxicon\endcsname {\simpleiconsmaponezero\symbol{37}} + \expandafter\def\csname simpleicon@robloxstudioicon\endcsname {\simpleiconsmaponezero\symbol{38}} + \expandafter\def\csname simpleicon@robotframeworkicon\endcsname {\simpleiconsmaponezero\symbol{39}} + \expandafter\def\csname simpleicon@rocketicon\endcsname {\simpleiconsmaponezero\symbol{40}} + \expandafter\def\csname simpleicon@rocketdotchaticon\endcsname {\simpleiconsmaponezero\symbol{41}} + \expandafter\def\csname simpleicon@rocksdbicon\endcsname {\simpleiconsmaponezero\symbol{42}} + \expandafter\def\csname simpleicon@rockstargamesicon\endcsname {\simpleiconsmaponezero\symbol{43}} + \expandafter\def\csname simpleicon@rockwellautomationicon\endcsname {\simpleiconsmaponezero\symbol{44}} + \expandafter\def\csname simpleicon@rockylinuxicon\endcsname {\simpleiconsmaponezero\symbol{45}} + \expandafter\def\csname simpleicon@rokuicon\endcsname {\simpleiconsmaponezero\symbol{46}} + \expandafter\def\csname simpleicon@roll20icon\endcsname {\simpleiconsmaponezero\symbol{47}} + \expandafter\def\csname simpleicon@rollsroyceicon\endcsname {\simpleiconsmaponezero\symbol{48}} + \expandafter\def\csname simpleicon@rollupdotjsicon\endcsname {\simpleiconsmaponezero\symbol{49}} + \expandafter\def\csname simpleicon@roonicon\endcsname {\simpleiconsmaponezero\symbol{50}} + \expandafter\def\csname simpleicon@rootmeicon\endcsname {\simpleiconsmaponezero\symbol{51}} + \expandafter\def\csname simpleicon@rootsicon\endcsname {\simpleiconsmaponezero\symbol{52}} + \expandafter\def\csname simpleicon@rootsbedrockicon\endcsname {\simpleiconsmaponezero\symbol{53}} + \expandafter\def\csname simpleicon@rootssageicon\endcsname {\simpleiconsmaponezero\symbol{54}} + \expandafter\def\csname simpleicon@rosicon\endcsname {\simpleiconsmaponezero\symbol{55}} + \expandafter\def\csname simpleicon@rossmannicon\endcsname {\simpleiconsmaponezero\symbol{56}} + \expandafter\def\csname simpleicon@rotaryinternationalicon\endcsname {\simpleiconsmaponezero\symbol{57}} + \expandafter\def\csname simpleicon@rottentomatoesicon\endcsname {\simpleiconsmaponezero\symbol{58}} + \expandafter\def\csname simpleicon@roundcubeicon\endcsname {\simpleiconsmaponezero\symbol{59}} + \expandafter\def\csname simpleicon@rsocketicon\endcsname {\simpleiconsmaponezero\symbol{60}} + \expandafter\def\csname simpleicon@rssicon\endcsname {\simpleiconsmaponezero\symbol{61}} + \expandafter\def\csname simpleicon@rstudioideicon\endcsname {\simpleiconsmaponezero\symbol{62}} + \expandafter\def\csname simpleicon@rteicon\endcsname {\simpleiconsmaponezero\symbol{63}} + \expandafter\def\csname simpleicon@rtlicon\endcsname {\simpleiconsmaponezero\symbol{64}} + \expandafter\def\csname simpleicon@rtlzweiicon\endcsname {\simpleiconsmaponezero\symbol{65}} + \expandafter\def\csname simpleicon@rtmicon\endcsname {\simpleiconsmaponezero\symbol{66}} + \expandafter\def\csname simpleicon@rubocopicon\endcsname {\simpleiconsmaponezero\symbol{67}} + \expandafter\def\csname simpleicon@rubyicon\endcsname {\simpleiconsmaponezero\symbol{68}} + \expandafter\def\csname simpleicon@rubygemsicon\endcsname {\simpleiconsmaponezero\symbol{69}} + \expandafter\def\csname simpleicon@rubymineicon\endcsname {\simpleiconsmaponezero\symbol{70}} + \expandafter\def\csname simpleicon@rubyonrailsicon\endcsname {\simpleiconsmaponezero\symbol{71}} + \expandafter\def\csname simpleicon@rubysinatraicon\endcsname {\simpleiconsmaponezero\symbol{72}} + \expandafter\def\csname simpleicon@rufficon\endcsname {\simpleiconsmaponezero\symbol{73}} + \expandafter\def\csname simpleicon@rumahwebicon\endcsname {\simpleiconsmaponezero\symbol{74}} + \expandafter\def\csname simpleicon@rumbleicon\endcsname {\simpleiconsmaponezero\symbol{75}} + \expandafter\def\csname simpleicon@rundeckicon\endcsname {\simpleiconsmaponezero\symbol{76}} + \expandafter\def\csname simpleicon@runkeepericon\endcsname {\simpleiconsmaponezero\symbol{77}} + \expandafter\def\csname simpleicon@runkiticon\endcsname {\simpleiconsmaponezero\symbol{78}} + \expandafter\def\csname simpleicon@runrundotiticon\endcsname {\simpleiconsmaponezero\symbol{79}} + \expandafter\def\csname simpleicon@rusticon\endcsname {\simpleiconsmaponezero\symbol{80}} + \expandafter\def\csname simpleicon@rustdeskicon\endcsname {\simpleiconsmaponezero\symbol{81}} + \expandafter\def\csname simpleicon@rxdbicon\endcsname {\simpleiconsmaponezero\symbol{82}} + \expandafter\def\csname simpleicon@ryanairicon\endcsname {\simpleiconsmaponezero\symbol{83}} + \expandafter\def\csname simpleicon@ryeicon\endcsname {\simpleiconsmaponezero\symbol{84}} + \expandafter\def\csname simpleicon@s7airlinesicon\endcsname {\simpleiconsmaponezero\symbol{85}} + \expandafter\def\csname simpleicon@sabanciicon\endcsname {\simpleiconsmaponezero\symbol{86}} + \expandafter\def\csname simpleicon@safariicon\endcsname {\simpleiconsmaponezero\symbol{87}} + \expandafter\def\csname simpleicon@sageicon\endcsname {\simpleiconsmaponezero\symbol{88}} + \expandafter\def\csname simpleicon@sahibindenicon\endcsname {\simpleiconsmaponezero\symbol{89}} + \expandafter\def\csname simpleicon@sailfishosicon\endcsname {\simpleiconsmaponezero\symbol{90}} + \expandafter\def\csname simpleicon@sailsdotjsicon\endcsname {\simpleiconsmaponezero\symbol{91}} + \expandafter\def\csname simpleicon@salesforceicon\endcsname {\simpleiconsmaponezero\symbol{92}} + \expandafter\def\csname simpleicon@sallaicon\endcsname {\simpleiconsmaponezero\symbol{93}} + \expandafter\def\csname simpleicon@saltprojecticon\endcsname {\simpleiconsmaponezero\symbol{94}} + \expandafter\def\csname simpleicon@samsclubicon\endcsname {\simpleiconsmaponezero\symbol{95}} + \expandafter\def\csname simpleicon@samsungicon\endcsname {\simpleiconsmaponezero\symbol{96}} + \expandafter\def\csname simpleicon@samsungpayicon\endcsname {\simpleiconsmaponezero\symbol{97}} + \expandafter\def\csname simpleicon@sandiskicon\endcsname {\simpleiconsmaponezero\symbol{98}} + \expandafter\def\csname simpleicon@sanfranciscomunicipalrailwayicon\endcsname {\simpleiconsmaponezero\symbol{99}} + \expandafter\def\csname simpleicon@sanicicon\endcsname {\simpleiconsmaponezero\symbol{100}} + \expandafter\def\csname simpleicon@sanityicon\endcsname {\simpleiconsmaponezero\symbol{101}} + \expandafter\def\csname simpleicon@saopaulometroicon\endcsname {\simpleiconsmaponezero\symbol{102}} + \expandafter\def\csname simpleicon@sapicon\endcsname {\simpleiconsmaponezero\symbol{103}} + \expandafter\def\csname simpleicon@sartoriusicon\endcsname {\simpleiconsmaponezero\symbol{104}} + \expandafter\def\csname simpleicon@sassicon\endcsname {\simpleiconsmaponezero\symbol{105}} + \expandafter\def\csname simpleicon@sat1icon\endcsname {\simpleiconsmaponezero\symbol{106}} + \expandafter\def\csname simpleicon@satelliteicon\endcsname {\simpleiconsmaponezero\symbol{107}} + \expandafter\def\csname simpleicon@saturnicon\endcsname {\simpleiconsmaponezero\symbol{108}} + \expandafter\def\csname simpleicon@saucelabsicon\endcsname {\simpleiconsmaponezero\symbol{109}} + \expandafter\def\csname simpleicon@saudiaicon\endcsname {\simpleiconsmaponezero\symbol{110}} + \expandafter\def\csname simpleicon@scalaicon\endcsname {\simpleiconsmaponezero\symbol{111}} + \expandafter\def\csname simpleicon@scalewayicon\endcsname {\simpleiconsmaponezero\symbol{112}} + \expandafter\def\csname simpleicon@scaniaicon\endcsname {\simpleiconsmaponezero\symbol{113}} + \expandafter\def\csname simpleicon@schneiderelectricicon\endcsname {\simpleiconsmaponezero\symbol{114}} + \expandafter\def\csname simpleicon@scikitlearnicon\endcsname {\simpleiconsmaponezero\symbol{115}} + \expandafter\def\csname simpleicon@scilabicon\endcsname {\simpleiconsmaponezero\symbol{116}} + \expandafter\def\csname simpleicon@scipyicon\endcsname {\simpleiconsmaponezero\symbol{117}} + \expandafter\def\csname simpleicon@scopusicon\endcsname {\simpleiconsmaponezero\symbol{118}} + \expandafter\def\csname simpleicon@scpfoundationicon\endcsname {\simpleiconsmaponezero\symbol{119}} + \expandafter\def\csname simpleicon@scrapboxicon\endcsname {\simpleiconsmaponezero\symbol{120}} + \expandafter\def\csname simpleicon@scrapyicon\endcsname {\simpleiconsmaponezero\symbol{121}} + \expandafter\def\csname simpleicon@scratchicon\endcsname {\simpleiconsmaponezero\symbol{122}} + \expandafter\def\csname simpleicon@screencastifyicon\endcsname {\simpleiconsmaponezero\symbol{123}} + \expandafter\def\csname simpleicon@scribdicon\endcsname {\simpleiconsmaponezero\symbol{124}} + \expandafter\def\csname simpleicon@scrimbaicon\endcsname {\simpleiconsmaponezero\symbol{125}} + \expandafter\def\csname simpleicon@scrollrevealicon\endcsname {\simpleiconsmaponezero\symbol{126}} + \expandafter\def\csname simpleicon@scrumallianceicon\endcsname {\simpleiconsmaponezero\symbol{127}} + \expandafter\def\csname simpleicon@scrutinizerciicon\endcsname {\simpleiconsmaponezero\symbol{128}} + \expandafter\def\csname simpleicon@scylladbicon\endcsname {\simpleiconsmaponezero\symbol{129}} + \expandafter\def\csname simpleicon@seagateicon\endcsname {\simpleiconsmaponezero\symbol{130}} + \expandafter\def\csname simpleicon@searxngicon\endcsname {\simpleiconsmaponezero\symbol{131}} + \expandafter\def\csname simpleicon@seaticon\endcsname {\simpleiconsmaponezero\symbol{132}} + \expandafter\def\csname simpleicon@seatgeekicon\endcsname {\simpleiconsmaponezero\symbol{133}} + \expandafter\def\csname simpleicon@securityscorecardicon\endcsname {\simpleiconsmaponezero\symbol{134}} + \expandafter\def\csname simpleicon@sefariaicon\endcsname {\simpleiconsmaponezero\symbol{135}} + \expandafter\def\csname simpleicon@segaicon\endcsname {\simpleiconsmaponezero\symbol{136}} + \expandafter\def\csname simpleicon@seleniumicon\endcsname {\simpleiconsmaponezero\symbol{137}} + \expandafter\def\csname simpleicon@sellfyicon\endcsname {\simpleiconsmaponezero\symbol{138}} + \expandafter\def\csname simpleicon@semanticreleaseicon\endcsname {\simpleiconsmaponezero\symbol{139}} + \expandafter\def\csname simpleicon@semanticscholaricon\endcsname {\simpleiconsmaponezero\symbol{140}} + \expandafter\def\csname simpleicon@semanticuiicon\endcsname {\simpleiconsmaponezero\symbol{141}} + \expandafter\def\csname simpleicon@semanticuireacticon\endcsname {\simpleiconsmaponezero\symbol{142}} + \expandafter\def\csname simpleicon@semanticwebicon\endcsname {\simpleiconsmaponezero\symbol{143}} + \expandafter\def\csname simpleicon@semaphoreciicon\endcsname {\simpleiconsmaponezero\symbol{144}} + \expandafter\def\csname simpleicon@semrushicon\endcsname {\simpleiconsmaponezero\symbol{145}} + \expandafter\def\csname simpleicon@semvericon\endcsname {\simpleiconsmaponezero\symbol{146}} + \expandafter\def\csname simpleicon@senchaicon\endcsname {\simpleiconsmaponezero\symbol{147}} + \expandafter\def\csname simpleicon@sennheisericon\endcsname {\simpleiconsmaponezero\symbol{148}} + \expandafter\def\csname simpleicon@sensuicon\endcsname {\simpleiconsmaponezero\symbol{149}} + \expandafter\def\csname simpleicon@sentryicon\endcsname {\simpleiconsmaponezero\symbol{150}} + \expandafter\def\csname simpleicon@sepaicon\endcsname {\simpleiconsmaponezero\symbol{151}} + \expandafter\def\csname simpleicon@sequelizeicon\endcsname {\simpleiconsmaponezero\symbol{152}} + \expandafter\def\csname simpleicon@serverfaulticon\endcsname {\simpleiconsmaponezero\symbol{153}} + \expandafter\def\csname simpleicon@serverlessicon\endcsname {\simpleiconsmaponezero\symbol{154}} + \expandafter\def\csname simpleicon@sessionicon\endcsname {\simpleiconsmaponezero\symbol{155}} + \expandafter\def\csname simpleicon@sessionizeicon\endcsname {\simpleiconsmaponezero\symbol{156}} + \expandafter\def\csname simpleicon@setappicon\endcsname {\simpleiconsmaponezero\symbol{157}} + \expandafter\def\csname simpleicon@sfmlicon\endcsname {\simpleiconsmaponezero\symbol{158}} + \expandafter\def\csname simpleicon@shadcnuiicon\endcsname {\simpleiconsmaponezero\symbol{159}} + \expandafter\def\csname simpleicon@shadowicon\endcsname {\simpleiconsmaponezero\symbol{160}} + \expandafter\def\csname simpleicon@shanghaimetroicon\endcsname {\simpleiconsmaponezero\symbol{161}} + \expandafter\def\csname simpleicon@sharexicon\endcsname {\simpleiconsmaponezero\symbol{162}} + \expandafter\def\csname simpleicon@sharpicon\endcsname {\simpleiconsmaponezero\symbol{163}} + \expandafter\def\csname simpleicon@shazamicon\endcsname {\simpleiconsmaponezero\symbol{164}} + \expandafter\def\csname simpleicon@shellicon\endcsname {\simpleiconsmaponezero\symbol{165}} + \expandafter\def\csname simpleicon@shellyicon\endcsname {\simpleiconsmaponezero\symbol{166}} + \expandafter\def\csname simpleicon@shenzhenmetroicon\endcsname {\simpleiconsmaponezero\symbol{167}} + \expandafter\def\csname simpleicon@shieldsdotioicon\endcsname {\simpleiconsmaponezero\symbol{168}} + \expandafter\def\csname simpleicon@shikimoriicon\endcsname {\simpleiconsmaponezero\symbol{169}} + \expandafter\def\csname simpleicon@shopeeicon\endcsname {\simpleiconsmaponezero\symbol{170}} + \expandafter\def\csname simpleicon@shopifyicon\endcsname {\simpleiconsmaponezero\symbol{171}} + \expandafter\def\csname simpleicon@shopwareicon\endcsname {\simpleiconsmaponezero\symbol{172}} + \expandafter\def\csname simpleicon@shortcuticon\endcsname {\simpleiconsmaponezero\symbol{173}} + \expandafter\def\csname simpleicon@showpadicon\endcsname {\simpleiconsmaponezero\symbol{174}} + \expandafter\def\csname simpleicon@showtimeicon\endcsname {\simpleiconsmaponezero\symbol{175}} + \expandafter\def\csname simpleicon@showwcaseicon\endcsname {\simpleiconsmaponezero\symbol{176}} + \expandafter\def\csname simpleicon@shutterstockicon\endcsname {\simpleiconsmaponezero\symbol{177}} + \expandafter\def\csname simpleicon@sidekiqicon\endcsname {\simpleiconsmaponezero\symbol{178}} + \expandafter\def\csname simpleicon@sidequesticon\endcsname {\simpleiconsmaponezero\symbol{179}} + \expandafter\def\csname simpleicon@siemensicon\endcsname {\simpleiconsmaponezero\symbol{180}} + \expandafter\def\csname simpleicon@sifiveicon\endcsname {\simpleiconsmaponezero\symbol{181}} + \expandafter\def\csname simpleicon@signalicon\endcsname {\simpleiconsmaponezero\symbol{182}} + \expandafter\def\csname simpleicon@similarwebicon\endcsname {\simpleiconsmaponezero\symbol{183}} + \expandafter\def\csname simpleicon@simklicon\endcsname {\simpleiconsmaponezero\symbol{184}} + \expandafter\def\csname simpleicon@simpleanalyticsicon\endcsname {\simpleiconsmaponezero\symbol{185}} + \expandafter\def\csname simpleicon@simpleiconsicon\endcsname {\simpleiconsmaponezero\symbol{186}} + \expandafter\def\csname simpleicon@simpleloginicon\endcsname {\simpleiconsmaponezero\symbol{187}} + \expandafter\def\csname simpleicon@simplenoteicon\endcsname {\simpleiconsmaponezero\symbol{188}} + \expandafter\def\csname simpleicon@sinaweiboicon\endcsname {\simpleiconsmaponezero\symbol{189}} + \expandafter\def\csname simpleicon@singaporeairlinesicon\endcsname {\simpleiconsmaponezero\symbol{190}} + \expandafter\def\csname simpleicon@singlestoreicon\endcsname {\simpleiconsmaponezero\symbol{191}} + \expandafter\def\csname simpleicon@sitecoreicon\endcsname {\simpleiconsmaponezero\symbol{192}} + \expandafter\def\csname simpleicon@sitepointicon\endcsname {\simpleiconsmaponezero\symbol{193}} + \expandafter\def\csname simpleicon@siyuanicon\endcsname {\simpleiconsmaponezero\symbol{194}} + \expandafter\def\csname simpleicon@skaffoldicon\endcsname {\simpleiconsmaponezero\symbol{195}} + \expandafter\def\csname simpleicon@sketchicon\endcsname {\simpleiconsmaponezero\symbol{196}} + \expandafter\def\csname simpleicon@sketchfabicon\endcsname {\simpleiconsmaponezero\symbol{197}} + \expandafter\def\csname simpleicon@sketchupicon\endcsname {\simpleiconsmaponezero\symbol{198}} + \expandafter\def\csname simpleicon@skillshareicon\endcsname {\simpleiconsmaponezero\symbol{199}} + \expandafter\def\csname simpleicon@skodaicon\endcsname {\simpleiconsmaponezero\symbol{200}} + \expandafter\def\csname simpleicon@skyicon\endcsname {\simpleiconsmaponezero\symbol{201}} + \expandafter\def\csname simpleicon@skypackicon\endcsname {\simpleiconsmaponezero\symbol{202}} + \expandafter\def\csname simpleicon@skyrockicon\endcsname {\simpleiconsmaponezero\symbol{203}} + \expandafter\def\csname simpleicon@slackicon\endcsname {\simpleiconsmaponezero\symbol{204}} + \expandafter\def\csname simpleicon@slackwareicon\endcsname {\simpleiconsmaponezero\symbol{205}} + \expandafter\def\csname simpleicon@slashdoticon\endcsname {\simpleiconsmaponezero\symbol{206}} + \expandafter\def\csname simpleicon@slickpicicon\endcsname {\simpleiconsmaponezero\symbol{207}} + \expandafter\def\csname simpleicon@slidesicon\endcsname {\simpleiconsmaponezero\symbol{208}} + \expandafter\def\csname simpleicon@slideshareicon\endcsname {\simpleiconsmaponezero\symbol{209}} + \expandafter\def\csname simpleicon@slinticon\endcsname {\simpleiconsmaponezero\symbol{210}} + \expandafter\def\csname simpleicon@smarticon\endcsname {\simpleiconsmaponezero\symbol{211}} + \expandafter\def\csname simpleicon@smartthingsicon\endcsname {\simpleiconsmaponezero\symbol{212}} + \expandafter\def\csname simpleicon@smashdotggicon\endcsname {\simpleiconsmaponezero\symbol{213}} + \expandafter\def\csname simpleicon@smashingmagazineicon\endcsname {\simpleiconsmaponezero\symbol{214}} + \expandafter\def\csname simpleicon@smrticon\endcsname {\simpleiconsmaponezero\symbol{215}} + \expandafter\def\csname simpleicon@smugmugicon\endcsname {\simpleiconsmaponezero\symbol{216}} + \expandafter\def\csname simpleicon@snapchaticon\endcsname {\simpleiconsmaponezero\symbol{217}} + \expandafter\def\csname simpleicon@snapcrafticon\endcsname {\simpleiconsmaponezero\symbol{218}} + \expandafter\def\csname simpleicon@sncficon\endcsname {\simpleiconsmaponezero\symbol{219}} + \expandafter\def\csname simpleicon@snorticon\endcsname {\simpleiconsmaponezero\symbol{220}} + \expandafter\def\csname simpleicon@snowflakeicon\endcsname {\simpleiconsmaponezero\symbol{221}} + \expandafter\def\csname simpleicon@snowpackicon\endcsname {\simpleiconsmaponezero\symbol{222}} + \expandafter\def\csname simpleicon@snykicon\endcsname {\simpleiconsmaponezero\symbol{223}} + \expandafter\def\csname simpleicon@socialbladeicon\endcsname {\simpleiconsmaponezero\symbol{224}} + \expandafter\def\csname simpleicon@society6icon\endcsname {\simpleiconsmaponezero\symbol{225}} + \expandafter\def\csname simpleicon@socketdotioicon\endcsname {\simpleiconsmaponezero\symbol{226}} + \expandafter\def\csname simpleicon@softpediaicon\endcsname {\simpleiconsmaponezero\symbol{227}} + \expandafter\def\csname simpleicon@sogouicon\endcsname {\simpleiconsmaponezero\symbol{228}} + \expandafter\def\csname simpleicon@solanaicon\endcsname {\simpleiconsmaponezero\symbol{229}} + \expandafter\def\csname simpleicon@solidicon\endcsname {\simpleiconsmaponezero\symbol{230}} + \expandafter\def\csname simpleicon@solidityicon\endcsname {\simpleiconsmaponezero\symbol{231}} + \expandafter\def\csname simpleicon@sololearnicon\endcsname {\simpleiconsmaponezero\symbol{232}} + \expandafter\def\csname simpleicon@solusicon\endcsname {\simpleiconsmaponezero\symbol{233}} + \expandafter\def\csname simpleicon@sonaricon\endcsname {\simpleiconsmaponezero\symbol{234}} + \expandafter\def\csname simpleicon@sonarcloudicon\endcsname {\simpleiconsmaponezero\symbol{235}} + \expandafter\def\csname simpleicon@sonarlinticon\endcsname {\simpleiconsmaponezero\symbol{236}} + \expandafter\def\csname simpleicon@sonarqubeicon\endcsname {\simpleiconsmaponezero\symbol{237}} + \expandafter\def\csname simpleicon@sonarricon\endcsname {\simpleiconsmaponezero\symbol{238}} + \expandafter\def\csname simpleicon@sonatypeicon\endcsname {\simpleiconsmaponezero\symbol{239}} + \expandafter\def\csname simpleicon@songkickicon\endcsname {\simpleiconsmaponezero\symbol{240}} + \expandafter\def\csname simpleicon@songodaicon\endcsname {\simpleiconsmaponezero\symbol{241}} + \expandafter\def\csname simpleicon@sonicwallicon\endcsname {\simpleiconsmaponezero\symbol{242}} + \expandafter\def\csname simpleicon@sonosicon\endcsname {\simpleiconsmaponezero\symbol{243}} + \expandafter\def\csname simpleicon@sonyicon\endcsname {\simpleiconsmaponezero\symbol{244}} + \expandafter\def\csname simpleicon@sorianaicon\endcsname {\simpleiconsmaponezero\symbol{245}} + \expandafter\def\csname simpleicon@soundchartsicon\endcsname {\simpleiconsmaponezero\symbol{246}} + \expandafter\def\csname simpleicon@soundcloudicon\endcsname {\simpleiconsmaponezero\symbol{247}} + \expandafter\def\csname simpleicon@sourceengineicon\endcsname {\simpleiconsmaponezero\symbol{248}} + \expandafter\def\csname simpleicon@sourceforgeicon\endcsname {\simpleiconsmaponezero\symbol{249}} + \expandafter\def\csname simpleicon@sourcehuticon\endcsname {\simpleiconsmaponezero\symbol{250}} + \expandafter\def\csname simpleicon@sourcetreeicon\endcsname {\simpleiconsmaponezero\symbol{251}} + \expandafter\def\csname simpleicon@southwestairlinesicon\endcsname {\simpleiconsmaponezero\symbol{252}} + \expandafter\def\csname simpleicon@spacemacsicon\endcsname {\simpleiconsmaponezero\symbol{253}} + \expandafter\def\csname simpleicon@spaceshipicon\endcsname {\simpleiconsmaponezero\symbol{254}} + \expandafter\def\csname simpleicon@spacexicon\endcsname {\simpleiconsmaponezero\symbol{255}} + \expandafter\def\csname simpleicon@spacyicon\endcsname {\simpleiconsmaponeone\symbol{0}} + \expandafter\def\csname simpleicon@sparkaricon\endcsname {\simpleiconsmaponeone\symbol{1}} + \expandafter\def\csname simpleicon@sparkasseicon\endcsname {\simpleiconsmaponeone\symbol{2}} + \expandafter\def\csname simpleicon@sparkfunicon\endcsname {\simpleiconsmaponeone\symbol{3}} + \expandafter\def\csname simpleicon@sparkposticon\endcsname {\simpleiconsmaponeone\symbol{4}} + \expandafter\def\csname simpleicon@spdxicon\endcsname {\simpleiconsmaponeone\symbol{5}} + \expandafter\def\csname simpleicon@speakerdeckicon\endcsname {\simpleiconsmaponeone\symbol{6}} + \expandafter\def\csname simpleicon@spectrumicon\endcsname {\simpleiconsmaponeone\symbol{7}} + \expandafter\def\csname simpleicon@speedtesticon\endcsname {\simpleiconsmaponeone\symbol{8}} + \expandafter\def\csname simpleicon@speedypageicon\endcsname {\simpleiconsmaponeone\symbol{9}} + \expandafter\def\csname simpleicon@sphinxicon\endcsname {\simpleiconsmaponeone\symbol{10}} + \expandafter\def\csname simpleicon@spigotmcicon\endcsname {\simpleiconsmaponeone\symbol{11}} + \expandafter\def\csname simpleicon@spineicon\endcsname {\simpleiconsmaponeone\symbol{12}} + \expandafter\def\csname simpleicon@spinnakericon\endcsname {\simpleiconsmaponeone\symbol{13}} + \expandafter\def\csname simpleicon@spinrillaicon\endcsname {\simpleiconsmaponeone\symbol{14}} + \expandafter\def\csname simpleicon@splunkicon\endcsname {\simpleiconsmaponeone\symbol{15}} + \expandafter\def\csname simpleicon@spojicon\endcsname {\simpleiconsmaponeone\symbol{16}} + \expandafter\def\csname simpleicon@spondicon\endcsname {\simpleiconsmaponeone\symbol{17}} + \expandafter\def\csname simpleicon@spotifyicon\endcsname {\simpleiconsmaponeone\symbol{18}} + \expandafter\def\csname simpleicon@spotlighticon\endcsname {\simpleiconsmaponeone\symbol{19}} + \expandafter\def\csname simpleicon@spreadshirticon\endcsname {\simpleiconsmaponeone\symbol{20}} + \expandafter\def\csname simpleicon@spreakericon\endcsname {\simpleiconsmaponeone\symbol{21}} + \expandafter\def\csname simpleicon@springicon\endcsname {\simpleiconsmaponeone\symbol{22}} + \expandafter\def\csname simpleicon@springcreatorsicon\endcsname {\simpleiconsmaponeone\symbol{23}} + \expandafter\def\csname simpleicon@springbooticon\endcsname {\simpleiconsmaponeone\symbol{24}} + \expandafter\def\csname simpleicon@springsecurityicon\endcsname {\simpleiconsmaponeone\symbol{25}} + \expandafter\def\csname simpleicon@spyderideicon\endcsname {\simpleiconsmaponeone\symbol{26}} + \expandafter\def\csname simpleicon@sqlalchemyicon\endcsname {\simpleiconsmaponeone\symbol{27}} + \expandafter\def\csname simpleicon@sqliteicon\endcsname {\simpleiconsmaponeone\symbol{28}} + \expandafter\def\csname simpleicon@squareicon\endcsname {\simpleiconsmaponeone\symbol{29}} + \expandafter\def\csname simpleicon@squareenixicon\endcsname {\simpleiconsmaponeone\symbol{30}} + \expandafter\def\csname simpleicon@squarespaceicon\endcsname {\simpleiconsmaponeone\symbol{31}} + \expandafter\def\csname simpleicon@srgssricon\endcsname {\simpleiconsmaponeone\symbol{32}} + \expandafter\def\csname simpleicon@ssrnicon\endcsname {\simpleiconsmaponeone\symbol{33}} + \expandafter\def\csname simpleicon@ssticon\endcsname {\simpleiconsmaponeone\symbol{34}} + \expandafter\def\csname simpleicon@stackbiticon\endcsname {\simpleiconsmaponeone\symbol{35}} + \expandafter\def\csname simpleicon@stackblitzicon\endcsname {\simpleiconsmaponeone\symbol{36}} + \expandafter\def\csname simpleicon@stackediticon\endcsname {\simpleiconsmaponeone\symbol{37}} + \expandafter\def\csname simpleicon@stackexchangeicon\endcsname {\simpleiconsmaponeone\symbol{38}} + \expandafter\def\csname simpleicon@stackhawkicon\endcsname {\simpleiconsmaponeone\symbol{39}} + \expandafter\def\csname simpleicon@stackoverflowicon\endcsname {\simpleiconsmaponeone\symbol{40}} + \expandafter\def\csname simpleicon@stackpathicon\endcsname {\simpleiconsmaponeone\symbol{41}} + \expandafter\def\csname simpleicon@stackshareicon\endcsname {\simpleiconsmaponeone\symbol{42}} + \expandafter\def\csname simpleicon@stadiaicon\endcsname {\simpleiconsmaponeone\symbol{43}} + \expandafter\def\csname simpleicon@staffbaseicon\endcsname {\simpleiconsmaponeone\symbol{44}} + \expandafter\def\csname simpleicon@stagetimericon\endcsname {\simpleiconsmaponeone\symbol{45}} + \expandafter\def\csname simpleicon@standardjsicon\endcsname {\simpleiconsmaponeone\symbol{46}} + \expandafter\def\csname simpleicon@standardresumeicon\endcsname {\simpleiconsmaponeone\symbol{47}} + \expandafter\def\csname simpleicon@starbucksicon\endcsname {\simpleiconsmaponeone\symbol{48}} + \expandafter\def\csname simpleicon@stardockicon\endcsname {\simpleiconsmaponeone\symbol{49}} + \expandafter\def\csname simpleicon@starlingbankicon\endcsname {\simpleiconsmaponeone\symbol{50}} + \expandafter\def\csname simpleicon@starshipicon\endcsname {\simpleiconsmaponeone\symbol{51}} + \expandafter\def\csname simpleicon@startrekicon\endcsname {\simpleiconsmaponeone\symbol{52}} + \expandafter\def\csname simpleicon@starzicon\endcsname {\simpleiconsmaponeone\symbol{53}} + \expandafter\def\csname simpleicon@statamicicon\endcsname {\simpleiconsmaponeone\symbol{54}} + \expandafter\def\csname simpleicon@statistaicon\endcsname {\simpleiconsmaponeone\symbol{55}} + \expandafter\def\csname simpleicon@statuspageicon\endcsname {\simpleiconsmaponeone\symbol{56}} + \expandafter\def\csname simpleicon@statuspalicon\endcsname {\simpleiconsmaponeone\symbol{57}} + \expandafter\def\csname simpleicon@steamicon\endcsname {\simpleiconsmaponeone\symbol{58}} + \expandafter\def\csname simpleicon@steamdbicon\endcsname {\simpleiconsmaponeone\symbol{59}} + \expandafter\def\csname simpleicon@steamdeckicon\endcsname {\simpleiconsmaponeone\symbol{60}} + \expandafter\def\csname simpleicon@steamworksicon\endcsname {\simpleiconsmaponeone\symbol{61}} + \expandafter\def\csname simpleicon@steelseriesicon\endcsname {\simpleiconsmaponeone\symbol{62}} + \expandafter\def\csname simpleicon@steemicon\endcsname {\simpleiconsmaponeone\symbol{63}} + \expandafter\def\csname simpleicon@steemiticon\endcsname {\simpleiconsmaponeone\symbol{64}} + \expandafter\def\csname simpleicon@steinbergicon\endcsname {\simpleiconsmaponeone\symbol{65}} + \expandafter\def\csname simpleicon@stellaricon\endcsname {\simpleiconsmaponeone\symbol{66}} + \expandafter\def\csname simpleicon@stencilicon\endcsname {\simpleiconsmaponeone\symbol{67}} + \expandafter\def\csname simpleicon@stencylicon\endcsname {\simpleiconsmaponeone\symbol{68}} + \expandafter\def\csname simpleicon@stimulusicon\endcsname {\simpleiconsmaponeone\symbol{69}} + \expandafter\def\csname simpleicon@stitchericon\endcsname {\simpleiconsmaponeone\symbol{70}} + \expandafter\def\csname simpleicon@stmicroelectronicsicon\endcsname {\simpleiconsmaponeone\symbol{71}} + \expandafter\def\csname simpleicon@stockxicon\endcsname {\simpleiconsmaponeone\symbol{72}} + \expandafter\def\csname simpleicon@stopstalkicon\endcsname {\simpleiconsmaponeone\symbol{73}} + \expandafter\def\csname simpleicon@storyblokicon\endcsname {\simpleiconsmaponeone\symbol{74}} + \expandafter\def\csname simpleicon@storybookicon\endcsname {\simpleiconsmaponeone\symbol{75}} + \expandafter\def\csname simpleicon@strapiicon\endcsname {\simpleiconsmaponeone\symbol{76}} + \expandafter\def\csname simpleicon@stravaicon\endcsname {\simpleiconsmaponeone\symbol{77}} + \expandafter\def\csname simpleicon@streamlabsicon\endcsname {\simpleiconsmaponeone\symbol{78}} + \expandafter\def\csname simpleicon@streamliticon\endcsname {\simpleiconsmaponeone\symbol{79}} + \expandafter\def\csname simpleicon@streamrunnersicon\endcsname {\simpleiconsmaponeone\symbol{80}} + \expandafter\def\csname simpleicon@stripeicon\endcsname {\simpleiconsmaponeone\symbol{81}} + \expandafter\def\csname simpleicon@strongswanicon\endcsname {\simpleiconsmaponeone\symbol{82}} + \expandafter\def\csname simpleicon@strykericon\endcsname {\simpleiconsmaponeone\symbol{83}} + \expandafter\def\csname simpleicon@stubhubicon\endcsname {\simpleiconsmaponeone\symbol{84}} + \expandafter\def\csname simpleicon@studio3ticon\endcsname {\simpleiconsmaponeone\symbol{85}} + \expandafter\def\csname simpleicon@studyverseicon\endcsname {\simpleiconsmaponeone\symbol{86}} + \expandafter\def\csname simpleicon@styledcomponentsicon\endcsname {\simpleiconsmaponeone\symbol{87}} + \expandafter\def\csname simpleicon@stylelinticon\endcsname {\simpleiconsmaponeone\symbol{88}} + \expandafter\def\csname simpleicon@styleshareicon\endcsname {\simpleiconsmaponeone\symbol{89}} + \expandafter\def\csname simpleicon@stylusicon\endcsname {\simpleiconsmaponeone\symbol{90}} + \expandafter\def\csname simpleicon@subaruicon\endcsname {\simpleiconsmaponeone\symbol{91}} + \expandafter\def\csname simpleicon@sublimetexticon\endcsname {\simpleiconsmaponeone\symbol{92}} + \expandafter\def\csname simpleicon@substackicon\endcsname {\simpleiconsmaponeone\symbol{93}} + \expandafter\def\csname simpleicon@subtitleediticon\endcsname {\simpleiconsmaponeone\symbol{94}} + \expandafter\def\csname simpleicon@subversionicon\endcsname {\simpleiconsmaponeone\symbol{95}} + \expandafter\def\csname simpleicon@sucklessicon\endcsname {\simpleiconsmaponeone\symbol{96}} + \expandafter\def\csname simpleicon@sumologicicon\endcsname {\simpleiconsmaponeone\symbol{97}} + \expandafter\def\csname simpleicon@sunoicon\endcsname {\simpleiconsmaponeone\symbol{98}} + \expandafter\def\csname simpleicon@sunriseicon\endcsname {\simpleiconsmaponeone\symbol{99}} + \expandafter\def\csname simpleicon@supabaseicon\endcsname {\simpleiconsmaponeone\symbol{100}} + \expandafter\def\csname simpleicon@supercreaseicon\endcsname {\simpleiconsmaponeone\symbol{101}} + \expandafter\def\csname simpleicon@supermicroicon\endcsname {\simpleiconsmaponeone\symbol{102}} + \expandafter\def\csname simpleicon@superusericon\endcsname {\simpleiconsmaponeone\symbol{103}} + \expandafter\def\csname simpleicon@surrealdbicon\endcsname {\simpleiconsmaponeone\symbol{104}} + \expandafter\def\csname simpleicon@surveymonkeyicon\endcsname {\simpleiconsmaponeone\symbol{105}} + \expandafter\def\csname simpleicon@suseicon\endcsname {\simpleiconsmaponeone\symbol{106}} + \expandafter\def\csname simpleicon@suzukiicon\endcsname {\simpleiconsmaponeone\symbol{107}} + \expandafter\def\csname simpleicon@svelteicon\endcsname {\simpleiconsmaponeone\symbol{108}} + \expandafter\def\csname simpleicon@svgicon\endcsname {\simpleiconsmaponeone\symbol{109}} + \expandafter\def\csname simpleicon@svgdotjsicon\endcsname {\simpleiconsmaponeone\symbol{110}} + \expandafter\def\csname simpleicon@svgoicon\endcsname {\simpleiconsmaponeone\symbol{111}} + \expandafter\def\csname simpleicon@swaggericon\endcsname {\simpleiconsmaponeone\symbol{112}} + \expandafter\def\csname simpleicon@swarmicon\endcsname {\simpleiconsmaponeone\symbol{113}} + \expandafter\def\csname simpleicon@swcicon\endcsname {\simpleiconsmaponeone\symbol{114}} + \expandafter\def\csname simpleicon@swifticon\endcsname {\simpleiconsmaponeone\symbol{115}} + \expandafter\def\csname simpleicon@swiggyicon\endcsname {\simpleiconsmaponeone\symbol{116}} + \expandafter\def\csname simpleicon@swipericon\endcsname {\simpleiconsmaponeone\symbol{117}} + \expandafter\def\csname simpleicon@swricon\endcsname {\simpleiconsmaponeone\symbol{118}} + \expandafter\def\csname simpleicon@symantecicon\endcsname {\simpleiconsmaponeone\symbol{119}} + \expandafter\def\csname simpleicon@symbolabicon\endcsname {\simpleiconsmaponeone\symbol{120}} + \expandafter\def\csname simpleicon@symfonyicon\endcsname {\simpleiconsmaponeone\symbol{121}} + \expandafter\def\csname simpleicon@symphonyicon\endcsname {\simpleiconsmaponeone\symbol{122}} + \expandafter\def\csname simpleicon@sympyicon\endcsname {\simpleiconsmaponeone\symbol{123}} + \expandafter\def\csname simpleicon@syncthingicon\endcsname {\simpleiconsmaponeone\symbol{124}} + \expandafter\def\csname simpleicon@synologyicon\endcsname {\simpleiconsmaponeone\symbol{125}} + \expandafter\def\csname simpleicon@system76icon\endcsname {\simpleiconsmaponeone\symbol{126}} + \expandafter\def\csname simpleicon@tabelogicon\endcsname {\simpleiconsmaponeone\symbol{127}} + \expandafter\def\csname simpleicon@tableauicon\endcsname {\simpleiconsmaponeone\symbol{128}} + \expandafter\def\csname simpleicon@tablecheckicon\endcsname {\simpleiconsmaponeone\symbol{129}} + \expandafter\def\csname simpleicon@tacobellicon\endcsname {\simpleiconsmaponeone\symbol{130}} + \expandafter\def\csname simpleicon@tadoicon\endcsname {\simpleiconsmaponeone\symbol{131}} + \expandafter\def\csname simpleicon@taichigraphicsicon\endcsname {\simpleiconsmaponeone\symbol{132}} + \expandafter\def\csname simpleicon@taichilangicon\endcsname {\simpleiconsmaponeone\symbol{133}} + \expandafter\def\csname simpleicon@tailsicon\endcsname {\simpleiconsmaponeone\symbol{134}} + \expandafter\def\csname simpleicon@tailscaleicon\endcsname {\simpleiconsmaponeone\symbol{135}} + \expandafter\def\csname simpleicon@tailwindcssicon\endcsname {\simpleiconsmaponeone\symbol{136}} + \expandafter\def\csname simpleicon@taipyicon\endcsname {\simpleiconsmaponeone\symbol{137}} + \expandafter\def\csname simpleicon@taketwointeractivesoftwareicon\endcsname {\simpleiconsmaponeone\symbol{138}} + \expandafter\def\csname simpleicon@talendicon\endcsname {\simpleiconsmaponeone\symbol{139}} + \expandafter\def\csname simpleicon@talenthouseicon\endcsname {\simpleiconsmaponeone\symbol{140}} + \expandafter\def\csname simpleicon@talosicon\endcsname {\simpleiconsmaponeone\symbol{141}} + \expandafter\def\csname simpleicon@tamiyaicon\endcsname {\simpleiconsmaponeone\symbol{142}} + \expandafter\def\csname simpleicon@tampermonkeyicon\endcsname {\simpleiconsmaponeone\symbol{143}} + \expandafter\def\csname simpleicon@taobaoicon\endcsname {\simpleiconsmaponeone\symbol{144}} + \expandafter\def\csname simpleicon@tapasicon\endcsname {\simpleiconsmaponeone\symbol{145}} + \expandafter\def\csname simpleicon@targeticon\endcsname {\simpleiconsmaponeone\symbol{146}} + \expandafter\def\csname simpleicon@taskicon\endcsname {\simpleiconsmaponeone\symbol{147}} + \expandafter\def\csname simpleicon@tasmotaicon\endcsname {\simpleiconsmaponeone\symbol{148}} + \expandafter\def\csname simpleicon@tataicon\endcsname {\simpleiconsmaponeone\symbol{149}} + \expandafter\def\csname simpleicon@tauriicon\endcsname {\simpleiconsmaponeone\symbol{150}} + \expandafter\def\csname simpleicon@taxbuzzicon\endcsname {\simpleiconsmaponeone\symbol{151}} + \expandafter\def\csname simpleicon@tcsicon\endcsname {\simpleiconsmaponeone\symbol{152}} + \expandafter\def\csname simpleicon@tealicon\endcsname {\simpleiconsmaponeone\symbol{153}} + \expandafter\def\csname simpleicon@teamcityicon\endcsname {\simpleiconsmaponeone\symbol{154}} + \expandafter\def\csname simpleicon@teamspeakicon\endcsname {\simpleiconsmaponeone\symbol{155}} + \expandafter\def\csname simpleicon@teamviewericon\endcsname {\simpleiconsmaponeone\symbol{156}} + \expandafter\def\csname simpleicon@techcrunchicon\endcsname {\simpleiconsmaponeone\symbol{157}} + \expandafter\def\csname simpleicon@tedicon\endcsname {\simpleiconsmaponeone\symbol{158}} + \expandafter\def\csname simpleicon@teepublicicon\endcsname {\simpleiconsmaponeone\symbol{159}} + \expandafter\def\csname simpleicon@teespringicon\endcsname {\simpleiconsmaponeone\symbol{160}} + \expandafter\def\csname simpleicon@tektonicon\endcsname {\simpleiconsmaponeone\symbol{161}} + \expandafter\def\csname simpleicon@tele5icon\endcsname {\simpleiconsmaponeone\symbol{162}} + \expandafter\def\csname simpleicon@telegramicon\endcsname {\simpleiconsmaponeone\symbol{163}} + \expandafter\def\csname simpleicon@telegraphicon\endcsname {\simpleiconsmaponeone\symbol{164}} + \expandafter\def\csname simpleicon@telequebecicon\endcsname {\simpleiconsmaponeone\symbol{165}} + \expandafter\def\csname simpleicon@temporalicon\endcsname {\simpleiconsmaponeone\symbol{166}} + \expandafter\def\csname simpleicon@tencentqqicon\endcsname {\simpleiconsmaponeone\symbol{167}} + \expandafter\def\csname simpleicon@tensorflowicon\endcsname {\simpleiconsmaponeone\symbol{168}} + \expandafter\def\csname simpleicon@teradataicon\endcsname {\simpleiconsmaponeone\symbol{169}} + \expandafter\def\csname simpleicon@teratailicon\endcsname {\simpleiconsmaponeone\symbol{170}} + \expandafter\def\csname simpleicon@termiusicon\endcsname {\simpleiconsmaponeone\symbol{171}} + \expandafter\def\csname simpleicon@terraformicon\endcsname {\simpleiconsmaponeone\symbol{172}} + \expandafter\def\csname simpleicon@tescoicon\endcsname {\simpleiconsmaponeone\symbol{173}} + \expandafter\def\csname simpleicon@teslaicon\endcsname {\simpleiconsmaponeone\symbol{174}} + \expandafter\def\csname simpleicon@testcafeicon\endcsname {\simpleiconsmaponeone\symbol{175}} + \expandafter\def\csname simpleicon@testinicon\endcsname {\simpleiconsmaponeone\symbol{176}} + \expandafter\def\csname simpleicon@testinglibraryicon\endcsname {\simpleiconsmaponeone\symbol{177}} + \expandafter\def\csname simpleicon@testrailicon\endcsname {\simpleiconsmaponeone\symbol{178}} + \expandafter\def\csname simpleicon@tethericon\endcsname {\simpleiconsmaponeone\symbol{179}} + \expandafter\def\csname simpleicon@textpatternicon\endcsname {\simpleiconsmaponeone\symbol{180}} + \expandafter\def\csname simpleicon@tgaicon\endcsname {\simpleiconsmaponeone\symbol{181}} + \expandafter\def\csname simpleicon@thangsicon\endcsname {\simpleiconsmaponeone\symbol{182}} + \expandafter\def\csname simpleicon@thealgorithmsicon\endcsname {\simpleiconsmaponeone\symbol{183}} + \expandafter\def\csname simpleicon@theboringcompanyicon\endcsname {\simpleiconsmaponeone\symbol{184}} + \expandafter\def\csname simpleicon@theconversationicon\endcsname {\simpleiconsmaponeone\symbol{185}} + \expandafter\def\csname simpleicon@thefinalsicon\endcsname {\simpleiconsmaponeone\symbol{186}} + \expandafter\def\csname simpleicon@theirishtimesicon\endcsname {\simpleiconsmaponeone\symbol{187}} + \expandafter\def\csname simpleicon@themightyicon\endcsname {\simpleiconsmaponeone\symbol{188}} + \expandafter\def\csname simpleicon@themodelsresourceicon\endcsname {\simpleiconsmaponeone\symbol{189}} + \expandafter\def\csname simpleicon@themoviedatabaseicon\endcsname {\simpleiconsmaponeone\symbol{190}} + \expandafter\def\csname simpleicon@thenorthfaceicon\endcsname {\simpleiconsmaponeone\symbol{191}} + \expandafter\def\csname simpleicon@theodinprojecticon\endcsname {\simpleiconsmaponeone\symbol{192}} + \expandafter\def\csname simpleicon@theregistericon\endcsname {\simpleiconsmaponeone\symbol{193}} + \expandafter\def\csname simpleicon@thesoundsresourceicon\endcsname {\simpleiconsmaponeone\symbol{194}} + \expandafter\def\csname simpleicon@thespritersresourceicon\endcsname {\simpleiconsmaponeone\symbol{195}} + \expandafter\def\csname simpleicon@thewashingtonposticon\endcsname {\simpleiconsmaponeone\symbol{196}} + \expandafter\def\csname simpleicon@thingiverseicon\endcsname {\simpleiconsmaponeone\symbol{197}} + \expandafter\def\csname simpleicon@thinkpadicon\endcsname {\simpleiconsmaponeone\symbol{198}} + \expandafter\def\csname simpleicon@thirdwebicon\endcsname {\simpleiconsmaponeone\symbol{199}} + \expandafter\def\csname simpleicon@threadlessicon\endcsname {\simpleiconsmaponeone\symbol{200}} + \expandafter\def\csname simpleicon@threadsicon\endcsname {\simpleiconsmaponeone\symbol{201}} + \expandafter\def\csname simpleicon@threedotjsicon\endcsname {\simpleiconsmaponeone\symbol{202}} + \expandafter\def\csname simpleicon@threemaicon\endcsname {\simpleiconsmaponeone\symbol{203}} + \expandafter\def\csname simpleicon@thumbtackicon\endcsname {\simpleiconsmaponeone\symbol{204}} + \expandafter\def\csname simpleicon@thunderbirdicon\endcsname {\simpleiconsmaponeone\symbol{205}} + \expandafter\def\csname simpleicon@thunderstoreicon\endcsname {\simpleiconsmaponeone\symbol{206}} + \expandafter\def\csname simpleicon@thurgauerkantonalbankicon\endcsname {\simpleiconsmaponeone\symbol{207}} + \expandafter\def\csname simpleicon@thymeleaficon\endcsname {\simpleiconsmaponeone\symbol{208}} + \expandafter\def\csname simpleicon@ticketmastericon\endcsname {\simpleiconsmaponeone\symbol{209}} + \expandafter\def\csname simpleicon@ticktickicon\endcsname {\simpleiconsmaponeone\symbol{210}} + \expandafter\def\csname simpleicon@tidalicon\endcsname {\simpleiconsmaponeone\symbol{211}} + \expandafter\def\csname simpleicon@tiddlywikiicon\endcsname {\simpleiconsmaponeone\symbol{212}} + \expandafter\def\csname simpleicon@tideicon\endcsname {\simpleiconsmaponeone\symbol{213}} + \expandafter\def\csname simpleicon@tidyverseicon\endcsname {\simpleiconsmaponeone\symbol{214}} + \expandafter\def\csname simpleicon@tietoevryicon\endcsname {\simpleiconsmaponeone\symbol{215}} + \expandafter\def\csname simpleicon@tiktokicon\endcsname {\simpleiconsmaponeone\symbol{216}} + \expandafter\def\csname simpleicon@tildapublishingicon\endcsname {\simpleiconsmaponeone\symbol{217}} + \expandafter\def\csname simpleicon@tileicon\endcsname {\simpleiconsmaponeone\symbol{218}} + \expandafter\def\csname simpleicon@timescaleicon\endcsname {\simpleiconsmaponeone\symbol{219}} + \expandafter\def\csname simpleicon@tinaicon\endcsname {\simpleiconsmaponeone\symbol{220}} + \expandafter\def\csname simpleicon@tindericon\endcsname {\simpleiconsmaponeone\symbol{221}} + \expandafter\def\csname simpleicon@tindieicon\endcsname {\simpleiconsmaponeone\symbol{222}} + \expandafter\def\csname simpleicon@tinkercadicon\endcsname {\simpleiconsmaponeone\symbol{223}} + \expandafter\def\csname simpleicon@tinygradicon\endcsname {\simpleiconsmaponeone\symbol{224}} + \expandafter\def\csname simpleicon@tinylettericon\endcsname {\simpleiconsmaponeone\symbol{225}} + \expandafter\def\csname simpleicon@tistoryicon\endcsname {\simpleiconsmaponeone\symbol{226}} + \expandafter\def\csname simpleicon@tldrawicon\endcsname {\simpleiconsmaponeone\symbol{227}} + \expandafter\def\csname simpleicon@tmobileicon\endcsname {\simpleiconsmaponeone\symbol{228}} + \expandafter\def\csname simpleicon@tmuxicon\endcsname {\simpleiconsmaponeone\symbol{229}} + \expandafter\def\csname simpleicon@todoisticon\endcsname {\simpleiconsmaponeone\symbol{230}} + \expandafter\def\csname simpleicon@togglicon\endcsname {\simpleiconsmaponeone\symbol{231}} + \expandafter\def\csname simpleicon@toggltrackicon\endcsname {\simpleiconsmaponeone\symbol{232}} + \expandafter\def\csname simpleicon@tokyometroicon\endcsname {\simpleiconsmaponeone\symbol{233}} + \expandafter\def\csname simpleicon@tollicon\endcsname {\simpleiconsmaponeone\symbol{234}} + \expandafter\def\csname simpleicon@tomlicon\endcsname {\simpleiconsmaponeone\symbol{235}} + \expandafter\def\csname simpleicon@tomorrowlandicon\endcsname {\simpleiconsmaponeone\symbol{236}} + \expandafter\def\csname simpleicon@tonicon\endcsname {\simpleiconsmaponeone\symbol{237}} + \expandafter\def\csname simpleicon@topcodericon\endcsname {\simpleiconsmaponeone\symbol{238}} + \expandafter\def\csname simpleicon@topdotggicon\endcsname {\simpleiconsmaponeone\symbol{239}} + \expandafter\def\csname simpleicon@toptalicon\endcsname {\simpleiconsmaponeone\symbol{240}} + \expandafter\def\csname simpleicon@torbrowsericon\endcsname {\simpleiconsmaponeone\symbol{241}} + \expandafter\def\csname simpleicon@torprojecticon\endcsname {\simpleiconsmaponeone\symbol{242}} + \expandafter\def\csname simpleicon@toshibaicon\endcsname {\simpleiconsmaponeone\symbol{243}} + \expandafter\def\csname simpleicon@totvsicon\endcsname {\simpleiconsmaponeone\symbol{244}} + \expandafter\def\csname simpleicon@tourboxicon\endcsname {\simpleiconsmaponeone\symbol{245}} + \expandafter\def\csname simpleicon@towericon\endcsname {\simpleiconsmaponeone\symbol{246}} + \expandafter\def\csname simpleicon@toyotaicon\endcsname {\simpleiconsmaponeone\symbol{247}} + \expandafter\def\csname simpleicon@tplinkicon\endcsname {\simpleiconsmaponeone\symbol{248}} + \expandafter\def\csname simpleicon@tqdmicon\endcsname {\simpleiconsmaponeone\symbol{249}} + \expandafter\def\csname simpleicon@traccaricon\endcsname {\simpleiconsmaponeone\symbol{250}} + \expandafter\def\csname simpleicon@tradingviewicon\endcsname {\simpleiconsmaponeone\symbol{251}} + \expandafter\def\csname simpleicon@traefikmeshicon\endcsname {\simpleiconsmaponeone\symbol{252}} + \expandafter\def\csname simpleicon@traefikproxyicon\endcsname {\simpleiconsmaponeone\symbol{253}} + \expandafter\def\csname simpleicon@trailforksicon\endcsname {\simpleiconsmaponeone\symbol{254}} + \expandafter\def\csname simpleicon@trainerroadicon\endcsname {\simpleiconsmaponeone\symbol{255}} + \expandafter\def\csname simpleicon@trakticon\endcsname {\simpleiconsmaponetwo\symbol{0}} + \expandafter\def\csname simpleicon@transifexicon\endcsname {\simpleiconsmaponetwo\symbol{1}} + \expandafter\def\csname simpleicon@transmissionicon\endcsname {\simpleiconsmaponetwo\symbol{2}} + \expandafter\def\csname simpleicon@transportforirelandicon\endcsname {\simpleiconsmaponetwo\symbol{3}} + \expandafter\def\csname simpleicon@transportforlondonicon\endcsname {\simpleiconsmaponetwo\symbol{4}} + \expandafter\def\csname simpleicon@travisciicon\endcsname {\simpleiconsmaponetwo\symbol{5}} + \expandafter\def\csname simpleicon@treehouseicon\endcsname {\simpleiconsmaponetwo\symbol{6}} + \expandafter\def\csname simpleicon@trelloicon\endcsname {\simpleiconsmaponetwo\symbol{7}} + \expandafter\def\csname simpleicon@trendmicroicon\endcsname {\simpleiconsmaponetwo\symbol{8}} + \expandafter\def\csname simpleicon@treyarchicon\endcsname {\simpleiconsmaponetwo\symbol{9}} + \expandafter\def\csname simpleicon@tricentisicon\endcsname {\simpleiconsmaponetwo\symbol{10}} + \expandafter\def\csname simpleicon@triliumicon\endcsname {\simpleiconsmaponetwo\symbol{11}} + \expandafter\def\csname simpleicon@trillericon\endcsname {\simpleiconsmaponetwo\symbol{12}} + \expandafter\def\csname simpleicon@trillertvicon\endcsname {\simpleiconsmaponetwo\symbol{13}} + \expandafter\def\csname simpleicon@trinoicon\endcsname {\simpleiconsmaponetwo\symbol{14}} + \expandafter\def\csname simpleicon@tripadvisoricon\endcsname {\simpleiconsmaponetwo\symbol{15}} + \expandafter\def\csname simpleicon@tripdotcomicon\endcsname {\simpleiconsmaponetwo\symbol{16}} + \expandafter\def\csname simpleicon@trivagoicon\endcsname {\simpleiconsmaponetwo\symbol{17}} + \expandafter\def\csname simpleicon@trivyicon\endcsname {\simpleiconsmaponetwo\symbol{18}} + \expandafter\def\csname simpleicon@troveicon\endcsname {\simpleiconsmaponetwo\symbol{19}} + \expandafter\def\csname simpleicon@trpcicon\endcsname {\simpleiconsmaponetwo\symbol{20}} + \expandafter\def\csname simpleicon@truenasicon\endcsname {\simpleiconsmaponetwo\symbol{21}} + \expandafter\def\csname simpleicon@trueupicon\endcsname {\simpleiconsmaponetwo\symbol{22}} + \expandafter\def\csname simpleicon@truliaicon\endcsname {\simpleiconsmaponetwo\symbol{23}} + \expandafter\def\csname simpleicon@trustedshopsicon\endcsname {\simpleiconsmaponetwo\symbol{24}} + \expandafter\def\csname simpleicon@trustpiloticon\endcsname {\simpleiconsmaponetwo\symbol{25}} + \expandafter\def\csname simpleicon@tryhackmeicon\endcsname {\simpleiconsmaponetwo\symbol{26}} + \expandafter\def\csname simpleicon@tryitonlineicon\endcsname {\simpleiconsmaponetwo\symbol{27}} + \expandafter\def\csname simpleicon@tsnodeicon\endcsname {\simpleiconsmaponetwo\symbol{28}} + \expandafter\def\csname simpleicon@tubiicon\endcsname {\simpleiconsmaponetwo\symbol{29}} + \expandafter\def\csname simpleicon@tuiicon\endcsname {\simpleiconsmaponetwo\symbol{30}} + \expandafter\def\csname simpleicon@tumblricon\endcsname {\simpleiconsmaponetwo\symbol{31}} + \expandafter\def\csname simpleicon@tuneinicon\endcsname {\simpleiconsmaponetwo\symbol{32}} + \expandafter\def\csname simpleicon@turboicon\endcsname {\simpleiconsmaponetwo\symbol{33}} + \expandafter\def\csname simpleicon@turborepoicon\endcsname {\simpleiconsmaponetwo\symbol{34}} + \expandafter\def\csname simpleicon@turbosquidicon\endcsname {\simpleiconsmaponetwo\symbol{35}} + \expandafter\def\csname simpleicon@turkishairlinesicon\endcsname {\simpleiconsmaponetwo\symbol{36}} + \expandafter\def\csname simpleicon@tursoicon\endcsname {\simpleiconsmaponetwo\symbol{37}} + \expandafter\def\csname simpleicon@tutanotaicon\endcsname {\simpleiconsmaponetwo\symbol{38}} + \expandafter\def\csname simpleicon@tv4playicon\endcsname {\simpleiconsmaponetwo\symbol{39}} + \expandafter\def\csname simpleicon@tvtimeicon\endcsname {\simpleiconsmaponetwo\symbol{40}} + \expandafter\def\csname simpleicon@twilioicon\endcsname {\simpleiconsmaponetwo\symbol{41}} + \expandafter\def\csname simpleicon@twinklyicon\endcsname {\simpleiconsmaponetwo\symbol{42}} + \expandafter\def\csname simpleicon@twinmotionicon\endcsname {\simpleiconsmaponetwo\symbol{43}} + \expandafter\def\csname simpleicon@twitchicon\endcsname {\simpleiconsmaponetwo\symbol{44}} + \expandafter\def\csname simpleicon@typeformicon\endcsname {\simpleiconsmaponetwo\symbol{45}} + \expandafter\def\csname simpleicon@typeormicon\endcsname {\simpleiconsmaponetwo\symbol{46}} + \expandafter\def\csname simpleicon@typericon\endcsname {\simpleiconsmaponetwo\symbol{47}} + \expandafter\def\csname simpleicon@typescripticon\endcsname {\simpleiconsmaponetwo\symbol{48}} + \expandafter\def\csname simpleicon@typo3icon\endcsname {\simpleiconsmaponetwo\symbol{49}} + \expandafter\def\csname simpleicon@typsticon\endcsname {\simpleiconsmaponetwo\symbol{50}} + \expandafter\def\csname simpleicon@ubericon\endcsname {\simpleiconsmaponetwo\symbol{51}} + \expandafter\def\csname simpleicon@ubereatsicon\endcsname {\simpleiconsmaponetwo\symbol{52}} + \expandafter\def\csname simpleicon@ubiquitiicon\endcsname {\simpleiconsmaponetwo\symbol{53}} + \expandafter\def\csname simpleicon@ubisofticon\endcsname {\simpleiconsmaponetwo\symbol{54}} + \expandafter\def\csname simpleicon@ublockoriginicon\endcsname {\simpleiconsmaponetwo\symbol{55}} + \expandafter\def\csname simpleicon@ubuntuicon\endcsname {\simpleiconsmaponetwo\symbol{56}} + \expandafter\def\csname simpleicon@ubuntumateicon\endcsname {\simpleiconsmaponetwo\symbol{57}} + \expandafter\def\csname simpleicon@udacityicon\endcsname {\simpleiconsmaponetwo\symbol{58}} + \expandafter\def\csname simpleicon@udemyicon\endcsname {\simpleiconsmaponetwo\symbol{59}} + \expandafter\def\csname simpleicon@ufcicon\endcsname {\simpleiconsmaponetwo\symbol{60}} + \expandafter\def\csname simpleicon@uikiticon\endcsname {\simpleiconsmaponetwo\symbol{61}} + \expandafter\def\csname simpleicon@uipathicon\endcsname {\simpleiconsmaponetwo\symbol{62}} + \expandafter\def\csname simpleicon@ululeicon\endcsname {\simpleiconsmaponetwo\symbol{63}} + \expandafter\def\csname simpleicon@umamiicon\endcsname {\simpleiconsmaponetwo\symbol{64}} + \expandafter\def\csname simpleicon@umbracoicon\endcsname {\simpleiconsmaponetwo\symbol{65}} + \expandafter\def\csname simpleicon@umlicon\endcsname {\simpleiconsmaponetwo\symbol{66}} + \expandafter\def\csname simpleicon@unacademyicon\endcsname {\simpleiconsmaponetwo\symbol{67}} + \expandafter\def\csname simpleicon@underarmouricon\endcsname {\simpleiconsmaponetwo\symbol{68}} + \expandafter\def\csname simpleicon@underscoredotjsicon\endcsname {\simpleiconsmaponetwo\symbol{69}} + \expandafter\def\csname simpleicon@undertaleicon\endcsname {\simpleiconsmaponetwo\symbol{70}} + \expandafter\def\csname simpleicon@unicodeicon\endcsname {\simpleiconsmaponetwo\symbol{71}} + \expandafter\def\csname simpleicon@unilevericon\endcsname {\simpleiconsmaponetwo\symbol{72}} + \expandafter\def\csname simpleicon@uniqloicon\endcsname {\simpleiconsmaponetwo\symbol{73}} + \expandafter\def\csname simpleicon@uniqlojaicon\endcsname {\simpleiconsmaponetwo\symbol{74}} + \expandafter\def\csname simpleicon@unitedairlinesicon\endcsname {\simpleiconsmaponetwo\symbol{75}} + \expandafter\def\csname simpleicon@unitednationsicon\endcsname {\simpleiconsmaponetwo\symbol{76}} + \expandafter\def\csname simpleicon@unityicon\endcsname {\simpleiconsmaponetwo\symbol{77}} + \expandafter\def\csname simpleicon@unjsicon\endcsname {\simpleiconsmaponetwo\symbol{78}} + \expandafter\def\csname simpleicon@unlicenseicon\endcsname {\simpleiconsmaponetwo\symbol{79}} + \expandafter\def\csname simpleicon@unocssicon\endcsname {\simpleiconsmaponetwo\symbol{80}} + \expandafter\def\csname simpleicon@unpkgicon\endcsname {\simpleiconsmaponetwo\symbol{81}} + \expandafter\def\csname simpleicon@unraidicon\endcsname {\simpleiconsmaponetwo\symbol{82}} + \expandafter\def\csname simpleicon@unrealengineicon\endcsname {\simpleiconsmaponetwo\symbol{83}} + \expandafter\def\csname simpleicon@unsplashicon\endcsname {\simpleiconsmaponetwo\symbol{84}} + \expandafter\def\csname simpleicon@untappdicon\endcsname {\simpleiconsmaponetwo\symbol{85}} + \expandafter\def\csname simpleicon@upcloudicon\endcsname {\simpleiconsmaponetwo\symbol{86}} + \expandafter\def\csname simpleicon@upholdicon\endcsname {\simpleiconsmaponetwo\symbol{87}} + \expandafter\def\csname simpleicon@uplabsicon\endcsname {\simpleiconsmaponetwo\symbol{88}} + \expandafter\def\csname simpleicon@upptimeicon\endcsname {\simpleiconsmaponetwo\symbol{89}} + \expandafter\def\csname simpleicon@upsicon\endcsname {\simpleiconsmaponetwo\symbol{90}} + \expandafter\def\csname simpleicon@upstashicon\endcsname {\simpleiconsmaponetwo\symbol{91}} + \expandafter\def\csname simpleicon@uptimekumaicon\endcsname {\simpleiconsmaponetwo\symbol{92}} + \expandafter\def\csname simpleicon@uptoboxicon\endcsname {\simpleiconsmaponetwo\symbol{93}} + \expandafter\def\csname simpleicon@upworkicon\endcsname {\simpleiconsmaponetwo\symbol{94}} + \expandafter\def\csname simpleicon@uspsicon\endcsname {\simpleiconsmaponetwo\symbol{95}} + \expandafter\def\csname simpleicon@utorrenticon\endcsname {\simpleiconsmaponetwo\symbol{96}} + \expandafter\def\csname simpleicon@vicon\endcsname {\simpleiconsmaponetwo\symbol{97}} + \expandafter\def\csname simpleicon@v2exicon\endcsname {\simpleiconsmaponetwo\symbol{98}} + \expandafter\def\csname simpleicon@v8icon\endcsname {\simpleiconsmaponetwo\symbol{99}} + \expandafter\def\csname simpleicon@vaadinicon\endcsname {\simpleiconsmaponetwo\symbol{100}} + \expandafter\def\csname simpleicon@vagranticon\endcsname {\simpleiconsmaponetwo\symbol{101}} + \expandafter\def\csname simpleicon@valaicon\endcsname {\simpleiconsmaponetwo\symbol{102}} + \expandafter\def\csname simpleicon@valoranticon\endcsname {\simpleiconsmaponetwo\symbol{103}} + \expandafter\def\csname simpleicon@valveicon\endcsname {\simpleiconsmaponetwo\symbol{104}} + \expandafter\def\csname simpleicon@vaporicon\endcsname {\simpleiconsmaponetwo\symbol{105}} + \expandafter\def\csname simpleicon@vaulticon\endcsname {\simpleiconsmaponetwo\symbol{106}} + \expandafter\def\csname simpleicon@vaultwardenicon\endcsname {\simpleiconsmaponetwo\symbol{107}} + \expandafter\def\csname simpleicon@vauxhallicon\endcsname {\simpleiconsmaponetwo\symbol{108}} + \expandafter\def\csname simpleicon@vbulletinicon\endcsname {\simpleiconsmaponetwo\symbol{109}} + \expandafter\def\csname simpleicon@vectaryicon\endcsname {\simpleiconsmaponetwo\symbol{110}} + \expandafter\def\csname simpleicon@vectorlogozoneicon\endcsname {\simpleiconsmaponetwo\symbol{111}} + \expandafter\def\csname simpleicon@vectorworksicon\endcsname {\simpleiconsmaponetwo\symbol{112}} + \expandafter\def\csname simpleicon@veeamicon\endcsname {\simpleiconsmaponetwo\symbol{113}} + \expandafter\def\csname simpleicon@veedicon\endcsname {\simpleiconsmaponetwo\symbol{114}} + \expandafter\def\csname simpleicon@veepeeicon\endcsname {\simpleiconsmaponetwo\symbol{115}} + \expandafter\def\csname simpleicon@vegaicon\endcsname {\simpleiconsmaponetwo\symbol{116}} + \expandafter\def\csname simpleicon@vegasicon\endcsname {\simpleiconsmaponetwo\symbol{117}} + \expandafter\def\csname simpleicon@velogicon\endcsname {\simpleiconsmaponetwo\symbol{118}} + \expandafter\def\csname simpleicon@venmoicon\endcsname {\simpleiconsmaponetwo\symbol{119}} + \expandafter\def\csname simpleicon@vercelicon\endcsname {\simpleiconsmaponetwo\symbol{120}} + \expandafter\def\csname simpleicon@verdaccioicon\endcsname {\simpleiconsmaponetwo\symbol{121}} + \expandafter\def\csname simpleicon@veritasicon\endcsname {\simpleiconsmaponetwo\symbol{122}} + \expandafter\def\csname simpleicon@verizonicon\endcsname {\simpleiconsmaponetwo\symbol{123}} + \expandafter\def\csname simpleicon@vespaicon\endcsname {\simpleiconsmaponetwo\symbol{124}} + \expandafter\def\csname simpleicon@vexxhosticon\endcsname {\simpleiconsmaponetwo\symbol{125}} + \expandafter\def\csname simpleicon@vfairsicon\endcsname {\simpleiconsmaponetwo\symbol{126}} + \expandafter\def\csname simpleicon@viadeoicon\endcsname {\simpleiconsmaponetwo\symbol{127}} + \expandafter\def\csname simpleicon@viaplayicon\endcsname {\simpleiconsmaponetwo\symbol{128}} + \expandafter\def\csname simpleicon@vibericon\endcsname {\simpleiconsmaponetwo\symbol{129}} + \expandafter\def\csname simpleicon@vibloicon\endcsname {\simpleiconsmaponetwo\symbol{130}} + \expandafter\def\csname simpleicon@victoriametricsicon\endcsname {\simpleiconsmaponetwo\symbol{131}} + \expandafter\def\csname simpleicon@victronenergyicon\endcsname {\simpleiconsmaponetwo\symbol{132}} + \expandafter\def\csname simpleicon@vimicon\endcsname {\simpleiconsmaponetwo\symbol{133}} + \expandafter\def\csname simpleicon@vimeoicon\endcsname {\simpleiconsmaponetwo\symbol{134}} + \expandafter\def\csname simpleicon@vimeolivestreamicon\endcsname {\simpleiconsmaponetwo\symbol{135}} + \expandafter\def\csname simpleicon@virginicon\endcsname {\simpleiconsmaponetwo\symbol{136}} + \expandafter\def\csname simpleicon@virginatlanticicon\endcsname {\simpleiconsmaponetwo\symbol{137}} + \expandafter\def\csname simpleicon@virginmediaicon\endcsname {\simpleiconsmaponetwo\symbol{138}} + \expandafter\def\csname simpleicon@virtualboxicon\endcsname {\simpleiconsmaponetwo\symbol{139}} + \expandafter\def\csname simpleicon@virustotalicon\endcsname {\simpleiconsmaponetwo\symbol{140}} + \expandafter\def\csname simpleicon@visaicon\endcsname {\simpleiconsmaponetwo\symbol{141}} + \expandafter\def\csname simpleicon@visxicon\endcsname {\simpleiconsmaponetwo\symbol{142}} + \expandafter\def\csname simpleicon@viteicon\endcsname {\simpleiconsmaponetwo\symbol{143}} + \expandafter\def\csname simpleicon@vitepressicon\endcsname {\simpleiconsmaponetwo\symbol{144}} + \expandafter\def\csname simpleicon@vitessicon\endcsname {\simpleiconsmaponetwo\symbol{145}} + \expandafter\def\csname simpleicon@vitesticon\endcsname {\simpleiconsmaponetwo\symbol{146}} + \expandafter\def\csname simpleicon@vivaldiicon\endcsname {\simpleiconsmaponetwo\symbol{147}} + \expandafter\def\csname simpleicon@vivawalleticon\endcsname {\simpleiconsmaponetwo\symbol{148}} + \expandafter\def\csname simpleicon@vivinoicon\endcsname {\simpleiconsmaponetwo\symbol{149}} + \expandafter\def\csname simpleicon@vivinticon\endcsname {\simpleiconsmaponetwo\symbol{150}} + \expandafter\def\csname simpleicon@vivoicon\endcsname {\simpleiconsmaponetwo\symbol{151}} + \expandafter\def\csname simpleicon@vkicon\endcsname {\simpleiconsmaponetwo\symbol{152}} + \expandafter\def\csname simpleicon@vlcmediaplayericon\endcsname {\simpleiconsmaponetwo\symbol{153}} + \expandafter\def\csname simpleicon@vmwareicon\endcsname {\simpleiconsmaponetwo\symbol{154}} + \expandafter\def\csname simpleicon@vodafoneicon\endcsname {\simpleiconsmaponetwo\symbol{155}} + \expandafter\def\csname simpleicon@voidlinuxicon\endcsname {\simpleiconsmaponetwo\symbol{156}} + \expandafter\def\csname simpleicon@voipdotmsicon\endcsname {\simpleiconsmaponetwo\symbol{157}} + \expandafter\def\csname simpleicon@volkswagenicon\endcsname {\simpleiconsmaponetwo\symbol{158}} + \expandafter\def\csname simpleicon@volvoicon\endcsname {\simpleiconsmaponetwo\symbol{159}} + \expandafter\def\csname simpleicon@vonageicon\endcsname {\simpleiconsmaponetwo\symbol{160}} + \expandafter\def\csname simpleicon@vorondesignicon\endcsname {\simpleiconsmaponetwo\symbol{161}} + \expandafter\def\csname simpleicon@vowpalwabbiticon\endcsname {\simpleiconsmaponetwo\symbol{162}} + \expandafter\def\csname simpleicon@voxicon\endcsname {\simpleiconsmaponetwo\symbol{163}} + \expandafter\def\csname simpleicon@vscoicon\endcsname {\simpleiconsmaponetwo\symbol{164}} + \expandafter\def\csname simpleicon@vscodiumicon\endcsname {\simpleiconsmaponetwo\symbol{165}} + \expandafter\def\csname simpleicon@vtexicon\endcsname {\simpleiconsmaponetwo\symbol{166}} + \expandafter\def\csname simpleicon@vuedotjsicon\endcsname {\simpleiconsmaponetwo\symbol{167}} + \expandafter\def\csname simpleicon@vuetifyicon\endcsname {\simpleiconsmaponetwo\symbol{168}} + \expandafter\def\csname simpleicon@vulkanicon\endcsname {\simpleiconsmaponetwo\symbol{169}} + \expandafter\def\csname simpleicon@vultricon\endcsname {\simpleiconsmaponetwo\symbol{170}} + \expandafter\def\csname simpleicon@vyondicon\endcsname {\simpleiconsmaponetwo\symbol{171}} + \expandafter\def\csname simpleicon@w3schoolsicon\endcsname {\simpleiconsmaponetwo\symbol{172}} + \expandafter\def\csname simpleicon@wacomicon\endcsname {\simpleiconsmaponetwo\symbol{173}} + \expandafter\def\csname simpleicon@wagmiicon\endcsname {\simpleiconsmaponetwo\symbol{174}} + \expandafter\def\csname simpleicon@wagtailicon\endcsname {\simpleiconsmaponetwo\symbol{175}} + \expandafter\def\csname simpleicon@wailsicon\endcsname {\simpleiconsmaponetwo\symbol{176}} + \expandafter\def\csname simpleicon@wakatimeicon\endcsname {\simpleiconsmaponetwo\symbol{177}} + \expandafter\def\csname simpleicon@walkmanicon\endcsname {\simpleiconsmaponetwo\symbol{178}} + \expandafter\def\csname simpleicon@wallabagicon\endcsname {\simpleiconsmaponetwo\symbol{179}} + \expandafter\def\csname simpleicon@walletconnecticon\endcsname {\simpleiconsmaponetwo\symbol{180}} + \expandafter\def\csname simpleicon@walmarticon\endcsname {\simpleiconsmaponetwo\symbol{181}} + \expandafter\def\csname simpleicon@wantedlyicon\endcsname {\simpleiconsmaponetwo\symbol{182}} + \expandafter\def\csname simpleicon@wappalyzericon\endcsname {\simpleiconsmaponetwo\symbol{183}} + \expandafter\def\csname simpleicon@warnerbrosicon\endcsname {\simpleiconsmaponetwo\symbol{184}} + \expandafter\def\csname simpleicon@warpicon\endcsname {\simpleiconsmaponetwo\symbol{185}} + \expandafter\def\csname simpleicon@wasabiicon\endcsname {\simpleiconsmaponetwo\symbol{186}} + \expandafter\def\csname simpleicon@wasmcloudicon\endcsname {\simpleiconsmaponetwo\symbol{187}} + \expandafter\def\csname simpleicon@wasmericon\endcsname {\simpleiconsmaponetwo\symbol{188}} + \expandafter\def\csname simpleicon@watchtowericon\endcsname {\simpleiconsmaponetwo\symbol{189}} + \expandafter\def\csname simpleicon@wattpadicon\endcsname {\simpleiconsmaponetwo\symbol{190}} + \expandafter\def\csname simpleicon@waylandicon\endcsname {\simpleiconsmaponetwo\symbol{191}} + \expandafter\def\csname simpleicon@wazeicon\endcsname {\simpleiconsmaponetwo\symbol{192}} + \expandafter\def\csname simpleicon@wazirxicon\endcsname {\simpleiconsmaponetwo\symbol{193}} + \expandafter\def\csname simpleicon@wearosicon\endcsname {\simpleiconsmaponetwo\symbol{194}} + \expandafter\def\csname simpleicon@weasylicon\endcsname {\simpleiconsmaponetwo\symbol{195}} + \expandafter\def\csname simpleicon@web3dotjsicon\endcsname {\simpleiconsmaponetwo\symbol{196}} + \expandafter\def\csname simpleicon@webassemblyicon\endcsname {\simpleiconsmaponetwo\symbol{197}} + \expandafter\def\csname simpleicon@webauthnicon\endcsname {\simpleiconsmaponetwo\symbol{198}} + \expandafter\def\csname simpleicon@webcomponentsdotorgicon\endcsname {\simpleiconsmaponetwo\symbol{199}} + \expandafter\def\csname simpleicon@webdriverioicon\endcsname {\simpleiconsmaponetwo\symbol{200}} + \expandafter\def\csname simpleicon@webexicon\endcsname {\simpleiconsmaponetwo\symbol{201}} + \expandafter\def\csname simpleicon@webflowicon\endcsname {\simpleiconsmaponetwo\symbol{202}} + \expandafter\def\csname simpleicon@webglicon\endcsname {\simpleiconsmaponetwo\symbol{203}} + \expandafter\def\csname simpleicon@webgpuicon\endcsname {\simpleiconsmaponetwo\symbol{204}} + \expandafter\def\csname simpleicon@weblateicon\endcsname {\simpleiconsmaponetwo\symbol{205}} + \expandafter\def\csname simpleicon@webminicon\endcsname {\simpleiconsmaponetwo\symbol{206}} + \expandafter\def\csname simpleicon@webmoneyicon\endcsname {\simpleiconsmaponetwo\symbol{207}} + \expandafter\def\csname simpleicon@webpackicon\endcsname {\simpleiconsmaponetwo\symbol{208}} + \expandafter\def\csname simpleicon@webrtcicon\endcsname {\simpleiconsmaponetwo\symbol{209}} + \expandafter\def\csname simpleicon@webstormicon\endcsname {\simpleiconsmaponetwo\symbol{210}} + \expandafter\def\csname simpleicon@webtoonicon\endcsname {\simpleiconsmaponetwo\symbol{211}} + \expandafter\def\csname simpleicon@webtreesicon\endcsname {\simpleiconsmaponetwo\symbol{212}} + \expandafter\def\csname simpleicon@wechaticon\endcsname {\simpleiconsmaponetwo\symbol{213}} + \expandafter\def\csname simpleicon@wegameicon\endcsname {\simpleiconsmaponetwo\symbol{214}} + \expandafter\def\csname simpleicon@weightsandbiasesicon\endcsname {\simpleiconsmaponetwo\symbol{215}} + \expandafter\def\csname simpleicon@welcometothejungleicon\endcsname {\simpleiconsmaponetwo\symbol{216}} + \expandafter\def\csname simpleicon@wellfoundicon\endcsname {\simpleiconsmaponetwo\symbol{217}} + \expandafter\def\csname simpleicon@wellsfargoicon\endcsname {\simpleiconsmaponetwo\symbol{218}} + \expandafter\def\csname simpleicon@wemoicon\endcsname {\simpleiconsmaponetwo\symbol{219}} + \expandafter\def\csname simpleicon@westerndigitalicon\endcsname {\simpleiconsmaponetwo\symbol{220}} + \expandafter\def\csname simpleicon@westernunionicon\endcsname {\simpleiconsmaponetwo\symbol{221}} + \expandafter\def\csname simpleicon@wetransfericon\endcsname {\simpleiconsmaponetwo\symbol{222}} + \expandafter\def\csname simpleicon@weztermicon\endcsname {\simpleiconsmaponetwo\symbol{223}} + \expandafter\def\csname simpleicon@wgpuicon\endcsname {\simpleiconsmaponetwo\symbol{224}} + \expandafter\def\csname simpleicon@whatsappicon\endcsname {\simpleiconsmaponetwo\symbol{225}} + \expandafter\def\csname simpleicon@wheniworkicon\endcsname {\simpleiconsmaponetwo\symbol{226}} + \expandafter\def\csname simpleicon@wiiicon\endcsname {\simpleiconsmaponetwo\symbol{227}} + \expandafter\def\csname simpleicon@wiiuicon\endcsname {\simpleiconsmaponetwo\symbol{228}} + \expandafter\def\csname simpleicon@wikidataicon\endcsname {\simpleiconsmaponetwo\symbol{229}} + \expandafter\def\csname simpleicon@wikidotggicon\endcsname {\simpleiconsmaponetwo\symbol{230}} + \expandafter\def\csname simpleicon@wikidotjsicon\endcsname {\simpleiconsmaponetwo\symbol{231}} + \expandafter\def\csname simpleicon@wikimediacommonsicon\endcsname {\simpleiconsmaponetwo\symbol{232}} + \expandafter\def\csname simpleicon@wikimediafoundationicon\endcsname {\simpleiconsmaponetwo\symbol{233}} + \expandafter\def\csname simpleicon@wikipediaicon\endcsname {\simpleiconsmaponetwo\symbol{234}} + \expandafter\def\csname simpleicon@wikiquoteicon\endcsname {\simpleiconsmaponetwo\symbol{235}} + \expandafter\def\csname simpleicon@wikivoyageicon\endcsname {\simpleiconsmaponetwo\symbol{236}} + \expandafter\def\csname simpleicon@winampicon\endcsname {\simpleiconsmaponetwo\symbol{237}} + \expandafter\def\csname simpleicon@wiproicon\endcsname {\simpleiconsmaponetwo\symbol{238}} + \expandafter\def\csname simpleicon@wireicon\endcsname {\simpleiconsmaponetwo\symbol{239}} + \expandafter\def\csname simpleicon@wireguardicon\endcsname {\simpleiconsmaponetwo\symbol{240}} + \expandafter\def\csname simpleicon@wiresharkicon\endcsname {\simpleiconsmaponetwo\symbol{241}} + \expandafter\def\csname simpleicon@wiseicon\endcsname {\simpleiconsmaponetwo\symbol{242}} + \expandafter\def\csname simpleicon@wishicon\endcsname {\simpleiconsmaponetwo\symbol{243}} + \expandafter\def\csname simpleicon@wistiaicon\endcsname {\simpleiconsmaponetwo\symbol{244}} + \expandafter\def\csname simpleicon@wixicon\endcsname {\simpleiconsmaponetwo\symbol{245}} + \expandafter\def\csname simpleicon@wizzairicon\endcsname {\simpleiconsmaponetwo\symbol{246}} + \expandafter\def\csname simpleicon@wolframicon\endcsname {\simpleiconsmaponetwo\symbol{247}} + \expandafter\def\csname simpleicon@wolframlanguageicon\endcsname {\simpleiconsmaponetwo\symbol{248}} + \expandafter\def\csname simpleicon@wolframmathematicaicon\endcsname {\simpleiconsmaponetwo\symbol{249}} + \expandafter\def\csname simpleicon@wondershareicon\endcsname {\simpleiconsmaponetwo\symbol{250}} + \expandafter\def\csname simpleicon@wondersharefilmoraicon\endcsname {\simpleiconsmaponetwo\symbol{251}} + \expandafter\def\csname simpleicon@wooicon\endcsname {\simpleiconsmaponetwo\symbol{252}} + \expandafter\def\csname simpleicon@woocommerceicon\endcsname {\simpleiconsmaponetwo\symbol{253}} + \expandafter\def\csname simpleicon@wordpressicon\endcsname {\simpleiconsmaponetwo\symbol{254}} + \expandafter\def\csname simpleicon@workplaceicon\endcsname {\simpleiconsmaponetwo\symbol{255}} + \expandafter\def\csname simpleicon@worldhealthorganizationicon\endcsname {\simpleiconsmaponethree\symbol{0}} + \expandafter\def\csname simpleicon@wpengineicon\endcsname {\simpleiconsmaponethree\symbol{1}} + \expandafter\def\csname simpleicon@wpexplorericon\endcsname {\simpleiconsmaponethree\symbol{2}} + \expandafter\def\csname simpleicon@wprocketicon\endcsname {\simpleiconsmaponethree\symbol{3}} + \expandafter\def\csname simpleicon@writedotasicon\endcsname {\simpleiconsmaponethree\symbol{4}} + \expandafter\def\csname simpleicon@wweicon\endcsname {\simpleiconsmaponethree\symbol{5}} + \expandafter\def\csname simpleicon@wwiseicon\endcsname {\simpleiconsmaponethree\symbol{6}} + \expandafter\def\csname simpleicon@wykopicon\endcsname {\simpleiconsmaponethree\symbol{7}} + \expandafter\def\csname simpleicon@wyzeicon\endcsname {\simpleiconsmaponethree\symbol{8}} + \expandafter\def\csname simpleicon@xicon\endcsname {\simpleiconsmaponethree\symbol{9}} + \expandafter\def\csname simpleicon@xamppicon\endcsname {\simpleiconsmaponethree\symbol{10}} + \expandafter\def\csname simpleicon@xcodeicon\endcsname {\simpleiconsmaponethree\symbol{11}} + \expandafter\def\csname simpleicon@xdadevelopersicon\endcsname {\simpleiconsmaponethree\symbol{12}} + \expandafter\def\csname simpleicon@xdotorgicon\endcsname {\simpleiconsmaponethree\symbol{13}} + \expandafter\def\csname simpleicon@xenditicon\endcsname {\simpleiconsmaponethree\symbol{14}} + \expandafter\def\csname simpleicon@xeroicon\endcsname {\simpleiconsmaponethree\symbol{15}} + \expandafter\def\csname simpleicon@xfceicon\endcsname {\simpleiconsmaponethree\symbol{16}} + \expandafter\def\csname simpleicon@xiaohongshuicon\endcsname {\simpleiconsmaponethree\symbol{17}} + \expandafter\def\csname simpleicon@xiaomiicon\endcsname {\simpleiconsmaponethree\symbol{18}} + \expandafter\def\csname simpleicon@xingicon\endcsname {\simpleiconsmaponethree\symbol{19}} + \expandafter\def\csname simpleicon@xmppicon\endcsname {\simpleiconsmaponethree\symbol{20}} + \expandafter\def\csname simpleicon@xoicon\endcsname {\simpleiconsmaponethree\symbol{21}} + \expandafter\def\csname simpleicon@xrpicon\endcsname {\simpleiconsmaponethree\symbol{22}} + \expandafter\def\csname simpleicon@xspliticon\endcsname {\simpleiconsmaponethree\symbol{23}} + \expandafter\def\csname simpleicon@xstateicon\endcsname {\simpleiconsmaponethree\symbol{24}} + \expandafter\def\csname simpleicon@yabaiicon\endcsname {\simpleiconsmaponethree\symbol{25}} + \expandafter\def\csname simpleicon@yaleicon\endcsname {\simpleiconsmaponethree\symbol{26}} + \expandafter\def\csname simpleicon@yamahacorporationicon\endcsname {\simpleiconsmaponethree\symbol{27}} + \expandafter\def\csname simpleicon@yamahamotorcorporationicon\endcsname {\simpleiconsmaponethree\symbol{28}} + \expandafter\def\csname simpleicon@yamlicon\endcsname {\simpleiconsmaponethree\symbol{29}} + \expandafter\def\csname simpleicon@yandexcloudicon\endcsname {\simpleiconsmaponethree\symbol{30}} + \expandafter\def\csname simpleicon@yarnicon\endcsname {\simpleiconsmaponethree\symbol{31}} + \expandafter\def\csname simpleicon@ycombinatoricon\endcsname {\simpleiconsmaponethree\symbol{32}} + \expandafter\def\csname simpleicon@yelpicon\endcsname {\simpleiconsmaponethree\symbol{33}} + \expandafter\def\csname simpleicon@yetiicon\endcsname {\simpleiconsmaponethree\symbol{34}} + \expandafter\def\csname simpleicon@yiiicon\endcsname {\simpleiconsmaponethree\symbol{35}} + \expandafter\def\csname simpleicon@yoasticon\endcsname {\simpleiconsmaponethree\symbol{36}} + \expandafter\def\csname simpleicon@youtubeicon\endcsname {\simpleiconsmaponethree\symbol{37}} + \expandafter\def\csname simpleicon@youtubegamingicon\endcsname {\simpleiconsmaponethree\symbol{38}} + \expandafter\def\csname simpleicon@youtubekidsicon\endcsname {\simpleiconsmaponethree\symbol{39}} + \expandafter\def\csname simpleicon@youtubemusicicon\endcsname {\simpleiconsmaponethree\symbol{40}} + \expandafter\def\csname simpleicon@youtubeshortsicon\endcsname {\simpleiconsmaponethree\symbol{41}} + \expandafter\def\csname simpleicon@youtubestudioicon\endcsname {\simpleiconsmaponethree\symbol{42}} + \expandafter\def\csname simpleicon@youtubetvicon\endcsname {\simpleiconsmaponethree\symbol{43}} + \expandafter\def\csname simpleicon@yricon\endcsname {\simpleiconsmaponethree\symbol{44}} + \expandafter\def\csname simpleicon@yubicoicon\endcsname {\simpleiconsmaponethree\symbol{45}} + \expandafter\def\csname simpleicon@yunohosticon\endcsname {\simpleiconsmaponethree\symbol{46}} + \expandafter\def\csname simpleicon@zabkaicon\endcsname {\simpleiconsmaponethree\symbol{47}} + \expandafter\def\csname simpleicon@zaimicon\endcsname {\simpleiconsmaponethree\symbol{48}} + \expandafter\def\csname simpleicon@zalandoicon\endcsname {\simpleiconsmaponethree\symbol{49}} + \expandafter\def\csname simpleicon@zaloicon\endcsname {\simpleiconsmaponethree\symbol{50}} + \expandafter\def\csname simpleicon@zapicon\endcsname {\simpleiconsmaponethree\symbol{51}} + \expandafter\def\csname simpleicon@zapiericon\endcsname {\simpleiconsmaponethree\symbol{52}} + \expandafter\def\csname simpleicon@zaraicon\endcsname {\simpleiconsmaponethree\symbol{53}} + \expandafter\def\csname simpleicon@zazzleicon\endcsname {\simpleiconsmaponethree\symbol{54}} + \expandafter\def\csname simpleicon@zcashicon\endcsname {\simpleiconsmaponethree\symbol{55}} + \expandafter\def\csname simpleicon@zcoolicon\endcsname {\simpleiconsmaponethree\symbol{56}} + \expandafter\def\csname simpleicon@zdficon\endcsname {\simpleiconsmaponethree\symbol{57}} + \expandafter\def\csname simpleicon@zebpayicon\endcsname {\simpleiconsmaponethree\symbol{58}} + \expandafter\def\csname simpleicon@zebratechnologiesicon\endcsname {\simpleiconsmaponethree\symbol{59}} + \expandafter\def\csname simpleicon@zedindustriesicon\endcsname {\simpleiconsmaponethree\symbol{60}} + \expandafter\def\csname simpleicon@zelleicon\endcsname {\simpleiconsmaponethree\symbol{61}} + \expandafter\def\csname simpleicon@zendicon\endcsname {\simpleiconsmaponethree\symbol{62}} + \expandafter\def\csname simpleicon@zendeskicon\endcsname {\simpleiconsmaponethree\symbol{63}} + \expandafter\def\csname simpleicon@zennicon\endcsname {\simpleiconsmaponethree\symbol{64}} + \expandafter\def\csname simpleicon@zenodoicon\endcsname {\simpleiconsmaponethree\symbol{65}} + \expandafter\def\csname simpleicon@zensaricon\endcsname {\simpleiconsmaponethree\symbol{66}} + \expandafter\def\csname simpleicon@zerodhaicon\endcsname {\simpleiconsmaponethree\symbol{67}} + \expandafter\def\csname simpleicon@zerotiericon\endcsname {\simpleiconsmaponethree\symbol{68}} + \expandafter\def\csname simpleicon@zerplyicon\endcsname {\simpleiconsmaponethree\symbol{69}} + \expandafter\def\csname simpleicon@zettlricon\endcsname {\simpleiconsmaponethree\symbol{70}} + \expandafter\def\csname simpleicon@zhihuicon\endcsname {\simpleiconsmaponethree\symbol{71}} + \expandafter\def\csname simpleicon@zigicon\endcsname {\simpleiconsmaponethree\symbol{72}} + \expandafter\def\csname simpleicon@zigbeeicon\endcsname {\simpleiconsmaponethree\symbol{73}} + \expandafter\def\csname simpleicon@zigbee2mqtticon\endcsname {\simpleiconsmaponethree\symbol{74}} + \expandafter\def\csname simpleicon@ziggoicon\endcsname {\simpleiconsmaponethree\symbol{75}} + \expandafter\def\csname simpleicon@zilchicon\endcsname {\simpleiconsmaponethree\symbol{76}} + \expandafter\def\csname simpleicon@zillowicon\endcsname {\simpleiconsmaponethree\symbol{77}} + \expandafter\def\csname simpleicon@zincsearchicon\endcsname {\simpleiconsmaponethree\symbol{78}} + \expandafter\def\csname simpleicon@zingaticon\endcsname {\simpleiconsmaponethree\symbol{79}} + \expandafter\def\csname simpleicon@zodicon\endcsname {\simpleiconsmaponethree\symbol{80}} + \expandafter\def\csname simpleicon@zohoicon\endcsname {\simpleiconsmaponethree\symbol{81}} + \expandafter\def\csname simpleicon@zoipericon\endcsname {\simpleiconsmaponethree\symbol{82}} + \expandafter\def\csname simpleicon@zomatoicon\endcsname {\simpleiconsmaponethree\symbol{83}} + \expandafter\def\csname simpleicon@zoomicon\endcsname {\simpleiconsmaponethree\symbol{84}} + \expandafter\def\csname simpleicon@zorinicon\endcsname {\simpleiconsmaponethree\symbol{85}} + \expandafter\def\csname simpleicon@zoteroicon\endcsname {\simpleiconsmaponethree\symbol{86}} + \expandafter\def\csname simpleicon@zshicon\endcsname {\simpleiconsmaponethree\symbol{87}} + \expandafter\def\csname simpleicon@zulipicon\endcsname {\simpleiconsmaponethree\symbol{88}} + \expandafter\def\csname simpleicon@zyteicon\endcsname {\simpleiconsmaponethree\symbol{89}}
\ 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 7ff9b4ef295..947e9507945 100644 --- a/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-xeluatex.tex +++ b/Master/texmf-dist/tex/latex/simpleicons/simpleiconsglyphs-xeluatex.tex @@ -1076,2079 +1076,2088 @@ \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@gmailicon\endcsname {\simpleiconsmap\symbol{"EE36}} - \expandafter\def\csname simpleicon@gnomeicon\endcsname {\simpleiconsmap\symbol{"EE37}} - \expandafter\def\csname simpleicon@gnometerminalicon\endcsname {\simpleiconsmap\symbol{"EE38}} - \expandafter\def\csname simpleicon@gnuicon\endcsname {\simpleiconsmap\symbol{"EE39}} - \expandafter\def\csname simpleicon@gnubashicon\endcsname {\simpleiconsmap\symbol{"EE3A}} - \expandafter\def\csname simpleicon@gnuemacsicon\endcsname {\simpleiconsmap\symbol{"EE3B}} - \expandafter\def\csname simpleicon@gnuicecaticon\endcsname {\simpleiconsmap\symbol{"EE3C}} - \expandafter\def\csname simpleicon@gnuprivacyguardicon\endcsname {\simpleiconsmap\symbol{"EE3D}} - \expandafter\def\csname simpleicon@gnusocialicon\endcsname {\simpleiconsmap\symbol{"EE3E}} - \expandafter\def\csname simpleicon@goicon\endcsname {\simpleiconsmap\symbol{"EE3F}} - \expandafter\def\csname simpleicon@gocdicon\endcsname {\simpleiconsmap\symbol{"EE40}} - \expandafter\def\csname simpleicon@godaddyicon\endcsname {\simpleiconsmap\symbol{"EE41}} - \expandafter\def\csname simpleicon@godotengineicon\endcsname {\simpleiconsmap\symbol{"EE42}} - \expandafter\def\csname simpleicon@gofundmeicon\endcsname {\simpleiconsmap\symbol{"EE43}} - \expandafter\def\csname simpleicon@gogdotcomicon\endcsname {\simpleiconsmap\symbol{"EE44}} - \expandafter\def\csname simpleicon@gojekicon\endcsname {\simpleiconsmap\symbol{"EE45}} - \expandafter\def\csname simpleicon@golandicon\endcsname {\simpleiconsmap\symbol{"EE46}} - \expandafter\def\csname simpleicon@goldenlineicon\endcsname {\simpleiconsmap\symbol{"EE47}} - \expandafter\def\csname simpleicon@goldmansachsicon\endcsname {\simpleiconsmap\symbol{"EE48}} - \expandafter\def\csname simpleicon@goodreadsicon\endcsname {\simpleiconsmap\symbol{"EE49}} - \expandafter\def\csname simpleicon@googleicon\endcsname {\simpleiconsmap\symbol{"EE4A}} - \expandafter\def\csname simpleicon@googleadmobicon\endcsname {\simpleiconsmap\symbol{"EE4B}} - \expandafter\def\csname simpleicon@googleadsicon\endcsname {\simpleiconsmap\symbol{"EE4C}} - \expandafter\def\csname simpleicon@googleadsenseicon\endcsname {\simpleiconsmap\symbol{"EE4D}} - \expandafter\def\csname simpleicon@googleanalyticsicon\endcsname {\simpleiconsmap\symbol{"EE4E}} - \expandafter\def\csname simpleicon@googleappsscripticon\endcsname {\simpleiconsmap\symbol{"EE4F}} - \expandafter\def\csname simpleicon@googleassistanticon\endcsname {\simpleiconsmap\symbol{"EE50}} - \expandafter\def\csname simpleicon@googleauthenticatoricon\endcsname {\simpleiconsmap\symbol{"EE51}} - \expandafter\def\csname simpleicon@googlebigqueryicon\endcsname {\simpleiconsmap\symbol{"EE52}} - \expandafter\def\csname simpleicon@googlebigtableicon\endcsname {\simpleiconsmap\symbol{"EE53}} - \expandafter\def\csname simpleicon@googlecalendaricon\endcsname {\simpleiconsmap\symbol{"EE54}} - \expandafter\def\csname simpleicon@googlecampaignmanager360icon\endcsname {\simpleiconsmap\symbol{"EE55}} - \expandafter\def\csname simpleicon@googlecardboardicon\endcsname {\simpleiconsmap\symbol{"EE56}} - \expandafter\def\csname simpleicon@googlechaticon\endcsname {\simpleiconsmap\symbol{"EE57}} - \expandafter\def\csname simpleicon@googlechromeicon\endcsname {\simpleiconsmap\symbol{"EE58}} - \expandafter\def\csname simpleicon@googlechronicleicon\endcsname {\simpleiconsmap\symbol{"EE59}} - \expandafter\def\csname simpleicon@googleclassroomicon\endcsname {\simpleiconsmap\symbol{"EE5A}} - \expandafter\def\csname simpleicon@googlecloudicon\endcsname {\simpleiconsmap\symbol{"EE5B}} - \expandafter\def\csname simpleicon@googlecloudcomposericon\endcsname {\simpleiconsmap\symbol{"EE5C}} - \expandafter\def\csname simpleicon@googlecloudspannericon\endcsname {\simpleiconsmap\symbol{"EE5D}} - \expandafter\def\csname simpleicon@googlecloudstorageicon\endcsname {\simpleiconsmap\symbol{"EE5E}} - \expandafter\def\csname simpleicon@googlecolabicon\endcsname {\simpleiconsmap\symbol{"EE5F}} - \expandafter\def\csname simpleicon@googlecontaineroptimizedosicon\endcsname {\simpleiconsmap\symbol{"EE60}} - \expandafter\def\csname simpleicon@googledataflowicon\endcsname {\simpleiconsmap\symbol{"EE61}} - \expandafter\def\csname simpleicon@googledataprocicon\endcsname {\simpleiconsmap\symbol{"EE62}} - \expandafter\def\csname simpleicon@googledatastudioicon\endcsname {\simpleiconsmap\symbol{"EE63}} - \expandafter\def\csname simpleicon@googledisplayandvideo360icon\endcsname {\simpleiconsmap\symbol{"EE64}} - \expandafter\def\csname simpleicon@googledocsicon\endcsname {\simpleiconsmap\symbol{"EE65}} - \expandafter\def\csname simpleicon@googledriveicon\endcsname {\simpleiconsmap\symbol{"EE66}} - \expandafter\def\csname simpleicon@googleearthicon\endcsname {\simpleiconsmap\symbol{"EE67}} - \expandafter\def\csname simpleicon@googleearthengineicon\endcsname {\simpleiconsmap\symbol{"EE68}} - \expandafter\def\csname simpleicon@googlefiticon\endcsname {\simpleiconsmap\symbol{"EE69}} - \expandafter\def\csname simpleicon@googlefontsicon\endcsname {\simpleiconsmap\symbol{"EE6A}} - \expandafter\def\csname simpleicon@googleformsicon\endcsname {\simpleiconsmap\symbol{"EE6B}} - \expandafter\def\csname simpleicon@googlegeminiicon\endcsname {\simpleiconsmap\symbol{"EE6C}} - \expandafter\def\csname simpleicon@googlehomeicon\endcsname {\simpleiconsmap\symbol{"EE6D}} - \expandafter\def\csname simpleicon@googlekeepicon\endcsname {\simpleiconsmap\symbol{"EE6E}} - \expandafter\def\csname simpleicon@googlelensicon\endcsname {\simpleiconsmap\symbol{"EE6F}} - \expandafter\def\csname simpleicon@googlemapsicon\endcsname {\simpleiconsmap\symbol{"EE70}} - \expandafter\def\csname simpleicon@googlemarketingplatformicon\endcsname {\simpleiconsmap\symbol{"EE71}} - \expandafter\def\csname simpleicon@googlemeeticon\endcsname {\simpleiconsmap\symbol{"EE72}} - \expandafter\def\csname simpleicon@googlemessagesicon\endcsname {\simpleiconsmap\symbol{"EE73}} - \expandafter\def\csname simpleicon@googlenearbyicon\endcsname {\simpleiconsmap\symbol{"EE74}} - \expandafter\def\csname simpleicon@googlenewsicon\endcsname {\simpleiconsmap\symbol{"EE75}} - \expandafter\def\csname simpleicon@googlepayicon\endcsname {\simpleiconsmap\symbol{"EE76}} - \expandafter\def\csname simpleicon@googlephotosicon\endcsname {\simpleiconsmap\symbol{"EE77}} - \expandafter\def\csname simpleicon@googleplayicon\endcsname {\simpleiconsmap\symbol{"EE78}} - \expandafter\def\csname simpleicon@googlepubsubicon\endcsname {\simpleiconsmap\symbol{"EE79}} - \expandafter\def\csname simpleicon@googlescholaricon\endcsname {\simpleiconsmap\symbol{"EE7A}} - \expandafter\def\csname simpleicon@googlesearchconsoleicon\endcsname {\simpleiconsmap\symbol{"EE7B}} - \expandafter\def\csname simpleicon@googlesheetsicon\endcsname {\simpleiconsmap\symbol{"EE7C}} - \expandafter\def\csname simpleicon@googleslidesicon\endcsname {\simpleiconsmap\symbol{"EE7D}} - \expandafter\def\csname simpleicon@googlestreetviewicon\endcsname {\simpleiconsmap\symbol{"EE7E}} - \expandafter\def\csname simpleicon@googletagmanagericon\endcsname {\simpleiconsmap\symbol{"EE7F}} - \expandafter\def\csname simpleicon@googletasksicon\endcsname {\simpleiconsmap\symbol{"EE80}} - \expandafter\def\csname simpleicon@googletranslateicon\endcsname {\simpleiconsmap\symbol{"EE81}} - \expandafter\def\csname simpleicon@gotomeetingicon\endcsname {\simpleiconsmap\symbol{"EE82}} - \expandafter\def\csname simpleicon@grabicon\endcsname {\simpleiconsmap\symbol{"EE83}} - \expandafter\def\csname simpleicon@gradleicon\endcsname {\simpleiconsmap\symbol{"EE84}} - \expandafter\def\csname simpleicon@gradleplaypublishericon\endcsname {\simpleiconsmap\symbol{"EE85}} - \expandafter\def\csname simpleicon@grafanaicon\endcsname {\simpleiconsmap\symbol{"EE86}} - \expandafter\def\csname simpleicon@grammarlyicon\endcsname {\simpleiconsmap\symbol{"EE87}} - \expandafter\def\csname simpleicon@grandfraisicon\endcsname {\simpleiconsmap\symbol{"EE88}} - \expandafter\def\csname simpleicon@grapheneosicon\endcsname {\simpleiconsmap\symbol{"EE89}} - \expandafter\def\csname simpleicon@graphiteicon\endcsname {\simpleiconsmap\symbol{"EE8A}} - \expandafter\def\csname simpleicon@graphqlicon\endcsname {\simpleiconsmap\symbol{"EE8B}} - \expandafter\def\csname simpleicon@gravicon\endcsname {\simpleiconsmap\symbol{"EE8C}} - \expandafter\def\csname simpleicon@gravataricon\endcsname {\simpleiconsmap\symbol{"EE8D}} - \expandafter\def\csname simpleicon@graylogicon\endcsname {\simpleiconsmap\symbol{"EE8E}} - \expandafter\def\csname simpleicon@greasyforkicon\endcsname {\simpleiconsmap\symbol{"EE8F}} - \expandafter\def\csname simpleicon@greatlearningicon\endcsname {\simpleiconsmap\symbol{"EE90}} - \expandafter\def\csname simpleicon@greenhouseicon\endcsname {\simpleiconsmap\symbol{"EE91}} - \expandafter\def\csname simpleicon@greensockicon\endcsname {\simpleiconsmap\symbol{"EE92}} - \expandafter\def\csname simpleicon@griddotaiicon\endcsname {\simpleiconsmap\symbol{"EE93}} - \expandafter\def\csname simpleicon@gridsomeicon\endcsname {\simpleiconsmap\symbol{"EE94}} - \expandafter\def\csname simpleicon@groupmeicon\endcsname {\simpleiconsmap\symbol{"EE95}} - \expandafter\def\csname simpleicon@grouponicon\endcsname {\simpleiconsmap\symbol{"EE96}} - \expandafter\def\csname simpleicon@grubhubicon\endcsname {\simpleiconsmap\symbol{"EE97}} - \expandafter\def\csname simpleicon@grunticon\endcsname {\simpleiconsmap\symbol{"EE98}} - \expandafter\def\csname simpleicon@gskicon\endcsname {\simpleiconsmap\symbol{"EE99}} - \expandafter\def\csname simpleicon@gsmarenadotcomicon\endcsname {\simpleiconsmap\symbol{"EE9A}} - \expandafter\def\csname simpleicon@gstreamericon\endcsname {\simpleiconsmap\symbol{"EE9B}} - \expandafter\def\csname simpleicon@gtkicon\endcsname {\simpleiconsmap\symbol{"EE9C}} - \expandafter\def\csname simpleicon@guangzhoumetroicon\endcsname {\simpleiconsmap\symbol{"EE9D}} - \expandafter\def\csname simpleicon@guildedicon\endcsname {\simpleiconsmap\symbol{"EE9E}} - \expandafter\def\csname simpleicon@gulpicon\endcsname {\simpleiconsmap\symbol{"EE9F}} - \expandafter\def\csname simpleicon@gumroadicon\endcsname {\simpleiconsmap\symbol{"EEA0}} - \expandafter\def\csname simpleicon@gumtreeicon\endcsname {\simpleiconsmap\symbol{"EEA1}} - \expandafter\def\csname simpleicon@gunicornicon\endcsname {\simpleiconsmap\symbol{"EEA2}} - \expandafter\def\csname simpleicon@gurobiicon\endcsname {\simpleiconsmap\symbol{"EEA3}} - \expandafter\def\csname simpleicon@gustoicon\endcsname {\simpleiconsmap\symbol{"EEA4}} - \expandafter\def\csname simpleicon@gutenbergicon\endcsname {\simpleiconsmap\symbol{"EEA5}} - \expandafter\def\csname simpleicon@h3icon\endcsname {\simpleiconsmap\symbol{"EEA6}} - \expandafter\def\csname simpleicon@habricon\endcsname {\simpleiconsmap\symbol{"EEA7}} - \expandafter\def\csname simpleicon@hackadayicon\endcsname {\simpleiconsmap\symbol{"EEA8}} - \expandafter\def\csname simpleicon@hackclubicon\endcsname {\simpleiconsmap\symbol{"EEA9}} - \expandafter\def\csname simpleicon@hackerearthicon\endcsname {\simpleiconsmap\symbol{"EEAA}} - \expandafter\def\csname simpleicon@hackernoonicon\endcsname {\simpleiconsmap\symbol{"EEAB}} - \expandafter\def\csname simpleicon@hackeroneicon\endcsname {\simpleiconsmap\symbol{"EEAC}} - \expandafter\def\csname simpleicon@hackerrankicon\endcsname {\simpleiconsmap\symbol{"EEAD}} - \expandafter\def\csname simpleicon@hackstericon\endcsname {\simpleiconsmap\symbol{"EEAE}} - \expandafter\def\csname simpleicon@hacktheboxicon\endcsname {\simpleiconsmap\symbol{"EEAF}} - \expandafter\def\csname simpleicon@halicon\endcsname {\simpleiconsmap\symbol{"EEB0}} - \expandafter\def\csname simpleicon@handlebarsdotjsicon\endcsname {\simpleiconsmap\symbol{"EEB1}} - \expandafter\def\csname simpleicon@handmicon\endcsname {\simpleiconsmap\symbol{"EEB2}} - \expandafter\def\csname simpleicon@handshakeicon\endcsname {\simpleiconsmap\symbol{"EEB3}} - \expandafter\def\csname simpleicon@handshakeprotocolicon\endcsname {\simpleiconsmap\symbol{"EEB4}} - \expandafter\def\csname simpleicon@happycowicon\endcsname {\simpleiconsmap\symbol{"EEB5}} - \expandafter\def\csname simpleicon@harboricon\endcsname {\simpleiconsmap\symbol{"EEB6}} - \expandafter\def\csname simpleicon@harmonyosicon\endcsname {\simpleiconsmap\symbol{"EEB7}} - \expandafter\def\csname simpleicon@hashicorpicon\endcsname {\simpleiconsmap\symbol{"EEB8}} - \expandafter\def\csname simpleicon@hashnodeicon\endcsname {\simpleiconsmap\symbol{"EEB9}} - \expandafter\def\csname simpleicon@haskellicon\endcsname {\simpleiconsmap\symbol{"EEBA}} - \expandafter\def\csname simpleicon@hasuraicon\endcsname {\simpleiconsmap\symbol{"EEBB}} - \expandafter\def\csname simpleicon@hatenabookmarkicon\endcsname {\simpleiconsmap\symbol{"EEBC}} - \expandafter\def\csname simpleicon@haveibeenpwnedicon\endcsname {\simpleiconsmap\symbol{"EEBD}} - \expandafter\def\csname simpleicon@haxeicon\endcsname {\simpleiconsmap\symbol{"EEBE}} - \expandafter\def\csname simpleicon@hboicon\endcsname {\simpleiconsmap\symbol{"EEBF}} - \expandafter\def\csname simpleicon@hclicon\endcsname {\simpleiconsmap\symbol{"EEC0}} - \expandafter\def\csname simpleicon@hdfcbankicon\endcsname {\simpleiconsmap\symbol{"EEC1}} - \expandafter\def\csname simpleicon@headlessuiicon\endcsname {\simpleiconsmap\symbol{"EEC2}} - \expandafter\def\csname simpleicon@headphonezoneicon\endcsname {\simpleiconsmap\symbol{"EEC3}} - \expandafter\def\csname simpleicon@headspaceicon\endcsname {\simpleiconsmap\symbol{"EEC4}} - \expandafter\def\csname simpleicon@hearthicon\endcsname {\simpleiconsmap\symbol{"EEC5}} - \expandafter\def\csname simpleicon@hearthisdotaticon\endcsname {\simpleiconsmap\symbol{"EEC6}} - \expandafter\def\csname simpleicon@hederaicon\endcsname {\simpleiconsmap\symbol{"EEC7}} - \expandafter\def\csname simpleicon@heliumicon\endcsname {\simpleiconsmap\symbol{"EEC8}} - \expandafter\def\csname simpleicon@hellofreshicon\endcsname {\simpleiconsmap\symbol{"EEC9}} - \expandafter\def\csname simpleicon@hellyhansenicon\endcsname {\simpleiconsmap\symbol{"EECA}} - \expandafter\def\csname simpleicon@helmicon\endcsname {\simpleiconsmap\symbol{"EECB}} - \expandafter\def\csname simpleicon@helpdeskicon\endcsname {\simpleiconsmap\symbol{"EECC}} - \expandafter\def\csname simpleicon@helpscouticon\endcsname {\simpleiconsmap\symbol{"EECD}} - \expandafter\def\csname simpleicon@hepsiemlakicon\endcsname {\simpleiconsmap\symbol{"EECE}} - \expandafter\def\csname simpleicon@hereicon\endcsname {\simpleiconsmap\symbol{"EECF}} - \expandafter\def\csname simpleicon@herokuicon\endcsname {\simpleiconsmap\symbol{"EED0}} - \expandafter\def\csname simpleicon@hetznericon\endcsname {\simpleiconsmap\symbol{"EED1}} - \expandafter\def\csname simpleicon@hevyicon\endcsname {\simpleiconsmap\symbol{"EED2}} - \expandafter\def\csname simpleicon@hexleticon\endcsname {\simpleiconsmap\symbol{"EED3}} - \expandafter\def\csname simpleicon@hexoicon\endcsname {\simpleiconsmap\symbol{"EED4}} - \expandafter\def\csname simpleicon@heyicon\endcsname {\simpleiconsmap\symbol{"EED5}} - \expandafter\def\csname simpleicon@hibernateicon\endcsname {\simpleiconsmap\symbol{"EED6}} - \expandafter\def\csname simpleicon@hibobicon\endcsname {\simpleiconsmap\symbol{"EED7}} - \expandafter\def\csname simpleicon@hiltonicon\endcsname {\simpleiconsmap\symbol{"EED8}} - \expandafter\def\csname simpleicon@hiltonhotelsandresortsicon\endcsname {\simpleiconsmap\symbol{"EED9}} - \expandafter\def\csname simpleicon@hitachiicon\endcsname {\simpleiconsmap\symbol{"EEDA}} - \expandafter\def\csname simpleicon@hiveicon\endcsname {\simpleiconsmap\symbol{"EEDB}} - \expandafter\def\csname simpleicon@hiveblockchainicon\endcsname {\simpleiconsmap\symbol{"EEDC}} - \expandafter\def\csname simpleicon@hivemqicon\endcsname {\simpleiconsmap\symbol{"EEDD}} - \expandafter\def\csname simpleicon@homarricon\endcsname {\simpleiconsmap\symbol{"EEDE}} - \expandafter\def\csname simpleicon@homeadvisoricon\endcsname {\simpleiconsmap\symbol{"EEDF}} - \expandafter\def\csname simpleicon@homeassistanticon\endcsname {\simpleiconsmap\symbol{"EEE0}} - \expandafter\def\csname simpleicon@homeassistantcommunitystoreicon\endcsname {\simpleiconsmap\symbol{"EEE1}} - \expandafter\def\csname simpleicon@homebrewicon\endcsname {\simpleiconsmap\symbol{"EEE2}} - \expandafter\def\csname simpleicon@homebridgeicon\endcsname {\simpleiconsmap\symbol{"EEE3}} - \expandafter\def\csname simpleicon@homepageicon\endcsname {\simpleiconsmap\symbol{"EEE4}} - \expandafter\def\csname simpleicon@homifyicon\endcsname {\simpleiconsmap\symbol{"EEE5}} - \expandafter\def\csname simpleicon@hondaicon\endcsname {\simpleiconsmap\symbol{"EEE6}} - \expandafter\def\csname simpleicon@honeyicon\endcsname {\simpleiconsmap\symbol{"EEE7}} - \expandafter\def\csname simpleicon@honoicon\endcsname {\simpleiconsmap\symbol{"EEE8}} - \expandafter\def\csname simpleicon@honoricon\endcsname {\simpleiconsmap\symbol{"EEE9}} - \expandafter\def\csname simpleicon@hootsuiteicon\endcsname {\simpleiconsmap\symbol{"EEEA}} - \expandafter\def\csname simpleicon@hoppscotchicon\endcsname {\simpleiconsmap\symbol{"EEEB}} - \expandafter\def\csname simpleicon@hostingericon\endcsname {\simpleiconsmap\symbol{"EEEC}} - \expandafter\def\csname simpleicon@hotelsdotcomicon\endcsname {\simpleiconsmap\symbol{"EEED}} - \expandafter\def\csname simpleicon@hotjaricon\endcsname {\simpleiconsmap\symbol{"EEEE}} - \expandafter\def\csname simpleicon@hotwireicon\endcsname {\simpleiconsmap\symbol{"EEEF}} - \expandafter\def\csname simpleicon@houdiniicon\endcsname {\simpleiconsmap\symbol{"EEF0}} - \expandafter\def\csname simpleicon@houzzicon\endcsname {\simpleiconsmap\symbol{"EEF1}} - \expandafter\def\csname simpleicon@hpicon\endcsname {\simpleiconsmap\symbol{"EEF2}} - \expandafter\def\csname simpleicon@hsbcicon\endcsname {\simpleiconsmap\symbol{"EEF3}} - \expandafter\def\csname simpleicon@html5icon\endcsname {\simpleiconsmap\symbol{"EEF4}} - \expandafter\def\csname simpleicon@htmlacademyicon\endcsname {\simpleiconsmap\symbol{"EEF5}} - \expandafter\def\csname simpleicon@htmxicon\endcsname {\simpleiconsmap\symbol{"EEF6}} - \expandafter\def\csname simpleicon@htopicon\endcsname {\simpleiconsmap\symbol{"EEF7}} - \expandafter\def\csname simpleicon@httpieicon\endcsname {\simpleiconsmap\symbol{"EEF8}} - \expandafter\def\csname simpleicon@huaweiicon\endcsname {\simpleiconsmap\symbol{"EEF9}} - \expandafter\def\csname simpleicon@hubspoticon\endcsname {\simpleiconsmap\symbol{"EEFA}} - \expandafter\def\csname simpleicon@huggingfaceicon\endcsname {\simpleiconsmap\symbol{"EEFB}} - \expandafter\def\csname simpleicon@hugoicon\endcsname {\simpleiconsmap\symbol{"EEFC}} - \expandafter\def\csname simpleicon@humblebundleicon\endcsname {\simpleiconsmap\symbol{"EEFD}} - \expandafter\def\csname simpleicon@hungryjacksicon\endcsname {\simpleiconsmap\symbol{"EEFE}} - \expandafter\def\csname simpleicon@husqvarnaicon\endcsname {\simpleiconsmap\symbol{"EEFF}} - \expandafter\def\csname simpleicon@hypericon\endcsname {\simpleiconsmap\symbol{"EF00}} - \expandafter\def\csname simpleicon@hyperskillicon\endcsname {\simpleiconsmap\symbol{"EF01}} - \expandafter\def\csname simpleicon@hypothesisicon\endcsname {\simpleiconsmap\symbol{"EF02}} - \expandafter\def\csname simpleicon@hyprlandicon\endcsname {\simpleiconsmap\symbol{"EF03}} - \expandafter\def\csname simpleicon@hyundaiicon\endcsname {\simpleiconsmap\symbol{"EF04}} - \expandafter\def\csname simpleicon@i18nexticon\endcsname {\simpleiconsmap\symbol{"EF05}} - \expandafter\def\csname simpleicon@i3icon\endcsname {\simpleiconsmap\symbol{"EF06}} - \expandafter\def\csname simpleicon@iataicon\endcsname {\simpleiconsmap\symbol{"EF07}} - \expandafter\def\csname simpleicon@ibeaconicon\endcsname {\simpleiconsmap\symbol{"EF08}} - \expandafter\def\csname simpleicon@iberiaicon\endcsname {\simpleiconsmap\symbol{"EF09}} - \expandafter\def\csname simpleicon@icedicon\endcsname {\simpleiconsmap\symbol{"EF0A}} - \expandafter\def\csname simpleicon@icelandicon\endcsname {\simpleiconsmap\symbol{"EF0B}} - \expandafter\def\csname simpleicon@icicibankicon\endcsname {\simpleiconsmap\symbol{"EF0C}} - \expandafter\def\csname simpleicon@icingaicon\endcsname {\simpleiconsmap\symbol{"EF0D}} - \expandafter\def\csname simpleicon@icloudicon\endcsname {\simpleiconsmap\symbol{"EF0E}} - \expandafter\def\csname simpleicon@icomoonicon\endcsname {\simpleiconsmap\symbol{"EF0F}} - \expandafter\def\csname simpleicon@iconicon\endcsname {\simpleiconsmap\symbol{"EF10}} - \expandafter\def\csname simpleicon@iconfindericon\endcsname {\simpleiconsmap\symbol{"EF11}} - \expandafter\def\csname simpleicon@iconifyicon\endcsname {\simpleiconsmap\symbol{"EF12}} - \expandafter\def\csname simpleicon@iconjaricon\endcsname {\simpleiconsmap\symbol{"EF13}} - \expandafter\def\csname simpleicon@icons8icon\endcsname {\simpleiconsmap\symbol{"EF14}} - \expandafter\def\csname simpleicon@icqicon\endcsname {\simpleiconsmap\symbol{"EF15}} - \expandafter\def\csname simpleicon@ieeeicon\endcsname {\simpleiconsmap\symbol{"EF16}} - \expandafter\def\csname simpleicon@ifixiticon\endcsname {\simpleiconsmap\symbol{"EF17}} - \expandafter\def\csname simpleicon@ifoodicon\endcsname {\simpleiconsmap\symbol{"EF18}} - \expandafter\def\csname simpleicon@ifttticon\endcsname {\simpleiconsmap\symbol{"EF19}} - \expandafter\def\csname simpleicon@igdbicon\endcsname {\simpleiconsmap\symbol{"EF1A}} - \expandafter\def\csname simpleicon@ignicon\endcsname {\simpleiconsmap\symbol{"EF1B}} - \expandafter\def\csname simpleicon@iheartradioicon\endcsname {\simpleiconsmap\symbol{"EF1C}} - \expandafter\def\csname simpleicon@ikeaicon\endcsname {\simpleiconsmap\symbol{"EF1D}} - \expandafter\def\csname simpleicon@iledefrancemobilitesicon\endcsname {\simpleiconsmap\symbol{"EF1E}} - \expandafter\def\csname simpleicon@imagedotscicon\endcsname {\simpleiconsmap\symbol{"EF1F}} - \expandafter\def\csname simpleicon@imagejicon\endcsname {\simpleiconsmap\symbol{"EF20}} - \expandafter\def\csname simpleicon@imdbicon\endcsname {\simpleiconsmap\symbol{"EF21}} - \expandafter\def\csname simpleicon@imessageicon\endcsname {\simpleiconsmap\symbol{"EF22}} - \expandafter\def\csname simpleicon@imguricon\endcsname {\simpleiconsmap\symbol{"EF23}} - \expandafter\def\csname simpleicon@immericon\endcsname {\simpleiconsmap\symbol{"EF24}} - \expandafter\def\csname simpleicon@immichicon\endcsname {\simpleiconsmap\symbol{"EF25}} - \expandafter\def\csname simpleicon@imouicon\endcsname {\simpleiconsmap\symbol{"EF26}} - \expandafter\def\csname simpleicon@improvmxicon\endcsname {\simpleiconsmap\symbol{"EF27}} - \expandafter\def\csname simpleicon@indeedicon\endcsname {\simpleiconsmap\symbol{"EF28}} - \expandafter\def\csname simpleicon@indiansuperleagueicon\endcsname {\simpleiconsmap\symbol{"EF29}} - \expandafter\def\csname simpleicon@indiehackersicon\endcsname {\simpleiconsmap\symbol{"EF2A}} - \expandafter\def\csname simpleicon@indigoicon\endcsname {\simpleiconsmap\symbol{"EF2B}} - \expandafter\def\csname simpleicon@inertiaicon\endcsname {\simpleiconsmap\symbol{"EF2C}} - \expandafter\def\csname simpleicon@infinitiicon\endcsname {\simpleiconsmap\symbol{"EF2D}} - \expandafter\def\csname simpleicon@influxdbicon\endcsname {\simpleiconsmap\symbol{"EF2E}} - \expandafter\def\csname simpleicon@infomaniakicon\endcsname {\simpleiconsmap\symbol{"EF2F}} - \expandafter\def\csname simpleicon@infoqicon\endcsname {\simpleiconsmap\symbol{"EF30}} - \expandafter\def\csname simpleicon@informaticaicon\endcsname {\simpleiconsmap\symbol{"EF31}} - \expandafter\def\csname simpleicon@infosysicon\endcsname {\simpleiconsmap\symbol{"EF32}} - \expandafter\def\csname simpleicon@infracosticon\endcsname {\simpleiconsmap\symbol{"EF33}} - \expandafter\def\csname simpleicon@ingressicon\endcsname {\simpleiconsmap\symbol{"EF34}} - \expandafter\def\csname simpleicon@inkdropicon\endcsname {\simpleiconsmap\symbol{"EF35}} - \expandafter\def\csname simpleicon@inkscapeicon\endcsname {\simpleiconsmap\symbol{"EF36}} - \expandafter\def\csname simpleicon@inoreadericon\endcsname {\simpleiconsmap\symbol{"EF37}} - \expandafter\def\csname simpleicon@insomniaicon\endcsname {\simpleiconsmap\symbol{"EF38}} - \expandafter\def\csname simpleicon@inspireicon\endcsname {\simpleiconsmap\symbol{"EF39}} - \expandafter\def\csname simpleicon@insta360icon\endcsname {\simpleiconsmap\symbol{"EF3A}} - \expandafter\def\csname simpleicon@instacarticon\endcsname {\simpleiconsmap\symbol{"EF3B}} - \expandafter\def\csname simpleicon@instagramicon\endcsname {\simpleiconsmap\symbol{"EF3C}} - \expandafter\def\csname simpleicon@instapapericon\endcsname {\simpleiconsmap\symbol{"EF3D}} - \expandafter\def\csname simpleicon@instatusicon\endcsname {\simpleiconsmap\symbol{"EF3E}} - \expandafter\def\csname simpleicon@instructablesicon\endcsname {\simpleiconsmap\symbol{"EF3F}} - \expandafter\def\csname simpleicon@instructureicon\endcsname {\simpleiconsmap\symbol{"EF40}} - \expandafter\def\csname simpleicon@intelicon\endcsname {\simpleiconsmap\symbol{"EF41}} - \expandafter\def\csname simpleicon@intellijideaicon\endcsname {\simpleiconsmap\symbol{"EF42}} - \expandafter\def\csname simpleicon@interactiondesignfoundationicon\endcsname {\simpleiconsmap\symbol{"EF43}} - \expandafter\def\csname simpleicon@interactjsicon\endcsname {\simpleiconsmap\symbol{"EF44}} - \expandafter\def\csname simpleicon@interbaseicon\endcsname {\simpleiconsmap\symbol{"EF45}} - \expandafter\def\csname simpleicon@intercomicon\endcsname {\simpleiconsmap\symbol{"EF46}} - \expandafter\def\csname simpleicon@intermarcheicon\endcsname {\simpleiconsmap\symbol{"EF47}} - \expandafter\def\csname simpleicon@internetarchiveicon\endcsname {\simpleiconsmap\symbol{"EF48}} - \expandafter\def\csname simpleicon@internetcomputericon\endcsname {\simpleiconsmap\symbol{"EF49}} - \expandafter\def\csname simpleicon@intigritiicon\endcsname {\simpleiconsmap\symbol{"EF4A}} - \expandafter\def\csname simpleicon@intuiticon\endcsname {\simpleiconsmap\symbol{"EF4B}} - \expandafter\def\csname simpleicon@invisionicon\endcsname {\simpleiconsmap\symbol{"EF4C}} - \expandafter\def\csname simpleicon@invoiceninjaicon\endcsname {\simpleiconsmap\symbol{"EF4D}} - \expandafter\def\csname simpleicon@iobrokericon\endcsname {\simpleiconsmap\symbol{"EF4E}} - \expandafter\def\csname simpleicon@ionicicon\endcsname {\simpleiconsmap\symbol{"EF4F}} - \expandafter\def\csname simpleicon@ionosicon\endcsname {\simpleiconsmap\symbol{"EF50}} - \expandafter\def\csname simpleicon@iosicon\endcsname {\simpleiconsmap\symbol{"EF51}} - \expandafter\def\csname simpleicon@iotaicon\endcsname {\simpleiconsmap\symbol{"EF52}} - \expandafter\def\csname simpleicon@ipfsicon\endcsname {\simpleiconsmap\symbol{"EF53}} - \expandafter\def\csname simpleicon@irisicon\endcsname {\simpleiconsmap\symbol{"EF54}} - \expandafter\def\csname simpleicon@iroboticon\endcsname {\simpleiconsmap\symbol{"EF55}} - \expandafter\def\csname simpleicon@isc2icon\endcsname {\simpleiconsmap\symbol{"EF56}} - \expandafter\def\csname simpleicon@issuuicon\endcsname {\simpleiconsmap\symbol{"EF57}} - \expandafter\def\csname simpleicon@istioicon\endcsname {\simpleiconsmap\symbol{"EF58}} - \expandafter\def\csname simpleicon@itchdotioicon\endcsname {\simpleiconsmap\symbol{"EF59}} - \expandafter\def\csname simpleicon@iterm2icon\endcsname {\simpleiconsmap\symbol{"EF5A}} - \expandafter\def\csname simpleicon@itunesicon\endcsname {\simpleiconsmap\symbol{"EF5B}} - \expandafter\def\csname simpleicon@itvxicon\endcsname {\simpleiconsmap\symbol{"EF5C}} - \expandafter\def\csname simpleicon@ivecoicon\endcsname {\simpleiconsmap\symbol{"EF5D}} - \expandafter\def\csname simpleicon@jabbericon\endcsname {\simpleiconsmap\symbol{"EF5E}} - \expandafter\def\csname simpleicon@jaegericon\endcsname {\simpleiconsmap\symbol{"EF5F}} - \expandafter\def\csname simpleicon@jaguaricon\endcsname {\simpleiconsmap\symbol{"EF60}} - \expandafter\def\csname simpleicon@jamboardicon\endcsname {\simpleiconsmap\symbol{"EF61}} - \expandafter\def\csname simpleicon@jamesonicon\endcsname {\simpleiconsmap\symbol{"EF62}} - \expandafter\def\csname simpleicon@jamstackicon\endcsname {\simpleiconsmap\symbol{"EF63}} - \expandafter\def\csname simpleicon@jasmineicon\endcsname {\simpleiconsmap\symbol{"EF64}} - \expandafter\def\csname simpleicon@javascripticon\endcsname {\simpleiconsmap\symbol{"EF65}} - \expandafter\def\csname simpleicon@jblicon\endcsname {\simpleiconsmap\symbol{"EF66}} - \expandafter\def\csname simpleicon@jcbicon\endcsname {\simpleiconsmap\symbol{"EF67}} - \expandafter\def\csname simpleicon@jeepicon\endcsname {\simpleiconsmap\symbol{"EF68}} - \expandafter\def\csname simpleicon@jekyllicon\endcsname {\simpleiconsmap\symbol{"EF69}} - \expandafter\def\csname simpleicon@jellyfinicon\endcsname {\simpleiconsmap\symbol{"EF6A}} - \expandafter\def\csname simpleicon@jenkinsicon\endcsname {\simpleiconsmap\symbol{"EF6B}} - \expandafter\def\csname simpleicon@jesticon\endcsname {\simpleiconsmap\symbol{"EF6C}} - \expandafter\def\csname simpleicon@jeticon\endcsname {\simpleiconsmap\symbol{"EF6D}} - \expandafter\def\csname simpleicon@jetblueicon\endcsname {\simpleiconsmap\symbol{"EF6E}} - \expandafter\def\csname simpleicon@jetbrainsicon\endcsname {\simpleiconsmap\symbol{"EF6F}} - \expandafter\def\csname simpleicon@jetpackcomposeicon\endcsname {\simpleiconsmap\symbol{"EF70}} - \expandafter\def\csname simpleicon@jfrogicon\endcsname {\simpleiconsmap\symbol{"EF71}} - \expandafter\def\csname simpleicon@jfrogpipelinesicon\endcsname {\simpleiconsmap\symbol{"EF72}} - \expandafter\def\csname simpleicon@jhipstericon\endcsname {\simpleiconsmap\symbol{"EF73}} - \expandafter\def\csname simpleicon@jinjaicon\endcsname {\simpleiconsmap\symbol{"EF74}} - \expandafter\def\csname simpleicon@jiraicon\endcsname {\simpleiconsmap\symbol{"EF75}} - \expandafter\def\csname simpleicon@jirasoftwareicon\endcsname {\simpleiconsmap\symbol{"EF76}} - \expandafter\def\csname simpleicon@jitpackicon\endcsname {\simpleiconsmap\symbol{"EF77}} - \expandafter\def\csname simpleicon@jitsiicon\endcsname {\simpleiconsmap\symbol{"EF78}} - \expandafter\def\csname simpleicon@johndeereicon\endcsname {\simpleiconsmap\symbol{"EF79}} - \expandafter\def\csname simpleicon@joomlaicon\endcsname {\simpleiconsmap\symbol{"EF7A}} - \expandafter\def\csname simpleicon@joplinicon\endcsname {\simpleiconsmap\symbol{"EF7B}} - \expandafter\def\csname simpleicon@jordanicon\endcsname {\simpleiconsmap\symbol{"EF7C}} - \expandafter\def\csname simpleicon@jouavicon\endcsname {\simpleiconsmap\symbol{"EF7D}} - \expandafter\def\csname simpleicon@jovianicon\endcsname {\simpleiconsmap\symbol{"EF7E}} - \expandafter\def\csname simpleicon@jpegicon\endcsname {\simpleiconsmap\symbol{"EF7F}} - \expandafter\def\csname simpleicon@jqueryicon\endcsname {\simpleiconsmap\symbol{"EF80}} - \expandafter\def\csname simpleicon@jrgroupicon\endcsname {\simpleiconsmap\symbol{"EF81}} - \expandafter\def\csname simpleicon@jsdelivricon\endcsname {\simpleiconsmap\symbol{"EF82}} - \expandafter\def\csname simpleicon@jsfiddleicon\endcsname {\simpleiconsmap\symbol{"EF83}} - \expandafter\def\csname simpleicon@jsonicon\endcsname {\simpleiconsmap\symbol{"EF84}} - \expandafter\def\csname simpleicon@jsonwebtokensicon\endcsname {\simpleiconsmap\symbol{"EF85}} - \expandafter\def\csname simpleicon@jsricon\endcsname {\simpleiconsmap\symbol{"EF86}} - \expandafter\def\csname simpleicon@jssicon\endcsname {\simpleiconsmap\symbol{"EF87}} - \expandafter\def\csname simpleicon@juceicon\endcsname {\simpleiconsmap\symbol{"EF88}} - \expandafter\def\csname simpleicon@juejinicon\endcsname {\simpleiconsmap\symbol{"EF89}} - \expandafter\def\csname simpleicon@jukeicon\endcsname {\simpleiconsmap\symbol{"EF8A}} - \expandafter\def\csname simpleicon@juliaicon\endcsname {\simpleiconsmap\symbol{"EF8B}} - \expandafter\def\csname simpleicon@junipernetworksicon\endcsname {\simpleiconsmap\symbol{"EF8C}} - \expandafter\def\csname simpleicon@junit5icon\endcsname {\simpleiconsmap\symbol{"EF8D}} - \expandafter\def\csname simpleicon@jupytericon\endcsname {\simpleiconsmap\symbol{"EF8E}} - \expandafter\def\csname simpleicon@justeaticon\endcsname {\simpleiconsmap\symbol{"EF8F}} - \expandafter\def\csname simpleicon@justgivingicon\endcsname {\simpleiconsmap\symbol{"EF90}} - \expandafter\def\csname simpleicon@k3sicon\endcsname {\simpleiconsmap\symbol{"EF91}} - \expandafter\def\csname simpleicon@k6icon\endcsname {\simpleiconsmap\symbol{"EF92}} - \expandafter\def\csname simpleicon@kaggleicon\endcsname {\simpleiconsmap\symbol{"EF93}} - \expandafter\def\csname simpleicon@kagiicon\endcsname {\simpleiconsmap\symbol{"EF94}} - \expandafter\def\csname simpleicon@kahooticon\endcsname {\simpleiconsmap\symbol{"EF95}} - \expandafter\def\csname simpleicon@kaiosicon\endcsname {\simpleiconsmap\symbol{"EF96}} - \expandafter\def\csname simpleicon@kakaoicon\endcsname {\simpleiconsmap\symbol{"EF97}} - \expandafter\def\csname simpleicon@kakaotalkicon\endcsname {\simpleiconsmap\symbol{"EF98}} - \expandafter\def\csname simpleicon@kalilinuxicon\endcsname {\simpleiconsmap\symbol{"EF99}} - \expandafter\def\csname simpleicon@kamailioicon\endcsname {\simpleiconsmap\symbol{"EF9A}} - \expandafter\def\csname simpleicon@kanikoicon\endcsname {\simpleiconsmap\symbol{"EF9B}} - \expandafter\def\csname simpleicon@karlsruherverkehrsverbundicon\endcsname {\simpleiconsmap\symbol{"EF9C}} - \expandafter\def\csname simpleicon@kasasmarticon\endcsname {\simpleiconsmap\symbol{"EF9D}} - \expandafter\def\csname simpleicon@kashflowicon\endcsname {\simpleiconsmap\symbol{"EF9E}} - \expandafter\def\csname simpleicon@kasperskyicon\endcsname {\simpleiconsmap\symbol{"EF9F}} - \expandafter\def\csname simpleicon@katacodaicon\endcsname {\simpleiconsmap\symbol{"EFA0}} - \expandafter\def\csname simpleicon@katanaicon\endcsname {\simpleiconsmap\symbol{"EFA1}} - \expandafter\def\csname simpleicon@kauflandicon\endcsname {\simpleiconsmap\symbol{"EFA2}} - \expandafter\def\csname simpleicon@kdeicon\endcsname {\simpleiconsmap\symbol{"EFA3}} - \expandafter\def\csname simpleicon@kdenliveicon\endcsname {\simpleiconsmap\symbol{"EFA4}} - \expandafter\def\csname simpleicon@kedroicon\endcsname {\simpleiconsmap\symbol{"EFA5}} - \expandafter\def\csname simpleicon@keeneticicon\endcsname {\simpleiconsmap\symbol{"EFA6}} - \expandafter\def\csname simpleicon@keepachangelogicon\endcsname {\simpleiconsmap\symbol{"EFA7}} - \expandafter\def\csname simpleicon@keepassxcicon\endcsname {\simpleiconsmap\symbol{"EFA8}} - \expandafter\def\csname simpleicon@kenticoicon\endcsname {\simpleiconsmap\symbol{"EFA9}} - \expandafter\def\csname simpleicon@kerasicon\endcsname {\simpleiconsmap\symbol{"EFAA}} - \expandafter\def\csname simpleicon@keybaseicon\endcsname {\simpleiconsmap\symbol{"EFAB}} - \expandafter\def\csname simpleicon@keycdnicon\endcsname {\simpleiconsmap\symbol{"EFAC}} - \expandafter\def\csname simpleicon@keycloakicon\endcsname {\simpleiconsmap\symbol{"EFAD}} - \expandafter\def\csname simpleicon@keystoneicon\endcsname {\simpleiconsmap\symbol{"EFAE}} - \expandafter\def\csname simpleicon@kfcicon\endcsname {\simpleiconsmap\symbol{"EFAF}} - \expandafter\def\csname simpleicon@khanacademyicon\endcsname {\simpleiconsmap\symbol{"EFB0}} - \expandafter\def\csname simpleicon@khronosgroupicon\endcsname {\simpleiconsmap\symbol{"EFB1}} - \expandafter\def\csname simpleicon@kiaicon\endcsname {\simpleiconsmap\symbol{"EFB2}} - \expandafter\def\csname simpleicon@kibanaicon\endcsname {\simpleiconsmap\symbol{"EFB3}} - \expandafter\def\csname simpleicon@kicadicon\endcsname {\simpleiconsmap\symbol{"EFB4}} - \expandafter\def\csname simpleicon@kickicon\endcsname {\simpleiconsmap\symbol{"EFB5}} - \expandafter\def\csname simpleicon@kickstartericon\endcsname {\simpleiconsmap\symbol{"EFB6}} - \expandafter\def\csname simpleicon@kikicon\endcsname {\simpleiconsmap\symbol{"EFB7}} - \expandafter\def\csname simpleicon@kingstontechnologyicon\endcsname {\simpleiconsmap\symbol{"EFB8}} - \expandafter\def\csname simpleicon@kinopoiskicon\endcsname {\simpleiconsmap\symbol{"EFB9}} - \expandafter\def\csname simpleicon@kinstaicon\endcsname {\simpleiconsmap\symbol{"EFBA}} - \expandafter\def\csname simpleicon@kirbyicon\endcsname {\simpleiconsmap\symbol{"EFBB}} - \expandafter\def\csname simpleicon@kiticon\endcsname {\simpleiconsmap\symbol{"EFBC}} - \expandafter\def\csname simpleicon@kitsuicon\endcsname {\simpleiconsmap\symbol{"EFBD}} - \expandafter\def\csname simpleicon@klarnaicon\endcsname {\simpleiconsmap\symbol{"EFBE}} - \expandafter\def\csname simpleicon@klmicon\endcsname {\simpleiconsmap\symbol{"EFBF}} - \expandafter\def\csname simpleicon@klookicon\endcsname {\simpleiconsmap\symbol{"EFC0}} - \expandafter\def\csname simpleicon@knativeicon\endcsname {\simpleiconsmap\symbol{"EFC1}} - \expandafter\def\csname simpleicon@knexdotjsicon\endcsname {\simpleiconsmap\symbol{"EFC2}} - \expandafter\def\csname simpleicon@knimeicon\endcsname {\simpleiconsmap\symbol{"EFC3}} - \expandafter\def\csname simpleicon@knipicon\endcsname {\simpleiconsmap\symbol{"EFC4}} - \expandafter\def\csname simpleicon@knowledgebaseicon\endcsname {\simpleiconsmap\symbol{"EFC5}} - \expandafter\def\csname simpleicon@knownicon\endcsname {\simpleiconsmap\symbol{"EFC6}} - \expandafter\def\csname simpleicon@koaicon\endcsname {\simpleiconsmap\symbol{"EFC7}} - \expandafter\def\csname simpleicon@kocicon\endcsname {\simpleiconsmap\symbol{"EFC8}} - \expandafter\def\csname simpleicon@kodakicon\endcsname {\simpleiconsmap\symbol{"EFC9}} - \expandafter\def\csname simpleicon@kodiicon\endcsname {\simpleiconsmap\symbol{"EFCA}} - \expandafter\def\csname simpleicon@koenigseggicon\endcsname {\simpleiconsmap\symbol{"EFCB}} - \expandafter\def\csname simpleicon@kofaxicon\endcsname {\simpleiconsmap\symbol{"EFCC}} - \expandafter\def\csname simpleicon@kofiicon\endcsname {\simpleiconsmap\symbol{"EFCD}} - \expandafter\def\csname simpleicon@komooticon\endcsname {\simpleiconsmap\symbol{"EFCE}} - \expandafter\def\csname simpleicon@konamiicon\endcsname {\simpleiconsmap\symbol{"EFCF}} - \expandafter\def\csname simpleicon@kongicon\endcsname {\simpleiconsmap\symbol{"EFD0}} - \expandafter\def\csname simpleicon@kongregateicon\endcsname {\simpleiconsmap\symbol{"EFD1}} - \expandafter\def\csname simpleicon@konvaicon\endcsname {\simpleiconsmap\symbol{"EFD2}} - \expandafter\def\csname simpleicon@kotlinicon\endcsname {\simpleiconsmap\symbol{"EFD3}} - \expandafter\def\csname simpleicon@koyebicon\endcsname {\simpleiconsmap\symbol{"EFD4}} - \expandafter\def\csname simpleicon@kritaicon\endcsname {\simpleiconsmap\symbol{"EFD5}} - \expandafter\def\csname simpleicon@ktmicon\endcsname {\simpleiconsmap\symbol{"EFD6}} - \expandafter\def\csname simpleicon@ktoricon\endcsname {\simpleiconsmap\symbol{"EFD7}} - \expandafter\def\csname simpleicon@kuaishouicon\endcsname {\simpleiconsmap\symbol{"EFD8}} - \expandafter\def\csname simpleicon@kubernetesicon\endcsname {\simpleiconsmap\symbol{"EFD9}} - \expandafter\def\csname simpleicon@kubuntuicon\endcsname {\simpleiconsmap\symbol{"EFDA}} - \expandafter\def\csname simpleicon@kucoinicon\endcsname {\simpleiconsmap\symbol{"EFDB}} - \expandafter\def\csname simpleicon@kumaicon\endcsname {\simpleiconsmap\symbol{"EFDC}} - \expandafter\def\csname simpleicon@kununuicon\endcsname {\simpleiconsmap\symbol{"EFDD}} - \expandafter\def\csname simpleicon@kuulaicon\endcsname {\simpleiconsmap\symbol{"EFDE}} - \expandafter\def\csname simpleicon@kxicon\endcsname {\simpleiconsmap\symbol{"EFDF}} - \expandafter\def\csname simpleicon@kyoceraicon\endcsname {\simpleiconsmap\symbol{"EFE0}} - \expandafter\def\csname simpleicon@labviewicon\endcsname {\simpleiconsmap\symbol{"EFE1}} - \expandafter\def\csname simpleicon@ladaicon\endcsname {\simpleiconsmap\symbol{"EFE2}} - \expandafter\def\csname simpleicon@lamborghiniicon\endcsname {\simpleiconsmap\symbol{"EFE3}} - \expandafter\def\csname simpleicon@landrovericon\endcsname {\simpleiconsmap\symbol{"EFE4}} - \expandafter\def\csname simpleicon@langchainicon\endcsname {\simpleiconsmap\symbol{"EFE5}} - \expandafter\def\csname simpleicon@lapceicon\endcsname {\simpleiconsmap\symbol{"EFE6}} - \expandafter\def\csname simpleicon@laragonicon\endcsname {\simpleiconsmap\symbol{"EFE7}} - \expandafter\def\csname simpleicon@laravelicon\endcsname {\simpleiconsmap\symbol{"EFE8}} - \expandafter\def\csname simpleicon@laravelhorizonicon\endcsname {\simpleiconsmap\symbol{"EFE9}} - \expandafter\def\csname simpleicon@laravelnovaicon\endcsname {\simpleiconsmap\symbol{"EFEA}} - \expandafter\def\csname simpleicon@lastdotfmicon\endcsname {\simpleiconsmap\symbol{"EFEB}} - \expandafter\def\csname simpleicon@lastpassicon\endcsname {\simpleiconsmap\symbol{"EFEC}} - \expandafter\def\csname simpleicon@latexicon\endcsname {\simpleiconsmap\symbol{"EFED}} - \expandafter\def\csname simpleicon@launchpadicon\endcsname {\simpleiconsmap\symbol{"EFEE}} - \expandafter\def\csname simpleicon@lazarusicon\endcsname {\simpleiconsmap\symbol{"EFEF}} - \expandafter\def\csname simpleicon@lazyvimicon\endcsname {\simpleiconsmap\symbol{"EFF0}} - \expandafter\def\csname simpleicon@lbryicon\endcsname {\simpleiconsmap\symbol{"EFF1}} - \expandafter\def\csname simpleicon@leaderpriceicon\endcsname {\simpleiconsmap\symbol{"EFF2}} - \expandafter\def\csname simpleicon@leafleticon\endcsname {\simpleiconsmap\symbol{"EFF3}} - \expandafter\def\csname simpleicon@leagueoflegendsicon\endcsname {\simpleiconsmap\symbol{"EFF4}} - \expandafter\def\csname simpleicon@leanpubicon\endcsname {\simpleiconsmap\symbol{"EFF5}} - \expandafter\def\csname simpleicon@leetcodeicon\endcsname {\simpleiconsmap\symbol{"EFF6}} - \expandafter\def\csname simpleicon@legacygamesicon\endcsname {\simpleiconsmap\symbol{"EFF7}} - \expandafter\def\csname simpleicon@leicaicon\endcsname {\simpleiconsmap\symbol{"EFF8}} - \expandafter\def\csname simpleicon@lemmyicon\endcsname {\simpleiconsmap\symbol{"EFF9}} - \expandafter\def\csname simpleicon@lemonsqueezyicon\endcsname {\simpleiconsmap\symbol{"EFFA}} - \expandafter\def\csname simpleicon@lenovoicon\endcsname {\simpleiconsmap\symbol{"EFFB}} - \expandafter\def\csname simpleicon@lensicon\endcsname {\simpleiconsmap\symbol{"EFFC}} - \expandafter\def\csname simpleicon@leptosicon\endcsname {\simpleiconsmap\symbol{"EFFD}} - \expandafter\def\csname simpleicon@lequipeicon\endcsname {\simpleiconsmap\symbol{"EFFE}} - \expandafter\def\csname simpleicon@lernaicon\endcsname {\simpleiconsmap\symbol{"EFFF}} - \expandafter\def\csname simpleicon@leroymerlinicon\endcsname {\simpleiconsmap\symbol{"F000}} - \expandafter\def\csname simpleicon@leslibrairesicon\endcsname {\simpleiconsmap\symbol{"F001}} - \expandafter\def\csname simpleicon@lessicon\endcsname {\simpleiconsmap\symbol{"F002}} - \expandafter\def\csname simpleicon@letsencrypticon\endcsname {\simpleiconsmap\symbol{"F003}} - \expandafter\def\csname simpleicon@letterboxdicon\endcsname {\simpleiconsmap\symbol{"F004}} - \expandafter\def\csname simpleicon@levelsdotfyiicon\endcsname {\simpleiconsmap\symbol{"F005}} - \expandafter\def\csname simpleicon@lgicon\endcsname {\simpleiconsmap\symbol{"F006}} - \expandafter\def\csname simpleicon@liberadotchaticon\endcsname {\simpleiconsmap\symbol{"F007}} - \expandafter\def\csname simpleicon@liberapayicon\endcsname {\simpleiconsmap\symbol{"F008}} - \expandafter\def\csname simpleicon@librariesdotioicon\endcsname {\simpleiconsmap\symbol{"F009}} - \expandafter\def\csname simpleicon@librarythingicon\endcsname {\simpleiconsmap\symbol{"F00A}} - \expandafter\def\csname simpleicon@libreofficeicon\endcsname {\simpleiconsmap\symbol{"F00B}} - \expandafter\def\csname simpleicon@libreofficebaseicon\endcsname {\simpleiconsmap\symbol{"F00C}} - \expandafter\def\csname simpleicon@libreofficecalcicon\endcsname {\simpleiconsmap\symbol{"F00D}} - \expandafter\def\csname simpleicon@libreofficedrawicon\endcsname {\simpleiconsmap\symbol{"F00E}} - \expandafter\def\csname simpleicon@libreofficeimpressicon\endcsname {\simpleiconsmap\symbol{"F00F}} - \expandafter\def\csname simpleicon@libreofficemathicon\endcsname {\simpleiconsmap\symbol{"F010}} - \expandafter\def\csname simpleicon@libreofficewritericon\endcsname {\simpleiconsmap\symbol{"F011}} - \expandafter\def\csname simpleicon@librewolficon\endcsname {\simpleiconsmap\symbol{"F012}} - \expandafter\def\csname simpleicon@libuvicon\endcsname {\simpleiconsmap\symbol{"F013}} - \expandafter\def\csname simpleicon@lichessicon\endcsname {\simpleiconsmap\symbol{"F014}} - \expandafter\def\csname simpleicon@lidlicon\endcsname {\simpleiconsmap\symbol{"F015}} - \expandafter\def\csname simpleicon@lifxicon\endcsname {\simpleiconsmap\symbol{"F016}} - \expandafter\def\csname simpleicon@lightburnicon\endcsname {\simpleiconsmap\symbol{"F017}} - \expandafter\def\csname simpleicon@lighthouseicon\endcsname {\simpleiconsmap\symbol{"F018}} - \expandafter\def\csname simpleicon@lightningicon\endcsname {\simpleiconsmap\symbol{"F019}} - \expandafter\def\csname simpleicon@limesurveyicon\endcsname {\simpleiconsmap\symbol{"F01A}} - \expandafter\def\csname simpleicon@lineicon\endcsname {\simpleiconsmap\symbol{"F01B}} - \expandafter\def\csname simpleicon@lineageosicon\endcsname {\simpleiconsmap\symbol{"F01C}} - \expandafter\def\csname simpleicon@linearicon\endcsname {\simpleiconsmap\symbol{"F01D}} - \expandafter\def\csname simpleicon@liningicon\endcsname {\simpleiconsmap\symbol{"F01E}} - \expandafter\def\csname simpleicon@linkedinicon\endcsname {\simpleiconsmap\symbol{"F01F}} - \expandafter\def\csname simpleicon@linkerdicon\endcsname {\simpleiconsmap\symbol{"F020}} - \expandafter\def\csname simpleicon@linkfireicon\endcsname {\simpleiconsmap\symbol{"F021}} - \expandafter\def\csname simpleicon@linksysicon\endcsname {\simpleiconsmap\symbol{"F022}} - \expandafter\def\csname simpleicon@linktreeicon\endcsname {\simpleiconsmap\symbol{"F023}} - \expandafter\def\csname simpleicon@lintcodeicon\endcsname {\simpleiconsmap\symbol{"F024}} - \expandafter\def\csname simpleicon@linuxicon\endcsname {\simpleiconsmap\symbol{"F025}} - \expandafter\def\csname simpleicon@linuxcontainersicon\endcsname {\simpleiconsmap\symbol{"F026}} - \expandafter\def\csname simpleicon@linuxfoundationicon\endcsname {\simpleiconsmap\symbol{"F027}} - \expandafter\def\csname simpleicon@linuxminticon\endcsname {\simpleiconsmap\symbol{"F028}} - \expandafter\def\csname simpleicon@linuxprofessionalinstituteicon\endcsname {\simpleiconsmap\symbol{"F029}} - \expandafter\def\csname simpleicon@linuxservericon\endcsname {\simpleiconsmap\symbol{"F02A}} - \expandafter\def\csname simpleicon@lionairicon\endcsname {\simpleiconsmap\symbol{"F02B}} - \expandafter\def\csname simpleicon@liquibaseicon\endcsname {\simpleiconsmap\symbol{"F02C}} - \expandafter\def\csname simpleicon@listmonkicon\endcsname {\simpleiconsmap\symbol{"F02D}} - \expandafter\def\csname simpleicon@liticon\endcsname {\simpleiconsmap\symbol{"F02E}} - \expandafter\def\csname simpleicon@litecoinicon\endcsname {\simpleiconsmap\symbol{"F02F}} - \expandafter\def\csname simpleicon@litiengineicon\endcsname {\simpleiconsmap\symbol{"F030}} - \expandafter\def\csname simpleicon@livechaticon\endcsname {\simpleiconsmap\symbol{"F031}} - \expandafter\def\csname simpleicon@livejournalicon\endcsname {\simpleiconsmap\symbol{"F032}} - \expandafter\def\csname simpleicon@livewireicon\endcsname {\simpleiconsmap\symbol{"F033}} - \expandafter\def\csname simpleicon@llvmicon\endcsname {\simpleiconsmap\symbol{"F034}} - \expandafter\def\csname simpleicon@lmmsicon\endcsname {\simpleiconsmap\symbol{"F035}} - \expandafter\def\csname simpleicon@localicon\endcsname {\simpleiconsmap\symbol{"F036}} - \expandafter\def\csname simpleicon@lodashicon\endcsname {\simpleiconsmap\symbol{"F037}} - \expandafter\def\csname simpleicon@logitechicon\endcsname {\simpleiconsmap\symbol{"F038}} - \expandafter\def\csname simpleicon@logitechgicon\endcsname {\simpleiconsmap\symbol{"F039}} - \expandafter\def\csname simpleicon@logmeinicon\endcsname {\simpleiconsmap\symbol{"F03A}} - \expandafter\def\csname simpleicon@logseqicon\endcsname {\simpleiconsmap\symbol{"F03B}} - \expandafter\def\csname simpleicon@logstashicon\endcsname {\simpleiconsmap\symbol{"F03C}} - \expandafter\def\csname simpleicon@lookericon\endcsname {\simpleiconsmap\symbol{"F03D}} - \expandafter\def\csname simpleicon@loomicon\endcsname {\simpleiconsmap\symbol{"F03E}} - \expandafter\def\csname simpleicon@loopicon\endcsname {\simpleiconsmap\symbol{"F03F}} - \expandafter\def\csname simpleicon@loopbackicon\endcsname {\simpleiconsmap\symbol{"F040}} - \expandafter\def\csname simpleicon@lootcrateicon\endcsname {\simpleiconsmap\symbol{"F041}} - \expandafter\def\csname simpleicon@lospecicon\endcsname {\simpleiconsmap\symbol{"F042}} - \expandafter\def\csname simpleicon@lotpolishairlinesicon\endcsname {\simpleiconsmap\symbol{"F043}} - \expandafter\def\csname simpleicon@ltspiceicon\endcsname {\simpleiconsmap\symbol{"F044}} - \expandafter\def\csname simpleicon@luaicon\endcsname {\simpleiconsmap\symbol{"F045}} - \expandafter\def\csname simpleicon@lubuntuicon\endcsname {\simpleiconsmap\symbol{"F046}} - \expandafter\def\csname simpleicon@luciaicon\endcsname {\simpleiconsmap\symbol{"F047}} - \expandafter\def\csname simpleicon@lucidicon\endcsname {\simpleiconsmap\symbol{"F048}} - \expandafter\def\csname simpleicon@ludwigicon\endcsname {\simpleiconsmap\symbol{"F049}} - \expandafter\def\csname simpleicon@lufthansaicon\endcsname {\simpleiconsmap\symbol{"F04A}} - \expandafter\def\csname simpleicon@lumenicon\endcsname {\simpleiconsmap\symbol{"F04B}} - \expandafter\def\csname simpleicon@lunacyicon\endcsname {\simpleiconsmap\symbol{"F04C}} - \expandafter\def\csname simpleicon@lutrisicon\endcsname {\simpleiconsmap\symbol{"F04D}} - \expandafter\def\csname simpleicon@lydiaicon\endcsname {\simpleiconsmap\symbol{"F04E}} - \expandafter\def\csname simpleicon@lyfticon\endcsname {\simpleiconsmap\symbol{"F04F}} - \expandafter\def\csname simpleicon@maasicon\endcsname {\simpleiconsmap\symbol{"F050}} - \expandafter\def\csname simpleicon@macosicon\endcsname {\simpleiconsmap\symbol{"F051}} - \expandafter\def\csname simpleicon@macpawicon\endcsname {\simpleiconsmap\symbol{"F052}} - \expandafter\def\csname simpleicon@macysicon\endcsname {\simpleiconsmap\symbol{"F053}} - \expandafter\def\csname simpleicon@magasinsuicon\endcsname {\simpleiconsmap\symbol{"F054}} - \expandafter\def\csname simpleicon@magentoicon\endcsname {\simpleiconsmap\symbol{"F055}} - \expandafter\def\csname simpleicon@magicicon\endcsname {\simpleiconsmap\symbol{"F056}} - \expandafter\def\csname simpleicon@magiskicon\endcsname {\simpleiconsmap\symbol{"F057}} - \expandafter\def\csname simpleicon@mahindraicon\endcsname {\simpleiconsmap\symbol{"F058}} - \expandafter\def\csname simpleicon@mailchimpicon\endcsname {\simpleiconsmap\symbol{"F059}} - \expandafter\def\csname simpleicon@maildotcomicon\endcsname {\simpleiconsmap\symbol{"F05A}} - \expandafter\def\csname simpleicon@maildotruicon\endcsname {\simpleiconsmap\symbol{"F05B}} - \expandafter\def\csname simpleicon@mailgunicon\endcsname {\simpleiconsmap\symbol{"F05C}} - \expandafter\def\csname simpleicon@mailtrapicon\endcsname {\simpleiconsmap\symbol{"F05D}} - \expandafter\def\csname simpleicon@mainwpicon\endcsname {\simpleiconsmap\symbol{"F05E}} - \expandafter\def\csname simpleicon@majorleaguehackingicon\endcsname {\simpleiconsmap\symbol{"F05F}} - \expandafter\def\csname simpleicon@makeicon\endcsname {\simpleiconsmap\symbol{"F060}} - \expandafter\def\csname simpleicon@makerboticon\endcsname {\simpleiconsmap\symbol{"F061}} - \expandafter\def\csname simpleicon@malticon\endcsname {\simpleiconsmap\symbol{"F062}} - \expandafter\def\csname simpleicon@malwarebytesicon\endcsname {\simpleiconsmap\symbol{"F063}} - \expandafter\def\csname simpleicon@mambauiicon\endcsname {\simpleiconsmap\symbol{"F064}} - \expandafter\def\csname simpleicon@mampicon\endcsname {\simpleiconsmap\symbol{"F065}} - \expandafter\def\csname simpleicon@manicon\endcsname {\simpleiconsmap\symbol{"F066}} - \expandafter\def\csname simpleicon@manageiqicon\endcsname {\simpleiconsmap\symbol{"F067}} - \expandafter\def\csname simpleicon@manjaroicon\endcsname {\simpleiconsmap\symbol{"F068}} - \expandafter\def\csname simpleicon@mantineicon\endcsname {\simpleiconsmap\symbol{"F069}} - \expandafter\def\csname simpleicon@mapboxicon\endcsname {\simpleiconsmap\symbol{"F06A}} - \expandafter\def\csname simpleicon@maplibreicon\endcsname {\simpleiconsmap\symbol{"F06B}} - \expandafter\def\csname simpleicon@mariadbicon\endcsname {\simpleiconsmap\symbol{"F06C}} - \expandafter\def\csname simpleicon@mariadbfoundationicon\endcsname {\simpleiconsmap\symbol{"F06D}} - \expandafter\def\csname simpleicon@markdownicon\endcsname {\simpleiconsmap\symbol{"F06E}} - \expandafter\def\csname simpleicon@marketoicon\endcsname {\simpleiconsmap\symbol{"F06F}} - \expandafter\def\csname simpleicon@markoicon\endcsname {\simpleiconsmap\symbol{"F070}} - \expandafter\def\csname simpleicon@marriotticon\endcsname {\simpleiconsmap\symbol{"F071}} - \expandafter\def\csname simpleicon@marvelappicon\endcsname {\simpleiconsmap\symbol{"F072}} - \expandafter\def\csname simpleicon@maseratiicon\endcsname {\simpleiconsmap\symbol{"F073}} - \expandafter\def\csname simpleicon@mastercardicon\endcsname {\simpleiconsmap\symbol{"F074}} - \expandafter\def\csname simpleicon@mastercomfigicon\endcsname {\simpleiconsmap\symbol{"F075}} - \expandafter\def\csname simpleicon@mastodonicon\endcsname {\simpleiconsmap\symbol{"F076}} - \expandafter\def\csname simpleicon@materialdesignicon\endcsname {\simpleiconsmap\symbol{"F077}} - \expandafter\def\csname simpleicon@materialdesigniconsicon\endcsname {\simpleiconsmap\symbol{"F078}} - \expandafter\def\csname simpleicon@materialformkdocsicon\endcsname {\simpleiconsmap\symbol{"F079}} - \expandafter\def\csname simpleicon@matillionicon\endcsname {\simpleiconsmap\symbol{"F07A}} - \expandafter\def\csname simpleicon@matomoicon\endcsname {\simpleiconsmap\symbol{"F07B}} - \expandafter\def\csname simpleicon@matrixicon\endcsname {\simpleiconsmap\symbol{"F07C}} - \expandafter\def\csname simpleicon@matterdotjsicon\endcsname {\simpleiconsmap\symbol{"F07D}} - \expandafter\def\csname simpleicon@mattermosticon\endcsname {\simpleiconsmap\symbol{"F07E}} - \expandafter\def\csname simpleicon@matterneticon\endcsname {\simpleiconsmap\symbol{"F07F}} - \expandafter\def\csname simpleicon@mauticicon\endcsname {\simpleiconsmap\symbol{"F080}} - \expandafter\def\csname simpleicon@maxicon\endcsname {\simpleiconsmap\symbol{"F081}} - \expandafter\def\csname simpleicon@maxplanckgesellschafticon\endcsname {\simpleiconsmap\symbol{"F082}} - \expandafter\def\csname simpleicon@maytagicon\endcsname {\simpleiconsmap\symbol{"F083}} - \expandafter\def\csname simpleicon@mazdaicon\endcsname {\simpleiconsmap\symbol{"F084}} - \expandafter\def\csname simpleicon@mcafeeicon\endcsname {\simpleiconsmap\symbol{"F085}} - \expandafter\def\csname simpleicon@mcdonaldsicon\endcsname {\simpleiconsmap\symbol{"F086}} - \expandafter\def\csname simpleicon@mclarenicon\endcsname {\simpleiconsmap\symbol{"F087}} - \expandafter\def\csname simpleicon@mdbookicon\endcsname {\simpleiconsmap\symbol{"F088}} - \expandafter\def\csname simpleicon@mdnwebdocsicon\endcsname {\simpleiconsmap\symbol{"F089}} - \expandafter\def\csname simpleicon@mdxicon\endcsname {\simpleiconsmap\symbol{"F08A}} - \expandafter\def\csname simpleicon@mediafireicon\endcsname {\simpleiconsmap\symbol{"F08B}} - \expandafter\def\csname simpleicon@mediamarkticon\endcsname {\simpleiconsmap\symbol{"F08C}} - \expandafter\def\csname simpleicon@mediatekicon\endcsname {\simpleiconsmap\symbol{"F08D}} - \expandafter\def\csname simpleicon@medibangpainticon\endcsname {\simpleiconsmap\symbol{"F08E}} - \expandafter\def\csname simpleicon@mediumicon\endcsname {\simpleiconsmap\symbol{"F08F}} - \expandafter\def\csname simpleicon@medusaicon\endcsname {\simpleiconsmap\symbol{"F090}} - \expandafter\def\csname simpleicon@meetupicon\endcsname {\simpleiconsmap\symbol{"F091}} - \expandafter\def\csname simpleicon@megaicon\endcsname {\simpleiconsmap\symbol{"F092}} - \expandafter\def\csname simpleicon@meilisearchicon\endcsname {\simpleiconsmap\symbol{"F093}} - \expandafter\def\csname simpleicon@meituanicon\endcsname {\simpleiconsmap\symbol{"F094}} - \expandafter\def\csname simpleicon@meizuicon\endcsname {\simpleiconsmap\symbol{"F095}} - \expandafter\def\csname simpleicon@mendeleyicon\endcsname {\simpleiconsmap\symbol{"F096}} - \expandafter\def\csname simpleicon@mentorcruiseicon\endcsname {\simpleiconsmap\symbol{"F097}} - \expandafter\def\csname simpleicon@mercadopagoicon\endcsname {\simpleiconsmap\symbol{"F098}} - \expandafter\def\csname simpleicon@mercedesicon\endcsname {\simpleiconsmap\symbol{"F099}} - \expandafter\def\csname simpleicon@merckicon\endcsname {\simpleiconsmap\symbol{"F09A}} - \expandafter\def\csname simpleicon@mercurialicon\endcsname {\simpleiconsmap\symbol{"F09B}} - \expandafter\def\csname simpleicon@mermaidicon\endcsname {\simpleiconsmap\symbol{"F09C}} - \expandafter\def\csname simpleicon@messengericon\endcsname {\simpleiconsmap\symbol{"F09D}} - \expandafter\def\csname simpleicon@metaicon\endcsname {\simpleiconsmap\symbol{"F09E}} - \expandafter\def\csname simpleicon@metabaseicon\endcsname {\simpleiconsmap\symbol{"F09F}} - \expandafter\def\csname simpleicon@metacriticicon\endcsname {\simpleiconsmap\symbol{"F0A0}} - \expandafter\def\csname simpleicon@metafiltericon\endcsname {\simpleiconsmap\symbol{"F0A1}} - \expandafter\def\csname simpleicon@metasploiticon\endcsname {\simpleiconsmap\symbol{"F0A2}} - \expandafter\def\csname simpleicon@meteoricon\endcsname {\simpleiconsmap\symbol{"F0A3}} - \expandafter\def\csname simpleicon@metroicon\endcsname {\simpleiconsmap\symbol{"F0A4}} - \expandafter\def\csname simpleicon@metrodelaciudaddemexicoicon\endcsname {\simpleiconsmap\symbol{"F0A5}} - \expandafter\def\csname simpleicon@metrodemadridicon\endcsname {\simpleiconsmap\symbol{"F0A6}} - \expandafter\def\csname simpleicon@metrodeparisicon\endcsname {\simpleiconsmap\symbol{"F0A7}} - \expandafter\def\csname simpleicon@meweicon\endcsname {\simpleiconsmap\symbol{"F0A8}} - \expandafter\def\csname simpleicon@mgicon\endcsname {\simpleiconsmap\symbol{"F0A9}} - \expandafter\def\csname simpleicon@microbiticon\endcsname {\simpleiconsmap\symbol{"F0AA}} - \expandafter\def\csname simpleicon@microdotblogicon\endcsname {\simpleiconsmap\symbol{"F0AB}} - \expandafter\def\csname simpleicon@microeditoricon\endcsname {\simpleiconsmap\symbol{"F0AC}} - \expandafter\def\csname simpleicon@microgeneticsicon\endcsname {\simpleiconsmap\symbol{"F0AD}} - \expandafter\def\csname simpleicon@micropythonicon\endcsname {\simpleiconsmap\symbol{"F0AE}} - \expandafter\def\csname simpleicon@microstationicon\endcsname {\simpleiconsmap\symbol{"F0AF}} - \expandafter\def\csname simpleicon@microstrategyicon\endcsname {\simpleiconsmap\symbol{"F0B0}} - \expandafter\def\csname simpleicon@midiicon\endcsname {\simpleiconsmap\symbol{"F0B1}} - \expandafter\def\csname simpleicon@migaduicon\endcsname {\simpleiconsmap\symbol{"F0B2}} - \expandafter\def\csname simpleicon@mikrotikicon\endcsname {\simpleiconsmap\symbol{"F0B3}} - \expandafter\def\csname simpleicon@milanoteicon\endcsname {\simpleiconsmap\symbol{"F0B4}} - \expandafter\def\csname simpleicon@milvusicon\endcsname {\simpleiconsmap\symbol{"F0B5}} - \expandafter\def\csname simpleicon@mindsicon\endcsname {\simpleiconsmap\symbol{"F0B6}} - \expandafter\def\csname simpleicon@minetesticon\endcsname {\simpleiconsmap\symbol{"F0B7}} - \expandafter\def\csname simpleicon@miniicon\endcsname {\simpleiconsmap\symbol{"F0B8}} - \expandafter\def\csname simpleicon@minioicon\endcsname {\simpleiconsmap\symbol{"F0B9}} - \expandafter\def\csname simpleicon@mintlifyicon\endcsname {\simpleiconsmap\symbol{"F0BA}} - \expandafter\def\csname simpleicon@minutemailericon\endcsname {\simpleiconsmap\symbol{"F0BB}} - \expandafter\def\csname simpleicon@mirahezeicon\endcsname {\simpleiconsmap\symbol{"F0BC}} - \expandafter\def\csname simpleicon@miroicon\endcsname {\simpleiconsmap\symbol{"F0BD}} - \expandafter\def\csname simpleicon@misskeyicon\endcsname {\simpleiconsmap\symbol{"F0BE}} - \expandafter\def\csname simpleicon@mitsubishiicon\endcsname {\simpleiconsmap\symbol{"F0BF}} - \expandafter\def\csname simpleicon@mixicon\endcsname {\simpleiconsmap\symbol{"F0C0}} - \expandafter\def\csname simpleicon@mixcloudicon\endcsname {\simpleiconsmap\symbol{"F0C1}} - \expandafter\def\csname simpleicon@mixpanelicon\endcsname {\simpleiconsmap\symbol{"F0C2}} - \expandafter\def\csname simpleicon@mlbicon\endcsname {\simpleiconsmap\symbol{"F0C3}} - \expandafter\def\csname simpleicon@mlflowicon\endcsname {\simpleiconsmap\symbol{"F0C4}} - \expandafter\def\csname simpleicon@mobxicon\endcsname {\simpleiconsmap\symbol{"F0C5}} - \expandafter\def\csname simpleicon@mobxstatetreeicon\endcsname {\simpleiconsmap\symbol{"F0C6}} - \expandafter\def\csname simpleicon@mochaicon\endcsname {\simpleiconsmap\symbol{"F0C7}} - \expandafter\def\csname simpleicon@mockserviceworkericon\endcsname {\simpleiconsmap\symbol{"F0C8}} - \expandafter\def\csname simpleicon@modalicon\endcsname {\simpleiconsmap\symbol{"F0C9}} - \expandafter\def\csname simpleicon@modinicon\endcsname {\simpleiconsmap\symbol{"F0CA}} - \expandafter\def\csname simpleicon@modrinthicon\endcsname {\simpleiconsmap\symbol{"F0CB}} - \expandafter\def\csname simpleicon@modxicon\endcsname {\simpleiconsmap\symbol{"F0CC}} - \expandafter\def\csname simpleicon@moleculericon\endcsname {\simpleiconsmap\symbol{"F0CD}} - \expandafter\def\csname simpleicon@momenteoicon\endcsname {\simpleiconsmap\symbol{"F0CE}} - \expandafter\def\csname simpleicon@moneroicon\endcsname {\simpleiconsmap\symbol{"F0CF}} - \expandafter\def\csname simpleicon@moneygramicon\endcsname {\simpleiconsmap\symbol{"F0D0}} - \expandafter\def\csname simpleicon@mongodbicon\endcsname {\simpleiconsmap\symbol{"F0D1}} - \expandafter\def\csname simpleicon@mongooseicon\endcsname {\simpleiconsmap\symbol{"F0D2}} - \expandafter\def\csname simpleicon@mongoosedotwsicon\endcsname {\simpleiconsmap\symbol{"F0D3}} - \expandafter\def\csname simpleicon@monicaicon\endcsname {\simpleiconsmap\symbol{"F0D4}} - \expandafter\def\csname simpleicon@monkeytieicon\endcsname {\simpleiconsmap\symbol{"F0D5}} - \expandafter\def\csname simpleicon@monkeytypeicon\endcsname {\simpleiconsmap\symbol{"F0D6}} - \expandafter\def\csname simpleicon@monogameicon\endcsname {\simpleiconsmap\symbol{"F0D7}} - \expandafter\def\csname simpleicon@monoprixicon\endcsname {\simpleiconsmap\symbol{"F0D8}} - \expandafter\def\csname simpleicon@monstericon\endcsname {\simpleiconsmap\symbol{"F0D9}} - \expandafter\def\csname simpleicon@monzoicon\endcsname {\simpleiconsmap\symbol{"F0DA}} - \expandafter\def\csname simpleicon@mooicon\endcsname {\simpleiconsmap\symbol{"F0DB}} - \expandafter\def\csname simpleicon@moodleicon\endcsname {\simpleiconsmap\symbol{"F0DC}} - \expandafter\def\csname simpleicon@moonrepoicon\endcsname {\simpleiconsmap\symbol{"F0DD}} - \expandafter\def\csname simpleicon@moqicon\endcsname {\simpleiconsmap\symbol{"F0DE}} - \expandafter\def\csname simpleicon@moqupsicon\endcsname {\simpleiconsmap\symbol{"F0DF}} - \expandafter\def\csname simpleicon@morrisonsicon\endcsname {\simpleiconsmap\symbol{"F0E0}} - \expandafter\def\csname simpleicon@moscowmetroicon\endcsname {\simpleiconsmap\symbol{"F0E1}} - \expandafter\def\csname simpleicon@motorolaicon\endcsname {\simpleiconsmap\symbol{"F0E2}} - \expandafter\def\csname simpleicon@mozillaicon\endcsname {\simpleiconsmap\symbol{"F0E3}} - \expandafter\def\csname simpleicon@mpvicon\endcsname {\simpleiconsmap\symbol{"F0E4}} - \expandafter\def\csname simpleicon@mqtticon\endcsname {\simpleiconsmap\symbol{"F0E5}} - \expandafter\def\csname simpleicon@msiicon\endcsname {\simpleiconsmap\symbol{"F0E6}} - \expandafter\def\csname simpleicon@msibusinessicon\endcsname {\simpleiconsmap\symbol{"F0E7}} - \expandafter\def\csname simpleicon@mtaicon\endcsname {\simpleiconsmap\symbol{"F0E8}} - \expandafter\def\csname simpleicon@mtricon\endcsname {\simpleiconsmap\symbol{"F0E9}} - \expandafter\def\csname simpleicon@mubiicon\endcsname {\simpleiconsmap\symbol{"F0EA}} - \expandafter\def\csname simpleicon@muiicon\endcsname {\simpleiconsmap\symbol{"F0EB}} - \expandafter\def\csname simpleicon@mulesofticon\endcsname {\simpleiconsmap\symbol{"F0EC}} - \expandafter\def\csname simpleicon@mullericon\endcsname {\simpleiconsmap\symbol{"F0ED}} - \expandafter\def\csname simpleicon@multisimicon\endcsname {\simpleiconsmap\symbol{"F0EE}} - \expandafter\def\csname simpleicon@mumbleicon\endcsname {\simpleiconsmap\symbol{"F0EF}} - \expandafter\def\csname simpleicon@muoicon\endcsname {\simpleiconsmap\symbol{"F0F0}} - \expandafter\def\csname simpleicon@muralicon\endcsname {\simpleiconsmap\symbol{"F0F1}} - \expandafter\def\csname simpleicon@musescoreicon\endcsname {\simpleiconsmap\symbol{"F0F2}} - \expandafter\def\csname simpleicon@musicbrainzicon\endcsname {\simpleiconsmap\symbol{"F0F3}} - \expandafter\def\csname simpleicon@mxlinuxicon\endcsname {\simpleiconsmap\symbol{"F0F4}} - \expandafter\def\csname simpleicon@myanimelisticon\endcsname {\simpleiconsmap\symbol{"F0F5}} - \expandafter\def\csname simpleicon@mygeticon\endcsname {\simpleiconsmap\symbol{"F0F6}} - \expandafter\def\csname simpleicon@myobicon\endcsname {\simpleiconsmap\symbol{"F0F7}} - \expandafter\def\csname simpleicon@myspaceicon\endcsname {\simpleiconsmap\symbol{"F0F8}} - \expandafter\def\csname simpleicon@mysqlicon\endcsname {\simpleiconsmap\symbol{"F0F9}} - \expandafter\def\csname simpleicon@n26icon\endcsname {\simpleiconsmap\symbol{"F0FA}} - \expandafter\def\csname simpleicon@n8nicon\endcsname {\simpleiconsmap\symbol{"F0FB}} - \expandafter\def\csname simpleicon@namebaseicon\endcsname {\simpleiconsmap\symbol{"F0FC}} - \expandafter\def\csname simpleicon@namecheapicon\endcsname {\simpleiconsmap\symbol{"F0FD}} - \expandafter\def\csname simpleicon@namemcicon\endcsname {\simpleiconsmap\symbol{"F0FE}} - \expandafter\def\csname simpleicon@namesiloicon\endcsname {\simpleiconsmap\symbol{"F0FF}} - \expandafter\def\csname simpleicon@namuwikiicon\endcsname {\simpleiconsmap\symbol{"F100}} - \expandafter\def\csname simpleicon@nanoicon\endcsname {\simpleiconsmap\symbol{"F101}} - \expandafter\def\csname simpleicon@nasaicon\endcsname {\simpleiconsmap\symbol{"F102}} - \expandafter\def\csname simpleicon@nationalgridicon\endcsname {\simpleiconsmap\symbol{"F103}} - \expandafter\def\csname simpleicon@nationalrailicon\endcsname {\simpleiconsmap\symbol{"F104}} - \expandafter\def\csname simpleicon@nativescripticon\endcsname {\simpleiconsmap\symbol{"F105}} - \expandafter\def\csname simpleicon@natsdotioicon\endcsname {\simpleiconsmap\symbol{"F106}} - \expandafter\def\csname simpleicon@navericon\endcsname {\simpleiconsmap\symbol{"F107}} - \expandafter\def\csname simpleicon@nbaicon\endcsname {\simpleiconsmap\symbol{"F108}} - \expandafter\def\csname simpleicon@nbbicon\endcsname {\simpleiconsmap\symbol{"F109}} - \expandafter\def\csname simpleicon@nbcicon\endcsname {\simpleiconsmap\symbol{"F10A}} - \expandafter\def\csname simpleicon@ndricon\endcsname {\simpleiconsmap\symbol{"F10B}} - \expandafter\def\csname simpleicon@nearicon\endcsname {\simpleiconsmap\symbol{"F10C}} - \expandafter\def\csname simpleicon@necicon\endcsname {\simpleiconsmap\symbol{"F10D}} - \expandafter\def\csname simpleicon@neo4jicon\endcsname {\simpleiconsmap\symbol{"F10E}} - \expandafter\def\csname simpleicon@neovimicon\endcsname {\simpleiconsmap\symbol{"F10F}} - \expandafter\def\csname simpleicon@neptuneicon\endcsname {\simpleiconsmap\symbol{"F110}} - \expandafter\def\csname simpleicon@nestjsicon\endcsname {\simpleiconsmap\symbol{"F111}} - \expandafter\def\csname simpleicon@netappicon\endcsname {\simpleiconsmap\symbol{"F112}} - \expandafter\def\csname simpleicon@netbsdicon\endcsname {\simpleiconsmap\symbol{"F113}} - \expandafter\def\csname simpleicon@netcupicon\endcsname {\simpleiconsmap\symbol{"F114}} - \expandafter\def\csname simpleicon@netdataicon\endcsname {\simpleiconsmap\symbol{"F115}} - \expandafter\def\csname simpleicon@neteasecloudmusicicon\endcsname {\simpleiconsmap\symbol{"F116}} - \expandafter\def\csname simpleicon@netflixicon\endcsname {\simpleiconsmap\symbol{"F117}} - \expandafter\def\csname simpleicon@netgearicon\endcsname {\simpleiconsmap\symbol{"F118}} - \expandafter\def\csname simpleicon@netlifyicon\endcsname {\simpleiconsmap\symbol{"F119}} - \expandafter\def\csname simpleicon@netteicon\endcsname {\simpleiconsmap\symbol{"F11A}} - \expandafter\def\csname simpleicon@nettoicon\endcsname {\simpleiconsmap\symbol{"F11B}} - \expandafter\def\csname simpleicon@neutralinojsicon\endcsname {\simpleiconsmap\symbol{"F11C}} - \expandafter\def\csname simpleicon@newbalanceicon\endcsname {\simpleiconsmap\symbol{"F11D}} - \expandafter\def\csname simpleicon@neweggicon\endcsname {\simpleiconsmap\symbol{"F11E}} - \expandafter\def\csname simpleicon@newjapanprowrestlingicon\endcsname {\simpleiconsmap\symbol{"F11F}} - \expandafter\def\csname simpleicon@newrelicicon\endcsname {\simpleiconsmap\symbol{"F120}} - \expandafter\def\csname simpleicon@newyorktimesicon\endcsname {\simpleiconsmap\symbol{"F121}} - \expandafter\def\csname simpleicon@nextbilliondotaiicon\endcsname {\simpleiconsmap\symbol{"F122}} - \expandafter\def\csname simpleicon@nextcloudicon\endcsname {\simpleiconsmap\symbol{"F123}} - \expandafter\def\csname simpleicon@nextdnsicon\endcsname {\simpleiconsmap\symbol{"F124}} - \expandafter\def\csname simpleicon@nextdooricon\endcsname {\simpleiconsmap\symbol{"F125}} - \expandafter\def\csname simpleicon@nextdotjsicon\endcsname {\simpleiconsmap\symbol{"F126}} - \expandafter\def\csname simpleicon@nextraicon\endcsname {\simpleiconsmap\symbol{"F127}} - \expandafter\def\csname simpleicon@nextuiicon\endcsname {\simpleiconsmap\symbol{"F128}} - \expandafter\def\csname simpleicon@nexusmodsicon\endcsname {\simpleiconsmap\symbol{"F129}} - \expandafter\def\csname simpleicon@nfcicon\endcsname {\simpleiconsmap\symbol{"F12A}} - \expandafter\def\csname simpleicon@nginxicon\endcsname {\simpleiconsmap\symbol{"F12B}} - \expandafter\def\csname simpleicon@nginxproxymanagericon\endcsname {\simpleiconsmap\symbol{"F12C}} - \expandafter\def\csname simpleicon@ngrokicon\endcsname {\simpleiconsmap\symbol{"F12D}} - \expandafter\def\csname simpleicon@ngrxicon\endcsname {\simpleiconsmap\symbol{"F12E}} - \expandafter\def\csname simpleicon@nhlicon\endcsname {\simpleiconsmap\symbol{"F12F}} - \expandafter\def\csname simpleicon@nicehashicon\endcsname {\simpleiconsmap\symbol{"F130}} - \expandafter\def\csname simpleicon@niconicoicon\endcsname {\simpleiconsmap\symbol{"F131}} - \expandafter\def\csname simpleicon@nikeicon\endcsname {\simpleiconsmap\symbol{"F132}} - \expandafter\def\csname simpleicon@nikonicon\endcsname {\simpleiconsmap\symbol{"F133}} - \expandafter\def\csname simpleicon@nimicon\endcsname {\simpleiconsmap\symbol{"F134}} - \expandafter\def\csname simpleicon@nintendoicon\endcsname {\simpleiconsmap\symbol{"F135}} - \expandafter\def\csname simpleicon@nintendo3dsicon\endcsname {\simpleiconsmap\symbol{"F136}} - \expandafter\def\csname simpleicon@nintendogamecubeicon\endcsname {\simpleiconsmap\symbol{"F137}} - \expandafter\def\csname simpleicon@nintendoswitchicon\endcsname {\simpleiconsmap\symbol{"F138}} - \expandafter\def\csname simpleicon@nissanicon\endcsname {\simpleiconsmap\symbol{"F139}} - \expandafter\def\csname simpleicon@nixosicon\endcsname {\simpleiconsmap\symbol{"F13A}} - \expandafter\def\csname simpleicon@nodedotjsicon\endcsname {\simpleiconsmap\symbol{"F13B}} - \expandafter\def\csname simpleicon@nodemonicon\endcsname {\simpleiconsmap\symbol{"F13C}} - \expandafter\def\csname simpleicon@noderedicon\endcsname {\simpleiconsmap\symbol{"F13D}} - \expandafter\def\csname simpleicon@nokiaicon\endcsname {\simpleiconsmap\symbol{"F13E}} - \expandafter\def\csname simpleicon@nomadicon\endcsname {\simpleiconsmap\symbol{"F13F}} - \expandafter\def\csname simpleicon@norcoicon\endcsname {\simpleiconsmap\symbol{"F140}} - \expandafter\def\csname simpleicon@nordicsemiconductoricon\endcsname {\simpleiconsmap\symbol{"F141}} - \expandafter\def\csname simpleicon@nordvpnicon\endcsname {\simpleiconsmap\symbol{"F142}} - \expandafter\def\csname simpleicon@normalizedotcssicon\endcsname {\simpleiconsmap\symbol{"F143}} - \expandafter\def\csname simpleicon@nortonicon\endcsname {\simpleiconsmap\symbol{"F144}} - \expandafter\def\csname simpleicon@norwegianicon\endcsname {\simpleiconsmap\symbol{"F145}} - \expandafter\def\csname simpleicon@notepadplusplusicon\endcsname {\simpleiconsmap\symbol{"F146}} - \expandafter\def\csname simpleicon@notionicon\endcsname {\simpleiconsmap\symbol{"F147}} - \expandafter\def\csname simpleicon@notisticon\endcsname {\simpleiconsmap\symbol{"F148}} - \expandafter\def\csname simpleicon@nounprojecticon\endcsname {\simpleiconsmap\symbol{"F149}} - \expandafter\def\csname simpleicon@novuicon\endcsname {\simpleiconsmap\symbol{"F14A}} - \expandafter\def\csname simpleicon@nowicon\endcsname {\simpleiconsmap\symbol{"F14B}} - \expandafter\def\csname simpleicon@npmicon\endcsname {\simpleiconsmap\symbol{"F14C}} - \expandafter\def\csname simpleicon@nrwlicon\endcsname {\simpleiconsmap\symbol{"F14D}} - \expandafter\def\csname simpleicon@nsisicon\endcsname {\simpleiconsmap\symbol{"F14E}} - \expandafter\def\csname simpleicon@ntfyicon\endcsname {\simpleiconsmap\symbol{"F14F}} - \expandafter\def\csname simpleicon@nubankicon\endcsname {\simpleiconsmap\symbol{"F150}} - \expandafter\def\csname simpleicon@nucleoicon\endcsname {\simpleiconsmap\symbol{"F151}} - \expandafter\def\csname simpleicon@nugeticon\endcsname {\simpleiconsmap\symbol{"F152}} - \expandafter\def\csname simpleicon@nukeicon\endcsname {\simpleiconsmap\symbol{"F153}} - \expandafter\def\csname simpleicon@numbaicon\endcsname {\simpleiconsmap\symbol{"F154}} - \expandafter\def\csname simpleicon@numpyicon\endcsname {\simpleiconsmap\symbol{"F155}} - \expandafter\def\csname simpleicon@nunjucksicon\endcsname {\simpleiconsmap\symbol{"F156}} - \expandafter\def\csname simpleicon@nushellicon\endcsname {\simpleiconsmap\symbol{"F157}} - \expandafter\def\csname simpleicon@nutanixicon\endcsname {\simpleiconsmap\symbol{"F158}} - \expandafter\def\csname simpleicon@nuxtdotjsicon\endcsname {\simpleiconsmap\symbol{"F159}} - \expandafter\def\csname simpleicon@nvidiaicon\endcsname {\simpleiconsmap\symbol{"F15A}} - \expandafter\def\csname simpleicon@nvmicon\endcsname {\simpleiconsmap\symbol{"F15B}} - \expandafter\def\csname simpleicon@nxicon\endcsname {\simpleiconsmap\symbol{"F15C}} - \expandafter\def\csname simpleicon@nxpicon\endcsname {\simpleiconsmap\symbol{"F15D}} - \expandafter\def\csname simpleicon@nzxticon\endcsname {\simpleiconsmap\symbol{"F15E}} - \expandafter\def\csname simpleicon@observableicon\endcsname {\simpleiconsmap\symbol{"F15F}} - \expandafter\def\csname simpleicon@obsidianicon\endcsname {\simpleiconsmap\symbol{"F160}} - \expandafter\def\csname simpleicon@obsstudioicon\endcsname {\simpleiconsmap\symbol{"F161}} - \expandafter\def\csname simpleicon@ocamlicon\endcsname {\simpleiconsmap\symbol{"F162}} - \expandafter\def\csname simpleicon@oclificon\endcsname {\simpleiconsmap\symbol{"F163}} - \expandafter\def\csname simpleicon@octanerendericon\endcsname {\simpleiconsmap\symbol{"F164}} - \expandafter\def\csname simpleicon@octaveicon\endcsname {\simpleiconsmap\symbol{"F165}} - \expandafter\def\csname simpleicon@octobercmsicon\endcsname {\simpleiconsmap\symbol{"F166}} - \expandafter\def\csname simpleicon@octoprinticon\endcsname {\simpleiconsmap\symbol{"F167}} - \expandafter\def\csname simpleicon@octopusdeployicon\endcsname {\simpleiconsmap\symbol{"F168}} - \expandafter\def\csname simpleicon@oculusicon\endcsname {\simpleiconsmap\symbol{"F169}} - \expandafter\def\csname simpleicon@odnoklassnikiicon\endcsname {\simpleiconsmap\symbol{"F16A}} - \expandafter\def\csname simpleicon@odooicon\endcsname {\simpleiconsmap\symbol{"F16B}} - \expandafter\def\csname simpleicon@odyseeicon\endcsname {\simpleiconsmap\symbol{"F16C}} - \expandafter\def\csname simpleicon@ohdearicon\endcsname {\simpleiconsmap\symbol{"F16D}} - \expandafter\def\csname simpleicon@okcupidicon\endcsname {\simpleiconsmap\symbol{"F16E}} - \expandafter\def\csname simpleicon@oktaicon\endcsname {\simpleiconsmap\symbol{"F16F}} - \expandafter\def\csname simpleicon@oneplusicon\endcsname {\simpleiconsmap\symbol{"F170}} - \expandafter\def\csname simpleicon@onlyfansicon\endcsname {\simpleiconsmap\symbol{"F171}} - \expandafter\def\csname simpleicon@onlyofficeicon\endcsname {\simpleiconsmap\symbol{"F172}} - \expandafter\def\csname simpleicon@onnxicon\endcsname {\simpleiconsmap\symbol{"F173}} - \expandafter\def\csname simpleicon@onstaricon\endcsname {\simpleiconsmap\symbol{"F174}} - \expandafter\def\csname simpleicon@opelicon\endcsname {\simpleiconsmap\symbol{"F175}} - \expandafter\def\csname simpleicon@openaccessicon\endcsname {\simpleiconsmap\symbol{"F176}} - \expandafter\def\csname simpleicon@openaiicon\endcsname {\simpleiconsmap\symbol{"F177}} - \expandafter\def\csname simpleicon@openaigymicon\endcsname {\simpleiconsmap\symbol{"F178}} - \expandafter\def\csname simpleicon@openapiinitiativeicon\endcsname {\simpleiconsmap\symbol{"F179}} - \expandafter\def\csname simpleicon@openbadgesicon\endcsname {\simpleiconsmap\symbol{"F17A}} - \expandafter\def\csname simpleicon@openbsdicon\endcsname {\simpleiconsmap\symbol{"F17B}} - \expandafter\def\csname simpleicon@openbugbountyicon\endcsname {\simpleiconsmap\symbol{"F17C}} - \expandafter\def\csname simpleicon@opencollectiveicon\endcsname {\simpleiconsmap\symbol{"F17D}} - \expandafter\def\csname simpleicon@opencontainersinitiativeicon\endcsname {\simpleiconsmap\symbol{"F17E}} - \expandafter\def\csname simpleicon@opencvicon\endcsname {\simpleiconsmap\symbol{"F17F}} - \expandafter\def\csname simpleicon@openfaasicon\endcsname {\simpleiconsmap\symbol{"F180}} - \expandafter\def\csname simpleicon@openglicon\endcsname {\simpleiconsmap\symbol{"F181}} - \expandafter\def\csname simpleicon@openhabicon\endcsname {\simpleiconsmap\symbol{"F182}} - \expandafter\def\csname simpleicon@openidicon\endcsname {\simpleiconsmap\symbol{"F183}} - \expandafter\def\csname simpleicon@openjdkicon\endcsname {\simpleiconsmap\symbol{"F184}} - \expandafter\def\csname simpleicon@openjsfoundationicon\endcsname {\simpleiconsmap\symbol{"F185}} - \expandafter\def\csname simpleicon@openlayersicon\endcsname {\simpleiconsmap\symbol{"F186}} - \expandafter\def\csname simpleicon@openmediavaulticon\endcsname {\simpleiconsmap\symbol{"F187}} - \expandafter\def\csname simpleicon@openminedicon\endcsname {\simpleiconsmap\symbol{"F188}} - \expandafter\def\csname simpleicon@opennebulaicon\endcsname {\simpleiconsmap\symbol{"F189}} - \expandafter\def\csname simpleicon@openprojecticon\endcsname {\simpleiconsmap\symbol{"F18A}} - \expandafter\def\csname simpleicon@openscadicon\endcsname {\simpleiconsmap\symbol{"F18B}} - \expandafter\def\csname simpleicon@openseaicon\endcsname {\simpleiconsmap\symbol{"F18C}} - \expandafter\def\csname simpleicon@opensearchicon\endcsname {\simpleiconsmap\symbol{"F18D}} - \expandafter\def\csname simpleicon@opensourcehardwareicon\endcsname {\simpleiconsmap\symbol{"F18E}} - \expandafter\def\csname simpleicon@opensourceinitiativeicon\endcsname {\simpleiconsmap\symbol{"F18F}} - \expandafter\def\csname simpleicon@opensslicon\endcsname {\simpleiconsmap\symbol{"F190}} - \expandafter\def\csname simpleicon@openstackicon\endcsname {\simpleiconsmap\symbol{"F191}} - \expandafter\def\csname simpleicon@openstreetmapicon\endcsname {\simpleiconsmap\symbol{"F192}} - \expandafter\def\csname simpleicon@opensuseicon\endcsname {\simpleiconsmap\symbol{"F193}} - \expandafter\def\csname simpleicon@opentelemetryicon\endcsname {\simpleiconsmap\symbol{"F194}} - \expandafter\def\csname simpleicon@opentexticon\endcsname {\simpleiconsmap\symbol{"F195}} - \expandafter\def\csname simpleicon@opentofuicon\endcsname {\simpleiconsmap\symbol{"F196}} - \expandafter\def\csname simpleicon@openverseicon\endcsname {\simpleiconsmap\symbol{"F197}} - \expandafter\def\csname simpleicon@openvpnicon\endcsname {\simpleiconsmap\symbol{"F198}} - \expandafter\def\csname simpleicon@openwrticon\endcsname {\simpleiconsmap\symbol{"F199}} - \expandafter\def\csname simpleicon@openzeppelinicon\endcsname {\simpleiconsmap\symbol{"F19A}} - \expandafter\def\csname simpleicon@openzfsicon\endcsname {\simpleiconsmap\symbol{"F19B}} - \expandafter\def\csname simpleicon@operaicon\endcsname {\simpleiconsmap\symbol{"F19C}} - \expandafter\def\csname simpleicon@operagxicon\endcsname {\simpleiconsmap\symbol{"F19D}} - \expandafter\def\csname simpleicon@opnsenseicon\endcsname {\simpleiconsmap\symbol{"F19E}} - \expandafter\def\csname simpleicon@oppoicon\endcsname {\simpleiconsmap\symbol{"F19F}} - \expandafter\def\csname simpleicon@opsgenieicon\endcsname {\simpleiconsmap\symbol{"F1A0}} - \expandafter\def\csname simpleicon@opslevelicon\endcsname {\simpleiconsmap\symbol{"F1A1}} - \expandafter\def\csname simpleicon@optimismicon\endcsname {\simpleiconsmap\symbol{"F1A2}} - \expandafter\def\csname simpleicon@oracleicon\endcsname {\simpleiconsmap\symbol{"F1A3}} - \expandafter\def\csname simpleicon@orangeicon\endcsname {\simpleiconsmap\symbol{"F1A4}} - \expandafter\def\csname simpleicon@orcidicon\endcsname {\simpleiconsmap\symbol{"F1A5}} - \expandafter\def\csname simpleicon@oreillyicon\endcsname {\simpleiconsmap\symbol{"F1A6}} - \expandafter\def\csname simpleicon@orgicon\endcsname {\simpleiconsmap\symbol{"F1A7}} - \expandafter\def\csname simpleicon@organicmapsicon\endcsname {\simpleiconsmap\symbol{"F1A8}} - \expandafter\def\csname simpleicon@originicon\endcsname {\simpleiconsmap\symbol{"F1A9}} - \expandafter\def\csname simpleicon@osanoicon\endcsname {\simpleiconsmap\symbol{"F1AA}} - \expandafter\def\csname simpleicon@osficon\endcsname {\simpleiconsmap\symbol{"F1AB}} - \expandafter\def\csname simpleicon@osgeoicon\endcsname {\simpleiconsmap\symbol{"F1AC}} - \expandafter\def\csname simpleicon@oshkoshicon\endcsname {\simpleiconsmap\symbol{"F1AD}} - \expandafter\def\csname simpleicon@osmcicon\endcsname {\simpleiconsmap\symbol{"F1AE}} - \expandafter\def\csname simpleicon@osuicon\endcsname {\simpleiconsmap\symbol{"F1AF}} - \expandafter\def\csname simpleicon@ottoicon\endcsname {\simpleiconsmap\symbol{"F1B0}} - \expandafter\def\csname simpleicon@overcasticon\endcsname {\simpleiconsmap\symbol{"F1B1}} - \expandafter\def\csname simpleicon@overleaficon\endcsname {\simpleiconsmap\symbol{"F1B2}} - \expandafter\def\csname simpleicon@ovhicon\endcsname {\simpleiconsmap\symbol{"F1B3}} - \expandafter\def\csname simpleicon@owaspicon\endcsname {\simpleiconsmap\symbol{"F1B4}} - \expandafter\def\csname simpleicon@owncloudicon\endcsname {\simpleiconsmap\symbol{"F1B5}} - \expandafter\def\csname simpleicon@oxygenicon\endcsname {\simpleiconsmap\symbol{"F1B6}} - \expandafter\def\csname simpleicon@oyoicon\endcsname {\simpleiconsmap\symbol{"F1B7}} - \expandafter\def\csname simpleicon@p5dotjsicon\endcsname {\simpleiconsmap\symbol{"F1B8}} - \expandafter\def\csname simpleicon@packagisticon\endcsname {\simpleiconsmap\symbol{"F1B9}} - \expandafter\def\csname simpleicon@packericon\endcsname {\simpleiconsmap\symbol{"F1BA}} - \expandafter\def\csname simpleicon@packticon\endcsname {\simpleiconsmap\symbol{"F1BB}} - \expandafter\def\csname simpleicon@paddleicon\endcsname {\simpleiconsmap\symbol{"F1BC}} - \expandafter\def\csname simpleicon@paddlepaddleicon\endcsname {\simpleiconsmap\symbol{"F1BD}} - \expandafter\def\csname simpleicon@paddypowericon\endcsname {\simpleiconsmap\symbol{"F1BE}} - \expandafter\def\csname simpleicon@pagekiticon\endcsname {\simpleiconsmap\symbol{"F1BF}} - \expandafter\def\csname simpleicon@pagerdutyicon\endcsname {\simpleiconsmap\symbol{"F1C0}} - \expandafter\def\csname simpleicon@pagespeedinsightsicon\endcsname {\simpleiconsmap\symbol{"F1C1}} - \expandafter\def\csname simpleicon@pagseguroicon\endcsname {\simpleiconsmap\symbol{"F1C2}} - \expandafter\def\csname simpleicon@palantiricon\endcsname {\simpleiconsmap\symbol{"F1C3}} - \expandafter\def\csname simpleicon@paloaltonetworksicon\endcsname {\simpleiconsmap\symbol{"F1C4}} - \expandafter\def\csname simpleicon@paloaltosoftwareicon\endcsname {\simpleiconsmap\symbol{"F1C5}} - \expandafter\def\csname simpleicon@panasonicicon\endcsname {\simpleiconsmap\symbol{"F1C6}} - \expandafter\def\csname simpleicon@pandasicon\endcsname {\simpleiconsmap\symbol{"F1C7}} - \expandafter\def\csname simpleicon@pandoraicon\endcsname {\simpleiconsmap\symbol{"F1C8}} - \expandafter\def\csname simpleicon@pantheonicon\endcsname {\simpleiconsmap\symbol{"F1C9}} - \expandafter\def\csname simpleicon@paperlessngxicon\endcsname {\simpleiconsmap\symbol{"F1CA}} - \expandafter\def\csname simpleicon@paperspaceicon\endcsname {\simpleiconsmap\symbol{"F1CB}} - \expandafter\def\csname simpleicon@paperswithcodeicon\endcsname {\simpleiconsmap\symbol{"F1CC}} - \expandafter\def\csname simpleicon@paramountplusicon\endcsname {\simpleiconsmap\symbol{"F1CD}} - \expandafter\def\csname simpleicon@paritysubstrateicon\endcsname {\simpleiconsmap\symbol{"F1CE}} - \expandafter\def\csname simpleicon@parrotsecurityicon\endcsname {\simpleiconsmap\symbol{"F1CF}} - \expandafter\def\csname simpleicon@parsedotlyicon\endcsname {\simpleiconsmap\symbol{"F1D0}} - \expandafter\def\csname simpleicon@passporticon\endcsname {\simpleiconsmap\symbol{"F1D1}} - \expandafter\def\csname simpleicon@pastebinicon\endcsname {\simpleiconsmap\symbol{"F1D2}} - \expandafter\def\csname simpleicon@patreonicon\endcsname {\simpleiconsmap\symbol{"F1D3}} - \expandafter\def\csname simpleicon@paychexicon\endcsname {\simpleiconsmap\symbol{"F1D4}} - \expandafter\def\csname simpleicon@payhipicon\endcsname {\simpleiconsmap\symbol{"F1D5}} - \expandafter\def\csname simpleicon@payloadcmsicon\endcsname {\simpleiconsmap\symbol{"F1D6}} - \expandafter\def\csname simpleicon@payoneericon\endcsname {\simpleiconsmap\symbol{"F1D7}} - \expandafter\def\csname simpleicon@paypalicon\endcsname {\simpleiconsmap\symbol{"F1D8}} - \expandafter\def\csname simpleicon@paytmicon\endcsname {\simpleiconsmap\symbol{"F1D9}} - \expandafter\def\csname simpleicon@pcgamingwikiicon\endcsname {\simpleiconsmap\symbol{"F1DA}} - \expandafter\def\csname simpleicon@pdmicon\endcsname {\simpleiconsmap\symbol{"F1DB}} - \expandafter\def\csname simpleicon@pdqicon\endcsname {\simpleiconsmap\symbol{"F1DC}} - \expandafter\def\csname simpleicon@peakdesignicon\endcsname {\simpleiconsmap\symbol{"F1DD}} - \expandafter\def\csname simpleicon@pearsonicon\endcsname {\simpleiconsmap\symbol{"F1DE}} - \expandafter\def\csname simpleicon@peerlisticon\endcsname {\simpleiconsmap\symbol{"F1DF}} - \expandafter\def\csname simpleicon@peertubeicon\endcsname {\simpleiconsmap\symbol{"F1E0}} - \expandafter\def\csname simpleicon@pegasusairlinesicon\endcsname {\simpleiconsmap\symbol{"F1E1}} - \expandafter\def\csname simpleicon@pelicanicon\endcsname {\simpleiconsmap\symbol{"F1E2}} - \expandafter\def\csname simpleicon@pelotonicon\endcsname {\simpleiconsmap\symbol{"F1E3}} - \expandafter\def\csname simpleicon@pennyicon\endcsname {\simpleiconsmap\symbol{"F1E4}} - \expandafter\def\csname simpleicon@penpoticon\endcsname {\simpleiconsmap\symbol{"F1E5}} - \expandafter\def\csname simpleicon@percyicon\endcsname {\simpleiconsmap\symbol{"F1E6}} - \expandafter\def\csname simpleicon@perforceicon\endcsname {\simpleiconsmap\symbol{"F1E7}} - \expandafter\def\csname simpleicon@perlicon\endcsname {\simpleiconsmap\symbol{"F1E8}} - \expandafter\def\csname simpleicon@perplexityicon\endcsname {\simpleiconsmap\symbol{"F1E9}} - \expandafter\def\csname simpleicon@persistenticon\endcsname {\simpleiconsmap\symbol{"F1EA}} - \expandafter\def\csname simpleicon@personioicon\endcsname {\simpleiconsmap\symbol{"F1EB}} - \expandafter\def\csname simpleicon@petsathomeicon\endcsname {\simpleiconsmap\symbol{"F1EC}} - \expandafter\def\csname simpleicon@peugeoticon\endcsname {\simpleiconsmap\symbol{"F1ED}} - \expandafter\def\csname simpleicon@pexelsicon\endcsname {\simpleiconsmap\symbol{"F1EE}} - \expandafter\def\csname simpleicon@pfsenseicon\endcsname {\simpleiconsmap\symbol{"F1EF}} - \expandafter\def\csname simpleicon@phabricatoricon\endcsname {\simpleiconsmap\symbol{"F1F0}} - \expandafter\def\csname simpleicon@philipshueicon\endcsname {\simpleiconsmap\symbol{"F1F1}} - \expandafter\def\csname simpleicon@phoenixframeworkicon\endcsname {\simpleiconsmap\symbol{"F1F2}} - \expandafter\def\csname simpleicon@phonepeicon\endcsname {\simpleiconsmap\symbol{"F1F3}} - \expandafter\def\csname simpleicon@phosphoriconsicon\endcsname {\simpleiconsmap\symbol{"F1F4}} - \expandafter\def\csname simpleicon@photobucketicon\endcsname {\simpleiconsmap\symbol{"F1F5}} - \expandafter\def\csname simpleicon@photocrowdicon\endcsname {\simpleiconsmap\symbol{"F1F6}} - \expandafter\def\csname simpleicon@photonicon\endcsname {\simpleiconsmap\symbol{"F1F7}} - \expandafter\def\csname simpleicon@photopeaicon\endcsname {\simpleiconsmap\symbol{"F1F8}} - \expandafter\def\csname simpleicon@phpicon\endcsname {\simpleiconsmap\symbol{"F1F9}} - \expandafter\def\csname simpleicon@phpmyadminicon\endcsname {\simpleiconsmap\symbol{"F1FA}} - \expandafter\def\csname simpleicon@phpstormicon\endcsname {\simpleiconsmap\symbol{"F1FB}} - \expandafter\def\csname simpleicon@piaggiogroupicon\endcsname {\simpleiconsmap\symbol{"F1FC}} - \expandafter\def\csname simpleicon@piaproicon\endcsname {\simpleiconsmap\symbol{"F1FD}} - \expandafter\def\csname simpleicon@picardsurgelesicon\endcsname {\simpleiconsmap\symbol{"F1FE}} - \expandafter\def\csname simpleicon@picartodottvicon\endcsname {\simpleiconsmap\symbol{"F1FF}} - \expandafter\def\csname simpleicon@picnicicon\endcsname {\simpleiconsmap\symbol{"F200}} - \expandafter\def\csname simpleicon@picpayicon\endcsname {\simpleiconsmap\symbol{"F201}} - \expandafter\def\csname simpleicon@picrewicon\endcsname {\simpleiconsmap\symbol{"F202}} - \expandafter\def\csname simpleicon@picxyicon\endcsname {\simpleiconsmap\symbol{"F203}} - \expandafter\def\csname simpleicon@piholeicon\endcsname {\simpleiconsmap\symbol{"F204}} - \expandafter\def\csname simpleicon@pimcoreicon\endcsname {\simpleiconsmap\symbol{"F205}} - \expandafter\def\csname simpleicon@pinboardicon\endcsname {\simpleiconsmap\symbol{"F206}} - \expandafter\def\csname simpleicon@pinescripticon\endcsname {\simpleiconsmap\symbol{"F207}} - \expandafter\def\csname simpleicon@pinetworkicon\endcsname {\simpleiconsmap\symbol{"F208}} - \expandafter\def\csname simpleicon@pingdomicon\endcsname {\simpleiconsmap\symbol{"F209}} - \expandafter\def\csname simpleicon@pinoicon\endcsname {\simpleiconsmap\symbol{"F20A}} - \expandafter\def\csname simpleicon@pinteresticon\endcsname {\simpleiconsmap\symbol{"F20B}} - \expandafter\def\csname simpleicon@pioneerdjicon\endcsname {\simpleiconsmap\symbol{"F20C}} - \expandafter\def\csname simpleicon@pipedicon\endcsname {\simpleiconsmap\symbol{"F20D}} - \expandafter\def\csname simpleicon@pipxicon\endcsname {\simpleiconsmap\symbol{"F20E}} - \expandafter\def\csname simpleicon@pivotaltrackericon\endcsname {\simpleiconsmap\symbol{"F20F}} - \expandafter\def\csname simpleicon@piwigoicon\endcsname {\simpleiconsmap\symbol{"F210}} - \expandafter\def\csname simpleicon@pixicon\endcsname {\simpleiconsmap\symbol{"F211}} - \expandafter\def\csname simpleicon@pixabayicon\endcsname {\simpleiconsmap\symbol{"F212}} - \expandafter\def\csname simpleicon@pixelfedicon\endcsname {\simpleiconsmap\symbol{"F213}} - \expandafter\def\csname simpleicon@pixivicon\endcsname {\simpleiconsmap\symbol{"F214}} - \expandafter\def\csname simpleicon@pixlricon\endcsname {\simpleiconsmap\symbol{"F215}} - \expandafter\def\csname simpleicon@pkgsrcicon\endcsname {\simpleiconsmap\symbol{"F216}} - \expandafter\def\csname simpleicon@planeticon\endcsname {\simpleiconsmap\symbol{"F217}} - \expandafter\def\csname simpleicon@planetscaleicon\endcsname {\simpleiconsmap\symbol{"F218}} - \expandafter\def\csname simpleicon@plangridicon\endcsname {\simpleiconsmap\symbol{"F219}} - \expandafter\def\csname simpleicon@platformdotshicon\endcsname {\simpleiconsmap\symbol{"F21A}} - \expandafter\def\csname simpleicon@platformioicon\endcsname {\simpleiconsmap\symbol{"F21B}} - \expandafter\def\csname simpleicon@platziicon\endcsname {\simpleiconsmap\symbol{"F21C}} - \expandafter\def\csname simpleicon@plausibleanalyticsicon\endcsname {\simpleiconsmap\symbol{"F21D}} - \expandafter\def\csname simpleicon@playcanvasicon\endcsname {\simpleiconsmap\symbol{"F21E}} - \expandafter\def\csname simpleicon@playerdotmeicon\endcsname {\simpleiconsmap\symbol{"F21F}} - \expandafter\def\csname simpleicon@playerfmicon\endcsname {\simpleiconsmap\symbol{"F220}} - \expandafter\def\csname simpleicon@playstationicon\endcsname {\simpleiconsmap\symbol{"F221}} - \expandafter\def\csname simpleicon@playstation2icon\endcsname {\simpleiconsmap\symbol{"F222}} - \expandafter\def\csname simpleicon@playstation3icon\endcsname {\simpleiconsmap\symbol{"F223}} - \expandafter\def\csname simpleicon@playstation4icon\endcsname {\simpleiconsmap\symbol{"F224}} - \expandafter\def\csname simpleicon@playstation5icon\endcsname {\simpleiconsmap\symbol{"F225}} - \expandafter\def\csname simpleicon@playstationportableicon\endcsname {\simpleiconsmap\symbol{"F226}} - \expandafter\def\csname simpleicon@playstationvitaicon\endcsname {\simpleiconsmap\symbol{"F227}} - \expandafter\def\csname simpleicon@pleromaicon\endcsname {\simpleiconsmap\symbol{"F228}} - \expandafter\def\csname simpleicon@pleskicon\endcsname {\simpleiconsmap\symbol{"F229}} - \expandafter\def\csname simpleicon@plexicon\endcsname {\simpleiconsmap\symbol{"F22A}} - \expandafter\def\csname simpleicon@plotlyicon\endcsname {\simpleiconsmap\symbol{"F22B}} - \expandafter\def\csname simpleicon@plumeicon\endcsname {\simpleiconsmap\symbol{"F22C}} - \expandafter\def\csname simpleicon@pluralsighticon\endcsname {\simpleiconsmap\symbol{"F22D}} - \expandafter\def\csname simpleicon@plurkicon\endcsname {\simpleiconsmap\symbol{"F22E}} - \expandafter\def\csname simpleicon@pluscodesicon\endcsname {\simpleiconsmap\symbol{"F22F}} - \expandafter\def\csname simpleicon@pm2icon\endcsname {\simpleiconsmap\symbol{"F230}} - \expandafter\def\csname simpleicon@pnpmicon\endcsname {\simpleiconsmap\symbol{"F231}} - \expandafter\def\csname simpleicon@pocketicon\endcsname {\simpleiconsmap\symbol{"F232}} - \expandafter\def\csname simpleicon@pocketbaseicon\endcsname {\simpleiconsmap\symbol{"F233}} - \expandafter\def\csname simpleicon@pocketcastsicon\endcsname {\simpleiconsmap\symbol{"F234}} - \expandafter\def\csname simpleicon@podcastaddicticon\endcsname {\simpleiconsmap\symbol{"F235}} - \expandafter\def\csname simpleicon@podcastindexicon\endcsname {\simpleiconsmap\symbol{"F236}} - \expandafter\def\csname simpleicon@podmanicon\endcsname {\simpleiconsmap\symbol{"F237}} - \expandafter\def\csname simpleicon@poeicon\endcsname {\simpleiconsmap\symbol{"F238}} - \expandafter\def\csname simpleicon@poetryicon\endcsname {\simpleiconsmap\symbol{"F239}} - \expandafter\def\csname simpleicon@pointyicon\endcsname {\simpleiconsmap\symbol{"F23A}} - \expandafter\def\csname simpleicon@pokemonicon\endcsname {\simpleiconsmap\symbol{"F23B}} - \expandafter\def\csname simpleicon@polarsicon\endcsname {\simpleiconsmap\symbol{"F23C}} - \expandafter\def\csname simpleicon@polestaricon\endcsname {\simpleiconsmap\symbol{"F23D}} - \expandafter\def\csname simpleicon@polkadoticon\endcsname {\simpleiconsmap\symbol{"F23E}} - \expandafter\def\csname simpleicon@polyicon\endcsname {\simpleiconsmap\symbol{"F23F}} - \expandafter\def\csname simpleicon@polygonicon\endcsname {\simpleiconsmap\symbol{"F240}} - \expandafter\def\csname simpleicon@polymerprojecticon\endcsname {\simpleiconsmap\symbol{"F241}} - \expandafter\def\csname simpleicon@polyworkicon\endcsname {\simpleiconsmap\symbol{"F242}} - \expandafter\def\csname simpleicon@pond5icon\endcsname {\simpleiconsmap\symbol{"F243}} - \expandafter\def\csname simpleicon@poposicon\endcsname {\simpleiconsmap\symbol{"F244}} - \expandafter\def\csname simpleicon@porkbunicon\endcsname {\simpleiconsmap\symbol{"F245}} - \expandafter\def\csname simpleicon@porscheicon\endcsname {\simpleiconsmap\symbol{"F246}} - \expandafter\def\csname simpleicon@portainericon\endcsname {\simpleiconsmap\symbol{"F247}} - \expandafter\def\csname simpleicon@portswiggericon\endcsname {\simpleiconsmap\symbol{"F248}} - \expandafter\def\csname simpleicon@positicon\endcsname {\simpleiconsmap\symbol{"F249}} - \expandafter\def\csname simpleicon@postcssicon\endcsname {\simpleiconsmap\symbol{"F24A}} - \expandafter\def\csname simpleicon@postgresqlicon\endcsname {\simpleiconsmap\symbol{"F24B}} - \expandafter\def\csname simpleicon@posthogicon\endcsname {\simpleiconsmap\symbol{"F24C}} - \expandafter\def\csname simpleicon@postmanicon\endcsname {\simpleiconsmap\symbol{"F24D}} - \expandafter\def\csname simpleicon@postmatesicon\endcsname {\simpleiconsmap\symbol{"F24E}} - \expandafter\def\csname simpleicon@powersicon\endcsname {\simpleiconsmap\symbol{"F24F}} - \expandafter\def\csname simpleicon@prdotcoicon\endcsname {\simpleiconsmap\symbol{"F250}} - \expandafter\def\csname simpleicon@preacticon\endcsname {\simpleiconsmap\symbol{"F251}} - \expandafter\def\csname simpleicon@precommiticon\endcsname {\simpleiconsmap\symbol{"F252}} - \expandafter\def\csname simpleicon@prefecticon\endcsname {\simpleiconsmap\symbol{"F253}} - \expandafter\def\csname simpleicon@premierleagueicon\endcsname {\simpleiconsmap\symbol{"F254}} - \expandafter\def\csname simpleicon@prepbytesicon\endcsname {\simpleiconsmap\symbol{"F255}} - \expandafter\def\csname simpleicon@prestashopicon\endcsname {\simpleiconsmap\symbol{"F256}} - \expandafter\def\csname simpleicon@prestoicon\endcsname {\simpleiconsmap\symbol{"F257}} - \expandafter\def\csname simpleicon@prettiericon\endcsname {\simpleiconsmap\symbol{"F258}} - \expandafter\def\csname simpleicon@pretzelicon\endcsname {\simpleiconsmap\symbol{"F259}} - \expandafter\def\csname simpleicon@preventionicon\endcsname {\simpleiconsmap\symbol{"F25A}} - \expandafter\def\csname simpleicon@preziicon\endcsname {\simpleiconsmap\symbol{"F25B}} - \expandafter\def\csname simpleicon@primeicon\endcsname {\simpleiconsmap\symbol{"F25C}} - \expandafter\def\csname simpleicon@primengicon\endcsname {\simpleiconsmap\symbol{"F25D}} - \expandafter\def\csname simpleicon@primereacticon\endcsname {\simpleiconsmap\symbol{"F25E}} - \expandafter\def\csname simpleicon@primevideoicon\endcsname {\simpleiconsmap\symbol{"F25F}} - \expandafter\def\csname simpleicon@printablesicon\endcsname {\simpleiconsmap\symbol{"F260}} - \expandafter\def\csname simpleicon@prismaicon\endcsname {\simpleiconsmap\symbol{"F261}} - \expandafter\def\csname simpleicon@prismicicon\endcsname {\simpleiconsmap\symbol{"F262}} - \expandafter\def\csname simpleicon@privatedivisionicon\endcsname {\simpleiconsmap\symbol{"F263}} - \expandafter\def\csname simpleicon@privateinternetaccessicon\endcsname {\simpleiconsmap\symbol{"F264}} - \expandafter\def\csname simpleicon@proboticon\endcsname {\simpleiconsmap\symbol{"F265}} - \expandafter\def\csname simpleicon@processingfoundationicon\endcsname {\simpleiconsmap\symbol{"F266}} - \expandafter\def\csname simpleicon@processwireicon\endcsname {\simpleiconsmap\symbol{"F267}} - \expandafter\def\csname simpleicon@producthunticon\endcsname {\simpleiconsmap\symbol{"F268}} - \expandafter\def\csname simpleicon@progateicon\endcsname {\simpleiconsmap\symbol{"F269}} - \expandafter\def\csname simpleicon@progressicon\endcsname {\simpleiconsmap\symbol{"F26A}} - \expandafter\def\csname simpleicon@prometheusicon\endcsname {\simpleiconsmap\symbol{"F26B}} - \expandafter\def\csname simpleicon@pronounsdotpageicon\endcsname {\simpleiconsmap\symbol{"F26C}} - \expandafter\def\csname simpleicon@prosiebenicon\endcsname {\simpleiconsmap\symbol{"F26D}} - \expandafter\def\csname simpleicon@proteusicon\endcsname {\simpleiconsmap\symbol{"F26E}} - \expandafter\def\csname simpleicon@protocolsdotioicon\endcsname {\simpleiconsmap\symbol{"F26F}} - \expandafter\def\csname simpleicon@protodotioicon\endcsname {\simpleiconsmap\symbol{"F270}} - \expandafter\def\csname simpleicon@protonicon\endcsname {\simpleiconsmap\symbol{"F271}} - \expandafter\def\csname simpleicon@protoncalendaricon\endcsname {\simpleiconsmap\symbol{"F272}} - \expandafter\def\csname simpleicon@protondbicon\endcsname {\simpleiconsmap\symbol{"F273}} - \expandafter\def\csname simpleicon@protondriveicon\endcsname {\simpleiconsmap\symbol{"F274}} - \expandafter\def\csname simpleicon@protonmailicon\endcsname {\simpleiconsmap\symbol{"F275}} - \expandafter\def\csname simpleicon@protonvpnicon\endcsname {\simpleiconsmap\symbol{"F276}} - \expandafter\def\csname simpleicon@protoolsicon\endcsname {\simpleiconsmap\symbol{"F277}} - \expandafter\def\csname simpleicon@protractoricon\endcsname {\simpleiconsmap\symbol{"F278}} - \expandafter\def\csname simpleicon@proxmoxicon\endcsname {\simpleiconsmap\symbol{"F279}} - \expandafter\def\csname simpleicon@pterodactylicon\endcsname {\simpleiconsmap\symbol{"F27A}} - \expandafter\def\csname simpleicon@pubgicon\endcsname {\simpleiconsmap\symbol{"F27B}} - \expandafter\def\csname simpleicon@publonsicon\endcsname {\simpleiconsmap\symbol{"F27C}} - \expandafter\def\csname simpleicon@pubmedicon\endcsname {\simpleiconsmap\symbol{"F27D}} - \expandafter\def\csname simpleicon@pugicon\endcsname {\simpleiconsmap\symbol{"F27E}} - \expandafter\def\csname simpleicon@pulumiicon\endcsname {\simpleiconsmap\symbol{"F27F}} - \expandafter\def\csname simpleicon@pumaicon\endcsname {\simpleiconsmap\symbol{"F280}} - \expandafter\def\csname simpleicon@puppeticon\endcsname {\simpleiconsmap\symbol{"F281}} - \expandafter\def\csname simpleicon@puppeteericon\endcsname {\simpleiconsmap\symbol{"F282}} - \expandafter\def\csname simpleicon@purescripticon\endcsname {\simpleiconsmap\symbol{"F283}} - \expandafter\def\csname simpleicon@purgecssicon\endcsname {\simpleiconsmap\symbol{"F284}} - \expandafter\def\csname simpleicon@purismicon\endcsname {\simpleiconsmap\symbol{"F285}} - \expandafter\def\csname simpleicon@pushbulleticon\endcsname {\simpleiconsmap\symbol{"F286}} - \expandafter\def\csname simpleicon@pushericon\endcsname {\simpleiconsmap\symbol{"F287}} - \expandafter\def\csname simpleicon@pwaicon\endcsname {\simpleiconsmap\symbol{"F288}} - \expandafter\def\csname simpleicon@pycharmicon\endcsname {\simpleiconsmap\symbol{"F289}} - \expandafter\def\csname simpleicon@pycqaicon\endcsname {\simpleiconsmap\symbol{"F28A}} - \expandafter\def\csname simpleicon@pydanticicon\endcsname {\simpleiconsmap\symbol{"F28B}} - \expandafter\def\csname simpleicon@pygicon\endcsname {\simpleiconsmap\symbol{"F28C}} - \expandafter\def\csname simpleicon@pypiicon\endcsname {\simpleiconsmap\symbol{"F28D}} - \expandafter\def\csname simpleicon@pypyicon\endcsname {\simpleiconsmap\symbol{"F28E}} - \expandafter\def\csname simpleicon@pyscaffoldicon\endcsname {\simpleiconsmap\symbol{"F28F}} - \expandafter\def\csname simpleicon@pysyfticon\endcsname {\simpleiconsmap\symbol{"F290}} - \expandafter\def\csname simpleicon@pytesticon\endcsname {\simpleiconsmap\symbol{"F291}} - \expandafter\def\csname simpleicon@pythonicon\endcsname {\simpleiconsmap\symbol{"F292}} - \expandafter\def\csname simpleicon@pythonanywhereicon\endcsname {\simpleiconsmap\symbol{"F293}} - \expandafter\def\csname simpleicon@pytorchicon\endcsname {\simpleiconsmap\symbol{"F294}} - \expandafter\def\csname simpleicon@pyupicon\endcsname {\simpleiconsmap\symbol{"F295}} - \expandafter\def\csname simpleicon@qantasicon\endcsname {\simpleiconsmap\symbol{"F296}} - \expandafter\def\csname simpleicon@qaseicon\endcsname {\simpleiconsmap\symbol{"F297}} - \expandafter\def\csname simpleicon@qatarairwaysicon\endcsname {\simpleiconsmap\symbol{"F298}} - \expandafter\def\csname simpleicon@qbittorrenticon\endcsname {\simpleiconsmap\symbol{"F299}} - \expandafter\def\csname simpleicon@qemuicon\endcsname {\simpleiconsmap\symbol{"F29A}} - \expandafter\def\csname simpleicon@qgisicon\endcsname {\simpleiconsmap\symbol{"F29B}} - \expandafter\def\csname simpleicon@qiicon\endcsname {\simpleiconsmap\symbol{"F29C}} - \expandafter\def\csname simpleicon@qiitaicon\endcsname {\simpleiconsmap\symbol{"F29D}} - \expandafter\def\csname simpleicon@qiskiticon\endcsname {\simpleiconsmap\symbol{"F29E}} - \expandafter\def\csname simpleicon@qiwiicon\endcsname {\simpleiconsmap\symbol{"F29F}} - \expandafter\def\csname simpleicon@qlikicon\endcsname {\simpleiconsmap\symbol{"F2A0}} - \expandafter\def\csname simpleicon@qmkicon\endcsname {\simpleiconsmap\symbol{"F2A1}} - \expandafter\def\csname simpleicon@qnapicon\endcsname {\simpleiconsmap\symbol{"F2A2}} - \expandafter\def\csname simpleicon@qticon\endcsname {\simpleiconsmap\symbol{"F2A3}} - \expandafter\def\csname simpleicon@qualcommicon\endcsname {\simpleiconsmap\symbol{"F2A4}} - \expandafter\def\csname simpleicon@qualtricsicon\endcsname {\simpleiconsmap\symbol{"F2A5}} - \expandafter\def\csname simpleicon@qualysicon\endcsname {\simpleiconsmap\symbol{"F2A6}} - \expandafter\def\csname simpleicon@quantcasticon\endcsname {\simpleiconsmap\symbol{"F2A7}} - \expandafter\def\csname simpleicon@quantconnecticon\endcsname {\simpleiconsmap\symbol{"F2A8}} - \expandafter\def\csname simpleicon@quarkusicon\endcsname {\simpleiconsmap\symbol{"F2A9}} - \expandafter\def\csname simpleicon@quartoicon\endcsname {\simpleiconsmap\symbol{"F2AA}} - \expandafter\def\csname simpleicon@quasaricon\endcsname {\simpleiconsmap\symbol{"F2AB}} - \expandafter\def\csname simpleicon@qubesosicon\endcsname {\simpleiconsmap\symbol{"F2AC}} - \expandafter\def\csname simpleicon@questicon\endcsname {\simpleiconsmap\symbol{"F2AD}} - \expandafter\def\csname simpleicon@quickbooksicon\endcsname {\simpleiconsmap\symbol{"F2AE}} - \expandafter\def\csname simpleicon@quicklookicon\endcsname {\simpleiconsmap\symbol{"F2AF}} - \expandafter\def\csname simpleicon@quicktimeicon\endcsname {\simpleiconsmap\symbol{"F2B0}} - \expandafter\def\csname simpleicon@quicktypeicon\endcsname {\simpleiconsmap\symbol{"F2B1}} - \expandafter\def\csname simpleicon@quipicon\endcsname {\simpleiconsmap\symbol{"F2B2}} - \expandafter\def\csname simpleicon@quizleticon\endcsname {\simpleiconsmap\symbol{"F2B3}} - \expandafter\def\csname simpleicon@quoraicon\endcsname {\simpleiconsmap\symbol{"F2B4}} - \expandafter\def\csname simpleicon@qwanticon\endcsname {\simpleiconsmap\symbol{"F2B5}} - \expandafter\def\csname simpleicon@qwikicon\endcsname {\simpleiconsmap\symbol{"F2B6}} - \expandafter\def\csname simpleicon@qwiklabsicon\endcsname {\simpleiconsmap\symbol{"F2B7}} - \expandafter\def\csname simpleicon@qzoneicon\endcsname {\simpleiconsmap\symbol{"F2B8}} - \expandafter\def\csname simpleicon@ricon\endcsname {\simpleiconsmap\symbol{"F2B9}} - \expandafter\def\csname simpleicon@r3icon\endcsname {\simpleiconsmap\symbol{"F2BA}} - \expandafter\def\csname simpleicon@rabbitmqicon\endcsname {\simpleiconsmap\symbol{"F2BB}} - \expandafter\def\csname simpleicon@racketicon\endcsname {\simpleiconsmap\symbol{"F2BC}} - \expandafter\def\csname simpleicon@radaricon\endcsname {\simpleiconsmap\symbol{"F2BD}} - \expandafter\def\csname simpleicon@radarricon\endcsname {\simpleiconsmap\symbol{"F2BE}} - \expandafter\def\csname simpleicon@radiopublicicon\endcsname {\simpleiconsmap\symbol{"F2BF}} - \expandafter\def\csname simpleicon@radixuiicon\endcsname {\simpleiconsmap\symbol{"F2C0}} - \expandafter\def\csname simpleicon@radstudioicon\endcsname {\simpleiconsmap\symbol{"F2C1}} - \expandafter\def\csname simpleicon@railwayicon\endcsname {\simpleiconsmap\symbol{"F2C2}} - \expandafter\def\csname simpleicon@rainmetericon\endcsname {\simpleiconsmap\symbol{"F2C3}} - \expandafter\def\csname simpleicon@rakutenicon\endcsname {\simpleiconsmap\symbol{"F2C4}} - \expandafter\def\csname simpleicon@ramicon\endcsname {\simpleiconsmap\symbol{"F2C5}} - \expandafter\def\csname simpleicon@ranchericon\endcsname {\simpleiconsmap\symbol{"F2C6}} - \expandafter\def\csname simpleicon@rapidicon\endcsname {\simpleiconsmap\symbol{"F2C7}} - \expandafter\def\csname simpleicon@raribleicon\endcsname {\simpleiconsmap\symbol{"F2C8}} - \expandafter\def\csname simpleicon@rasaicon\endcsname {\simpleiconsmap\symbol{"F2C9}} - \expandafter\def\csname simpleicon@raspberrypiicon\endcsname {\simpleiconsmap\symbol{"F2CA}} - \expandafter\def\csname simpleicon@ravelryicon\endcsname {\simpleiconsmap\symbol{"F2CB}} - \expandafter\def\csname simpleicon@rayicon\endcsname {\simpleiconsmap\symbol{"F2CC}} - \expandafter\def\csname simpleicon@raycasticon\endcsname {\simpleiconsmap\symbol{"F2CD}} - \expandafter\def\csname simpleicon@raylibicon\endcsname {\simpleiconsmap\symbol{"F2CE}} - \expandafter\def\csname simpleicon@razericon\endcsname {\simpleiconsmap\symbol{"F2CF}} - \expandafter\def\csname simpleicon@razorpayicon\endcsname {\simpleiconsmap\symbol{"F2D0}} - \expandafter\def\csname simpleicon@rcloneicon\endcsname {\simpleiconsmap\symbol{"F2D1}} - \expandafter\def\csname simpleicon@reacticon\endcsname {\simpleiconsmap\symbol{"F2D2}} - \expandafter\def\csname simpleicon@reactbootstrapicon\endcsname {\simpleiconsmap\symbol{"F2D3}} - \expandafter\def\csname simpleicon@reacthookformicon\endcsname {\simpleiconsmap\symbol{"F2D4}} - \expandafter\def\csname simpleicon@reactiveresumeicon\endcsname {\simpleiconsmap\symbol{"F2D5}} - \expandafter\def\csname simpleicon@reactivexicon\endcsname {\simpleiconsmap\symbol{"F2D6}} - \expandafter\def\csname simpleicon@reactosicon\endcsname {\simpleiconsmap\symbol{"F2D7}} - \expandafter\def\csname simpleicon@reactqueryicon\endcsname {\simpleiconsmap\symbol{"F2D8}} - \expandafter\def\csname simpleicon@reactroutericon\endcsname {\simpleiconsmap\symbol{"F2D9}} - \expandafter\def\csname simpleicon@reacttableicon\endcsname {\simpleiconsmap\symbol{"F2DA}} - \expandafter\def\csname simpleicon@readdotcvicon\endcsname {\simpleiconsmap\symbol{"F2DB}} - \expandafter\def\csname simpleicon@readmeicon\endcsname {\simpleiconsmap\symbol{"F2DC}} - \expandafter\def\csname simpleicon@readthedocsicon\endcsname {\simpleiconsmap\symbol{"F2DD}} - \expandafter\def\csname simpleicon@realmicon\endcsname {\simpleiconsmap\symbol{"F2DE}} - \expandafter\def\csname simpleicon@reasonicon\endcsname {\simpleiconsmap\symbol{"F2DF}} - \expandafter\def\csname simpleicon@reasonstudiosicon\endcsname {\simpleiconsmap\symbol{"F2E0}} - \expandafter\def\csname simpleicon@recoilicon\endcsname {\simpleiconsmap\symbol{"F2E1}} - \expandafter\def\csname simpleicon@redicon\endcsname {\simpleiconsmap\symbol{"F2E2}} - \expandafter\def\csname simpleicon@redashicon\endcsname {\simpleiconsmap\symbol{"F2E3}} - \expandafter\def\csname simpleicon@redbubbleicon\endcsname {\simpleiconsmap\symbol{"F2E4}} - \expandafter\def\csname simpleicon@redbullicon\endcsname {\simpleiconsmap\symbol{"F2E5}} - \expandafter\def\csname simpleicon@redditicon\endcsname {\simpleiconsmap\symbol{"F2E6}} - \expandafter\def\csname simpleicon@redhaticon\endcsname {\simpleiconsmap\symbol{"F2E7}} - \expandafter\def\csname simpleicon@redhatopenshifticon\endcsname {\simpleiconsmap\symbol{"F2E8}} - \expandafter\def\csname simpleicon@redisicon\endcsname {\simpleiconsmap\symbol{"F2E9}} - \expandafter\def\csname simpleicon@redmineicon\endcsname {\simpleiconsmap\symbol{"F2EA}} - \expandafter\def\csname simpleicon@redoxicon\endcsname {\simpleiconsmap\symbol{"F2EB}} - \expandafter\def\csname simpleicon@redsysicon\endcsname {\simpleiconsmap\symbol{"F2EC}} - \expandafter\def\csname simpleicon@reduxicon\endcsname {\simpleiconsmap\symbol{"F2ED}} - \expandafter\def\csname simpleicon@reduxsagaicon\endcsname {\simpleiconsmap\symbol{"F2EE}} - \expandafter\def\csname simpleicon@redwoodjsicon\endcsname {\simpleiconsmap\symbol{"F2EF}} - \expandafter\def\csname simpleicon@reebokicon\endcsname {\simpleiconsmap\symbol{"F2F0}} - \expandafter\def\csname simpleicon@refineicon\endcsname {\simpleiconsmap\symbol{"F2F1}} - \expandafter\def\csname simpleicon@relayicon\endcsname {\simpleiconsmap\symbol{"F2F2}} - \expandafter\def\csname simpleicon@relianceindustrieslimitedicon\endcsname {\simpleiconsmap\symbol{"F2F3}} - \expandafter\def\csname simpleicon@remarkicon\endcsname {\simpleiconsmap\symbol{"F2F4}} - \expandafter\def\csname simpleicon@remedyentertainmenticon\endcsname {\simpleiconsmap\symbol{"F2F5}} - \expandafter\def\csname simpleicon@remixicon\endcsname {\simpleiconsmap\symbol{"F2F6}} - \expandafter\def\csname simpleicon@removedotbgicon\endcsname {\simpleiconsmap\symbol{"F2F7}} - \expandafter\def\csname simpleicon@renaulticon\endcsname {\simpleiconsmap\symbol{"F2F8}} - \expandafter\def\csname simpleicon@rendericon\endcsname {\simpleiconsmap\symbol{"F2F9}} - \expandafter\def\csname simpleicon@renovateicon\endcsname {\simpleiconsmap\symbol{"F2FA}} - \expandafter\def\csname simpleicon@renpyicon\endcsname {\simpleiconsmap\symbol{"F2FB}} - \expandafter\def\csname simpleicon@renrenicon\endcsname {\simpleiconsmap\symbol{"F2FC}} - \expandafter\def\csname simpleicon@repliticon\endcsname {\simpleiconsmap\symbol{"F2FD}} - \expandafter\def\csname simpleicon@republicofgamersicon\endcsname {\simpleiconsmap\symbol{"F2FE}} - \expandafter\def\csname simpleicon@rescripticon\endcsname {\simpleiconsmap\symbol{"F2FF}} - \expandafter\def\csname simpleicon@rescuetimeicon\endcsname {\simpleiconsmap\symbol{"F300}} - \expandafter\def\csname simpleicon@researchgateicon\endcsname {\simpleiconsmap\symbol{"F301}} - \expandafter\def\csname simpleicon@resendicon\endcsname {\simpleiconsmap\symbol{"F302}} - \expandafter\def\csname simpleicon@resharpericon\endcsname {\simpleiconsmap\symbol{"F303}} - \expandafter\def\csname simpleicon@resurrectionremixosicon\endcsname {\simpleiconsmap\symbol{"F304}} - \expandafter\def\csname simpleicon@retoolicon\endcsname {\simpleiconsmap\symbol{"F305}} - \expandafter\def\csname simpleicon@retroarchicon\endcsname {\simpleiconsmap\symbol{"F306}} - \expandafter\def\csname simpleicon@retropieicon\endcsname {\simpleiconsmap\symbol{"F307}} - \expandafter\def\csname simpleicon@revancedicon\endcsname {\simpleiconsmap\symbol{"F308}} - \expandafter\def\csname simpleicon@revealdotjsicon\endcsname {\simpleiconsmap\symbol{"F309}} - \expandafter\def\csname simpleicon@reverbnationicon\endcsname {\simpleiconsmap\symbol{"F30A}} - \expandafter\def\csname simpleicon@revoltdotchaticon\endcsname {\simpleiconsmap\symbol{"F30B}} - \expandafter\def\csname simpleicon@revoluticon\endcsname {\simpleiconsmap\symbol{"F30C}} - \expandafter\def\csname simpleicon@revueicon\endcsname {\simpleiconsmap\symbol{"F30D}} - \expandafter\def\csname simpleicon@reweicon\endcsname {\simpleiconsmap\symbol{"F30E}} - \expandafter\def\csname simpleicon@rezgoicon\endcsname {\simpleiconsmap\symbol{"F30F}} - \expandafter\def\csname simpleicon@rhinocerosicon\endcsname {\simpleiconsmap\symbol{"F310}} - \expandafter\def\csname simpleicon@richicon\endcsname {\simpleiconsmap\symbol{"F311}} - \expandafter\def\csname simpleicon@ridericon\endcsname {\simpleiconsmap\symbol{"F312}} - \expandafter\def\csname simpleicon@rimacautomobiliicon\endcsname {\simpleiconsmap\symbol{"F313}} - \expandafter\def\csname simpleicon@rimeicon\endcsname {\simpleiconsmap\symbol{"F314}} - \expandafter\def\csname simpleicon@ringicon\endcsname {\simpleiconsmap\symbol{"F315}} - \expandafter\def\csname simpleicon@riotgamesicon\endcsname {\simpleiconsmap\symbol{"F316}} - \expandafter\def\csname simpleicon@rippleicon\endcsname {\simpleiconsmap\symbol{"F317}} - \expandafter\def\csname simpleicon@riscvicon\endcsname {\simpleiconsmap\symbol{"F318}} - \expandafter\def\csname simpleicon@riseupicon\endcsname {\simpleiconsmap\symbol{"F319}} - \expandafter\def\csname simpleicon@ritzcarltonicon\endcsname {\simpleiconsmap\symbol{"F31A}} - \expandafter\def\csname simpleicon@riveicon\endcsname {\simpleiconsmap\symbol{"F31B}} - \expandafter\def\csname simpleicon@roadmapdotshicon\endcsname {\simpleiconsmap\symbol{"F31C}} - \expandafter\def\csname simpleicon@roamresearchicon\endcsname {\simpleiconsmap\symbol{"F31D}} - \expandafter\def\csname simpleicon@robinhoodicon\endcsname {\simpleiconsmap\symbol{"F31E}} - \expandafter\def\csname simpleicon@robloxicon\endcsname {\simpleiconsmap\symbol{"F31F}} - \expandafter\def\csname simpleicon@robloxstudioicon\endcsname {\simpleiconsmap\symbol{"F320}} - \expandafter\def\csname simpleicon@robotframeworkicon\endcsname {\simpleiconsmap\symbol{"F321}} - \expandafter\def\csname simpleicon@rocketicon\endcsname {\simpleiconsmap\symbol{"F322}} - \expandafter\def\csname simpleicon@rocketdotchaticon\endcsname {\simpleiconsmap\symbol{"F323}} - \expandafter\def\csname simpleicon@rocksdbicon\endcsname {\simpleiconsmap\symbol{"F324}} - \expandafter\def\csname simpleicon@rockstargamesicon\endcsname {\simpleiconsmap\symbol{"F325}} - \expandafter\def\csname simpleicon@rockwellautomationicon\endcsname {\simpleiconsmap\symbol{"F326}} - \expandafter\def\csname simpleicon@rockylinuxicon\endcsname {\simpleiconsmap\symbol{"F327}} - \expandafter\def\csname simpleicon@rokuicon\endcsname {\simpleiconsmap\symbol{"F328}} - \expandafter\def\csname simpleicon@roll20icon\endcsname {\simpleiconsmap\symbol{"F329}} - \expandafter\def\csname simpleicon@rollsroyceicon\endcsname {\simpleiconsmap\symbol{"F32A}} - \expandafter\def\csname simpleicon@rollupdotjsicon\endcsname {\simpleiconsmap\symbol{"F32B}} - \expandafter\def\csname simpleicon@roonicon\endcsname {\simpleiconsmap\symbol{"F32C}} - \expandafter\def\csname simpleicon@rootmeicon\endcsname {\simpleiconsmap\symbol{"F32D}} - \expandafter\def\csname simpleicon@rootsicon\endcsname {\simpleiconsmap\symbol{"F32E}} - \expandafter\def\csname simpleicon@rootsbedrockicon\endcsname {\simpleiconsmap\symbol{"F32F}} - \expandafter\def\csname simpleicon@rootssageicon\endcsname {\simpleiconsmap\symbol{"F330}} - \expandafter\def\csname simpleicon@rosicon\endcsname {\simpleiconsmap\symbol{"F331}} - \expandafter\def\csname simpleicon@rossmannicon\endcsname {\simpleiconsmap\symbol{"F332}} - \expandafter\def\csname simpleicon@rotaryinternationalicon\endcsname {\simpleiconsmap\symbol{"F333}} - \expandafter\def\csname simpleicon@rottentomatoesicon\endcsname {\simpleiconsmap\symbol{"F334}} - \expandafter\def\csname simpleicon@roundcubeicon\endcsname {\simpleiconsmap\symbol{"F335}} - \expandafter\def\csname simpleicon@rsocketicon\endcsname {\simpleiconsmap\symbol{"F336}} - \expandafter\def\csname simpleicon@rssicon\endcsname {\simpleiconsmap\symbol{"F337}} - \expandafter\def\csname simpleicon@rstudioideicon\endcsname {\simpleiconsmap\symbol{"F338}} - \expandafter\def\csname simpleicon@rteicon\endcsname {\simpleiconsmap\symbol{"F339}} - \expandafter\def\csname simpleicon@rtlicon\endcsname {\simpleiconsmap\symbol{"F33A}} - \expandafter\def\csname simpleicon@rtlzweiicon\endcsname {\simpleiconsmap\symbol{"F33B}} - \expandafter\def\csname simpleicon@rtmicon\endcsname {\simpleiconsmap\symbol{"F33C}} - \expandafter\def\csname simpleicon@rubocopicon\endcsname {\simpleiconsmap\symbol{"F33D}} - \expandafter\def\csname simpleicon@rubyicon\endcsname {\simpleiconsmap\symbol{"F33E}} - \expandafter\def\csname simpleicon@rubygemsicon\endcsname {\simpleiconsmap\symbol{"F33F}} - \expandafter\def\csname simpleicon@rubymineicon\endcsname {\simpleiconsmap\symbol{"F340}} - \expandafter\def\csname simpleicon@rubyonrailsicon\endcsname {\simpleiconsmap\symbol{"F341}} - \expandafter\def\csname simpleicon@rubysinatraicon\endcsname {\simpleiconsmap\symbol{"F342}} - \expandafter\def\csname simpleicon@rufficon\endcsname {\simpleiconsmap\symbol{"F343}} - \expandafter\def\csname simpleicon@rumahwebicon\endcsname {\simpleiconsmap\symbol{"F344}} - \expandafter\def\csname simpleicon@rumbleicon\endcsname {\simpleiconsmap\symbol{"F345}} - \expandafter\def\csname simpleicon@rundeckicon\endcsname {\simpleiconsmap\symbol{"F346}} - \expandafter\def\csname simpleicon@runkeepericon\endcsname {\simpleiconsmap\symbol{"F347}} - \expandafter\def\csname simpleicon@runkiticon\endcsname {\simpleiconsmap\symbol{"F348}} - \expandafter\def\csname simpleicon@runrundotiticon\endcsname {\simpleiconsmap\symbol{"F349}} - \expandafter\def\csname simpleicon@rusticon\endcsname {\simpleiconsmap\symbol{"F34A}} - \expandafter\def\csname simpleicon@rustdeskicon\endcsname {\simpleiconsmap\symbol{"F34B}} - \expandafter\def\csname simpleicon@rxdbicon\endcsname {\simpleiconsmap\symbol{"F34C}} - \expandafter\def\csname simpleicon@ryanairicon\endcsname {\simpleiconsmap\symbol{"F34D}} - \expandafter\def\csname simpleicon@ryeicon\endcsname {\simpleiconsmap\symbol{"F34E}} - \expandafter\def\csname simpleicon@s7airlinesicon\endcsname {\simpleiconsmap\symbol{"F34F}} - \expandafter\def\csname simpleicon@sabanciicon\endcsname {\simpleiconsmap\symbol{"F350}} - \expandafter\def\csname simpleicon@safariicon\endcsname {\simpleiconsmap\symbol{"F351}} - \expandafter\def\csname simpleicon@sageicon\endcsname {\simpleiconsmap\symbol{"F352}} - \expandafter\def\csname simpleicon@sahibindenicon\endcsname {\simpleiconsmap\symbol{"F353}} - \expandafter\def\csname simpleicon@sailfishosicon\endcsname {\simpleiconsmap\symbol{"F354}} - \expandafter\def\csname simpleicon@sailsdotjsicon\endcsname {\simpleiconsmap\symbol{"F355}} - \expandafter\def\csname simpleicon@salesforceicon\endcsname {\simpleiconsmap\symbol{"F356}} - \expandafter\def\csname simpleicon@sallaicon\endcsname {\simpleiconsmap\symbol{"F357}} - \expandafter\def\csname simpleicon@saltprojecticon\endcsname {\simpleiconsmap\symbol{"F358}} - \expandafter\def\csname simpleicon@samsclubicon\endcsname {\simpleiconsmap\symbol{"F359}} - \expandafter\def\csname simpleicon@samsungicon\endcsname {\simpleiconsmap\symbol{"F35A}} - \expandafter\def\csname simpleicon@samsungpayicon\endcsname {\simpleiconsmap\symbol{"F35B}} - \expandafter\def\csname simpleicon@sandiskicon\endcsname {\simpleiconsmap\symbol{"F35C}} - \expandafter\def\csname simpleicon@sanfranciscomunicipalrailwayicon\endcsname {\simpleiconsmap\symbol{"F35D}} - \expandafter\def\csname simpleicon@sanicicon\endcsname {\simpleiconsmap\symbol{"F35E}} - \expandafter\def\csname simpleicon@sanityicon\endcsname {\simpleiconsmap\symbol{"F35F}} - \expandafter\def\csname simpleicon@saopaulometroicon\endcsname {\simpleiconsmap\symbol{"F360}} - \expandafter\def\csname simpleicon@sapicon\endcsname {\simpleiconsmap\symbol{"F361}} - \expandafter\def\csname simpleicon@sartoriusicon\endcsname {\simpleiconsmap\symbol{"F362}} - \expandafter\def\csname simpleicon@sassicon\endcsname {\simpleiconsmap\symbol{"F363}} - \expandafter\def\csname simpleicon@sat1icon\endcsname {\simpleiconsmap\symbol{"F364}} - \expandafter\def\csname simpleicon@satelliteicon\endcsname {\simpleiconsmap\symbol{"F365}} - \expandafter\def\csname simpleicon@saturnicon\endcsname {\simpleiconsmap\symbol{"F366}} - \expandafter\def\csname simpleicon@saucelabsicon\endcsname {\simpleiconsmap\symbol{"F367}} - \expandafter\def\csname simpleicon@saudiaicon\endcsname {\simpleiconsmap\symbol{"F368}} - \expandafter\def\csname simpleicon@scalaicon\endcsname {\simpleiconsmap\symbol{"F369}} - \expandafter\def\csname simpleicon@scalewayicon\endcsname {\simpleiconsmap\symbol{"F36A}} - \expandafter\def\csname simpleicon@scaniaicon\endcsname {\simpleiconsmap\symbol{"F36B}} - \expandafter\def\csname simpleicon@schneiderelectricicon\endcsname {\simpleiconsmap\symbol{"F36C}} - \expandafter\def\csname simpleicon@scikitlearnicon\endcsname {\simpleiconsmap\symbol{"F36D}} - \expandafter\def\csname simpleicon@scilabicon\endcsname {\simpleiconsmap\symbol{"F36E}} - \expandafter\def\csname simpleicon@scipyicon\endcsname {\simpleiconsmap\symbol{"F36F}} - \expandafter\def\csname simpleicon@scopusicon\endcsname {\simpleiconsmap\symbol{"F370}} - \expandafter\def\csname simpleicon@scpfoundationicon\endcsname {\simpleiconsmap\symbol{"F371}} - \expandafter\def\csname simpleicon@scrapboxicon\endcsname {\simpleiconsmap\symbol{"F372}} - \expandafter\def\csname simpleicon@scrapyicon\endcsname {\simpleiconsmap\symbol{"F373}} - \expandafter\def\csname simpleicon@scratchicon\endcsname {\simpleiconsmap\symbol{"F374}} - \expandafter\def\csname simpleicon@screencastifyicon\endcsname {\simpleiconsmap\symbol{"F375}} - \expandafter\def\csname simpleicon@scribdicon\endcsname {\simpleiconsmap\symbol{"F376}} - \expandafter\def\csname simpleicon@scrimbaicon\endcsname {\simpleiconsmap\symbol{"F377}} - \expandafter\def\csname simpleicon@scrollrevealicon\endcsname {\simpleiconsmap\symbol{"F378}} - \expandafter\def\csname simpleicon@scrumallianceicon\endcsname {\simpleiconsmap\symbol{"F379}} - \expandafter\def\csname simpleicon@scrutinizerciicon\endcsname {\simpleiconsmap\symbol{"F37A}} - \expandafter\def\csname simpleicon@scylladbicon\endcsname {\simpleiconsmap\symbol{"F37B}} - \expandafter\def\csname simpleicon@seagateicon\endcsname {\simpleiconsmap\symbol{"F37C}} - \expandafter\def\csname simpleicon@searxngicon\endcsname {\simpleiconsmap\symbol{"F37D}} - \expandafter\def\csname simpleicon@seaticon\endcsname {\simpleiconsmap\symbol{"F37E}} - \expandafter\def\csname simpleicon@seatgeekicon\endcsname {\simpleiconsmap\symbol{"F37F}} - \expandafter\def\csname simpleicon@securityscorecardicon\endcsname {\simpleiconsmap\symbol{"F380}} - \expandafter\def\csname simpleicon@sefariaicon\endcsname {\simpleiconsmap\symbol{"F381}} - \expandafter\def\csname simpleicon@segaicon\endcsname {\simpleiconsmap\symbol{"F382}} - \expandafter\def\csname simpleicon@seleniumicon\endcsname {\simpleiconsmap\symbol{"F383}} - \expandafter\def\csname simpleicon@sellfyicon\endcsname {\simpleiconsmap\symbol{"F384}} - \expandafter\def\csname simpleicon@semanticreleaseicon\endcsname {\simpleiconsmap\symbol{"F385}} - \expandafter\def\csname simpleicon@semanticscholaricon\endcsname {\simpleiconsmap\symbol{"F386}} - \expandafter\def\csname simpleicon@semanticuiicon\endcsname {\simpleiconsmap\symbol{"F387}} - \expandafter\def\csname simpleicon@semanticuireacticon\endcsname {\simpleiconsmap\symbol{"F388}} - \expandafter\def\csname simpleicon@semanticwebicon\endcsname {\simpleiconsmap\symbol{"F389}} - \expandafter\def\csname simpleicon@semaphoreciicon\endcsname {\simpleiconsmap\symbol{"F38A}} - \expandafter\def\csname simpleicon@semrushicon\endcsname {\simpleiconsmap\symbol{"F38B}} - \expandafter\def\csname simpleicon@semvericon\endcsname {\simpleiconsmap\symbol{"F38C}} - \expandafter\def\csname simpleicon@senchaicon\endcsname {\simpleiconsmap\symbol{"F38D}} - \expandafter\def\csname simpleicon@sennheisericon\endcsname {\simpleiconsmap\symbol{"F38E}} - \expandafter\def\csname simpleicon@sensuicon\endcsname {\simpleiconsmap\symbol{"F38F}} - \expandafter\def\csname simpleicon@sentryicon\endcsname {\simpleiconsmap\symbol{"F390}} - \expandafter\def\csname simpleicon@sepaicon\endcsname {\simpleiconsmap\symbol{"F391}} - \expandafter\def\csname simpleicon@sequelizeicon\endcsname {\simpleiconsmap\symbol{"F392}} - \expandafter\def\csname simpleicon@serverfaulticon\endcsname {\simpleiconsmap\symbol{"F393}} - \expandafter\def\csname simpleicon@serverlessicon\endcsname {\simpleiconsmap\symbol{"F394}} - \expandafter\def\csname simpleicon@sessionicon\endcsname {\simpleiconsmap\symbol{"F395}} - \expandafter\def\csname simpleicon@sessionizeicon\endcsname {\simpleiconsmap\symbol{"F396}} - \expandafter\def\csname simpleicon@setappicon\endcsname {\simpleiconsmap\symbol{"F397}} - \expandafter\def\csname simpleicon@sfmlicon\endcsname {\simpleiconsmap\symbol{"F398}} - \expandafter\def\csname simpleicon@shadcnuiicon\endcsname {\simpleiconsmap\symbol{"F399}} - \expandafter\def\csname simpleicon@shadowicon\endcsname {\simpleiconsmap\symbol{"F39A}} - \expandafter\def\csname simpleicon@shanghaimetroicon\endcsname {\simpleiconsmap\symbol{"F39B}} - \expandafter\def\csname simpleicon@sharexicon\endcsname {\simpleiconsmap\symbol{"F39C}} - \expandafter\def\csname simpleicon@sharpicon\endcsname {\simpleiconsmap\symbol{"F39D}} - \expandafter\def\csname simpleicon@shazamicon\endcsname {\simpleiconsmap\symbol{"F39E}} - \expandafter\def\csname simpleicon@shellicon\endcsname {\simpleiconsmap\symbol{"F39F}} - \expandafter\def\csname simpleicon@shellyicon\endcsname {\simpleiconsmap\symbol{"F3A0}} - \expandafter\def\csname simpleicon@shenzhenmetroicon\endcsname {\simpleiconsmap\symbol{"F3A1}} - \expandafter\def\csname simpleicon@shieldsdotioicon\endcsname {\simpleiconsmap\symbol{"F3A2}} - \expandafter\def\csname simpleicon@shikimoriicon\endcsname {\simpleiconsmap\symbol{"F3A3}} - \expandafter\def\csname simpleicon@shopeeicon\endcsname {\simpleiconsmap\symbol{"F3A4}} - \expandafter\def\csname simpleicon@shopifyicon\endcsname {\simpleiconsmap\symbol{"F3A5}} - \expandafter\def\csname simpleicon@shopwareicon\endcsname {\simpleiconsmap\symbol{"F3A6}} - \expandafter\def\csname simpleicon@shortcuticon\endcsname {\simpleiconsmap\symbol{"F3A7}} - \expandafter\def\csname simpleicon@showpadicon\endcsname {\simpleiconsmap\symbol{"F3A8}} - \expandafter\def\csname simpleicon@showtimeicon\endcsname {\simpleiconsmap\symbol{"F3A9}} - \expandafter\def\csname simpleicon@showwcaseicon\endcsname {\simpleiconsmap\symbol{"F3AA}} - \expandafter\def\csname simpleicon@shutterstockicon\endcsname {\simpleiconsmap\symbol{"F3AB}} - \expandafter\def\csname simpleicon@sidekiqicon\endcsname {\simpleiconsmap\symbol{"F3AC}} - \expandafter\def\csname simpleicon@sidequesticon\endcsname {\simpleiconsmap\symbol{"F3AD}} - \expandafter\def\csname simpleicon@siemensicon\endcsname {\simpleiconsmap\symbol{"F3AE}} - \expandafter\def\csname simpleicon@sifiveicon\endcsname {\simpleiconsmap\symbol{"F3AF}} - \expandafter\def\csname simpleicon@signalicon\endcsname {\simpleiconsmap\symbol{"F3B0}} - \expandafter\def\csname simpleicon@similarwebicon\endcsname {\simpleiconsmap\symbol{"F3B1}} - \expandafter\def\csname simpleicon@simklicon\endcsname {\simpleiconsmap\symbol{"F3B2}} - \expandafter\def\csname simpleicon@simpleanalyticsicon\endcsname {\simpleiconsmap\symbol{"F3B3}} - \expandafter\def\csname simpleicon@simpleiconsicon\endcsname {\simpleiconsmap\symbol{"F3B4}} - \expandafter\def\csname simpleicon@simpleloginicon\endcsname {\simpleiconsmap\symbol{"F3B5}} - \expandafter\def\csname simpleicon@simplenoteicon\endcsname {\simpleiconsmap\symbol{"F3B6}} - \expandafter\def\csname simpleicon@sinaweiboicon\endcsname {\simpleiconsmap\symbol{"F3B7}} - \expandafter\def\csname simpleicon@singaporeairlinesicon\endcsname {\simpleiconsmap\symbol{"F3B8}} - \expandafter\def\csname simpleicon@singlestoreicon\endcsname {\simpleiconsmap\symbol{"F3B9}} - \expandafter\def\csname simpleicon@sitecoreicon\endcsname {\simpleiconsmap\symbol{"F3BA}} - \expandafter\def\csname simpleicon@sitepointicon\endcsname {\simpleiconsmap\symbol{"F3BB}} - \expandafter\def\csname simpleicon@siyuanicon\endcsname {\simpleiconsmap\symbol{"F3BC}} - \expandafter\def\csname simpleicon@skaffoldicon\endcsname {\simpleiconsmap\symbol{"F3BD}} - \expandafter\def\csname simpleicon@sketchicon\endcsname {\simpleiconsmap\symbol{"F3BE}} - \expandafter\def\csname simpleicon@sketchfabicon\endcsname {\simpleiconsmap\symbol{"F3BF}} - \expandafter\def\csname simpleicon@sketchupicon\endcsname {\simpleiconsmap\symbol{"F3C0}} - \expandafter\def\csname simpleicon@skillshareicon\endcsname {\simpleiconsmap\symbol{"F3C1}} - \expandafter\def\csname simpleicon@skodaicon\endcsname {\simpleiconsmap\symbol{"F3C2}} - \expandafter\def\csname simpleicon@skyicon\endcsname {\simpleiconsmap\symbol{"F3C3}} - \expandafter\def\csname simpleicon@skypackicon\endcsname {\simpleiconsmap\symbol{"F3C4}} - \expandafter\def\csname simpleicon@skyrockicon\endcsname {\simpleiconsmap\symbol{"F3C5}} - \expandafter\def\csname simpleicon@slackicon\endcsname {\simpleiconsmap\symbol{"F3C6}} - \expandafter\def\csname simpleicon@slackwareicon\endcsname {\simpleiconsmap\symbol{"F3C7}} - \expandafter\def\csname simpleicon@slashdoticon\endcsname {\simpleiconsmap\symbol{"F3C8}} - \expandafter\def\csname simpleicon@slickpicicon\endcsname {\simpleiconsmap\symbol{"F3C9}} - \expandafter\def\csname simpleicon@slidesicon\endcsname {\simpleiconsmap\symbol{"F3CA}} - \expandafter\def\csname simpleicon@slideshareicon\endcsname {\simpleiconsmap\symbol{"F3CB}} - \expandafter\def\csname simpleicon@slinticon\endcsname {\simpleiconsmap\symbol{"F3CC}} - \expandafter\def\csname simpleicon@smarticon\endcsname {\simpleiconsmap\symbol{"F3CD}} - \expandafter\def\csname simpleicon@smartthingsicon\endcsname {\simpleiconsmap\symbol{"F3CE}} - \expandafter\def\csname simpleicon@smashdotggicon\endcsname {\simpleiconsmap\symbol{"F3CF}} - \expandafter\def\csname simpleicon@smashingmagazineicon\endcsname {\simpleiconsmap\symbol{"F3D0}} - \expandafter\def\csname simpleicon@smrticon\endcsname {\simpleiconsmap\symbol{"F3D1}} - \expandafter\def\csname simpleicon@smugmugicon\endcsname {\simpleiconsmap\symbol{"F3D2}} - \expandafter\def\csname simpleicon@snapchaticon\endcsname {\simpleiconsmap\symbol{"F3D3}} - \expandafter\def\csname simpleicon@snapcrafticon\endcsname {\simpleiconsmap\symbol{"F3D4}} - \expandafter\def\csname simpleicon@sncficon\endcsname {\simpleiconsmap\symbol{"F3D5}} - \expandafter\def\csname simpleicon@snorticon\endcsname {\simpleiconsmap\symbol{"F3D6}} - \expandafter\def\csname simpleicon@snowflakeicon\endcsname {\simpleiconsmap\symbol{"F3D7}} - \expandafter\def\csname simpleicon@snowpackicon\endcsname {\simpleiconsmap\symbol{"F3D8}} - \expandafter\def\csname simpleicon@snykicon\endcsname {\simpleiconsmap\symbol{"F3D9}} - \expandafter\def\csname simpleicon@socialbladeicon\endcsname {\simpleiconsmap\symbol{"F3DA}} - \expandafter\def\csname simpleicon@society6icon\endcsname {\simpleiconsmap\symbol{"F3DB}} - \expandafter\def\csname simpleicon@socketdotioicon\endcsname {\simpleiconsmap\symbol{"F3DC}} - \expandafter\def\csname simpleicon@softpediaicon\endcsname {\simpleiconsmap\symbol{"F3DD}} - \expandafter\def\csname simpleicon@sogouicon\endcsname {\simpleiconsmap\symbol{"F3DE}} - \expandafter\def\csname simpleicon@solanaicon\endcsname {\simpleiconsmap\symbol{"F3DF}} - \expandafter\def\csname simpleicon@solidicon\endcsname {\simpleiconsmap\symbol{"F3E0}} - \expandafter\def\csname simpleicon@solidityicon\endcsname {\simpleiconsmap\symbol{"F3E1}} - \expandafter\def\csname simpleicon@sololearnicon\endcsname {\simpleiconsmap\symbol{"F3E2}} - \expandafter\def\csname simpleicon@solusicon\endcsname {\simpleiconsmap\symbol{"F3E3}} - \expandafter\def\csname simpleicon@sonaricon\endcsname {\simpleiconsmap\symbol{"F3E4}} - \expandafter\def\csname simpleicon@sonarcloudicon\endcsname {\simpleiconsmap\symbol{"F3E5}} - \expandafter\def\csname simpleicon@sonarlinticon\endcsname {\simpleiconsmap\symbol{"F3E6}} - \expandafter\def\csname simpleicon@sonarqubeicon\endcsname {\simpleiconsmap\symbol{"F3E7}} - \expandafter\def\csname simpleicon@sonarricon\endcsname {\simpleiconsmap\symbol{"F3E8}} - \expandafter\def\csname simpleicon@sonatypeicon\endcsname {\simpleiconsmap\symbol{"F3E9}} - \expandafter\def\csname simpleicon@songkickicon\endcsname {\simpleiconsmap\symbol{"F3EA}} - \expandafter\def\csname simpleicon@songodaicon\endcsname {\simpleiconsmap\symbol{"F3EB}} - \expandafter\def\csname simpleicon@sonicwallicon\endcsname {\simpleiconsmap\symbol{"F3EC}} - \expandafter\def\csname simpleicon@sonosicon\endcsname {\simpleiconsmap\symbol{"F3ED}} - \expandafter\def\csname simpleicon@sonyicon\endcsname {\simpleiconsmap\symbol{"F3EE}} - \expandafter\def\csname simpleicon@sorianaicon\endcsname {\simpleiconsmap\symbol{"F3EF}} - \expandafter\def\csname simpleicon@soundchartsicon\endcsname {\simpleiconsmap\symbol{"F3F0}} - \expandafter\def\csname simpleicon@soundcloudicon\endcsname {\simpleiconsmap\symbol{"F3F1}} - \expandafter\def\csname simpleicon@sourceengineicon\endcsname {\simpleiconsmap\symbol{"F3F2}} - \expandafter\def\csname simpleicon@sourceforgeicon\endcsname {\simpleiconsmap\symbol{"F3F3}} - \expandafter\def\csname simpleicon@sourcehuticon\endcsname {\simpleiconsmap\symbol{"F3F4}} - \expandafter\def\csname simpleicon@sourcetreeicon\endcsname {\simpleiconsmap\symbol{"F3F5}} - \expandafter\def\csname simpleicon@southwestairlinesicon\endcsname {\simpleiconsmap\symbol{"F3F6}} - \expandafter\def\csname simpleicon@spacemacsicon\endcsname {\simpleiconsmap\symbol{"F3F7}} - \expandafter\def\csname simpleicon@spaceshipicon\endcsname {\simpleiconsmap\symbol{"F3F8}} - \expandafter\def\csname simpleicon@spacexicon\endcsname {\simpleiconsmap\symbol{"F3F9}} - \expandafter\def\csname simpleicon@spacyicon\endcsname {\simpleiconsmap\symbol{"F3FA}} - \expandafter\def\csname simpleicon@sparkaricon\endcsname {\simpleiconsmap\symbol{"F3FB}} - \expandafter\def\csname simpleicon@sparkasseicon\endcsname {\simpleiconsmap\symbol{"F3FC}} - \expandafter\def\csname simpleicon@sparkfunicon\endcsname {\simpleiconsmap\symbol{"F3FD}} - \expandafter\def\csname simpleicon@sparkposticon\endcsname {\simpleiconsmap\symbol{"F3FE}} - \expandafter\def\csname simpleicon@spdxicon\endcsname {\simpleiconsmap\symbol{"F3FF}} - \expandafter\def\csname simpleicon@speakerdeckicon\endcsname {\simpleiconsmap\symbol{"F400}} - \expandafter\def\csname simpleicon@spectrumicon\endcsname {\simpleiconsmap\symbol{"F401}} - \expandafter\def\csname simpleicon@speedtesticon\endcsname {\simpleiconsmap\symbol{"F402}} - \expandafter\def\csname simpleicon@speedypageicon\endcsname {\simpleiconsmap\symbol{"F403}} - \expandafter\def\csname simpleicon@sphinxicon\endcsname {\simpleiconsmap\symbol{"F404}} - \expandafter\def\csname simpleicon@spigotmcicon\endcsname {\simpleiconsmap\symbol{"F405}} - \expandafter\def\csname simpleicon@spineicon\endcsname {\simpleiconsmap\symbol{"F406}} - \expandafter\def\csname simpleicon@spinnakericon\endcsname {\simpleiconsmap\symbol{"F407}} - \expandafter\def\csname simpleicon@spinrillaicon\endcsname {\simpleiconsmap\symbol{"F408}} - \expandafter\def\csname simpleicon@splunkicon\endcsname {\simpleiconsmap\symbol{"F409}} - \expandafter\def\csname simpleicon@spojicon\endcsname {\simpleiconsmap\symbol{"F40A}} - \expandafter\def\csname simpleicon@spondicon\endcsname {\simpleiconsmap\symbol{"F40B}} - \expandafter\def\csname simpleicon@spotifyicon\endcsname {\simpleiconsmap\symbol{"F40C}} - \expandafter\def\csname simpleicon@spotlighticon\endcsname {\simpleiconsmap\symbol{"F40D}} - \expandafter\def\csname simpleicon@spreadshirticon\endcsname {\simpleiconsmap\symbol{"F40E}} - \expandafter\def\csname simpleicon@spreakericon\endcsname {\simpleiconsmap\symbol{"F40F}} - \expandafter\def\csname simpleicon@springicon\endcsname {\simpleiconsmap\symbol{"F410}} - \expandafter\def\csname simpleicon@springcreatorsicon\endcsname {\simpleiconsmap\symbol{"F411}} - \expandafter\def\csname simpleicon@springbooticon\endcsname {\simpleiconsmap\symbol{"F412}} - \expandafter\def\csname simpleicon@springsecurityicon\endcsname {\simpleiconsmap\symbol{"F413}} - \expandafter\def\csname simpleicon@spyderideicon\endcsname {\simpleiconsmap\symbol{"F414}} - \expandafter\def\csname simpleicon@sqlalchemyicon\endcsname {\simpleiconsmap\symbol{"F415}} - \expandafter\def\csname simpleicon@sqliteicon\endcsname {\simpleiconsmap\symbol{"F416}} - \expandafter\def\csname simpleicon@squareicon\endcsname {\simpleiconsmap\symbol{"F417}} - \expandafter\def\csname simpleicon@squareenixicon\endcsname {\simpleiconsmap\symbol{"F418}} - \expandafter\def\csname simpleicon@squarespaceicon\endcsname {\simpleiconsmap\symbol{"F419}} - \expandafter\def\csname simpleicon@srgssricon\endcsname {\simpleiconsmap\symbol{"F41A}} - \expandafter\def\csname simpleicon@ssrnicon\endcsname {\simpleiconsmap\symbol{"F41B}} - \expandafter\def\csname simpleicon@ssticon\endcsname {\simpleiconsmap\symbol{"F41C}} - \expandafter\def\csname simpleicon@stackbiticon\endcsname {\simpleiconsmap\symbol{"F41D}} - \expandafter\def\csname simpleicon@stackblitzicon\endcsname {\simpleiconsmap\symbol{"F41E}} - \expandafter\def\csname simpleicon@stackediticon\endcsname {\simpleiconsmap\symbol{"F41F}} - \expandafter\def\csname simpleicon@stackexchangeicon\endcsname {\simpleiconsmap\symbol{"F420}} - \expandafter\def\csname simpleicon@stackhawkicon\endcsname {\simpleiconsmap\symbol{"F421}} - \expandafter\def\csname simpleicon@stackoverflowicon\endcsname {\simpleiconsmap\symbol{"F422}} - \expandafter\def\csname simpleicon@stackpathicon\endcsname {\simpleiconsmap\symbol{"F423}} - \expandafter\def\csname simpleicon@stackshareicon\endcsname {\simpleiconsmap\symbol{"F424}} - \expandafter\def\csname simpleicon@stadiaicon\endcsname {\simpleiconsmap\symbol{"F425}} - \expandafter\def\csname simpleicon@staffbaseicon\endcsname {\simpleiconsmap\symbol{"F426}} - \expandafter\def\csname simpleicon@stagetimericon\endcsname {\simpleiconsmap\symbol{"F427}} - \expandafter\def\csname simpleicon@standardjsicon\endcsname {\simpleiconsmap\symbol{"F428}} - \expandafter\def\csname simpleicon@standardresumeicon\endcsname {\simpleiconsmap\symbol{"F429}} - \expandafter\def\csname simpleicon@starbucksicon\endcsname {\simpleiconsmap\symbol{"F42A}} - \expandafter\def\csname simpleicon@stardockicon\endcsname {\simpleiconsmap\symbol{"F42B}} - \expandafter\def\csname simpleicon@starlingbankicon\endcsname {\simpleiconsmap\symbol{"F42C}} - \expandafter\def\csname simpleicon@starshipicon\endcsname {\simpleiconsmap\symbol{"F42D}} - \expandafter\def\csname simpleicon@startrekicon\endcsname {\simpleiconsmap\symbol{"F42E}} - \expandafter\def\csname simpleicon@starzicon\endcsname {\simpleiconsmap\symbol{"F42F}} - \expandafter\def\csname simpleicon@statamicicon\endcsname {\simpleiconsmap\symbol{"F430}} - \expandafter\def\csname simpleicon@statistaicon\endcsname {\simpleiconsmap\symbol{"F431}} - \expandafter\def\csname simpleicon@statuspageicon\endcsname {\simpleiconsmap\symbol{"F432}} - \expandafter\def\csname simpleicon@statuspalicon\endcsname {\simpleiconsmap\symbol{"F433}} - \expandafter\def\csname simpleicon@steamicon\endcsname {\simpleiconsmap\symbol{"F434}} - \expandafter\def\csname simpleicon@steamdbicon\endcsname {\simpleiconsmap\symbol{"F435}} - \expandafter\def\csname simpleicon@steamdeckicon\endcsname {\simpleiconsmap\symbol{"F436}} - \expandafter\def\csname simpleicon@steamworksicon\endcsname {\simpleiconsmap\symbol{"F437}} - \expandafter\def\csname simpleicon@steelseriesicon\endcsname {\simpleiconsmap\symbol{"F438}} - \expandafter\def\csname simpleicon@steemicon\endcsname {\simpleiconsmap\symbol{"F439}} - \expandafter\def\csname simpleicon@steemiticon\endcsname {\simpleiconsmap\symbol{"F43A}} - \expandafter\def\csname simpleicon@steinbergicon\endcsname {\simpleiconsmap\symbol{"F43B}} - \expandafter\def\csname simpleicon@stellaricon\endcsname {\simpleiconsmap\symbol{"F43C}} - \expandafter\def\csname simpleicon@stencilicon\endcsname {\simpleiconsmap\symbol{"F43D}} - \expandafter\def\csname simpleicon@stencylicon\endcsname {\simpleiconsmap\symbol{"F43E}} - \expandafter\def\csname simpleicon@stimulusicon\endcsname {\simpleiconsmap\symbol{"F43F}} - \expandafter\def\csname simpleicon@stitchericon\endcsname {\simpleiconsmap\symbol{"F440}} - \expandafter\def\csname simpleicon@stmicroelectronicsicon\endcsname {\simpleiconsmap\symbol{"F441}} - \expandafter\def\csname simpleicon@stockxicon\endcsname {\simpleiconsmap\symbol{"F442}} - \expandafter\def\csname simpleicon@stopstalkicon\endcsname {\simpleiconsmap\symbol{"F443}} - \expandafter\def\csname simpleicon@storyblokicon\endcsname {\simpleiconsmap\symbol{"F444}} - \expandafter\def\csname simpleicon@storybookicon\endcsname {\simpleiconsmap\symbol{"F445}} - \expandafter\def\csname simpleicon@strapiicon\endcsname {\simpleiconsmap\symbol{"F446}} - \expandafter\def\csname simpleicon@stravaicon\endcsname {\simpleiconsmap\symbol{"F447}} - \expandafter\def\csname simpleicon@streamlabsicon\endcsname {\simpleiconsmap\symbol{"F448}} - \expandafter\def\csname simpleicon@streamliticon\endcsname {\simpleiconsmap\symbol{"F449}} - \expandafter\def\csname simpleicon@streamrunnersicon\endcsname {\simpleiconsmap\symbol{"F44A}} - \expandafter\def\csname simpleicon@stripeicon\endcsname {\simpleiconsmap\symbol{"F44B}} - \expandafter\def\csname simpleicon@strongswanicon\endcsname {\simpleiconsmap\symbol{"F44C}} - \expandafter\def\csname simpleicon@strykericon\endcsname {\simpleiconsmap\symbol{"F44D}} - \expandafter\def\csname simpleicon@stubhubicon\endcsname {\simpleiconsmap\symbol{"F44E}} - \expandafter\def\csname simpleicon@studio3ticon\endcsname {\simpleiconsmap\symbol{"F44F}} - \expandafter\def\csname simpleicon@studyverseicon\endcsname {\simpleiconsmap\symbol{"F450}} - \expandafter\def\csname simpleicon@styledcomponentsicon\endcsname {\simpleiconsmap\symbol{"F451}} - \expandafter\def\csname simpleicon@stylelinticon\endcsname {\simpleiconsmap\symbol{"F452}} - \expandafter\def\csname simpleicon@styleshareicon\endcsname {\simpleiconsmap\symbol{"F453}} - \expandafter\def\csname simpleicon@stylusicon\endcsname {\simpleiconsmap\symbol{"F454}} - \expandafter\def\csname simpleicon@subaruicon\endcsname {\simpleiconsmap\symbol{"F455}} - \expandafter\def\csname simpleicon@sublimetexticon\endcsname {\simpleiconsmap\symbol{"F456}} - \expandafter\def\csname simpleicon@substackicon\endcsname {\simpleiconsmap\symbol{"F457}} - \expandafter\def\csname simpleicon@subtitleediticon\endcsname {\simpleiconsmap\symbol{"F458}} - \expandafter\def\csname simpleicon@subversionicon\endcsname {\simpleiconsmap\symbol{"F459}} - \expandafter\def\csname simpleicon@sucklessicon\endcsname {\simpleiconsmap\symbol{"F45A}} - \expandafter\def\csname simpleicon@sumologicicon\endcsname {\simpleiconsmap\symbol{"F45B}} - \expandafter\def\csname simpleicon@sunoicon\endcsname {\simpleiconsmap\symbol{"F45C}} - \expandafter\def\csname simpleicon@sunriseicon\endcsname {\simpleiconsmap\symbol{"F45D}} - \expandafter\def\csname simpleicon@supabaseicon\endcsname {\simpleiconsmap\symbol{"F45E}} - \expandafter\def\csname simpleicon@supercreaseicon\endcsname {\simpleiconsmap\symbol{"F45F}} - \expandafter\def\csname simpleicon@supermicroicon\endcsname {\simpleiconsmap\symbol{"F460}} - \expandafter\def\csname simpleicon@superusericon\endcsname {\simpleiconsmap\symbol{"F461}} - \expandafter\def\csname simpleicon@surrealdbicon\endcsname {\simpleiconsmap\symbol{"F462}} - \expandafter\def\csname simpleicon@surveymonkeyicon\endcsname {\simpleiconsmap\symbol{"F463}} - \expandafter\def\csname simpleicon@suseicon\endcsname {\simpleiconsmap\symbol{"F464}} - \expandafter\def\csname simpleicon@suzukiicon\endcsname {\simpleiconsmap\symbol{"F465}} - \expandafter\def\csname simpleicon@svelteicon\endcsname {\simpleiconsmap\symbol{"F466}} - \expandafter\def\csname simpleicon@svgicon\endcsname {\simpleiconsmap\symbol{"F467}} - \expandafter\def\csname simpleicon@svgdotjsicon\endcsname {\simpleiconsmap\symbol{"F468}} - \expandafter\def\csname simpleicon@svgoicon\endcsname {\simpleiconsmap\symbol{"F469}} - \expandafter\def\csname simpleicon@swaggericon\endcsname {\simpleiconsmap\symbol{"F46A}} - \expandafter\def\csname simpleicon@swarmicon\endcsname {\simpleiconsmap\symbol{"F46B}} - \expandafter\def\csname simpleicon@swcicon\endcsname {\simpleiconsmap\symbol{"F46C}} - \expandafter\def\csname simpleicon@swifticon\endcsname {\simpleiconsmap\symbol{"F46D}} - \expandafter\def\csname simpleicon@swiggyicon\endcsname {\simpleiconsmap\symbol{"F46E}} - \expandafter\def\csname simpleicon@swipericon\endcsname {\simpleiconsmap\symbol{"F46F}} - \expandafter\def\csname simpleicon@swricon\endcsname {\simpleiconsmap\symbol{"F470}} - \expandafter\def\csname simpleicon@symantecicon\endcsname {\simpleiconsmap\symbol{"F471}} - \expandafter\def\csname simpleicon@symbolabicon\endcsname {\simpleiconsmap\symbol{"F472}} - \expandafter\def\csname simpleicon@symfonyicon\endcsname {\simpleiconsmap\symbol{"F473}} - \expandafter\def\csname simpleicon@symphonyicon\endcsname {\simpleiconsmap\symbol{"F474}} - \expandafter\def\csname simpleicon@sympyicon\endcsname {\simpleiconsmap\symbol{"F475}} - \expandafter\def\csname simpleicon@syncthingicon\endcsname {\simpleiconsmap\symbol{"F476}} - \expandafter\def\csname simpleicon@synologyicon\endcsname {\simpleiconsmap\symbol{"F477}} - \expandafter\def\csname simpleicon@system76icon\endcsname {\simpleiconsmap\symbol{"F478}} - \expandafter\def\csname simpleicon@tabelogicon\endcsname {\simpleiconsmap\symbol{"F479}} - \expandafter\def\csname simpleicon@tableauicon\endcsname {\simpleiconsmap\symbol{"F47A}} - \expandafter\def\csname simpleicon@tablecheckicon\endcsname {\simpleiconsmap\symbol{"F47B}} - \expandafter\def\csname simpleicon@tacobellicon\endcsname {\simpleiconsmap\symbol{"F47C}} - \expandafter\def\csname simpleicon@tadoicon\endcsname {\simpleiconsmap\symbol{"F47D}} - \expandafter\def\csname simpleicon@taichigraphicsicon\endcsname {\simpleiconsmap\symbol{"F47E}} - \expandafter\def\csname simpleicon@taichilangicon\endcsname {\simpleiconsmap\symbol{"F47F}} - \expandafter\def\csname simpleicon@tailsicon\endcsname {\simpleiconsmap\symbol{"F480}} - \expandafter\def\csname simpleicon@tailscaleicon\endcsname {\simpleiconsmap\symbol{"F481}} - \expandafter\def\csname simpleicon@tailwindcssicon\endcsname {\simpleiconsmap\symbol{"F482}} - \expandafter\def\csname simpleicon@taipyicon\endcsname {\simpleiconsmap\symbol{"F483}} - \expandafter\def\csname simpleicon@taketwointeractivesoftwareicon\endcsname {\simpleiconsmap\symbol{"F484}} - \expandafter\def\csname simpleicon@talendicon\endcsname {\simpleiconsmap\symbol{"F485}} - \expandafter\def\csname simpleicon@talenthouseicon\endcsname {\simpleiconsmap\symbol{"F486}} - \expandafter\def\csname simpleicon@talosicon\endcsname {\simpleiconsmap\symbol{"F487}} - \expandafter\def\csname simpleicon@tamiyaicon\endcsname {\simpleiconsmap\symbol{"F488}} - \expandafter\def\csname simpleicon@tampermonkeyicon\endcsname {\simpleiconsmap\symbol{"F489}} - \expandafter\def\csname simpleicon@taobaoicon\endcsname {\simpleiconsmap\symbol{"F48A}} - \expandafter\def\csname simpleicon@tapasicon\endcsname {\simpleiconsmap\symbol{"F48B}} - \expandafter\def\csname simpleicon@targeticon\endcsname {\simpleiconsmap\symbol{"F48C}} - \expandafter\def\csname simpleicon@taskicon\endcsname {\simpleiconsmap\symbol{"F48D}} - \expandafter\def\csname simpleicon@tasmotaicon\endcsname {\simpleiconsmap\symbol{"F48E}} - \expandafter\def\csname simpleicon@tataicon\endcsname {\simpleiconsmap\symbol{"F48F}} - \expandafter\def\csname simpleicon@tauriicon\endcsname {\simpleiconsmap\symbol{"F490}} - \expandafter\def\csname simpleicon@taxbuzzicon\endcsname {\simpleiconsmap\symbol{"F491}} - \expandafter\def\csname simpleicon@tcsicon\endcsname {\simpleiconsmap\symbol{"F492}} - \expandafter\def\csname simpleicon@tealicon\endcsname {\simpleiconsmap\symbol{"F493}} - \expandafter\def\csname simpleicon@teamcityicon\endcsname {\simpleiconsmap\symbol{"F494}} - \expandafter\def\csname simpleicon@teamspeakicon\endcsname {\simpleiconsmap\symbol{"F495}} - \expandafter\def\csname simpleicon@teamviewericon\endcsname {\simpleiconsmap\symbol{"F496}} - \expandafter\def\csname simpleicon@techcrunchicon\endcsname {\simpleiconsmap\symbol{"F497}} - \expandafter\def\csname simpleicon@tedicon\endcsname {\simpleiconsmap\symbol{"F498}} - \expandafter\def\csname simpleicon@teepublicicon\endcsname {\simpleiconsmap\symbol{"F499}} - \expandafter\def\csname simpleicon@teespringicon\endcsname {\simpleiconsmap\symbol{"F49A}} - \expandafter\def\csname simpleicon@tektonicon\endcsname {\simpleiconsmap\symbol{"F49B}} - \expandafter\def\csname simpleicon@tele5icon\endcsname {\simpleiconsmap\symbol{"F49C}} - \expandafter\def\csname simpleicon@telegramicon\endcsname {\simpleiconsmap\symbol{"F49D}} - \expandafter\def\csname simpleicon@telegraphicon\endcsname {\simpleiconsmap\symbol{"F49E}} - \expandafter\def\csname simpleicon@telequebecicon\endcsname {\simpleiconsmap\symbol{"F49F}} - \expandafter\def\csname simpleicon@temporalicon\endcsname {\simpleiconsmap\symbol{"F4A0}} - \expandafter\def\csname simpleicon@tencentqqicon\endcsname {\simpleiconsmap\symbol{"F4A1}} - \expandafter\def\csname simpleicon@tensorflowicon\endcsname {\simpleiconsmap\symbol{"F4A2}} - \expandafter\def\csname simpleicon@teradataicon\endcsname {\simpleiconsmap\symbol{"F4A3}} - \expandafter\def\csname simpleicon@teratailicon\endcsname {\simpleiconsmap\symbol{"F4A4}} - \expandafter\def\csname simpleicon@termiusicon\endcsname {\simpleiconsmap\symbol{"F4A5}} - \expandafter\def\csname simpleicon@terraformicon\endcsname {\simpleiconsmap\symbol{"F4A6}} - \expandafter\def\csname simpleicon@tescoicon\endcsname {\simpleiconsmap\symbol{"F4A7}} - \expandafter\def\csname simpleicon@teslaicon\endcsname {\simpleiconsmap\symbol{"F4A8}} - \expandafter\def\csname simpleicon@testcafeicon\endcsname {\simpleiconsmap\symbol{"F4A9}} - \expandafter\def\csname simpleicon@testinicon\endcsname {\simpleiconsmap\symbol{"F4AA}} - \expandafter\def\csname simpleicon@testinglibraryicon\endcsname {\simpleiconsmap\symbol{"F4AB}} - \expandafter\def\csname simpleicon@testrailicon\endcsname {\simpleiconsmap\symbol{"F4AC}} - \expandafter\def\csname simpleicon@tethericon\endcsname {\simpleiconsmap\symbol{"F4AD}} - \expandafter\def\csname simpleicon@textpatternicon\endcsname {\simpleiconsmap\symbol{"F4AE}} - \expandafter\def\csname simpleicon@tgaicon\endcsname {\simpleiconsmap\symbol{"F4AF}} - \expandafter\def\csname simpleicon@thangsicon\endcsname {\simpleiconsmap\symbol{"F4B0}} - \expandafter\def\csname simpleicon@thealgorithmsicon\endcsname {\simpleiconsmap\symbol{"F4B1}} - \expandafter\def\csname simpleicon@theboringcompanyicon\endcsname {\simpleiconsmap\symbol{"F4B2}} - \expandafter\def\csname simpleicon@theconversationicon\endcsname {\simpleiconsmap\symbol{"F4B3}} - \expandafter\def\csname simpleicon@thefinalsicon\endcsname {\simpleiconsmap\symbol{"F4B4}} - \expandafter\def\csname simpleicon@theirishtimesicon\endcsname {\simpleiconsmap\symbol{"F4B5}} - \expandafter\def\csname simpleicon@themightyicon\endcsname {\simpleiconsmap\symbol{"F4B6}} - \expandafter\def\csname simpleicon@themodelsresourceicon\endcsname {\simpleiconsmap\symbol{"F4B7}} - \expandafter\def\csname simpleicon@themoviedatabaseicon\endcsname {\simpleiconsmap\symbol{"F4B8}} - \expandafter\def\csname simpleicon@thenorthfaceicon\endcsname {\simpleiconsmap\symbol{"F4B9}} - \expandafter\def\csname simpleicon@theodinprojecticon\endcsname {\simpleiconsmap\symbol{"F4BA}} - \expandafter\def\csname simpleicon@theregistericon\endcsname {\simpleiconsmap\symbol{"F4BB}} - \expandafter\def\csname simpleicon@thesoundsresourceicon\endcsname {\simpleiconsmap\symbol{"F4BC}} - \expandafter\def\csname simpleicon@thespritersresourceicon\endcsname {\simpleiconsmap\symbol{"F4BD}} - \expandafter\def\csname simpleicon@thewashingtonposticon\endcsname {\simpleiconsmap\symbol{"F4BE}} - \expandafter\def\csname simpleicon@thingiverseicon\endcsname {\simpleiconsmap\symbol{"F4BF}} - \expandafter\def\csname simpleicon@thinkpadicon\endcsname {\simpleiconsmap\symbol{"F4C0}} - \expandafter\def\csname simpleicon@thirdwebicon\endcsname {\simpleiconsmap\symbol{"F4C1}} - \expandafter\def\csname simpleicon@threadlessicon\endcsname {\simpleiconsmap\symbol{"F4C2}} - \expandafter\def\csname simpleicon@threadsicon\endcsname {\simpleiconsmap\symbol{"F4C3}} - \expandafter\def\csname simpleicon@threedotjsicon\endcsname {\simpleiconsmap\symbol{"F4C4}} - \expandafter\def\csname simpleicon@threemaicon\endcsname {\simpleiconsmap\symbol{"F4C5}} - \expandafter\def\csname simpleicon@thumbtackicon\endcsname {\simpleiconsmap\symbol{"F4C6}} - \expandafter\def\csname simpleicon@thunderbirdicon\endcsname {\simpleiconsmap\symbol{"F4C7}} - \expandafter\def\csname simpleicon@thunderstoreicon\endcsname {\simpleiconsmap\symbol{"F4C8}} - \expandafter\def\csname simpleicon@thurgauerkantonalbankicon\endcsname {\simpleiconsmap\symbol{"F4C9}} - \expandafter\def\csname simpleicon@thymeleaficon\endcsname {\simpleiconsmap\symbol{"F4CA}} - \expandafter\def\csname simpleicon@ticketmastericon\endcsname {\simpleiconsmap\symbol{"F4CB}} - \expandafter\def\csname simpleicon@ticktickicon\endcsname {\simpleiconsmap\symbol{"F4CC}} - \expandafter\def\csname simpleicon@tidalicon\endcsname {\simpleiconsmap\symbol{"F4CD}} - \expandafter\def\csname simpleicon@tiddlywikiicon\endcsname {\simpleiconsmap\symbol{"F4CE}} - \expandafter\def\csname simpleicon@tideicon\endcsname {\simpleiconsmap\symbol{"F4CF}} - \expandafter\def\csname simpleicon@tidyverseicon\endcsname {\simpleiconsmap\symbol{"F4D0}} - \expandafter\def\csname simpleicon@tietoevryicon\endcsname {\simpleiconsmap\symbol{"F4D1}} - \expandafter\def\csname simpleicon@tiktokicon\endcsname {\simpleiconsmap\symbol{"F4D2}} - \expandafter\def\csname simpleicon@tildapublishingicon\endcsname {\simpleiconsmap\symbol{"F4D3}} - \expandafter\def\csname simpleicon@tileicon\endcsname {\simpleiconsmap\symbol{"F4D4}} - \expandafter\def\csname simpleicon@timescaleicon\endcsname {\simpleiconsmap\symbol{"F4D5}} - \expandafter\def\csname simpleicon@tinaicon\endcsname {\simpleiconsmap\symbol{"F4D6}} - \expandafter\def\csname simpleicon@tindericon\endcsname {\simpleiconsmap\symbol{"F4D7}} - \expandafter\def\csname simpleicon@tindieicon\endcsname {\simpleiconsmap\symbol{"F4D8}} - \expandafter\def\csname simpleicon@tinkercadicon\endcsname {\simpleiconsmap\symbol{"F4D9}} - \expandafter\def\csname simpleicon@tinygradicon\endcsname {\simpleiconsmap\symbol{"F4DA}} - \expandafter\def\csname simpleicon@tinylettericon\endcsname {\simpleiconsmap\symbol{"F4DB}} - \expandafter\def\csname simpleicon@tistoryicon\endcsname {\simpleiconsmap\symbol{"F4DC}} - \expandafter\def\csname simpleicon@tldrawicon\endcsname {\simpleiconsmap\symbol{"F4DD}} - \expandafter\def\csname simpleicon@tmobileicon\endcsname {\simpleiconsmap\symbol{"F4DE}} - \expandafter\def\csname simpleicon@tmuxicon\endcsname {\simpleiconsmap\symbol{"F4DF}} - \expandafter\def\csname simpleicon@todoisticon\endcsname {\simpleiconsmap\symbol{"F4E0}} - \expandafter\def\csname simpleicon@togglicon\endcsname {\simpleiconsmap\symbol{"F4E1}} - \expandafter\def\csname simpleicon@toggltrackicon\endcsname {\simpleiconsmap\symbol{"F4E2}} - \expandafter\def\csname simpleicon@tokyometroicon\endcsname {\simpleiconsmap\symbol{"F4E3}} - \expandafter\def\csname simpleicon@tollicon\endcsname {\simpleiconsmap\symbol{"F4E4}} - \expandafter\def\csname simpleicon@tomlicon\endcsname {\simpleiconsmap\symbol{"F4E5}} - \expandafter\def\csname simpleicon@tomorrowlandicon\endcsname {\simpleiconsmap\symbol{"F4E6}} - \expandafter\def\csname simpleicon@tonicon\endcsname {\simpleiconsmap\symbol{"F4E7}} - \expandafter\def\csname simpleicon@topcodericon\endcsname {\simpleiconsmap\symbol{"F4E8}} - \expandafter\def\csname simpleicon@topdotggicon\endcsname {\simpleiconsmap\symbol{"F4E9}} - \expandafter\def\csname simpleicon@toptalicon\endcsname {\simpleiconsmap\symbol{"F4EA}} - \expandafter\def\csname simpleicon@torbrowsericon\endcsname {\simpleiconsmap\symbol{"F4EB}} - \expandafter\def\csname simpleicon@torprojecticon\endcsname {\simpleiconsmap\symbol{"F4EC}} - \expandafter\def\csname simpleicon@toshibaicon\endcsname {\simpleiconsmap\symbol{"F4ED}} - \expandafter\def\csname simpleicon@totvsicon\endcsname {\simpleiconsmap\symbol{"F4EE}} - \expandafter\def\csname simpleicon@tourboxicon\endcsname {\simpleiconsmap\symbol{"F4EF}} - \expandafter\def\csname simpleicon@towericon\endcsname {\simpleiconsmap\symbol{"F4F0}} - \expandafter\def\csname simpleicon@toyotaicon\endcsname {\simpleiconsmap\symbol{"F4F1}} - \expandafter\def\csname simpleicon@tplinkicon\endcsname {\simpleiconsmap\symbol{"F4F2}} - \expandafter\def\csname simpleicon@tqdmicon\endcsname {\simpleiconsmap\symbol{"F4F3}} - \expandafter\def\csname simpleicon@traccaricon\endcsname {\simpleiconsmap\symbol{"F4F4}} - \expandafter\def\csname simpleicon@tradingviewicon\endcsname {\simpleiconsmap\symbol{"F4F5}} - \expandafter\def\csname simpleicon@traefikmeshicon\endcsname {\simpleiconsmap\symbol{"F4F6}} - \expandafter\def\csname simpleicon@traefikproxyicon\endcsname {\simpleiconsmap\symbol{"F4F7}} - \expandafter\def\csname simpleicon@trailforksicon\endcsname {\simpleiconsmap\symbol{"F4F8}} - \expandafter\def\csname simpleicon@trainerroadicon\endcsname {\simpleiconsmap\symbol{"F4F9}} - \expandafter\def\csname simpleicon@trakticon\endcsname {\simpleiconsmap\symbol{"F4FA}} - \expandafter\def\csname simpleicon@transifexicon\endcsname {\simpleiconsmap\symbol{"F4FB}} - \expandafter\def\csname simpleicon@transmissionicon\endcsname {\simpleiconsmap\symbol{"F4FC}} - \expandafter\def\csname simpleicon@transportforirelandicon\endcsname {\simpleiconsmap\symbol{"F4FD}} - \expandafter\def\csname simpleicon@transportforlondonicon\endcsname {\simpleiconsmap\symbol{"F4FE}} - \expandafter\def\csname simpleicon@travisciicon\endcsname {\simpleiconsmap\symbol{"F4FF}} - \expandafter\def\csname simpleicon@treehouseicon\endcsname {\simpleiconsmap\symbol{"F500}} - \expandafter\def\csname simpleicon@trelloicon\endcsname {\simpleiconsmap\symbol{"F501}} - \expandafter\def\csname simpleicon@trendmicroicon\endcsname {\simpleiconsmap\symbol{"F502}} - \expandafter\def\csname simpleicon@treyarchicon\endcsname {\simpleiconsmap\symbol{"F503}} - \expandafter\def\csname simpleicon@tricentisicon\endcsname {\simpleiconsmap\symbol{"F504}} - \expandafter\def\csname simpleicon@triliumicon\endcsname {\simpleiconsmap\symbol{"F505}} - \expandafter\def\csname simpleicon@trillericon\endcsname {\simpleiconsmap\symbol{"F506}} - \expandafter\def\csname simpleicon@trillertvicon\endcsname {\simpleiconsmap\symbol{"F507}} - \expandafter\def\csname simpleicon@trinoicon\endcsname {\simpleiconsmap\symbol{"F508}} - \expandafter\def\csname simpleicon@tripadvisoricon\endcsname {\simpleiconsmap\symbol{"F509}} - \expandafter\def\csname simpleicon@tripdotcomicon\endcsname {\simpleiconsmap\symbol{"F50A}} - \expandafter\def\csname simpleicon@trivagoicon\endcsname {\simpleiconsmap\symbol{"F50B}} - \expandafter\def\csname simpleicon@trivyicon\endcsname {\simpleiconsmap\symbol{"F50C}} - \expandafter\def\csname simpleicon@troveicon\endcsname {\simpleiconsmap\symbol{"F50D}} - \expandafter\def\csname simpleicon@trpcicon\endcsname {\simpleiconsmap\symbol{"F50E}} - \expandafter\def\csname simpleicon@truenasicon\endcsname {\simpleiconsmap\symbol{"F50F}} - \expandafter\def\csname simpleicon@trueupicon\endcsname {\simpleiconsmap\symbol{"F510}} - \expandafter\def\csname simpleicon@truliaicon\endcsname {\simpleiconsmap\symbol{"F511}} - \expandafter\def\csname simpleicon@trustedshopsicon\endcsname {\simpleiconsmap\symbol{"F512}} - \expandafter\def\csname simpleicon@trustpiloticon\endcsname {\simpleiconsmap\symbol{"F513}} - \expandafter\def\csname simpleicon@tryhackmeicon\endcsname {\simpleiconsmap\symbol{"F514}} - \expandafter\def\csname simpleicon@tryitonlineicon\endcsname {\simpleiconsmap\symbol{"F515}} - \expandafter\def\csname simpleicon@tsnodeicon\endcsname {\simpleiconsmap\symbol{"F516}} - \expandafter\def\csname simpleicon@tubiicon\endcsname {\simpleiconsmap\symbol{"F517}} - \expandafter\def\csname simpleicon@tuiicon\endcsname {\simpleiconsmap\symbol{"F518}} - \expandafter\def\csname simpleicon@tumblricon\endcsname {\simpleiconsmap\symbol{"F519}} - \expandafter\def\csname simpleicon@tuneinicon\endcsname {\simpleiconsmap\symbol{"F51A}} - \expandafter\def\csname simpleicon@turboicon\endcsname {\simpleiconsmap\symbol{"F51B}} - \expandafter\def\csname simpleicon@turborepoicon\endcsname {\simpleiconsmap\symbol{"F51C}} - \expandafter\def\csname simpleicon@turbosquidicon\endcsname {\simpleiconsmap\symbol{"F51D}} - \expandafter\def\csname simpleicon@turkishairlinesicon\endcsname {\simpleiconsmap\symbol{"F51E}} - \expandafter\def\csname simpleicon@tursoicon\endcsname {\simpleiconsmap\symbol{"F51F}} - \expandafter\def\csname simpleicon@tutanotaicon\endcsname {\simpleiconsmap\symbol{"F520}} - \expandafter\def\csname simpleicon@tv4playicon\endcsname {\simpleiconsmap\symbol{"F521}} - \expandafter\def\csname simpleicon@tvtimeicon\endcsname {\simpleiconsmap\symbol{"F522}} - \expandafter\def\csname simpleicon@twilioicon\endcsname {\simpleiconsmap\symbol{"F523}} - \expandafter\def\csname simpleicon@twinklyicon\endcsname {\simpleiconsmap\symbol{"F524}} - \expandafter\def\csname simpleicon@twinmotionicon\endcsname {\simpleiconsmap\symbol{"F525}} - \expandafter\def\csname simpleicon@twitchicon\endcsname {\simpleiconsmap\symbol{"F526}} - \expandafter\def\csname simpleicon@typeformicon\endcsname {\simpleiconsmap\symbol{"F527}} - \expandafter\def\csname simpleicon@typeormicon\endcsname {\simpleiconsmap\symbol{"F528}} - \expandafter\def\csname simpleicon@typericon\endcsname {\simpleiconsmap\symbol{"F529}} - \expandafter\def\csname simpleicon@typescripticon\endcsname {\simpleiconsmap\symbol{"F52A}} - \expandafter\def\csname simpleicon@typo3icon\endcsname {\simpleiconsmap\symbol{"F52B}} - \expandafter\def\csname simpleicon@typsticon\endcsname {\simpleiconsmap\symbol{"F52C}} - \expandafter\def\csname simpleicon@ubericon\endcsname {\simpleiconsmap\symbol{"F52D}} - \expandafter\def\csname simpleicon@ubereatsicon\endcsname {\simpleiconsmap\symbol{"F52E}} - \expandafter\def\csname simpleicon@ubiquitiicon\endcsname {\simpleiconsmap\symbol{"F52F}} - \expandafter\def\csname simpleicon@ubisofticon\endcsname {\simpleiconsmap\symbol{"F530}} - \expandafter\def\csname simpleicon@ublockoriginicon\endcsname {\simpleiconsmap\symbol{"F531}} - \expandafter\def\csname simpleicon@ubuntuicon\endcsname {\simpleiconsmap\symbol{"F532}} - \expandafter\def\csname simpleicon@ubuntumateicon\endcsname {\simpleiconsmap\symbol{"F533}} - \expandafter\def\csname simpleicon@udacityicon\endcsname {\simpleiconsmap\symbol{"F534}} - \expandafter\def\csname simpleicon@udemyicon\endcsname {\simpleiconsmap\symbol{"F535}} - \expandafter\def\csname simpleicon@ufcicon\endcsname {\simpleiconsmap\symbol{"F536}} - \expandafter\def\csname simpleicon@uikiticon\endcsname {\simpleiconsmap\symbol{"F537}} - \expandafter\def\csname simpleicon@uipathicon\endcsname {\simpleiconsmap\symbol{"F538}} - \expandafter\def\csname simpleicon@ululeicon\endcsname {\simpleiconsmap\symbol{"F539}} - \expandafter\def\csname simpleicon@umamiicon\endcsname {\simpleiconsmap\symbol{"F53A}} - \expandafter\def\csname simpleicon@umbracoicon\endcsname {\simpleiconsmap\symbol{"F53B}} - \expandafter\def\csname simpleicon@umlicon\endcsname {\simpleiconsmap\symbol{"F53C}} - \expandafter\def\csname simpleicon@unacademyicon\endcsname {\simpleiconsmap\symbol{"F53D}} - \expandafter\def\csname simpleicon@underarmouricon\endcsname {\simpleiconsmap\symbol{"F53E}} - \expandafter\def\csname simpleicon@underscoredotjsicon\endcsname {\simpleiconsmap\symbol{"F53F}} - \expandafter\def\csname simpleicon@undertaleicon\endcsname {\simpleiconsmap\symbol{"F540}} - \expandafter\def\csname simpleicon@unicodeicon\endcsname {\simpleiconsmap\symbol{"F541}} - \expandafter\def\csname simpleicon@unilevericon\endcsname {\simpleiconsmap\symbol{"F542}} - \expandafter\def\csname simpleicon@uniqloicon\endcsname {\simpleiconsmap\symbol{"F543}} - \expandafter\def\csname simpleicon@uniqlojaicon\endcsname {\simpleiconsmap\symbol{"F544}} - \expandafter\def\csname simpleicon@unitedairlinesicon\endcsname {\simpleiconsmap\symbol{"F545}} - \expandafter\def\csname simpleicon@unitednationsicon\endcsname {\simpleiconsmap\symbol{"F546}} - \expandafter\def\csname simpleicon@unityicon\endcsname {\simpleiconsmap\symbol{"F547}} - \expandafter\def\csname simpleicon@unjsicon\endcsname {\simpleiconsmap\symbol{"F548}} - \expandafter\def\csname simpleicon@unlicenseicon\endcsname {\simpleiconsmap\symbol{"F549}} - \expandafter\def\csname simpleicon@unocssicon\endcsname {\simpleiconsmap\symbol{"F54A}} - \expandafter\def\csname simpleicon@unpkgicon\endcsname {\simpleiconsmap\symbol{"F54B}} - \expandafter\def\csname simpleicon@unraidicon\endcsname {\simpleiconsmap\symbol{"F54C}} - \expandafter\def\csname simpleicon@unrealengineicon\endcsname {\simpleiconsmap\symbol{"F54D}} - \expandafter\def\csname simpleicon@unsplashicon\endcsname {\simpleiconsmap\symbol{"F54E}} - \expandafter\def\csname simpleicon@untappdicon\endcsname {\simpleiconsmap\symbol{"F54F}} - \expandafter\def\csname simpleicon@upcloudicon\endcsname {\simpleiconsmap\symbol{"F550}} - \expandafter\def\csname simpleicon@upholdicon\endcsname {\simpleiconsmap\symbol{"F551}} - \expandafter\def\csname simpleicon@uplabsicon\endcsname {\simpleiconsmap\symbol{"F552}} - \expandafter\def\csname simpleicon@upptimeicon\endcsname {\simpleiconsmap\symbol{"F553}} - \expandafter\def\csname simpleicon@upsicon\endcsname {\simpleiconsmap\symbol{"F554}} - \expandafter\def\csname simpleicon@upstashicon\endcsname {\simpleiconsmap\symbol{"F555}} - \expandafter\def\csname simpleicon@uptimekumaicon\endcsname {\simpleiconsmap\symbol{"F556}} - \expandafter\def\csname simpleicon@uptoboxicon\endcsname {\simpleiconsmap\symbol{"F557}} - \expandafter\def\csname simpleicon@upworkicon\endcsname {\simpleiconsmap\symbol{"F558}} - \expandafter\def\csname simpleicon@uspsicon\endcsname {\simpleiconsmap\symbol{"F559}} - \expandafter\def\csname simpleicon@utorrenticon\endcsname {\simpleiconsmap\symbol{"F55A}} - \expandafter\def\csname simpleicon@vicon\endcsname {\simpleiconsmap\symbol{"F55B}} - \expandafter\def\csname simpleicon@v2exicon\endcsname {\simpleiconsmap\symbol{"F55C}} - \expandafter\def\csname simpleicon@v8icon\endcsname {\simpleiconsmap\symbol{"F55D}} - \expandafter\def\csname simpleicon@vaadinicon\endcsname {\simpleiconsmap\symbol{"F55E}} - \expandafter\def\csname simpleicon@vagranticon\endcsname {\simpleiconsmap\symbol{"F55F}} - \expandafter\def\csname simpleicon@valaicon\endcsname {\simpleiconsmap\symbol{"F560}} - \expandafter\def\csname simpleicon@valoranticon\endcsname {\simpleiconsmap\symbol{"F561}} - \expandafter\def\csname simpleicon@valveicon\endcsname {\simpleiconsmap\symbol{"F562}} - \expandafter\def\csname simpleicon@vaporicon\endcsname {\simpleiconsmap\symbol{"F563}} - \expandafter\def\csname simpleicon@vaulticon\endcsname {\simpleiconsmap\symbol{"F564}} - \expandafter\def\csname simpleicon@vaultwardenicon\endcsname {\simpleiconsmap\symbol{"F565}} - \expandafter\def\csname simpleicon@vauxhallicon\endcsname {\simpleiconsmap\symbol{"F566}} - \expandafter\def\csname simpleicon@vbulletinicon\endcsname {\simpleiconsmap\symbol{"F567}} - \expandafter\def\csname simpleicon@vectaryicon\endcsname {\simpleiconsmap\symbol{"F568}} - \expandafter\def\csname simpleicon@vectorlogozoneicon\endcsname {\simpleiconsmap\symbol{"F569}} - \expandafter\def\csname simpleicon@vectorworksicon\endcsname {\simpleiconsmap\symbol{"F56A}} - \expandafter\def\csname simpleicon@veeamicon\endcsname {\simpleiconsmap\symbol{"F56B}} - \expandafter\def\csname simpleicon@veedicon\endcsname {\simpleiconsmap\symbol{"F56C}} - \expandafter\def\csname simpleicon@veepeeicon\endcsname {\simpleiconsmap\symbol{"F56D}} - \expandafter\def\csname simpleicon@vegaicon\endcsname {\simpleiconsmap\symbol{"F56E}} - \expandafter\def\csname simpleicon@vegasicon\endcsname {\simpleiconsmap\symbol{"F56F}} - \expandafter\def\csname simpleicon@velogicon\endcsname {\simpleiconsmap\symbol{"F570}} - \expandafter\def\csname simpleicon@venmoicon\endcsname {\simpleiconsmap\symbol{"F571}} - \expandafter\def\csname simpleicon@vercelicon\endcsname {\simpleiconsmap\symbol{"F572}} - \expandafter\def\csname simpleicon@verdaccioicon\endcsname {\simpleiconsmap\symbol{"F573}} - \expandafter\def\csname simpleicon@veritasicon\endcsname {\simpleiconsmap\symbol{"F574}} - \expandafter\def\csname simpleicon@verizonicon\endcsname {\simpleiconsmap\symbol{"F575}} - \expandafter\def\csname simpleicon@vespaicon\endcsname {\simpleiconsmap\symbol{"F576}} - \expandafter\def\csname simpleicon@vexxhosticon\endcsname {\simpleiconsmap\symbol{"F577}} - \expandafter\def\csname simpleicon@vfairsicon\endcsname {\simpleiconsmap\symbol{"F578}} - \expandafter\def\csname simpleicon@viadeoicon\endcsname {\simpleiconsmap\symbol{"F579}} - \expandafter\def\csname simpleicon@viaplayicon\endcsname {\simpleiconsmap\symbol{"F57A}} - \expandafter\def\csname simpleicon@vibericon\endcsname {\simpleiconsmap\symbol{"F57B}} - \expandafter\def\csname simpleicon@vibloicon\endcsname {\simpleiconsmap\symbol{"F57C}} - \expandafter\def\csname simpleicon@victoriametricsicon\endcsname {\simpleiconsmap\symbol{"F57D}} - \expandafter\def\csname simpleicon@victronenergyicon\endcsname {\simpleiconsmap\symbol{"F57E}} - \expandafter\def\csname simpleicon@vimicon\endcsname {\simpleiconsmap\symbol{"F57F}} - \expandafter\def\csname simpleicon@vimeoicon\endcsname {\simpleiconsmap\symbol{"F580}} - \expandafter\def\csname simpleicon@vimeolivestreamicon\endcsname {\simpleiconsmap\symbol{"F581}} - \expandafter\def\csname simpleicon@virginicon\endcsname {\simpleiconsmap\symbol{"F582}} - \expandafter\def\csname simpleicon@virginatlanticicon\endcsname {\simpleiconsmap\symbol{"F583}} - \expandafter\def\csname simpleicon@virginmediaicon\endcsname {\simpleiconsmap\symbol{"F584}} - \expandafter\def\csname simpleicon@virtualboxicon\endcsname {\simpleiconsmap\symbol{"F585}} - \expandafter\def\csname simpleicon@virustotalicon\endcsname {\simpleiconsmap\symbol{"F586}} - \expandafter\def\csname simpleicon@visaicon\endcsname {\simpleiconsmap\symbol{"F587}} - \expandafter\def\csname simpleicon@visxicon\endcsname {\simpleiconsmap\symbol{"F588}} - \expandafter\def\csname simpleicon@viteicon\endcsname {\simpleiconsmap\symbol{"F589}} - \expandafter\def\csname simpleicon@vitepressicon\endcsname {\simpleiconsmap\symbol{"F58A}} - \expandafter\def\csname simpleicon@vitessicon\endcsname {\simpleiconsmap\symbol{"F58B}} - \expandafter\def\csname simpleicon@vitesticon\endcsname {\simpleiconsmap\symbol{"F58C}} - \expandafter\def\csname simpleicon@vivaldiicon\endcsname {\simpleiconsmap\symbol{"F58D}} - \expandafter\def\csname simpleicon@vivawalleticon\endcsname {\simpleiconsmap\symbol{"F58E}} - \expandafter\def\csname simpleicon@vivinoicon\endcsname {\simpleiconsmap\symbol{"F58F}} - \expandafter\def\csname simpleicon@vivinticon\endcsname {\simpleiconsmap\symbol{"F590}} - \expandafter\def\csname simpleicon@vivoicon\endcsname {\simpleiconsmap\symbol{"F591}} - \expandafter\def\csname simpleicon@vkicon\endcsname {\simpleiconsmap\symbol{"F592}} - \expandafter\def\csname simpleicon@vlcmediaplayericon\endcsname {\simpleiconsmap\symbol{"F593}} - \expandafter\def\csname simpleicon@vmwareicon\endcsname {\simpleiconsmap\symbol{"F594}} - \expandafter\def\csname simpleicon@vodafoneicon\endcsname {\simpleiconsmap\symbol{"F595}} - \expandafter\def\csname simpleicon@voidlinuxicon\endcsname {\simpleiconsmap\symbol{"F596}} - \expandafter\def\csname simpleicon@voipdotmsicon\endcsname {\simpleiconsmap\symbol{"F597}} - \expandafter\def\csname simpleicon@volkswagenicon\endcsname {\simpleiconsmap\symbol{"F598}} - \expandafter\def\csname simpleicon@volvoicon\endcsname {\simpleiconsmap\symbol{"F599}} - \expandafter\def\csname simpleicon@vonageicon\endcsname {\simpleiconsmap\symbol{"F59A}} - \expandafter\def\csname simpleicon@vorondesignicon\endcsname {\simpleiconsmap\symbol{"F59B}} - \expandafter\def\csname simpleicon@vowpalwabbiticon\endcsname {\simpleiconsmap\symbol{"F59C}} - \expandafter\def\csname simpleicon@voxicon\endcsname {\simpleiconsmap\symbol{"F59D}} - \expandafter\def\csname simpleicon@vscoicon\endcsname {\simpleiconsmap\symbol{"F59E}} - \expandafter\def\csname simpleicon@vscodiumicon\endcsname {\simpleiconsmap\symbol{"F59F}} - \expandafter\def\csname simpleicon@vtexicon\endcsname {\simpleiconsmap\symbol{"F5A0}} - \expandafter\def\csname simpleicon@vuedotjsicon\endcsname {\simpleiconsmap\symbol{"F5A1}} - \expandafter\def\csname simpleicon@vuetifyicon\endcsname {\simpleiconsmap\symbol{"F5A2}} - \expandafter\def\csname simpleicon@vulkanicon\endcsname {\simpleiconsmap\symbol{"F5A3}} - \expandafter\def\csname simpleicon@vultricon\endcsname {\simpleiconsmap\symbol{"F5A4}} - \expandafter\def\csname simpleicon@vyondicon\endcsname {\simpleiconsmap\symbol{"F5A5}} - \expandafter\def\csname simpleicon@w3schoolsicon\endcsname {\simpleiconsmap\symbol{"F5A6}} - \expandafter\def\csname simpleicon@wacomicon\endcsname {\simpleiconsmap\symbol{"F5A7}} - \expandafter\def\csname simpleicon@wagmiicon\endcsname {\simpleiconsmap\symbol{"F5A8}} - \expandafter\def\csname simpleicon@wagtailicon\endcsname {\simpleiconsmap\symbol{"F5A9}} - \expandafter\def\csname simpleicon@wailsicon\endcsname {\simpleiconsmap\symbol{"F5AA}} - \expandafter\def\csname simpleicon@wakatimeicon\endcsname {\simpleiconsmap\symbol{"F5AB}} - \expandafter\def\csname simpleicon@walkmanicon\endcsname {\simpleiconsmap\symbol{"F5AC}} - \expandafter\def\csname simpleicon@wallabagicon\endcsname {\simpleiconsmap\symbol{"F5AD}} - \expandafter\def\csname simpleicon@walletconnecticon\endcsname {\simpleiconsmap\symbol{"F5AE}} - \expandafter\def\csname simpleicon@walmarticon\endcsname {\simpleiconsmap\symbol{"F5AF}} - \expandafter\def\csname simpleicon@wantedlyicon\endcsname {\simpleiconsmap\symbol{"F5B0}} - \expandafter\def\csname simpleicon@wappalyzericon\endcsname {\simpleiconsmap\symbol{"F5B1}} - \expandafter\def\csname simpleicon@warnerbrosicon\endcsname {\simpleiconsmap\symbol{"F5B2}} - \expandafter\def\csname simpleicon@warpicon\endcsname {\simpleiconsmap\symbol{"F5B3}} - \expandafter\def\csname simpleicon@wasabiicon\endcsname {\simpleiconsmap\symbol{"F5B4}} - \expandafter\def\csname simpleicon@wasmcloudicon\endcsname {\simpleiconsmap\symbol{"F5B5}} - \expandafter\def\csname simpleicon@wasmericon\endcsname {\simpleiconsmap\symbol{"F5B6}} - \expandafter\def\csname simpleicon@watchtowericon\endcsname {\simpleiconsmap\symbol{"F5B7}} - \expandafter\def\csname simpleicon@wattpadicon\endcsname {\simpleiconsmap\symbol{"F5B8}} - \expandafter\def\csname simpleicon@waylandicon\endcsname {\simpleiconsmap\symbol{"F5B9}} - \expandafter\def\csname simpleicon@wazeicon\endcsname {\simpleiconsmap\symbol{"F5BA}} - \expandafter\def\csname simpleicon@wazirxicon\endcsname {\simpleiconsmap\symbol{"F5BB}} - \expandafter\def\csname simpleicon@wearosicon\endcsname {\simpleiconsmap\symbol{"F5BC}} - \expandafter\def\csname simpleicon@weasylicon\endcsname {\simpleiconsmap\symbol{"F5BD}} - \expandafter\def\csname simpleicon@web3dotjsicon\endcsname {\simpleiconsmap\symbol{"F5BE}} - \expandafter\def\csname simpleicon@webassemblyicon\endcsname {\simpleiconsmap\symbol{"F5BF}} - \expandafter\def\csname simpleicon@webauthnicon\endcsname {\simpleiconsmap\symbol{"F5C0}} - \expandafter\def\csname simpleicon@webcomponentsdotorgicon\endcsname {\simpleiconsmap\symbol{"F5C1}} - \expandafter\def\csname simpleicon@webdriverioicon\endcsname {\simpleiconsmap\symbol{"F5C2}} - \expandafter\def\csname simpleicon@webexicon\endcsname {\simpleiconsmap\symbol{"F5C3}} - \expandafter\def\csname simpleicon@webflowicon\endcsname {\simpleiconsmap\symbol{"F5C4}} - \expandafter\def\csname simpleicon@webglicon\endcsname {\simpleiconsmap\symbol{"F5C5}} - \expandafter\def\csname simpleicon@webgpuicon\endcsname {\simpleiconsmap\symbol{"F5C6}} - \expandafter\def\csname simpleicon@weblateicon\endcsname {\simpleiconsmap\symbol{"F5C7}} - \expandafter\def\csname simpleicon@webminicon\endcsname {\simpleiconsmap\symbol{"F5C8}} - \expandafter\def\csname simpleicon@webmoneyicon\endcsname {\simpleiconsmap\symbol{"F5C9}} - \expandafter\def\csname simpleicon@webpackicon\endcsname {\simpleiconsmap\symbol{"F5CA}} - \expandafter\def\csname simpleicon@webrtcicon\endcsname {\simpleiconsmap\symbol{"F5CB}} - \expandafter\def\csname simpleicon@webstormicon\endcsname {\simpleiconsmap\symbol{"F5CC}} - \expandafter\def\csname simpleicon@webtoonicon\endcsname {\simpleiconsmap\symbol{"F5CD}} - \expandafter\def\csname simpleicon@webtreesicon\endcsname {\simpleiconsmap\symbol{"F5CE}} - \expandafter\def\csname simpleicon@wechaticon\endcsname {\simpleiconsmap\symbol{"F5CF}} - \expandafter\def\csname simpleicon@wegameicon\endcsname {\simpleiconsmap\symbol{"F5D0}} - \expandafter\def\csname simpleicon@weightsandbiasesicon\endcsname {\simpleiconsmap\symbol{"F5D1}} - \expandafter\def\csname simpleicon@welcometothejungleicon\endcsname {\simpleiconsmap\symbol{"F5D2}} - \expandafter\def\csname simpleicon@wellfoundicon\endcsname {\simpleiconsmap\symbol{"F5D3}} - \expandafter\def\csname simpleicon@wellsfargoicon\endcsname {\simpleiconsmap\symbol{"F5D4}} - \expandafter\def\csname simpleicon@wemoicon\endcsname {\simpleiconsmap\symbol{"F5D5}} - \expandafter\def\csname simpleicon@westerndigitalicon\endcsname {\simpleiconsmap\symbol{"F5D6}} - \expandafter\def\csname simpleicon@westernunionicon\endcsname {\simpleiconsmap\symbol{"F5D7}} - \expandafter\def\csname simpleicon@wetransfericon\endcsname {\simpleiconsmap\symbol{"F5D8}} - \expandafter\def\csname simpleicon@weztermicon\endcsname {\simpleiconsmap\symbol{"F5D9}} - \expandafter\def\csname simpleicon@wgpuicon\endcsname {\simpleiconsmap\symbol{"F5DA}} - \expandafter\def\csname simpleicon@whatsappicon\endcsname {\simpleiconsmap\symbol{"F5DB}} - \expandafter\def\csname simpleicon@wheniworkicon\endcsname {\simpleiconsmap\symbol{"F5DC}} - \expandafter\def\csname simpleicon@wiiicon\endcsname {\simpleiconsmap\symbol{"F5DD}} - \expandafter\def\csname simpleicon@wiiuicon\endcsname {\simpleiconsmap\symbol{"F5DE}} - \expandafter\def\csname simpleicon@wikidataicon\endcsname {\simpleiconsmap\symbol{"F5DF}} - \expandafter\def\csname simpleicon@wikidotggicon\endcsname {\simpleiconsmap\symbol{"F5E0}} - \expandafter\def\csname simpleicon@wikidotjsicon\endcsname {\simpleiconsmap\symbol{"F5E1}} - \expandafter\def\csname simpleicon@wikimediacommonsicon\endcsname {\simpleiconsmap\symbol{"F5E2}} - \expandafter\def\csname simpleicon@wikimediafoundationicon\endcsname {\simpleiconsmap\symbol{"F5E3}} - \expandafter\def\csname simpleicon@wikipediaicon\endcsname {\simpleiconsmap\symbol{"F5E4}} - \expandafter\def\csname simpleicon@wikiquoteicon\endcsname {\simpleiconsmap\symbol{"F5E5}} - \expandafter\def\csname simpleicon@wikivoyageicon\endcsname {\simpleiconsmap\symbol{"F5E6}} - \expandafter\def\csname simpleicon@winampicon\endcsname {\simpleiconsmap\symbol{"F5E7}} - \expandafter\def\csname simpleicon@wiproicon\endcsname {\simpleiconsmap\symbol{"F5E8}} - \expandafter\def\csname simpleicon@wireicon\endcsname {\simpleiconsmap\symbol{"F5E9}} - \expandafter\def\csname simpleicon@wireguardicon\endcsname {\simpleiconsmap\symbol{"F5EA}} - \expandafter\def\csname simpleicon@wiresharkicon\endcsname {\simpleiconsmap\symbol{"F5EB}} - \expandafter\def\csname simpleicon@wiseicon\endcsname {\simpleiconsmap\symbol{"F5EC}} - \expandafter\def\csname simpleicon@wishicon\endcsname {\simpleiconsmap\symbol{"F5ED}} - \expandafter\def\csname simpleicon@wistiaicon\endcsname {\simpleiconsmap\symbol{"F5EE}} - \expandafter\def\csname simpleicon@wixicon\endcsname {\simpleiconsmap\symbol{"F5EF}} - \expandafter\def\csname simpleicon@wizzairicon\endcsname {\simpleiconsmap\symbol{"F5F0}} - \expandafter\def\csname simpleicon@wolframicon\endcsname {\simpleiconsmap\symbol{"F5F1}} - \expandafter\def\csname simpleicon@wolframlanguageicon\endcsname {\simpleiconsmap\symbol{"F5F2}} - \expandafter\def\csname simpleicon@wolframmathematicaicon\endcsname {\simpleiconsmap\symbol{"F5F3}} - \expandafter\def\csname simpleicon@wondershareicon\endcsname {\simpleiconsmap\symbol{"F5F4}} - \expandafter\def\csname simpleicon@wondersharefilmoraicon\endcsname {\simpleiconsmap\symbol{"F5F5}} - \expandafter\def\csname simpleicon@wooicon\endcsname {\simpleiconsmap\symbol{"F5F6}} - \expandafter\def\csname simpleicon@woocommerceicon\endcsname {\simpleiconsmap\symbol{"F5F7}} - \expandafter\def\csname simpleicon@wordpressicon\endcsname {\simpleiconsmap\symbol{"F5F8}} - \expandafter\def\csname simpleicon@workplaceicon\endcsname {\simpleiconsmap\symbol{"F5F9}} - \expandafter\def\csname simpleicon@worldhealthorganizationicon\endcsname {\simpleiconsmap\symbol{"F5FA}} - \expandafter\def\csname simpleicon@wpengineicon\endcsname {\simpleiconsmap\symbol{"F5FB}} - \expandafter\def\csname simpleicon@wpexplorericon\endcsname {\simpleiconsmap\symbol{"F5FC}} - \expandafter\def\csname simpleicon@wprocketicon\endcsname {\simpleiconsmap\symbol{"F5FD}} - \expandafter\def\csname simpleicon@writedotasicon\endcsname {\simpleiconsmap\symbol{"F5FE}} - \expandafter\def\csname simpleicon@wweicon\endcsname {\simpleiconsmap\symbol{"F5FF}} - \expandafter\def\csname simpleicon@wwiseicon\endcsname {\simpleiconsmap\symbol{"F600}} - \expandafter\def\csname simpleicon@wykopicon\endcsname {\simpleiconsmap\symbol{"F601}} - \expandafter\def\csname simpleicon@wyzeicon\endcsname {\simpleiconsmap\symbol{"F602}} - \expandafter\def\csname simpleicon@xicon\endcsname {\simpleiconsmap\symbol{"F603}} - \expandafter\def\csname simpleicon@xamppicon\endcsname {\simpleiconsmap\symbol{"F604}} - \expandafter\def\csname simpleicon@xcodeicon\endcsname {\simpleiconsmap\symbol{"F605}} - \expandafter\def\csname simpleicon@xdadevelopersicon\endcsname {\simpleiconsmap\symbol{"F606}} - \expandafter\def\csname simpleicon@xdotorgicon\endcsname {\simpleiconsmap\symbol{"F607}} - \expandafter\def\csname simpleicon@xenditicon\endcsname {\simpleiconsmap\symbol{"F608}} - \expandafter\def\csname simpleicon@xeroicon\endcsname {\simpleiconsmap\symbol{"F609}} - \expandafter\def\csname simpleicon@xfceicon\endcsname {\simpleiconsmap\symbol{"F60A}} - \expandafter\def\csname simpleicon@xiaohongshuicon\endcsname {\simpleiconsmap\symbol{"F60B}} - \expandafter\def\csname simpleicon@xiaomiicon\endcsname {\simpleiconsmap\symbol{"F60C}} - \expandafter\def\csname simpleicon@xingicon\endcsname {\simpleiconsmap\symbol{"F60D}} - \expandafter\def\csname simpleicon@xmppicon\endcsname {\simpleiconsmap\symbol{"F60E}} - \expandafter\def\csname simpleicon@xoicon\endcsname {\simpleiconsmap\symbol{"F60F}} - \expandafter\def\csname simpleicon@xrpicon\endcsname {\simpleiconsmap\symbol{"F610}} - \expandafter\def\csname simpleicon@xspliticon\endcsname {\simpleiconsmap\symbol{"F611}} - \expandafter\def\csname simpleicon@xstateicon\endcsname {\simpleiconsmap\symbol{"F612}} - \expandafter\def\csname simpleicon@yabaiicon\endcsname {\simpleiconsmap\symbol{"F613}} - \expandafter\def\csname simpleicon@yaleicon\endcsname {\simpleiconsmap\symbol{"F614}} - \expandafter\def\csname simpleicon@yamahacorporationicon\endcsname {\simpleiconsmap\symbol{"F615}} - \expandafter\def\csname simpleicon@yamahamotorcorporationicon\endcsname {\simpleiconsmap\symbol{"F616}} - \expandafter\def\csname simpleicon@yamlicon\endcsname {\simpleiconsmap\symbol{"F617}} - \expandafter\def\csname simpleicon@yandexcloudicon\endcsname {\simpleiconsmap\symbol{"F618}} - \expandafter\def\csname simpleicon@yarnicon\endcsname {\simpleiconsmap\symbol{"F619}} - \expandafter\def\csname simpleicon@ycombinatoricon\endcsname {\simpleiconsmap\symbol{"F61A}} - \expandafter\def\csname simpleicon@yelpicon\endcsname {\simpleiconsmap\symbol{"F61B}} - \expandafter\def\csname simpleicon@yetiicon\endcsname {\simpleiconsmap\symbol{"F61C}} - \expandafter\def\csname simpleicon@yoasticon\endcsname {\simpleiconsmap\symbol{"F61D}} - \expandafter\def\csname simpleicon@youtubeicon\endcsname {\simpleiconsmap\symbol{"F61E}} - \expandafter\def\csname simpleicon@youtubegamingicon\endcsname {\simpleiconsmap\symbol{"F61F}} - \expandafter\def\csname simpleicon@youtubekidsicon\endcsname {\simpleiconsmap\symbol{"F620}} - \expandafter\def\csname simpleicon@youtubemusicicon\endcsname {\simpleiconsmap\symbol{"F621}} - \expandafter\def\csname simpleicon@youtubeshortsicon\endcsname {\simpleiconsmap\symbol{"F622}} - \expandafter\def\csname simpleicon@youtubestudioicon\endcsname {\simpleiconsmap\symbol{"F623}} - \expandafter\def\csname simpleicon@youtubetvicon\endcsname {\simpleiconsmap\symbol{"F624}} - \expandafter\def\csname simpleicon@yricon\endcsname {\simpleiconsmap\symbol{"F625}} - \expandafter\def\csname simpleicon@yubicoicon\endcsname {\simpleiconsmap\symbol{"F626}} - \expandafter\def\csname simpleicon@yunohosticon\endcsname {\simpleiconsmap\symbol{"F627}} - \expandafter\def\csname simpleicon@zabkaicon\endcsname {\simpleiconsmap\symbol{"F628}} - \expandafter\def\csname simpleicon@zaimicon\endcsname {\simpleiconsmap\symbol{"F629}} - \expandafter\def\csname simpleicon@zalandoicon\endcsname {\simpleiconsmap\symbol{"F62A}} - \expandafter\def\csname simpleicon@zaloicon\endcsname {\simpleiconsmap\symbol{"F62B}} - \expandafter\def\csname simpleicon@zapicon\endcsname {\simpleiconsmap\symbol{"F62C}} - \expandafter\def\csname simpleicon@zapiericon\endcsname {\simpleiconsmap\symbol{"F62D}} - \expandafter\def\csname simpleicon@zaraicon\endcsname {\simpleiconsmap\symbol{"F62E}} - \expandafter\def\csname simpleicon@zazzleicon\endcsname {\simpleiconsmap\symbol{"F62F}} - \expandafter\def\csname simpleicon@zcashicon\endcsname {\simpleiconsmap\symbol{"F630}} - \expandafter\def\csname simpleicon@zcoolicon\endcsname {\simpleiconsmap\symbol{"F631}} - \expandafter\def\csname simpleicon@zdficon\endcsname {\simpleiconsmap\symbol{"F632}} - \expandafter\def\csname simpleicon@zebpayicon\endcsname {\simpleiconsmap\symbol{"F633}} - \expandafter\def\csname simpleicon@zebratechnologiesicon\endcsname {\simpleiconsmap\symbol{"F634}} - \expandafter\def\csname simpleicon@zedindustriesicon\endcsname {\simpleiconsmap\symbol{"F635}} - \expandafter\def\csname simpleicon@zelleicon\endcsname {\simpleiconsmap\symbol{"F636}} - \expandafter\def\csname simpleicon@zendicon\endcsname {\simpleiconsmap\symbol{"F637}} - \expandafter\def\csname simpleicon@zendeskicon\endcsname {\simpleiconsmap\symbol{"F638}} - \expandafter\def\csname simpleicon@zennicon\endcsname {\simpleiconsmap\symbol{"F639}} - \expandafter\def\csname simpleicon@zenodoicon\endcsname {\simpleiconsmap\symbol{"F63A}} - \expandafter\def\csname simpleicon@zensaricon\endcsname {\simpleiconsmap\symbol{"F63B}} - \expandafter\def\csname simpleicon@zerodhaicon\endcsname {\simpleiconsmap\symbol{"F63C}} - \expandafter\def\csname simpleicon@zerplyicon\endcsname {\simpleiconsmap\symbol{"F63D}} - \expandafter\def\csname simpleicon@zettlricon\endcsname {\simpleiconsmap\symbol{"F63E}} - \expandafter\def\csname simpleicon@zhihuicon\endcsname {\simpleiconsmap\symbol{"F63F}} - \expandafter\def\csname simpleicon@zigicon\endcsname {\simpleiconsmap\symbol{"F640}} - \expandafter\def\csname simpleicon@zigbeeicon\endcsname {\simpleiconsmap\symbol{"F641}} - \expandafter\def\csname simpleicon@zigbee2mqtticon\endcsname {\simpleiconsmap\symbol{"F642}} - \expandafter\def\csname simpleicon@ziggoicon\endcsname {\simpleiconsmap\symbol{"F643}} - \expandafter\def\csname simpleicon@zilchicon\endcsname {\simpleiconsmap\symbol{"F644}} - \expandafter\def\csname simpleicon@zillowicon\endcsname {\simpleiconsmap\symbol{"F645}} - \expandafter\def\csname simpleicon@zincsearchicon\endcsname {\simpleiconsmap\symbol{"F646}} - \expandafter\def\csname simpleicon@zingaticon\endcsname {\simpleiconsmap\symbol{"F647}} - \expandafter\def\csname simpleicon@zodicon\endcsname {\simpleiconsmap\symbol{"F648}} - \expandafter\def\csname simpleicon@zohoicon\endcsname {\simpleiconsmap\symbol{"F649}} - \expandafter\def\csname simpleicon@zoipericon\endcsname {\simpleiconsmap\symbol{"F64A}} - \expandafter\def\csname simpleicon@zomatoicon\endcsname {\simpleiconsmap\symbol{"F64B}} - \expandafter\def\csname simpleicon@zoomicon\endcsname {\simpleiconsmap\symbol{"F64C}} - \expandafter\def\csname simpleicon@zorinicon\endcsname {\simpleiconsmap\symbol{"F64D}} - \expandafter\def\csname simpleicon@zoteroicon\endcsname {\simpleiconsmap\symbol{"F64E}} - \expandafter\def\csname simpleicon@zshicon\endcsname {\simpleiconsmap\symbol{"F64F}} - \expandafter\def\csname simpleicon@zulipicon\endcsname {\simpleiconsmap\symbol{"F650}} - \expandafter\def\csname simpleicon@zyteicon\endcsname {\simpleiconsmap\symbol{"F651}}
\ No newline at end of file + \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@languagetoolicon\endcsname {\simpleiconsmap\symbol{"EFE7}} + \expandafter\def\csname simpleicon@lapceicon\endcsname {\simpleiconsmap\symbol{"EFE8}} + \expandafter\def\csname simpleicon@laragonicon\endcsname {\simpleiconsmap\symbol{"EFE9}} + \expandafter\def\csname simpleicon@laravelicon\endcsname {\simpleiconsmap\symbol{"EFEA}} + \expandafter\def\csname simpleicon@laravelhorizonicon\endcsname {\simpleiconsmap\symbol{"EFEB}} + \expandafter\def\csname simpleicon@laravelnovaicon\endcsname {\simpleiconsmap\symbol{"EFEC}} + \expandafter\def\csname simpleicon@lastdotfmicon\endcsname {\simpleiconsmap\symbol{"EFED}} + \expandafter\def\csname simpleicon@lastpassicon\endcsname {\simpleiconsmap\symbol{"EFEE}} + \expandafter\def\csname simpleicon@latexicon\endcsname {\simpleiconsmap\symbol{"EFEF}} + \expandafter\def\csname simpleicon@launchpadicon\endcsname {\simpleiconsmap\symbol{"EFF0}} + \expandafter\def\csname simpleicon@lazarusicon\endcsname {\simpleiconsmap\symbol{"EFF1}} + \expandafter\def\csname simpleicon@lazyvimicon\endcsname {\simpleiconsmap\symbol{"EFF2}} + \expandafter\def\csname simpleicon@lbryicon\endcsname {\simpleiconsmap\symbol{"EFF3}} + \expandafter\def\csname simpleicon@leaderpriceicon\endcsname {\simpleiconsmap\symbol{"EFF4}} + \expandafter\def\csname simpleicon@leafleticon\endcsname {\simpleiconsmap\symbol{"EFF5}} + \expandafter\def\csname simpleicon@leagueoflegendsicon\endcsname {\simpleiconsmap\symbol{"EFF6}} + \expandafter\def\csname simpleicon@leanpubicon\endcsname {\simpleiconsmap\symbol{"EFF7}} + \expandafter\def\csname simpleicon@leetcodeicon\endcsname {\simpleiconsmap\symbol{"EFF8}} + \expandafter\def\csname simpleicon@legacygamesicon\endcsname {\simpleiconsmap\symbol{"EFF9}} + \expandafter\def\csname simpleicon@leicaicon\endcsname {\simpleiconsmap\symbol{"EFFA}} + \expandafter\def\csname simpleicon@lemmyicon\endcsname {\simpleiconsmap\symbol{"EFFB}} + \expandafter\def\csname simpleicon@lemonsqueezyicon\endcsname {\simpleiconsmap\symbol{"EFFC}} + \expandafter\def\csname simpleicon@lenovoicon\endcsname {\simpleiconsmap\symbol{"EFFD}} + \expandafter\def\csname simpleicon@lensicon\endcsname {\simpleiconsmap\symbol{"EFFE}} + \expandafter\def\csname simpleicon@leptosicon\endcsname {\simpleiconsmap\symbol{"EFFF}} + \expandafter\def\csname simpleicon@lequipeicon\endcsname {\simpleiconsmap\symbol{"F000}} + \expandafter\def\csname simpleicon@lernaicon\endcsname {\simpleiconsmap\symbol{"F001}} + \expandafter\def\csname simpleicon@leroymerlinicon\endcsname {\simpleiconsmap\symbol{"F002}} + \expandafter\def\csname simpleicon@leslibrairesicon\endcsname {\simpleiconsmap\symbol{"F003}} + \expandafter\def\csname simpleicon@lessicon\endcsname {\simpleiconsmap\symbol{"F004}} + \expandafter\def\csname simpleicon@letsencrypticon\endcsname {\simpleiconsmap\symbol{"F005}} + \expandafter\def\csname simpleicon@letterboxdicon\endcsname {\simpleiconsmap\symbol{"F006}} + \expandafter\def\csname simpleicon@levelsdotfyiicon\endcsname {\simpleiconsmap\symbol{"F007}} + \expandafter\def\csname simpleicon@lgicon\endcsname {\simpleiconsmap\symbol{"F008}} + \expandafter\def\csname simpleicon@liberadotchaticon\endcsname {\simpleiconsmap\symbol{"F009}} + \expandafter\def\csname simpleicon@liberapayicon\endcsname {\simpleiconsmap\symbol{"F00A}} + \expandafter\def\csname simpleicon@librariesdotioicon\endcsname {\simpleiconsmap\symbol{"F00B}} + \expandafter\def\csname simpleicon@librarythingicon\endcsname {\simpleiconsmap\symbol{"F00C}} + \expandafter\def\csname simpleicon@libreofficeicon\endcsname {\simpleiconsmap\symbol{"F00D}} + \expandafter\def\csname simpleicon@libreofficebaseicon\endcsname {\simpleiconsmap\symbol{"F00E}} + \expandafter\def\csname simpleicon@libreofficecalcicon\endcsname {\simpleiconsmap\symbol{"F00F}} + \expandafter\def\csname simpleicon@libreofficedrawicon\endcsname {\simpleiconsmap\symbol{"F010}} + \expandafter\def\csname simpleicon@libreofficeimpressicon\endcsname {\simpleiconsmap\symbol{"F011}} + \expandafter\def\csname simpleicon@libreofficemathicon\endcsname {\simpleiconsmap\symbol{"F012}} + \expandafter\def\csname simpleicon@libreofficewritericon\endcsname {\simpleiconsmap\symbol{"F013}} + \expandafter\def\csname simpleicon@librewolficon\endcsname {\simpleiconsmap\symbol{"F014}} + \expandafter\def\csname simpleicon@libuvicon\endcsname {\simpleiconsmap\symbol{"F015}} + \expandafter\def\csname simpleicon@lichessicon\endcsname {\simpleiconsmap\symbol{"F016}} + \expandafter\def\csname simpleicon@lidlicon\endcsname {\simpleiconsmap\symbol{"F017}} + \expandafter\def\csname simpleicon@lifxicon\endcsname {\simpleiconsmap\symbol{"F018}} + \expandafter\def\csname simpleicon@lightburnicon\endcsname {\simpleiconsmap\symbol{"F019}} + \expandafter\def\csname simpleicon@lighthouseicon\endcsname {\simpleiconsmap\symbol{"F01A}} + \expandafter\def\csname simpleicon@lightningicon\endcsname {\simpleiconsmap\symbol{"F01B}} + \expandafter\def\csname simpleicon@limesurveyicon\endcsname {\simpleiconsmap\symbol{"F01C}} + \expandafter\def\csname simpleicon@lineicon\endcsname {\simpleiconsmap\symbol{"F01D}} + \expandafter\def\csname simpleicon@lineageosicon\endcsname {\simpleiconsmap\symbol{"F01E}} + \expandafter\def\csname simpleicon@linearicon\endcsname {\simpleiconsmap\symbol{"F01F}} + \expandafter\def\csname simpleicon@liningicon\endcsname {\simpleiconsmap\symbol{"F020}} + \expandafter\def\csname simpleicon@linkedinicon\endcsname {\simpleiconsmap\symbol{"F021}} + \expandafter\def\csname simpleicon@linkerdicon\endcsname {\simpleiconsmap\symbol{"F022}} + \expandafter\def\csname simpleicon@linkfireicon\endcsname {\simpleiconsmap\symbol{"F023}} + \expandafter\def\csname simpleicon@linksysicon\endcsname {\simpleiconsmap\symbol{"F024}} + \expandafter\def\csname simpleicon@linktreeicon\endcsname {\simpleiconsmap\symbol{"F025}} + \expandafter\def\csname simpleicon@lintcodeicon\endcsname {\simpleiconsmap\symbol{"F026}} + \expandafter\def\csname simpleicon@linuxicon\endcsname {\simpleiconsmap\symbol{"F027}} + \expandafter\def\csname simpleicon@linuxcontainersicon\endcsname {\simpleiconsmap\symbol{"F028}} + \expandafter\def\csname simpleicon@linuxfoundationicon\endcsname {\simpleiconsmap\symbol{"F029}} + \expandafter\def\csname simpleicon@linuxminticon\endcsname {\simpleiconsmap\symbol{"F02A}} + \expandafter\def\csname simpleicon@linuxprofessionalinstituteicon\endcsname {\simpleiconsmap\symbol{"F02B}} + \expandafter\def\csname simpleicon@linuxservericon\endcsname {\simpleiconsmap\symbol{"F02C}} + \expandafter\def\csname simpleicon@lionairicon\endcsname {\simpleiconsmap\symbol{"F02D}} + \expandafter\def\csname simpleicon@liquibaseicon\endcsname {\simpleiconsmap\symbol{"F02E}} + \expandafter\def\csname simpleicon@listmonkicon\endcsname {\simpleiconsmap\symbol{"F02F}} + \expandafter\def\csname simpleicon@liticon\endcsname {\simpleiconsmap\symbol{"F030}} + \expandafter\def\csname simpleicon@litecoinicon\endcsname {\simpleiconsmap\symbol{"F031}} + \expandafter\def\csname simpleicon@literalicon\endcsname {\simpleiconsmap\symbol{"F032}} + \expandafter\def\csname simpleicon@litiengineicon\endcsname {\simpleiconsmap\symbol{"F033}} + \expandafter\def\csname simpleicon@livechaticon\endcsname {\simpleiconsmap\symbol{"F034}} + \expandafter\def\csname simpleicon@livejournalicon\endcsname {\simpleiconsmap\symbol{"F035}} + \expandafter\def\csname simpleicon@livewireicon\endcsname {\simpleiconsmap\symbol{"F036}} + \expandafter\def\csname simpleicon@llvmicon\endcsname {\simpleiconsmap\symbol{"F037}} + \expandafter\def\csname simpleicon@lmmsicon\endcsname {\simpleiconsmap\symbol{"F038}} + \expandafter\def\csname simpleicon@lobstersicon\endcsname {\simpleiconsmap\symbol{"F039}} + \expandafter\def\csname simpleicon@localicon\endcsname {\simpleiconsmap\symbol{"F03A}} + \expandafter\def\csname simpleicon@lodashicon\endcsname {\simpleiconsmap\symbol{"F03B}} + \expandafter\def\csname simpleicon@logitechicon\endcsname {\simpleiconsmap\symbol{"F03C}} + \expandafter\def\csname simpleicon@logitechgicon\endcsname {\simpleiconsmap\symbol{"F03D}} + \expandafter\def\csname simpleicon@logmeinicon\endcsname {\simpleiconsmap\symbol{"F03E}} + \expandafter\def\csname simpleicon@logseqicon\endcsname {\simpleiconsmap\symbol{"F03F}} + \expandafter\def\csname simpleicon@logstashicon\endcsname {\simpleiconsmap\symbol{"F040}} + \expandafter\def\csname simpleicon@lookericon\endcsname {\simpleiconsmap\symbol{"F041}} + \expandafter\def\csname simpleicon@loomicon\endcsname {\simpleiconsmap\symbol{"F042}} + \expandafter\def\csname simpleicon@loopicon\endcsname {\simpleiconsmap\symbol{"F043}} + \expandafter\def\csname simpleicon@loopbackicon\endcsname {\simpleiconsmap\symbol{"F044}} + \expandafter\def\csname simpleicon@lootcrateicon\endcsname {\simpleiconsmap\symbol{"F045}} + \expandafter\def\csname simpleicon@lospecicon\endcsname {\simpleiconsmap\symbol{"F046}} + \expandafter\def\csname simpleicon@lotpolishairlinesicon\endcsname {\simpleiconsmap\symbol{"F047}} + \expandafter\def\csname simpleicon@ltspiceicon\endcsname {\simpleiconsmap\symbol{"F048}} + \expandafter\def\csname simpleicon@luaicon\endcsname {\simpleiconsmap\symbol{"F049}} + \expandafter\def\csname simpleicon@lubuntuicon\endcsname {\simpleiconsmap\symbol{"F04A}} + \expandafter\def\csname simpleicon@luciaicon\endcsname {\simpleiconsmap\symbol{"F04B}} + \expandafter\def\csname simpleicon@lucidicon\endcsname {\simpleiconsmap\symbol{"F04C}} + \expandafter\def\csname simpleicon@ludwigicon\endcsname {\simpleiconsmap\symbol{"F04D}} + \expandafter\def\csname simpleicon@lufthansaicon\endcsname {\simpleiconsmap\symbol{"F04E}} + \expandafter\def\csname simpleicon@lumenicon\endcsname {\simpleiconsmap\symbol{"F04F}} + \expandafter\def\csname simpleicon@lunacyicon\endcsname {\simpleiconsmap\symbol{"F050}} + \expandafter\def\csname simpleicon@lutrisicon\endcsname {\simpleiconsmap\symbol{"F051}} + \expandafter\def\csname simpleicon@lydiaicon\endcsname {\simpleiconsmap\symbol{"F052}} + \expandafter\def\csname simpleicon@lyfticon\endcsname {\simpleiconsmap\symbol{"F053}} + \expandafter\def\csname simpleicon@maasicon\endcsname {\simpleiconsmap\symbol{"F054}} + \expandafter\def\csname simpleicon@macosicon\endcsname {\simpleiconsmap\symbol{"F055}} + \expandafter\def\csname simpleicon@macpawicon\endcsname {\simpleiconsmap\symbol{"F056}} + \expandafter\def\csname simpleicon@macysicon\endcsname {\simpleiconsmap\symbol{"F057}} + \expandafter\def\csname simpleicon@magasinsuicon\endcsname {\simpleiconsmap\symbol{"F058}} + \expandafter\def\csname simpleicon@magentoicon\endcsname {\simpleiconsmap\symbol{"F059}} + \expandafter\def\csname simpleicon@magicicon\endcsname {\simpleiconsmap\symbol{"F05A}} + \expandafter\def\csname simpleicon@magiskicon\endcsname {\simpleiconsmap\symbol{"F05B}} + \expandafter\def\csname simpleicon@mahindraicon\endcsname {\simpleiconsmap\symbol{"F05C}} + \expandafter\def\csname simpleicon@mailchimpicon\endcsname {\simpleiconsmap\symbol{"F05D}} + \expandafter\def\csname simpleicon@maildotcomicon\endcsname {\simpleiconsmap\symbol{"F05E}} + \expandafter\def\csname simpleicon@maildotruicon\endcsname {\simpleiconsmap\symbol{"F05F}} + \expandafter\def\csname simpleicon@mailgunicon\endcsname {\simpleiconsmap\symbol{"F060}} + \expandafter\def\csname simpleicon@mailtrapicon\endcsname {\simpleiconsmap\symbol{"F061}} + \expandafter\def\csname simpleicon@mainwpicon\endcsname {\simpleiconsmap\symbol{"F062}} + \expandafter\def\csname simpleicon@majorleaguehackingicon\endcsname {\simpleiconsmap\symbol{"F063}} + \expandafter\def\csname simpleicon@makeicon\endcsname {\simpleiconsmap\symbol{"F064}} + \expandafter\def\csname simpleicon@makerboticon\endcsname {\simpleiconsmap\symbol{"F065}} + \expandafter\def\csname simpleicon@malticon\endcsname {\simpleiconsmap\symbol{"F066}} + \expandafter\def\csname simpleicon@malwarebytesicon\endcsname {\simpleiconsmap\symbol{"F067}} + \expandafter\def\csname simpleicon@mambauiicon\endcsname {\simpleiconsmap\symbol{"F068}} + \expandafter\def\csname simpleicon@mampicon\endcsname {\simpleiconsmap\symbol{"F069}} + \expandafter\def\csname simpleicon@manicon\endcsname {\simpleiconsmap\symbol{"F06A}} + \expandafter\def\csname simpleicon@manageiqicon\endcsname {\simpleiconsmap\symbol{"F06B}} + \expandafter\def\csname simpleicon@manjaroicon\endcsname {\simpleiconsmap\symbol{"F06C}} + \expandafter\def\csname simpleicon@mantineicon\endcsname {\simpleiconsmap\symbol{"F06D}} + \expandafter\def\csname simpleicon@mapboxicon\endcsname {\simpleiconsmap\symbol{"F06E}} + \expandafter\def\csname simpleicon@maplibreicon\endcsname {\simpleiconsmap\symbol{"F06F}} + \expandafter\def\csname simpleicon@mariadbicon\endcsname {\simpleiconsmap\symbol{"F070}} + \expandafter\def\csname simpleicon@mariadbfoundationicon\endcsname {\simpleiconsmap\symbol{"F071}} + \expandafter\def\csname simpleicon@markdownicon\endcsname {\simpleiconsmap\symbol{"F072}} + \expandafter\def\csname simpleicon@marketoicon\endcsname {\simpleiconsmap\symbol{"F073}} + \expandafter\def\csname simpleicon@markoicon\endcsname {\simpleiconsmap\symbol{"F074}} + \expandafter\def\csname simpleicon@marriotticon\endcsname {\simpleiconsmap\symbol{"F075}} + \expandafter\def\csname simpleicon@marvelappicon\endcsname {\simpleiconsmap\symbol{"F076}} + \expandafter\def\csname simpleicon@maseratiicon\endcsname {\simpleiconsmap\symbol{"F077}} + \expandafter\def\csname simpleicon@mastercardicon\endcsname {\simpleiconsmap\symbol{"F078}} + \expandafter\def\csname simpleicon@mastercomfigicon\endcsname {\simpleiconsmap\symbol{"F079}} + \expandafter\def\csname simpleicon@mastodonicon\endcsname {\simpleiconsmap\symbol{"F07A}} + \expandafter\def\csname simpleicon@materialdesignicon\endcsname {\simpleiconsmap\symbol{"F07B}} + \expandafter\def\csname simpleicon@materialdesigniconsicon\endcsname {\simpleiconsmap\symbol{"F07C}} + \expandafter\def\csname simpleicon@materialformkdocsicon\endcsname {\simpleiconsmap\symbol{"F07D}} + \expandafter\def\csname simpleicon@matillionicon\endcsname {\simpleiconsmap\symbol{"F07E}} + \expandafter\def\csname simpleicon@matomoicon\endcsname {\simpleiconsmap\symbol{"F07F}} + \expandafter\def\csname simpleicon@matrixicon\endcsname {\simpleiconsmap\symbol{"F080}} + \expandafter\def\csname simpleicon@matterdotjsicon\endcsname {\simpleiconsmap\symbol{"F081}} + \expandafter\def\csname simpleicon@mattermosticon\endcsname {\simpleiconsmap\symbol{"F082}} + \expandafter\def\csname simpleicon@matterneticon\endcsname {\simpleiconsmap\symbol{"F083}} + \expandafter\def\csname simpleicon@mauticicon\endcsname {\simpleiconsmap\symbol{"F084}} + \expandafter\def\csname simpleicon@maxicon\endcsname {\simpleiconsmap\symbol{"F085}} + \expandafter\def\csname simpleicon@maxplanckgesellschafticon\endcsname {\simpleiconsmap\symbol{"F086}} + \expandafter\def\csname simpleicon@maytagicon\endcsname {\simpleiconsmap\symbol{"F087}} + \expandafter\def\csname simpleicon@mazdaicon\endcsname {\simpleiconsmap\symbol{"F088}} + \expandafter\def\csname simpleicon@mcafeeicon\endcsname {\simpleiconsmap\symbol{"F089}} + \expandafter\def\csname simpleicon@mcdonaldsicon\endcsname {\simpleiconsmap\symbol{"F08A}} + \expandafter\def\csname simpleicon@mclarenicon\endcsname {\simpleiconsmap\symbol{"F08B}} + \expandafter\def\csname simpleicon@mdbookicon\endcsname {\simpleiconsmap\symbol{"F08C}} + \expandafter\def\csname simpleicon@mdnwebdocsicon\endcsname {\simpleiconsmap\symbol{"F08D}} + \expandafter\def\csname simpleicon@mdxicon\endcsname {\simpleiconsmap\symbol{"F08E}} + \expandafter\def\csname simpleicon@mediafireicon\endcsname {\simpleiconsmap\symbol{"F08F}} + \expandafter\def\csname simpleicon@mediamarkticon\endcsname {\simpleiconsmap\symbol{"F090}} + \expandafter\def\csname simpleicon@mediatekicon\endcsname {\simpleiconsmap\symbol{"F091}} + \expandafter\def\csname simpleicon@medibangpainticon\endcsname {\simpleiconsmap\symbol{"F092}} + \expandafter\def\csname simpleicon@mediumicon\endcsname {\simpleiconsmap\symbol{"F093}} + \expandafter\def\csname simpleicon@medusaicon\endcsname {\simpleiconsmap\symbol{"F094}} + \expandafter\def\csname simpleicon@meetupicon\endcsname {\simpleiconsmap\symbol{"F095}} + \expandafter\def\csname simpleicon@megaicon\endcsname {\simpleiconsmap\symbol{"F096}} + \expandafter\def\csname simpleicon@meilisearchicon\endcsname {\simpleiconsmap\symbol{"F097}} + \expandafter\def\csname simpleicon@meituanicon\endcsname {\simpleiconsmap\symbol{"F098}} + \expandafter\def\csname simpleicon@meizuicon\endcsname {\simpleiconsmap\symbol{"F099}} + \expandafter\def\csname simpleicon@mendeleyicon\endcsname {\simpleiconsmap\symbol{"F09A}} + \expandafter\def\csname simpleicon@mentorcruiseicon\endcsname {\simpleiconsmap\symbol{"F09B}} + \expandafter\def\csname simpleicon@mercadopagoicon\endcsname {\simpleiconsmap\symbol{"F09C}} + \expandafter\def\csname simpleicon@mercedesicon\endcsname {\simpleiconsmap\symbol{"F09D}} + \expandafter\def\csname simpleicon@merckicon\endcsname {\simpleiconsmap\symbol{"F09E}} + \expandafter\def\csname simpleicon@mercurialicon\endcsname {\simpleiconsmap\symbol{"F09F}} + \expandafter\def\csname simpleicon@mermaidicon\endcsname {\simpleiconsmap\symbol{"F0A0}} + \expandafter\def\csname simpleicon@messengericon\endcsname {\simpleiconsmap\symbol{"F0A1}} + \expandafter\def\csname simpleicon@metaicon\endcsname {\simpleiconsmap\symbol{"F0A2}} + \expandafter\def\csname simpleicon@metabaseicon\endcsname {\simpleiconsmap\symbol{"F0A3}} + \expandafter\def\csname simpleicon@metacriticicon\endcsname {\simpleiconsmap\symbol{"F0A4}} + \expandafter\def\csname simpleicon@metafiltericon\endcsname {\simpleiconsmap\symbol{"F0A5}} + \expandafter\def\csname simpleicon@metasploiticon\endcsname {\simpleiconsmap\symbol{"F0A6}} + \expandafter\def\csname simpleicon@meteoricon\endcsname {\simpleiconsmap\symbol{"F0A7}} + \expandafter\def\csname simpleicon@metroicon\endcsname {\simpleiconsmap\symbol{"F0A8}} + \expandafter\def\csname simpleicon@metrodelaciudaddemexicoicon\endcsname {\simpleiconsmap\symbol{"F0A9}} + \expandafter\def\csname simpleicon@metrodemadridicon\endcsname {\simpleiconsmap\symbol{"F0AA}} + \expandafter\def\csname simpleicon@metrodeparisicon\endcsname {\simpleiconsmap\symbol{"F0AB}} + \expandafter\def\csname simpleicon@meweicon\endcsname {\simpleiconsmap\symbol{"F0AC}} + \expandafter\def\csname simpleicon@mgicon\endcsname {\simpleiconsmap\symbol{"F0AD}} + \expandafter\def\csname simpleicon@microbiticon\endcsname {\simpleiconsmap\symbol{"F0AE}} + \expandafter\def\csname simpleicon@microdotblogicon\endcsname {\simpleiconsmap\symbol{"F0AF}} + \expandafter\def\csname simpleicon@microeditoricon\endcsname {\simpleiconsmap\symbol{"F0B0}} + \expandafter\def\csname simpleicon@microgeneticsicon\endcsname {\simpleiconsmap\symbol{"F0B1}} + \expandafter\def\csname simpleicon@micropythonicon\endcsname {\simpleiconsmap\symbol{"F0B2}} + \expandafter\def\csname simpleicon@microstationicon\endcsname {\simpleiconsmap\symbol{"F0B3}} + \expandafter\def\csname simpleicon@microstrategyicon\endcsname {\simpleiconsmap\symbol{"F0B4}} + \expandafter\def\csname simpleicon@midiicon\endcsname {\simpleiconsmap\symbol{"F0B5}} + \expandafter\def\csname simpleicon@migaduicon\endcsname {\simpleiconsmap\symbol{"F0B6}} + \expandafter\def\csname simpleicon@mikrotikicon\endcsname {\simpleiconsmap\symbol{"F0B7}} + \expandafter\def\csname simpleicon@milanoteicon\endcsname {\simpleiconsmap\symbol{"F0B8}} + \expandafter\def\csname simpleicon@milvusicon\endcsname {\simpleiconsmap\symbol{"F0B9}} + \expandafter\def\csname simpleicon@mindsicon\endcsname {\simpleiconsmap\symbol{"F0BA}} + \expandafter\def\csname simpleicon@minetesticon\endcsname {\simpleiconsmap\symbol{"F0BB}} + \expandafter\def\csname simpleicon@mingww64icon\endcsname {\simpleiconsmap\symbol{"F0BC}} + \expandafter\def\csname simpleicon@miniicon\endcsname {\simpleiconsmap\symbol{"F0BD}} + \expandafter\def\csname simpleicon@minioicon\endcsname {\simpleiconsmap\symbol{"F0BE}} + \expandafter\def\csname simpleicon@mintlifyicon\endcsname {\simpleiconsmap\symbol{"F0BF}} + \expandafter\def\csname simpleicon@minutemailericon\endcsname {\simpleiconsmap\symbol{"F0C0}} + \expandafter\def\csname simpleicon@mirahezeicon\endcsname {\simpleiconsmap\symbol{"F0C1}} + \expandafter\def\csname simpleicon@miroicon\endcsname {\simpleiconsmap\symbol{"F0C2}} + \expandafter\def\csname simpleicon@misskeyicon\endcsname {\simpleiconsmap\symbol{"F0C3}} + \expandafter\def\csname simpleicon@mitsubishiicon\endcsname {\simpleiconsmap\symbol{"F0C4}} + \expandafter\def\csname simpleicon@mixicon\endcsname {\simpleiconsmap\symbol{"F0C5}} + \expandafter\def\csname simpleicon@mixcloudicon\endcsname {\simpleiconsmap\symbol{"F0C6}} + \expandafter\def\csname simpleicon@mixpanelicon\endcsname {\simpleiconsmap\symbol{"F0C7}} + \expandafter\def\csname simpleicon@mlbicon\endcsname {\simpleiconsmap\symbol{"F0C8}} + \expandafter\def\csname simpleicon@mlflowicon\endcsname {\simpleiconsmap\symbol{"F0C9}} + \expandafter\def\csname simpleicon@mobxicon\endcsname {\simpleiconsmap\symbol{"F0CA}} + \expandafter\def\csname simpleicon@mobxstatetreeicon\endcsname {\simpleiconsmap\symbol{"F0CB}} + \expandafter\def\csname simpleicon@mochaicon\endcsname {\simpleiconsmap\symbol{"F0CC}} + \expandafter\def\csname simpleicon@mockserviceworkericon\endcsname {\simpleiconsmap\symbol{"F0CD}} + \expandafter\def\csname simpleicon@modalicon\endcsname {\simpleiconsmap\symbol{"F0CE}} + \expandafter\def\csname simpleicon@modinicon\endcsname {\simpleiconsmap\symbol{"F0CF}} + \expandafter\def\csname simpleicon@modrinthicon\endcsname {\simpleiconsmap\symbol{"F0D0}} + \expandafter\def\csname simpleicon@modxicon\endcsname {\simpleiconsmap\symbol{"F0D1}} + \expandafter\def\csname simpleicon@moleculericon\endcsname {\simpleiconsmap\symbol{"F0D2}} + \expandafter\def\csname simpleicon@momenteoicon\endcsname {\simpleiconsmap\symbol{"F0D3}} + \expandafter\def\csname simpleicon@moneroicon\endcsname {\simpleiconsmap\symbol{"F0D4}} + \expandafter\def\csname simpleicon@moneygramicon\endcsname {\simpleiconsmap\symbol{"F0D5}} + \expandafter\def\csname simpleicon@mongodbicon\endcsname {\simpleiconsmap\symbol{"F0D6}} + \expandafter\def\csname simpleicon@mongooseicon\endcsname {\simpleiconsmap\symbol{"F0D7}} + \expandafter\def\csname simpleicon@mongoosedotwsicon\endcsname {\simpleiconsmap\symbol{"F0D8}} + \expandafter\def\csname simpleicon@monicaicon\endcsname {\simpleiconsmap\symbol{"F0D9}} + \expandafter\def\csname simpleicon@monkeytieicon\endcsname {\simpleiconsmap\symbol{"F0DA}} + \expandafter\def\csname simpleicon@monkeytypeicon\endcsname {\simpleiconsmap\symbol{"F0DB}} + \expandafter\def\csname simpleicon@monogameicon\endcsname {\simpleiconsmap\symbol{"F0DC}} + \expandafter\def\csname simpleicon@monoprixicon\endcsname {\simpleiconsmap\symbol{"F0DD}} + \expandafter\def\csname simpleicon@monstericon\endcsname {\simpleiconsmap\symbol{"F0DE}} + \expandafter\def\csname simpleicon@monzoicon\endcsname {\simpleiconsmap\symbol{"F0DF}} + \expandafter\def\csname simpleicon@mooicon\endcsname {\simpleiconsmap\symbol{"F0E0}} + \expandafter\def\csname simpleicon@moodleicon\endcsname {\simpleiconsmap\symbol{"F0E1}} + \expandafter\def\csname simpleicon@moonrepoicon\endcsname {\simpleiconsmap\symbol{"F0E2}} + \expandafter\def\csname simpleicon@moqicon\endcsname {\simpleiconsmap\symbol{"F0E3}} + \expandafter\def\csname simpleicon@moqupsicon\endcsname {\simpleiconsmap\symbol{"F0E4}} + \expandafter\def\csname simpleicon@morrisonsicon\endcsname {\simpleiconsmap\symbol{"F0E5}} + \expandafter\def\csname simpleicon@moscowmetroicon\endcsname {\simpleiconsmap\symbol{"F0E6}} + \expandafter\def\csname simpleicon@motorolaicon\endcsname {\simpleiconsmap\symbol{"F0E7}} + \expandafter\def\csname simpleicon@mozillaicon\endcsname {\simpleiconsmap\symbol{"F0E8}} + \expandafter\def\csname simpleicon@mpvicon\endcsname {\simpleiconsmap\symbol{"F0E9}} + \expandafter\def\csname simpleicon@mqtticon\endcsname {\simpleiconsmap\symbol{"F0EA}} + \expandafter\def\csname simpleicon@msiicon\endcsname {\simpleiconsmap\symbol{"F0EB}} + \expandafter\def\csname simpleicon@msibusinessicon\endcsname {\simpleiconsmap\symbol{"F0EC}} + \expandafter\def\csname simpleicon@mtaicon\endcsname {\simpleiconsmap\symbol{"F0ED}} + \expandafter\def\csname simpleicon@mtricon\endcsname {\simpleiconsmap\symbol{"F0EE}} + \expandafter\def\csname simpleicon@mubiicon\endcsname {\simpleiconsmap\symbol{"F0EF}} + \expandafter\def\csname simpleicon@muiicon\endcsname {\simpleiconsmap\symbol{"F0F0}} + \expandafter\def\csname simpleicon@mulesofticon\endcsname {\simpleiconsmap\symbol{"F0F1}} + \expandafter\def\csname simpleicon@mullericon\endcsname {\simpleiconsmap\symbol{"F0F2}} + \expandafter\def\csname simpleicon@multisimicon\endcsname {\simpleiconsmap\symbol{"F0F3}} + \expandafter\def\csname simpleicon@mumbleicon\endcsname {\simpleiconsmap\symbol{"F0F4}} + \expandafter\def\csname simpleicon@muoicon\endcsname {\simpleiconsmap\symbol{"F0F5}} + \expandafter\def\csname simpleicon@muralicon\endcsname {\simpleiconsmap\symbol{"F0F6}} + \expandafter\def\csname simpleicon@musescoreicon\endcsname {\simpleiconsmap\symbol{"F0F7}} + \expandafter\def\csname simpleicon@musicbrainzicon\endcsname {\simpleiconsmap\symbol{"F0F8}} + \expandafter\def\csname simpleicon@mxlinuxicon\endcsname {\simpleiconsmap\symbol{"F0F9}} + \expandafter\def\csname simpleicon@myanimelisticon\endcsname {\simpleiconsmap\symbol{"F0FA}} + \expandafter\def\csname simpleicon@mygeticon\endcsname {\simpleiconsmap\symbol{"F0FB}} + \expandafter\def\csname simpleicon@myobicon\endcsname {\simpleiconsmap\symbol{"F0FC}} + \expandafter\def\csname simpleicon@myspaceicon\endcsname {\simpleiconsmap\symbol{"F0FD}} + \expandafter\def\csname simpleicon@mysqlicon\endcsname {\simpleiconsmap\symbol{"F0FE}} + \expandafter\def\csname simpleicon@n26icon\endcsname {\simpleiconsmap\symbol{"F0FF}} + \expandafter\def\csname simpleicon@n8nicon\endcsname {\simpleiconsmap\symbol{"F100}} + \expandafter\def\csname simpleicon@namebaseicon\endcsname {\simpleiconsmap\symbol{"F101}} + \expandafter\def\csname simpleicon@namecheapicon\endcsname {\simpleiconsmap\symbol{"F102}} + \expandafter\def\csname simpleicon@namemcicon\endcsname {\simpleiconsmap\symbol{"F103}} + \expandafter\def\csname simpleicon@namesiloicon\endcsname {\simpleiconsmap\symbol{"F104}} + \expandafter\def\csname simpleicon@namuwikiicon\endcsname {\simpleiconsmap\symbol{"F105}} + \expandafter\def\csname simpleicon@nanoicon\endcsname {\simpleiconsmap\symbol{"F106}} + \expandafter\def\csname simpleicon@nasaicon\endcsname {\simpleiconsmap\symbol{"F107}} + \expandafter\def\csname simpleicon@nationalgridicon\endcsname {\simpleiconsmap\symbol{"F108}} + \expandafter\def\csname simpleicon@nationalrailicon\endcsname {\simpleiconsmap\symbol{"F109}} + \expandafter\def\csname simpleicon@nativescripticon\endcsname {\simpleiconsmap\symbol{"F10A}} + \expandafter\def\csname simpleicon@natsdotioicon\endcsname {\simpleiconsmap\symbol{"F10B}} + \expandafter\def\csname simpleicon@navericon\endcsname {\simpleiconsmap\symbol{"F10C}} + \expandafter\def\csname simpleicon@nbaicon\endcsname {\simpleiconsmap\symbol{"F10D}} + \expandafter\def\csname simpleicon@nbbicon\endcsname {\simpleiconsmap\symbol{"F10E}} + \expandafter\def\csname simpleicon@nbcicon\endcsname {\simpleiconsmap\symbol{"F10F}} + \expandafter\def\csname simpleicon@ndricon\endcsname {\simpleiconsmap\symbol{"F110}} + \expandafter\def\csname simpleicon@nearicon\endcsname {\simpleiconsmap\symbol{"F111}} + \expandafter\def\csname simpleicon@necicon\endcsname {\simpleiconsmap\symbol{"F112}} + \expandafter\def\csname simpleicon@neo4jicon\endcsname {\simpleiconsmap\symbol{"F113}} + \expandafter\def\csname simpleicon@neovimicon\endcsname {\simpleiconsmap\symbol{"F114}} + \expandafter\def\csname simpleicon@neptuneicon\endcsname {\simpleiconsmap\symbol{"F115}} + \expandafter\def\csname simpleicon@nestjsicon\endcsname {\simpleiconsmap\symbol{"F116}} + \expandafter\def\csname simpleicon@netappicon\endcsname {\simpleiconsmap\symbol{"F117}} + \expandafter\def\csname simpleicon@netbsdicon\endcsname {\simpleiconsmap\symbol{"F118}} + \expandafter\def\csname simpleicon@netcupicon\endcsname {\simpleiconsmap\symbol{"F119}} + \expandafter\def\csname simpleicon@netdataicon\endcsname {\simpleiconsmap\symbol{"F11A}} + \expandafter\def\csname simpleicon@neteasecloudmusicicon\endcsname {\simpleiconsmap\symbol{"F11B}} + \expandafter\def\csname simpleicon@netflixicon\endcsname {\simpleiconsmap\symbol{"F11C}} + \expandafter\def\csname simpleicon@netgearicon\endcsname {\simpleiconsmap\symbol{"F11D}} + \expandafter\def\csname simpleicon@netlifyicon\endcsname {\simpleiconsmap\symbol{"F11E}} + \expandafter\def\csname simpleicon@netteicon\endcsname {\simpleiconsmap\symbol{"F11F}} + \expandafter\def\csname simpleicon@nettoicon\endcsname {\simpleiconsmap\symbol{"F120}} + \expandafter\def\csname simpleicon@neutralinojsicon\endcsname {\simpleiconsmap\symbol{"F121}} + \expandafter\def\csname simpleicon@newbalanceicon\endcsname {\simpleiconsmap\symbol{"F122}} + \expandafter\def\csname simpleicon@neweggicon\endcsname {\simpleiconsmap\symbol{"F123}} + \expandafter\def\csname simpleicon@newjapanprowrestlingicon\endcsname {\simpleiconsmap\symbol{"F124}} + \expandafter\def\csname simpleicon@newrelicicon\endcsname {\simpleiconsmap\symbol{"F125}} + \expandafter\def\csname simpleicon@newyorktimesicon\endcsname {\simpleiconsmap\symbol{"F126}} + \expandafter\def\csname simpleicon@nextbilliondotaiicon\endcsname {\simpleiconsmap\symbol{"F127}} + \expandafter\def\csname simpleicon@nextcloudicon\endcsname {\simpleiconsmap\symbol{"F128}} + \expandafter\def\csname simpleicon@nextdnsicon\endcsname {\simpleiconsmap\symbol{"F129}} + \expandafter\def\csname simpleicon@nextdooricon\endcsname {\simpleiconsmap\symbol{"F12A}} + \expandafter\def\csname simpleicon@nextdotjsicon\endcsname {\simpleiconsmap\symbol{"F12B}} + \expandafter\def\csname simpleicon@nextraicon\endcsname {\simpleiconsmap\symbol{"F12C}} + \expandafter\def\csname simpleicon@nextuiicon\endcsname {\simpleiconsmap\symbol{"F12D}} + \expandafter\def\csname simpleicon@nexusmodsicon\endcsname {\simpleiconsmap\symbol{"F12E}} + \expandafter\def\csname simpleicon@nfcicon\endcsname {\simpleiconsmap\symbol{"F12F}} + \expandafter\def\csname simpleicon@nginxicon\endcsname {\simpleiconsmap\symbol{"F130}} + \expandafter\def\csname simpleicon@nginxproxymanagericon\endcsname {\simpleiconsmap\symbol{"F131}} + \expandafter\def\csname simpleicon@ngrokicon\endcsname {\simpleiconsmap\symbol{"F132}} + \expandafter\def\csname simpleicon@ngrxicon\endcsname {\simpleiconsmap\symbol{"F133}} + \expandafter\def\csname simpleicon@nhlicon\endcsname {\simpleiconsmap\symbol{"F134}} + \expandafter\def\csname simpleicon@nicehashicon\endcsname {\simpleiconsmap\symbol{"F135}} + \expandafter\def\csname simpleicon@niconicoicon\endcsname {\simpleiconsmap\symbol{"F136}} + \expandafter\def\csname simpleicon@nikeicon\endcsname {\simpleiconsmap\symbol{"F137}} + \expandafter\def\csname simpleicon@nikonicon\endcsname {\simpleiconsmap\symbol{"F138}} + \expandafter\def\csname simpleicon@nimicon\endcsname {\simpleiconsmap\symbol{"F139}} + \expandafter\def\csname simpleicon@nintendoicon\endcsname {\simpleiconsmap\symbol{"F13A}} + \expandafter\def\csname simpleicon@nintendo3dsicon\endcsname {\simpleiconsmap\symbol{"F13B}} + \expandafter\def\csname simpleicon@nintendogamecubeicon\endcsname {\simpleiconsmap\symbol{"F13C}} + \expandafter\def\csname simpleicon@nintendoswitchicon\endcsname {\simpleiconsmap\symbol{"F13D}} + \expandafter\def\csname simpleicon@nissanicon\endcsname {\simpleiconsmap\symbol{"F13E}} + \expandafter\def\csname simpleicon@nixosicon\endcsname {\simpleiconsmap\symbol{"F13F}} + \expandafter\def\csname simpleicon@nodedotjsicon\endcsname {\simpleiconsmap\symbol{"F140}} + \expandafter\def\csname simpleicon@nodemonicon\endcsname {\simpleiconsmap\symbol{"F141}} + \expandafter\def\csname simpleicon@noderedicon\endcsname {\simpleiconsmap\symbol{"F142}} + \expandafter\def\csname simpleicon@nokiaicon\endcsname {\simpleiconsmap\symbol{"F143}} + \expandafter\def\csname simpleicon@nomadicon\endcsname {\simpleiconsmap\symbol{"F144}} + \expandafter\def\csname simpleicon@norcoicon\endcsname {\simpleiconsmap\symbol{"F145}} + \expandafter\def\csname simpleicon@nordicsemiconductoricon\endcsname {\simpleiconsmap\symbol{"F146}} + \expandafter\def\csname simpleicon@nordvpnicon\endcsname {\simpleiconsmap\symbol{"F147}} + \expandafter\def\csname simpleicon@normalizedotcssicon\endcsname {\simpleiconsmap\symbol{"F148}} + \expandafter\def\csname simpleicon@nortonicon\endcsname {\simpleiconsmap\symbol{"F149}} + \expandafter\def\csname simpleicon@norwegianicon\endcsname {\simpleiconsmap\symbol{"F14A}} + \expandafter\def\csname simpleicon@notepadplusplusicon\endcsname {\simpleiconsmap\symbol{"F14B}} + \expandafter\def\csname simpleicon@notionicon\endcsname {\simpleiconsmap\symbol{"F14C}} + \expandafter\def\csname simpleicon@notisticon\endcsname {\simpleiconsmap\symbol{"F14D}} + \expandafter\def\csname simpleicon@nounprojecticon\endcsname {\simpleiconsmap\symbol{"F14E}} + \expandafter\def\csname simpleicon@novuicon\endcsname {\simpleiconsmap\symbol{"F14F}} + \expandafter\def\csname simpleicon@nowicon\endcsname {\simpleiconsmap\symbol{"F150}} + \expandafter\def\csname simpleicon@npmicon\endcsname {\simpleiconsmap\symbol{"F151}} + \expandafter\def\csname simpleicon@nrwlicon\endcsname {\simpleiconsmap\symbol{"F152}} + \expandafter\def\csname simpleicon@nsisicon\endcsname {\simpleiconsmap\symbol{"F153}} + \expandafter\def\csname simpleicon@ntfyicon\endcsname {\simpleiconsmap\symbol{"F154}} + \expandafter\def\csname simpleicon@nubankicon\endcsname {\simpleiconsmap\symbol{"F155}} + \expandafter\def\csname simpleicon@nucleoicon\endcsname {\simpleiconsmap\symbol{"F156}} + \expandafter\def\csname simpleicon@nugeticon\endcsname {\simpleiconsmap\symbol{"F157}} + \expandafter\def\csname simpleicon@nukeicon\endcsname {\simpleiconsmap\symbol{"F158}} + \expandafter\def\csname simpleicon@numbaicon\endcsname {\simpleiconsmap\symbol{"F159}} + \expandafter\def\csname simpleicon@numpyicon\endcsname {\simpleiconsmap\symbol{"F15A}} + \expandafter\def\csname simpleicon@nunjucksicon\endcsname {\simpleiconsmap\symbol{"F15B}} + \expandafter\def\csname simpleicon@nushellicon\endcsname {\simpleiconsmap\symbol{"F15C}} + \expandafter\def\csname simpleicon@nutanixicon\endcsname {\simpleiconsmap\symbol{"F15D}} + \expandafter\def\csname simpleicon@nuxtdotjsicon\endcsname {\simpleiconsmap\symbol{"F15E}} + \expandafter\def\csname simpleicon@nvidiaicon\endcsname {\simpleiconsmap\symbol{"F15F}} + \expandafter\def\csname simpleicon@nvmicon\endcsname {\simpleiconsmap\symbol{"F160}} + \expandafter\def\csname simpleicon@nxicon\endcsname {\simpleiconsmap\symbol{"F161}} + \expandafter\def\csname simpleicon@nxpicon\endcsname {\simpleiconsmap\symbol{"F162}} + \expandafter\def\csname simpleicon@nzxticon\endcsname {\simpleiconsmap\symbol{"F163}} + \expandafter\def\csname simpleicon@observableicon\endcsname {\simpleiconsmap\symbol{"F164}} + \expandafter\def\csname simpleicon@obsidianicon\endcsname {\simpleiconsmap\symbol{"F165}} + \expandafter\def\csname simpleicon@obsstudioicon\endcsname {\simpleiconsmap\symbol{"F166}} + \expandafter\def\csname simpleicon@ocamlicon\endcsname {\simpleiconsmap\symbol{"F167}} + \expandafter\def\csname simpleicon@oclificon\endcsname {\simpleiconsmap\symbol{"F168}} + \expandafter\def\csname simpleicon@octanerendericon\endcsname {\simpleiconsmap\symbol{"F169}} + \expandafter\def\csname simpleicon@octaveicon\endcsname {\simpleiconsmap\symbol{"F16A}} + \expandafter\def\csname simpleicon@octobercmsicon\endcsname {\simpleiconsmap\symbol{"F16B}} + \expandafter\def\csname simpleicon@octoprinticon\endcsname {\simpleiconsmap\symbol{"F16C}} + \expandafter\def\csname simpleicon@octopusdeployicon\endcsname {\simpleiconsmap\symbol{"F16D}} + \expandafter\def\csname simpleicon@oculusicon\endcsname {\simpleiconsmap\symbol{"F16E}} + \expandafter\def\csname simpleicon@odnoklassnikiicon\endcsname {\simpleiconsmap\symbol{"F16F}} + \expandafter\def\csname simpleicon@odooicon\endcsname {\simpleiconsmap\symbol{"F170}} + \expandafter\def\csname simpleicon@odyseeicon\endcsname {\simpleiconsmap\symbol{"F171}} + \expandafter\def\csname simpleicon@ohdearicon\endcsname {\simpleiconsmap\symbol{"F172}} + \expandafter\def\csname simpleicon@okcupidicon\endcsname {\simpleiconsmap\symbol{"F173}} + \expandafter\def\csname simpleicon@oktaicon\endcsname {\simpleiconsmap\symbol{"F174}} + \expandafter\def\csname simpleicon@ollamaicon\endcsname {\simpleiconsmap\symbol{"F175}} + \expandafter\def\csname simpleicon@oneplusicon\endcsname {\simpleiconsmap\symbol{"F176}} + \expandafter\def\csname simpleicon@onlyfansicon\endcsname {\simpleiconsmap\symbol{"F177}} + \expandafter\def\csname simpleicon@onlyofficeicon\endcsname {\simpleiconsmap\symbol{"F178}} + \expandafter\def\csname simpleicon@onnxicon\endcsname {\simpleiconsmap\symbol{"F179}} + \expandafter\def\csname simpleicon@onstaricon\endcsname {\simpleiconsmap\symbol{"F17A}} + \expandafter\def\csname simpleicon@opelicon\endcsname {\simpleiconsmap\symbol{"F17B}} + \expandafter\def\csname simpleicon@openaccessicon\endcsname {\simpleiconsmap\symbol{"F17C}} + \expandafter\def\csname simpleicon@openaiicon\endcsname {\simpleiconsmap\symbol{"F17D}} + \expandafter\def\csname simpleicon@openaigymicon\endcsname {\simpleiconsmap\symbol{"F17E}} + \expandafter\def\csname simpleicon@openapiinitiativeicon\endcsname {\simpleiconsmap\symbol{"F17F}} + \expandafter\def\csname simpleicon@openbadgesicon\endcsname {\simpleiconsmap\symbol{"F180}} + \expandafter\def\csname simpleicon@openbsdicon\endcsname {\simpleiconsmap\symbol{"F181}} + \expandafter\def\csname simpleicon@openbugbountyicon\endcsname {\simpleiconsmap\symbol{"F182}} + \expandafter\def\csname simpleicon@opencollectiveicon\endcsname {\simpleiconsmap\symbol{"F183}} + \expandafter\def\csname simpleicon@opencontainersinitiativeicon\endcsname {\simpleiconsmap\symbol{"F184}} + \expandafter\def\csname simpleicon@opencvicon\endcsname {\simpleiconsmap\symbol{"F185}} + \expandafter\def\csname simpleicon@openfaasicon\endcsname {\simpleiconsmap\symbol{"F186}} + \expandafter\def\csname simpleicon@openglicon\endcsname {\simpleiconsmap\symbol{"F187}} + \expandafter\def\csname simpleicon@openhabicon\endcsname {\simpleiconsmap\symbol{"F188}} + \expandafter\def\csname simpleicon@openidicon\endcsname {\simpleiconsmap\symbol{"F189}} + \expandafter\def\csname simpleicon@openjdkicon\endcsname {\simpleiconsmap\symbol{"F18A}} + \expandafter\def\csname simpleicon@openjsfoundationicon\endcsname {\simpleiconsmap\symbol{"F18B}} + \expandafter\def\csname simpleicon@openlayersicon\endcsname {\simpleiconsmap\symbol{"F18C}} + \expandafter\def\csname simpleicon@openmediavaulticon\endcsname {\simpleiconsmap\symbol{"F18D}} + \expandafter\def\csname simpleicon@openminedicon\endcsname {\simpleiconsmap\symbol{"F18E}} + \expandafter\def\csname simpleicon@opennebulaicon\endcsname {\simpleiconsmap\symbol{"F18F}} + \expandafter\def\csname simpleicon@openprojecticon\endcsname {\simpleiconsmap\symbol{"F190}} + \expandafter\def\csname simpleicon@openscadicon\endcsname {\simpleiconsmap\symbol{"F191}} + \expandafter\def\csname simpleicon@openseaicon\endcsname {\simpleiconsmap\symbol{"F192}} + \expandafter\def\csname simpleicon@opensearchicon\endcsname {\simpleiconsmap\symbol{"F193}} + \expandafter\def\csname simpleicon@opensourcehardwareicon\endcsname {\simpleiconsmap\symbol{"F194}} + \expandafter\def\csname simpleicon@opensourceinitiativeicon\endcsname {\simpleiconsmap\symbol{"F195}} + \expandafter\def\csname simpleicon@opensslicon\endcsname {\simpleiconsmap\symbol{"F196}} + \expandafter\def\csname simpleicon@openstackicon\endcsname {\simpleiconsmap\symbol{"F197}} + \expandafter\def\csname simpleicon@openstreetmapicon\endcsname {\simpleiconsmap\symbol{"F198}} + \expandafter\def\csname simpleicon@opensuseicon\endcsname {\simpleiconsmap\symbol{"F199}} + \expandafter\def\csname simpleicon@opentelemetryicon\endcsname {\simpleiconsmap\symbol{"F19A}} + \expandafter\def\csname simpleicon@opentexticon\endcsname {\simpleiconsmap\symbol{"F19B}} + \expandafter\def\csname simpleicon@opentofuicon\endcsname {\simpleiconsmap\symbol{"F19C}} + \expandafter\def\csname simpleicon@openverseicon\endcsname {\simpleiconsmap\symbol{"F19D}} + \expandafter\def\csname simpleicon@openvpnicon\endcsname {\simpleiconsmap\symbol{"F19E}} + \expandafter\def\csname simpleicon@openwrticon\endcsname {\simpleiconsmap\symbol{"F19F}} + \expandafter\def\csname simpleicon@openzeppelinicon\endcsname {\simpleiconsmap\symbol{"F1A0}} + \expandafter\def\csname simpleicon@openzfsicon\endcsname {\simpleiconsmap\symbol{"F1A1}} + \expandafter\def\csname simpleicon@operaicon\endcsname {\simpleiconsmap\symbol{"F1A2}} + \expandafter\def\csname simpleicon@operagxicon\endcsname {\simpleiconsmap\symbol{"F1A3}} + \expandafter\def\csname simpleicon@opnsenseicon\endcsname {\simpleiconsmap\symbol{"F1A4}} + \expandafter\def\csname simpleicon@oppoicon\endcsname {\simpleiconsmap\symbol{"F1A5}} + \expandafter\def\csname simpleicon@opsgenieicon\endcsname {\simpleiconsmap\symbol{"F1A6}} + \expandafter\def\csname simpleicon@opslevelicon\endcsname {\simpleiconsmap\symbol{"F1A7}} + \expandafter\def\csname simpleicon@optimismicon\endcsname {\simpleiconsmap\symbol{"F1A8}} + \expandafter\def\csname simpleicon@oracleicon\endcsname {\simpleiconsmap\symbol{"F1A9}} + \expandafter\def\csname simpleicon@orangeicon\endcsname {\simpleiconsmap\symbol{"F1AA}} + \expandafter\def\csname simpleicon@orcidicon\endcsname {\simpleiconsmap\symbol{"F1AB}} + \expandafter\def\csname simpleicon@oreillyicon\endcsname {\simpleiconsmap\symbol{"F1AC}} + \expandafter\def\csname simpleicon@orgicon\endcsname {\simpleiconsmap\symbol{"F1AD}} + \expandafter\def\csname simpleicon@organicmapsicon\endcsname {\simpleiconsmap\symbol{"F1AE}} + \expandafter\def\csname simpleicon@originicon\endcsname {\simpleiconsmap\symbol{"F1AF}} + \expandafter\def\csname simpleicon@osanoicon\endcsname {\simpleiconsmap\symbol{"F1B0}} + \expandafter\def\csname simpleicon@osficon\endcsname {\simpleiconsmap\symbol{"F1B1}} + \expandafter\def\csname simpleicon@osgeoicon\endcsname {\simpleiconsmap\symbol{"F1B2}} + \expandafter\def\csname simpleicon@oshkoshicon\endcsname {\simpleiconsmap\symbol{"F1B3}} + \expandafter\def\csname simpleicon@osmcicon\endcsname {\simpleiconsmap\symbol{"F1B4}} + \expandafter\def\csname simpleicon@osuicon\endcsname {\simpleiconsmap\symbol{"F1B5}} + \expandafter\def\csname simpleicon@ottoicon\endcsname {\simpleiconsmap\symbol{"F1B6}} + \expandafter\def\csname simpleicon@outlineicon\endcsname {\simpleiconsmap\symbol{"F1B7}} + \expandafter\def\csname simpleicon@overcasticon\endcsname {\simpleiconsmap\symbol{"F1B8}} + \expandafter\def\csname simpleicon@overleaficon\endcsname {\simpleiconsmap\symbol{"F1B9}} + \expandafter\def\csname simpleicon@ovhicon\endcsname {\simpleiconsmap\symbol{"F1BA}} + \expandafter\def\csname simpleicon@owaspicon\endcsname {\simpleiconsmap\symbol{"F1BB}} + \expandafter\def\csname simpleicon@owncloudicon\endcsname {\simpleiconsmap\symbol{"F1BC}} + \expandafter\def\csname simpleicon@oxygenicon\endcsname {\simpleiconsmap\symbol{"F1BD}} + \expandafter\def\csname simpleicon@oyoicon\endcsname {\simpleiconsmap\symbol{"F1BE}} + \expandafter\def\csname simpleicon@p5dotjsicon\endcsname {\simpleiconsmap\symbol{"F1BF}} + \expandafter\def\csname simpleicon@packagisticon\endcsname {\simpleiconsmap\symbol{"F1C0}} + \expandafter\def\csname simpleicon@packericon\endcsname {\simpleiconsmap\symbol{"F1C1}} + \expandafter\def\csname simpleicon@packticon\endcsname {\simpleiconsmap\symbol{"F1C2}} + \expandafter\def\csname simpleicon@paddleicon\endcsname {\simpleiconsmap\symbol{"F1C3}} + \expandafter\def\csname simpleicon@paddlepaddleicon\endcsname {\simpleiconsmap\symbol{"F1C4}} + \expandafter\def\csname simpleicon@paddypowericon\endcsname {\simpleiconsmap\symbol{"F1C5}} + \expandafter\def\csname simpleicon@pagekiticon\endcsname {\simpleiconsmap\symbol{"F1C6}} + \expandafter\def\csname simpleicon@pagerdutyicon\endcsname {\simpleiconsmap\symbol{"F1C7}} + \expandafter\def\csname simpleicon@pagespeedinsightsicon\endcsname {\simpleiconsmap\symbol{"F1C8}} + \expandafter\def\csname simpleicon@pagseguroicon\endcsname {\simpleiconsmap\symbol{"F1C9}} + \expandafter\def\csname simpleicon@palantiricon\endcsname {\simpleiconsmap\symbol{"F1CA}} + \expandafter\def\csname simpleicon@paloaltonetworksicon\endcsname {\simpleiconsmap\symbol{"F1CB}} + \expandafter\def\csname simpleicon@paloaltosoftwareicon\endcsname {\simpleiconsmap\symbol{"F1CC}} + \expandafter\def\csname simpleicon@panasonicicon\endcsname {\simpleiconsmap\symbol{"F1CD}} + \expandafter\def\csname simpleicon@pandasicon\endcsname {\simpleiconsmap\symbol{"F1CE}} + \expandafter\def\csname simpleicon@pandoraicon\endcsname {\simpleiconsmap\symbol{"F1CF}} + \expandafter\def\csname simpleicon@pantheonicon\endcsname {\simpleiconsmap\symbol{"F1D0}} + \expandafter\def\csname simpleicon@paperlessngxicon\endcsname {\simpleiconsmap\symbol{"F1D1}} + \expandafter\def\csname simpleicon@paperspaceicon\endcsname {\simpleiconsmap\symbol{"F1D2}} + \expandafter\def\csname simpleicon@paperswithcodeicon\endcsname {\simpleiconsmap\symbol{"F1D3}} + \expandafter\def\csname simpleicon@paramountplusicon\endcsname {\simpleiconsmap\symbol{"F1D4}} + \expandafter\def\csname simpleicon@paritysubstrateicon\endcsname {\simpleiconsmap\symbol{"F1D5}} + \expandafter\def\csname simpleicon@parrotsecurityicon\endcsname {\simpleiconsmap\symbol{"F1D6}} + \expandafter\def\csname simpleicon@parsedotlyicon\endcsname {\simpleiconsmap\symbol{"F1D7}} + \expandafter\def\csname simpleicon@passporticon\endcsname {\simpleiconsmap\symbol{"F1D8}} + \expandafter\def\csname simpleicon@pastebinicon\endcsname {\simpleiconsmap\symbol{"F1D9}} + \expandafter\def\csname simpleicon@patreonicon\endcsname {\simpleiconsmap\symbol{"F1DA}} + \expandafter\def\csname simpleicon@paychexicon\endcsname {\simpleiconsmap\symbol{"F1DB}} + \expandafter\def\csname simpleicon@payhipicon\endcsname {\simpleiconsmap\symbol{"F1DC}} + \expandafter\def\csname simpleicon@payloadcmsicon\endcsname {\simpleiconsmap\symbol{"F1DD}} + \expandafter\def\csname simpleicon@payoneericon\endcsname {\simpleiconsmap\symbol{"F1DE}} + \expandafter\def\csname simpleicon@paypalicon\endcsname {\simpleiconsmap\symbol{"F1DF}} + \expandafter\def\csname simpleicon@paytmicon\endcsname {\simpleiconsmap\symbol{"F1E0}} + \expandafter\def\csname simpleicon@pcgamingwikiicon\endcsname {\simpleiconsmap\symbol{"F1E1}} + \expandafter\def\csname simpleicon@pdmicon\endcsname {\simpleiconsmap\symbol{"F1E2}} + \expandafter\def\csname simpleicon@pdqicon\endcsname {\simpleiconsmap\symbol{"F1E3}} + \expandafter\def\csname simpleicon@peakdesignicon\endcsname {\simpleiconsmap\symbol{"F1E4}} + \expandafter\def\csname simpleicon@pearsonicon\endcsname {\simpleiconsmap\symbol{"F1E5}} + \expandafter\def\csname simpleicon@peerlisticon\endcsname {\simpleiconsmap\symbol{"F1E6}} + \expandafter\def\csname simpleicon@peertubeicon\endcsname {\simpleiconsmap\symbol{"F1E7}} + \expandafter\def\csname simpleicon@pegasusairlinesicon\endcsname {\simpleiconsmap\symbol{"F1E8}} + \expandafter\def\csname simpleicon@pelicanicon\endcsname {\simpleiconsmap\symbol{"F1E9}} + \expandafter\def\csname simpleicon@pelotonicon\endcsname {\simpleiconsmap\symbol{"F1EA}} + \expandafter\def\csname simpleicon@pennyicon\endcsname {\simpleiconsmap\symbol{"F1EB}} + \expandafter\def\csname simpleicon@penpoticon\endcsname {\simpleiconsmap\symbol{"F1EC}} + \expandafter\def\csname simpleicon@percyicon\endcsname {\simpleiconsmap\symbol{"F1ED}} + \expandafter\def\csname simpleicon@perforceicon\endcsname {\simpleiconsmap\symbol{"F1EE}} + \expandafter\def\csname simpleicon@perlicon\endcsname {\simpleiconsmap\symbol{"F1EF}} + \expandafter\def\csname simpleicon@perplexityicon\endcsname {\simpleiconsmap\symbol{"F1F0}} + \expandafter\def\csname simpleicon@persistenticon\endcsname {\simpleiconsmap\symbol{"F1F1}} + \expandafter\def\csname simpleicon@personioicon\endcsname {\simpleiconsmap\symbol{"F1F2}} + \expandafter\def\csname simpleicon@petsathomeicon\endcsname {\simpleiconsmap\symbol{"F1F3}} + \expandafter\def\csname simpleicon@peugeoticon\endcsname {\simpleiconsmap\symbol{"F1F4}} + \expandafter\def\csname simpleicon@pexelsicon\endcsname {\simpleiconsmap\symbol{"F1F5}} + \expandafter\def\csname simpleicon@pfsenseicon\endcsname {\simpleiconsmap\symbol{"F1F6}} + \expandafter\def\csname simpleicon@phabricatoricon\endcsname {\simpleiconsmap\symbol{"F1F7}} + \expandafter\def\csname simpleicon@philipshueicon\endcsname {\simpleiconsmap\symbol{"F1F8}} + \expandafter\def\csname simpleicon@phoenixframeworkicon\endcsname {\simpleiconsmap\symbol{"F1F9}} + \expandafter\def\csname simpleicon@phonepeicon\endcsname {\simpleiconsmap\symbol{"F1FA}} + \expandafter\def\csname simpleicon@phosphoriconsicon\endcsname {\simpleiconsmap\symbol{"F1FB}} + \expandafter\def\csname simpleicon@photobucketicon\endcsname {\simpleiconsmap\symbol{"F1FC}} + \expandafter\def\csname simpleicon@photocrowdicon\endcsname {\simpleiconsmap\symbol{"F1FD}} + \expandafter\def\csname simpleicon@photonicon\endcsname {\simpleiconsmap\symbol{"F1FE}} + \expandafter\def\csname simpleicon@photopeaicon\endcsname {\simpleiconsmap\symbol{"F1FF}} + \expandafter\def\csname simpleicon@phpicon\endcsname {\simpleiconsmap\symbol{"F200}} + \expandafter\def\csname simpleicon@phpmyadminicon\endcsname {\simpleiconsmap\symbol{"F201}} + \expandafter\def\csname simpleicon@phpstormicon\endcsname {\simpleiconsmap\symbol{"F202}} + \expandafter\def\csname simpleicon@piaggiogroupicon\endcsname {\simpleiconsmap\symbol{"F203}} + \expandafter\def\csname simpleicon@piaproicon\endcsname {\simpleiconsmap\symbol{"F204}} + \expandafter\def\csname simpleicon@picardsurgelesicon\endcsname {\simpleiconsmap\symbol{"F205}} + \expandafter\def\csname simpleicon@picartodottvicon\endcsname {\simpleiconsmap\symbol{"F206}} + \expandafter\def\csname simpleicon@picnicicon\endcsname {\simpleiconsmap\symbol{"F207}} + \expandafter\def\csname simpleicon@picpayicon\endcsname {\simpleiconsmap\symbol{"F208}} + \expandafter\def\csname simpleicon@picrewicon\endcsname {\simpleiconsmap\symbol{"F209}} + \expandafter\def\csname simpleicon@picxyicon\endcsname {\simpleiconsmap\symbol{"F20A}} + \expandafter\def\csname simpleicon@piholeicon\endcsname {\simpleiconsmap\symbol{"F20B}} + \expandafter\def\csname simpleicon@pimcoreicon\endcsname {\simpleiconsmap\symbol{"F20C}} + \expandafter\def\csname simpleicon@pinboardicon\endcsname {\simpleiconsmap\symbol{"F20D}} + \expandafter\def\csname simpleicon@pinescripticon\endcsname {\simpleiconsmap\symbol{"F20E}} + \expandafter\def\csname simpleicon@pinetworkicon\endcsname {\simpleiconsmap\symbol{"F20F}} + \expandafter\def\csname simpleicon@pingdomicon\endcsname {\simpleiconsmap\symbol{"F210}} + \expandafter\def\csname simpleicon@pinoicon\endcsname {\simpleiconsmap\symbol{"F211}} + \expandafter\def\csname simpleicon@pinteresticon\endcsname {\simpleiconsmap\symbol{"F212}} + \expandafter\def\csname simpleicon@pioneerdjicon\endcsname {\simpleiconsmap\symbol{"F213}} + \expandafter\def\csname simpleicon@pipedicon\endcsname {\simpleiconsmap\symbol{"F214}} + \expandafter\def\csname simpleicon@pipxicon\endcsname {\simpleiconsmap\symbol{"F215}} + \expandafter\def\csname simpleicon@pivotaltrackericon\endcsname {\simpleiconsmap\symbol{"F216}} + \expandafter\def\csname simpleicon@piwigoicon\endcsname {\simpleiconsmap\symbol{"F217}} + \expandafter\def\csname simpleicon@pixicon\endcsname {\simpleiconsmap\symbol{"F218}} + \expandafter\def\csname simpleicon@pixabayicon\endcsname {\simpleiconsmap\symbol{"F219}} + \expandafter\def\csname simpleicon@pixelfedicon\endcsname {\simpleiconsmap\symbol{"F21A}} + \expandafter\def\csname simpleicon@pixivicon\endcsname {\simpleiconsmap\symbol{"F21B}} + \expandafter\def\csname simpleicon@pixlricon\endcsname {\simpleiconsmap\symbol{"F21C}} + \expandafter\def\csname simpleicon@pkgsrcicon\endcsname {\simpleiconsmap\symbol{"F21D}} + \expandafter\def\csname simpleicon@planeticon\endcsname {\simpleiconsmap\symbol{"F21E}} + \expandafter\def\csname simpleicon@planetscaleicon\endcsname {\simpleiconsmap\symbol{"F21F}} + \expandafter\def\csname simpleicon@plangridicon\endcsname {\simpleiconsmap\symbol{"F220}} + \expandafter\def\csname simpleicon@platformdotshicon\endcsname {\simpleiconsmap\symbol{"F221}} + \expandafter\def\csname simpleicon@platformioicon\endcsname {\simpleiconsmap\symbol{"F222}} + \expandafter\def\csname simpleicon@platziicon\endcsname {\simpleiconsmap\symbol{"F223}} + \expandafter\def\csname simpleicon@plausibleanalyticsicon\endcsname {\simpleiconsmap\symbol{"F224}} + \expandafter\def\csname simpleicon@playcanvasicon\endcsname {\simpleiconsmap\symbol{"F225}} + \expandafter\def\csname simpleicon@playerdotmeicon\endcsname {\simpleiconsmap\symbol{"F226}} + \expandafter\def\csname simpleicon@playerfmicon\endcsname {\simpleiconsmap\symbol{"F227}} + \expandafter\def\csname simpleicon@playstationicon\endcsname {\simpleiconsmap\symbol{"F228}} + \expandafter\def\csname simpleicon@playstation2icon\endcsname {\simpleiconsmap\symbol{"F229}} + \expandafter\def\csname simpleicon@playstation3icon\endcsname {\simpleiconsmap\symbol{"F22A}} + \expandafter\def\csname simpleicon@playstation4icon\endcsname {\simpleiconsmap\symbol{"F22B}} + \expandafter\def\csname simpleicon@playstation5icon\endcsname {\simpleiconsmap\symbol{"F22C}} + \expandafter\def\csname simpleicon@playstationportableicon\endcsname {\simpleiconsmap\symbol{"F22D}} + \expandafter\def\csname simpleicon@playstationvitaicon\endcsname {\simpleiconsmap\symbol{"F22E}} + \expandafter\def\csname simpleicon@pleromaicon\endcsname {\simpleiconsmap\symbol{"F22F}} + \expandafter\def\csname simpleicon@pleskicon\endcsname {\simpleiconsmap\symbol{"F230}} + \expandafter\def\csname simpleicon@plexicon\endcsname {\simpleiconsmap\symbol{"F231}} + \expandafter\def\csname simpleicon@plotlyicon\endcsname {\simpleiconsmap\symbol{"F232}} + \expandafter\def\csname simpleicon@plumeicon\endcsname {\simpleiconsmap\symbol{"F233}} + \expandafter\def\csname simpleicon@pluralsighticon\endcsname {\simpleiconsmap\symbol{"F234}} + \expandafter\def\csname simpleicon@plurkicon\endcsname {\simpleiconsmap\symbol{"F235}} + \expandafter\def\csname simpleicon@pluscodesicon\endcsname {\simpleiconsmap\symbol{"F236}} + \expandafter\def\csname simpleicon@pm2icon\endcsname {\simpleiconsmap\symbol{"F237}} + \expandafter\def\csname simpleicon@pnpmicon\endcsname {\simpleiconsmap\symbol{"F238}} + \expandafter\def\csname simpleicon@pocketicon\endcsname {\simpleiconsmap\symbol{"F239}} + \expandafter\def\csname simpleicon@pocketbaseicon\endcsname {\simpleiconsmap\symbol{"F23A}} + \expandafter\def\csname simpleicon@pocketcastsicon\endcsname {\simpleiconsmap\symbol{"F23B}} + \expandafter\def\csname simpleicon@podcastaddicticon\endcsname {\simpleiconsmap\symbol{"F23C}} + \expandafter\def\csname simpleicon@podcastindexicon\endcsname {\simpleiconsmap\symbol{"F23D}} + \expandafter\def\csname simpleicon@podmanicon\endcsname {\simpleiconsmap\symbol{"F23E}} + \expandafter\def\csname simpleicon@poeicon\endcsname {\simpleiconsmap\symbol{"F23F}} + \expandafter\def\csname simpleicon@poetryicon\endcsname {\simpleiconsmap\symbol{"F240}} + \expandafter\def\csname simpleicon@pointyicon\endcsname {\simpleiconsmap\symbol{"F241}} + \expandafter\def\csname simpleicon@pokemonicon\endcsname {\simpleiconsmap\symbol{"F242}} + \expandafter\def\csname simpleicon@polarsicon\endcsname {\simpleiconsmap\symbol{"F243}} + \expandafter\def\csname simpleicon@polestaricon\endcsname {\simpleiconsmap\symbol{"F244}} + \expandafter\def\csname simpleicon@polkadoticon\endcsname {\simpleiconsmap\symbol{"F245}} + \expandafter\def\csname simpleicon@polyicon\endcsname {\simpleiconsmap\symbol{"F246}} + \expandafter\def\csname simpleicon@polygonicon\endcsname {\simpleiconsmap\symbol{"F247}} + \expandafter\def\csname simpleicon@polymerprojecticon\endcsname {\simpleiconsmap\symbol{"F248}} + \expandafter\def\csname simpleicon@polyworkicon\endcsname {\simpleiconsmap\symbol{"F249}} + \expandafter\def\csname simpleicon@pond5icon\endcsname {\simpleiconsmap\symbol{"F24A}} + \expandafter\def\csname simpleicon@poposicon\endcsname {\simpleiconsmap\symbol{"F24B}} + \expandafter\def\csname simpleicon@porkbunicon\endcsname {\simpleiconsmap\symbol{"F24C}} + \expandafter\def\csname simpleicon@porscheicon\endcsname {\simpleiconsmap\symbol{"F24D}} + \expandafter\def\csname simpleicon@portainericon\endcsname {\simpleiconsmap\symbol{"F24E}} + \expandafter\def\csname simpleicon@portswiggericon\endcsname {\simpleiconsmap\symbol{"F24F}} + \expandafter\def\csname simpleicon@positicon\endcsname {\simpleiconsmap\symbol{"F250}} + \expandafter\def\csname simpleicon@postcssicon\endcsname {\simpleiconsmap\symbol{"F251}} + \expandafter\def\csname simpleicon@postgresqlicon\endcsname {\simpleiconsmap\symbol{"F252}} + \expandafter\def\csname simpleicon@posthogicon\endcsname {\simpleiconsmap\symbol{"F253}} + \expandafter\def\csname simpleicon@postmanicon\endcsname {\simpleiconsmap\symbol{"F254}} + \expandafter\def\csname simpleicon@postmatesicon\endcsname {\simpleiconsmap\symbol{"F255}} + \expandafter\def\csname simpleicon@powersicon\endcsname {\simpleiconsmap\symbol{"F256}} + \expandafter\def\csname simpleicon@prdotcoicon\endcsname {\simpleiconsmap\symbol{"F257}} + \expandafter\def\csname simpleicon@preacticon\endcsname {\simpleiconsmap\symbol{"F258}} + \expandafter\def\csname simpleicon@precommiticon\endcsname {\simpleiconsmap\symbol{"F259}} + \expandafter\def\csname simpleicon@prefecticon\endcsname {\simpleiconsmap\symbol{"F25A}} + \expandafter\def\csname simpleicon@premierleagueicon\endcsname {\simpleiconsmap\symbol{"F25B}} + \expandafter\def\csname simpleicon@prepbytesicon\endcsname {\simpleiconsmap\symbol{"F25C}} + \expandafter\def\csname simpleicon@prestashopicon\endcsname {\simpleiconsmap\symbol{"F25D}} + \expandafter\def\csname simpleicon@prestoicon\endcsname {\simpleiconsmap\symbol{"F25E}} + \expandafter\def\csname simpleicon@prettiericon\endcsname {\simpleiconsmap\symbol{"F25F}} + \expandafter\def\csname simpleicon@pretzelicon\endcsname {\simpleiconsmap\symbol{"F260}} + \expandafter\def\csname simpleicon@preventionicon\endcsname {\simpleiconsmap\symbol{"F261}} + \expandafter\def\csname simpleicon@preziicon\endcsname {\simpleiconsmap\symbol{"F262}} + \expandafter\def\csname simpleicon@primeicon\endcsname {\simpleiconsmap\symbol{"F263}} + \expandafter\def\csname simpleicon@primengicon\endcsname {\simpleiconsmap\symbol{"F264}} + \expandafter\def\csname simpleicon@primereacticon\endcsname {\simpleiconsmap\symbol{"F265}} + \expandafter\def\csname simpleicon@primevideoicon\endcsname {\simpleiconsmap\symbol{"F266}} + \expandafter\def\csname simpleicon@printablesicon\endcsname {\simpleiconsmap\symbol{"F267}} + \expandafter\def\csname simpleicon@prismaicon\endcsname {\simpleiconsmap\symbol{"F268}} + \expandafter\def\csname simpleicon@prismicicon\endcsname {\simpleiconsmap\symbol{"F269}} + \expandafter\def\csname simpleicon@privatedivisionicon\endcsname {\simpleiconsmap\symbol{"F26A}} + \expandafter\def\csname simpleicon@privateinternetaccessicon\endcsname {\simpleiconsmap\symbol{"F26B}} + \expandafter\def\csname simpleicon@proboticon\endcsname {\simpleiconsmap\symbol{"F26C}} + \expandafter\def\csname simpleicon@processingfoundationicon\endcsname {\simpleiconsmap\symbol{"F26D}} + \expandafter\def\csname simpleicon@processwireicon\endcsname {\simpleiconsmap\symbol{"F26E}} + \expandafter\def\csname simpleicon@producthunticon\endcsname {\simpleiconsmap\symbol{"F26F}} + \expandafter\def\csname simpleicon@progateicon\endcsname {\simpleiconsmap\symbol{"F270}} + \expandafter\def\csname simpleicon@progressicon\endcsname {\simpleiconsmap\symbol{"F271}} + \expandafter\def\csname simpleicon@prometheusicon\endcsname {\simpleiconsmap\symbol{"F272}} + \expandafter\def\csname simpleicon@pronounsdotpageicon\endcsname {\simpleiconsmap\symbol{"F273}} + \expandafter\def\csname simpleicon@prosiebenicon\endcsname {\simpleiconsmap\symbol{"F274}} + \expandafter\def\csname simpleicon@proteusicon\endcsname {\simpleiconsmap\symbol{"F275}} + \expandafter\def\csname simpleicon@protocolsdotioicon\endcsname {\simpleiconsmap\symbol{"F276}} + \expandafter\def\csname simpleicon@protodotioicon\endcsname {\simpleiconsmap\symbol{"F277}} + \expandafter\def\csname simpleicon@protonicon\endcsname {\simpleiconsmap\symbol{"F278}} + \expandafter\def\csname simpleicon@protoncalendaricon\endcsname {\simpleiconsmap\symbol{"F279}} + \expandafter\def\csname simpleicon@protondbicon\endcsname {\simpleiconsmap\symbol{"F27A}} + \expandafter\def\csname simpleicon@protondriveicon\endcsname {\simpleiconsmap\symbol{"F27B}} + \expandafter\def\csname simpleicon@protonmailicon\endcsname {\simpleiconsmap\symbol{"F27C}} + \expandafter\def\csname simpleicon@protonvpnicon\endcsname {\simpleiconsmap\symbol{"F27D}} + \expandafter\def\csname simpleicon@protoolsicon\endcsname {\simpleiconsmap\symbol{"F27E}} + \expandafter\def\csname simpleicon@protractoricon\endcsname {\simpleiconsmap\symbol{"F27F}} + \expandafter\def\csname simpleicon@proxmoxicon\endcsname {\simpleiconsmap\symbol{"F280}} + \expandafter\def\csname simpleicon@pterodactylicon\endcsname {\simpleiconsmap\symbol{"F281}} + \expandafter\def\csname simpleicon@pubgicon\endcsname {\simpleiconsmap\symbol{"F282}} + \expandafter\def\csname simpleicon@publonsicon\endcsname {\simpleiconsmap\symbol{"F283}} + \expandafter\def\csname simpleicon@pubmedicon\endcsname {\simpleiconsmap\symbol{"F284}} + \expandafter\def\csname simpleicon@pugicon\endcsname {\simpleiconsmap\symbol{"F285}} + \expandafter\def\csname simpleicon@pulumiicon\endcsname {\simpleiconsmap\symbol{"F286}} + \expandafter\def\csname simpleicon@pumaicon\endcsname {\simpleiconsmap\symbol{"F287}} + \expandafter\def\csname simpleicon@puppeticon\endcsname {\simpleiconsmap\symbol{"F288}} + \expandafter\def\csname simpleicon@puppeteericon\endcsname {\simpleiconsmap\symbol{"F289}} + \expandafter\def\csname simpleicon@purescripticon\endcsname {\simpleiconsmap\symbol{"F28A}} + \expandafter\def\csname simpleicon@purgecssicon\endcsname {\simpleiconsmap\symbol{"F28B}} + \expandafter\def\csname simpleicon@purismicon\endcsname {\simpleiconsmap\symbol{"F28C}} + \expandafter\def\csname simpleicon@pushbulleticon\endcsname {\simpleiconsmap\symbol{"F28D}} + \expandafter\def\csname simpleicon@pushericon\endcsname {\simpleiconsmap\symbol{"F28E}} + \expandafter\def\csname simpleicon@pwaicon\endcsname {\simpleiconsmap\symbol{"F28F}} + \expandafter\def\csname simpleicon@pycharmicon\endcsname {\simpleiconsmap\symbol{"F290}} + \expandafter\def\csname simpleicon@pycqaicon\endcsname {\simpleiconsmap\symbol{"F291}} + \expandafter\def\csname simpleicon@pydanticicon\endcsname {\simpleiconsmap\symbol{"F292}} + \expandafter\def\csname simpleicon@pygicon\endcsname {\simpleiconsmap\symbol{"F293}} + \expandafter\def\csname simpleicon@pypiicon\endcsname {\simpleiconsmap\symbol{"F294}} + \expandafter\def\csname simpleicon@pypyicon\endcsname {\simpleiconsmap\symbol{"F295}} + \expandafter\def\csname simpleicon@pyscaffoldicon\endcsname {\simpleiconsmap\symbol{"F296}} + \expandafter\def\csname simpleicon@pysyfticon\endcsname {\simpleiconsmap\symbol{"F297}} + \expandafter\def\csname simpleicon@pytesticon\endcsname {\simpleiconsmap\symbol{"F298}} + \expandafter\def\csname simpleicon@pythonicon\endcsname {\simpleiconsmap\symbol{"F299}} + \expandafter\def\csname simpleicon@pythonanywhereicon\endcsname {\simpleiconsmap\symbol{"F29A}} + \expandafter\def\csname simpleicon@pytorchicon\endcsname {\simpleiconsmap\symbol{"F29B}} + \expandafter\def\csname simpleicon@pyupicon\endcsname {\simpleiconsmap\symbol{"F29C}} + \expandafter\def\csname simpleicon@qantasicon\endcsname {\simpleiconsmap\symbol{"F29D}} + \expandafter\def\csname simpleicon@qaseicon\endcsname {\simpleiconsmap\symbol{"F29E}} + \expandafter\def\csname simpleicon@qatarairwaysicon\endcsname {\simpleiconsmap\symbol{"F29F}} + \expandafter\def\csname simpleicon@qbittorrenticon\endcsname {\simpleiconsmap\symbol{"F2A0}} + \expandafter\def\csname simpleicon@qemuicon\endcsname {\simpleiconsmap\symbol{"F2A1}} + \expandafter\def\csname simpleicon@qgisicon\endcsname {\simpleiconsmap\symbol{"F2A2}} + \expandafter\def\csname simpleicon@qiicon\endcsname {\simpleiconsmap\symbol{"F2A3}} + \expandafter\def\csname simpleicon@qiitaicon\endcsname {\simpleiconsmap\symbol{"F2A4}} + \expandafter\def\csname simpleicon@qiskiticon\endcsname {\simpleiconsmap\symbol{"F2A5}} + \expandafter\def\csname simpleicon@qiwiicon\endcsname {\simpleiconsmap\symbol{"F2A6}} + \expandafter\def\csname simpleicon@qlikicon\endcsname {\simpleiconsmap\symbol{"F2A7}} + \expandafter\def\csname simpleicon@qmkicon\endcsname {\simpleiconsmap\symbol{"F2A8}} + \expandafter\def\csname simpleicon@qnapicon\endcsname {\simpleiconsmap\symbol{"F2A9}} + \expandafter\def\csname simpleicon@qticon\endcsname {\simpleiconsmap\symbol{"F2AA}} + \expandafter\def\csname simpleicon@qualcommicon\endcsname {\simpleiconsmap\symbol{"F2AB}} + \expandafter\def\csname simpleicon@qualtricsicon\endcsname {\simpleiconsmap\symbol{"F2AC}} + \expandafter\def\csname simpleicon@qualysicon\endcsname {\simpleiconsmap\symbol{"F2AD}} + \expandafter\def\csname simpleicon@quantcasticon\endcsname {\simpleiconsmap\symbol{"F2AE}} + \expandafter\def\csname simpleicon@quantconnecticon\endcsname {\simpleiconsmap\symbol{"F2AF}} + \expandafter\def\csname simpleicon@quarkusicon\endcsname {\simpleiconsmap\symbol{"F2B0}} + \expandafter\def\csname simpleicon@quartoicon\endcsname {\simpleiconsmap\symbol{"F2B1}} + \expandafter\def\csname simpleicon@quasaricon\endcsname {\simpleiconsmap\symbol{"F2B2}} + \expandafter\def\csname simpleicon@qubesosicon\endcsname {\simpleiconsmap\symbol{"F2B3}} + \expandafter\def\csname simpleicon@questicon\endcsname {\simpleiconsmap\symbol{"F2B4}} + \expandafter\def\csname simpleicon@quickbooksicon\endcsname {\simpleiconsmap\symbol{"F2B5}} + \expandafter\def\csname simpleicon@quicklookicon\endcsname {\simpleiconsmap\symbol{"F2B6}} + \expandafter\def\csname simpleicon@quicktimeicon\endcsname {\simpleiconsmap\symbol{"F2B7}} + \expandafter\def\csname simpleicon@quicktypeicon\endcsname {\simpleiconsmap\symbol{"F2B8}} + \expandafter\def\csname simpleicon@quipicon\endcsname {\simpleiconsmap\symbol{"F2B9}} + \expandafter\def\csname simpleicon@quizleticon\endcsname {\simpleiconsmap\symbol{"F2BA}} + \expandafter\def\csname simpleicon@quoraicon\endcsname {\simpleiconsmap\symbol{"F2BB}} + \expandafter\def\csname simpleicon@qwanticon\endcsname {\simpleiconsmap\symbol{"F2BC}} + \expandafter\def\csname simpleicon@qwikicon\endcsname {\simpleiconsmap\symbol{"F2BD}} + \expandafter\def\csname simpleicon@qwiklabsicon\endcsname {\simpleiconsmap\symbol{"F2BE}} + \expandafter\def\csname simpleicon@qzoneicon\endcsname {\simpleiconsmap\symbol{"F2BF}} + \expandafter\def\csname simpleicon@ricon\endcsname {\simpleiconsmap\symbol{"F2C0}} + \expandafter\def\csname simpleicon@r3icon\endcsname {\simpleiconsmap\symbol{"F2C1}} + \expandafter\def\csname simpleicon@rabbitmqicon\endcsname {\simpleiconsmap\symbol{"F2C2}} + \expandafter\def\csname simpleicon@racketicon\endcsname {\simpleiconsmap\symbol{"F2C3}} + \expandafter\def\csname simpleicon@radaricon\endcsname {\simpleiconsmap\symbol{"F2C4}} + \expandafter\def\csname simpleicon@radarricon\endcsname {\simpleiconsmap\symbol{"F2C5}} + \expandafter\def\csname simpleicon@radiopublicicon\endcsname {\simpleiconsmap\symbol{"F2C6}} + \expandafter\def\csname simpleicon@radixuiicon\endcsname {\simpleiconsmap\symbol{"F2C7}} + \expandafter\def\csname simpleicon@radstudioicon\endcsname {\simpleiconsmap\symbol{"F2C8}} + \expandafter\def\csname simpleicon@railwayicon\endcsname {\simpleiconsmap\symbol{"F2C9}} + \expandafter\def\csname simpleicon@rainmetericon\endcsname {\simpleiconsmap\symbol{"F2CA}} + \expandafter\def\csname simpleicon@rakutenicon\endcsname {\simpleiconsmap\symbol{"F2CB}} + \expandafter\def\csname simpleicon@ramicon\endcsname {\simpleiconsmap\symbol{"F2CC}} + \expandafter\def\csname simpleicon@ranchericon\endcsname {\simpleiconsmap\symbol{"F2CD}} + \expandafter\def\csname simpleicon@rapidicon\endcsname {\simpleiconsmap\symbol{"F2CE}} + \expandafter\def\csname simpleicon@raribleicon\endcsname {\simpleiconsmap\symbol{"F2CF}} + \expandafter\def\csname simpleicon@rasaicon\endcsname {\simpleiconsmap\symbol{"F2D0}} + \expandafter\def\csname simpleicon@raspberrypiicon\endcsname {\simpleiconsmap\symbol{"F2D1}} + \expandafter\def\csname simpleicon@ravelryicon\endcsname {\simpleiconsmap\symbol{"F2D2}} + \expandafter\def\csname simpleicon@rayicon\endcsname {\simpleiconsmap\symbol{"F2D3}} + \expandafter\def\csname simpleicon@raycasticon\endcsname {\simpleiconsmap\symbol{"F2D4}} + \expandafter\def\csname simpleicon@raylibicon\endcsname {\simpleiconsmap\symbol{"F2D5}} + \expandafter\def\csname simpleicon@razericon\endcsname {\simpleiconsmap\symbol{"F2D6}} + \expandafter\def\csname simpleicon@razorpayicon\endcsname {\simpleiconsmap\symbol{"F2D7}} + \expandafter\def\csname simpleicon@rcloneicon\endcsname {\simpleiconsmap\symbol{"F2D8}} + \expandafter\def\csname simpleicon@reacticon\endcsname {\simpleiconsmap\symbol{"F2D9}} + \expandafter\def\csname simpleicon@reactbootstrapicon\endcsname {\simpleiconsmap\symbol{"F2DA}} + \expandafter\def\csname simpleicon@reacthookformicon\endcsname {\simpleiconsmap\symbol{"F2DB}} + \expandafter\def\csname simpleicon@reactiveresumeicon\endcsname {\simpleiconsmap\symbol{"F2DC}} + \expandafter\def\csname simpleicon@reactivexicon\endcsname {\simpleiconsmap\symbol{"F2DD}} + \expandafter\def\csname simpleicon@reactosicon\endcsname {\simpleiconsmap\symbol{"F2DE}} + \expandafter\def\csname simpleicon@reactqueryicon\endcsname {\simpleiconsmap\symbol{"F2DF}} + \expandafter\def\csname simpleicon@reactroutericon\endcsname {\simpleiconsmap\symbol{"F2E0}} + \expandafter\def\csname simpleicon@reacttableicon\endcsname {\simpleiconsmap\symbol{"F2E1}} + \expandafter\def\csname simpleicon@readdotcvicon\endcsname {\simpleiconsmap\symbol{"F2E2}} + \expandafter\def\csname simpleicon@readmeicon\endcsname {\simpleiconsmap\symbol{"F2E3}} + \expandafter\def\csname simpleicon@readthedocsicon\endcsname {\simpleiconsmap\symbol{"F2E4}} + \expandafter\def\csname simpleicon@realmicon\endcsname {\simpleiconsmap\symbol{"F2E5}} + \expandafter\def\csname simpleicon@reasonicon\endcsname {\simpleiconsmap\symbol{"F2E6}} + \expandafter\def\csname simpleicon@reasonstudiosicon\endcsname {\simpleiconsmap\symbol{"F2E7}} + \expandafter\def\csname simpleicon@recoilicon\endcsname {\simpleiconsmap\symbol{"F2E8}} + \expandafter\def\csname simpleicon@redicon\endcsname {\simpleiconsmap\symbol{"F2E9}} + \expandafter\def\csname simpleicon@redashicon\endcsname {\simpleiconsmap\symbol{"F2EA}} + \expandafter\def\csname simpleicon@redbubbleicon\endcsname {\simpleiconsmap\symbol{"F2EB}} + \expandafter\def\csname simpleicon@redbullicon\endcsname {\simpleiconsmap\symbol{"F2EC}} + \expandafter\def\csname simpleicon@redditicon\endcsname {\simpleiconsmap\symbol{"F2ED}} + \expandafter\def\csname simpleicon@redhaticon\endcsname {\simpleiconsmap\symbol{"F2EE}} + \expandafter\def\csname simpleicon@redhatopenshifticon\endcsname {\simpleiconsmap\symbol{"F2EF}} + \expandafter\def\csname simpleicon@redisicon\endcsname {\simpleiconsmap\symbol{"F2F0}} + \expandafter\def\csname simpleicon@redmineicon\endcsname {\simpleiconsmap\symbol{"F2F1}} + \expandafter\def\csname simpleicon@redoxicon\endcsname {\simpleiconsmap\symbol{"F2F2}} + \expandafter\def\csname simpleicon@redsysicon\endcsname {\simpleiconsmap\symbol{"F2F3}} + \expandafter\def\csname simpleicon@reduxicon\endcsname {\simpleiconsmap\symbol{"F2F4}} + \expandafter\def\csname simpleicon@reduxsagaicon\endcsname {\simpleiconsmap\symbol{"F2F5}} + \expandafter\def\csname simpleicon@redwoodjsicon\endcsname {\simpleiconsmap\symbol{"F2F6}} + \expandafter\def\csname simpleicon@reebokicon\endcsname {\simpleiconsmap\symbol{"F2F7}} + \expandafter\def\csname simpleicon@refineicon\endcsname {\simpleiconsmap\symbol{"F2F8}} + \expandafter\def\csname simpleicon@relayicon\endcsname {\simpleiconsmap\symbol{"F2F9}} + \expandafter\def\csname simpleicon@relianceindustrieslimitedicon\endcsname {\simpleiconsmap\symbol{"F2FA}} + \expandafter\def\csname simpleicon@remarkicon\endcsname {\simpleiconsmap\symbol{"F2FB}} + \expandafter\def\csname simpleicon@remedyentertainmenticon\endcsname {\simpleiconsmap\symbol{"F2FC}} + \expandafter\def\csname simpleicon@remixicon\endcsname {\simpleiconsmap\symbol{"F2FD}} + \expandafter\def\csname simpleicon@removedotbgicon\endcsname {\simpleiconsmap\symbol{"F2FE}} + \expandafter\def\csname simpleicon@renaulticon\endcsname {\simpleiconsmap\symbol{"F2FF}} + \expandafter\def\csname simpleicon@rendericon\endcsname {\simpleiconsmap\symbol{"F300}} + \expandafter\def\csname simpleicon@renovateicon\endcsname {\simpleiconsmap\symbol{"F301}} + \expandafter\def\csname simpleicon@renpyicon\endcsname {\simpleiconsmap\symbol{"F302}} + \expandafter\def\csname simpleicon@renrenicon\endcsname {\simpleiconsmap\symbol{"F303}} + \expandafter\def\csname simpleicon@repliticon\endcsname {\simpleiconsmap\symbol{"F304}} + \expandafter\def\csname simpleicon@republicofgamersicon\endcsname {\simpleiconsmap\symbol{"F305}} + \expandafter\def\csname simpleicon@rescripticon\endcsname {\simpleiconsmap\symbol{"F306}} + \expandafter\def\csname simpleicon@rescuetimeicon\endcsname {\simpleiconsmap\symbol{"F307}} + \expandafter\def\csname simpleicon@researchgateicon\endcsname {\simpleiconsmap\symbol{"F308}} + \expandafter\def\csname simpleicon@resendicon\endcsname {\simpleiconsmap\symbol{"F309}} + \expandafter\def\csname simpleicon@resharpericon\endcsname {\simpleiconsmap\symbol{"F30A}} + \expandafter\def\csname simpleicon@resurrectionremixosicon\endcsname {\simpleiconsmap\symbol{"F30B}} + \expandafter\def\csname simpleicon@retoolicon\endcsname {\simpleiconsmap\symbol{"F30C}} + \expandafter\def\csname simpleicon@retroarchicon\endcsname {\simpleiconsmap\symbol{"F30D}} + \expandafter\def\csname simpleicon@retropieicon\endcsname {\simpleiconsmap\symbol{"F30E}} + \expandafter\def\csname simpleicon@revancedicon\endcsname {\simpleiconsmap\symbol{"F30F}} + \expandafter\def\csname simpleicon@revealdotjsicon\endcsname {\simpleiconsmap\symbol{"F310}} + \expandafter\def\csname simpleicon@reverbnationicon\endcsname {\simpleiconsmap\symbol{"F311}} + \expandafter\def\csname simpleicon@revoltdotchaticon\endcsname {\simpleiconsmap\symbol{"F312}} + \expandafter\def\csname simpleicon@revoluticon\endcsname {\simpleiconsmap\symbol{"F313}} + \expandafter\def\csname simpleicon@revueicon\endcsname {\simpleiconsmap\symbol{"F314}} + \expandafter\def\csname simpleicon@reweicon\endcsname {\simpleiconsmap\symbol{"F315}} + \expandafter\def\csname simpleicon@rezgoicon\endcsname {\simpleiconsmap\symbol{"F316}} + \expandafter\def\csname simpleicon@rhinocerosicon\endcsname {\simpleiconsmap\symbol{"F317}} + \expandafter\def\csname simpleicon@richicon\endcsname {\simpleiconsmap\symbol{"F318}} + \expandafter\def\csname simpleicon@ridericon\endcsname {\simpleiconsmap\symbol{"F319}} + \expandafter\def\csname simpleicon@rimacautomobiliicon\endcsname {\simpleiconsmap\symbol{"F31A}} + \expandafter\def\csname simpleicon@rimeicon\endcsname {\simpleiconsmap\symbol{"F31B}} + \expandafter\def\csname simpleicon@ringicon\endcsname {\simpleiconsmap\symbol{"F31C}} + \expandafter\def\csname simpleicon@riotgamesicon\endcsname {\simpleiconsmap\symbol{"F31D}} + \expandafter\def\csname simpleicon@rippleicon\endcsname {\simpleiconsmap\symbol{"F31E}} + \expandafter\def\csname simpleicon@riscvicon\endcsname {\simpleiconsmap\symbol{"F31F}} + \expandafter\def\csname simpleicon@riseupicon\endcsname {\simpleiconsmap\symbol{"F320}} + \expandafter\def\csname simpleicon@ritzcarltonicon\endcsname {\simpleiconsmap\symbol{"F321}} + \expandafter\def\csname simpleicon@riveicon\endcsname {\simpleiconsmap\symbol{"F322}} + \expandafter\def\csname simpleicon@roadmapdotshicon\endcsname {\simpleiconsmap\symbol{"F323}} + \expandafter\def\csname simpleicon@roamresearchicon\endcsname {\simpleiconsmap\symbol{"F324}} + \expandafter\def\csname simpleicon@robinhoodicon\endcsname {\simpleiconsmap\symbol{"F325}} + \expandafter\def\csname simpleicon@robloxicon\endcsname {\simpleiconsmap\symbol{"F326}} + \expandafter\def\csname simpleicon@robloxstudioicon\endcsname {\simpleiconsmap\symbol{"F327}} + \expandafter\def\csname simpleicon@robotframeworkicon\endcsname {\simpleiconsmap\symbol{"F328}} + \expandafter\def\csname simpleicon@rocketicon\endcsname {\simpleiconsmap\symbol{"F329}} + \expandafter\def\csname simpleicon@rocketdotchaticon\endcsname {\simpleiconsmap\symbol{"F32A}} + \expandafter\def\csname simpleicon@rocksdbicon\endcsname {\simpleiconsmap\symbol{"F32B}} + \expandafter\def\csname simpleicon@rockstargamesicon\endcsname {\simpleiconsmap\symbol{"F32C}} + \expandafter\def\csname simpleicon@rockwellautomationicon\endcsname {\simpleiconsmap\symbol{"F32D}} + \expandafter\def\csname simpleicon@rockylinuxicon\endcsname {\simpleiconsmap\symbol{"F32E}} + \expandafter\def\csname simpleicon@rokuicon\endcsname {\simpleiconsmap\symbol{"F32F}} + \expandafter\def\csname simpleicon@roll20icon\endcsname {\simpleiconsmap\symbol{"F330}} + \expandafter\def\csname simpleicon@rollsroyceicon\endcsname {\simpleiconsmap\symbol{"F331}} + \expandafter\def\csname simpleicon@rollupdotjsicon\endcsname {\simpleiconsmap\symbol{"F332}} + \expandafter\def\csname simpleicon@roonicon\endcsname {\simpleiconsmap\symbol{"F333}} + \expandafter\def\csname simpleicon@rootmeicon\endcsname {\simpleiconsmap\symbol{"F334}} + \expandafter\def\csname simpleicon@rootsicon\endcsname {\simpleiconsmap\symbol{"F335}} + \expandafter\def\csname simpleicon@rootsbedrockicon\endcsname {\simpleiconsmap\symbol{"F336}} + \expandafter\def\csname simpleicon@rootssageicon\endcsname {\simpleiconsmap\symbol{"F337}} + \expandafter\def\csname simpleicon@rosicon\endcsname {\simpleiconsmap\symbol{"F338}} + \expandafter\def\csname simpleicon@rossmannicon\endcsname {\simpleiconsmap\symbol{"F339}} + \expandafter\def\csname simpleicon@rotaryinternationalicon\endcsname {\simpleiconsmap\symbol{"F33A}} + \expandafter\def\csname simpleicon@rottentomatoesicon\endcsname {\simpleiconsmap\symbol{"F33B}} + \expandafter\def\csname simpleicon@roundcubeicon\endcsname {\simpleiconsmap\symbol{"F33C}} + \expandafter\def\csname simpleicon@rsocketicon\endcsname {\simpleiconsmap\symbol{"F33D}} + \expandafter\def\csname simpleicon@rssicon\endcsname {\simpleiconsmap\symbol{"F33E}} + \expandafter\def\csname simpleicon@rstudioideicon\endcsname {\simpleiconsmap\symbol{"F33F}} + \expandafter\def\csname simpleicon@rteicon\endcsname {\simpleiconsmap\symbol{"F340}} + \expandafter\def\csname simpleicon@rtlicon\endcsname {\simpleiconsmap\symbol{"F341}} + \expandafter\def\csname simpleicon@rtlzweiicon\endcsname {\simpleiconsmap\symbol{"F342}} + \expandafter\def\csname simpleicon@rtmicon\endcsname {\simpleiconsmap\symbol{"F343}} + \expandafter\def\csname simpleicon@rubocopicon\endcsname {\simpleiconsmap\symbol{"F344}} + \expandafter\def\csname simpleicon@rubyicon\endcsname {\simpleiconsmap\symbol{"F345}} + \expandafter\def\csname simpleicon@rubygemsicon\endcsname {\simpleiconsmap\symbol{"F346}} + \expandafter\def\csname simpleicon@rubymineicon\endcsname {\simpleiconsmap\symbol{"F347}} + \expandafter\def\csname simpleicon@rubyonrailsicon\endcsname {\simpleiconsmap\symbol{"F348}} + \expandafter\def\csname simpleicon@rubysinatraicon\endcsname {\simpleiconsmap\symbol{"F349}} + \expandafter\def\csname simpleicon@rufficon\endcsname {\simpleiconsmap\symbol{"F34A}} + \expandafter\def\csname simpleicon@rumahwebicon\endcsname {\simpleiconsmap\symbol{"F34B}} + \expandafter\def\csname simpleicon@rumbleicon\endcsname {\simpleiconsmap\symbol{"F34C}} + \expandafter\def\csname simpleicon@rundeckicon\endcsname {\simpleiconsmap\symbol{"F34D}} + \expandafter\def\csname simpleicon@runkeepericon\endcsname {\simpleiconsmap\symbol{"F34E}} + \expandafter\def\csname simpleicon@runkiticon\endcsname {\simpleiconsmap\symbol{"F34F}} + \expandafter\def\csname simpleicon@runrundotiticon\endcsname {\simpleiconsmap\symbol{"F350}} + \expandafter\def\csname simpleicon@rusticon\endcsname {\simpleiconsmap\symbol{"F351}} + \expandafter\def\csname simpleicon@rustdeskicon\endcsname {\simpleiconsmap\symbol{"F352}} + \expandafter\def\csname simpleicon@rxdbicon\endcsname {\simpleiconsmap\symbol{"F353}} + \expandafter\def\csname simpleicon@ryanairicon\endcsname {\simpleiconsmap\symbol{"F354}} + \expandafter\def\csname simpleicon@ryeicon\endcsname {\simpleiconsmap\symbol{"F355}} + \expandafter\def\csname simpleicon@s7airlinesicon\endcsname {\simpleiconsmap\symbol{"F356}} + \expandafter\def\csname simpleicon@sabanciicon\endcsname {\simpleiconsmap\symbol{"F357}} + \expandafter\def\csname simpleicon@safariicon\endcsname {\simpleiconsmap\symbol{"F358}} + \expandafter\def\csname simpleicon@sageicon\endcsname {\simpleiconsmap\symbol{"F359}} + \expandafter\def\csname simpleicon@sahibindenicon\endcsname {\simpleiconsmap\symbol{"F35A}} + \expandafter\def\csname simpleicon@sailfishosicon\endcsname {\simpleiconsmap\symbol{"F35B}} + \expandafter\def\csname simpleicon@sailsdotjsicon\endcsname {\simpleiconsmap\symbol{"F35C}} + \expandafter\def\csname simpleicon@salesforceicon\endcsname {\simpleiconsmap\symbol{"F35D}} + \expandafter\def\csname simpleicon@sallaicon\endcsname {\simpleiconsmap\symbol{"F35E}} + \expandafter\def\csname simpleicon@saltprojecticon\endcsname {\simpleiconsmap\symbol{"F35F}} + \expandafter\def\csname simpleicon@samsclubicon\endcsname {\simpleiconsmap\symbol{"F360}} + \expandafter\def\csname simpleicon@samsungicon\endcsname {\simpleiconsmap\symbol{"F361}} + \expandafter\def\csname simpleicon@samsungpayicon\endcsname {\simpleiconsmap\symbol{"F362}} + \expandafter\def\csname simpleicon@sandiskicon\endcsname {\simpleiconsmap\symbol{"F363}} + \expandafter\def\csname simpleicon@sanfranciscomunicipalrailwayicon\endcsname {\simpleiconsmap\symbol{"F364}} + \expandafter\def\csname simpleicon@sanicicon\endcsname {\simpleiconsmap\symbol{"F365}} + \expandafter\def\csname simpleicon@sanityicon\endcsname {\simpleiconsmap\symbol{"F366}} + \expandafter\def\csname simpleicon@saopaulometroicon\endcsname {\simpleiconsmap\symbol{"F367}} + \expandafter\def\csname simpleicon@sapicon\endcsname {\simpleiconsmap\symbol{"F368}} + \expandafter\def\csname simpleicon@sartoriusicon\endcsname {\simpleiconsmap\symbol{"F369}} + \expandafter\def\csname simpleicon@sassicon\endcsname {\simpleiconsmap\symbol{"F36A}} + \expandafter\def\csname simpleicon@sat1icon\endcsname {\simpleiconsmap\symbol{"F36B}} + \expandafter\def\csname simpleicon@satelliteicon\endcsname {\simpleiconsmap\symbol{"F36C}} + \expandafter\def\csname simpleicon@saturnicon\endcsname {\simpleiconsmap\symbol{"F36D}} + \expandafter\def\csname simpleicon@saucelabsicon\endcsname {\simpleiconsmap\symbol{"F36E}} + \expandafter\def\csname simpleicon@saudiaicon\endcsname {\simpleiconsmap\symbol{"F36F}} + \expandafter\def\csname simpleicon@scalaicon\endcsname {\simpleiconsmap\symbol{"F370}} + \expandafter\def\csname simpleicon@scalewayicon\endcsname {\simpleiconsmap\symbol{"F371}} + \expandafter\def\csname simpleicon@scaniaicon\endcsname {\simpleiconsmap\symbol{"F372}} + \expandafter\def\csname simpleicon@schneiderelectricicon\endcsname {\simpleiconsmap\symbol{"F373}} + \expandafter\def\csname simpleicon@scikitlearnicon\endcsname {\simpleiconsmap\symbol{"F374}} + \expandafter\def\csname simpleicon@scilabicon\endcsname {\simpleiconsmap\symbol{"F375}} + \expandafter\def\csname simpleicon@scipyicon\endcsname {\simpleiconsmap\symbol{"F376}} + \expandafter\def\csname simpleicon@scopusicon\endcsname {\simpleiconsmap\symbol{"F377}} + \expandafter\def\csname simpleicon@scpfoundationicon\endcsname {\simpleiconsmap\symbol{"F378}} + \expandafter\def\csname simpleicon@scrapboxicon\endcsname {\simpleiconsmap\symbol{"F379}} + \expandafter\def\csname simpleicon@scrapyicon\endcsname {\simpleiconsmap\symbol{"F37A}} + \expandafter\def\csname simpleicon@scratchicon\endcsname {\simpleiconsmap\symbol{"F37B}} + \expandafter\def\csname simpleicon@screencastifyicon\endcsname {\simpleiconsmap\symbol{"F37C}} + \expandafter\def\csname simpleicon@scribdicon\endcsname {\simpleiconsmap\symbol{"F37D}} + \expandafter\def\csname simpleicon@scrimbaicon\endcsname {\simpleiconsmap\symbol{"F37E}} + \expandafter\def\csname simpleicon@scrollrevealicon\endcsname {\simpleiconsmap\symbol{"F37F}} + \expandafter\def\csname simpleicon@scrumallianceicon\endcsname {\simpleiconsmap\symbol{"F380}} + \expandafter\def\csname simpleicon@scrutinizerciicon\endcsname {\simpleiconsmap\symbol{"F381}} + \expandafter\def\csname simpleicon@scylladbicon\endcsname {\simpleiconsmap\symbol{"F382}} + \expandafter\def\csname simpleicon@seagateicon\endcsname {\simpleiconsmap\symbol{"F383}} + \expandafter\def\csname simpleicon@searxngicon\endcsname {\simpleiconsmap\symbol{"F384}} + \expandafter\def\csname simpleicon@seaticon\endcsname {\simpleiconsmap\symbol{"F385}} + \expandafter\def\csname simpleicon@seatgeekicon\endcsname {\simpleiconsmap\symbol{"F386}} + \expandafter\def\csname simpleicon@securityscorecardicon\endcsname {\simpleiconsmap\symbol{"F387}} + \expandafter\def\csname simpleicon@sefariaicon\endcsname {\simpleiconsmap\symbol{"F388}} + \expandafter\def\csname simpleicon@segaicon\endcsname {\simpleiconsmap\symbol{"F389}} + \expandafter\def\csname simpleicon@seleniumicon\endcsname {\simpleiconsmap\symbol{"F38A}} + \expandafter\def\csname simpleicon@sellfyicon\endcsname {\simpleiconsmap\symbol{"F38B}} + \expandafter\def\csname simpleicon@semanticreleaseicon\endcsname {\simpleiconsmap\symbol{"F38C}} + \expandafter\def\csname simpleicon@semanticscholaricon\endcsname {\simpleiconsmap\symbol{"F38D}} + \expandafter\def\csname simpleicon@semanticuiicon\endcsname {\simpleiconsmap\symbol{"F38E}} + \expandafter\def\csname simpleicon@semanticuireacticon\endcsname {\simpleiconsmap\symbol{"F38F}} + \expandafter\def\csname simpleicon@semanticwebicon\endcsname {\simpleiconsmap\symbol{"F390}} + \expandafter\def\csname simpleicon@semaphoreciicon\endcsname {\simpleiconsmap\symbol{"F391}} + \expandafter\def\csname simpleicon@semrushicon\endcsname {\simpleiconsmap\symbol{"F392}} + \expandafter\def\csname simpleicon@semvericon\endcsname {\simpleiconsmap\symbol{"F393}} + \expandafter\def\csname simpleicon@senchaicon\endcsname {\simpleiconsmap\symbol{"F394}} + \expandafter\def\csname simpleicon@sennheisericon\endcsname {\simpleiconsmap\symbol{"F395}} + \expandafter\def\csname simpleicon@sensuicon\endcsname {\simpleiconsmap\symbol{"F396}} + \expandafter\def\csname simpleicon@sentryicon\endcsname {\simpleiconsmap\symbol{"F397}} + \expandafter\def\csname simpleicon@sepaicon\endcsname {\simpleiconsmap\symbol{"F398}} + \expandafter\def\csname simpleicon@sequelizeicon\endcsname {\simpleiconsmap\symbol{"F399}} + \expandafter\def\csname simpleicon@serverfaulticon\endcsname {\simpleiconsmap\symbol{"F39A}} + \expandafter\def\csname simpleicon@serverlessicon\endcsname {\simpleiconsmap\symbol{"F39B}} + \expandafter\def\csname simpleicon@sessionicon\endcsname {\simpleiconsmap\symbol{"F39C}} + \expandafter\def\csname simpleicon@sessionizeicon\endcsname {\simpleiconsmap\symbol{"F39D}} + \expandafter\def\csname simpleicon@setappicon\endcsname {\simpleiconsmap\symbol{"F39E}} + \expandafter\def\csname simpleicon@sfmlicon\endcsname {\simpleiconsmap\symbol{"F39F}} + \expandafter\def\csname simpleicon@shadcnuiicon\endcsname {\simpleiconsmap\symbol{"F3A0}} + \expandafter\def\csname simpleicon@shadowicon\endcsname {\simpleiconsmap\symbol{"F3A1}} + \expandafter\def\csname simpleicon@shanghaimetroicon\endcsname {\simpleiconsmap\symbol{"F3A2}} + \expandafter\def\csname simpleicon@sharexicon\endcsname {\simpleiconsmap\symbol{"F3A3}} + \expandafter\def\csname simpleicon@sharpicon\endcsname {\simpleiconsmap\symbol{"F3A4}} + \expandafter\def\csname simpleicon@shazamicon\endcsname {\simpleiconsmap\symbol{"F3A5}} + \expandafter\def\csname simpleicon@shellicon\endcsname {\simpleiconsmap\symbol{"F3A6}} + \expandafter\def\csname simpleicon@shellyicon\endcsname {\simpleiconsmap\symbol{"F3A7}} + \expandafter\def\csname simpleicon@shenzhenmetroicon\endcsname {\simpleiconsmap\symbol{"F3A8}} + \expandafter\def\csname simpleicon@shieldsdotioicon\endcsname {\simpleiconsmap\symbol{"F3A9}} + \expandafter\def\csname simpleicon@shikimoriicon\endcsname {\simpleiconsmap\symbol{"F3AA}} + \expandafter\def\csname simpleicon@shopeeicon\endcsname {\simpleiconsmap\symbol{"F3AB}} + \expandafter\def\csname simpleicon@shopifyicon\endcsname {\simpleiconsmap\symbol{"F3AC}} + \expandafter\def\csname simpleicon@shopwareicon\endcsname {\simpleiconsmap\symbol{"F3AD}} + \expandafter\def\csname simpleicon@shortcuticon\endcsname {\simpleiconsmap\symbol{"F3AE}} + \expandafter\def\csname simpleicon@showpadicon\endcsname {\simpleiconsmap\symbol{"F3AF}} + \expandafter\def\csname simpleicon@showtimeicon\endcsname {\simpleiconsmap\symbol{"F3B0}} + \expandafter\def\csname simpleicon@showwcaseicon\endcsname {\simpleiconsmap\symbol{"F3B1}} + \expandafter\def\csname simpleicon@shutterstockicon\endcsname {\simpleiconsmap\symbol{"F3B2}} + \expandafter\def\csname simpleicon@sidekiqicon\endcsname {\simpleiconsmap\symbol{"F3B3}} + \expandafter\def\csname simpleicon@sidequesticon\endcsname {\simpleiconsmap\symbol{"F3B4}} + \expandafter\def\csname simpleicon@siemensicon\endcsname {\simpleiconsmap\symbol{"F3B5}} + \expandafter\def\csname simpleicon@sifiveicon\endcsname {\simpleiconsmap\symbol{"F3B6}} + \expandafter\def\csname simpleicon@signalicon\endcsname {\simpleiconsmap\symbol{"F3B7}} + \expandafter\def\csname simpleicon@similarwebicon\endcsname {\simpleiconsmap\symbol{"F3B8}} + \expandafter\def\csname simpleicon@simklicon\endcsname {\simpleiconsmap\symbol{"F3B9}} + \expandafter\def\csname simpleicon@simpleanalyticsicon\endcsname {\simpleiconsmap\symbol{"F3BA}} + \expandafter\def\csname simpleicon@simpleiconsicon\endcsname {\simpleiconsmap\symbol{"F3BB}} + \expandafter\def\csname simpleicon@simpleloginicon\endcsname {\simpleiconsmap\symbol{"F3BC}} + \expandafter\def\csname simpleicon@simplenoteicon\endcsname {\simpleiconsmap\symbol{"F3BD}} + \expandafter\def\csname simpleicon@sinaweiboicon\endcsname {\simpleiconsmap\symbol{"F3BE}} + \expandafter\def\csname simpleicon@singaporeairlinesicon\endcsname {\simpleiconsmap\symbol{"F3BF}} + \expandafter\def\csname simpleicon@singlestoreicon\endcsname {\simpleiconsmap\symbol{"F3C0}} + \expandafter\def\csname simpleicon@sitecoreicon\endcsname {\simpleiconsmap\symbol{"F3C1}} + \expandafter\def\csname simpleicon@sitepointicon\endcsname {\simpleiconsmap\symbol{"F3C2}} + \expandafter\def\csname simpleicon@siyuanicon\endcsname {\simpleiconsmap\symbol{"F3C3}} + \expandafter\def\csname simpleicon@skaffoldicon\endcsname {\simpleiconsmap\symbol{"F3C4}} + \expandafter\def\csname simpleicon@sketchicon\endcsname {\simpleiconsmap\symbol{"F3C5}} + \expandafter\def\csname simpleicon@sketchfabicon\endcsname {\simpleiconsmap\symbol{"F3C6}} + \expandafter\def\csname simpleicon@sketchupicon\endcsname {\simpleiconsmap\symbol{"F3C7}} + \expandafter\def\csname simpleicon@skillshareicon\endcsname {\simpleiconsmap\symbol{"F3C8}} + \expandafter\def\csname simpleicon@skodaicon\endcsname {\simpleiconsmap\symbol{"F3C9}} + \expandafter\def\csname simpleicon@skyicon\endcsname {\simpleiconsmap\symbol{"F3CA}} + \expandafter\def\csname simpleicon@skypackicon\endcsname {\simpleiconsmap\symbol{"F3CB}} + \expandafter\def\csname simpleicon@skyrockicon\endcsname {\simpleiconsmap\symbol{"F3CC}} + \expandafter\def\csname simpleicon@slackicon\endcsname {\simpleiconsmap\symbol{"F3CD}} + \expandafter\def\csname simpleicon@slackwareicon\endcsname {\simpleiconsmap\symbol{"F3CE}} + \expandafter\def\csname simpleicon@slashdoticon\endcsname {\simpleiconsmap\symbol{"F3CF}} + \expandafter\def\csname simpleicon@slickpicicon\endcsname {\simpleiconsmap\symbol{"F3D0}} + \expandafter\def\csname simpleicon@slidesicon\endcsname {\simpleiconsmap\symbol{"F3D1}} + \expandafter\def\csname simpleicon@slideshareicon\endcsname {\simpleiconsmap\symbol{"F3D2}} + \expandafter\def\csname simpleicon@slinticon\endcsname {\simpleiconsmap\symbol{"F3D3}} + \expandafter\def\csname simpleicon@smarticon\endcsname {\simpleiconsmap\symbol{"F3D4}} + \expandafter\def\csname simpleicon@smartthingsicon\endcsname {\simpleiconsmap\symbol{"F3D5}} + \expandafter\def\csname simpleicon@smashdotggicon\endcsname {\simpleiconsmap\symbol{"F3D6}} + \expandafter\def\csname simpleicon@smashingmagazineicon\endcsname {\simpleiconsmap\symbol{"F3D7}} + \expandafter\def\csname simpleicon@smrticon\endcsname {\simpleiconsmap\symbol{"F3D8}} + \expandafter\def\csname simpleicon@smugmugicon\endcsname {\simpleiconsmap\symbol{"F3D9}} + \expandafter\def\csname simpleicon@snapchaticon\endcsname {\simpleiconsmap\symbol{"F3DA}} + \expandafter\def\csname simpleicon@snapcrafticon\endcsname {\simpleiconsmap\symbol{"F3DB}} + \expandafter\def\csname simpleicon@sncficon\endcsname {\simpleiconsmap\symbol{"F3DC}} + \expandafter\def\csname simpleicon@snorticon\endcsname {\simpleiconsmap\symbol{"F3DD}} + \expandafter\def\csname simpleicon@snowflakeicon\endcsname {\simpleiconsmap\symbol{"F3DE}} + \expandafter\def\csname simpleicon@snowpackicon\endcsname {\simpleiconsmap\symbol{"F3DF}} + \expandafter\def\csname simpleicon@snykicon\endcsname {\simpleiconsmap\symbol{"F3E0}} + \expandafter\def\csname simpleicon@socialbladeicon\endcsname {\simpleiconsmap\symbol{"F3E1}} + \expandafter\def\csname simpleicon@society6icon\endcsname {\simpleiconsmap\symbol{"F3E2}} + \expandafter\def\csname simpleicon@socketdotioicon\endcsname {\simpleiconsmap\symbol{"F3E3}} + \expandafter\def\csname simpleicon@softpediaicon\endcsname {\simpleiconsmap\symbol{"F3E4}} + \expandafter\def\csname simpleicon@sogouicon\endcsname {\simpleiconsmap\symbol{"F3E5}} + \expandafter\def\csname simpleicon@solanaicon\endcsname {\simpleiconsmap\symbol{"F3E6}} + \expandafter\def\csname simpleicon@solidicon\endcsname {\simpleiconsmap\symbol{"F3E7}} + \expandafter\def\csname simpleicon@solidityicon\endcsname {\simpleiconsmap\symbol{"F3E8}} + \expandafter\def\csname simpleicon@sololearnicon\endcsname {\simpleiconsmap\symbol{"F3E9}} + \expandafter\def\csname simpleicon@solusicon\endcsname {\simpleiconsmap\symbol{"F3EA}} + \expandafter\def\csname simpleicon@sonaricon\endcsname {\simpleiconsmap\symbol{"F3EB}} + \expandafter\def\csname simpleicon@sonarcloudicon\endcsname {\simpleiconsmap\symbol{"F3EC}} + \expandafter\def\csname simpleicon@sonarlinticon\endcsname {\simpleiconsmap\symbol{"F3ED}} + \expandafter\def\csname simpleicon@sonarqubeicon\endcsname {\simpleiconsmap\symbol{"F3EE}} + \expandafter\def\csname simpleicon@sonarricon\endcsname {\simpleiconsmap\symbol{"F3EF}} + \expandafter\def\csname simpleicon@sonatypeicon\endcsname {\simpleiconsmap\symbol{"F3F0}} + \expandafter\def\csname simpleicon@songkickicon\endcsname {\simpleiconsmap\symbol{"F3F1}} + \expandafter\def\csname simpleicon@songodaicon\endcsname {\simpleiconsmap\symbol{"F3F2}} + \expandafter\def\csname simpleicon@sonicwallicon\endcsname {\simpleiconsmap\symbol{"F3F3}} + \expandafter\def\csname simpleicon@sonosicon\endcsname {\simpleiconsmap\symbol{"F3F4}} + \expandafter\def\csname simpleicon@sonyicon\endcsname {\simpleiconsmap\symbol{"F3F5}} + \expandafter\def\csname simpleicon@sorianaicon\endcsname {\simpleiconsmap\symbol{"F3F6}} + \expandafter\def\csname simpleicon@soundchartsicon\endcsname {\simpleiconsmap\symbol{"F3F7}} + \expandafter\def\csname simpleicon@soundcloudicon\endcsname {\simpleiconsmap\symbol{"F3F8}} + \expandafter\def\csname simpleicon@sourceengineicon\endcsname {\simpleiconsmap\symbol{"F3F9}} + \expandafter\def\csname simpleicon@sourceforgeicon\endcsname {\simpleiconsmap\symbol{"F3FA}} + \expandafter\def\csname simpleicon@sourcehuticon\endcsname {\simpleiconsmap\symbol{"F3FB}} + \expandafter\def\csname simpleicon@sourcetreeicon\endcsname {\simpleiconsmap\symbol{"F3FC}} + \expandafter\def\csname simpleicon@southwestairlinesicon\endcsname {\simpleiconsmap\symbol{"F3FD}} + \expandafter\def\csname simpleicon@spacemacsicon\endcsname {\simpleiconsmap\symbol{"F3FE}} + \expandafter\def\csname simpleicon@spaceshipicon\endcsname {\simpleiconsmap\symbol{"F3FF}} + \expandafter\def\csname simpleicon@spacexicon\endcsname {\simpleiconsmap\symbol{"F400}} + \expandafter\def\csname simpleicon@spacyicon\endcsname {\simpleiconsmap\symbol{"F401}} + \expandafter\def\csname simpleicon@sparkaricon\endcsname {\simpleiconsmap\symbol{"F402}} + \expandafter\def\csname simpleicon@sparkasseicon\endcsname {\simpleiconsmap\symbol{"F403}} + \expandafter\def\csname simpleicon@sparkfunicon\endcsname {\simpleiconsmap\symbol{"F404}} + \expandafter\def\csname simpleicon@sparkposticon\endcsname {\simpleiconsmap\symbol{"F405}} + \expandafter\def\csname simpleicon@spdxicon\endcsname {\simpleiconsmap\symbol{"F406}} + \expandafter\def\csname simpleicon@speakerdeckicon\endcsname {\simpleiconsmap\symbol{"F407}} + \expandafter\def\csname simpleicon@spectrumicon\endcsname {\simpleiconsmap\symbol{"F408}} + \expandafter\def\csname simpleicon@speedtesticon\endcsname {\simpleiconsmap\symbol{"F409}} + \expandafter\def\csname simpleicon@speedypageicon\endcsname {\simpleiconsmap\symbol{"F40A}} + \expandafter\def\csname simpleicon@sphinxicon\endcsname {\simpleiconsmap\symbol{"F40B}} + \expandafter\def\csname simpleicon@spigotmcicon\endcsname {\simpleiconsmap\symbol{"F40C}} + \expandafter\def\csname simpleicon@spineicon\endcsname {\simpleiconsmap\symbol{"F40D}} + \expandafter\def\csname simpleicon@spinnakericon\endcsname {\simpleiconsmap\symbol{"F40E}} + \expandafter\def\csname simpleicon@spinrillaicon\endcsname {\simpleiconsmap\symbol{"F40F}} + \expandafter\def\csname simpleicon@splunkicon\endcsname {\simpleiconsmap\symbol{"F410}} + \expandafter\def\csname simpleicon@spojicon\endcsname {\simpleiconsmap\symbol{"F411}} + \expandafter\def\csname simpleicon@spondicon\endcsname {\simpleiconsmap\symbol{"F412}} + \expandafter\def\csname simpleicon@spotifyicon\endcsname {\simpleiconsmap\symbol{"F413}} + \expandafter\def\csname simpleicon@spotlighticon\endcsname {\simpleiconsmap\symbol{"F414}} + \expandafter\def\csname simpleicon@spreadshirticon\endcsname {\simpleiconsmap\symbol{"F415}} + \expandafter\def\csname simpleicon@spreakericon\endcsname {\simpleiconsmap\symbol{"F416}} + \expandafter\def\csname simpleicon@springicon\endcsname {\simpleiconsmap\symbol{"F417}} + \expandafter\def\csname simpleicon@springcreatorsicon\endcsname {\simpleiconsmap\symbol{"F418}} + \expandafter\def\csname simpleicon@springbooticon\endcsname {\simpleiconsmap\symbol{"F419}} + \expandafter\def\csname simpleicon@springsecurityicon\endcsname {\simpleiconsmap\symbol{"F41A}} + \expandafter\def\csname simpleicon@spyderideicon\endcsname {\simpleiconsmap\symbol{"F41B}} + \expandafter\def\csname simpleicon@sqlalchemyicon\endcsname {\simpleiconsmap\symbol{"F41C}} + \expandafter\def\csname simpleicon@sqliteicon\endcsname {\simpleiconsmap\symbol{"F41D}} + \expandafter\def\csname simpleicon@squareicon\endcsname {\simpleiconsmap\symbol{"F41E}} + \expandafter\def\csname simpleicon@squareenixicon\endcsname {\simpleiconsmap\symbol{"F41F}} + \expandafter\def\csname simpleicon@squarespaceicon\endcsname {\simpleiconsmap\symbol{"F420}} + \expandafter\def\csname simpleicon@srgssricon\endcsname {\simpleiconsmap\symbol{"F421}} + \expandafter\def\csname simpleicon@ssrnicon\endcsname {\simpleiconsmap\symbol{"F422}} + \expandafter\def\csname simpleicon@ssticon\endcsname {\simpleiconsmap\symbol{"F423}} + \expandafter\def\csname simpleicon@stackbiticon\endcsname {\simpleiconsmap\symbol{"F424}} + \expandafter\def\csname simpleicon@stackblitzicon\endcsname {\simpleiconsmap\symbol{"F425}} + \expandafter\def\csname simpleicon@stackediticon\endcsname {\simpleiconsmap\symbol{"F426}} + \expandafter\def\csname simpleicon@stackexchangeicon\endcsname {\simpleiconsmap\symbol{"F427}} + \expandafter\def\csname simpleicon@stackhawkicon\endcsname {\simpleiconsmap\symbol{"F428}} + \expandafter\def\csname simpleicon@stackoverflowicon\endcsname {\simpleiconsmap\symbol{"F429}} + \expandafter\def\csname simpleicon@stackpathicon\endcsname {\simpleiconsmap\symbol{"F42A}} + \expandafter\def\csname simpleicon@stackshareicon\endcsname {\simpleiconsmap\symbol{"F42B}} + \expandafter\def\csname simpleicon@stadiaicon\endcsname {\simpleiconsmap\symbol{"F42C}} + \expandafter\def\csname simpleicon@staffbaseicon\endcsname {\simpleiconsmap\symbol{"F42D}} + \expandafter\def\csname simpleicon@stagetimericon\endcsname {\simpleiconsmap\symbol{"F42E}} + \expandafter\def\csname simpleicon@standardjsicon\endcsname {\simpleiconsmap\symbol{"F42F}} + \expandafter\def\csname simpleicon@standardresumeicon\endcsname {\simpleiconsmap\symbol{"F430}} + \expandafter\def\csname simpleicon@starbucksicon\endcsname {\simpleiconsmap\symbol{"F431}} + \expandafter\def\csname simpleicon@stardockicon\endcsname {\simpleiconsmap\symbol{"F432}} + \expandafter\def\csname simpleicon@starlingbankicon\endcsname {\simpleiconsmap\symbol{"F433}} + \expandafter\def\csname simpleicon@starshipicon\endcsname {\simpleiconsmap\symbol{"F434}} + \expandafter\def\csname simpleicon@startrekicon\endcsname {\simpleiconsmap\symbol{"F435}} + \expandafter\def\csname simpleicon@starzicon\endcsname {\simpleiconsmap\symbol{"F436}} + \expandafter\def\csname simpleicon@statamicicon\endcsname {\simpleiconsmap\symbol{"F437}} + \expandafter\def\csname simpleicon@statistaicon\endcsname {\simpleiconsmap\symbol{"F438}} + \expandafter\def\csname simpleicon@statuspageicon\endcsname {\simpleiconsmap\symbol{"F439}} + \expandafter\def\csname simpleicon@statuspalicon\endcsname {\simpleiconsmap\symbol{"F43A}} + \expandafter\def\csname simpleicon@steamicon\endcsname {\simpleiconsmap\symbol{"F43B}} + \expandafter\def\csname simpleicon@steamdbicon\endcsname {\simpleiconsmap\symbol{"F43C}} + \expandafter\def\csname simpleicon@steamdeckicon\endcsname {\simpleiconsmap\symbol{"F43D}} + \expandafter\def\csname simpleicon@steamworksicon\endcsname {\simpleiconsmap\symbol{"F43E}} + \expandafter\def\csname simpleicon@steelseriesicon\endcsname {\simpleiconsmap\symbol{"F43F}} + \expandafter\def\csname simpleicon@steemicon\endcsname {\simpleiconsmap\symbol{"F440}} + \expandafter\def\csname simpleicon@steemiticon\endcsname {\simpleiconsmap\symbol{"F441}} + \expandafter\def\csname simpleicon@steinbergicon\endcsname {\simpleiconsmap\symbol{"F442}} + \expandafter\def\csname simpleicon@stellaricon\endcsname {\simpleiconsmap\symbol{"F443}} + \expandafter\def\csname simpleicon@stencilicon\endcsname {\simpleiconsmap\symbol{"F444}} + \expandafter\def\csname simpleicon@stencylicon\endcsname {\simpleiconsmap\symbol{"F445}} + \expandafter\def\csname simpleicon@stimulusicon\endcsname {\simpleiconsmap\symbol{"F446}} + \expandafter\def\csname simpleicon@stitchericon\endcsname {\simpleiconsmap\symbol{"F447}} + \expandafter\def\csname simpleicon@stmicroelectronicsicon\endcsname {\simpleiconsmap\symbol{"F448}} + \expandafter\def\csname simpleicon@stockxicon\endcsname {\simpleiconsmap\symbol{"F449}} + \expandafter\def\csname simpleicon@stopstalkicon\endcsname {\simpleiconsmap\symbol{"F44A}} + \expandafter\def\csname simpleicon@storyblokicon\endcsname {\simpleiconsmap\symbol{"F44B}} + \expandafter\def\csname simpleicon@storybookicon\endcsname {\simpleiconsmap\symbol{"F44C}} + \expandafter\def\csname simpleicon@strapiicon\endcsname {\simpleiconsmap\symbol{"F44D}} + \expandafter\def\csname simpleicon@stravaicon\endcsname {\simpleiconsmap\symbol{"F44E}} + \expandafter\def\csname simpleicon@streamlabsicon\endcsname {\simpleiconsmap\symbol{"F44F}} + \expandafter\def\csname simpleicon@streamliticon\endcsname {\simpleiconsmap\symbol{"F450}} + \expandafter\def\csname simpleicon@streamrunnersicon\endcsname {\simpleiconsmap\symbol{"F451}} + \expandafter\def\csname simpleicon@stripeicon\endcsname {\simpleiconsmap\symbol{"F452}} + \expandafter\def\csname simpleicon@strongswanicon\endcsname {\simpleiconsmap\symbol{"F453}} + \expandafter\def\csname simpleicon@strykericon\endcsname {\simpleiconsmap\symbol{"F454}} + \expandafter\def\csname simpleicon@stubhubicon\endcsname {\simpleiconsmap\symbol{"F455}} + \expandafter\def\csname simpleicon@studio3ticon\endcsname {\simpleiconsmap\symbol{"F456}} + \expandafter\def\csname simpleicon@studyverseicon\endcsname {\simpleiconsmap\symbol{"F457}} + \expandafter\def\csname simpleicon@styledcomponentsicon\endcsname {\simpleiconsmap\symbol{"F458}} + \expandafter\def\csname simpleicon@stylelinticon\endcsname {\simpleiconsmap\symbol{"F459}} + \expandafter\def\csname simpleicon@styleshareicon\endcsname {\simpleiconsmap\symbol{"F45A}} + \expandafter\def\csname simpleicon@stylusicon\endcsname {\simpleiconsmap\symbol{"F45B}} + \expandafter\def\csname simpleicon@subaruicon\endcsname {\simpleiconsmap\symbol{"F45C}} + \expandafter\def\csname simpleicon@sublimetexticon\endcsname {\simpleiconsmap\symbol{"F45D}} + \expandafter\def\csname simpleicon@substackicon\endcsname {\simpleiconsmap\symbol{"F45E}} + \expandafter\def\csname simpleicon@subtitleediticon\endcsname {\simpleiconsmap\symbol{"F45F}} + \expandafter\def\csname simpleicon@subversionicon\endcsname {\simpleiconsmap\symbol{"F460}} + \expandafter\def\csname simpleicon@sucklessicon\endcsname {\simpleiconsmap\symbol{"F461}} + \expandafter\def\csname simpleicon@sumologicicon\endcsname {\simpleiconsmap\symbol{"F462}} + \expandafter\def\csname simpleicon@sunoicon\endcsname {\simpleiconsmap\symbol{"F463}} + \expandafter\def\csname simpleicon@sunriseicon\endcsname {\simpleiconsmap\symbol{"F464}} + \expandafter\def\csname simpleicon@supabaseicon\endcsname {\simpleiconsmap\symbol{"F465}} + \expandafter\def\csname simpleicon@supercreaseicon\endcsname {\simpleiconsmap\symbol{"F466}} + \expandafter\def\csname simpleicon@supermicroicon\endcsname {\simpleiconsmap\symbol{"F467}} + \expandafter\def\csname simpleicon@superusericon\endcsname {\simpleiconsmap\symbol{"F468}} + \expandafter\def\csname simpleicon@surrealdbicon\endcsname {\simpleiconsmap\symbol{"F469}} + \expandafter\def\csname simpleicon@surveymonkeyicon\endcsname {\simpleiconsmap\symbol{"F46A}} + \expandafter\def\csname simpleicon@suseicon\endcsname {\simpleiconsmap\symbol{"F46B}} + \expandafter\def\csname simpleicon@suzukiicon\endcsname {\simpleiconsmap\symbol{"F46C}} + \expandafter\def\csname simpleicon@svelteicon\endcsname {\simpleiconsmap\symbol{"F46D}} + \expandafter\def\csname simpleicon@svgicon\endcsname {\simpleiconsmap\symbol{"F46E}} + \expandafter\def\csname simpleicon@svgdotjsicon\endcsname {\simpleiconsmap\symbol{"F46F}} + \expandafter\def\csname simpleicon@svgoicon\endcsname {\simpleiconsmap\symbol{"F470}} + \expandafter\def\csname simpleicon@swaggericon\endcsname {\simpleiconsmap\symbol{"F471}} + \expandafter\def\csname simpleicon@swarmicon\endcsname {\simpleiconsmap\symbol{"F472}} + \expandafter\def\csname simpleicon@swcicon\endcsname {\simpleiconsmap\symbol{"F473}} + \expandafter\def\csname simpleicon@swifticon\endcsname {\simpleiconsmap\symbol{"F474}} + \expandafter\def\csname simpleicon@swiggyicon\endcsname {\simpleiconsmap\symbol{"F475}} + \expandafter\def\csname simpleicon@swipericon\endcsname {\simpleiconsmap\symbol{"F476}} + \expandafter\def\csname simpleicon@swricon\endcsname {\simpleiconsmap\symbol{"F477}} + \expandafter\def\csname simpleicon@symantecicon\endcsname {\simpleiconsmap\symbol{"F478}} + \expandafter\def\csname simpleicon@symbolabicon\endcsname {\simpleiconsmap\symbol{"F479}} + \expandafter\def\csname simpleicon@symfonyicon\endcsname {\simpleiconsmap\symbol{"F47A}} + \expandafter\def\csname simpleicon@symphonyicon\endcsname {\simpleiconsmap\symbol{"F47B}} + \expandafter\def\csname simpleicon@sympyicon\endcsname {\simpleiconsmap\symbol{"F47C}} + \expandafter\def\csname simpleicon@syncthingicon\endcsname {\simpleiconsmap\symbol{"F47D}} + \expandafter\def\csname simpleicon@synologyicon\endcsname {\simpleiconsmap\symbol{"F47E}} + \expandafter\def\csname simpleicon@system76icon\endcsname {\simpleiconsmap\symbol{"F47F}} + \expandafter\def\csname simpleicon@tabelogicon\endcsname {\simpleiconsmap\symbol{"F480}} + \expandafter\def\csname simpleicon@tableauicon\endcsname {\simpleiconsmap\symbol{"F481}} + \expandafter\def\csname simpleicon@tablecheckicon\endcsname {\simpleiconsmap\symbol{"F482}} + \expandafter\def\csname simpleicon@tacobellicon\endcsname {\simpleiconsmap\symbol{"F483}} + \expandafter\def\csname simpleicon@tadoicon\endcsname {\simpleiconsmap\symbol{"F484}} + \expandafter\def\csname simpleicon@taichigraphicsicon\endcsname {\simpleiconsmap\symbol{"F485}} + \expandafter\def\csname simpleicon@taichilangicon\endcsname {\simpleiconsmap\symbol{"F486}} + \expandafter\def\csname simpleicon@tailsicon\endcsname {\simpleiconsmap\symbol{"F487}} + \expandafter\def\csname simpleicon@tailscaleicon\endcsname {\simpleiconsmap\symbol{"F488}} + \expandafter\def\csname simpleicon@tailwindcssicon\endcsname {\simpleiconsmap\symbol{"F489}} + \expandafter\def\csname simpleicon@taipyicon\endcsname {\simpleiconsmap\symbol{"F48A}} + \expandafter\def\csname simpleicon@taketwointeractivesoftwareicon\endcsname {\simpleiconsmap\symbol{"F48B}} + \expandafter\def\csname simpleicon@talendicon\endcsname {\simpleiconsmap\symbol{"F48C}} + \expandafter\def\csname simpleicon@talenthouseicon\endcsname {\simpleiconsmap\symbol{"F48D}} + \expandafter\def\csname simpleicon@talosicon\endcsname {\simpleiconsmap\symbol{"F48E}} + \expandafter\def\csname simpleicon@tamiyaicon\endcsname {\simpleiconsmap\symbol{"F48F}} + \expandafter\def\csname simpleicon@tampermonkeyicon\endcsname {\simpleiconsmap\symbol{"F490}} + \expandafter\def\csname simpleicon@taobaoicon\endcsname {\simpleiconsmap\symbol{"F491}} + \expandafter\def\csname simpleicon@tapasicon\endcsname {\simpleiconsmap\symbol{"F492}} + \expandafter\def\csname simpleicon@targeticon\endcsname {\simpleiconsmap\symbol{"F493}} + \expandafter\def\csname simpleicon@taskicon\endcsname {\simpleiconsmap\symbol{"F494}} + \expandafter\def\csname simpleicon@tasmotaicon\endcsname {\simpleiconsmap\symbol{"F495}} + \expandafter\def\csname simpleicon@tataicon\endcsname {\simpleiconsmap\symbol{"F496}} + \expandafter\def\csname simpleicon@tauriicon\endcsname {\simpleiconsmap\symbol{"F497}} + \expandafter\def\csname simpleicon@taxbuzzicon\endcsname {\simpleiconsmap\symbol{"F498}} + \expandafter\def\csname simpleicon@tcsicon\endcsname {\simpleiconsmap\symbol{"F499}} + \expandafter\def\csname simpleicon@tealicon\endcsname {\simpleiconsmap\symbol{"F49A}} + \expandafter\def\csname simpleicon@teamcityicon\endcsname {\simpleiconsmap\symbol{"F49B}} + \expandafter\def\csname simpleicon@teamspeakicon\endcsname {\simpleiconsmap\symbol{"F49C}} + \expandafter\def\csname simpleicon@teamviewericon\endcsname {\simpleiconsmap\symbol{"F49D}} + \expandafter\def\csname simpleicon@techcrunchicon\endcsname {\simpleiconsmap\symbol{"F49E}} + \expandafter\def\csname simpleicon@tedicon\endcsname {\simpleiconsmap\symbol{"F49F}} + \expandafter\def\csname simpleicon@teepublicicon\endcsname {\simpleiconsmap\symbol{"F4A0}} + \expandafter\def\csname simpleicon@teespringicon\endcsname {\simpleiconsmap\symbol{"F4A1}} + \expandafter\def\csname simpleicon@tektonicon\endcsname {\simpleiconsmap\symbol{"F4A2}} + \expandafter\def\csname simpleicon@tele5icon\endcsname {\simpleiconsmap\symbol{"F4A3}} + \expandafter\def\csname simpleicon@telegramicon\endcsname {\simpleiconsmap\symbol{"F4A4}} + \expandafter\def\csname simpleicon@telegraphicon\endcsname {\simpleiconsmap\symbol{"F4A5}} + \expandafter\def\csname simpleicon@telequebecicon\endcsname {\simpleiconsmap\symbol{"F4A6}} + \expandafter\def\csname simpleicon@temporalicon\endcsname {\simpleiconsmap\symbol{"F4A7}} + \expandafter\def\csname simpleicon@tencentqqicon\endcsname {\simpleiconsmap\symbol{"F4A8}} + \expandafter\def\csname simpleicon@tensorflowicon\endcsname {\simpleiconsmap\symbol{"F4A9}} + \expandafter\def\csname simpleicon@teradataicon\endcsname {\simpleiconsmap\symbol{"F4AA}} + \expandafter\def\csname simpleicon@teratailicon\endcsname {\simpleiconsmap\symbol{"F4AB}} + \expandafter\def\csname simpleicon@termiusicon\endcsname {\simpleiconsmap\symbol{"F4AC}} + \expandafter\def\csname simpleicon@terraformicon\endcsname {\simpleiconsmap\symbol{"F4AD}} + \expandafter\def\csname simpleicon@tescoicon\endcsname {\simpleiconsmap\symbol{"F4AE}} + \expandafter\def\csname simpleicon@teslaicon\endcsname {\simpleiconsmap\symbol{"F4AF}} + \expandafter\def\csname simpleicon@testcafeicon\endcsname {\simpleiconsmap\symbol{"F4B0}} + \expandafter\def\csname simpleicon@testinicon\endcsname {\simpleiconsmap\symbol{"F4B1}} + \expandafter\def\csname simpleicon@testinglibraryicon\endcsname {\simpleiconsmap\symbol{"F4B2}} + \expandafter\def\csname simpleicon@testrailicon\endcsname {\simpleiconsmap\symbol{"F4B3}} + \expandafter\def\csname simpleicon@tethericon\endcsname {\simpleiconsmap\symbol{"F4B4}} + \expandafter\def\csname simpleicon@textpatternicon\endcsname {\simpleiconsmap\symbol{"F4B5}} + \expandafter\def\csname simpleicon@tgaicon\endcsname {\simpleiconsmap\symbol{"F4B6}} + \expandafter\def\csname simpleicon@thangsicon\endcsname {\simpleiconsmap\symbol{"F4B7}} + \expandafter\def\csname simpleicon@thealgorithmsicon\endcsname {\simpleiconsmap\symbol{"F4B8}} + \expandafter\def\csname simpleicon@theboringcompanyicon\endcsname {\simpleiconsmap\symbol{"F4B9}} + \expandafter\def\csname simpleicon@theconversationicon\endcsname {\simpleiconsmap\symbol{"F4BA}} + \expandafter\def\csname simpleicon@thefinalsicon\endcsname {\simpleiconsmap\symbol{"F4BB}} + \expandafter\def\csname simpleicon@theirishtimesicon\endcsname {\simpleiconsmap\symbol{"F4BC}} + \expandafter\def\csname simpleicon@themightyicon\endcsname {\simpleiconsmap\symbol{"F4BD}} + \expandafter\def\csname simpleicon@themodelsresourceicon\endcsname {\simpleiconsmap\symbol{"F4BE}} + \expandafter\def\csname simpleicon@themoviedatabaseicon\endcsname {\simpleiconsmap\symbol{"F4BF}} + \expandafter\def\csname simpleicon@thenorthfaceicon\endcsname {\simpleiconsmap\symbol{"F4C0}} + \expandafter\def\csname simpleicon@theodinprojecticon\endcsname {\simpleiconsmap\symbol{"F4C1}} + \expandafter\def\csname simpleicon@theregistericon\endcsname {\simpleiconsmap\symbol{"F4C2}} + \expandafter\def\csname simpleicon@thesoundsresourceicon\endcsname {\simpleiconsmap\symbol{"F4C3}} + \expandafter\def\csname simpleicon@thespritersresourceicon\endcsname {\simpleiconsmap\symbol{"F4C4}} + \expandafter\def\csname simpleicon@thewashingtonposticon\endcsname {\simpleiconsmap\symbol{"F4C5}} + \expandafter\def\csname simpleicon@thingiverseicon\endcsname {\simpleiconsmap\symbol{"F4C6}} + \expandafter\def\csname simpleicon@thinkpadicon\endcsname {\simpleiconsmap\symbol{"F4C7}} + \expandafter\def\csname simpleicon@thirdwebicon\endcsname {\simpleiconsmap\symbol{"F4C8}} + \expandafter\def\csname simpleicon@threadlessicon\endcsname {\simpleiconsmap\symbol{"F4C9}} + \expandafter\def\csname simpleicon@threadsicon\endcsname {\simpleiconsmap\symbol{"F4CA}} + \expandafter\def\csname simpleicon@threedotjsicon\endcsname {\simpleiconsmap\symbol{"F4CB}} + \expandafter\def\csname simpleicon@threemaicon\endcsname {\simpleiconsmap\symbol{"F4CC}} + \expandafter\def\csname simpleicon@thumbtackicon\endcsname {\simpleiconsmap\symbol{"F4CD}} + \expandafter\def\csname simpleicon@thunderbirdicon\endcsname {\simpleiconsmap\symbol{"F4CE}} + \expandafter\def\csname simpleicon@thunderstoreicon\endcsname {\simpleiconsmap\symbol{"F4CF}} + \expandafter\def\csname simpleicon@thurgauerkantonalbankicon\endcsname {\simpleiconsmap\symbol{"F4D0}} + \expandafter\def\csname simpleicon@thymeleaficon\endcsname {\simpleiconsmap\symbol{"F4D1}} + \expandafter\def\csname simpleicon@ticketmastericon\endcsname {\simpleiconsmap\symbol{"F4D2}} + \expandafter\def\csname simpleicon@ticktickicon\endcsname {\simpleiconsmap\symbol{"F4D3}} + \expandafter\def\csname simpleicon@tidalicon\endcsname {\simpleiconsmap\symbol{"F4D4}} + \expandafter\def\csname simpleicon@tiddlywikiicon\endcsname {\simpleiconsmap\symbol{"F4D5}} + \expandafter\def\csname simpleicon@tideicon\endcsname {\simpleiconsmap\symbol{"F4D6}} + \expandafter\def\csname simpleicon@tidyverseicon\endcsname {\simpleiconsmap\symbol{"F4D7}} + \expandafter\def\csname simpleicon@tietoevryicon\endcsname {\simpleiconsmap\symbol{"F4D8}} + \expandafter\def\csname simpleicon@tiktokicon\endcsname {\simpleiconsmap\symbol{"F4D9}} + \expandafter\def\csname simpleicon@tildapublishingicon\endcsname {\simpleiconsmap\symbol{"F4DA}} + \expandafter\def\csname simpleicon@tileicon\endcsname {\simpleiconsmap\symbol{"F4DB}} + \expandafter\def\csname simpleicon@timescaleicon\endcsname {\simpleiconsmap\symbol{"F4DC}} + \expandafter\def\csname simpleicon@tinaicon\endcsname {\simpleiconsmap\symbol{"F4DD}} + \expandafter\def\csname simpleicon@tindericon\endcsname {\simpleiconsmap\symbol{"F4DE}} + \expandafter\def\csname simpleicon@tindieicon\endcsname {\simpleiconsmap\symbol{"F4DF}} + \expandafter\def\csname simpleicon@tinkercadicon\endcsname {\simpleiconsmap\symbol{"F4E0}} + \expandafter\def\csname simpleicon@tinygradicon\endcsname {\simpleiconsmap\symbol{"F4E1}} + \expandafter\def\csname simpleicon@tinylettericon\endcsname {\simpleiconsmap\symbol{"F4E2}} + \expandafter\def\csname simpleicon@tistoryicon\endcsname {\simpleiconsmap\symbol{"F4E3}} + \expandafter\def\csname simpleicon@tldrawicon\endcsname {\simpleiconsmap\symbol{"F4E4}} + \expandafter\def\csname simpleicon@tmobileicon\endcsname {\simpleiconsmap\symbol{"F4E5}} + \expandafter\def\csname simpleicon@tmuxicon\endcsname {\simpleiconsmap\symbol{"F4E6}} + \expandafter\def\csname simpleicon@todoisticon\endcsname {\simpleiconsmap\symbol{"F4E7}} + \expandafter\def\csname simpleicon@togglicon\endcsname {\simpleiconsmap\symbol{"F4E8}} + \expandafter\def\csname simpleicon@toggltrackicon\endcsname {\simpleiconsmap\symbol{"F4E9}} + \expandafter\def\csname simpleicon@tokyometroicon\endcsname {\simpleiconsmap\symbol{"F4EA}} + \expandafter\def\csname simpleicon@tollicon\endcsname {\simpleiconsmap\symbol{"F4EB}} + \expandafter\def\csname simpleicon@tomlicon\endcsname {\simpleiconsmap\symbol{"F4EC}} + \expandafter\def\csname simpleicon@tomorrowlandicon\endcsname {\simpleiconsmap\symbol{"F4ED}} + \expandafter\def\csname simpleicon@tonicon\endcsname {\simpleiconsmap\symbol{"F4EE}} + \expandafter\def\csname simpleicon@topcodericon\endcsname {\simpleiconsmap\symbol{"F4EF}} + \expandafter\def\csname simpleicon@topdotggicon\endcsname {\simpleiconsmap\symbol{"F4F0}} + \expandafter\def\csname simpleicon@toptalicon\endcsname {\simpleiconsmap\symbol{"F4F1}} + \expandafter\def\csname simpleicon@torbrowsericon\endcsname {\simpleiconsmap\symbol{"F4F2}} + \expandafter\def\csname simpleicon@torprojecticon\endcsname {\simpleiconsmap\symbol{"F4F3}} + \expandafter\def\csname simpleicon@toshibaicon\endcsname {\simpleiconsmap\symbol{"F4F4}} + \expandafter\def\csname simpleicon@totvsicon\endcsname {\simpleiconsmap\symbol{"F4F5}} + \expandafter\def\csname simpleicon@tourboxicon\endcsname {\simpleiconsmap\symbol{"F4F6}} + \expandafter\def\csname simpleicon@towericon\endcsname {\simpleiconsmap\symbol{"F4F7}} + \expandafter\def\csname simpleicon@toyotaicon\endcsname {\simpleiconsmap\symbol{"F4F8}} + \expandafter\def\csname simpleicon@tplinkicon\endcsname {\simpleiconsmap\symbol{"F4F9}} + \expandafter\def\csname simpleicon@tqdmicon\endcsname {\simpleiconsmap\symbol{"F4FA}} + \expandafter\def\csname simpleicon@traccaricon\endcsname {\simpleiconsmap\symbol{"F4FB}} + \expandafter\def\csname simpleicon@tradingviewicon\endcsname {\simpleiconsmap\symbol{"F4FC}} + \expandafter\def\csname simpleicon@traefikmeshicon\endcsname {\simpleiconsmap\symbol{"F4FD}} + \expandafter\def\csname simpleicon@traefikproxyicon\endcsname {\simpleiconsmap\symbol{"F4FE}} + \expandafter\def\csname simpleicon@trailforksicon\endcsname {\simpleiconsmap\symbol{"F4FF}} + \expandafter\def\csname simpleicon@trainerroadicon\endcsname {\simpleiconsmap\symbol{"F500}} + \expandafter\def\csname simpleicon@trakticon\endcsname {\simpleiconsmap\symbol{"F501}} + \expandafter\def\csname simpleicon@transifexicon\endcsname {\simpleiconsmap\symbol{"F502}} + \expandafter\def\csname simpleicon@transmissionicon\endcsname {\simpleiconsmap\symbol{"F503}} + \expandafter\def\csname simpleicon@transportforirelandicon\endcsname {\simpleiconsmap\symbol{"F504}} + \expandafter\def\csname simpleicon@transportforlondonicon\endcsname {\simpleiconsmap\symbol{"F505}} + \expandafter\def\csname simpleicon@travisciicon\endcsname {\simpleiconsmap\symbol{"F506}} + \expandafter\def\csname simpleicon@treehouseicon\endcsname {\simpleiconsmap\symbol{"F507}} + \expandafter\def\csname simpleicon@trelloicon\endcsname {\simpleiconsmap\symbol{"F508}} + \expandafter\def\csname simpleicon@trendmicroicon\endcsname {\simpleiconsmap\symbol{"F509}} + \expandafter\def\csname simpleicon@treyarchicon\endcsname {\simpleiconsmap\symbol{"F50A}} + \expandafter\def\csname simpleicon@tricentisicon\endcsname {\simpleiconsmap\symbol{"F50B}} + \expandafter\def\csname simpleicon@triliumicon\endcsname {\simpleiconsmap\symbol{"F50C}} + \expandafter\def\csname simpleicon@trillericon\endcsname {\simpleiconsmap\symbol{"F50D}} + \expandafter\def\csname simpleicon@trillertvicon\endcsname {\simpleiconsmap\symbol{"F50E}} + \expandafter\def\csname simpleicon@trinoicon\endcsname {\simpleiconsmap\symbol{"F50F}} + \expandafter\def\csname simpleicon@tripadvisoricon\endcsname {\simpleiconsmap\symbol{"F510}} + \expandafter\def\csname simpleicon@tripdotcomicon\endcsname {\simpleiconsmap\symbol{"F511}} + \expandafter\def\csname simpleicon@trivagoicon\endcsname {\simpleiconsmap\symbol{"F512}} + \expandafter\def\csname simpleicon@trivyicon\endcsname {\simpleiconsmap\symbol{"F513}} + \expandafter\def\csname simpleicon@troveicon\endcsname {\simpleiconsmap\symbol{"F514}} + \expandafter\def\csname simpleicon@trpcicon\endcsname {\simpleiconsmap\symbol{"F515}} + \expandafter\def\csname simpleicon@truenasicon\endcsname {\simpleiconsmap\symbol{"F516}} + \expandafter\def\csname simpleicon@trueupicon\endcsname {\simpleiconsmap\symbol{"F517}} + \expandafter\def\csname simpleicon@truliaicon\endcsname {\simpleiconsmap\symbol{"F518}} + \expandafter\def\csname simpleicon@trustedshopsicon\endcsname {\simpleiconsmap\symbol{"F519}} + \expandafter\def\csname simpleicon@trustpiloticon\endcsname {\simpleiconsmap\symbol{"F51A}} + \expandafter\def\csname simpleicon@tryhackmeicon\endcsname {\simpleiconsmap\symbol{"F51B}} + \expandafter\def\csname simpleicon@tryitonlineicon\endcsname {\simpleiconsmap\symbol{"F51C}} + \expandafter\def\csname simpleicon@tsnodeicon\endcsname {\simpleiconsmap\symbol{"F51D}} + \expandafter\def\csname simpleicon@tubiicon\endcsname {\simpleiconsmap\symbol{"F51E}} + \expandafter\def\csname simpleicon@tuiicon\endcsname {\simpleiconsmap\symbol{"F51F}} + \expandafter\def\csname simpleicon@tumblricon\endcsname {\simpleiconsmap\symbol{"F520}} + \expandafter\def\csname simpleicon@tuneinicon\endcsname {\simpleiconsmap\symbol{"F521}} + \expandafter\def\csname simpleicon@turboicon\endcsname {\simpleiconsmap\symbol{"F522}} + \expandafter\def\csname simpleicon@turborepoicon\endcsname {\simpleiconsmap\symbol{"F523}} + \expandafter\def\csname simpleicon@turbosquidicon\endcsname {\simpleiconsmap\symbol{"F524}} + \expandafter\def\csname simpleicon@turkishairlinesicon\endcsname {\simpleiconsmap\symbol{"F525}} + \expandafter\def\csname simpleicon@tursoicon\endcsname {\simpleiconsmap\symbol{"F526}} + \expandafter\def\csname simpleicon@tutanotaicon\endcsname {\simpleiconsmap\symbol{"F527}} + \expandafter\def\csname simpleicon@tv4playicon\endcsname {\simpleiconsmap\symbol{"F528}} + \expandafter\def\csname simpleicon@tvtimeicon\endcsname {\simpleiconsmap\symbol{"F529}} + \expandafter\def\csname simpleicon@twilioicon\endcsname {\simpleiconsmap\symbol{"F52A}} + \expandafter\def\csname simpleicon@twinklyicon\endcsname {\simpleiconsmap\symbol{"F52B}} + \expandafter\def\csname simpleicon@twinmotionicon\endcsname {\simpleiconsmap\symbol{"F52C}} + \expandafter\def\csname simpleicon@twitchicon\endcsname {\simpleiconsmap\symbol{"F52D}} + \expandafter\def\csname simpleicon@typeformicon\endcsname {\simpleiconsmap\symbol{"F52E}} + \expandafter\def\csname simpleicon@typeormicon\endcsname {\simpleiconsmap\symbol{"F52F}} + \expandafter\def\csname simpleicon@typericon\endcsname {\simpleiconsmap\symbol{"F530}} + \expandafter\def\csname simpleicon@typescripticon\endcsname {\simpleiconsmap\symbol{"F531}} + \expandafter\def\csname simpleicon@typo3icon\endcsname {\simpleiconsmap\symbol{"F532}} + \expandafter\def\csname simpleicon@typsticon\endcsname {\simpleiconsmap\symbol{"F533}} + \expandafter\def\csname simpleicon@ubericon\endcsname {\simpleiconsmap\symbol{"F534}} + \expandafter\def\csname simpleicon@ubereatsicon\endcsname {\simpleiconsmap\symbol{"F535}} + \expandafter\def\csname simpleicon@ubiquitiicon\endcsname {\simpleiconsmap\symbol{"F536}} + \expandafter\def\csname simpleicon@ubisofticon\endcsname {\simpleiconsmap\symbol{"F537}} + \expandafter\def\csname simpleicon@ublockoriginicon\endcsname {\simpleiconsmap\symbol{"F538}} + \expandafter\def\csname simpleicon@ubuntuicon\endcsname {\simpleiconsmap\symbol{"F539}} + \expandafter\def\csname simpleicon@ubuntumateicon\endcsname {\simpleiconsmap\symbol{"F53A}} + \expandafter\def\csname simpleicon@udacityicon\endcsname {\simpleiconsmap\symbol{"F53B}} + \expandafter\def\csname simpleicon@udemyicon\endcsname {\simpleiconsmap\symbol{"F53C}} + \expandafter\def\csname simpleicon@ufcicon\endcsname {\simpleiconsmap\symbol{"F53D}} + \expandafter\def\csname simpleicon@uikiticon\endcsname {\simpleiconsmap\symbol{"F53E}} + \expandafter\def\csname simpleicon@uipathicon\endcsname {\simpleiconsmap\symbol{"F53F}} + \expandafter\def\csname simpleicon@ululeicon\endcsname {\simpleiconsmap\symbol{"F540}} + \expandafter\def\csname simpleicon@umamiicon\endcsname {\simpleiconsmap\symbol{"F541}} + \expandafter\def\csname simpleicon@umbracoicon\endcsname {\simpleiconsmap\symbol{"F542}} + \expandafter\def\csname simpleicon@umlicon\endcsname {\simpleiconsmap\symbol{"F543}} + \expandafter\def\csname simpleicon@unacademyicon\endcsname {\simpleiconsmap\symbol{"F544}} + \expandafter\def\csname simpleicon@underarmouricon\endcsname {\simpleiconsmap\symbol{"F545}} + \expandafter\def\csname simpleicon@underscoredotjsicon\endcsname {\simpleiconsmap\symbol{"F546}} + \expandafter\def\csname simpleicon@undertaleicon\endcsname {\simpleiconsmap\symbol{"F547}} + \expandafter\def\csname simpleicon@unicodeicon\endcsname {\simpleiconsmap\symbol{"F548}} + \expandafter\def\csname simpleicon@unilevericon\endcsname {\simpleiconsmap\symbol{"F549}} + \expandafter\def\csname simpleicon@uniqloicon\endcsname {\simpleiconsmap\symbol{"F54A}} + \expandafter\def\csname simpleicon@uniqlojaicon\endcsname {\simpleiconsmap\symbol{"F54B}} + \expandafter\def\csname simpleicon@unitedairlinesicon\endcsname {\simpleiconsmap\symbol{"F54C}} + \expandafter\def\csname simpleicon@unitednationsicon\endcsname {\simpleiconsmap\symbol{"F54D}} + \expandafter\def\csname simpleicon@unityicon\endcsname {\simpleiconsmap\symbol{"F54E}} + \expandafter\def\csname simpleicon@unjsicon\endcsname {\simpleiconsmap\symbol{"F54F}} + \expandafter\def\csname simpleicon@unlicenseicon\endcsname {\simpleiconsmap\symbol{"F550}} + \expandafter\def\csname simpleicon@unocssicon\endcsname {\simpleiconsmap\symbol{"F551}} + \expandafter\def\csname simpleicon@unpkgicon\endcsname {\simpleiconsmap\symbol{"F552}} + \expandafter\def\csname simpleicon@unraidicon\endcsname {\simpleiconsmap\symbol{"F553}} + \expandafter\def\csname simpleicon@unrealengineicon\endcsname {\simpleiconsmap\symbol{"F554}} + \expandafter\def\csname simpleicon@unsplashicon\endcsname {\simpleiconsmap\symbol{"F555}} + \expandafter\def\csname simpleicon@untappdicon\endcsname {\simpleiconsmap\symbol{"F556}} + \expandafter\def\csname simpleicon@upcloudicon\endcsname {\simpleiconsmap\symbol{"F557}} + \expandafter\def\csname simpleicon@upholdicon\endcsname {\simpleiconsmap\symbol{"F558}} + \expandafter\def\csname simpleicon@uplabsicon\endcsname {\simpleiconsmap\symbol{"F559}} + \expandafter\def\csname simpleicon@upptimeicon\endcsname {\simpleiconsmap\symbol{"F55A}} + \expandafter\def\csname simpleicon@upsicon\endcsname {\simpleiconsmap\symbol{"F55B}} + \expandafter\def\csname simpleicon@upstashicon\endcsname {\simpleiconsmap\symbol{"F55C}} + \expandafter\def\csname simpleicon@uptimekumaicon\endcsname {\simpleiconsmap\symbol{"F55D}} + \expandafter\def\csname simpleicon@uptoboxicon\endcsname {\simpleiconsmap\symbol{"F55E}} + \expandafter\def\csname simpleicon@upworkicon\endcsname {\simpleiconsmap\symbol{"F55F}} + \expandafter\def\csname simpleicon@uspsicon\endcsname {\simpleiconsmap\symbol{"F560}} + \expandafter\def\csname simpleicon@utorrenticon\endcsname {\simpleiconsmap\symbol{"F561}} + \expandafter\def\csname simpleicon@vicon\endcsname {\simpleiconsmap\symbol{"F562}} + \expandafter\def\csname simpleicon@v2exicon\endcsname {\simpleiconsmap\symbol{"F563}} + \expandafter\def\csname simpleicon@v8icon\endcsname {\simpleiconsmap\symbol{"F564}} + \expandafter\def\csname simpleicon@vaadinicon\endcsname {\simpleiconsmap\symbol{"F565}} + \expandafter\def\csname simpleicon@vagranticon\endcsname {\simpleiconsmap\symbol{"F566}} + \expandafter\def\csname simpleicon@valaicon\endcsname {\simpleiconsmap\symbol{"F567}} + \expandafter\def\csname simpleicon@valoranticon\endcsname {\simpleiconsmap\symbol{"F568}} + \expandafter\def\csname simpleicon@valveicon\endcsname {\simpleiconsmap\symbol{"F569}} + \expandafter\def\csname simpleicon@vaporicon\endcsname {\simpleiconsmap\symbol{"F56A}} + \expandafter\def\csname simpleicon@vaulticon\endcsname {\simpleiconsmap\symbol{"F56B}} + \expandafter\def\csname simpleicon@vaultwardenicon\endcsname {\simpleiconsmap\symbol{"F56C}} + \expandafter\def\csname simpleicon@vauxhallicon\endcsname {\simpleiconsmap\symbol{"F56D}} + \expandafter\def\csname simpleicon@vbulletinicon\endcsname {\simpleiconsmap\symbol{"F56E}} + \expandafter\def\csname simpleicon@vectaryicon\endcsname {\simpleiconsmap\symbol{"F56F}} + \expandafter\def\csname simpleicon@vectorlogozoneicon\endcsname {\simpleiconsmap\symbol{"F570}} + \expandafter\def\csname simpleicon@vectorworksicon\endcsname {\simpleiconsmap\symbol{"F571}} + \expandafter\def\csname simpleicon@veeamicon\endcsname {\simpleiconsmap\symbol{"F572}} + \expandafter\def\csname simpleicon@veedicon\endcsname {\simpleiconsmap\symbol{"F573}} + \expandafter\def\csname simpleicon@veepeeicon\endcsname {\simpleiconsmap\symbol{"F574}} + \expandafter\def\csname simpleicon@vegaicon\endcsname {\simpleiconsmap\symbol{"F575}} + \expandafter\def\csname simpleicon@vegasicon\endcsname {\simpleiconsmap\symbol{"F576}} + \expandafter\def\csname simpleicon@velogicon\endcsname {\simpleiconsmap\symbol{"F577}} + \expandafter\def\csname simpleicon@venmoicon\endcsname {\simpleiconsmap\symbol{"F578}} + \expandafter\def\csname simpleicon@vercelicon\endcsname {\simpleiconsmap\symbol{"F579}} + \expandafter\def\csname simpleicon@verdaccioicon\endcsname {\simpleiconsmap\symbol{"F57A}} + \expandafter\def\csname simpleicon@veritasicon\endcsname {\simpleiconsmap\symbol{"F57B}} + \expandafter\def\csname simpleicon@verizonicon\endcsname {\simpleiconsmap\symbol{"F57C}} + \expandafter\def\csname simpleicon@vespaicon\endcsname {\simpleiconsmap\symbol{"F57D}} + \expandafter\def\csname simpleicon@vexxhosticon\endcsname {\simpleiconsmap\symbol{"F57E}} + \expandafter\def\csname simpleicon@vfairsicon\endcsname {\simpleiconsmap\symbol{"F57F}} + \expandafter\def\csname simpleicon@viadeoicon\endcsname {\simpleiconsmap\symbol{"F580}} + \expandafter\def\csname simpleicon@viaplayicon\endcsname {\simpleiconsmap\symbol{"F581}} + \expandafter\def\csname simpleicon@vibericon\endcsname {\simpleiconsmap\symbol{"F582}} + \expandafter\def\csname simpleicon@vibloicon\endcsname {\simpleiconsmap\symbol{"F583}} + \expandafter\def\csname simpleicon@victoriametricsicon\endcsname {\simpleiconsmap\symbol{"F584}} + \expandafter\def\csname simpleicon@victronenergyicon\endcsname {\simpleiconsmap\symbol{"F585}} + \expandafter\def\csname simpleicon@vimicon\endcsname {\simpleiconsmap\symbol{"F586}} + \expandafter\def\csname simpleicon@vimeoicon\endcsname {\simpleiconsmap\symbol{"F587}} + \expandafter\def\csname simpleicon@vimeolivestreamicon\endcsname {\simpleiconsmap\symbol{"F588}} + \expandafter\def\csname simpleicon@virginicon\endcsname {\simpleiconsmap\symbol{"F589}} + \expandafter\def\csname simpleicon@virginatlanticicon\endcsname {\simpleiconsmap\symbol{"F58A}} + \expandafter\def\csname simpleicon@virginmediaicon\endcsname {\simpleiconsmap\symbol{"F58B}} + \expandafter\def\csname simpleicon@virtualboxicon\endcsname {\simpleiconsmap\symbol{"F58C}} + \expandafter\def\csname simpleicon@virustotalicon\endcsname {\simpleiconsmap\symbol{"F58D}} + \expandafter\def\csname simpleicon@visaicon\endcsname {\simpleiconsmap\symbol{"F58E}} + \expandafter\def\csname simpleicon@visxicon\endcsname {\simpleiconsmap\symbol{"F58F}} + \expandafter\def\csname simpleicon@viteicon\endcsname {\simpleiconsmap\symbol{"F590}} + \expandafter\def\csname simpleicon@vitepressicon\endcsname {\simpleiconsmap\symbol{"F591}} + \expandafter\def\csname simpleicon@vitessicon\endcsname {\simpleiconsmap\symbol{"F592}} + \expandafter\def\csname simpleicon@vitesticon\endcsname {\simpleiconsmap\symbol{"F593}} + \expandafter\def\csname simpleicon@vivaldiicon\endcsname {\simpleiconsmap\symbol{"F594}} + \expandafter\def\csname simpleicon@vivawalleticon\endcsname {\simpleiconsmap\symbol{"F595}} + \expandafter\def\csname simpleicon@vivinoicon\endcsname {\simpleiconsmap\symbol{"F596}} + \expandafter\def\csname simpleicon@vivinticon\endcsname {\simpleiconsmap\symbol{"F597}} + \expandafter\def\csname simpleicon@vivoicon\endcsname {\simpleiconsmap\symbol{"F598}} + \expandafter\def\csname simpleicon@vkicon\endcsname {\simpleiconsmap\symbol{"F599}} + \expandafter\def\csname simpleicon@vlcmediaplayericon\endcsname {\simpleiconsmap\symbol{"F59A}} + \expandafter\def\csname simpleicon@vmwareicon\endcsname {\simpleiconsmap\symbol{"F59B}} + \expandafter\def\csname simpleicon@vodafoneicon\endcsname {\simpleiconsmap\symbol{"F59C}} + \expandafter\def\csname simpleicon@voidlinuxicon\endcsname {\simpleiconsmap\symbol{"F59D}} + \expandafter\def\csname simpleicon@voipdotmsicon\endcsname {\simpleiconsmap\symbol{"F59E}} + \expandafter\def\csname simpleicon@volkswagenicon\endcsname {\simpleiconsmap\symbol{"F59F}} + \expandafter\def\csname simpleicon@volvoicon\endcsname {\simpleiconsmap\symbol{"F5A0}} + \expandafter\def\csname simpleicon@vonageicon\endcsname {\simpleiconsmap\symbol{"F5A1}} + \expandafter\def\csname simpleicon@vorondesignicon\endcsname {\simpleiconsmap\symbol{"F5A2}} + \expandafter\def\csname simpleicon@vowpalwabbiticon\endcsname {\simpleiconsmap\symbol{"F5A3}} + \expandafter\def\csname simpleicon@voxicon\endcsname {\simpleiconsmap\symbol{"F5A4}} + \expandafter\def\csname simpleicon@vscoicon\endcsname {\simpleiconsmap\symbol{"F5A5}} + \expandafter\def\csname simpleicon@vscodiumicon\endcsname {\simpleiconsmap\symbol{"F5A6}} + \expandafter\def\csname simpleicon@vtexicon\endcsname {\simpleiconsmap\symbol{"F5A7}} + \expandafter\def\csname simpleicon@vuedotjsicon\endcsname {\simpleiconsmap\symbol{"F5A8}} + \expandafter\def\csname simpleicon@vuetifyicon\endcsname {\simpleiconsmap\symbol{"F5A9}} + \expandafter\def\csname simpleicon@vulkanicon\endcsname {\simpleiconsmap\symbol{"F5AA}} + \expandafter\def\csname simpleicon@vultricon\endcsname {\simpleiconsmap\symbol{"F5AB}} + \expandafter\def\csname simpleicon@vyondicon\endcsname {\simpleiconsmap\symbol{"F5AC}} + \expandafter\def\csname simpleicon@w3schoolsicon\endcsname {\simpleiconsmap\symbol{"F5AD}} + \expandafter\def\csname simpleicon@wacomicon\endcsname {\simpleiconsmap\symbol{"F5AE}} + \expandafter\def\csname simpleicon@wagmiicon\endcsname {\simpleiconsmap\symbol{"F5AF}} + \expandafter\def\csname simpleicon@wagtailicon\endcsname {\simpleiconsmap\symbol{"F5B0}} + \expandafter\def\csname simpleicon@wailsicon\endcsname {\simpleiconsmap\symbol{"F5B1}} + \expandafter\def\csname simpleicon@wakatimeicon\endcsname {\simpleiconsmap\symbol{"F5B2}} + \expandafter\def\csname simpleicon@walkmanicon\endcsname {\simpleiconsmap\symbol{"F5B3}} + \expandafter\def\csname simpleicon@wallabagicon\endcsname {\simpleiconsmap\symbol{"F5B4}} + \expandafter\def\csname simpleicon@walletconnecticon\endcsname {\simpleiconsmap\symbol{"F5B5}} + \expandafter\def\csname simpleicon@walmarticon\endcsname {\simpleiconsmap\symbol{"F5B6}} + \expandafter\def\csname simpleicon@wantedlyicon\endcsname {\simpleiconsmap\symbol{"F5B7}} + \expandafter\def\csname simpleicon@wappalyzericon\endcsname {\simpleiconsmap\symbol{"F5B8}} + \expandafter\def\csname simpleicon@warnerbrosicon\endcsname {\simpleiconsmap\symbol{"F5B9}} + \expandafter\def\csname simpleicon@warpicon\endcsname {\simpleiconsmap\symbol{"F5BA}} + \expandafter\def\csname simpleicon@wasabiicon\endcsname {\simpleiconsmap\symbol{"F5BB}} + \expandafter\def\csname simpleicon@wasmcloudicon\endcsname {\simpleiconsmap\symbol{"F5BC}} + \expandafter\def\csname simpleicon@wasmericon\endcsname {\simpleiconsmap\symbol{"F5BD}} + \expandafter\def\csname simpleicon@watchtowericon\endcsname {\simpleiconsmap\symbol{"F5BE}} + \expandafter\def\csname simpleicon@wattpadicon\endcsname {\simpleiconsmap\symbol{"F5BF}} + \expandafter\def\csname simpleicon@waylandicon\endcsname {\simpleiconsmap\symbol{"F5C0}} + \expandafter\def\csname simpleicon@wazeicon\endcsname {\simpleiconsmap\symbol{"F5C1}} + \expandafter\def\csname simpleicon@wazirxicon\endcsname {\simpleiconsmap\symbol{"F5C2}} + \expandafter\def\csname simpleicon@wearosicon\endcsname {\simpleiconsmap\symbol{"F5C3}} + \expandafter\def\csname simpleicon@weasylicon\endcsname {\simpleiconsmap\symbol{"F5C4}} + \expandafter\def\csname simpleicon@web3dotjsicon\endcsname {\simpleiconsmap\symbol{"F5C5}} + \expandafter\def\csname simpleicon@webassemblyicon\endcsname {\simpleiconsmap\symbol{"F5C6}} + \expandafter\def\csname simpleicon@webauthnicon\endcsname {\simpleiconsmap\symbol{"F5C7}} + \expandafter\def\csname simpleicon@webcomponentsdotorgicon\endcsname {\simpleiconsmap\symbol{"F5C8}} + \expandafter\def\csname simpleicon@webdriverioicon\endcsname {\simpleiconsmap\symbol{"F5C9}} + \expandafter\def\csname simpleicon@webexicon\endcsname {\simpleiconsmap\symbol{"F5CA}} + \expandafter\def\csname simpleicon@webflowicon\endcsname {\simpleiconsmap\symbol{"F5CB}} + \expandafter\def\csname simpleicon@webglicon\endcsname {\simpleiconsmap\symbol{"F5CC}} + \expandafter\def\csname simpleicon@webgpuicon\endcsname {\simpleiconsmap\symbol{"F5CD}} + \expandafter\def\csname simpleicon@weblateicon\endcsname {\simpleiconsmap\symbol{"F5CE}} + \expandafter\def\csname simpleicon@webminicon\endcsname {\simpleiconsmap\symbol{"F5CF}} + \expandafter\def\csname simpleicon@webmoneyicon\endcsname {\simpleiconsmap\symbol{"F5D0}} + \expandafter\def\csname simpleicon@webpackicon\endcsname {\simpleiconsmap\symbol{"F5D1}} + \expandafter\def\csname simpleicon@webrtcicon\endcsname {\simpleiconsmap\symbol{"F5D2}} + \expandafter\def\csname simpleicon@webstormicon\endcsname {\simpleiconsmap\symbol{"F5D3}} + \expandafter\def\csname simpleicon@webtoonicon\endcsname {\simpleiconsmap\symbol{"F5D4}} + \expandafter\def\csname simpleicon@webtreesicon\endcsname {\simpleiconsmap\symbol{"F5D5}} + \expandafter\def\csname simpleicon@wechaticon\endcsname {\simpleiconsmap\symbol{"F5D6}} + \expandafter\def\csname simpleicon@wegameicon\endcsname {\simpleiconsmap\symbol{"F5D7}} + \expandafter\def\csname simpleicon@weightsandbiasesicon\endcsname {\simpleiconsmap\symbol{"F5D8}} + \expandafter\def\csname simpleicon@welcometothejungleicon\endcsname {\simpleiconsmap\symbol{"F5D9}} + \expandafter\def\csname simpleicon@wellfoundicon\endcsname {\simpleiconsmap\symbol{"F5DA}} + \expandafter\def\csname simpleicon@wellsfargoicon\endcsname {\simpleiconsmap\symbol{"F5DB}} + \expandafter\def\csname simpleicon@wemoicon\endcsname {\simpleiconsmap\symbol{"F5DC}} + \expandafter\def\csname simpleicon@westerndigitalicon\endcsname {\simpleiconsmap\symbol{"F5DD}} + \expandafter\def\csname simpleicon@westernunionicon\endcsname {\simpleiconsmap\symbol{"F5DE}} + \expandafter\def\csname simpleicon@wetransfericon\endcsname {\simpleiconsmap\symbol{"F5DF}} + \expandafter\def\csname simpleicon@weztermicon\endcsname {\simpleiconsmap\symbol{"F5E0}} + \expandafter\def\csname simpleicon@wgpuicon\endcsname {\simpleiconsmap\symbol{"F5E1}} + \expandafter\def\csname simpleicon@whatsappicon\endcsname {\simpleiconsmap\symbol{"F5E2}} + \expandafter\def\csname simpleicon@wheniworkicon\endcsname {\simpleiconsmap\symbol{"F5E3}} + \expandafter\def\csname simpleicon@wiiicon\endcsname {\simpleiconsmap\symbol{"F5E4}} + \expandafter\def\csname simpleicon@wiiuicon\endcsname {\simpleiconsmap\symbol{"F5E5}} + \expandafter\def\csname simpleicon@wikidataicon\endcsname {\simpleiconsmap\symbol{"F5E6}} + \expandafter\def\csname simpleicon@wikidotggicon\endcsname {\simpleiconsmap\symbol{"F5E7}} + \expandafter\def\csname simpleicon@wikidotjsicon\endcsname {\simpleiconsmap\symbol{"F5E8}} + \expandafter\def\csname simpleicon@wikimediacommonsicon\endcsname {\simpleiconsmap\symbol{"F5E9}} + \expandafter\def\csname simpleicon@wikimediafoundationicon\endcsname {\simpleiconsmap\symbol{"F5EA}} + \expandafter\def\csname simpleicon@wikipediaicon\endcsname {\simpleiconsmap\symbol{"F5EB}} + \expandafter\def\csname simpleicon@wikiquoteicon\endcsname {\simpleiconsmap\symbol{"F5EC}} + \expandafter\def\csname simpleicon@wikivoyageicon\endcsname {\simpleiconsmap\symbol{"F5ED}} + \expandafter\def\csname simpleicon@winampicon\endcsname {\simpleiconsmap\symbol{"F5EE}} + \expandafter\def\csname simpleicon@wiproicon\endcsname {\simpleiconsmap\symbol{"F5EF}} + \expandafter\def\csname simpleicon@wireicon\endcsname {\simpleiconsmap\symbol{"F5F0}} + \expandafter\def\csname simpleicon@wireguardicon\endcsname {\simpleiconsmap\symbol{"F5F1}} + \expandafter\def\csname simpleicon@wiresharkicon\endcsname {\simpleiconsmap\symbol{"F5F2}} + \expandafter\def\csname simpleicon@wiseicon\endcsname {\simpleiconsmap\symbol{"F5F3}} + \expandafter\def\csname simpleicon@wishicon\endcsname {\simpleiconsmap\symbol{"F5F4}} + \expandafter\def\csname simpleicon@wistiaicon\endcsname {\simpleiconsmap\symbol{"F5F5}} + \expandafter\def\csname simpleicon@wixicon\endcsname {\simpleiconsmap\symbol{"F5F6}} + \expandafter\def\csname simpleicon@wizzairicon\endcsname {\simpleiconsmap\symbol{"F5F7}} + \expandafter\def\csname simpleicon@wolframicon\endcsname {\simpleiconsmap\symbol{"F5F8}} + \expandafter\def\csname simpleicon@wolframlanguageicon\endcsname {\simpleiconsmap\symbol{"F5F9}} + \expandafter\def\csname simpleicon@wolframmathematicaicon\endcsname {\simpleiconsmap\symbol{"F5FA}} + \expandafter\def\csname simpleicon@wondershareicon\endcsname {\simpleiconsmap\symbol{"F5FB}} + \expandafter\def\csname simpleicon@wondersharefilmoraicon\endcsname {\simpleiconsmap\symbol{"F5FC}} + \expandafter\def\csname simpleicon@wooicon\endcsname {\simpleiconsmap\symbol{"F5FD}} + \expandafter\def\csname simpleicon@woocommerceicon\endcsname {\simpleiconsmap\symbol{"F5FE}} + \expandafter\def\csname simpleicon@wordpressicon\endcsname {\simpleiconsmap\symbol{"F5FF}} + \expandafter\def\csname simpleicon@workplaceicon\endcsname {\simpleiconsmap\symbol{"F600}} + \expandafter\def\csname simpleicon@worldhealthorganizationicon\endcsname {\simpleiconsmap\symbol{"F601}} + \expandafter\def\csname simpleicon@wpengineicon\endcsname {\simpleiconsmap\symbol{"F602}} + \expandafter\def\csname simpleicon@wpexplorericon\endcsname {\simpleiconsmap\symbol{"F603}} + \expandafter\def\csname simpleicon@wprocketicon\endcsname {\simpleiconsmap\symbol{"F604}} + \expandafter\def\csname simpleicon@writedotasicon\endcsname {\simpleiconsmap\symbol{"F605}} + \expandafter\def\csname simpleicon@wweicon\endcsname {\simpleiconsmap\symbol{"F606}} + \expandafter\def\csname simpleicon@wwiseicon\endcsname {\simpleiconsmap\symbol{"F607}} + \expandafter\def\csname simpleicon@wykopicon\endcsname {\simpleiconsmap\symbol{"F608}} + \expandafter\def\csname simpleicon@wyzeicon\endcsname {\simpleiconsmap\symbol{"F609}} + \expandafter\def\csname simpleicon@xicon\endcsname {\simpleiconsmap\symbol{"F60A}} + \expandafter\def\csname simpleicon@xamppicon\endcsname {\simpleiconsmap\symbol{"F60B}} + \expandafter\def\csname simpleicon@xcodeicon\endcsname {\simpleiconsmap\symbol{"F60C}} + \expandafter\def\csname simpleicon@xdadevelopersicon\endcsname {\simpleiconsmap\symbol{"F60D}} + \expandafter\def\csname simpleicon@xdotorgicon\endcsname {\simpleiconsmap\symbol{"F60E}} + \expandafter\def\csname simpleicon@xenditicon\endcsname {\simpleiconsmap\symbol{"F60F}} + \expandafter\def\csname simpleicon@xeroicon\endcsname {\simpleiconsmap\symbol{"F610}} + \expandafter\def\csname simpleicon@xfceicon\endcsname {\simpleiconsmap\symbol{"F611}} + \expandafter\def\csname simpleicon@xiaohongshuicon\endcsname {\simpleiconsmap\symbol{"F612}} + \expandafter\def\csname simpleicon@xiaomiicon\endcsname {\simpleiconsmap\symbol{"F613}} + \expandafter\def\csname simpleicon@xingicon\endcsname {\simpleiconsmap\symbol{"F614}} + \expandafter\def\csname simpleicon@xmppicon\endcsname {\simpleiconsmap\symbol{"F615}} + \expandafter\def\csname simpleicon@xoicon\endcsname {\simpleiconsmap\symbol{"F616}} + \expandafter\def\csname simpleicon@xrpicon\endcsname {\simpleiconsmap\symbol{"F617}} + \expandafter\def\csname simpleicon@xspliticon\endcsname {\simpleiconsmap\symbol{"F618}} + \expandafter\def\csname simpleicon@xstateicon\endcsname {\simpleiconsmap\symbol{"F619}} + \expandafter\def\csname simpleicon@yabaiicon\endcsname {\simpleiconsmap\symbol{"F61A}} + \expandafter\def\csname simpleicon@yaleicon\endcsname {\simpleiconsmap\symbol{"F61B}} + \expandafter\def\csname simpleicon@yamahacorporationicon\endcsname {\simpleiconsmap\symbol{"F61C}} + \expandafter\def\csname simpleicon@yamahamotorcorporationicon\endcsname {\simpleiconsmap\symbol{"F61D}} + \expandafter\def\csname simpleicon@yamlicon\endcsname {\simpleiconsmap\symbol{"F61E}} + \expandafter\def\csname simpleicon@yandexcloudicon\endcsname {\simpleiconsmap\symbol{"F61F}} + \expandafter\def\csname simpleicon@yarnicon\endcsname {\simpleiconsmap\symbol{"F620}} + \expandafter\def\csname simpleicon@ycombinatoricon\endcsname {\simpleiconsmap\symbol{"F621}} + \expandafter\def\csname simpleicon@yelpicon\endcsname {\simpleiconsmap\symbol{"F622}} + \expandafter\def\csname simpleicon@yetiicon\endcsname {\simpleiconsmap\symbol{"F623}} + \expandafter\def\csname simpleicon@yiiicon\endcsname {\simpleiconsmap\symbol{"F624}} + \expandafter\def\csname simpleicon@yoasticon\endcsname {\simpleiconsmap\symbol{"F625}} + \expandafter\def\csname simpleicon@youtubeicon\endcsname {\simpleiconsmap\symbol{"F626}} + \expandafter\def\csname simpleicon@youtubegamingicon\endcsname {\simpleiconsmap\symbol{"F627}} + \expandafter\def\csname simpleicon@youtubekidsicon\endcsname {\simpleiconsmap\symbol{"F628}} + \expandafter\def\csname simpleicon@youtubemusicicon\endcsname {\simpleiconsmap\symbol{"F629}} + \expandafter\def\csname simpleicon@youtubeshortsicon\endcsname {\simpleiconsmap\symbol{"F62A}} + \expandafter\def\csname simpleicon@youtubestudioicon\endcsname {\simpleiconsmap\symbol{"F62B}} + \expandafter\def\csname simpleicon@youtubetvicon\endcsname {\simpleiconsmap\symbol{"F62C}} + \expandafter\def\csname simpleicon@yricon\endcsname {\simpleiconsmap\symbol{"F62D}} + \expandafter\def\csname simpleicon@yubicoicon\endcsname {\simpleiconsmap\symbol{"F62E}} + \expandafter\def\csname simpleicon@yunohosticon\endcsname {\simpleiconsmap\symbol{"F62F}} + \expandafter\def\csname simpleicon@zabkaicon\endcsname {\simpleiconsmap\symbol{"F630}} + \expandafter\def\csname simpleicon@zaimicon\endcsname {\simpleiconsmap\symbol{"F631}} + \expandafter\def\csname simpleicon@zalandoicon\endcsname {\simpleiconsmap\symbol{"F632}} + \expandafter\def\csname simpleicon@zaloicon\endcsname {\simpleiconsmap\symbol{"F633}} + \expandafter\def\csname simpleicon@zapicon\endcsname {\simpleiconsmap\symbol{"F634}} + \expandafter\def\csname simpleicon@zapiericon\endcsname {\simpleiconsmap\symbol{"F635}} + \expandafter\def\csname simpleicon@zaraicon\endcsname {\simpleiconsmap\symbol{"F636}} + \expandafter\def\csname simpleicon@zazzleicon\endcsname {\simpleiconsmap\symbol{"F637}} + \expandafter\def\csname simpleicon@zcashicon\endcsname {\simpleiconsmap\symbol{"F638}} + \expandafter\def\csname simpleicon@zcoolicon\endcsname {\simpleiconsmap\symbol{"F639}} + \expandafter\def\csname simpleicon@zdficon\endcsname {\simpleiconsmap\symbol{"F63A}} + \expandafter\def\csname simpleicon@zebpayicon\endcsname {\simpleiconsmap\symbol{"F63B}} + \expandafter\def\csname simpleicon@zebratechnologiesicon\endcsname {\simpleiconsmap\symbol{"F63C}} + \expandafter\def\csname simpleicon@zedindustriesicon\endcsname {\simpleiconsmap\symbol{"F63D}} + \expandafter\def\csname simpleicon@zelleicon\endcsname {\simpleiconsmap\symbol{"F63E}} + \expandafter\def\csname simpleicon@zendicon\endcsname {\simpleiconsmap\symbol{"F63F}} + \expandafter\def\csname simpleicon@zendeskicon\endcsname {\simpleiconsmap\symbol{"F640}} + \expandafter\def\csname simpleicon@zennicon\endcsname {\simpleiconsmap\symbol{"F641}} + \expandafter\def\csname simpleicon@zenodoicon\endcsname {\simpleiconsmap\symbol{"F642}} + \expandafter\def\csname simpleicon@zensaricon\endcsname {\simpleiconsmap\symbol{"F643}} + \expandafter\def\csname simpleicon@zerodhaicon\endcsname {\simpleiconsmap\symbol{"F644}} + \expandafter\def\csname simpleicon@zerotiericon\endcsname {\simpleiconsmap\symbol{"F645}} + \expandafter\def\csname simpleicon@zerplyicon\endcsname {\simpleiconsmap\symbol{"F646}} + \expandafter\def\csname simpleicon@zettlricon\endcsname {\simpleiconsmap\symbol{"F647}} + \expandafter\def\csname simpleicon@zhihuicon\endcsname {\simpleiconsmap\symbol{"F648}} + \expandafter\def\csname simpleicon@zigicon\endcsname {\simpleiconsmap\symbol{"F649}} + \expandafter\def\csname simpleicon@zigbeeicon\endcsname {\simpleiconsmap\symbol{"F64A}} + \expandafter\def\csname simpleicon@zigbee2mqtticon\endcsname {\simpleiconsmap\symbol{"F64B}} + \expandafter\def\csname simpleicon@ziggoicon\endcsname {\simpleiconsmap\symbol{"F64C}} + \expandafter\def\csname simpleicon@zilchicon\endcsname {\simpleiconsmap\symbol{"F64D}} + \expandafter\def\csname simpleicon@zillowicon\endcsname {\simpleiconsmap\symbol{"F64E}} + \expandafter\def\csname simpleicon@zincsearchicon\endcsname {\simpleiconsmap\symbol{"F64F}} + \expandafter\def\csname simpleicon@zingaticon\endcsname {\simpleiconsmap\symbol{"F650}} + \expandafter\def\csname simpleicon@zodicon\endcsname {\simpleiconsmap\symbol{"F651}} + \expandafter\def\csname simpleicon@zohoicon\endcsname {\simpleiconsmap\symbol{"F652}} + \expandafter\def\csname simpleicon@zoipericon\endcsname {\simpleiconsmap\symbol{"F653}} + \expandafter\def\csname simpleicon@zomatoicon\endcsname {\simpleiconsmap\symbol{"F654}} + \expandafter\def\csname simpleicon@zoomicon\endcsname {\simpleiconsmap\symbol{"F655}} + \expandafter\def\csname simpleicon@zorinicon\endcsname {\simpleiconsmap\symbol{"F656}} + \expandafter\def\csname simpleicon@zoteroicon\endcsname {\simpleiconsmap\symbol{"F657}} + \expandafter\def\csname simpleicon@zshicon\endcsname {\simpleiconsmap\symbol{"F658}} + \expandafter\def\csname simpleicon@zulipicon\endcsname {\simpleiconsmap\symbol{"F659}} + \expandafter\def\csname simpleicon@zyteicon\endcsname {\simpleiconsmap\symbol{"F65A}}
\ 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 b7fdf3bc904..9a2577a979a 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/12 Font definitions for U/simpleiconseight.] + \ProvidesFile{usimpleiconseight.fd}[2024/08/23 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 6af1a1e8100..0887d0c858c 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/12 Font definitions for U/simpleiconsfive.] + \ProvidesFile{usimpleiconsfive.fd}[2024/08/23 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 3324eae514f..c8a047ba73d 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/12 Font definitions for U/simpleiconsfour.] + \ProvidesFile{usimpleiconsfour.fd}[2024/08/23 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 6fbec07c5eb..550fb0befe0 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/12 Font definitions for U/simpleiconsnine.] + \ProvidesFile{usimpleiconsnine.fd}[2024/08/23 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 525eb910e67..966435d33dd 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/12 Font definitions for U/simpleiconsone.] + \ProvidesFile{usimpleiconsone.fd}[2024/08/23 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 704d6dfe38c..172ea4c434b 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/12 Font definitions for U/simpleiconsoneone.] + \ProvidesFile{usimpleiconsoneone.fd}[2024/08/23 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 95c0687d34a..b5dcd0e051f 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/12 Font definitions for U/simpleiconsonethree.] + \ProvidesFile{usimpleiconsonethree.fd}[2024/08/23 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 24f46e9ff7c..d444d3d3214 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/12 Font definitions for U/simpleiconsonetwo.] + \ProvidesFile{usimpleiconsonetwo.fd}[2024/08/23 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 fa32daf5d99..1937dbd6fcd 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/12 Font definitions for U/simpleiconsonezero.] + \ProvidesFile{usimpleiconsonezero.fd}[2024/08/23 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 e2d5c58f188..d31541ae35c 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/12 Font definitions for U/simpleiconsseven.] + \ProvidesFile{usimpleiconsseven.fd}[2024/08/23 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 e05549bde9b..50b3e50395d 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/12 Font definitions for U/simpleiconssix.] + \ProvidesFile{usimpleiconssix.fd}[2024/08/23 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 a653873414c..6f5988065b1 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/12 Font definitions for U/simpleiconsthree.] + \ProvidesFile{usimpleiconsthree.fd}[2024/08/23 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 19d30bd3fcc..e609d25c1c0 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/12 Font definitions for U/simpleiconstwo.] + \ProvidesFile{usimpleiconstwo.fd}[2024/08/23 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/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/telprint/telprint.sty b/Master/texmf-dist/tex/latex/telprint/telprint.sty new file mode 100644 index 00000000000..f4e08a7c42d --- /dev/null +++ b/Master/texmf-dist/tex/latex/telprint/telprint.sty @@ -0,0 +1,258 @@ +%% +%% This is file `telprint.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% telprint.dtx (with options: `package') +%% +%% This is a generated file. +%% +%% Project: telprint +%% Version: 2024-07-26 v1.12 +%% +%% Copyright (C) +%% 1996, 1997, 2004-2008 Heiko Oberdiek +%% 2016-2024 Oberdiek Package Support Group +%% +%% 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. This version of this license is in +%% https://www.latex-project.org/lppl/lppl-1-3c.txt +%% and the latest version of this license is in +%% 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. +%% +%% This work has the LPPL maintenance status "maintained". +%% +%% The Current Maintainers of this work are +%% Heiko Oberdiek and the Oberdiek Package Support Group +%% https://github.com/ho-tex/telprint/issues +%% +%% The Base Interpreter refers to any `TeX-Format', +%% because some files are installed in TDS:tex/generic//. +%% +%% This work consists of the main source file telprint.dtx +%% and the derived files +%% telprint.sty, telprint.pdf, telprint.ins, telprint.drv, +%% telprint-test1.tex. +%% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode58=12 % : + \catcode64=11 % @ + \catcode123=1 % { + \catcode125=2 % } + \expandafter\let\expandafter\x\csname ver@telprint.sty\endcsname + \ifx\x\relax % plain-TeX, first loading + \else + \def\empty{}% + \ifx\x\empty % LaTeX, first loading, + % variable is initialized, but \ProvidesPackage not yet seen + \else + \expandafter\ifx\csname PackageInfo\endcsname\relax + \def\x#1#2{% + \immediate\write-1{Package #1 Info: #2.}% + }% + \else + \def\x#1#2{\PackageInfo{#1}{#2, stopped}}% + \fi + \x{telprint}{The package is already loaded}% + \aftergroup\endinput + \fi + \fi +\endgroup% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode35=6 % # + \catcode39=12 % ' + \catcode40=12 % ( + \catcode41=12 % ) + \catcode44=12 % , + \catcode45=12 % - + \catcode46=12 % . + \catcode47=12 % / + \catcode58=12 % : + \catcode64=11 % @ + \catcode91=12 % [ + \catcode93=12 % ] + \catcode123=1 % { + \catcode125=2 % } + \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \def\x#1#2#3[#4]{\endgroup + \immediate\write-1{Package: #3 #4}% + \xdef#1{#4}% + }% + \else + \def\x#1#2[#3]{\endgroup + #2[{#3}]% + \ifx#1\@undefined + \xdef#1{#3}% + \fi + \ifx#1\relax + \xdef#1{#3}% + \fi + }% + \fi +\expandafter\x\csname ver@telprint.sty\endcsname +\ProvidesPackage{telprint}% + [2024-07-26 v1.12 Format German phone numbers (HO)]% +\begingroup\catcode61\catcode48\catcode32=10\relax% + \catcode13=5 % ^^M + \endlinechar=13 % + \catcode123=1 % { + \catcode125=2 % } + \catcode64=11 % @ + \def\x{\endgroup + \expandafter\edef\csname TELAtEnd\endcsname{% + \endlinechar=\the\endlinechar\relax + \catcode13=\the\catcode13\relax + \catcode32=\the\catcode32\relax + \catcode35=\the\catcode35\relax + \catcode61=\the\catcode61\relax + \catcode64=\the\catcode64\relax + \catcode123=\the\catcode123\relax + \catcode125=\the\catcode125\relax + }% + }% +\x\catcode61\catcode48\catcode32=10\relax% +\catcode13=5 % ^^M +\endlinechar=13 % +\catcode35=6 % # +\catcode64=11 % @ +\catcode123=1 % { +\catcode125=2 % } +\def\TMP@EnsureCode#1#2{% + \edef\TELAtEnd{% + \TELAtEnd + \catcode#1=\the\catcode#1\relax + }% + \catcode#1=#2\relax +} +\TMP@EnsureCode{33}{12}% ! +\TMP@EnsureCode{36}{3}% $ +\TMP@EnsureCode{40}{12}% ( +\TMP@EnsureCode{41}{12}% ) +\TMP@EnsureCode{42}{12}% * +\TMP@EnsureCode{43}{12}% + +\TMP@EnsureCode{44}{12}% , +\TMP@EnsureCode{45}{12}% - +\TMP@EnsureCode{46}{12}% . +\TMP@EnsureCode{47}{12}% / +\TMP@EnsureCode{91}{12}% [ +\TMP@EnsureCode{93}{12}% ] +\TMP@EnsureCode{126}{13}% ~ (active) +\edef\TELAtEnd{\TELAtEnd\noexpand\endinput} +\ifx\DeclareRobustCommand\UnDeFiNeD + \def\DeclareRobustCommand*#1[1]{\def#1##1}% + \def\TELreset{\let\DeclareRobustCommand=\UnDeFiNeD}% + \input infwarerr.sty\relax + \@PackageInfo{telprint}{% + Macros are not robust!% + }% +\else + \let\TELreset=\relax +\fi +\DeclareRobustCommand*{\telspace}[1]{\def\TELspace{#1}} +\ifcsname LaTeXReleaseInfo\endcsname + \telspace{\,} +\else + \telspace{{}$\,${}} +\fi +\DeclareRobustCommand*{\telhyphen}[1]{\def\TELhyphen{#1}} +\telhyphen{\leavevmode\hbox{-}}% \hbox zur Verhinderung der Trennung +\DeclareRobustCommand*{\telslash}[1]{\def\TELslash{#1}} +\telslash{/}% +\DeclareRobustCommand*{\telleftparen}[1]{\def\TELleftparen{#1}} +\telleftparen{(}% +\DeclareRobustCommand*{\telrightparen}[1]{\def\TELrightparen{#1}} +\telrightparen{)}% +\DeclareRobustCommand*{\telplus}[1]{\def\TELplus{#1}} +\telplus{+}% +\DeclareRobustCommand*{\teltilde}[1]{\def\TELtilde{#1}} +\teltilde{~}% +\newtoks\TELtoks +\def\TELnumber#1#2\TELnumberEND{% + \begingroup + \def\0{#2}% + \expandafter\endgroup + \ifx\0\empty + \TELtoks=\expandafter{\the\TELtoks#1}% + \ifnum\TELswitch=0 % + \def\TELx{\TELspace}\def\TELy{}% + \else + \def\TELx{}\def\TELy{\TELspace}% + \fi + \the\TELtoks + \else + \ifnum\TELswitch=0 % + \TELtoks=\expandafter{\the\TELtoks#1\TELx}% + \def\TELswitch{1}% + \else + \TELtoks=\expandafter{\the\TELtoks#1\TELy}% + \def\TELswitch{0}% + \fi + \TELnumber#2\TELnumberEND + \fi +} +\DeclareRobustCommand*{\telnumber}[1]{% + \TELtoks={}% + \def\TELswitch{0}% + \TELnumber#1{}\TELnumberEND +} +\def\TELsplit{\futurelet\TELfuture\TELdosplit} +\def\TELdosplit#1#2\TELsplitEND +{% + \def\TELsp{ }% + \expandafter\ifx\TELsp\TELfuture + \let\TELfuture=\relax + \expandafter\telnumber\expandafter{\the\TELtoks}~% + \telprint{#1#2}% Das Leerzeichen kann nicht #1 sein! + \else + \def\TELfirst{#1}% + \ifx\TELfirst\empty + \expandafter\telnumber\expandafter{\the\TELtoks}% + \TELtoks={}% + \else\if-\TELfirst + \expandafter\telnumber\expandafter{\the\TELtoks}\TELhyphen + \telprint{#2}% + \else\if/\TELfirst + \expandafter\telnumber\expandafter{\the\TELtoks}\TELslash + \telprint{#2}% + \else\if(\TELfirst + \expandafter\telnumber\expandafter{\the\TELtoks}\TELleftparen + \telprint{#2}% + \else\if)\TELfirst + \expandafter\telnumber\expandafter{\the\TELtoks}\TELrightparen + \telprint{#2}% + \else\if+\TELfirst + \expandafter\telnumber\expandafter{\the\TELtoks}\TELplus + \telprint{#2}% + \else\def\TELtemp{~}\ifx\TELtemp\TELfirst + \expandafter\telnumber\expandafter{\the\TELtoks}\TELtilde + \telprint{#2}% + \else + \TELtoks=\expandafter{\the\TELtoks#1}% + \TELsplit#2{}\TELsplitEND + \fi\fi\fi\fi\fi\fi\fi + \fi +} +\DeclareRobustCommand*{\telprint}[1]{% + \TELtoks={}% + \TELsplit#1{}\TELsplitEND +} +\TELreset\let\TELreset=\UnDeFiNeD +\TELAtEnd% +%% \section{Installation} +\endinput +%% +%% End of file `telprint.sty'. diff --git a/Master/texmf-dist/tex/latex/tikzbricks/tikzbricks-doc-settings.sty b/Master/texmf-dist/tex/latex/tikzbricks/tikzbricks-doc-settings.sty deleted file mode 100644 index 777cedba6ef..00000000000 --- a/Master/texmf-dist/tex/latex/tikzbricks/tikzbricks-doc-settings.sty +++ /dev/null @@ -1,199 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% Personal helper theme for package documentations -% Copyright samcarter -% -% This file may be distributed and/or modified -% under the LaTeX Project Public License 1.3c or later -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% Usage: -% ln ~/Life/latex/beamertheme-sam/themesam.sty package-doc-settings.sty -% \usepackage[ -% themecolor=samdblue -% ]{\jobname-settings} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% Colours -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\RequirePackage{xcolor} -\definecolor{samyellow}{RGB}{246,193,65} -\definecolor{samorange}{RGB}{241,147,45} -\definecolor{samred}{RGB}{191,26,46}% TikZbricks -\definecolor{sammagenta}{RGB}{170,42,104}% TikZmarmots -\definecolor{samviolet}{RGB}{136,46,114}% TikZlings -\definecolor{samlila}{RGB}{101,67,159}% Rainbow beamer theme -\definecolor{samdblue}{RGB}{0,51,134}% beamer theme -\definecolor{samlblue}{RGB}{22,89,155}% TikZducks -\definecolor{samteal}{RGB}{25,143,157}% Tcolorbox beamer theme -\definecolor{samlgreen}{RGB}{68,170,153}% Jigsaw -\definecolor{samdgreen}{RGB}{78,178,125} -\definecolor{samlgray}{RGB}{160,160,185} -\definecolor{samdgray}{RGB}{60,60,85} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% Package options -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\RequirePackage{xkeyval} -\DeclareOptionX{themecolor}[samdblue]{\colorlet{themecolor}{#1}} -\DeclareOptionX{listingcolor}[samlblue]{\colorlet{listingcolor}{#1}} -\ExecuteOptionsX{themecolor,listingcolor} -\ProcessOptionsX - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% Packages -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\@ifclassloaded{beamer}{}{% - \RequirePackage[english]{babel} - \RequirePackage[paper=a4paper,margin=2.9cm]{geometry} - \RequirePackage{scrlayer-scrpage} - \let\hrulefillx\hrulefill - \RequirePackage[bitstream-charter]{mathdesign} - \let\hrulefill\hrulefillx - \RequirePackage[hang,flushmargin,bottom]{footmisc} - \RequirePackage{footnotehyper} - \makesavenoteenv{tcolorbox} - \RequirePackage[all]{nowidow} - \RequirePackage[colorlinks=true,breaklinks=true,allcolors=themecolor,hyperfootnotes=false]{hyperref} -} -\RequirePackage[T1]{fontenc} -\RequirePackage{xspace} -\RequirePackage{inconsolata}% mono font with bold, but italic is missing -% \RequirePackage[scale=0.85]{cascadia-code} -% \AddToHook{cmd/ttfamily/before}{\fontseries{sl}} -\RequirePackage{iexec} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% Listings -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\RequirePackage[ - cachedir=$TMPDIR/minted/ -]{minted} - -% smuggling custom pygmentize style in cache folder -% (a real pygmentise style would need installtion in some python folder) -\begin{filecontents*}[noheader]{./sam.pygstyle} -\makeatletter -\def\PYG@reset{\let\PYG@it=\relax \let\PYG@bf=\relax% - \let\PYG@ul=\relax \let\PYG@tc=\relax% - \let\PYG@bc=\relax \let\PYG@ff=\relax} -\def\PYG@tok#1{\csname PYG@tok@#1\endcsname} -\def\PYG@toks#1+{\ifx\relax#1\empty\else% - \PYG@tok{#1}\expandafter\PYG@toks\fi} -\def\PYG@do#1{\PYG@bc{\PYG@tc{\PYG@ul{% - \PYG@it{\PYG@bf{\PYG@ff{#1}}}}}}} -\def\PYG#1#2{\PYG@reset\PYG@toks#1+\relax+\PYG@do{#2}} - -% optional arguments -\expandafter\def\csname PYG@tok@na\endcsname{\def\PYG@tc##1{\textcolor{black}{##1}}} - -% macros -\expandafter\def\csname PYG@tok@k\endcsname{\def\PYG@tc##1{\textcolor{listingcolor}{\bfseries ##1}}} -% curly brakets -\expandafter\def\csname PYG@tok@nb\endcsname{\def\PYG@tc##1{\textcolor{listingcolor}{\bfseries ##1}}} - -% comments (italics won't work with the inconsolata font) -\expandafter\def\csname PYG@tok@c\endcsname{\def\PYG@tc##1{\textcolor{gray}{##1}}} - -\def\PYGZbs{\char`\\} -\def\PYGZus{\char`\_} -\def\PYGZob{\char`\{} -\def\PYGZcb{\char`\}} -\def\PYGZca{\char`\^} -\def\PYGZam{\char`\&} -\def\PYGZlt{\char`\<} -\def\PYGZgt{\char`\>} -\def\PYGZsh{\char`\#} -\def\PYGZpc{\char`\%} -\def\PYGZdl{\char`\$} -\def\PYGZhy{\char`\-} -\def\PYGZsq{\char`\'} -\def\PYGZdq{\char`\"} -\def\PYGZti{\char`\~} -% for compatibility with earlier versions -\def\PYGZat{@} -\def\PYGZlb{[} -\def\PYGZrb{]} -\makeatother -\end{filecontents*} - -\iexec{mkdir -p $TMPDIR/minted && mv sam.pygstyle $TMPDIR/minted/.} - -\usemintedstyle{sam} -\setminted{ - breaksymbolleft={}, - tabsize=2, - breaklines=true, -} -\newminted[samcode]{latex}{} -\newmintinline[saminline]{latex}{} - -% use non-bold and all coloured for inline code in articles -\ifdefined\insertaspectratio\else - \patchcmd{\minted@inputpyg@inline}{\minted@input}{\color{listingcolor}\renewcommand\textcolor[3][]{##3}\renewcommand\bfseries{}\minted@input}{}{} -\fi - -\RequirePackage[most]{tcolorbox} -\tcbuselibrary{minted} -\tcbset{% - colframe=themecolor, - fonttitle=\bfseries, - sidebyside, - center lower, - righthand width=5.7cm, - bottom=2pt, - top=2pt, - left=3pt, - right=3pt, - sidebyside gap=10pt, - lower separated=false, - listing engine=minted, - minted language=latex, - colback=themecolor!10, - sharp corners, - boxrule=0pt, - before title={\strut} -} - -% avoid page breaks right in front of the tcolorbox -\@ifclassloaded{beamer}{}{ - \tcbuselibrary{hooks} - \tcbset{before pre={\nopagebreak[4]}} -} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% document settings -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\@ifclassloaded{scrartcl}{% - \KOMAoptions{parskip=half} - \addtokomafont{sectioning}{\color{themecolor}} - \addtokomafont{date}{\normalsize} - \addtokomafont{author}{\normalsize} - \setlength{\footnotemargin}{0.7em} -}{} - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% Custom macros -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\providecommand*{\CTAN}{\textsc{CTAN}\xspace} -\providecommand*{\TikZ}{Ti\emph{k}Z\xspace} -\providecommand*{\miktex}{MiK\TeX\xspace} -\providecommand*{\texlive}{\TeX{}Live\xspace} -\providecommand*{\tikzbrick}{Ti\emph{k}Zbrick\xspace} -\providecommand*{\tikzducks}{Ti\emph{k}Zducks\xspace} -\providecommand*{\tikzlings}{Ti\emph{k}Zlings\xspace} -\providecommand*{\tikzmarmots}{Ti\emph{k}Zmarmots\xspace} -\providecommand*{\ConTeXt}{C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt}
\ No newline at end of file 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..a27e1a7ac6c 100644 --- a/Master/texmf-dist/tex/latex/tutodoc/tutodoc.sty +++ b/Master/texmf-dist/tex/latex/tutodoc/tutodoc.sty @@ -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/univie-ling/univie-ling-expose.cls b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-expose.cls index b31ae0a4f7d..f7ff0916f44 100644 --- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-expose.cls +++ b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-expose.cls @@ -33,7 +33,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e}[2022/06/01] -\ProvidesPackage{univie-ling-expose}[2024/06/27 v.2.6 Univie Linguistic Exposes (JSp)] +\ProvidesPackage{univie-ling-expose}[2024/07/23 v.2.7 Univie Linguistic Exposes (JSp)] %% ============================================================ @@ -274,10 +274,10 @@ \NewDocumentCommand\weblink{mo}{% \url{#1}% \IfNoValueTF{#2}% - {\ifthenelse{\isempty{\wlg@urldate}}{}{% + {\ifx\wlg@urldate\empty\else% \ \urldate{\wlg@urldate}% - }}% - {\ \urldate{#2}} + \fi}% + {\ \urldate{#2}}% } } diff --git a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-handout.cls b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-handout.cls index 01abf2e31cb..73c5a325da4 100644 --- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-handout.cls +++ b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-handout.cls @@ -35,7 +35,7 @@ \NeedsTeXFormat{LaTeX2e}[2022/06/01] -\ProvidesClass{univie-ling-handout}[2024/06/27 v.2.6 Univie Ling handout class (JSp)] +\ProvidesClass{univie-ling-handout}[2024/07/23 v.2.7 Univie Ling handout class (JSp)] %% ============================================================ %% CLASS OPTIONS @@ -933,10 +933,10 @@ \NewDocumentCommand\weblink{mo}{% \url{#1}% \IfNoValueTF{#2}% - {\ifthenelse{\isempty{\wlg@urldate}}{}{% + {\ifx\wlg@urldate\empty\else% \ \urldate{\wlg@urldate}% - }}% - {\ \urldate{#2}} + \fi}% + {\ \urldate{#2}}% } } diff --git a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-paper.cls b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-paper.cls index 88ec71a6fae..eda1430345b 100644 --- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-paper.cls +++ b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-paper.cls @@ -32,7 +32,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e}[2022/06/01] -\ProvidesPackage{univie-ling-paper}[2024/06/27 v.2.6 Univie Linguistic Papers (JSp)] +\ProvidesPackage{univie-ling-paper}[2024/07/23 v.2.7 Univie Linguistic Papers (JSp)] %% ============================================================ @@ -296,10 +296,10 @@ This includes all drawings, sketches, graphics and internet sources.} \NewDocumentCommand\weblink{mo}{% \url{#1}% \IfNoValueTF{#2}% - {\ifthenelse{\isempty{\wlg@urldate}}{}{% + {\ifx\wlg@urldate\empty\else% \ \urldate{\wlg@urldate}% - }}% - {\ \urldate{#2}} + \fi}% + {\ \urldate{#2}}% } } diff --git a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-poster.cls b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-poster.cls index 9a354e25c7f..87f5092d4ce 100644 --- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-poster.cls +++ b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-poster.cls @@ -34,7 +34,7 @@ \NeedsTeXFormat{LaTeX2e}[2022/06/01] -\ProvidesClass{univie-ling-poster}[2024/06/27 v.2.6 Univie Ling poster class (JSp)] +\ProvidesClass{univie-ling-poster}[2024/07/23 v.2.7 Univie Ling poster class (JSp)] %% ============================================================ %% CLASS OPTIONS @@ -909,10 +909,10 @@ \NewDocumentCommand\weblink{mo}{% \url{#1}% \IfNoValueTF{#2}% - {\ifthenelse{\isempty{\wlg@urldate}}{}{% + {\ifx\wlg@urldate\empty\else% \ \urldate{\wlg@urldate}% - }}% - {\ \urldate{#2}} + \fi}% + {\ \urldate{#2}}% } } diff --git a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-thesis.cls b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-thesis.cls index 4813af3abc9..91d34276a0f 100644 --- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-thesis.cls +++ b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-thesis.cls @@ -33,7 +33,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e}[2022/06/01] -\ProvidesPackage{univie-ling-thesis}[2024/06/27 v.2.6 Univie Linguistic Theses (JSp)] +\ProvidesPackage{univie-ling-thesis}[2024/07/23 v.2.7 Univie Linguistic Theses (JSp)] %% ============================================================ @@ -288,10 +288,10 @@ This includes all drawings, sketches, graphics and internet sources.} \NewDocumentCommand\weblink{mo}{% \url{#1}% \IfNoValueTF{#2}% - {\ifthenelse{\isempty{\wlg@urldate}}{}{% + {\ifx\wlg@urldate\empty\else% \ \urldate{\wlg@urldate}% - }}% - {\ \urldate{#2}} + \fi}% + {\ \urldate{#2}}% } } diff --git a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg.cls b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg.cls index e85daaabe05..00deb089cca 100644 --- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg.cls +++ b/Master/texmf-dist/tex/latex/univie-ling/univie-ling-wlg.cls @@ -34,7 +34,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \NeedsTeXFormat{LaTeX2e}[2022/06/01] -\ProvidesPackage{univie-ling-wlg}[2024/06/27 v.2.6 Univie WLG journal layout (JSp)] +\ProvidesPackage{univie-ling-wlg}[2024/07/23 v.2.7 Univie WLG journal layout (JSp)] %% ============================================================ @@ -225,10 +225,10 @@ \NewDocumentCommand\weblink{mo}{% \url{#1}% \IfNoValueTF{#2}% - {\ifthenelse{\isempty{\wlg@urldate}}{}{% + {\ifx\wlg@urldate\empty\else% \ \urldate{\wlg@urldate}% - }}% - {\ \urldate{#2}} + \fi}% + {\ \urldate{#2}}% } } @@ -1043,6 +1043,8 @@ \if@wlg@covington \RequirePackage{covington} \renewcommand{\p@equation}[1]{(#1)} + \setlength\reflistindent{\parindent} + \setlength\reflistparsep{0pt} \fi diff --git a/Master/texmf-dist/tex/latex/univie-ling/univie-ling.bbx b/Master/texmf-dist/tex/latex/univie-ling/univie-ling.bbx index 43b942d15cf..985dc19f98b 100644 --- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling.bbx +++ b/Master/texmf-dist/tex/latex/univie-ling/univie-ling.bbx @@ -38,7 +38,7 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesFile{univie-ling.bbx}[2024/06/27 v.2.6 biblatex bibliography style] +\ProvidesFile{univie-ling.bbx}[2024/07/23 v.2.7 biblatex bibliography style] % Load base style (authoryear-comp) \RequireBibliographyStyle{authoryear-comp} diff --git a/Master/texmf-dist/tex/latex/univie-ling/univie-ling.cbx b/Master/texmf-dist/tex/latex/univie-ling/univie-ling.cbx index 30064c8f911..76000569402 100644 --- a/Master/texmf-dist/tex/latex/univie-ling/univie-ling.cbx +++ b/Master/texmf-dist/tex/latex/univie-ling/univie-ling.cbx @@ -36,7 +36,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\ProvidesFile{univie-ling.cbx}[2024/06/27 v.2.6 biblatex citation style] +\ProvidesFile{univie-ling.cbx}[2024/07/23 v.2.7 biblatex citation style] \RequireCitationStyle{authoryear-comp} diff --git a/Master/texmf-dist/tex/latex/ut-thesis/ut-thesis.cls b/Master/texmf-dist/tex/latex/ut-thesis/ut-thesis.cls index 07ca4382793..5c33490cbaa 100644 --- a/Master/texmf-dist/tex/latex/ut-thesis/ut-thesis.cls +++ b/Master/texmf-dist/tex/latex/ut-thesis/ut-thesis.cls @@ -13,8 +13,8 @@ %% [https://www.sgs.utoronto.ca/academic-progress/program-completion/formatting] %% %% Copyright (c) 1998-2013 Francois Pitt <fpitt@cs.utoronto.ca>, -%% 2020-2021 Jesse Knight <jesse.knight@mail.utoronto.ca> -%% last updated at 23:30 (EST) on Tue 20 July 2021 +%% 2020-2024 Jesse Knight <jesse.x.knight@protonmail.com> +%% last updated at 09:00 (BST) on Fri 26 July 2024 %% %% This work may be distributed and/or modified under the conditions of %% the LaTeX Project Public Licence, either version 1.3c of this licence @@ -30,7 +30,7 @@ %% This work has the LPPL maintenance status "maintained". %% %% The Current Maintainer of this work is -%% Jesse Knight <jesse.knight@mail.utoronto.ca>. +%% Jesse Knight <jesse.x.knight@protonmail.com>. %% %% This work consists of the files: %% - README @@ -39,19 +39,20 @@ %% - ut-thesis.pdf (derived user manual) %% - ut-thesis.cls (derived class file) %% -%% To generate ut-thesis.cls (class file), run: pdflatex ut-thesis.ins -%% To generate ut-thesis.pdf (documentation), run: pdflatex ut-thesis.dtx -%% To use the class, make ut-thesis.cls visible to your LaTeX distribution, -%% by placing ut-thesis.cls either in your working directory, -%% or in your texmf tree, perhaps: $texmf/tex/latex/ut-thesis/ut-thesis.cls -%% and the documentation: $texmf/doc/latex/ut-thesis/ut-thesis.pdf +%% Install ut-thesis from your favourite LaTeX distribution. +%% Alternatively, or to use the latest version: +%% - generate ut-thesis.cls (class file) using: pdflatex ut-thesis.ins +%% and copy to: $texmf/tex/latex/ut-thesis/ut-thesis.cls +%% - generate ut-thesis.pdf (documentation) using: pdflatex ut-thesis.dtx +%% and copy to: $texmf/doc/latex/ut-thesis/ut-thesis.pdf +%% or simply copy ut-thesis.cls to your working directory. %% %% See version history on GitHub: %% [https://github.com/jessexknight/ut-thesis] %% \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesClass{ut-thesis} -[2023/02/08 v3.1.7 University of Toronto thesis class] +[2024/07/26 v3.1.8 University of Toronto thesis class] \newif\ifmargins@equal \newlength{\margin@base} \newlength{\margin@offset} diff --git a/Master/texmf-dist/tex/latex/wheelchart/wheelchart.sty b/Master/texmf-dist/tex/latex/wheelchart/wheelchart.sty index e2c85439761..21e232b099b 100644 --- a/Master/texmf-dist/tex/latex/wheelchart/wheelchart.sty +++ b/Master/texmf-dist/tex/latex/wheelchart/wheelchart.sty @@ -18,7 +18,7 @@ \NeedsTeXFormat{LaTeX2e} \RequirePackage{tikz} \usetikzlibrary{calc} -\ProvidesExplPackage{wheelchart}{2024/03/08}{3.0}{Diagrams with circular or other shapes using TikZ and LaTeX3} +\ProvidesExplPackage{wheelchart}{2024/07/28}{4.0}{Diagrams with circular or other shapes using TikZ and LaTeX3} %%> \subsection{Variables} @@ -59,6 +59,8 @@ \fp_const:Nn \c__wheelchart_arc_data_end_factor_left_fp { 1 } \fp_const:Nn \c__wheelchart_arc_data_end_factor_right_fp { 0 } \fp_new:N \l__wheelchart_arc_data_line_sep_factor_fp +\fp_new:N \l__wheelchart_arc_data_lines_pos_fp +\fp_new:N \l__wheelchart_arc_data_lines_shift_fp \fp_new:N \l__wheelchart_arc_data_pos_fp \fp_new:N \l__wheelchart_arc_data_radius_plot_false_fp \fp_new:N \l__wheelchart_arc_data_sep_fp @@ -168,6 +170,9 @@ \int_new:N \l__wheelchart_lines_ext_top_dir_int \int_new:N \l__wheelchart_max_list_items_int +\regex_const:Nn \c__wheelchart_braces_regex { \{(.+)\} } +\regex_const:Nn \c__wheelchart_key_braces_regex { [\w\s]+\{(.+)\} } + \seq_new:N \l__wheelchart_arc_data_seq \seq_new:N \l__wheelchart_discrete_coefficients_first_seq \seq_new:N \l__wheelchart_discrete_coefficients_second_seq @@ -180,8 +185,8 @@ { sign ( \l__wheelchart_arc_data_dir_fp ) * ( - \cs:w c__wheelchart_arc_data_start_factor_\l__wheelchart_arc_data_align_tl _fp\cs_end: - + \cs:w c__wheelchart_arc_data_end_factor_\l__wheelchart_arc_data_align_tl _fp\cs_end: + \cs:w c__wheelchart_arc_data_start_factor_\l__wheelchart_arc_data_align_tl _fp \cs_end: + + \cs:w c__wheelchart_arc_data_end_factor_\l__wheelchart_arc_data_align_tl _fp \cs_end: ) } \tl_new:N \l__wheelchart_arc_data_align_tl @@ -262,7 +267,7 @@ \cs_new_protected:Npn \__wheelchart_caption_and_title:nnnnn #1#2#3#4#5 { - \__wheelchart_if_text:nn {#1} + \__wheelchart_if_text:nnn {#1} { o } { \node [ anchor = #2 , align = #3 , / wheelchart / #1_style ] at ( $ (#4) + ( 0 , { #5 * ( \pgfkeysvalueof { / wheelchart / #1~sep } ) } ) $ ) @@ -282,12 +287,12 @@ { \fp_eval:n { - ( 1 - (#1) ) * \cs:w g__wheelchart_slice_inner_start_angle_\WCcount _fp\cs_end: - + (#1) * \cs:w g__wheelchart_slice_inner_end_angle_\WCcount _fp\cs_end: + ( 1 - (#1) ) * \cs:w g__wheelchart_slice_inner_start_angle_\WCcount _fp \cs_end: + + (#1) * \cs:w g__wheelchart_slice_inner_end_angle_\WCcount _fp \cs_end: + \l__wheelchart_counter_or_clockwise_fp * (#2) } } - { \fp_eval:n { \cs:w g__wheelchart_inner_radius_\WCcount _fp\cs_end: - (#4) } } + { \fp_eval:n { \cs:w g__wheelchart_inner_radius_\WCcount _fp \cs_end: - (#4) } } ) ! { \fp_eval:n {#3} } ! ( @@ -295,12 +300,12 @@ { \fp_eval:n { - ( 1 - (#1) ) * \cs:w g__wheelchart_slice_outer_start_angle_\WCcount _fp\cs_end: - + (#1) * \cs:w g__wheelchart_slice_outer_end_angle_\WCcount _fp\cs_end: + ( 1 - (#1) ) * \cs:w g__wheelchart_slice_outer_start_angle_\WCcount _fp \cs_end: + + (#1) * \cs:w g__wheelchart_slice_outer_end_angle_\WCcount _fp \cs_end: + \l__wheelchart_counter_or_clockwise_fp * (#2) } } - { \fp_eval:n { \cs:w g__wheelchart_outer_radius_\WCcount _fp\cs_end: + (#4) } } + { \fp_eval:n { \cs:w g__wheelchart_outer_radius_\WCcount _fp \cs_end: + (#4) } } ) $%note the () around the #i's to keep these contents together } @@ -374,10 +379,10 @@ \path let \p { l__wheelchart_def_angle_1 } = \__wheelchart_point_plot_true:nnnnn { \WCcount } {#1} {#2} { 0 } - { \fp_eval:n { (#4) + 1 / \cs:w g__wheelchart_samples_\WCcount _fp\cs_end: } } , + { \fp_eval:n { (#4) + 1 / \cs:w g__wheelchart_samples_\WCcount _fp \cs_end: } } , \p { l__wheelchart_def_angle_2 } = \__wheelchart_point_plot_true:nnnnn { \WCcount } {#1} {#2} { 1 } - { \fp_eval:n { (#4) + 1 / \cs:w g__wheelchart_samples_\WCcount _fp\cs_end: } } + { \fp_eval:n { (#4) + 1 / \cs:w g__wheelchart_samples_\WCcount _fp \cs_end: } } in [ / utils / exec = { \__wheelchart_def_angle_aux: } ] ; } @@ -392,10 +397,10 @@ { ( 1 - (#2) ) * ( - \cs:w g__wheelchart_slice_outer_start_angle_#1_fp\cs_end: - - \cs:w g__wheelchart_slice_inner_start_angle_#1_fp\cs_end: + \cs:w g__wheelchart_slice_outer_start_angle_#1_fp \cs_end: + - \cs:w g__wheelchart_slice_inner_start_angle_#1_fp \cs_end: ) - + (#2) * ( \cs:w g__wheelchart_slice_outer_end_angle_#1_fp\cs_end: - \cs:w g__wheelchart_slice_inner_end_angle_#1_fp\cs_end: ) + + (#2) * ( \cs:w g__wheelchart_slice_outer_end_angle_#1_fp \cs_end: - \cs:w g__wheelchart_slice_inner_end_angle_#1_fp \cs_end: ) } \cs_new:Npn \__wheelchart_def_angle_plot_false:nnnnn #1#2#3#4#5 @@ -410,11 +415,11 @@ ( sqrt ( - ( \cs:w g__wheelchart_outer_radius_#1_fp\cs_end: + \cs:w g__wheelchart_inner_radius_#1_fp\cs_end: ) ^ 2 - - \cs:w g__wheelchart_outer_radius_#1_fp\cs_end: * \cs:w g__wheelchart_inner_radius_#1_fp\cs_end: * + ( \cs:w g__wheelchart_outer_radius_#1_fp \cs_end: + \cs:w g__wheelchart_inner_radius_#1_fp \cs_end: ) ^ 2 + - \cs:w g__wheelchart_outer_radius_#1_fp \cs_end: * \cs:w g__wheelchart_inner_radius_#1_fp \cs_end: * ( 2 + 2 * cosd ( \__wheelchart_def_angle_plot_false_aux_angle:nn {#1} {#2} ) - + \cs:w g__wheelchart_outer_radius_#1_fp\cs_end: * \cs:w g__wheelchart_inner_radius_#1_fp\cs_end: + + \cs:w g__wheelchart_outer_radius_#1_fp \cs_end: * \cs:w g__wheelchart_inner_radius_#1_fp \cs_end: * ( ( @@ -425,25 +430,25 @@ ) ) ) - + \cs:w g__wheelchart_inner_radius_#1_fp\cs_end: * + + \cs:w g__wheelchart_inner_radius_#1_fp \cs_end: * ( - \cs:w g__wheelchart_inner_radius_#1_fp\cs_end: - - \cs:w g__wheelchart_outer_radius_#1_fp\cs_end: + \cs:w g__wheelchart_inner_radius_#1_fp \cs_end: + - \cs:w g__wheelchart_outer_radius_#1_fp \cs_end: * cosd ( \__wheelchart_def_angle_plot_false_aux_angle:nn {#1} {#2} ) ) / \__wheelchart_def_radius:nnn {#1} {#4} {#5} ) - * \cs:w g__wheelchart_outer_radius_#1_fp\cs_end: * sind ( \__wheelchart_def_angle_plot_false_aux_angle:nn {#1} {#2} ) + * \cs:w g__wheelchart_outer_radius_#1_fp \cs_end: * sind ( \__wheelchart_def_angle_plot_false_aux_angle:nn {#1} {#2} ) / ( - ( \cs:w g__wheelchart_outer_radius_#1_fp\cs_end: + \cs:w g__wheelchart_inner_radius_#1_fp\cs_end: ) ^ 2 - - 2 * \cs:w g__wheelchart_outer_radius_#1_fp\cs_end: * \cs:w g__wheelchart_inner_radius_#1_fp\cs_end: + ( \cs:w g__wheelchart_outer_radius_#1_fp \cs_end: + \cs:w g__wheelchart_inner_radius_#1_fp \cs_end: ) ^ 2 + - 2 * \cs:w g__wheelchart_outer_radius_#1_fp \cs_end: * \cs:w g__wheelchart_inner_radius_#1_fp \cs_end: * ( 1 + cosd ( \__wheelchart_def_angle_plot_false_aux_angle:nn {#1} {#2} ) ) ) ) } - + ( 1 - (#2) ) * ( \cs:w g__wheelchart_slice_inner_start_angle_#1_fp\cs_end: ) - + (#2) * ( \cs:w g__wheelchart_slice_inner_end_angle_#1_fp\cs_end: ) + + ( 1 - (#2) ) * ( \cs:w g__wheelchart_slice_inner_start_angle_#1_fp \cs_end: ) + + (#2) * ( \cs:w g__wheelchart_slice_inner_end_angle_#1_fp \cs_end: ) + \l__wheelchart_counter_or_clockwise_fp * (#3) } } @@ -451,7 +456,7 @@ \cs_new_protected:Npn \__wheelchart_def_coord:nnnn #1#2#3#4 { \path let \p { l__wheelchart_coord } = - ( \cs:w __wheelchart_#2_plot:nn\cs_end: {#4} { \fp_use:c { g__wheelchart_#2_radius_\WCcount _fp } } ) + ( \cs:w __wheelchart_#2_plot:nn \cs_end: {#4} { \fp_use:c { g__wheelchart_#2_radius_\WCcount _fp } } ) in [ / utils / exec = @@ -484,11 +489,11 @@ < \l__wheelchart_gap_fp ? - min ( \cs:w g__wheelchart_abs_half_angle_minus_new_angle_\WCcount _fp\cs_end: , \l__wheelchart_gap_max_angle_def_fp ) + min ( \cs:w g__wheelchart_abs_half_angle_minus_new_angle_\WCcount _fp \cs_end: , \l__wheelchart_gap_max_angle_def_fp ) : asind ( min ( \l__wheelchart_gap_fp / ( (#2) + 1 - sign (#2) ) , 1 ) ) + \l__wheelchart_gap_polar_fp - %note the min ( ... , 1 ) such that the asind is always defined - %also note the + 1 - sign (#2) such that the denominator is also nonzero if #2 = 0 + %note the min ( ... , 1 ) so that the asind is always defined + %also note the + 1 - sign (#2) so that the denominator is also nonzero if #2 = 0 } } @@ -516,7 +521,7 @@ : \g__wheelchart_new_angle_fp - \g__wheelchart_angle_fp ) - / \cs:w g__wheelchart_samples_1_fp\cs_end: + / \cs:w g__wheelchart_samples_1_fp \cs_end: } \path let \p { l__wheelchart_slices_orientation_1 } = @@ -579,8 +584,8 @@ { \fp_eval:n { - ( 1 - (#2) ) * ( \cs:w g__wheelchart_inner_radius_#1_fp\cs_end: - (#3) ) - + (#2) * ( \cs:w g__wheelchart_outer_radius_#1_fp\cs_end: + (#3) ) + ( 1 - (#2) ) * ( \cs:w g__wheelchart_inner_radius_#1_fp \cs_end: - (#3) ) + + (#2) * ( \cs:w g__wheelchart_outer_radius_#1_fp \cs_end: + (#3) ) } } @@ -591,26 +596,26 @@ { \fp_gset:cn { g__wheelchart_slice_#1_#2_angle_\WCcount _fp } { - \cs:w g__wheelchart_#3angle_fp\cs_end: + + \cs:w g__wheelchart_#3angle_fp \cs_end: + ( \l__wheelchart_counter_or_clockwise_fp * - ( (#4) * \cs:w g__wheelchart_#1_gap_\WCcount _fp\cs_end: + \cs:w l__wheelchart_slices_#1_#2_angle_shift_fp\cs_end: ) + ( (#4) * \cs:w g__wheelchart_#1_gap_\WCcount _fp \cs_end: + \cs:w l__wheelchart_slices_#1_#2_angle_shift_fp \cs_end: ) ) } } { \fp_gset:cn { g__wheelchart_slice_#1_#2_angle_\WCcount _fp } { - \cs:w g__wheelchart_#3angle_fp\cs_end: + + \cs:w g__wheelchart_#3angle_fp \cs_end: + ( \l__wheelchart_counter_or_clockwise_fp * ( - (#4) * \cs:w g__wheelchart_#1_gap_\WCcount _fp\cs_end: + \cs:w l__wheelchart_slices_#1_#2_angle_shift_fp\cs_end: + (#4) * \cs:w g__wheelchart_#1_gap_\WCcount _fp \cs_end: + \cs:w l__wheelchart_slices_#1_#2_angle_shift_fp \cs_end: - asind ( - \cs:w g__wheelchart_inner_radius_\WCcount _fp\cs_end: - * sind ( \cs:w l__wheelchart_slices_#1_#2_angle_shift_fp\cs_end: ) - / \cs:w g__wheelchart_outer_radius_\WCcount _fp\cs_end: + \cs:w g__wheelchart_inner_radius_\WCcount _fp \cs_end: + * sind ( \cs:w l__wheelchart_slices_#1_#2_angle_shift_fp \cs_end: ) + / \cs:w g__wheelchart_outer_radius_\WCcount _fp \cs_end: ) ) ) @@ -620,8 +625,8 @@ \cs_new_protected:Npn \__wheelchart_def_slice_keys:n #1 { - {%note the double {{...}} such that the contents is in a group - %such that pgfkeys which are specific to the current slice are local for this slice + {%note the double braces {{...}} so that the contents is in a group + %and in particular, pgfkeys which are specific to the current slice are local for this slice \clist_if_in:NVT \l__wheelchart_slice_range_local_clist \WCcount { \pgfkeys { / wheelchart , slice_final /. expanded = { \exp_not:v { l__wheelchart_slice_\WCcount _keys_clist } } } @@ -663,24 +668,24 @@ %g__wheelchart_WCcount_counter to be larger than \WCtotalcount \tl_build_end:N \WClegend \cs_set:Npn \WCcount { \theg__wheelchart_WCcount_counter } - \cs_set:Npn \WCpercentage { \cs:w l__wheelchart_WCpercentage_\theg__wheelchart_WCcount_counter\cs_end: } - \cs_set:Npn \WCpercentagerounded { \cs:w l__wheelchart_WCpercentagerounded_\theg__wheelchart_WCcount_counter\cs_end: } + \cs_set:Npn \WCpercentage { \cs:w l__wheelchart_WCpercentage_\theg__wheelchart_WCcount_counter \cs_end: } + \cs_set:Npn \WCpercentagerounded { \cs:w l__wheelchart_WCpercentagerounded_\theg__wheelchart_WCcount_counter \cs_end: } \str_if_eq:eeTF { \l__wheelchart_type_tl } { etoc } { \cs_set:Npn \WCetocthelinkedname - { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_linked_name_\theg__wheelchart_WCcount_counter\cs_end: } + { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_linked_name_\theg__wheelchart_WCcount_counter \cs_end: } \cs_set:Npn \WCetocthelinkednumber - { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_linked_number_\theg__wheelchart_WCcount_counter\cs_end: } + { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_linked_number_\theg__wheelchart_WCcount_counter \cs_end: } \cs_set:Npn \WCetocthelinkedpage - { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_linked_page_\theg__wheelchart_WCcount_counter\cs_end: } + { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_linked_page_\theg__wheelchart_WCcount_counter \cs_end: } \cs_set:Npn \WCetocthename - { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_name_\theg__wheelchart_WCcount_counter\cs_end: } + { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_name_\theg__wheelchart_WCcount_counter \cs_end: } \cs_set:Npn \WCetocthenumber - { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_number_\theg__wheelchart_WCcount_counter\cs_end: } + { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_number_\theg__wheelchart_WCcount_counter \cs_end: } \cs_set:Npn \WCetocthepage - { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_page_\theg__wheelchart_WCcount_counter\cs_end: } + { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_page_\theg__wheelchart_WCcount_counter \cs_end: } \cs_set:Npn \WCetocthenumberofpages - { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_number_of_pages_\theg__wheelchart_WCcount_counter\cs_end: } + { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _the_number_of_pages_\theg__wheelchart_WCcount_counter \cs_end: } } { \clist_if_empty:NTF \l__wheelchart_header_clist @@ -688,7 +693,7 @@ \int_step_inline:nn { \l__wheelchart_max_list_items_int } { \cs_set:cpn { WCvar\int_to_Alph:n {##1} } - { \cs:w l__wheelchart_item_WCvar\int_to_Alph:n {##1}_\theg__wheelchart_WCcount_counter\cs_end: } + { \cs:w l__wheelchart_item_WCvar\int_to_Alph:n {##1}_\theg__wheelchart_WCcount_counter \cs_end: } } } { @@ -717,13 +722,13 @@ ( atand ( - \cs:w g__wheelchart_#3_y_fp\cs_end: - \cs:w g__wheelchart_#4_y_fp\cs_end: , - \cs:w g__wheelchart_#3_x_fp\cs_end: - \cs:w g__wheelchart_#4_x_fp\cs_end: + \cs:w g__wheelchart_#3_y_fp \cs_end: - \cs:w g__wheelchart_#4_y_fp \cs_end: , + \cs:w g__wheelchart_#3_x_fp \cs_end: - \cs:w g__wheelchart_#4_x_fp \cs_end: ) - atand ( - \cs:w g__wheelchart_#1_y_fp\cs_end: - \cs:w g__wheelchart_#2_y_fp\cs_end: , - \cs:w g__wheelchart_#1_x_fp\cs_end: - \cs:w g__wheelchart_#2_x_fp\cs_end: + \cs:w g__wheelchart_#1_y_fp \cs_end: - \cs:w g__wheelchart_#2_y_fp \cs_end: , + \cs:w g__wheelchart_#1_x_fp \cs_end: - \cs:w g__wheelchart_#2_x_fp \cs_end: ) ) } @@ -969,9 +974,9 @@ \__wheelchart_for_loop:n { \pgfkeysvalueof { / wheelchart / before~slices } - \int_step_inline:nn { \fp_eval:n { round ( \cs:w g__wheelchart_value_\WCcount _fp\cs_end: ) } } - %note that \fp_eval:n { round ( ... ) } is necessary even when the value is an integer because if parse=pgfmath - %then .0 is added and then \int_step_inline:nn { \cs:w g__wheelchart_value_\WCcount _fp\cs_end: } would give the messages + \int_step_inline:nn { \fp_eval:n { round ( \cs:w g__wheelchart_value_\WCcount _fp \cs_end: ) } } + %note that \fp_eval:n { round ( ... ) } is necessary even when the value is an integer because pgfmath + %could have added .0 and then \int_step_inline:nn { \cs:w g__wheelchart_value_\WCcount _fp \cs_end: } would give the messages %Missing character: There is no . in font nullfont! Missing character: There is no 0 in font nullfont! { \int_gincr:N \g__wheelchart_discrete_count_int @@ -1082,7 +1087,7 @@ \cs_set:Npe \WCmidangle { \fp_use:c { g__wheelchart_WCmidangle_\WCcount _fp } } \pgfkeysvalueof { / wheelchart / for~loop~start }%this must be placed after the definition of macros such as \WCpercentage - %such that these macros can be used in the key for loop start + %so that these macros can be used in the key for loop start \begin { scope } [ shift = { ( \WCmidangle \c_colon_str \fp_use:c { g__wheelchart_explode_\WCcount _fp } ) } , @@ -1161,16 +1166,21 @@ \fp_gset:cn { g__wheelchart_#1_\WCcount _fp } { \pgfmathresult } } -\cs_new_protected:Npn \__wheelchart_if_text:nn #1#2 +\cs_new_protected:Npn \__wheelchart_if_text:nnn #1#2#3 { %https://tex.stackexchange.com/questions/42280/expand-away-empty-macros-within-ifthenelse %https://tex.stackexchange.com/questions/44919/proper-way-to-detect-empty-blank-text \begin { pgfinterruptpicture } + \DeclareDocumentCommand \\ {#2} {} + %for arc data, \\ is used with seq_set_split so has no optional argument thus then #2 is empty + %otherwise, #2 is o + %no s because an optional star does not apply in a node + %no ! because a space between \\ and its optional argument is allowed in a node %https://tex.stackexchange.com/questions/459853/savebox-within-tikzpicture-results-in-an-empty-savebox \hbox_gset:Nn \g__wheelchart_if_text_box { \pgfkeysvalueof { / wheelchart / #1 } } \end { pgfinterruptpicture } \dim_compare:nNnT { \box_wd:N \g__wheelchart_if_text_box } > { 0 pt } - { {#2} } + { {#3} } } \cs_new_protected:Npn \__wheelchart_initial:n #1 @@ -1182,7 +1192,7 @@ \tl_if_empty:nTF {#1} { \cs_set:Npn \WCtotalcount { 0 } } { - \cs:w seq_set_split:Ne\l__wheelchart_expand_list_tl\cs_end: + \cs:w seq_set_split:Ne\l__wheelchart_expand_list_tl \cs_end: \l__wheelchart_list_seq { \pgfkeysvalueof { / wheelchart / separator~rows } } {#1} @@ -1190,7 +1200,7 @@ \int_zero:N \l__wheelchart_max_list_items_int \seq_map_indexed_inline:Nn \l__wheelchart_list_seq { - \cs:w seq_set_split:Ne\l__wheelchart_expand_list_items_tl\cs_end: + \cs:w seq_set_split:Ne\l__wheelchart_expand_list_items_tl \cs_end: \l__wheelchart_list_items_seq { \pgfkeysvalueof { / wheelchart / separator~columns } } {##2} @@ -1245,7 +1255,7 @@ \etocsetnexttocdepth { -1 }%only for the next toc \etocsetstyle { \l__wheelchart_etoc_level_tl } {} {} { - \int_compare:nNnT { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int\cs_end: } > { 0 } + \int_compare:nNnT { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int \cs_end: } > { 0 } { \cs_gset:cpe { @@ -1304,7 +1314,7 @@ {} \int_gzero_new:c { g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int } \pgfkeysvalueof { / wheelchart / etoc~code } - \int_compare:nNnT { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int\cs_end: } > { 0 } + \int_compare:nNnT { \cs:w g__wheelchart_etoc_item_\l__wheelchart_etoc_name_tl _count_int \cs_end: } > { 0 } { \cs_gset:cpe { @@ -1331,32 +1341,32 @@ { \__wheelchart_def_slice_keys:n { \__wheelchart_gdef_count_fp:nn { value } { value } } - \cs_set:Npe \WCtotalnum { \fp_eval:n { \WCtotalnum + \cs:w g__wheelchart_value_\WCcount _fp\cs_end: } } + \cs_set:Npe \WCtotalnum { \fp_eval:n { \WCtotalnum + \cs:w g__wheelchart_value_\WCcount _fp \cs_end: } } } \int_step_inline:nn { \WCtotalcount } { \cs_set:cpe { l__wheelchart_WCpercentage_##1 } - { \fp_eval:n { \cs:w g__wheelchart_value_##1_fp\cs_end: / ( \WCtotalnum / 100 ) } } + { \fp_eval:n { \cs:w g__wheelchart_value_##1_fp \cs_end: / ( \WCtotalnum / 100 ) } } \cs_set:cpe { l__wheelchart_WCpercentagerounded_##1 } - { \fp_eval:n { round ( \cs:w l__wheelchart_WCpercentage_##1\cs_end: , \pgfkeysvalueof { / wheelchart / perc~precision } ) } } + { \fp_eval:n { round ( \cs:w l__wheelchart_WCpercentage_##1 \cs_end: , \pgfkeysvalueof { / wheelchart / perc~precision } ) } } } } \cs_new_protected:Npn \__wheelchart_inner_and_wheel_data:n #1 { - \__wheelchart_if_text:nn { #1~data } + \__wheelchart_if_text:nnn { #1~data } { o } { \__wheelchart_def_fp:nn { #1_data_angle_pos } { #1~data~angle~pos } \__wheelchart_def_fp:nn { #1_data_angle_shift } { #1~data~angle~shift } \__wheelchart_def_fp:nn { #1_data_pos } { #1~data~pos } \__wheelchart_def_fp:nn { #1_data_sep } { #1~data~sep } \node [ align = left , / wheelchart / #1_data_style ] at - \cs:w __wheelchart_point_plot_\bool_to_str:N \l__wheelchart_plot_bool :nnnnn\cs_end: + \cs:w __wheelchart_point_plot_\bool_to_str:N \l__wheelchart_plot_bool :nnnnn \cs_end: { \WCcount } - { \cs:w l__wheelchart_#1_data_angle_pos_fp\cs_end: } - { \cs:w l__wheelchart_#1_data_angle_shift_fp\cs_end: } - { \cs:w l__wheelchart_#1_data_pos_fp\cs_end: } - { \cs:w l__wheelchart_#1_data_sep_fp\cs_end: } + { \cs:w l__wheelchart_#1_data_angle_pos_fp \cs_end: } + { \cs:w l__wheelchart_#1_data_angle_shift_fp \cs_end: } + { \cs:w l__wheelchart_#1_data_pos_fp \cs_end: } + { \cs:w l__wheelchart_#1_data_sep_fp \cs_end: } { \pgfkeysvalueof { / wheelchart / #1~data } } ; } } @@ -1366,13 +1376,13 @@ \cs_new_protected:Npn \__wheelchart_legend_append:nn #1#2 { - \tl_build_put_right:NV \WClegend \l__wheelchart_legend_row_tl%note the V specifier such that \WClegend can also be combined - %with an S column of the package siunitx and such that \WClegend can be used in a tblr environment of the package tabularray + \tl_build_put_right:NV \WClegend \l__wheelchart_legend_row_tl%note the V specifier so that \WClegend can also be combined + %with an S column of the package siunitx and so that \WClegend can be used in a tblr environment of the package tabularray %and then the option expand=\WClegend needs to be given to the tblr environment \tl_build_put_right:Nn \WClegend { \protect \setcounter { g__wheelchart_WCcount_counter } }%note the \protect for in case that %\WClegend would be parsed in a particular way %note that the counter g__wheelchart_WCcount_counter is defined globally and at the end of the previous \l__wheelchart_legend_row_tl - %such that this value is defined and has the right value at the start of the next \l__wheelchart_legend_row_tl + %so that this value is defined and has the right value at the start of the next \l__wheelchart_legend_row_tl %if \WClegend is used in a tblr environment of the package tabularray then \UseTblrLibrary{counter} is required \tl_build_put_right:Ne \WClegend { { \int_eval:n {#1} } } \tl_build_put_right:Nn \WClegend {#2} @@ -1414,8 +1424,8 @@ { atand ( - \cs:w g__wheelchart_#3_y_fp\cs_end: - \cs:w g__wheelchart_#4_y_fp\cs_end: , - \cs:w g__wheelchart_#3_x_fp\cs_end: - \cs:w g__wheelchart_#4_x_fp\cs_end: + \cs:w g__wheelchart_#3_y_fp \cs_end: - \cs:w g__wheelchart_#4_y_fp \cs_end: , + \cs:w g__wheelchart_#3_x_fp \cs_end: - \cs:w g__wheelchart_#4_x_fp \cs_end: ) } \fp_set:Nn \l__wheelchart_slices_arc_coord_fp @@ -1440,7 +1450,7 @@ ) : atand ( ( \l__wheelchart_slices_arc_A_fp - ( 1 / \l__wheelchart_slices_arc_A_fp ) ) / 2 ) - }%note the min ( \l__wheelchart_slices_arc_B_fp , 0 ) such that the acosd is always defined + }%note the min ( \l__wheelchart_slices_arc_B_fp , 0 ) so that the acosd is always defined } } ] @@ -1486,8 +1496,8 @@ * abs ( ( 1 / \l__wheelchart_slices_arc_A_fp ) + \l__wheelchart_slices_arc_A_fp ) * sqrt ( - ( \cs:w g__wheelchart_#3_x_fp\cs_end: - \cs:w g__wheelchart_#4_x_fp\cs_end: ) ^ 2 - + ( \cs:w g__wheelchart_#3_y_fp\cs_end: - \cs:w g__wheelchart_#4_y_fp\cs_end: ) ^ 2 + ( \cs:w g__wheelchart_#3_x_fp \cs_end: - \cs:w g__wheelchart_#4_x_fp \cs_end: ) ^ 2 + + ( \cs:w g__wheelchart_#3_y_fp \cs_end: - \cs:w g__wheelchart_#4_y_fp \cs_end: ) ^ 2 ) } } @@ -1539,11 +1549,11 @@ \fp_eval:n { ( - \cs:w g__wheelchart_#3_x_fp\cs_end: + \cs:w g__wheelchart_#4_x_fp\cs_end: + + \cs:w g__wheelchart_#3_x_fp \cs_end: + \cs:w g__wheelchart_#4_x_fp \cs_end: + ( \g__wheelchart_slices_orientation_fp * ( \l__wheelchart_slices_arrow_coord_fp - 1 ) * \l__wheelchart_slices_arrow_A_fp - * ( \cs:w g__wheelchart_#3_y_fp\cs_end: - \cs:w g__wheelchart_#4_y_fp\cs_end: ) + * ( \cs:w g__wheelchart_#3_y_fp \cs_end: - \cs:w g__wheelchart_#4_y_fp \cs_end: ) ) ) / 2 @@ -1552,11 +1562,11 @@ \fp_eval:n { ( - \cs:w g__wheelchart_#3_y_fp\cs_end: + \cs:w g__wheelchart_#4_y_fp\cs_end: + + \cs:w g__wheelchart_#3_y_fp \cs_end: + \cs:w g__wheelchart_#4_y_fp \cs_end: + ( \g__wheelchart_slices_orientation_fp * ( \l__wheelchart_slices_arrow_coord_fp - 1 ) * \l__wheelchart_slices_arrow_A_fp - * ( \cs:w g__wheelchart_#4_x_fp\cs_end: - \cs:w g__wheelchart_#3_x_fp\cs_end: ) + * ( \cs:w g__wheelchart_#4_x_fp \cs_end: - \cs:w g__wheelchart_#3_x_fp \cs_end: ) ) ) / 2 @@ -1593,10 +1603,10 @@ { \fp_eval:n { - ( 1 - (#1) / max ( round ( \cs:w g__wheelchart_value_\WCcount _fp\cs_end: ) , 1 ) ) - * \cs:w g__wheelchart_slice_#2_start_angle_\WCcount _fp\cs_end: - + (#1) * \cs:w g__wheelchart_slice_#2_end_angle_\WCcount _fp\cs_end: - / max ( round ( \cs:w g__wheelchart_value_\WCcount _fp\cs_end: ) , 1 ) + ( 1 - (#1) / max ( round ( \cs:w g__wheelchart_value_\WCcount _fp \cs_end: ) , 1 ) ) + * \cs:w g__wheelchart_slice_#2_start_angle_\WCcount _fp \cs_end: + + (#1) * \cs:w g__wheelchart_slice_#2_end_angle_\WCcount _fp \cs_end: + / max ( round ( \cs:w g__wheelchart_value_\WCcount _fp \cs_end: ) , 1 ) } } @@ -1617,17 +1627,19 @@ arc_style /. style = {} , arc~around~line /. initial = 1 , arc~around~text /. default = true ,%this key is not set up with /.is choice or \bool_set:Nn - %such that for example \WCvarA can be used as value for this key + %so that for example \WCvarA can be used as value for this key arc~around~text /. initial = false , arc~data /. initial = {} , arc~data~align /. code = { \tl_set:Nn \l__wheelchart_arc_data_align_tl {#1} } ,%this key is not set up with /.is choice - %such that for example \WCvarA can be used as value for this key + %so that for example \WCvarA can be used as value for this key arc~data~align = center , arc~data~angle~pos /. initial = 0.5 , arc~data~angle~shift /. initial = 0 , arc~data~dir /. initial = 1 , arc~data~expand /. initial = n , arc~data~line~sep~factor /. initial = 1 , + arc~data~lines~pos /. initial = 0.5 , + arc~data~lines~shift /. initial = 0 , arc~data~pos /. initial = 1 , arc~data~sep /. initial = 1 ex / 1 cm , arc~data~style /. style = { arc_data_style /. style = {#1} } , @@ -1640,7 +1652,7 @@ arc~sep /. initial = 1 ex / 1 cm , at /. initial = { ( 0 , 0 ) } , before~slices /. initial = {} , - bool_set_true /. code = { \bool_set_true:N #1 } , + bool_set_true /. code = \bool_set_true:N #1 , caption /. initial = {} , caption~left /. initial = {} , caption~left~sep /. initial = 0.5 , @@ -1670,9 +1682,9 @@ data~style /. style = { data_style /. style = {#1} } , data_style /. style = {} , discrete /. is~choice , - discrete / false /. code = { \bool_set_false:N \l__wheelchart_discrete_bool } , + discrete / false /. code = \bool_set_false:N \l__wheelchart_discrete_bool , discrete / false /. value~forbidden , - discrete / true /. code = { \bool_set_true:N \l__wheelchart_discrete_bool } , + discrete / true /. code = \bool_set_true:N \l__wheelchart_discrete_bool , discrete / true /. value~forbidden , discrete /. default = true , discrete = false , @@ -1777,7 +1789,7 @@ legend /. initial = {} , legend~columns /. initial = 1 , legend~entry /. initial = {} , - legend~only /. code = { \bool_set:Nn \l__wheelchart_legend_only_bool { \cs:w c_#1_bool\cs_end: } } , + legend~only /. code = \bool_set:Nn \l__wheelchart_legend_only_bool { \cs:w c_#1_bool \cs_end: } , legend~only /. default = true , legend~only = false , legend~row /. code = @@ -1800,7 +1812,7 @@ } , lines~ext~dirsep /. initial = 0 , lines~ext~fixed /. default = true ,%this key is not set up with /.is choice or \bool_set:Nn - %such that for example \WCvarA can be used as value for this key + %so that for example \WCvarA can be used as value for this key lines~ext~fixed /. initial = false , lines~ext~fixed~left /. initial = { @@ -1808,7 +1820,7 @@ { \l__wheelchart_lines_ext_dir_int * ( - \cs:w g__wheelchart_outer_radius_\WCcount _fp\cs_end: + \l__wheelchart_lines_sep_fp + \cs:w g__wheelchart_outer_radius_\WCcount _fp \cs_end: + \l__wheelchart_lines_sep_fp + \l__wheelchart_lines_fp + \l__wheelchart_lines_ext_fp ) } @@ -1819,7 +1831,7 @@ { \l__wheelchart_lines_ext_dir_int * ( - \cs:w g__wheelchart_outer_radius_\WCcount _fp\cs_end: + \l__wheelchart_lines_sep_fp + \cs:w g__wheelchart_outer_radius_\WCcount _fp \cs_end: + \l__wheelchart_lines_sep_fp + \l__wheelchart_lines_fp + \l__wheelchart_lines_ext_fp ) } @@ -1870,7 +1882,7 @@ outer_plot_style /. style = {} , outer~radius /. initial = 3 , perc~precision /. initial = 0 , - pie /. code = { \bool_set:Nn \l__wheelchart_pie_bool { \cs:w c_#1_bool\cs_end: } } , + pie /. code = \bool_set:Nn \l__wheelchart_pie_bool { \cs:w c_#1_bool \cs_end: } , pie /. default = true , pie = false , plot /. style = @@ -2029,12 +2041,12 @@ } , slices~inner /. initial = { - \fp_compare:nNnT { \cs:w g__wheelchart_inner_radius_\WCcount _fp\cs_end: } > { 0 } + \fp_compare:nNnT { \cs:w g__wheelchart_inner_radius_\WCcount _fp \cs_end: } > { 0 } { \fp_compare:nNnT - { \cs:w g__wheelchart_inner_gap_\WCcount _fp\cs_end: } + { \cs:w g__wheelchart_inner_gap_\WCcount _fp \cs_end: } < - { \cs:w g__wheelchart_abs_half_angle_minus_new_angle_\WCcount _fp\cs_end: } + { \cs:w g__wheelchart_abs_half_angle_minus_new_angle_\WCcount _fp \cs_end: } { arc [ @@ -2212,7 +2224,7 @@ {} } } , - slices~start~arrow/.style~2~args = + slices~start~arrow /. style~2~args = { slices~start = { @@ -2241,13 +2253,13 @@ (#1) - \fp_eval:n { - \l__wheelchart_counter_or_clockwise_fp * \cs:w g__wheelchart_value_1_fp\cs_end: * 0.5 + \l__wheelchart_counter_or_clockwise_fp * \cs:w g__wheelchart_value_1_fp \cs_end: * 0.5 * ( \l__wheelchart_total_angle_fp / \WCtotalnum ) } } } , start~half /. default = 90 , - title /. initial= {} , + title /. initial = {} , title~left /. initial = {} , title~left~sep /. initial = 0.5 , title~left~style /. style = { title~left_style /. style = {#1} } , @@ -2283,13 +2295,13 @@ { \cs_set:cpn {#1} { \use:e { \clist_item:nn {#2} { \int_mod:nn { \WCcount - 1 } { \clist_count:n {#2} } + 1 } } } - %note the \use:e such that \WClist<name> also works when given as an argument to pgfmath + %note the \use:e so that \WClist<name> also works when given as an argument to pgfmath %if the list contains a macro, for example %\begin{tikzpicture} %\def\n{1} %\wheelchart[ - % value=\WClistA, - % WClistA={\n} + % value=\WClistA, + % WClistA=\n %]{\exampleforthismanual} %\end{tikzpicture} %https://tex.stackexchange.com/questions/671298/clist-item-and-pgfmathsetmacro-causing-an-error @@ -2331,18 +2343,18 @@ { \tl_set:Ne \l__wheelchart_key_name_tl { \pgfkeyscurrentname }%it is necessary to define \l__wheelchart_key_name_tl %because \pgfkeyscurrentname will be overwritten by / errors / unknown~key /. expanded - \regex_match:nVTF { \{(.+)\} } \l__wheelchart_key_name_tl + \regex_match:NVTF \c__wheelchart_braces_regex \l__wheelchart_key_name_tl { \tl_set:Ne \l__wheelchart_key_range_tl { \pgfkeyscurrentname } - \regex_replace_all:nnN { \{(.+)\} } {} \l__wheelchart_key_name_tl - \regex_replace_all:nnN { [\w\s]+\{(.+)\} } { \1 } \l__wheelchart_key_range_tl + \regex_replace_all:NnN \c__wheelchart_braces_regex {} \l__wheelchart_key_name_tl + \regex_replace_all:NnN \c__wheelchart_key_braces_regex { \1 } \l__wheelchart_key_range_tl \str_if_eq:eeTF { \l__wheelchart_key_range_tl } { list } { \pgfkeys { / wheelchart , WC_list = { l__wheelchart_list_\l__wheelchart_key_name_tl } {#1} } \pgfkeys { / wheelchart , - \l__wheelchart_key_name_tl /. expand~once = { \cs:w l__wheelchart_list_\l__wheelchart_key_name_tl\cs_end: } + \l__wheelchart_key_name_tl /. expand~once = { \cs:w l__wheelchart_list_\l__wheelchart_key_name_tl \cs_end: } } } { @@ -2393,12 +2405,12 @@ \NewDocumentCommand \wheelchart { O {} m } { - {%note the double braces {{...}} such that the contents is in a group and such that & can be used in pgfmath in a tabular + {%note the double braces {{...}} so that the contents is in a group and so that & can be used in pgfmath in a tabular \pgfkeys { / wheelchart , #1 } \IfPackageLoadedTF { siunitx } { \cs_set:Npn \WCperc { \qty { \WCpercentagerounded } { \percent } } } { \cs_set:Npn \WCperc { \WCpercentagerounded \, \% } }%the definition of \WCperc is placed inside the command \wheelchart - %such that \WCperc is not defined outside this command + %so that \WCperc is not defined outside this command \bool_if:NTF \l__wheelchart_legend_only_bool { \__wheelchart_initial:n {#2} @@ -2430,7 +2442,7 @@ { \g__wheelchart_angle_fp + ( - \l__wheelchart_counter_or_clockwise_fp * \cs:w g__wheelchart_value_\WCcount _fp\cs_end: + \l__wheelchart_counter_or_clockwise_fp * \cs:w g__wheelchart_value_\WCcount _fp \cs_end: * ( \l__wheelchart_total_angle_fp / \WCtotalnum ) ) } @@ -2455,7 +2467,7 @@ \fp_gset:cn { g__wheelchart_abs_half_angle_minus_new_angle_\WCcount _fp } { abs ( \g__wheelchart_angle_fp - \g__wheelchart_new_angle_fp ) / 2 } \fp_set:Nn \l__wheelchart_abs_half_angle_minus_new_angle_minus_gap_polar_fp - { \cs:w g__wheelchart_abs_half_angle_minus_new_angle_\WCcount _fp\cs_end: - \l__wheelchart_gap_polar_fp } + { \cs:w g__wheelchart_abs_half_angle_minus_new_angle_\WCcount _fp \cs_end: - \l__wheelchart_gap_polar_fp } \fp_gzero_new:c { g__wheelchart_outer_gap_\WCcount _fp } \fp_gzero_new:c { g__wheelchart_inner_gap_\WCcount _fp } \bool_if:NTF \l__wheelchart_plot_bool @@ -2466,7 +2478,7 @@ { \fp_set:Nn \l__wheelchart_gap_max_angle_def_fp { - \cs:w g__wheelchart_inner_radius_\WCcount _fp\cs_end: > 0 + \cs:w g__wheelchart_inner_radius_\WCcount _fp \cs_end: > 0 ? 90 : @@ -2490,8 +2502,8 @@ ) ) } - \__wheelchart_def_gap:nn { outer } { \cs:w g__wheelchart_outer_radius_\WCcount _fp\cs_end: } - \__wheelchart_def_gap:nn { inner } { \cs:w g__wheelchart_inner_radius_\WCcount _fp\cs_end: } + \__wheelchart_def_gap:nn { outer } { \cs:w g__wheelchart_outer_radius_\WCcount _fp \cs_end: } + \__wheelchart_def_gap:nn { inner } { \cs:w g__wheelchart_inner_radius_\WCcount _fp \cs_end: } \fp_compare:nNnT { \l__wheelchart_abs_half_angle_minus_new_angle_minus_gap_polar_fp } > { 0.01 } { \fp_gset:cn { g__wheelchart_inner_radius_\WCcount _fp } @@ -2508,7 +2520,7 @@ ) ) , - \cs:w g__wheelchart_inner_radius_\WCcount _fp\cs_end: + \cs:w g__wheelchart_inner_radius_\WCcount _fp \cs_end: ) } } @@ -2523,14 +2535,14 @@ \__wheelchart_gdef_count_fp:nn { data_pos } { data~pos } \__wheelchart_gdef_count_fp:nn { data_sep } { data~sep } \__wheelchart_def_angle:nnnn - { \cs:w g__wheelchart_data_angle_pos_\WCcount _fp\cs_end: } - { \cs:w g__wheelchart_data_angle_shift_\WCcount _fp\cs_end: } - { \cs:w g__wheelchart_data_pos_\WCcount _fp\cs_end: } - { \cs:w g__wheelchart_data_sep_\WCcount _fp\cs_end: } + { \cs:w g__wheelchart_data_angle_pos_\WCcount _fp \cs_end: } + { \cs:w g__wheelchart_data_angle_shift_\WCcount _fp \cs_end: } + { \cs:w g__wheelchart_data_pos_\WCcount _fp \cs_end: } + { \cs:w g__wheelchart_data_sep_\WCcount _fp \cs_end: } \cs_set:Npe \WCdataangle { \pgfmathresult } \__wheelchart_gdef_count_fp:nn { explode } { explode } \pgfkeysvalueof { / wheelchart / for~loop~start }%this must be placed after the definition of macros such as - %\WCpercentage such that these macros can be used in the key for loop start + %\WCpercentage so that these macros can be used in the key for loop start \int_compare:nNnT { \WCcount } = { 1 } { \begin { scope } @@ -2601,7 +2613,7 @@ [ shift /. expanded = { - \cs:w __wheelchart_point_plot_\bool_to_str:N \l__wheelchart_plot_bool :nnnnn\cs_end: + \cs:w __wheelchart_point_plot_\bool_to_str:N \l__wheelchart_plot_bool :nnnnn \cs_end: { \WCcount } { \l__wheelchart_slices_angle_pos_fp } { \l__wheelchart_slices_angle_shift_fp } @@ -2639,9 +2651,9 @@ \__wheelchart_for_loop:n { \bool_if:NT \l__wheelchart_wheel_lines_bool - %this is placed inside \__wheelchart_for_loop:n such that wheel lines can be applied for specific slices + %this is placed inside \__wheelchart_for_loop:n so that wheel lines can be applied for specific slices { - \int_step_inline:nnn { 0 } { \fp_eval:n { round ( \cs:w g__wheelchart_value_\WCcount _fp\cs_end: ) } } + \int_step_inline:nnn { 0 } { \fp_eval:n { round ( \cs:w g__wheelchart_value_\WCcount _fp \cs_end: ) } } %note the \fp_eval:n { round ( ... ) } to avoid the messages Missing character: There is no ... in font nullfont! { \bool_if:NTF \l__wheelchart_plot_bool @@ -2783,14 +2795,14 @@ \fp_compare:nF { \l__wheelchart_lines_fp == 0 && \l__wheelchart_lines_ext_fp == 0 } { \draw [ / wheelchart / lines_style ] let \p { l__wheelchart_lines_1 } = - \cs:w __wheelchart_point_plot_\bool_to_str:N \l__wheelchart_plot_bool :nnnnn\cs_end: + \cs:w __wheelchart_point_plot_\bool_to_str:N \l__wheelchart_plot_bool :nnnnn \cs_end: { \WCcount } - { \cs:w g__wheelchart_data_angle_pos_\WCcount _fp\cs_end: } - { \cs:w g__wheelchart_data_angle_shift_\WCcount _fp\cs_end: } - { \cs:w g__wheelchart_data_pos_\WCcount _fp\cs_end: } + { \cs:w g__wheelchart_data_angle_pos_\WCcount _fp \cs_end: } + { \cs:w g__wheelchart_data_angle_shift_\WCcount _fp \cs_end: } + { \cs:w g__wheelchart_data_pos_\WCcount _fp \cs_end: } { \l__wheelchart_lines_sep_fp + \l__wheelchart_lines_fp } in - \cs:w __wheelchart_point_plot_\bool_to_str:N \l__wheelchart_plot_bool :nnnnn\cs_end: + \cs:w __wheelchart_point_plot_\bool_to_str:N \l__wheelchart_plot_bool :nnnnn \cs_end: { \WCcount } { \l__wheelchart_lines_angle_pos_fp } { \l__wheelchart_lines_angle_shift_fp } @@ -2838,7 +2850,7 @@ { \fp_eval:n { - \l__wheelchart_lines_ext_dir_int * \cs:w g__wheelchart_data_sep_\WCcount _fp\cs_end: + \l__wheelchart_lines_ext_dir_int * \cs:w g__wheelchart_data_sep_\WCcount _fp \cs_end: } } , 0 @@ -2849,7 +2861,7 @@ } ; } - \__wheelchart_if_text:nn { data } + \__wheelchart_if_text:nnn { data } { o } { \fp_compare:nNnTF { \l__wheelchart_lines_ext_fp } = { 0 } { @@ -2876,13 +2888,13 @@ \coordinate [ at = - \cs:w __wheelchart_point_plot_\bool_to_str:N \l__wheelchart_plot_bool :nnnnn\cs_end: + \cs:w __wheelchart_point_plot_\bool_to_str:N \l__wheelchart_plot_bool :nnnnn \cs_end: { \WCcount } - { \cs:w g__wheelchart_data_angle_pos_\WCcount _fp\cs_end: } - { \cs:w g__wheelchart_data_angle_shift_\WCcount _fp\cs_end: } - { \cs:w g__wheelchart_data_pos_\WCcount _fp\cs_end: } + { \cs:w g__wheelchart_data_angle_pos_\WCcount _fp \cs_end: } + { \cs:w g__wheelchart_data_angle_shift_\WCcount _fp \cs_end: } + { \cs:w g__wheelchart_data_pos_\WCcount _fp \cs_end: } { - \cs:w g__wheelchart_data_sep_\WCcount _fp\cs_end: + + \cs:w g__wheelchart_data_sep_\WCcount _fp \cs_end: + ( \l__wheelchart_lines_fp == 0 ? @@ -2902,7 +2914,7 @@ \node [ anchor = \l__wheelchart_data_anchor_tl , align = left , / wheelchart / data_style ] at ( g__wheelchart_data_coordinate ) { \pgfkeysvalueof { / wheelchart / data } } ;%a separate \node and not at the end of the \draw with lines_style - %such that the key lines style is not passed to this \node + %so that the key lines style is not passed to this \node } \__wheelchart_def_fp:nn { arc_around_line } { arc~around~line } \__wheelchart_def_fp:nn { arc_data_angle_pos } { arc~data~angle~pos } @@ -2913,14 +2925,16 @@ \fp_gset:Nn \g__wheelchart_half_ex_over_one_cm_fp { 0.5 ex / 1 cm }% \endpgfinterruptpicture% \fp_gset:Nn \g__wheelchart_arc_data_aux_ii_fp { 0 } - \__wheelchart_if_text:nn { arc~data } + \__wheelchart_if_text:nnn { arc~data } {} { - \cs_set:Npn \WCperc { \WCpercentagerounded { \, } { \% } }%such that \WCperc follows the arc if used in arc data + \cs_set:Npn \WCperc { \WCpercentagerounded { \, } { \% } }%so that \WCperc follows the arc if used in arc data %this redefinition of \WCperc is local to the group of arc data \__wheelchart_def_fp:nn { arc_data_pos } { arc~data~pos } \__wheelchart_def_fp:nn { arc_data_sep } { arc~data~sep } \__wheelchart_def_fp:nn { arc_data_line_sep_factor } { arc~data~line~sep~factor } - \cs:w seq_set_split:Nn\pgfkeysvalueof { / wheelchart / arc~data~expand }\cs_end: + \__wheelchart_def_fp:nn { arc_data_lines_pos } { arc~data~lines~pos } + \__wheelchart_def_fp:nn { arc_data_lines_shift } { arc~data~lines~shift } + \cs:w seq_set_split:Nn\pgfkeysvalueof { / wheelchart / arc~data~expand } \cs_end: \l__wheelchart_arc_data_seq { \\ } { \pgfkeysvalueof { / wheelchart / arc~data } } @@ -2928,13 +2942,17 @@ { \fp_set:Nn \l__wheelchart_arc_data_text_pos_fp { - \l__wheelchart_arc_data_pos_fp + 2 * \g__wheelchart_slices_orientation_fp - * ( 2 * ####1 - \seq_count:N \l__wheelchart_arc_data_seq - 1 ) * sign ( \l__wheelchart_arc_data_dir_fp ) + \l__wheelchart_arc_data_pos_fp + 4 * \g__wheelchart_slices_orientation_fp * + ( + ####1 - 1 - \l__wheelchart_arc_data_lines_pos_fp * ( \seq_count:N \l__wheelchart_arc_data_seq - 1 ) + + \l__wheelchart_arc_data_lines_shift_fp + ) + * sign ( \l__wheelchart_arc_data_dir_fp ) * \l__wheelchart_arc_data_line_sep_factor_fp * \g__wheelchart_half_ex_over_one_cm_fp / ( - \cs:w g__wheelchart_outer_radius_\WCcount _fp\cs_end: - - \cs:w g__wheelchart_inner_radius_\WCcount _fp\cs_end: + \cs:w g__wheelchart_outer_radius_\WCcount _fp \cs_end: + - \cs:w g__wheelchart_inner_radius_\WCcount _fp \cs_end: + 2 * \l__wheelchart_arc_data_sep_fp ) }%the sign is needed because \l__wheelchart_arc_data_dir_fp is not necessarily 1 or -1 @@ -2957,9 +2975,9 @@ / wheelchart / arc_data_style } }%get the length of the path - %note the option overlay such that this does not increase the bounding box + %note the option overlay so that this does not increase the bounding box %note the {} at the start of text and the braces around \fp_gset:Nn ... - %such that the compilation does not stall + %so that the compilation does not stall { 0 } { 1 } { \l__wheelchart_plot_variable_tl } @@ -3033,7 +3051,7 @@ { \l__wheelchart_arc_data_text_pos_fp } { \l__wheelchart_arc_data_sep_fp + \g__wheelchart_half_ex_over_one_cm_fp } + \l__wheelchart_counter_or_clockwise_fp * \l__wheelchart_arc_data_dir_fp - * \cs:w c__wheelchart_arc_data_start_factor_\l__wheelchart_arc_data_align_tl _fp\cs_end: + * \cs:w c__wheelchart_arc_data_start_factor_\l__wheelchart_arc_data_align_tl _fp \cs_end: * \l__wheelchart_arc_data_total_angle_plot_false_fp } \path @@ -3188,7 +3206,7 @@ } \bool_if:NT \l__wheelchart_legend_row_bool { \__wheelchart_def_WClegend: } - \__wheelchart_if_text:nn { middle } + \__wheelchart_if_text:nnn { middle } { o } { \node [ align = center , / wheelchart / middle_style ] at ( 0 , 0 ) { \pgfkeysvalueof { / wheelchart / middle } } ; } \pgfkeysvalueof { / wheelchart / legend } \end { scope } @@ -3203,4 +3221,6 @@ \end { scope } } } - }
\ No newline at end of file + } + +\endinput
\ No newline at end of file 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/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 } } } |