From 488ce3fef5b02f2ea18895f0f43f460b0811418a Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 24 Apr 2024 22:11:10 +0000 Subject: letterspacing support, tex4ht r1508-1511 git-svn-id: svn://tug.org/texlive/trunk@71072 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/generic/tex4ht/ChangeLog | 19 ++++++ .../source/generic/tex4ht/tex4ht-4ht.tex | 36 +++++++++--- .../source/generic/tex4ht/tex4ht-html4.tex | 11 +++- Master/texmf-dist/tex/generic/tex4ht/html4.4ht | 15 ++++- Master/texmf-dist/tex/generic/tex4ht/microtype.4ht | 68 +++++++++++++--------- 5 files changed, 109 insertions(+), 40 deletions(-) diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 4cc207e3324..2429b5742c1 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,22 @@ +2024-04-24 Karl Berry + + * tex4ht-4ht.tex (microtype.4ht): use | + to get version ident, etc. + +2024-04-24 Michal Hoftich + + * tex4ht-4ht.tex (microtype.4ht), + * tex4ht-html4.tex (html4.4ht): use default value of letter spacing + provided by Microtype. + https://github.com/michal-h21/tex4ebook/issues/127 + +2024-04-23 Michal Hoftich + + * tex4ht-4ht.tex (microtype.4ht), + * tex4ht-html4.tex (html4.4ht): added support for letter spacing + using the \textls command. + https://github.com/michal-h21/tex4ebook/issues/127 + 2024-04-22 Michal Hoftich * tex4ht-4ht.tex (tcolorbox.4ht): fixed handling of labels in diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index 8296aec575f..4af3079f8a6 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 1507 2024-04-22 13:28:48Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1512 2024-04-24 22:10:14Z karl $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2024 TeX Users Group @@ -31389,11 +31389,11 @@ for output formats. %%%%%%%%%%%%% \<<< -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% microtype.4ht |version % -% Copyright (C) |CopyYear.2007. Eitan M. Gurari % -| +% microtype.4ht (|version), generated from |jobname.tex +% Copyright |CopyYear.2007. Eitan M. Gurari +| | + | \Hinput{microtype} \endinput >>> \AddFile{9}{microtype} @@ -31406,11 +31406,31 @@ for output formats. \renewcommand{\UseMicroTypeSet}[2][]{} \renewcommand{\SetProtrusion}[3][]{} \renewcommand{\SetExpansion}[3][]{} -\ifx \textls\UnDef\else - \renewcommand{\textls}[2][]{#2} -\fi >>> +We can try to provide a letterspacing command: + +\<<< +\NewConfigure{textls}{2} +\ExplSyntaxOn +\ifx\MT@letterspace\m@ne +\edef\:letterspacedefault{\fp_eval:n{\MT@letterspace@default/1000}} +\else +\edef\:letterspacedefault{\fp_eval:n{\MT@letterspace/1000}} +\fi +\providecommand\:textls[2][]{% + \begingroup% + \ifx\relax#1\relax\else% + \edef\:letterspacing{\fp_eval:n{#1/1000}}% + \fi% + \a:textls% + #2% + \b:textls% + \endgroup% +} +\ExplSyntaxOff +\HLet\MT@textls\:textls +>>> %%%%%%%%%%%%% \Section{Bm.sty} %%%%%%%%%%%%% diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex index 3cdfddd7910..4fe364db384 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-html4.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-html4.tex 1504 2024-04-19 15:48:03Z michal_h21 $ +% $Id: tex4ht-html4.tex 1511 2024-04-24 12:46:19Z michal_h21 $ % Compile 4 times: latex tex4ht-html4 % Copy html4.4ht into the work directory before all but the last compilation. % @@ -21751,6 +21751,15 @@ users redefine the latter macro. \ExplSyntaxOff >>> +%%%%%%%%%%%%%%%%%%%%% +\section{microtype} +%%%%%%%%%%%%%%%%%%%%% + +\<<< +\Configure{textls}{\HCode{}}{\HCode{}} +\Css{.textls{letter-spacing:\:letterspacedefault rem;}} % default letter spacing, if no amount is specified +>>> + %%%%%%%%%%%%%%%%%%%%% \section{mhchem} diff --git a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht index e0ffb4ab875..0ac29a156d3 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/html4.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/html4.4ht @@ -1,4 +1,4 @@ -% html4.4ht (2024-04-20-08:15), generated from tex4ht-html4.tex +% html4.4ht (2024-04-24-13:39), generated from tex4ht-html4.tex % Copyright 2009-2024 TeX Users Group % Copyright 1997-2009 Eitan M. Gurari % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2024-04-20-08:15} +\immediate\write-1{version 2024-04-24-13:39} \exit:ifnot{8859-6,% CJK,% @@ -160,6 +160,7 @@ memoir,% mex,% mfpic,% mhchem,% +microtype,% minitoc,% minted,% mls,% @@ -36754,6 +36755,16 @@ description">}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \ConfigureHinput{microtype} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + \Configure{textls}{\HCode{}}{\HCode{}} +\Css{.textls{letter-spacing:\:letterspacedefault rem;}} % default letter spacing, if no amount is specified + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\endinput\empty\empty\empty\empty\empty\empty +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/tex/generic/tex4ht/microtype.4ht b/Master/texmf-dist/tex/generic/tex4ht/microtype.4ht index b50a4e3ddd6..c2559007219 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/microtype.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/microtype.4ht @@ -1,30 +1,23 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% microtype.4ht 2009-05-21-09:32 % -% Copyright (C) 2007--2009 Eitan M. Gurari % -% % -% This work may be distributed and/or modified under the % -% conditions of the LaTeX Project Public License, either % -% version 1.3c of this license or (at your option) any % -% later version. The latest version of this license is % -% in % -% http://www.latex-project.org/lppl.txt % -% and version 1.3c or later is part of all distributions % -% of LaTeX version 2005/12/01 or later. % -% % -% This work has the LPPL maintenance status "maintained".% -% % -% This Current Maintainer of this work % -% is Eitan M. Gurari. % -% % -% If you modify this program your changing its signature % -% with a directive of the following form will be % -% appreciated. % -% \message{signature} % -% % -% gurari@cse.ohio-state.edu % -% http://www.cse.ohio-state.edu/~gurari % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\immediate\write-1{version 2009-05-21-09:32} +% microtype.4ht (2024-04-24-15:10), generated from tex4ht-4ht.tex +% Copyright 2007-2009 Eitan M. Gurari +% Copyright 2009-2024 TeX Users Group +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either +% version 1.3c of this license or (at your option) any +% later version. The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions +% of LaTeX version 2005/12/01 or later. +% +% This work has the LPPL maintenance status "maintained". +% +% The Current Maintainer of this work +% is the TeX4ht Project . +% +% If you modify this program, changing the +% version identification would be appreciated. +\immediate\write-1{version 2024-04-24-15:10} \MT@protrusionfalse \MT@expansionfalse @@ -33,9 +26,26 @@ \renewcommand{\UseMicroTypeSet}[2][]{} \renewcommand{\SetProtrusion}[3][]{} \renewcommand{\SetExpansion}[3][]{} -\ifx \textls\UnDef\else - \renewcommand{\textls}[2][]{#2} + + \NewConfigure{textls}{2} +\ExplSyntaxOn +\ifx\MT@letterspace\m@ne +\edef\:letterspacedefault{\fp_eval:n{\MT@letterspace@default/1000}} +\else +\edef\:letterspacedefault{\fp_eval:n{\MT@letterspace/1000}} \fi +\providecommand\:textls[2][]{% + \begingroup% + \ifx\relax#1\relax\else% + \edef\:letterspacing{\fp_eval:n{#1/1000}}% + \fi% + \a:textls% + #2% + \b:textls% + \endgroup% +} +\ExplSyntaxOff +\HLet\MT@textls\:textls \Hinput{microtype} \endinput -- cgit v1.2.3