[latex3-commits] [git/LaTeX3-latex3-latex3] master: Delay font setup to AtBeginDocument (d37fdf20b)

[Joseph Wright]

Repository : https://github.com/latex3/latex3
On branch  : master
Link       : https://github.com/latex3/latex3/commit/d37fdf20b00fd5546cf301710a5cc999766bb5aa

>---------------------------------------------------------------

commit d37fdf20b00fd5546cf301710a5cc999766bb5aa
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Mon Jul 20 12:48:29 2020 +0100

    Delay font setup to AtBeginDocument


>---------------------------------------------------------------

d37fdf20b00fd5546cf301710a5cc999766bb5aa
 l3kernel/l3coffins.dtx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/l3kernel/l3coffins.dtx b/l3kernel/l3coffins.dtx
index c0dddaeb1..0fdcbc67f 100644
--- a/l3kernel/l3coffins.dtx
+++ b/l3kernel/l3coffins.dtx
@@ -2236,10 +2236,15 @@
 %   flexible.
 %    \begin{macrocode}
 \tl_new:N  \l_@@_display_font_tl
-\tl_set:Nx \l_@@_display_font_tl
+\cs_if_exist:NTF \AtBeginDocument
+  { \AtBeginDocument }
+  { \use:n }
   {
-    \cs_if_exist:NT \sffamily { \exp_not:N \sffamily }
-    \cs_if_exist:NT \tiny { \exp_not:N \tiny }
+    \tl_set:Nx \l_@@_display_font_tl
+      {
+        \cs_if_exist:NT \sffamily { \exp_not:N \sffamily }
+        \cs_if_exist:NT \tiny { \exp_not:N \tiny }
+      }
   }
 %    \end{macrocode}
 % \end{variable}