diff options
author | Karl Berry <karl@freefriends.org> | 2016-12-09 23:50:03 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-12-09 23:50:03 +0000 |
commit | e07718cf09bc0b67323b93d3f313e937200bad9a (patch) | |
tree | 5ae6e20e9ea8c8d95d354c3c3a6b9bd89fec1af5 /Master/texmf-dist | |
parent | 509826c1ca2d20abd0c31f25bd1aee0930889f9a (diff) |
fontspec in usepackage.4ht, tex4ht r205 et al.
git-svn-id: svn://tug.org/texlive/trunk@42665 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht | 45 |
1 files changed, 41 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht index e8211820ab0..6f74a1683ab 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht @@ -1,4 +1,4 @@ -% usepackage.4ht (2016-07-01-09:18), generated from tex4ht-4ht.tex +% usepackage.4ht (2016-12-09-15:49), generated from tex4ht-4ht.tex % Copyright 2003-2009 Eitan M. Gurari % Copyright 2009-2016 TeX Users Group % @@ -17,8 +17,6 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2016-07-01-09:18} - \def\:temp{tex4ht}\ifx \:temp\@currname \:warning{\string\usepackage{tex4ht} again?} \def\:temp#1htex4ht.def,tex4ht.sty#2!*?: {\def\:temp{#2}} @@ -33,7 +31,7 @@ \fi \fi -\gdef\a:usepackage{\use:package xr,xr-hyper,savetrees,,!*?: } +\gdef\a:usepackage{\use:package xr,xr-hyper,savetrees,fontspec,,!*?: } \gdef\use:package#1,{% \if :#1:\def\:temp##1!*?: {}\else \def\:temp{#1}\ifx \@currname\:temp @@ -57,6 +55,45 @@ \def\:temp{savetrees}\ifx \@currname\:temp \:dontusepackage{savetrees} \fi +\def\:temp{fontspec}\ifx \@currname\:temp +\:dontusepackage{fontenc} +\RequirePackage{expl3} +\append:def\config:opt{,new-accents} +\ExplSyntaxOn +\AtEndOfPackage{% + \tl_gset:Nx \l__fontspec_nfss_enc_tl {T1} + \tl_gset:Nx \g_fontspec_encoding_tl {T1} + \seq_new:N \fontspec_ht_scripts + \seq_new:N \fontspec_ht_fontfamilies + \keys_define:nn {fontspec4ht}{ + Script .code:n = \seq_put_right:Nn \fontspec_ht_scripts {#1} + } + \cs_gset:Nn \__fontspec_fontspec:nn + { + % \fontspec_set_family:Nnn \f@family {#1} {#2} + % \selectfont + \ignorespaces + } + \cs_set:Nn \__fontspec_newfontfamily:Nnn + { + % \fontspec_set_family:cnn { g__fontspec_ \cs_to_str:N #1 _family } {#2} {#3} + \keys_set_known:nn {fontspec4ht}{#2} + \seq_put_right:Nn \fontspec_ht_fontfamilies {#3} + \use:x + { + \exp_not:N \DeclareRobustCommand \exp_not:N #1 + { + % \exp_not:N \fontfamily { \use:c {g__fontspec_ \cs_to_str:N #1 _family} } + % \exp_not:N \fontencoding { \l__fontspec_nfss_enc_tl } + % \exp_not:N \selectfont + } + } + } + \global\expandafter\let\csname ver@fontenc.sty\endcsname\relax + \global\expandafter\let\csname opt@fontenc.sty\endcsname\relax +} +\ExplSyntaxOff +\fi \endinput |