summaryrefslogtreecommitdiff
path: root/support/TeX4ht
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-12-22 03:02:07 +0000
committerNorbert Preining <norbert@preining.info>2023-12-22 03:02:07 +0000
commit49150e453072cff2c2ecaba1d1a55d8333d191d3 (patch)
treebd7e16e55839f6baf784320bb751d2892bcb88cc /support/TeX4ht
parent838a56d5436e7e7e526d6dffe2461cf050643168 (diff)
CTAN sync 202312220302
Diffstat (limited to 'support/TeX4ht')
-rw-r--r--support/TeX4ht/source/ChangeLog11
-rw-r--r--support/TeX4ht/source/tex4ht-fonts-noncjk.tex258
-rw-r--r--support/TeX4ht/source/tex4ht-ooffice.tex22
3 files changed, 161 insertions, 130 deletions
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog
index fb58c85cb6..3ebf22b777 100644
--- a/support/TeX4ht/source/ChangeLog
+++ b/support/TeX4ht/source/ChangeLog
@@ -1,3 +1,14 @@
+2023-12-20 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-fonts-noncjk.tex (
+ ./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/misc/wasy.htf
+ ): fixed wrong characters in the Wasy font.
+ Thanks to Arkady Benediktov
+
+ * tex4ht-ooffice.tex (ooffice-mml.4ht): use code from html-mml.4ht
+ to prevent spurious <mo> element in equation. It could prevent
+ displaying of equations.
+
2023-12-17 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-4ht.tex (enumitem.4ht): prevent errors with redefined
diff --git a/support/TeX4ht/source/tex4ht-fonts-noncjk.tex b/support/TeX4ht/source/tex4ht-fonts-noncjk.tex
index d9ea432b56..e3acee737d 100644
--- a/support/TeX4ht/source/tex4ht-fonts-noncjk.tex
+++ b/support/TeX4ht/source/tex4ht-fonts-noncjk.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-fonts-noncjk.tex 1416 2023-12-05 08:58:07Z michal_h21 $
+% $Id: tex4ht-fonts-noncjk.tex 1427 2023-12-20 22:00:23Z michal_h21 $
% tex tex4ht-fonts-noncjk
% or ht tex tex4ht-fonts-noncjk
%
@@ -50608,134 +50608,134 @@ ifsym 0 124
\<wasy\><<<
wasy 0 127
-'&#x2206;' '' 0 `<version 0`>
-'&#x22B2;' '' 1 % wasy.htf `version %
-'&#x22B4;' '' 2 % Copyright `CopyYear.2002. Eitan M. Gurari %
-'&#x22B3;' '' 3 `<version 2`>
-'&#x22B5;' '' 4 `<version 3`>
-'&#x2234;' '' 5 `<version 4`>
-'&#x2315;' '' 6 `<version 5`>
-'&#x260E;' '' phone 7 `<version 6`>
-'&#x2713;' '' check mark 8 `<version 7`>
-'&#x21E8;' '' right white arrow 19 `<version 8`>
-'???' '1' bell 10 `<version 9`>
-'&#x2264;' '' 11 `<version 10`>
-'&#x2269;' '' 12 `<version 11`>
-'&#x2269;' '' 13 `<version 12`>
-'???' '1' 14 `<version 13`>
-'&#x226B;' '' 15 `<version 14`>
-'&#x25C4;' '' 16 `<version 15`>
-'&#x25BA;' '' 17 `<version 16`>
-'&#x03DF;' '' 18 `<version 17`>
-'&#x264C;' '' 19 `<version 18`>
-'???' '1' 20
-'???' '1' 21
-'???' '1' 22
-'&#x2648;' '' 23
-'???' '1' 24
-'&#x2640;' '' 25
-'&#x2642;' '' 26
-'&#x00A4;' '' 27
-'???' '1' 28
-'&#x221D;' '' 29
-'&#x2222;' '' 30
-'&#x2300;' '' 31
-'&#x25CF;' '' 32
-'&#x21BB;' '' 33
-'&#x21BA;' '' 34
-'&#x25EF;' '' 35
-'&#x263E;' '' 36
-'&#x263D;' '' 37
-'&#x2641;' '' 38
-'&#x263F;' '' 39
-'&#x29FC;' '' 40
-'&#x29FD;' '' 41
-'???' '1' 42
-'???' '1' 43
-'&#x263A;' '' 44
-'&#x263B;' '' 45
-'&#x263C;' '' 46
-'&#x2639;' '' 47
-'&#x2127;' '' 48
-'???' '1' 49
-'&#x25A1;' '' 50
-'&#x25C7;' '' 51
-'&#x22A0;' '' 52
-'???' '1' 53
-'&#x2720;' '' 54
-'&#x2394;' '' 55
-'???' '1' 56
-'???' '1' 57
-'&#x223C;' '' 58
-'&#x219D;' '' 59
-'&#x228F;' '' 60
-'&#x2290;' '' 61
-'&#x2272;' '' 62
-'&#x2273;' '' 63
-'&#x224B;' '' 64
-'???' '1' 65
-'???' '1' 66
-'&#x2721;' '' 67
-'???' '1' 68
-'???' '1' 69
-'&#x25BD;' '' 70
-'&#x25D6;' '' 71
-'&#x25D7;' '' 72
-'???' '1' 73
-'???' '1' 74
-'&#x25B2;' '' 75
-'&#x25BC;' '' 76
-'' '' 77
-'' '' 78
-'' '' 79
-'???' '1' 80
-'???' '1' 81
-'???' '1' 82
-'' '' 83
-'' '' 84
-'???' '1' 85
-'&#x260C;' '' 86
-'&#x260D;' '' 87
-'&#x2643;' '' 88
-'&#x2644;' '' 89
-'???' '1' 90
-'???' '1' 91
-'&#x2647;' '' 92
-'&#x2649;' '' 93
-'&#x264A;' '' 94
-'&#x264B;' '' 95
-'&#x264D;' '' 96
-'&#x264E;' '' 97
-'&#x264F;' '' 98
-'&#x2650;' '' 99
-'???' '1' 100
-'&#x2652;' '' 101
-'&#x2653;' '' 102
-'&#x00A2;' '' 103
-'&#x2030;' '' 104
-'&#x00FE;' '' 105
-'&#x00DE;' '' 106
-'???' '1' 107
-'&#x0254;' '' 108
-'???' '1' 109
-'&#x2350;' '' 110
-'&#x2357;' '' 111
-'&#x2347;' '' 112
-'&#x2348;' '' 113
-'&#x222B;' '' 114
-'&#x222C;' '' 115
-'&#x222D;' '' 116
-'&#x222E;' '' 117
-'&#x222F;' '' 118
-'&#x222B;' '' 119
-'&#x222C;' '' 120
-'&#x222D;' '' 121
-'&#x222E;' '' 122
-'&#x222F;' '' 123
-'&#x00A6;' '' 124
-'&#x235E;' '' 125
-'???' '1' 126
-'???' '1' 127
+'&#x25b3;' '' 0 `<version 0`>
+'&#x22b2;' '' 1 % wasy.htf `version %
+'&#x22b4;' '' 2 % Copyright `CopyYear.2002. Eitan M. Gurari %
+'&#x22b3;' '' 3 `<version 2`>
+'&#x22b5;' '' 4 `<version 3`>
+'&#x2234;' '' 5 `<version 4`>
+'&#x2315;' '' 6 `<version 5`>
+'&#x260e;' '' 7 `<version 6`>
+'&#x2713;' '' 8 `<version 7`>
+'&#x21e8;' '' 9 `<version 8`>
+'&#x1f514;' '' 10 `<version 9`>
+'&#x266a;' '' 11 `<version 10`>
+'&#x2669;' '' 12 `<version 11`>
+'&#x1d15e;' '' 13 `<version 12`>
+'&#x1d15d;' '' 14 `<version 13`>
+'&#x266b;' '' 15 `<version 14`>
+'&#x25c4;' '' 16 `<version 15`>
+'&#x25ba;' '' 17 `<version 16`>
+'&#x21af;' '' 18 `<version 17`>
+'&#x260a;' '' 19 `<version 18`>
+'&#x260b;' '' 20
+'&#x2349;' '' 21
+'&#x235f;' '' 22
+'&#x2648;' '' 23
+'&#x2310;' '' 24
+'&#x2640;' '' 25
+'&#x2642;' '' 26
+'&#x00a4;' '' 27
+'&#x1f552;' '' 28
+'&#x221d;' '' 29
+'&#x2222;' '' 30
+'&#x2300;' '' 31
+'&#x25cf;' '' 32
+'&#x21bb;' '' 33
+'&#x21ba;' '' 34
+'&#x25ef;' '' 35
+'&#x263e;' '' 36
+'&#x263d;' '' 37
+'&#x2641;' '' 38
+'&#x263f;' '' 39
+'&#x29fc;' '' 40
+'&#x29fd;' '' 41
+'&#x22cf;' '' 42
+'&#x22ce;' '' 43
+'&#x263a;' '' 44
+'&#x263b;' '' 45
+'&#x263c;' '' 46
+'&#x2639;' '' 47
+'&#x2127;' '' 48
+'&#x22c8;' '' 49
+'&#x25a1;' '' 50
+'&#x25c7;' '' 51
+'&#x22a0;' '' 52
+'&#x2311;' '' 53
+'&#x2720;' '' 54
+'&#x2394;' '' 55
+'' '1' 56
+'&#x2b21;' '' 57
+'&#x223c;' '' 58
+'&#x219d;' '' 59
+'&#x228f;' '' 60
+'&#x2290;' '' 61
+'&#x2272;' '' 62
+'&#x2273;' '' 63
+'&#x224b;' '' 64
+'&#x2736;' '' 65
+'&#x2736;' '' 66
+'&#x2721;' '' 67
+'&#x2b20;' '' 68
+'&#x2605;' '' 69
+'&#x25bd;' '' 70
+'&#x25d6;' '' 71
+'&#x25d7;' '' 72
+'' '1' 73
+'' '1' 74
+'&#x25b2;' '' 75
+'&#x25bc;' '' 76
+'&#x00a7;' '' 77
+'&#x20ac;' '' 78
+'&#x0292;' '' 79
+'&#x0263;' '' 80
+'' '1' 81
+'' '1' 82
+'&#x2318;' '' 83
+'&#x017f;' '' 84
+'&#x0259;' '' 85
+'&#x260c;' '' 86
+'&#x260d;' '' 87
+'&#x2643;' '' 88
+'&#x2644;' '' 89
+'&#x26e2;' '' 90
+'&#x2646;' '' 91
+'&#x2647;' '' 92
+'&#x2649;' '' 93
+'&#x264a;' '' 94
+'&#x264b;' '' 95
+'&#x264d;' '' 96
+'&#x264e;' '' 97
+'&#x264f;' '' 98
+'&#x2650;' '' 99
+'&#x2651;' '' 100
+'&#x2652;' '' 101
+'&#x2653;' '' 102
+'&#x00a2;' '' 103
+'&#x2030;' '' 104
+'&#x00fe;' '' 105
+'&#x00de;' '' 106
+'&#x00f0;' '' 107
+'&#x0254;' '' 108
+'' '1' 109
+'&#x2350;' '' 110
+'&#x2357;' '' 111
+'&#x2347;' '' 112
+'&#x2348;' '' 113
+'&#x222b;' '' 114
+'&#x222c;' '' 115
+'&#x222d;' '' 116
+'&#x222e;' '' 117
+'&#x222f;' '' 118
+'&#x222b;' '' 119
+'&#x222c;' '' 120
+'&#x222d;' '' 121
+'&#x222e;' '' 122
+'&#x222f;' '' 123
+'&#x00a6;' '' 124
+'&#x235e;' '' 125
+'&#x2395;' '' 126
+'&#x235d;' '' 127
wasy 0 127
htfcss: wasyb font-weight: bold;
>>>
diff --git a/support/TeX4ht/source/tex4ht-ooffice.tex b/support/TeX4ht/source/tex4ht-ooffice.tex
index 8db74a7ac6..5952e4534c 100644
--- a/support/TeX4ht/source/tex4ht-ooffice.tex
+++ b/support/TeX4ht/source/tex4ht-ooffice.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-ooffice.tex 1405 2023-11-03 10:47:49Z michal_h21 $
+% $Id: tex4ht-ooffice.tex 1426 2023-12-20 10:13:58Z michal_h21 $
% compile 3 times: latex tex4ht-ooffice
% htlatex tex4ht-ooffice "xhtml,4,sections+"
%
@@ -7741,6 +7741,7 @@ It seems that it is a best method how to come with solutions that work in the OD
>>>
+
\<tab-based display equation\><<<
\Configure{equation}
{\IgnorePar\ifvmode\else \HCode{<!--tex4ht:inline-->}\fi
@@ -7876,6 +7877,7 @@ It seems that it is a best method how to come with solutions that work in the OD
\<configure ooffice-mml amsmath\><<<
+|<alt mathopen for eq|>
\:CheckOption{tab-eq}\if:Option
|<tab-based ams display equation|>
\else
@@ -7886,6 +7888,22 @@ It seems that it is a best method how to come with solutions that work in the OD
>>>
+Current AMSMath uses empty mathopen at the beginning of an equation,
+which results in missing markup for subsequent numbers and characters.
+
+We check for empty parameter, and don't execute configurations when it is empty.
+
+This is a copy from tex4ht-mathml.tex, because here it is used only in the
+htlm-mml.4ht output.
+
+\<alt mathopen for eq\><<<
+\def\eq:mathopen#1{\ifx\relax#1\relax\else\a:mathopen\fi\o:mathopen:{#1}}
+>>>
+
+\<mathopen in equation\><<<
+\let\mathopen\eq:mathopen%
+>>>
+
@@ -7896,6 +7914,7 @@ It seems that it is a best method how to come with solutions that work in the OD
|<equation start table|>%
|<amsmath equation july 2000|>%
|<disp math within equation|>%
+ |<mathopen in equation|>%
}
{\ifvmode \IgnorePar\fi\EndP |<equation table cells separator|>}
{\ifvmode \IgnorePar\fi\EndP |<equation end table|>%
@@ -7912,6 +7931,7 @@ It seems that it is a best method how to come with solutions that work in the OD
\EndP \HCode{<text:p text:style-name="equ-p-tab"><text:tab/>}%
\Tabtrue
|<amsmath equation july 2000|>%
+ |<mathopen in equation|>%
\IgnorePar}
{\Tabfalse \ifvmode \IgnorePar\fi\EndP \HCode{<text:tab/>}}
{\HCode{</text:p>}|<try inline par|>%