summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-05-06 20:55:58 +0000
committerKarl Berry <karl@freefriends.org>2024-05-06 20:55:58 +0000
commitfcbe1ce01e3a87f8ae1d73bbf65c9b13fe02113b (patch)
tree3e54222c6919a761227da2d7c822e5b107e83aaa
parent745497623100a9f1e89425706188e4f003c2846b (diff)
tagpdf support still in progress, tex4ht r1514
git-svn-id: svn://tug.org/texlive/trunk@71194 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog9
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex7
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex17
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/tagpdf-base-hooks.4ht9
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/tex4ht.4ht4
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty19
6 files changed, 41 insertions, 24 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 7bf38f7cc5f..6fd8ded5b11 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,12 @@
+2024-05-06 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-sty.tex (tex4ht.sty): don't disable \DocumentMetadata.
+ https://github.com/michal-h21/make4ht/issues/145
+
+ * tex4ht-4ht.tex (tagpdf-base-hooks.4ht): don't use \ExplSyntaxOn to
+ prevent catcode issues when we use \DocumentMetadata in the
+ document.
+
2024-05-03 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-4ht.tex (usepackage.4ht, tagpdf-hooks.4ht,
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index 1abdca77535..172cc6fa40d 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 1513 2024-05-03 14:15:23Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1514 2024-05-06 14:50:21Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2024 TeX Users Group
@@ -5115,10 +5115,9 @@ here as well.
% tagpd-base-hooks.4ht (|version), generated from |jobname.tex
% Copyright 2024 TeX Users Group
|<TeX4ht license text|>
-\ExplSyntaxOn
% ignore tagpdf's specials
-\cs_set_protected:Npn \__tag_whatsits: {}
-\ExplSyntaxOff
+% we use csname, because \ExplSyntaxOn .. Off caused catcode issues
+\expandafter\def\csname __tag_whatsits:\endcsname{}
\endinput
>>> \AddFile{9}{tagpdf-base-hooks}
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-sty.tex
index 34435a78243..e713134f7e3 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 1451 2024-01-23 14:16:56Z michal_h21 $
+% $Id: tex4ht-sty.tex 1514 2024-05-06 14:50:21Z michal_h21 $
% tex tex4ht-sty or ht tex tex4ht-sty
%
% Copyright 2009-2022 TeX Users Group
@@ -175,11 +175,16 @@
\let\AtBeginDocument\origatbegindocument
\fi
-% disable new LaTeX's tagging support,
-% but save the requested keys for possible latter processing
-\ifdefined\DocumentMetadata
- \def\DocumentMetadata#1{\def\:DocumentMetadata{#1}}
-\fi
+
+% we used to disable new LaTeX's tagging support,
+% because it clashed with TeX4ht and caused fatal errors
+% we fixed the fatal errors, so it should be possible to
+% fix other issues as well. The upside will be that we
+% should be able to coordinate the projects and reuse some code.
+% https://github.com/michal-h21/make4ht/issues/145
+% \ifdefined\DocumentMetadata
+% \def\DocumentMetadata#1{\def\:DocumentMetadata{#1}}
+% \fi
\def\writesixteen#1{\immediate\write99999{#1}}
|<save cat codes|>
diff --git a/Master/texmf-dist/tex/generic/tex4ht/tagpdf-base-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/tagpdf-base-hooks.4ht
index 09d16cefdfd..4793862b311 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/tagpdf-base-hooks.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/tagpdf-base-hooks.4ht
@@ -1,4 +1,4 @@
-% tagpd-base-hooks.4ht (2024-05-03-14:34), generated from tex4ht-4ht.tex
+% tagpd-base-hooks.4ht (2024-05-06-13:37), generated from tex4ht-4ht.tex
% Copyright 2024 TeX Users Group
%
% This work may be distributed and/or modified under the
@@ -16,11 +16,10 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2024-05-03-14:34}
+\immediate\write-1{version 2024-05-06-13:37}
-\ExplSyntaxOn
% ignore tagpdf's specials
-\cs_set_protected:Npn \__tag_whatsits: {}
-\ExplSyntaxOff
+% we use csname, because \ExplSyntaxOn .. Off caused catcode issues
+\expandafter\def\csname __tag_whatsits:\endcsname{}
\endinput
diff --git a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.4ht b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.4ht
index dfa8e3eda6f..4a90577d7c4 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.4ht
@@ -1,7 +1,7 @@
\ifnum\the\catcode`\%=14\else \expandafter\edef\csname
\string:RestoreCatcodes\endcsname{\catcode`\%\the
\catcode`\%}\catcode`\%14\fi
-% tex4ht.4ht (2024-01-10-14:44), generated from tex4ht-options.tex
+% tex4ht.4ht (2024-05-06-13:38), generated from tex4ht-options.tex
% Copyright 2009-2024 TeX Users Group
% Copyright 1997-2009 Eitan M. Gurari
%
@@ -20,7 +20,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2024-01-10-14:44}
+\immediate\write-1{version 2024-05-06-13:38}
\expandafter\edef\csname :RestoreCatcodes\endcsname{%
\expandafter\ifx \csname :RestoreCatcodes\endcsname\relax\else
diff --git a/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty b/Master/texmf-dist/tex/generic/tex4ht/tex4ht.sty
index c0cdadf2f27..18a85e36ce7 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 (2024-01-23-13:44), generated from tex4ht-sty.tex
+% tex4ht.sty (2024-05-06-13:36), generated from tex4ht-sty.tex
% Copyright 2009-2024 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 2024-01-23-13:44}
+\immediate\write-1{version 2024-05-06-13:36}
\ifx \Preamble\UnDef \else
@@ -32,11 +32,16 @@
\let\AtBeginDocument\origatbegindocument
\fi
-% disable new LaTeX's tagging support,
-% but save the requested keys for possible latter processing
-\ifdefined\DocumentMetadata
- \def\DocumentMetadata#1{\def\:DocumentMetadata{#1}}
-\fi
+
+% we used to disable new LaTeX's tagging support,
+% because it clashed with TeX4ht and caused fatal errors
+% we fixed the fatal errors, so it should be possible to
+% fix other issues as well. The upside will be that we
+% should be able to coordinate the projects and reuse some code.
+% https://github.com/michal-h21/make4ht/issues/145
+% \ifdefined\DocumentMetadata
+% \def\DocumentMetadata#1{\def\:DocumentMetadata{#1}}
+% \fi
\def\writesixteen#1{\immediate\write99999{#1}}
\expandafter\edef\csname :RestoreCatcodes\endcsname{%