summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-03-15 20:50:15 +0000
committerKarl Berry <karl@freefriends.org>2022-03-15 20:50:15 +0000
commitdc6a278930a56b80f723f219fc4ee1622d83084b (patch)
tree02475a1a17832217329c76894d19590c3f982209
parent269db182a3b5d6df307e49e15092cbd1dd26d898 (diff)
do not load fontspec twice, tex4ht r1089
git-svn-id: svn://tug.org/texlive/trunk@62727 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog6
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex5
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/unicode-math-hooks.4ht7
3 files changed, 13 insertions, 5 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index efebbc22a77..9525e920e50 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,9 @@
+2022-03-15 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (unicode-math-hooks.4ht): don't load Fontspec if it
+ is already loaded.
+ https://github.com/michal-h21/make4ht/issues/67
+
2022-03-14 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-4ht.tex (biblatex.4ht): removed unused boolean variable.
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index a69e3e6c50d..5bad77a00c5 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1088 2022-03-14 20:55:35Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1089 2022-03-15 15:14:50Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2022 TeX Users Group
@@ -4169,7 +4169,8 @@ document.
% Copyright 2021-2022 TeX Users Group
|<TeX4ht license text|>
\:dontusepackage{unicode-math}
-\RequirePackage{fontspec} % it is loaded by unicode-math
+\@ifpackageloaded{fontspec}{}
+{\RequirePackage{fontspec}} % it is loaded by unicode-math
\NewDocumentCommand \setmathfont { O{} m O{} }{}
\endinput
>>> \AddFile{9}{unicode-math-hooks}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/unicode-math-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/unicode-math-hooks.4ht
index d502623244a..8623309c9b5 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/unicode-math-hooks.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/unicode-math-hooks.4ht
@@ -1,4 +1,4 @@
-% unicode-math-hooks.4ht (2022-01-23-07:51), generated from tex4ht-4ht.tex
+% unicode-math-hooks.4ht (2022-03-15-13:25), generated from tex4ht-4ht.tex
% Copyright 2021-2022 TeX Users Group
%
% This work may be distributed and/or modified under the
@@ -16,10 +16,11 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2022-01-23-07:51}
+\immediate\write-1{version 2022-03-15-13:25}
\:dontusepackage{unicode-math}
-\RequirePackage{fontspec} % it is loaded by unicode-math
+\@ifpackageloaded{fontspec}{}
+{\RequirePackage{fontspec}} % it is loaded by unicode-math
\NewDocumentCommand \setmathfont { O{} m O{} }{}
\endinput