From e55e229e13434f5752b115d04b65f0f79a8c53b5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 27 Mar 2023 21:26:26 +0000 Subject: disable accent redefinition, tex4ht r1311; do not redefine \chapter, tex4ht r1312 git-svn-id: svn://tug.org/texlive/trunk@66688 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/generic/tex4ht/ChangeLog | 10 +++++ .../source/generic/tex4ht/tex4ht-4ht.tex | 6 ++- .../source/generic/tex4ht/tex4ht-unicode.tex | 8 +++- .../source/generic/tex4ht/update-htfonts | 20 +++++----- Master/texmf-dist/tex/generic/tex4ht/glossary.4ht | 8 ++-- .../tex/generic/tex4ht/titlesec-hooks.4ht | 8 +++- Master/texmf-dist/tex/generic/tex4ht/unicode.4ht | 45 +++++++++++++++++----- 7 files changed, 79 insertions(+), 26 deletions(-) diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index 80a5f4cd67d..334f53cfa40 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,13 @@ +2023-03-27 Michal Hoftich + + * tex4ht-4ht.tex (titlesec-hooks.4ht): prevent redefinition of + \chapter commands + https://tex.stackexchange.com/a/680943/2891 + + * tex4ht-unicode.tex (unicode.4ht): disabled redefinition of + accents, in order to get pictured accents in default HTML math + output. + 2023-03-24 Michal Hoftich * tex4ht-fonts-noncjk.tex ( diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index beb17eeabc1..f0d98163632 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 1309 2023-03-22 13:48:40Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1312 2023-03-27 13:06:23Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2023 TeX Users Group @@ -937,6 +937,8 @@ is loaded, and then load the saved versions back to the original commands. >>> \AddFile{9}{titlesec-hooks} \<<< +\let\ttl:@makechapterhead\@makechapterhead +\let\ttl:@makeschapterhead\@makeschapterhead \let\ttl:chapter\chapter \let\ttl:section\section \let\ttl:subsection\subsection @@ -950,6 +952,8 @@ is loaded, and then load the saved versions back to the original commands. \let\subsubsection\ttl:subsubsection \let\paragraph\ttl:paragraph \let\subparagraph\ttl:subparagraph + \let\@makechapterhead\ttl:@makechapterhead + \let\@makeschapterhead\ttl:@makeschapterhead } >>> diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-unicode.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-unicode.tex index e5ccf2814eb..cda543e9ab7 100644 --- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-unicode.tex +++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-unicode.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-unicode.tex 1230 2022-10-31 12:01:20Z michal_h21 $ +% $Id: tex4ht-unicode.tex 1311 2023-03-27 07:25:44Z michal_h21 $ % latex tex4ht-unicode or xhlatex tex4ht-unicode "html,3,sections+" % % Copyright 2009-2022 TeX Users Group @@ -356,12 +356,18 @@ applets. a candidadte for delition. \:CheckOption{new-accents} \if:Option \else | \ifx \mathml:on\:UnDef +% this configuration causes wrong rendering of accents in the default TeX4ht +% math output - accented text, like vectors is converted without accents +% we will rather use the default configuration, which produces pictures +% in the text mode, accents seems to work fine with or without this configuration + \iffalse % we use \iffalse, because simple commenting off didn't work \Configure{accents} {\ifmmode \expandafter\mathord\fi {|% \ht:special{t4ht@[}x\ht:special{t4ht@]}}} {\ifmmode \expandafter\mathord\fi {\HCode{}#3\HCode{}}} + \fi \else \:warning{unicode.4ht loaded after mathml.4ht} \fi diff --git a/Master/texmf-dist/source/generic/tex4ht/update-htfonts b/Master/texmf-dist/source/generic/tex4ht/update-htfonts index 1b24cc5ec45..e07d1e0b075 100644 --- a/Master/texmf-dist/source/generic/tex4ht/update-htfonts +++ b/Master/texmf-dist/source/generic/tex4ht/update-htfonts @@ -1,5 +1,6 @@ #!/bin/sh # $Id: update-htfonts 1141 2022-06-01 21:43:42Z karl $ +# Update TeX4ht font files (.htf). See ./Makefile for invocations. # Public domain. Originally written by Karl Berry, 2022. # don't bother with real option parsing. @@ -34,7 +35,8 @@ fi devdir=$1 instdir=$2 verbose=true -tmp=/tmp/htdif # prefix +tmpdir=/tmp/htdif.d # prefix +rm -rf $tmpdir; mkdir $tmpdir if test ! -d "$devdir"; then echo "$0: devdir not a directory: $devdir" >&2 @@ -66,8 +68,8 @@ copy_file () { htf_same () { src=$1; dest=$2; # - src_filtered=$tmp.s`basename "$src"` - dest_filtered=$tmp.d`basename "$dest"` + src_filtered=$tmpdir/s`basename "$src"` + dest_filtered=$tmpdir/d`basename "$dest"` # sed 's/20[0-9][0-9]-[0-9][0-9]-[0-9][0-9]\(-[0-9][0-9]:[0-9][0-9]\)*//' \ $src >$src_filtered || exit 1 @@ -79,7 +81,7 @@ htf_same () { # Iterate through all files in the dev directory. echo "$prg: comparing $devdir" echo "$prg: to $instdir" ->$tmp.0 # accumulate diffs here +>$tmpdir/0 # accumulate diffs here # find "$devdir" -type f -print | sort | while read devf; do instf=`echo "$devf" | sed "s,^$devdir/,$instdir/,"` @@ -93,7 +95,7 @@ find "$devdir" -type f -print | sort | while read devf; do else $verbose && echo "`basename \"$devf\"`: diff ($devf != $instf)" # save diff from (older) DEST to newer (SRC). - diff -u0 "$dest" "$src" >>$tmp.0 + diff -u0 "$dest" "$src" >>$tmpdir/0 # copy_file "$devf" "$instf" fi @@ -122,14 +124,14 @@ find "$devdir" -type f -print | sort | while read devf; do done # check for extra files in $instdir -(cd "$devdir" && find . -type f -print | sort) >$tmp.devdir || exit 1 -(cd "$instdir" && find . -type f -print | sort) >$tmp.instdir || exit 1 +(cd "$devdir" && find . -type f -print | sort) >$tmpdir/devdir || exit 1 +(cd "$instdir" && find . -type f -print | sort) >$tmpdir/instdir || exit 1 echo "$prg: files in devdir and not in instdir (should be empty):" -comm -23 $tmp.devdir $tmp.instdir +comm -23 $tmpdir/devdir $tmpdir/instdir echo "$prg: files in instdir and not in devdir (you should remove):" -comm -13 $tmp.devdir $tmp.instdir +comm -13 $tmpdir/devdir $tmpdir/instdir # maybe better to leave it for manual removal? echo "$prg: done." diff --git a/Master/texmf-dist/tex/generic/tex4ht/glossary.4ht b/Master/texmf-dist/tex/generic/tex4ht/glossary.4ht index ea1710e481c..c69deee18b2 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/glossary.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/glossary.4ht @@ -1,6 +1,6 @@ -% glossary.4ht (2021-06-06-09:18), generated from tex4ht-4ht.tex +% glossary.4ht (2023-03-22-13:41), generated from tex4ht-4ht.tex % Copyright 2005-2009 Eitan M. Gurari -% Copyright 2009-2021 TeX Users Group +% Copyright 2009-2023 TeX Users Group % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2021-06-06-09:18} +\immediate\write-1{version 2023-03-22-13:41} \def\glosslabel#1{\Link{}{#1}\EndLink} \def\glossref#1#2{\Link{#1}{}#2\EndLink} @@ -41,7 +41,7 @@ {\Configure{Needs}{File: #1.4idx}\Needs{}}% \fi} -\warn:gls{\jobname} +refextract\warn:gls{\jobname} \def\gloskip{\expandafter\ifx\csname gloskip:\gls@style\endcsname\relax \indexspace \else \csname gloskip:\gls@style\endcsname\fi} \NewConfigure{gloskip}[2]{\expandafter\def\csname gloskip:#1\endcsname{#2}} diff --git a/Master/texmf-dist/tex/generic/tex4ht/titlesec-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/titlesec-hooks.4ht index 59f7380baf7..58fa3b78357 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/titlesec-hooks.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/titlesec-hooks.4ht @@ -1,4 +1,4 @@ -% titlesec-hooks.4ht (2022-03-16-14:13), generated from tex4ht-4ht.tex +% titlesec-hooks.4ht (2023-03-27-13:26), generated from tex4ht-4ht.tex % Copyright 2022 TeX Users Group % % This work may be distributed and/or modified under the @@ -16,8 +16,10 @@ % % 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 2023-03-27-13:26} +\let\ttl:@makechapterhead\@makechapterhead +\let\ttl:@makeschapterhead\@makeschapterhead \let\ttl:chapter\chapter \let\ttl:section\section \let\ttl:subsection\subsection @@ -31,6 +33,8 @@ \let\subsubsection\ttl:subsubsection \let\paragraph\ttl:paragraph \let\subparagraph\ttl:subparagraph + \let\@makechapterhead\ttl:@makechapterhead + \let\@makeschapterhead\ttl:@makeschapterhead } \endinput diff --git a/Master/texmf-dist/tex/generic/tex4ht/unicode.4ht b/Master/texmf-dist/tex/generic/tex4ht/unicode.4ht index b9f4e115a42..8b387ec5d63 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/unicode.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/unicode.4ht @@ -1,4 +1,4 @@ -% unicode.4ht (2022-10-31-13:02), generated from tex4ht-unicode.tex +% unicode.4ht (2023-03-27-13:26), generated from tex4ht-unicode.tex % Copyright 2009-2022 TeX Users Group % Copyright 1998-2009 Eitan M. Gurari % @@ -17,7 +17,7 @@ % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2022-10-31-13:02} +\immediate\write-1{version 2023-03-27-13:26} \exit:ifnot{8859-6,% SIunits,% @@ -303,6 +303,11 @@ y{0233}G{1E20}g{1E21}% {\a:accents{}{#1}} {\b:accents{bar}{#1}{#2}} \ifx \mathml:on\:UnDef +% this configuration causes wrong rendering of accents in the default TeX4ht +% math output - accented text, like vectors is converted without accents +% we will rather use the default configuration, which produces pictures +% in the text mode, accents seems to work fine with or without this configuration + \iffalse % we use \iffalse, because simple commenting off didn't work \Configure{accents} {\ifmmode \expandafter\mathord\fi {\leavevmode @@ -316,6 +321,7 @@ y{0233}G{1E20}g{1E21}% \ht:special{t4ht@[}x\ht:special{t4ht@]}}} {\ifmmode \expandafter\mathord\fi {\HCode{}#3\HCode{}}} + \fi \else \:warning{unicode.4ht loaded after mathml.4ht} \fi @@ -566,8 +572,6 @@ R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}% - - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsart} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -579,6 +583,7 @@ R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsproc} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -589,7 +594,6 @@ R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amsldoc} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -679,7 +683,6 @@ R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}% - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{amstex1} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -730,6 +733,7 @@ Y{0178}\i{00EF}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{plain} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -959,6 +963,11 @@ y{0233}G{1E20}g{1E21}% {\a:accents{}{#1}} {\b:accents{bar}{#1}{#2}} \ifx \mathml:on\:UnDef +% this configuration causes wrong rendering of accents in the default TeX4ht +% math output - accented text, like vectors is converted without accents +% we will rather use the default configuration, which produces pictures +% in the text mode, accents seems to work fine with or without this configuration + \iffalse % we use \iffalse, because simple commenting off didn't work \Configure{accents} {\ifmmode \expandafter\mathord\fi {\leavevmode @@ -972,6 +981,7 @@ y{0233}G{1E20}g{1E21}% \ht:special{t4ht@[}x\ht:special{t4ht@]}}} {\ifmmode \expandafter\mathord\fi {\HCode{}#3\HCode{}}} + \fi \else \:warning{unicode.4ht loaded after mathml.4ht} \fi @@ -1181,6 +1191,16 @@ R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}% + + + + + + + + + + @@ -1262,6 +1282,7 @@ R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}% \endinput\empty\empty\empty\empty\empty\empty %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{8859-6} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1331,9 +1352,6 @@ R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}% - - - @@ -1361,6 +1379,7 @@ R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \ConfigureHinput{sistyle} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1454,6 +1473,9 @@ R{1E5E}r{1E5F}T{1E6E}t{1E6F}Z{1E94}z{1E95}h{1E96}% + + + @@ -2171,6 +2193,11 @@ s{015B}u{00FA}y{00FD}z{017A}j{FFFD}J{FFDD}\i{00ED}\j{FFFD}% + + + + + -- cgit v1.2.3