summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-10-27 20:48:57 +0000
committerKarl Berry <karl@freefriends.org>2023-10-27 20:48:57 +0000
commit3bab6284c93491b38391f3f71cc7113c1fdb5038 (patch)
tree732778c25afb6f11b8491dcb1e3bcdfbe8365dcc /Master/texmf-dist
parent1d55c8b2cc67da8038f7456daa08a11e403ab4af (diff)
accented chars in docbook, tex4ht r1399
git-svn-id: svn://tug.org/texlive/trunk@68679 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog6
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-docbook.tex22
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/docbook.4ht24
3 files changed, 47 insertions, 5 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 9ac2a7d02da..6c152f54e57 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,9 @@
+2023-10-27 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-docbook.tex (docbook.4ht): fixed support for accented
+ characters.
+ https://github.com/michal-h21/make4ht/issues/138
+
2023-10-25 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-4ht.tex (tabularray.4ht),
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-docbook.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-docbook.tex
index b6ac89f11de..a65ce6153c9 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-docbook.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-docbook.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-docbook.tex 1362 2023-08-27 15:01:41Z karl $
+% $Id: tex4ht-docbook.tex 1399 2023-10-27 10:48:56Z michal_h21 $
% compile 3 times: latex tex4ht-docbook
% or xhlatex tex4ht-docbook "html,3,sections+"
%
@@ -123,6 +123,26 @@
>>>
+We reuse old accents code from unicode.4ht, because
+we got errors for accented characters without explicit
+configuration for accents.
+
+\<latex etc\><<<
+\Configure{accents}
+{\ifmmode \expandafter\mathord\fi
+{\leavevmode
+\if !#1!\ht:special{t4ht@+&\#x#2;}%
+\else \expandafter \ifx\csname U#2#1\endcsname\relax
+ \ht:special{t4ht@+&{35}x#2;}%
+\else
+ \ht:special{t4ht@+&{35}x\csname U#2#1\endcsname;}%
+\fi \fi x%
+\ht:special{t4ht@[}x\ht:special{t4ht@]}}}
+{\ifmmode \expandafter\mathord\fi
+{#3}}
+>>>
+
+
\<configure docbook-mml latex\><<<
\def\refLink#1#2#3\EndLink{%
\ifvmode
diff --git a/Master/texmf-dist/tex/generic/tex4ht/docbook.4ht b/Master/texmf-dist/tex/generic/tex4ht/docbook.4ht
index 6b57308c4d8..1890eed7165 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/docbook.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/docbook.4ht
@@ -1,4 +1,4 @@
-% docbook.4ht (2023-08-27-08:01), generated from tex4ht-docbook.tex
+% docbook.4ht (2023-10-27-13:27), generated from tex4ht-docbook.tex
% Copyright 2009-2023 TeX Users Group
% Copyright 2000-2009 Eitan M. Gurari
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2023-08-27-08:01}
+\immediate\write-1{version 2023-10-27-13:27}
\exit:ifnot{Preamble,%
algorithmic,%
@@ -547,6 +547,18 @@ switches of tex4ht.c)
\else
\Link{#1}{#2}\expandafter\ifx \csname RefArg\endcsname\relax\else \Tg<!--ref: \RefArg-->\fi\EndLink
\fi}
+\Configure{accents}
+{\ifmmode \expandafter\mathord\fi
+{\leavevmode
+\if !#1!\ht:special{t4ht@+&\#x#2;}%
+\else \expandafter \ifx\csname U#2#1\endcsname\relax
+ \ht:special{t4ht@+&{35}x#2;}%
+\else
+ \ht:special{t4ht@+&{35}x\csname U#2#1\endcsname;}%
+\fi \fi x%
+\ht:special{t4ht@[}x\ht:special{t4ht@]}}}
+{\ifmmode \expandafter\mathord\fi
+{#3}}
\Configure{newline}{\HCode{<!--br\Hnewline/-->}}
\Configure{newtheorem}
{\IgnorePar\EndP\HCode{<blockquote role="newtheorem"><title>}}
@@ -2737,7 +2749,6 @@ version="5.0" \Hnewline
-
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{biblatex}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3169,6 +3180,11 @@ version="5.0" \Hnewline
+
+
+
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{memoir}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -3515,6 +3531,7 @@ version="5.0" \Hnewline
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ConfigureHinput{dcolumn}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -5594,6 +5611,5 @@ version="5.0" \Hnewline
-
\endinput