summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/fontspec
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-02-22 03:01:30 +0000
committerNorbert Preining <norbert@preining.info>2020-02-22 03:01:30 +0000
commit3549e67b13c8460a73d122fbc2eef8badd816636 (patch)
tree9a4470b701a252b954f3e41771010f24350a033c /macros/latex/contrib/fontspec
parentedf9632b63615c375b45941052fe190d1e02d887 (diff)
CTAN sync 202002220301
Diffstat (limited to 'macros/latex/contrib/fontspec')
-rw-r--r--macros/latex/contrib/fontspec/CHANGES.md6
-rw-r--r--macros/latex/contrib/fontspec/fontspec-code-internal.dtx45
-rw-r--r--macros/latex/contrib/fontspec/fontspec-code-user.dtx9
-rw-r--r--macros/latex/contrib/fontspec/fontspec-code.pdfbin626791 -> 629912 bytes
-rw-r--r--macros/latex/contrib/fontspec/fontspec.dtx6
-rw-r--r--macros/latex/contrib/fontspec/fontspec.pdfbin610880 -> 600048 bytes
6 files changed, 63 insertions, 3 deletions
diff --git a/macros/latex/contrib/fontspec/CHANGES.md b/macros/latex/contrib/fontspec/CHANGES.md
index 176a83b6c8..63ae8620b4 100644
--- a/macros/latex/contrib/fontspec/CHANGES.md
+++ b/macros/latex/contrib/fontspec/CHANGES.md
@@ -1,6 +1,12 @@
Change history
==============
+## v2.7i (2020/02/21)
+
+ * Define both `b` and `bx` font series by default to avoid spurious warnings in some
+ cases, and broken behaviour in pathological cases.
+
+
## v2.7h (2020/02/03)
* Eroneous uses of `language=DFLT` changed to `language=dflt`.
diff --git a/macros/latex/contrib/fontspec/fontspec-code-internal.dtx b/macros/latex/contrib/fontspec/fontspec-code-internal.dtx
index 6282569a6f..375fc7be2e 100644
--- a/macros/latex/contrib/fontspec/fontspec-code-internal.dtx
+++ b/macros/latex/contrib/fontspec/fontspec-code-internal.dtx
@@ -724,6 +724,7 @@
\@@_declare_shapes_normal:nn {#1} {#2}
\@@_declare_shapes_smcaps:nn {#1} {#2}
\@@_declare_shape_slanted:nn {#1} {#2}
+ \@@_declare_shapes_bx:nn {#1} {#2}
\@@_declare_shape_loginfo:nn {#1} {#2}
}
% \end{macrocode}
@@ -871,6 +872,50 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\@@_declare_shapes_bx:nn}
+% Similar processing for setting up b/bx substitutions.
+% \begin{macrocode}
+\cs_new:Nn \@@_declare_shapes_bx:nn
+ {
+ \bool_if:nT
+ {
+ \str_if_eq_p:ee {#1} {\bfdefault} &&
+ !(\str_if_eq_p:ee {\bfdefault} {bx})
+ }
+ {
+ % bx/?
+ \@@_DeclareFontShape:xxxxxx {\g_@@_nfss_enc_tl} {\g_@@_nfss_family_tl}
+ {bx} {#2}
+ { <->ssub*\g_@@_nfss_family_tl/\bfdefault/#2 }
+ { \l_@@_postadjust_tl }
+
+ % bx/sc -> b/sc
+ \tl_if_empty:NF \l_@@_nfss_sc_tl
+ {
+ \@@_DeclareFontShape:xxxxxx {\g_@@_nfss_enc_tl} {\g_@@_nfss_family_tl}
+ {bx} { \@@_combo_sc_shape:n {#2} }
+ { <->ssub*\g_@@_nfss_family_tl/\bfdefault/#2 }
+ { \l_@@_postadjust_tl }
+ }
+
+ % bx/sl -> bx/it
+ \bool_if:nT
+ {
+ \str_if_eq_p:ee {#2} {\itdefault} &&
+ !(\str_if_eq_p:ee {\itdefault} {\sldefault})
+ }
+ {
+ \@@_DeclareFontShape:xxxxxx {\g_@@_nfss_enc_tl} {\g_@@_nfss_family_tl}
+ {bx} {\sldefault}
+ { <->ssub*\g_@@_nfss_family_tl/bx/\itdefault }
+ { \l_@@_postadjust_tl }
+ }
+
+ }
+ }
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\@@_declare_shape_loginfo:nn}
% Lastly some informative messaging.
% \begin{macrocode}
diff --git a/macros/latex/contrib/fontspec/fontspec-code-user.dtx b/macros/latex/contrib/fontspec/fontspec-code-user.dtx
index d235d0dbe9..a4a754d598 100644
--- a/macros/latex/contrib/fontspec/fontspec-code-user.dtx
+++ b/macros/latex/contrib/fontspec/fontspec-code-user.dtx
@@ -64,6 +64,9 @@
% \begin{macrocode}
\cs_new:Nn \@@_main_setmainfont:nn
{
+ \ifdefined\DeclareFontSeriesDefault
+ \DeclareFontSeriesDefault[rm]{bf}{\bfdefault}
+ \fi
\fontspec_set_family:Nnn \l_@@_rmfamily_family_tl {#1} {#2}
\tl_set_eq:NN \rmdefault \l_@@_rmfamily_family_tl
\tl_set_eq:NN \l_@@_rmfamily_encoding_tl \g_@@_nfss_enc_tl
@@ -80,6 +83,9 @@
% \begin{macrocode}
\cs_new:Nn \@@_main_setsansfont:nn
{
+ \ifdefined\DeclareFontSeriesDefault
+ \DeclareFontSeriesDefault[sf]{bf}{\bfdefault}
+ \fi
\fontspec_set_family:Nnn \l_@@_sffamily_family_tl {#1} {#2}
\tl_set_eq:NN \sfdefault \l_@@_sffamily_family_tl
\tl_set_eq:NN \l_@@_sffamily_encoding_tl \g_@@_nfss_enc_tl
@@ -96,6 +102,9 @@
% \begin{macrocode}
\cs_new:Nn \@@_main_setmonofont:nn
{
+ \ifdefined\DeclareFontSeriesDefault
+ \DeclareFontSeriesDefault[tt]{bf}{\bfdefault}
+ \fi
\fontspec_set_family:Nnn \l_@@_ttfamily_family_tl {#1} {#2}
\tl_set_eq:NN \ttdefault \l_@@_ttfamily_family_tl
\tl_set_eq:NN \l_@@_ttfamily_encoding_tl \g_@@_nfss_enc_tl
diff --git a/macros/latex/contrib/fontspec/fontspec-code.pdf b/macros/latex/contrib/fontspec/fontspec-code.pdf
index 9ca1bd3430..52d9e28cde 100644
--- a/macros/latex/contrib/fontspec/fontspec-code.pdf
+++ b/macros/latex/contrib/fontspec/fontspec-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/fontspec/fontspec.dtx b/macros/latex/contrib/fontspec/fontspec.dtx
index e5a6f2f111..5d07989465 100644
--- a/macros/latex/contrib/fontspec/fontspec.dtx
+++ b/macros/latex/contrib/fontspec/fontspec.dtx
@@ -70,7 +70,7 @@
\ProvidesExplFile{fontspec.dtx}
%</dtx>
%<*fontspec>
- {2020/02/03}{2.7h}{Font selection for XeLaTeX and LuaLaTeX}
+ {2020/02/21}{2.7i}{Font selection for XeLaTeX and LuaLaTeX}
%</fontspec>
% \end{macrocode}
%
@@ -89,8 +89,8 @@
%<lua>local fontspec = fontspec
%<lua>fontspec.module = {
%<lua> name = "fontspec",
-%<lua> version = "2.7h",
-%<lua> date = "2020/02/03",
+%<lua> version = "2.7i",
+%<lua> date = "2020/02/21",
%<lua> description = "Font selection for XeLaTeX and LuaLaTeX",
%<lua> author = "Khaled Hosny, Philipp Gesang, Will Robertson",
%<lua> copyright = "Khaled Hosny, Philipp Gesang, Will Robertson",
diff --git a/macros/latex/contrib/fontspec/fontspec.pdf b/macros/latex/contrib/fontspec/fontspec.pdf
index 2003bddf9c..97e8a293a0 100644
--- a/macros/latex/contrib/fontspec/fontspec.pdf
+++ b/macros/latex/contrib/fontspec/fontspec.pdf
Binary files differ