From da68bce1d25d68087ca3b70134a61ae1c3a96b67 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Wed, 15 Jun 2022 03:00:50 +0000 Subject: CTAN sync 202206150300 --- support/TeX4ht/source/ChangeLog | 14 ++++++++ support/TeX4ht/source/Makefile | 6 ++-- support/TeX4ht/source/mktex4ht-cnf.tex | 3 +- support/TeX4ht/source/tex4ht-4ht.tex | 59 +++++++++++++++++++++++++++++++++- support/TeX4ht/source/update-htfonts | 4 +-- 5 files changed, 79 insertions(+), 7 deletions(-) (limited to 'support/TeX4ht/source') diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog index a11517b52b..f3741e4ff5 100644 --- a/support/TeX4ht/source/ChangeLog +++ b/support/TeX4ht/source/ChangeLog @@ -1,3 +1,17 @@ +2022-06-14 Michal Hoftich + + * tex4ht-4ht-tex (usepackage.4ht, ctexart-hooks.4ht, ctexart.4ht): + added support for the Ctexart class. + https://tex.stackexchange.com/a/647738/2891 + +2022-06-13 Michal Hoftich + + * tex4ht-fonts-cjk-utf8.tex ( + ./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/cjk/utf8/unisong*.htf + ): renamed utf8song*.htf to unisong*.htf, as the upstream fonts were + renamed. + https://tex.stackexchange.com/q/647557/2891 + 2022-06-10 Michal Hoftich * tex4ht-jats.tex (jats.4ht): added basic formatting support for diff --git a/support/TeX4ht/source/Makefile b/support/TeX4ht/source/Makefile index 01514e9fe7..322ad08061 100644 --- a/support/TeX4ht/source/Makefile +++ b/support/TeX4ht/source/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 1141 2022-06-01 21:43:42Z karl $ +# $Id: Makefile 1148 2022-06-13 20:58:49Z michal_h21 $ # This file is public domain. Originally written 2010, Karl Berry. # Assumes GNU make. @@ -115,7 +115,7 @@ tex4ht_4ht_derived = \ reading.4ht \ scrartcl.4ht scrbook.4ht scrreprt.4ht scrjura.4ht sectionbreak.4ht \ skak.4ht spanish.4ht subscript.4ht svg.4ht \ - tabu.4ht tcolorbox.4ht titlesec.4ht tocloft.4ht \ + tabu.4ht tcolorbox.4ht texpower.4ht titlesec.4ht tocloft.4ht \ tuenc-luatex.4ht tuenc-xetex.4ht \ tugboat.4ht \ usepackage.4ht usepackage-fontspec.4ht \ @@ -147,7 +147,7 @@ tex4ht_fonts_cjk_derived = \ derived += $(tex4ht_fonts_cjk_utf8_derived) tex4ht_fonts_cjk_utf8_derived = \ - $(ht_fonts_devdir)/unicode/cjk/utf8/utf8songa0.htf + $(ht_fonts_devdir)/unicode/cjk/utf8/unisonga0.htf # noncjk.tex \input's modern, but seems more maintainable # to have separate lists. diff --git a/support/TeX4ht/source/mktex4ht-cnf.tex b/support/TeX4ht/source/mktex4ht-cnf.tex index dd413acdff..ed83cdac17 100644 --- a/support/TeX4ht/source/mktex4ht-cnf.tex +++ b/support/TeX4ht/source/mktex4ht-cnf.tex @@ -1,4 +1,4 @@ -% $Id: mktex4ht-cnf.tex 1135 2022-05-19 15:28:47Z michal_h21 $ +% $Id: mktex4ht-cnf.tex 1149 2022-06-14 15:04:29Z michal_h21 $ % Manually-maintained file, listing *.4ht files created by tex4ht-4ht.tex. % Read by tex4ht-cond4ht. % @@ -353,6 +353,7 @@ \AddFile{9}{magyar} \AddFile{9}{exam} \AddFile{9}{ctex} +\AddFile{9}{ctexart} \AddFile{9}{polyglossia} \AddFile{9}{gloss-french} \AddFile{9}{fontspec} diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex index 72e706b6c9..b0276e19a9 100644 --- a/support/TeX4ht/source/tex4ht-4ht.tex +++ b/support/TeX4ht/source/tex4ht-4ht.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-4ht.tex 1145 2022-06-09 10:45:16Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1149 2022-06-14 15:04:29Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2022 TeX Users Group @@ -4326,6 +4326,63 @@ Add dummy .4ht file. We may use it in the future. \endinput >>> \AddFile{9}{ctex} +%%%%%%%%%%%%%%%%% +\Section{ctexart} +%%%%%%%%%%%%%%%%% + +This is a class relatex to Ctex. It fails with a fatal error +with LuaTeX and XeTeX, so we need to suppress lot of it's behavior. + +We need to use the LaTeX hook mechanism to load the patch file +before the class itself. + +\<<< +\AddToHook{class/ctexart/before}{\input{ctexart-hooks.4ht}} +>>> + +\<<< +% ctexart-hooks.4ht (|version), generated from |jobname.tex +% Copyright 2022 TeX Users Group +| +\ExplSyntaxOn + +% prevent multiple execution of this file +\ifdefined\l_save_engine_str\endinput\fi +\str_new:N \l_save_engine_str +% stop processing if the engine is pdftex, we want to change processing only for LuaTeX +\def\l_save_engine_str{pdftex} +\str_if_eq:NNTF \c_sys_engine_str\l_save_engine_str{\ExplSyntaxOff\endinput}{} + +% the luatexja package causes fatal error +\:dontusepackage{luatexja} + +% fix compilation errors +\AddToHook{package/ctexhook/after}{ + % don't let ctex to insert any files + \cs_set:Npn \ctex_file_input:n #1{} + % define some macros that are declared in the input files, and which are needed in the class + \cs_set:Npn \ctex_add_to_selectfont:n #1{} + \dim_new:N \ccwd + \skip_new:N \l__ctex_ccglue_skip + \cs_set_protected:Npn \ctex_update_em_unit: + { \dim_set:Nn \ccwd { \f@size \p@ } } + \cs_set_protected:Npn \ctex_update_ccglue: {} +} + +\ExplSyntaxOff +\endinput +>>> \AddFile{9}{ctexart-hooks} + +Add dummy .4ht file. We may use it in the future. + +\<<< +% ctexart.4ht (|version), generated from |jobname.tex +% Copyright 2022 TeX Users Group +| +\Hinput{ctexart} +\endinput +>>> \AddFile{9}{ctexart} + %%%%%%%%%%%%%%%%% \Section{polyglossia} %%%%%%%%%%%%%%%%% diff --git a/support/TeX4ht/source/update-htfonts b/support/TeX4ht/source/update-htfonts index 36d624d5ac..1b24cc5ec4 100755 --- a/support/TeX4ht/source/update-htfonts +++ b/support/TeX4ht/source/update-htfonts @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: update-htfonts 1093 2022-03-20 16:15:35Z karl $ +# $Id: update-htfonts 1141 2022-06-01 21:43:42Z karl $ # Public domain. Originally written by Karl Berry, 2022. # don't bother with real option parsing. @@ -83,7 +83,7 @@ echo "$prg: to $instdir" # find "$devdir" -type f -print | sort | while read devf; do instf=`echo "$devf" | sed "s,^$devdir/,$instdir/,"` - echo "$devf" | grep OpenSans >/dev/null && + #echo "$devf" | grep ec-mlm >/dev/null && #$verbose && echo "considering $devf -> $instf" if test -r "$instf"; then -- cgit v1.2.3