summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/fontawesome5/fontawesome5-utex-helper.sty
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/fontawesome5/fontawesome5-utex-helper.sty')
-rw-r--r--Master/texmf-dist/tex/latex/fontawesome5/fontawesome5-utex-helper.sty17
1 files changed, 12 insertions, 5 deletions
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:
}