diff options
Diffstat (limited to 'Master')
6 files changed, 46 insertions, 9 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index c4f37f88ffc..60905beb60f 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,3 +1,9 @@ +2022-08-04 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-4ht.tex (latex.4ht): revert to the original definition of + \% when TeX4ht doesn't compile literate sources. + https://tex.stackexchange.com/a/652950/2891 + 2022-07-26 Michal Hoftich <michal.h21@gmail.com> * tex4ht-mathml.tex (mathml.4ht): protect \sum etc., in order to diff --git a/Master/texmf-dist/source/generic/tex4ht/Makefile b/Master/texmf-dist/source/generic/tex4ht/Makefile index 01a6b62e903..825444558f8 100644 --- a/Master/texmf-dist/source/generic/tex4ht/Makefile +++ b/Master/texmf-dist/source/generic/tex4ht/Makefile @@ -856,6 +856,6 @@ diff = diff -u0 --ignore-all-space --ignore-blank-lines \ --ignore-matching-lines='write-1.version\|, generated from\|Copyright' # run weekly by karl. -croncheck: diff-all \ +croncheck: upm diff-all \ inst-check-copyright inst-check-files inst-check-version \ diff-htfonts diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index dbd0b1c60d6..c8533c2faf4 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 1179 2022-07-25 20:40:57Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1181 2022-08-04 17:27:58Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2022 TeX Users Group @@ -1142,6 +1142,7 @@ The following protection, e.g., for titles of sections. \<latex ltplain\><<< |<plain,ltplain obeylines,oalign|> +|<ltplain percent|> >>> plain.tex and latex. @@ -1192,6 +1193,23 @@ xxxxxxxxxxxxxxxxxxxxx \EndVerbatim\EndHPage{}]\fi + + +The \''\%' command needs to be redefined for TeX4ht source files, +but this redefinition causes compilation errors when it is used in +titles or captions. So we redefine it to the original LaTeX +definition. We can detect if we are in the literate sources by checking +if the \''\MAKETITLE' command is defined. + +See \Link[https://tex.stackexchange.com/q/652848/2891]{}{} +this question on TeX.sx for more details\EndLink. + +\<ltplain percent\><<< +\ifdefined\MAKETITLE\else +\chardef\%=`\% +\fi +>>> + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \Chapter{ltspace (Horizontal Spaces)} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex index 02b759ca684..4e64265ba4b 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 1171 2022-07-05 21:29:31Z karl $ +% $Id: tex4ht-sty.tex 1181 2022-08-04 17:27:58Z michal_h21 $ % tex tex4ht-sty or ht tex tex4ht-sty % % Copyright 2009-2022 TeX Users Group @@ -2224,6 +2224,15 @@ tags that in the meantime are created by the system. \catcode`\%|=12 \def\prcnt:ch{%} \catcode`\%|=14 >>> +I don't know what this code is supposed to do, but it can produce +fatal errors when \''\%' is used inside of title, captions or sections. +See \Link[https://tex.stackexchange.com/q/652848/2891]{}{} +this question on TeX.sx for an example\EndLink. + +But when I remove it, the compilation process of TeX4ht sources fails, +so we will need to revert to the original version of the percent command +probably in latex.4ht. + \<html utilities\><<< \catcode`\%|=12 \def\%{%} \catcode`\%|=14 >>> diff --git a/Master/texmf-dist/tex/generic/tex4ht/latex.4ht b/Master/texmf-dist/tex/generic/tex4ht/latex.4ht index 4a04e981a2b..40886972129 100644 --- a/Master/texmf-dist/tex/generic/tex4ht/latex.4ht +++ b/Master/texmf-dist/tex/generic/tex4ht/latex.4ht @@ -1,4 +1,4 @@ -% latex.4ht (2022-07-16-13:22), generated from tex4ht-4ht.tex +% latex.4ht (2022-08-07-07:59), generated from tex4ht-4ht.tex % Copyright 1997-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-07-16-13:22} +\immediate\write-1{version 2022-08-07-07:59} \ifx\SaveMkHalignConf:g\:UnDef \else \expandafter\endinput\fi @@ -135,6 +135,10 @@ \HLet\oalign\:temp \NewConfigure{oalign}{2} +\ifdefined\MAKETITLE\else +\chardef\%=`\% +\fi + @@ -2314,7 +2318,7 @@ $\vcenter \expandafter\:temp\usepackage!*?: \def\:tempa{\@latex@e@error} \ifx \:temp\:tempa - % latex209.4ht (2022-07-16-13:22), generated from tex4ht-4ht.tex + % latex209.4ht (2022-08-07-07:59), generated from tex4ht-4ht.tex % Copyright 1997-2009 Eitan M. Gurari % Copyright 2009-2022 TeX Users Group % @@ -2333,7 +2337,7 @@ $\vcenter % % If you modify this program, changing the % version identification would be appreciated. -\immediate\write-1{version 2022-07-16-13:22} +\immediate\write-1{version 2022-08-07-07:59} \let\:fnsymbol\@fnsymbol \def\@fnsymbol#1{{\hbox{$\:fnsymbol{#1}$}}} diff --git a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty index fe1980a741e..eb331b395bb 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-07-05-14:35), generated from tex4ht-sty.tex +% tex4ht.sty (2022-08-07-07:59), 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-07-05-14:35} +\immediate\write-1{version 2022-08-07-07:59} \ifx \Preamble\UnDef \else |