From 454b3c35a8454fe9289227eec847b8be8996d66c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 10 May 2018 22:42:41 +0000 Subject: better xetex support and more, tex4ht r399-402 git-svn-id: svn://tug.org/texlive/trunk@47673 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/tex4ht/usepackage-fontspec.4ht | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht') diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht index e894d5259a5..a0c49803293 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/usepackage-fontspec.4ht @@ -1,4 +1,4 @@ -% usepackage-fontspec.4ht (2017-04-11-16:02), generated from tex4ht-4ht.tex +% usepackage-fontspec.4ht (2018-05-09-14:47), generated from tex4ht-4ht.tex % Copyright 2017 TeX Users Group % % This work may be distributed and/or modified under the @@ -16,10 +16,16 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2017-04-11-16:02} +\immediate\write-1{version 2018-05-09-14:47} \:dontusepackage{fontenc} -\RequirePackage{expl3} +\ifdefined\XeTeXversion% +\xenunidelblock{Latin-expl3}% expl3 package makes some characters active +\RequirePackage{expl3}% we need to disable them before loading +\xeuniuseblock{Latin-expl3}% and define again +\else% +\RequirePackage{expl3}% +\fi% \PassOptionsToPackage{no-math}{fontspec} \ExplSyntaxOn \AtEndOfPackage{% @@ -27,9 +33,15 @@ \tl_gset:Nx \g_fontspec_encoding_tl {T1} \seq_new:N \fontspec_ht_scripts \seq_new:N \fontspec_ht_fontfamilies + \ifdefined\XeTeXversion + \keys_define:nn {fontspec4ht}{ + Script .code:n = \xeuniuseblock{#1} + } + \else \keys_define:nn {fontspec4ht}{ Script .code:n = \seq_put_right:Nn \fontspec_ht_scripts {#1} } + \fi \cs_set:Nn \fontspec_set_family:Nnn { % \tl_set:Nn \l__fontspec_family_label_tl { #1 } -- cgit v1.2.3