texlive[62727] Master/texmf-dist: do not load fontspec twice, tex4ht

[commits+karl at tug.org]

Revision: 62727
          http://tug.org/svn/texlive?view=revision&revision=62727
Author:   karl
Date:     2022-03-15 21:50:15 +0100 (Tue, 15 Mar 2022)
Log Message:
-----------
do not load fontspec twice, tex4ht r1089

Revision Links:
--------------
    http://tug.org/svn/texlive?view=revision&revision=1089

Modified Paths:
--------------
    trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
    trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
    trunk/Master/texmf-dist/tex/generic/tex4ht/unicode-math-hooks.4ht

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2022-03-15 20:17:30 UTC (rev 62726)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/ChangeLog	2022-03-15 20:50:15 UTC (rev 62727)
@@ -1,3 +1,9 @@
+2022-03-15  Michal Hoftich  <michal.h21 at 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 at gmail.com>
 
 	* tex4ht-4ht.tex (biblatex.4ht): removed unused boolean variable.

Modified: trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
===================================================================
--- trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2022-03-15 20:17:30 UTC (rev 62726)
+++ trunk/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex	2022-03-15 20:50:15 UTC (rev 62727)
@@ -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 @@
 % 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}

Modified: trunk/Master/texmf-dist/tex/generic/tex4ht/unicode-math-hooks.4ht
===================================================================
--- trunk/Master/texmf-dist/tex/generic/tex4ht/unicode-math-hooks.4ht	2022-03-15 20:17:30 UTC (rev 62726)
+++ trunk/Master/texmf-dist/tex/generic/tex4ht/unicode-math-hooks.4ht	2022-03-15 20:50:15 UTC (rev 62727)
@@ -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