From a25f6272b8613c37311e3a90092d57904f6089b6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 13 Dec 2019 22:57:46 +0000 Subject: polyglossia direction fix, tex4ht r631 git-svn-id: svn://tug.org/texlive/trunk@53121 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/generic/tex4ht/usepackage.4ht | 36 ++++++++++------------ 1 file changed, 16 insertions(+), 20 deletions(-) (limited to 'Master/texmf-dist/tex/generic') diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht index 737ad8439e5..b0203d20e17 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 (2019-10-31-14:15), generated from tex4ht-4ht.tex +% usepackage.4ht (2019-12-13-14:32), generated from tex4ht-4ht.tex % Copyright 2003-2009 Eitan M. Gurari % Copyright 2009-2019 TeX Users Group % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2019-10-31-14:15} +\immediate\write-1{version 2019-12-13-14:32} \def\:temp{tex4ht}\ifx \:temp\@currname \:warning{\string\usepackage{tex4ht} again?} @@ -108,26 +108,22 @@ \xeuniuseblock{CJK} } \fi +\def\:temp{polyglossia}\ifx \@currname\:temp +\ExplSyntaxOn \AtEndOfPackage{ - \let\orig@xpg@define@keys\xpg@define@keys - \def\xpg@define@keys#1{% - \orig@xpg@define@keys{#1}% - \define@choicekey+[xpg@setup]{#1}{direction}[\val\nr]{LR,RL}[LR]% - { - \togglefalse{#1@RL}% - \ifcase\nr\relax% - \csgappto{init@extras@#1}{% - a:PolyglossiaRtl% - } - \or - \csgappto{init@extras@#1}{% - \b:PolyglossiaRtl% - } - \fi - }% - {\xpg@warning{#1: Invalid value \val\space for key "direction"}}% -}} +\cs_set_eq:NN\orig_polyglossia@keys_define_lang:n\polyglossia@keys_define_lang:n +\cs_set_protected:Npn \polyglossia@keys_define_lang:n #1 { + \orig_polyglossia@keys_define_lang:n{#1} + \keys_define:nn {polyglossia}{ + #1 / direction + . code:n = {} + } +} +\def\RequireBidi{}% +} +\ExplSyntaxOff +\fi \def\:temp{fontspec}\ifx \@currname\:temp \ifdefined\fontspec \:dontusepackage{fontspec} -- cgit v1.2.3