summaryrefslogtreecommitdiff
path: root/support
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-03-28 03:03:58 +0000
committerNorbert Preining <norbert@preining.info>2023-03-28 03:03:58 +0000
commit344dd03236ce7a31067cf768fed299127c60c7aa (patch)
treef49d0f6b2fbe9d87597177e249d2e7d6f15f971c /support
parent8ee50414f6054311ac11efe8ea6360c25c622498 (diff)
CTAN sync 202303280303
Diffstat (limited to 'support')
-rw-r--r--support/TeX4ht/source/ChangeLog10
-rw-r--r--support/TeX4ht/source/tex4ht-4ht.tex6
-rw-r--r--support/TeX4ht/source/tex4ht-unicode.tex8
-rwxr-xr-xsupport/TeX4ht/source/update-htfonts20
4 files changed, 33 insertions, 11 deletions
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog
index 80a5f4cd67..334f53cfa4 100644
--- a/support/TeX4ht/source/ChangeLog
+++ b/support/TeX4ht/source/ChangeLog
@@ -1,3 +1,13 @@
+2023-03-27 Michal Hoftich <michal.h21@gmail.com>
+
+ * 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 <michal.h21@gmail.com>
* tex4ht-fonts-noncjk.tex (
diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex
index beb17eeabc..f0d9816363 100644
--- a/support/TeX4ht/source/tex4ht-4ht.tex
+++ b/support/TeX4ht/source/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}
\<titlesec-packagehooks\><<<
+\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/support/TeX4ht/source/tex4ht-unicode.tex b/support/TeX4ht/source/tex4ht-unicode.tex
index e5ccf2814e..cda543e9ab 100644
--- a/support/TeX4ht/source/tex4ht-unicode.tex
+++ b/support/TeX4ht/source/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
|<old unicode accents|>
\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
{|<temp hcode accents|>%
\ht:special{t4ht@[}x\ht:special{t4ht@]}}}
{\ifmmode \expandafter\mathord\fi
{\HCode{<span class='accent#1'>}#3\HCode{</span>}}}
+ \fi
\else
\:warning{unicode.4ht loaded after mathml.4ht}
\fi
diff --git a/support/TeX4ht/source/update-htfonts b/support/TeX4ht/source/update-htfonts
index 1b24cc5ec4..e07d1e0b07 100755
--- a/support/TeX4ht/source/update-htfonts
+++ b/support/TeX4ht/source/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."