diff options
author | Karl Berry <karl@freefriends.org> | 2022-09-16 21:34:20 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-09-16 21:34:20 +0000 |
commit | 78e79639162e72c8e359d5a6538dc819f39a268f (patch) | |
tree | d2003625e1a8a49113a002140387b509a6935182 | |
parent | 6e35a37ae644b460381ca941f295678270e56ad5 (diff) |
declare \unimathsetup, tex4ht r1195; handle ^ catcode change in (hyp)doc, tex4ht r1194
git-svn-id: svn://tug.org/texlive/trunk@64417 c570f23f-e606-0410-a88d-b1316a301751
7 files changed, 79 insertions, 8 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 940b0380953..b016187e218 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,14 @@ +2022-09-16 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-4ht.tex (unicode-math-hooks.4ht): declare the \unimathsetup + command. + + * tex4ht-sty.tex (tex4ht.sty): initialize the \SUPOn and \SUBOn + macros. + + * tex4ht-4ht (usepackage.4ht): disable TeX4ht redefinitions of the ^ + character at the loading of the doc and hypdoc packages. + 2022-09-14 Michal Hoftich <michal.h21@gmail.com> * tex4ht-4ht.tex (usepackage.4ht, luatexja-hooks.4ht): prevent diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index 4f4a5c6ba5a..c975e6e7c30 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 1193 2022-09-14 14:21:16Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1195 2022-09-16 20:06:02Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2022 TeX Users Group @@ -4301,6 +4301,7 @@ document. \@ifpackageloaded{fontspec}{} {\RequirePackage{fontspec}} % it is loaded by unicode-math \NewDocumentCommand \setmathfont { O{} m O{} }{} +\NewDocumentCommand \unimathsetup {m} {} \catcode`\:=11\makeatletter \endinput >>> \AddFile{9}{unicode-math-hooks} @@ -17552,11 +17553,21 @@ unnumberedsubsubsec% % Copyright (C) |CopyYear.1997. Eitan M. Gurari % |<TeX4ht copyright|> + + |<doc.sty|> \Hinput{doc} \endinput >>> \AddFile{9}{doc} +We have issue with catcode of the hat character, so we need to turn off +TeX4ht code for this character when the package is processed. + +\<add to usepackage\><<< +\AddToHook{package/doc/before}{\SUPOff} +\AddToHook{package/doc/after}{\SUPOn} +>>> + \<doc.sty\><<< \:CheckOption{no^} \if:Option \else \catcode`\^^M|=13 \def\hat:A#1^^M{\egroup} \catcode`\^^M|=5 % @@ -17628,6 +17639,20 @@ unnumberedsubsubsec% >>> %%%%%%%%%%%%%%%%%%%%%%%%%%% +\Section{hypdoc.sty} +%%%%%%%%%%%%%%%%%%%%%%%%%%% + +We don't need configuration file for the hypdoc package, but we need +to fix catcode issues with the hat character. + + +\<add to usepackage\><<< +\AddToHook{package/hypdoc/before}{\SUPOff} +\AddToHook{package/hypdoc/after}{\SUPOn} +>>> + + +%%%%%%%%%%%%%%%%%%%%%%%%%%% \Section{holtxdoc.sty} %%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex index 4e64265ba4b..c9193ba9400 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-sty.tex 1181 2022-08-04 17:27:58Z michal_h21 $ +% $Id: tex4ht-sty.tex 1194 2022-09-16 13:21:14Z michal_h21 $ % tex tex4ht-sty or ht tex tex4ht-sty % % Copyright 2009-2022 TeX Users Group @@ -8761,6 +8761,10 @@ TRY: Replace SUBOn with HSUBOn, SUBOff with HSUBOff, Ditto for SUP +\<record external sub-sup\><<< +\def\SUPOn{} +\def\SUBOn{} +>>> \<record external sub-sup\><<< \edef\SUPOff{% diff --git a/Master/texmf-dist/tex/generic/tex4ht/luatexja-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/luatexja-hooks.4ht new file mode 100644 index 00000000000..6b241268322 --- /dev/null +++ b/Master/texmf-dist/tex/generic/tex4ht/luatexja-hooks.4ht @@ -0,0 +1,24 @@ +% luatexja-hooks.4ht (2022-09-14-13:33), generated from tex4ht-4ht.tex +% Copyright 2022 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 <http://tug.org/tex4ht>. +% +% If you modify this program, changing the +% version identification would be appreciated. +\immediate\write-1{version 2022-09-14-13:33} + +\:dontusepackage{luatexja} +\:dontusepackage{luatexja-fontspec} +\endinput + diff --git a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty index eb331b395bb..3a1ee6554d1 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty +++ b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty @@ -1,7 +1,7 @@ \ifnum\the\catcode`\%=14\else\expandafter\edef\csname \string:RestoreCatcodes\endcsname{\catcode`\%\the \catcode`\%}\catcode`\%14\fi -% tex4ht.sty (2022-08-07-07:59), generated from tex4ht-sty.tex +% tex4ht.sty (2022-09-16-14:11), generated from tex4ht-sty.tex % Copyright 2009-2022 TeX Users Group % Copyright 1996-2009 Eitan M. Gurari % @@ -20,7 +20,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2022-08-07-07:59} +\immediate\write-1{version 2022-09-16-14:11} \ifx \Preamble\UnDef \else @@ -84,6 +84,8 @@ \catcode`\:11 \catcode`\@11 \catcode`;12 \catcode`\ 10 \catcode`\<12 \catcode`\>12 \catcode`+12 \catcode`*12 \catcode`\?12 +\def\SUPOn{} +\def\SUBOn{} \edef\SUPOff{% \catcode`\noexpand ^\the\catcode`^\relax } diff --git a/Master/texmf-dist/tex/generic/tex4ht/unicode-math-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/unicode-math-hooks.4ht index 484d972a10a..fcf66160e44 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/unicode-math-hooks.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/unicode-math-hooks.4ht @@ -1,4 +1,4 @@ -% unicode-math-hooks.4ht (2022-03-16-14:13), generated from tex4ht-4ht.tex +% unicode-math-hooks.4ht (2022-09-16-14:11), generated from tex4ht-4ht.tex % Copyright 2021-2022 TeX Users Group % % This work may be distributed and/or modified under the @@ -16,13 +16,14 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2022-03-16-14:13} +\immediate\write-1{version 2022-09-16-14:11} \:dontusepackage{unicode-math} \TivhTcats% we need to reset catcodes for : and @ before \RequirePackage \@ifpackageloaded{fontspec}{} {\RequirePackage{fontspec}} % it is loaded by unicode-math \NewDocumentCommand \setmathfont { O{} m O{} }{} +\NewDocumentCommand \unimathsetup {m} {} \catcode`\:=11\makeatletter \endinput diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht index b6086edf938..136d00f909c 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 (2022-09-14-13:33), generated from tex4ht-4ht.tex +% usepackage.4ht (2022-09-16-14:11), generated from tex4ht-4ht.tex % Copyright 2003-2009 Eitan M. Gurari % Copyright 2009-2022 TeX Users Group % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2022-09-14-13:33} +\immediate\write-1{version 2022-09-16-14:11} \def\:temp{tex4ht}\ifx \:temp\@currname \:warning{\string\usepackage{tex4ht} again?} @@ -70,6 +70,10 @@ \Configure{PackageHooks}{hyperref.sty}{hyperref-hooks.4ht} \Configure{PackageHooks}{bookmark.sty}{bookmark-hooks.4ht} \Configure{PackageHooks}{caption.sty}{caption-hooks.4ht} +\AddToHook{package/doc/before}{\SUPOff} +\AddToHook{package/doc/after}{\SUPOn} +\AddToHook{package/hypdoc/before}{\SUPOff} +\AddToHook{package/hypdoc/after}{\SUPOn} \Configure{PackageHooks}{babel.sty}{babel-sty-hooks.4ht} \Configure{PackageHooks}{minted.sty}{minted-sty-hooks.4ht} \Configure{PackageHooks}{graphics.sty}{graphics-hooks.4ht} |