summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-10-13 21:02:42 +0000
committerKarl Berry <karl@freefriends.org>2018-10-13 21:02:42 +0000
commit206e1efd94e4c3414835af0e2c8266c88ed7dcc9 (patch)
treeb7463549a030aa9cfddbd1e7154bd8c62d5d33b5 /Master
parent192d971f371510873c8f0dc2e8119ca4195599ea (diff)
fontawesome5 (13oct18)
git-svn-id: svn://tug.org/texlive/trunk@48903 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/fonts/fontawesome5/fontawesome5.pdfbin147566 -> 148726 bytes
-rw-r--r--Master/texmf-dist/doc/fonts/fontawesome5/fontawesome5.tex8
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fontawesome5/fa5brands1.enc14
-rw-r--r--Master/texmf-dist/fonts/enc/dvips/fontawesome5/fa5free3.enc80
-rw-r--r--Master/texmf-dist/fonts/opentype/public/fontawesome5/FontAwesome5Brands-Regular-400.otfbin185912 -> 193376 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/fontawesome5/FontAwesome5Free-Regular-400.otfbin69764 -> 69764 bytes
-rw-r--r--Master/texmf-dist/fonts/opentype/public/fontawesome5/FontAwesome5Free-Solid-900.otfbin298688 -> 314964 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/fontawesome5/fa5brands0.tfmbin1400 -> 1400 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/fontawesome5/fa5brands1.tfmbin964 -> 1012 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/fontawesome5/fa5free1solid.tfmbin1340 -> 1340 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/fontawesome5/fa5free2solid.tfmbin1452 -> 1452 bytes
-rw-r--r--Master/texmf-dist/fonts/tfm/public/fontawesome5/fa5free3solid.tfmbin384 -> 572 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/fontawesome5/FontAwesome5BrandsRegular.pfbbin208365 -> 220106 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/fontawesome5/FontAwesome5FreeRegular.pfbbin76055 -> 76055 bytes
-rw-r--r--Master/texmf-dist/fonts/type1/public/fontawesome5/FontAwesome5FreeSolid.pfbbin283814 -> 299990 bytes
-rw-r--r--Master/texmf-dist/tex/latex/fontawesome5/fontawesome5-generic-helper.sty17
-rw-r--r--Master/texmf-dist/tex/latex/fontawesome5/fontawesome5-mapping.def119
-rw-r--r--Master/texmf-dist/tex/latex/fontawesome5/fontawesome5-utex-helper.sty17
-rw-r--r--Master/texmf-dist/tex/latex/fontawesome5/fontawesome5.lua8
-rw-r--r--Master/texmf-dist/tex/latex/fontawesome5/fontawesome5.sty31
20 files changed, 194 insertions, 100 deletions
diff --git a/Master/texmf-dist/doc/fonts/fontawesome5/fontawesome5.pdf b/Master/texmf-dist/doc/fonts/fontawesome5/fontawesome5.pdf
index a27a1e5686e..f0c73ec03be 100644
--- a/Master/texmf-dist/doc/fonts/fontawesome5/fontawesome5.pdf
+++ b/Master/texmf-dist/doc/fonts/fontawesome5/fontawesome5.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/fonts/fontawesome5/fontawesome5.tex b/Master/texmf-dist/doc/fonts/fontawesome5/fontawesome5.tex
index 72d49c41753..2501fa51b2d 100644
--- a/Master/texmf-dist/doc/fonts/fontawesome5/fontawesome5.tex
+++ b/Master/texmf-dist/doc/fonts/fontawesome5/fontawesome5.tex
@@ -6,7 +6,7 @@
\usepackage[utf8]{inputenc}
\MakeShortVerb{\|}
\begin{document}
-\title{The fontawesome5 package\thanks{This document corresponds to fontawesome5 version 5.3.1, dated 2018/08/30}}
+\title{The fontawesome5 package\thanks{This document corresponds to fontawesome5 version 5.4.1, dated 2018/10/13}}
\author{Font Awesome\thanks{More information at \url{https://fontawesome.com}} (The font)\and Marcel Krüger\thanks{E-Mail: \href{mailto:tex@2krueger.de}{\nolinkurl{tex@2krueger.de}}} (The \LaTeX{} package)}
\maketitle
This package provides \LaTeX{} support for the Font Awesome 5 icons.
@@ -15,6 +15,10 @@ To use Font Awesome 5 icons in your document, include the package with
\begin{verbatim}
\usepackage{fontawesome5}
\end{verbatim}
+Alternatively you can add the |fixed| option to get fixed-width icons:
+\begin{verbatim}
+ \usepackage[fixed]{fontawesome5}
+\end{verbatim}
For every icon a macro is provided: Just use the official icon names\footnote{For a full list see \url{https://fontawesome.com/cheatsheet}.} converted to CamelCase with the prefix |\fa|.
For example to use the |hand-point-up| icon, use |\faHandPointUp|.
For icons ending with |-alt|, append a |*| instead.
@@ -61,7 +65,7 @@ Now additional icons and the |light| style can be used.
Pro is only supported with \XeLaTeX{} and \LuaLaTeX.
\subsection*{Updates}
-This package corresponds to Font Awesome 5.3.1.
+This package corresponds to Font Awesome 5.4.1.
In case there is a newer version available on the Font Awesome homepage, check for updates on \url{https://ctan.org/pkg/fontawesome5}. Should there be no corresponding update on CTAN, you can write a mail to \href{mailto:tex@2krueger.de}{\nolinkurl{tex@2krueger.de}}.
If you use \XeLaTeX{} or \LuaLaTeX{}, you can also directly download the new Desktop Fonts from \url{https://fontawesome.com} into your \TeX{} tree. If you save them with the filenames\\
{\ttfamily\begin{tabular}{l}
diff --git a/Master/texmf-dist/fonts/enc/dvips/fontawesome5/fa5brands1.enc b/Master/texmf-dist/fonts/enc/dvips/fontawesome5/fa5brands1.enc
index 21b4c9863d7..8637159fe8f 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fontawesome5/fa5brands1.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fontawesome5/fa5brands1.enc
@@ -89,6 +89,7 @@
/creative-commons-sampling
/creative-commons-sampling-plus
/creative-commons-share
+/creative-commons-zero
/ebay
/keybase
/mastodon
@@ -124,13 +125,12 @@
/zhihu
/alipay
/the-red-yeti
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+/acquisitions-incorporated
+/critical-role
+/dev
+/fantasy-flight-games
+/penny-arcade
+/wizards-of-the-coast
/.notdef
/.notdef
/.notdef
diff --git a/Master/texmf-dist/fonts/enc/dvips/fontawesome5/fa5free3.enc b/Master/texmf-dist/fonts/enc/dvips/fontawesome5/fa5free3.enc
index 66d7f3e13ce..512374339a4 100644
--- a/Master/texmf-dist/fonts/enc/dvips/fontawesome5/fa5free3.enc
+++ b/Master/texmf-dist/fonts/enc/dvips/fontawesome5/fa5free3.enc
@@ -40,47 +40,47 @@
/torah
/torii-gate
/vihara
+/volume-mute
/yin-yang
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
-/.notdef
+/blender-phone
+/book-dead
+/campground
+/cat
+/chair
+/cloud-moon
+/cloud-sun
+/dice-d20
+/dice-d6
+/dog
+/dragon
+/drumstick-bite
+/dungeon
+/file-csv
+/fist-raised
+/ghost
+/hammer
+/hanukiah
+/hat-wizard
+/hiking
+/hippo
+/horse
+/house-damage
+/hryvnia
+/mask
+/mountain
+/network-wired
+/otter
+/ring
+/running
+/scroll
+/skull-crossbones
+/slash
+/spider
+/toilet-paper
+/tractor
+/user-injured
+/wind
+/wine-bottle
/.notdef
/.notdef
/.notdef
diff --git a/Master/texmf-dist/fonts/opentype/public/fontawesome5/FontAwesome5Brands-Regular-400.otf b/Master/texmf-dist/fonts/opentype/public/fontawesome5/FontAwesome5Brands-Regular-400.otf
index ed597e28f53..a32037f127b 100644
--- a/Master/texmf-dist/fonts/opentype/public/fontawesome5/FontAwesome5Brands-Regular-400.otf
+++ b/Master/texmf-dist/fonts/opentype/public/fontawesome5/FontAwesome5Brands-Regular-400.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/fontawesome5/FontAwesome5Free-Regular-400.otf b/Master/texmf-dist/fonts/opentype/public/fontawesome5/FontAwesome5Free-Regular-400.otf
index cd22c5c2eb5..518ad4578db 100644
--- a/Master/texmf-dist/fonts/opentype/public/fontawesome5/FontAwesome5Free-Regular-400.otf
+++ b/Master/texmf-dist/fonts/opentype/public/fontawesome5/FontAwesome5Free-Regular-400.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/opentype/public/fontawesome5/FontAwesome5Free-Solid-900.otf b/Master/texmf-dist/fonts/opentype/public/fontawesome5/FontAwesome5Free-Solid-900.otf
index 5864c104d88..12fb6cf10d7 100644
--- a/Master/texmf-dist/fonts/opentype/public/fontawesome5/FontAwesome5Free-Solid-900.otf
+++ b/Master/texmf-dist/fonts/opentype/public/fontawesome5/FontAwesome5Free-Solid-900.otf
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/fontawesome5/fa5brands0.tfm b/Master/texmf-dist/fonts/tfm/public/fontawesome5/fa5brands0.tfm
index 8c5f4a5fdf0..e52e5db858e 100644
--- a/Master/texmf-dist/fonts/tfm/public/fontawesome5/fa5brands0.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/fontawesome5/fa5brands0.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/fontawesome5/fa5brands1.tfm b/Master/texmf-dist/fonts/tfm/public/fontawesome5/fa5brands1.tfm
index c24dff81eb4..86b4aa7f638 100644
--- a/Master/texmf-dist/fonts/tfm/public/fontawesome5/fa5brands1.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/fontawesome5/fa5brands1.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/fontawesome5/fa5free1solid.tfm b/Master/texmf-dist/fonts/tfm/public/fontawesome5/fa5free1solid.tfm
index f7a5874ec96..7baf37ba8a7 100644
--- a/Master/texmf-dist/fonts/tfm/public/fontawesome5/fa5free1solid.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/fontawesome5/fa5free1solid.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/fontawesome5/fa5free2solid.tfm b/Master/texmf-dist/fonts/tfm/public/fontawesome5/fa5free2solid.tfm
index b179ae82b98..cf8dd060033 100644
--- a/Master/texmf-dist/fonts/tfm/public/fontawesome5/fa5free2solid.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/fontawesome5/fa5free2solid.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/tfm/public/fontawesome5/fa5free3solid.tfm b/Master/texmf-dist/fonts/tfm/public/fontawesome5/fa5free3solid.tfm
index ca3ef9f23d7..a79224d3e40 100644
--- a/Master/texmf-dist/fonts/tfm/public/fontawesome5/fa5free3solid.tfm
+++ b/Master/texmf-dist/fonts/tfm/public/fontawesome5/fa5free3solid.tfm
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/fontawesome5/FontAwesome5BrandsRegular.pfb b/Master/texmf-dist/fonts/type1/public/fontawesome5/FontAwesome5BrandsRegular.pfb
index 30f868586f1..c771af70815 100644
--- a/Master/texmf-dist/fonts/type1/public/fontawesome5/FontAwesome5BrandsRegular.pfb
+++ b/Master/texmf-dist/fonts/type1/public/fontawesome5/FontAwesome5BrandsRegular.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/fontawesome5/FontAwesome5FreeRegular.pfb b/Master/texmf-dist/fonts/type1/public/fontawesome5/FontAwesome5FreeRegular.pfb
index 4530fce0ea6..fd00d8ca507 100644
--- a/Master/texmf-dist/fonts/type1/public/fontawesome5/FontAwesome5FreeRegular.pfb
+++ b/Master/texmf-dist/fonts/type1/public/fontawesome5/FontAwesome5FreeRegular.pfb
Binary files differ
diff --git a/Master/texmf-dist/fonts/type1/public/fontawesome5/FontAwesome5FreeSolid.pfb b/Master/texmf-dist/fonts/type1/public/fontawesome5/FontAwesome5FreeSolid.pfb
index 602d67567c2..b3594474c2f 100644
--- a/Master/texmf-dist/fonts/type1/public/fontawesome5/FontAwesome5FreeSolid.pfb
+++ b/Master/texmf-dist/fonts/type1/public/fontawesome5/FontAwesome5FreeSolid.pfb
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/fontawesome5/fontawesome5-generic-helper.sty b/Master/texmf-dist/tex/latex/fontawesome5/fontawesome5-generic-helper.sty
index 7b0b4c98d90..3c73eecbee0 100644
--- a/Master/texmf-dist/tex/latex/fontawesome5/fontawesome5-generic-helper.sty
+++ b/Master/texmf-dist/tex/latex/fontawesome5/fontawesome5-generic-helper.sty
@@ -15,7 +15,7 @@
\@ifpackageloaded{fontawesome5}{}{\PackageError{fontawesome5-generic-helper}{This package should not be loaded individually. Load fontawesome5 instead.}{}}
-\ProvidesExplPackage{fontawesome5-generic-helper}{2018/08/30}{5.3.1}{non-uTeX helper for fontawesome5}
+\ProvidesExplPackage{fontawesome5-generic-helper}{2018/10/13}{5.4.1}{non-uTeX helper for fontawesome5}
\cs_new:Nn\__fontawesome_def_icon:nnnnn{
\tl_if_empty:nF{#1}{
@@ -45,10 +45,17 @@
}
\cs_new:Nn\fontawesome_use_icon:nn{
\cs_if_exist:cTF{c__fontawesome_slot_#2_tl}{
- \exp_last_unbraced:Nv
- \__fontawesome_icon_at:nnnn
- {c__fontawesome_slot_#2_tl}
- {#1}{#2}
+ \bool_if:NTF\c__fontawesome_fixed_bool{
+ \makebox[1.5em][c]
+ }{
+ \use:n
+ }
+ {
+ \exp_last_unbraced:Nv
+ \__fontawesome_icon_at:nnnn
+ {c__fontawesome_slot_#2_tl}
+ {#1}{#2}
+ }
}{
\msg_error:nnxx{fontawesome5}{icon-not-found}{#2}{#1}
}
diff --git a/Master/texmf-dist/tex/latex/fontawesome5/fontawesome5-mapping.def b/Master/texmf-dist/tex/latex/fontawesome5/fontawesome5-mapping.def
index 0ca64324efd..fabfc3f4cb9 100644
--- a/Master/texmf-dist/tex/latex/fontawesome5/fontawesome5-mapping.def
+++ b/Master/texmf-dist/tex/latex/fontawesome5/fontawesome5-mapping.def
@@ -358,41 +358,48 @@
\__fontawesome_def_icon:nnnnn{\faCreativeCommonsSampling}{creative-commons-sampling}{brands1}{87}{"F4F0}
\__fontawesome_def_icon:nnnnn{\faCreativeCommonsSamplingPlus}{creative-commons-sampling-plus}{brands1}{88}{"F4F1}
\__fontawesome_def_icon:nnnnn{\faCreativeCommonsShare}{creative-commons-share}{brands1}{89}{"F4F2}
-\__fontawesome_def_icon:nnnnn{\faEbay}{ebay}{brands1}{90}{"F4F4}
-\__fontawesome_def_icon:nnnnn{\faKeybase}{keybase}{brands1}{91}{"F4F5}
-\__fontawesome_def_icon:nnnnn{\faMastodon}{mastodon}{brands1}{92}{"F4F6}
-\__fontawesome_def_icon:nnnnn{\faRProject}{r-project}{brands1}{93}{"F4F7}
-\__fontawesome_def_icon:nnnnn{\faResearchgate}{researchgate}{brands1}{94}{"F4F8}
-\__fontawesome_def_icon:nnnnn{\faTeamspeak}{teamspeak}{brands1}{95}{"F4F9}
-\__fontawesome_def_icon:nnnnn{}{first-order-alt}{brands1}{96}{"F50A}
-\__fontawesome_def_icon:nnnnn{\faFulcrum}{fulcrum}{brands1}{97}{"F50B}
-\__fontawesome_def_icon:nnnnn{\faGalacticRepublic}{galactic-republic}{brands1}{98}{"F50C}
-\__fontawesome_def_icon:nnnnn{\faGalacticSenate}{galactic-senate}{brands1}{99}{"F50D}
-\__fontawesome_def_icon:nnnnn{\faJediOrder}{jedi-order}{brands1}{100}{"F50E}
-\__fontawesome_def_icon:nnnnn{\faMandalorian}{mandalorian}{brands1}{101}{"F50F}
-\__fontawesome_def_icon:nnnnn{\faOldRepublic}{old-republic}{brands1}{102}{"F510}
-\__fontawesome_def_icon:nnnnn{\faPhoenixSquadron}{phoenix-squadron}{brands1}{103}{"F511}
-\__fontawesome_def_icon:nnnnn{\faSith}{sith}{brands1}{104}{"F512}
-\__fontawesome_def_icon:nnnnn{\faTradeFederation}{trade-federation}{brands1}{105}{"F513}
-\__fontawesome_def_icon:nnnnn{\faWolfPackBattalion}{wolf-pack-battalion}{brands1}{106}{"F514}
-\__fontawesome_def_icon:nnnnn{\faHornbill}{hornbill}{brands1}{107}{"F592}
-\__fontawesome_def_icon:nnnnn{\faMailchimp}{mailchimp}{brands1}{108}{"F59E}
-\__fontawesome_def_icon:nnnnn{\faMegaport}{megaport}{brands1}{109}{"F5A3}
-\__fontawesome_def_icon:nnnnn{\faNimblr}{nimblr}{brands1}{110}{"F5A8}
-\__fontawesome_def_icon:nnnnn{\faRev}{rev}{brands1}{111}{"F5B2}
-\__fontawesome_def_icon:nnnnn{\faShopware}{shopware}{brands1}{112}{"F5B5}
-\__fontawesome_def_icon:nnnnn{\faSquarespace}{squarespace}{brands1}{113}{"F5BE}
-\__fontawesome_def_icon:nnnnn{\faThemeco}{themeco}{brands1}{114}{"F5C6}
-\__fontawesome_def_icon:nnnnn{\faWeebly}{weebly}{brands1}{115}{"F5CC}
-\__fontawesome_def_icon:nnnnn{\faWix}{wix}{brands1}{116}{"F5CF}
-\__fontawesome_def_icon:nnnnn{\faEllo}{ello}{brands1}{117}{"F5F1}
-\__fontawesome_def_icon:nnnnn{\faHackerrank}{hackerrank}{brands1}{118}{"F5F7}
-\__fontawesome_def_icon:nnnnn{\faKaggle}{kaggle}{brands1}{119}{"F5FA}
-\__fontawesome_def_icon:nnnnn{\faMarkdown}{markdown}{brands1}{120}{"F60F}
-\__fontawesome_def_icon:nnnnn{\faNeos}{neos}{brands1}{121}{"F612}
-\__fontawesome_def_icon:nnnnn{\faZhihu}{zhihu}{brands1}{122}{"F63F}
-\__fontawesome_def_icon:nnnnn{\faAlipay}{alipay}{brands1}{123}{"F642}
-\__fontawesome_def_icon:nnnnn{\faTheRedYeti}{the-red-yeti}{brands1}{124}{"F69D}
+\__fontawesome_def_icon:nnnnn{\faCreativeCommonsZero}{creative-commons-zero}{brands1}{90}{"F4F3}
+\__fontawesome_def_icon:nnnnn{\faEbay}{ebay}{brands1}{91}{"F4F4}
+\__fontawesome_def_icon:nnnnn{\faKeybase}{keybase}{brands1}{92}{"F4F5}
+\__fontawesome_def_icon:nnnnn{\faMastodon}{mastodon}{brands1}{93}{"F4F6}
+\__fontawesome_def_icon:nnnnn{\faRProject}{r-project}{brands1}{94}{"F4F7}
+\__fontawesome_def_icon:nnnnn{\faResearchgate}{researchgate}{brands1}{95}{"F4F8}
+\__fontawesome_def_icon:nnnnn{\faTeamspeak}{teamspeak}{brands1}{96}{"F4F9}
+\__fontawesome_def_icon:nnnnn{}{first-order-alt}{brands1}{97}{"F50A}
+\__fontawesome_def_icon:nnnnn{\faFulcrum}{fulcrum}{brands1}{98}{"F50B}
+\__fontawesome_def_icon:nnnnn{\faGalacticRepublic}{galactic-republic}{brands1}{99}{"F50C}
+\__fontawesome_def_icon:nnnnn{\faGalacticSenate}{galactic-senate}{brands1}{100}{"F50D}
+\__fontawesome_def_icon:nnnnn{\faJediOrder}{jedi-order}{brands1}{101}{"F50E}
+\__fontawesome_def_icon:nnnnn{\faMandalorian}{mandalorian}{brands1}{102}{"F50F}
+\__fontawesome_def_icon:nnnnn{\faOldRepublic}{old-republic}{brands1}{103}{"F510}
+\__fontawesome_def_icon:nnnnn{\faPhoenixSquadron}{phoenix-squadron}{brands1}{104}{"F511}
+\__fontawesome_def_icon:nnnnn{\faSith}{sith}{brands1}{105}{"F512}
+\__fontawesome_def_icon:nnnnn{\faTradeFederation}{trade-federation}{brands1}{106}{"F513}
+\__fontawesome_def_icon:nnnnn{\faWolfPackBattalion}{wolf-pack-battalion}{brands1}{107}{"F514}
+\__fontawesome_def_icon:nnnnn{\faHornbill}{hornbill}{brands1}{108}{"F592}
+\__fontawesome_def_icon:nnnnn{\faMailchimp}{mailchimp}{brands1}{109}{"F59E}
+\__fontawesome_def_icon:nnnnn{\faMegaport}{megaport}{brands1}{110}{"F5A3}
+\__fontawesome_def_icon:nnnnn{\faNimblr}{nimblr}{brands1}{111}{"F5A8}
+\__fontawesome_def_icon:nnnnn{\faRev}{rev}{brands1}{112}{"F5B2}
+\__fontawesome_def_icon:nnnnn{\faShopware}{shopware}{brands1}{113}{"F5B5}
+\__fontawesome_def_icon:nnnnn{\faSquarespace}{squarespace}{brands1}{114}{"F5BE}
+\__fontawesome_def_icon:nnnnn{\faThemeco}{themeco}{brands1}{115}{"F5C6}
+\__fontawesome_def_icon:nnnnn{\faWeebly}{weebly}{brands1}{116}{"F5CC}
+\__fontawesome_def_icon:nnnnn{\faWix}{wix}{brands1}{117}{"F5CF}
+\__fontawesome_def_icon:nnnnn{\faEllo}{ello}{brands1}{118}{"F5F1}
+\__fontawesome_def_icon:nnnnn{\faHackerrank}{hackerrank}{brands1}{119}{"F5F7}
+\__fontawesome_def_icon:nnnnn{\faKaggle}{kaggle}{brands1}{120}{"F5FA}
+\__fontawesome_def_icon:nnnnn{\faMarkdown}{markdown}{brands1}{121}{"F60F}
+\__fontawesome_def_icon:nnnnn{\faNeos}{neos}{brands1}{122}{"F612}
+\__fontawesome_def_icon:nnnnn{\faZhihu}{zhihu}{brands1}{123}{"F63F}
+\__fontawesome_def_icon:nnnnn{\faAlipay}{alipay}{brands1}{124}{"F642}
+\__fontawesome_def_icon:nnnnn{\faTheRedYeti}{the-red-yeti}{brands1}{125}{"F69D}
+\__fontawesome_def_icon:nnnnn{\faAcquisitionsIncorporated}{acquisitions-incorporated}{brands1}{126}{"F6AF}
+\__fontawesome_def_icon:nnnnn{\faCriticalRole}{critical-role}{brands1}{127}{"F6C9}
+\__fontawesome_def_icon:nnnnn{\faDev}{dev}{brands1}{128}{"F6CC}
+\__fontawesome_def_icon:nnnnn{\faFantasyFlightGames}{fantasy-flight-games}{brands1}{129}{"F6DC}
+\__fontawesome_def_icon:nnnnn{\faPennyArcade}{penny-arcade}{brands1}{130}{"F704}
+\__fontawesome_def_icon:nnnnn{\faWizardsOfTheCoast}{wizards-of-the-coast}{brands1}{131}{"F730}
\__fontawesome_def_icon:nnnnn{\faGlassMartini}{glass-martini}{free0}{0}{"F000}
\__fontawesome_def_icon:nnnnn{\faMusic}{music}{free0}{1}{"F001}
\__fontawesome_def_icon:nnnnn{\faSearch}{search}{free0}{2}{"F002}
@@ -1202,4 +1209,44 @@
\__fontawesome_def_icon:nnnnn{\faTorah}{torah}{free3}{38}{"F6A0}
\__fontawesome_def_icon:nnnnn{\faToriiGate}{torii-gate}{free3}{39}{"F6A1}
\__fontawesome_def_icon:nnnnn{\faVihara}{vihara}{free3}{40}{"F6A7}
-\__fontawesome_def_icon:nnnnn{\faYinYang}{yin-yang}{free3}{41}{"F6AD}
+\__fontawesome_def_icon:nnnnn{\faVolumeMute}{volume-mute}{free3}{41}{"F6A9}
+\__fontawesome_def_icon:nnnnn{\faYinYang}{yin-yang}{free3}{42}{"F6AD}
+\__fontawesome_def_icon:nnnnn{\faBlenderPhone}{blender-phone}{free3}{43}{"F6B6}
+\__fontawesome_def_icon:nnnnn{\faBookDead}{book-dead}{free3}{44}{"F6B7}
+\__fontawesome_def_icon:nnnnn{\faCampground}{campground}{free3}{45}{"F6BB}
+\__fontawesome_def_icon:nnnnn{\faCat}{cat}{free3}{46}{"F6BE}
+\__fontawesome_def_icon:nnnnn{\faChair}{chair}{free3}{47}{"F6C0}
+\__fontawesome_def_icon:nnnnn{\faCloudMoon}{cloud-moon}{free3}{48}{"F6C3}
+\__fontawesome_def_icon:nnnnn{\faCloudSun}{cloud-sun}{free3}{49}{"F6C4}
+\__fontawesome_def_icon:nnnnn{}{dice-d20}{free3}{50}{"F6CF}
+\__fontawesome_def_icon:nnnnn{}{dice-d6}{free3}{51}{"F6D1}
+\__fontawesome_def_icon:nnnnn{\faDog}{dog}{free3}{52}{"F6D3}
+\__fontawesome_def_icon:nnnnn{\faDragon}{dragon}{free3}{53}{"F6D5}
+\__fontawesome_def_icon:nnnnn{\faDrumstickBite}{drumstick-bite}{free3}{54}{"F6D7}
+\__fontawesome_def_icon:nnnnn{\faDungeon}{dungeon}{free3}{55}{"F6D9}
+\__fontawesome_def_icon:nnnnn{\faFileCsv}{file-csv}{free3}{56}{"F6DD}
+\__fontawesome_def_icon:nnnnn{\faFistRaised}{fist-raised}{free3}{57}{"F6DE}
+\__fontawesome_def_icon:nnnnn{\faGhost}{ghost}{free3}{58}{"F6E2}
+\__fontawesome_def_icon:nnnnn{\faHammer}{hammer}{free3}{59}{"F6E3}
+\__fontawesome_def_icon:nnnnn{\faHanukiah}{hanukiah}{free3}{60}{"F6E6}
+\__fontawesome_def_icon:nnnnn{\faHatWizard}{hat-wizard}{free3}{61}{"F6E8}
+\__fontawesome_def_icon:nnnnn{\faHiking}{hiking}{free3}{62}{"F6EC}
+\__fontawesome_def_icon:nnnnn{\faHippo}{hippo}{free3}{63}{"F6ED}
+\__fontawesome_def_icon:nnnnn{\faHorse}{horse}{free3}{64}{"F6F0}
+\__fontawesome_def_icon:nnnnn{\faHouseDamage}{house-damage}{free3}{65}{"F6F1}
+\__fontawesome_def_icon:nnnnn{\faHryvnia}{hryvnia}{free3}{66}{"F6F2}
+\__fontawesome_def_icon:nnnnn{\faMask}{mask}{free3}{67}{"F6FA}
+\__fontawesome_def_icon:nnnnn{\faMountain}{mountain}{free3}{68}{"F6FC}
+\__fontawesome_def_icon:nnnnn{\faNetworkWired}{network-wired}{free3}{69}{"F6FF}
+\__fontawesome_def_icon:nnnnn{\faOtter}{otter}{free3}{70}{"F700}
+\__fontawesome_def_icon:nnnnn{\faRing}{ring}{free3}{71}{"F70B}
+\__fontawesome_def_icon:nnnnn{\faRunning}{running}{free3}{72}{"F70C}
+\__fontawesome_def_icon:nnnnn{\faScroll}{scroll}{free3}{73}{"F70E}
+\__fontawesome_def_icon:nnnnn{\faSkullCrossbones}{skull-crossbones}{free3}{74}{"F714}
+\__fontawesome_def_icon:nnnnn{\faSlash}{slash}{free3}{75}{"F715}
+\__fontawesome_def_icon:nnnnn{\faSpider}{spider}{free3}{76}{"F717}
+\__fontawesome_def_icon:nnnnn{\faToiletPaper}{toilet-paper}{free3}{77}{"F71E}
+\__fontawesome_def_icon:nnnnn{\faTractor}{tractor}{free3}{78}{"F722}
+\__fontawesome_def_icon:nnnnn{\faUserInjured}{user-injured}{free3}{79}{"F728}
+\__fontawesome_def_icon:nnnnn{\faWind}{wind}{free3}{80}{"F72E}
+\__fontawesome_def_icon:nnnnn{\faWineBottle}{wine-bottle}{free3}{81}{"F72F}
diff --git a/Master/texmf-dist/tex/latex/fontawesome5/fontawesome5-utex-helper.sty b/Master/texmf-dist/tex/latex/fontawesome5/fontawesome5-utex-helper.sty
index ab85dce9f02..49716c1eab7 100644
--- a/Master/texmf-dist/tex/latex/fontawesome5/fontawesome5-utex-helper.sty
+++ b/Master/texmf-dist/tex/latex/fontawesome5/fontawesome5-utex-helper.sty
@@ -14,7 +14,7 @@
%
\@ifpackageloaded{fontawesome5}{}{\PackageError{fontawesome5-utex-helper}{This package should not be loaded individually. Load fontawesome5 instead.}{}}
-\ProvidesExplPackage{fontawesome5-utex-helper}{2018/08/30}{5.3.1}{uTeX helper for fontawesome5}
+\ProvidesExplPackage{fontawesome5-utex-helper}{2018/10/13}{5.4.1}{uTeX helper for fontawesome5}
\sys_if_engine_luatex:TF{
\RequirePackage{luatexbase}
@@ -27,11 +27,11 @@
\group_end:
}
\cs_set:Nn\__fontawesome_glyphindex:n{
- \lua_now_x:n{tex.sprint(font.getfont(font.current()).resources.unicodes["\lua_escape_x:n{#1}"]~or~0)}
+ \lua_now_x:n{tex.sprint(font.getfont(font.current()).resources.unicodes[token.scan_string()]~or~0)}{\str_if_eq:eeTF{stop}{#1}{square}{#1}}
}
\cs_set_eq:NN\__fontawesome_glyph:w\tex_char:D
}{
- \seq_set_from_clist:Nn\c__fontawesome_invalid_tokens_seq{\fa,\faH,\faRepeat,\faWifi,\faSignal,\faSignalAlt}
+ \seq_set_from_clist:Nn\c__fontawesome_invalid_tokens_seq{\fa,\faH,\faRepeat,\faWifi,\faSignal,\faSignalAlt,\faDiceD}
\regex_const:Nn\c__fontawesome_alt_regex{-alt\Z}
\cs_generate_variant:Nn\regex_match:NnF{NVF}
\cs_new:Nn\__fontawesome_analyze_font:nn{
@@ -52,7 +52,7 @@
\group_end:
}
\cs_set:Nn\__fontawesome_glyphindex:n{
- \the\xetex_glyphindex:D"#1"\scan_stop:
+ \the\xetex_glyphindex:D"\str_if_eq:eeTF{stop}{#1}{square}{#1}"\scan_stop:
}
\cs_set_eq:NN\__fontawesome_glyph:w\xetex_glyph:D
}
@@ -83,6 +83,13 @@
\msg_warning:nnxx{fontawesome5}{style-substitution}{#2}{#1}
}
}
- \__fontawesome_glyph:w\l_tmpa_int
+ \bool_if:NTF\c__fontawesome_fixed_bool{
+ \makebox[1.5em][c]
+ }{
+ \use:n
+ }
+ {
+ \__fontawesome_glyph:w\l_tmpa_int
+ }
\group_end:
}
diff --git a/Master/texmf-dist/tex/latex/fontawesome5/fontawesome5.lua b/Master/texmf-dist/tex/latex/fontawesome5/fontawesome5.lua
index f24734831b7..cc95c5f6d22 100644
--- a/Master/texmf-dist/tex/latex/fontawesome5/fontawesome5.lua
+++ b/Master/texmf-dist/tex/latex/fontawesome5/fontawesome5.lua
@@ -31,7 +31,13 @@ function fontawesome5_analyze_current_font(fontid)
["signal-alt-2"]=true,
["signal-alt-3"]=true,
["repeat"]=true,
- ["repeat-1"]=true
+ ["repeat-1"]=true,
+ ["dice-d4"]=true,
+ ["dice-d6"]=true,
+ ["dice-d8"]=true,
+ ["dice-d10"]=true,
+ ["dice-d12"]=true,
+ ["dice-d20"]=true,
}
for name, value in pairs(font.getfont(fontid).resources.unicodes) do
tex.sprint(
diff --git a/Master/texmf-dist/tex/latex/fontawesome5/fontawesome5.sty b/Master/texmf-dist/tex/latex/fontawesome5/fontawesome5.sty
index 80d10cbf587..f19285f0f50 100644
--- a/Master/texmf-dist/tex/latex/fontawesome5/fontawesome5.sty
+++ b/Master/texmf-dist/tex/latex/fontawesome5/fontawesome5.sty
@@ -13,7 +13,7 @@
% The Current Maintainer of this work is Marcel Krueger
%
\RequirePackage{expl3}
-\ProvidesExplPackage{fontawesome5}{2018/08/30}{5.3.1}{Font Awesome 5}
+\ProvidesExplPackage{fontawesome5}{2018/10/13}{5.4.1}{Font Awesome 5}
\RequirePackage{l3keys2e}
@@ -24,7 +24,9 @@
pro .default:n = pro,
free .value_forbidden:n = true,
free .tl_set:N = \c__fontawesome_kind_tl,
- free .default:n = free
+ free .default:n = free,
+ fixed .bool_set:N = \c__fontawesome_fixed_bool,
+ fixed .default:n = true
}
\keys_set:nn{fontawesome5}{free}
@@ -78,12 +80,33 @@
\NewDocumentCommand\faRepeat{t{1}}{
\faPreselectedIcon{repeat\IfBooleanT{#1}{-1}}
}
-\cs_new:Nn\fa__select:nn{
- \cs_if_exist_use:cF {fa__#1_#2:} {\faPreselectedIcon{#1}#2}
+\cs_new:Npn\fa__select_ii:nnn#1#2#3{
+ \cs_if_exist_use:cF {fa__#1_#2#3:} {
+ \faPreselectedIcon{#1}#2#3
+ }
+}
+\cs_new:Npn\fa__select:nn#1#2{
+ \cs_if_exist_use:cF {fa__#1_#2:} {
+ \peek_catcode:NTF 0 {
+ \fa__select_ii:nnn {#1}{#2}
+ }{
+ \faPreselectedIcon{#1}#2
+ }
+ }
}
\cs_new:Npn\fa__select:nw#1{
\peek_catcode:NTF 0 {\fa__select:nn {#1}} {\faPreselectedIcon{#1}}
}
+\cs_new:cpn{fa__dice-d_4:}{\faPreselectedIcon{dice-d4}}
+\cs_new:cpn{fa__dice-d_6:}{\faPreselectedIcon{dice-d6}}
+\cs_new:cpn{fa__dice-d_8:}{\faPreselectedIcon{dice-d8}}
+\cs_new:cpn{fa__dice-d_10:}{\faPreselectedIcon{dice-d10}}
+\cs_new:cpn{fa__dice-d_12:}{\faPreselectedIcon{dice-d12}}
+\cs_new:cpn{fa__dice-d_20:}{\faPreselectedIcon{dice-d20}}
+\NewDocumentCommand\faDiceD{}{
+ \fa__select:nw {dice-d}
+}
+
\cs_new:cpn{fa__wifi_0:}{\faPreselectedIcon{wifi-slash}}
\cs_new:cpn{fa__wifi_1:}{\faPreselectedIcon{wifi-1}}
\cs_new:cpn{fa__wifi_2:}{\faPreselectedIcon{wifi-2}}