summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-04-18 22:09:05 +0000
committerKarl Berry <karl@freefriends.org>2024-04-18 22:09:05 +0000
commit3d288f4b017841503f55fa80343f4759e6afcd01 (patch)
treeb80f874877bbbe2e42391397e88fce19c58972ab /Master
parent8e50fc8e0bf9a205f13a9148962b6bc29b98f1a2 (diff)
xycirc font support, tex4ht r1501; xyling package support, tex4ht r1502
git-svn-id: svn://tug.org/texlive/trunk@70983 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog11
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex4
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex55
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-fonts-noncjk.tex138
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht5
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/xyling-hooks.4ht30
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/xyling.4ht28
-rw-r--r--Master/texmf-dist/tex4ht/ht-fonts/iso8859/1/xypic/xycirc.htf131
8 files changed, 397 insertions, 5 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index 6f2d034f23f..9f90bcb335a 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,14 @@
+2024-04-18 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (usepackage.4ht, xyling-hooks.4ht, xyling.4ht):
+ added support for the Xyling package.
+ https://www.umsu.de/blog/2024/801#c2398
+
+ * tex4ht-fonts-noncjk.tex (
+ tex4ht.dir/texmf/tex4ht/ht-fonts/iso8859/1/xypic/xycirc.htf
+ ): added support for the xycirc font.
+ https://www.umsu.de/blog/2024/801#c2398
+
2024-04-09 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-html5.tex (html5.4ht): set backround and foreground colors
diff --git a/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex b/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
index 4cb4c4b6e41..9fdfe40b68d 100644
--- a/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
@@ -1,4 +1,4 @@
-% $Id: mktex4ht-cnf.tex 1487 2024-03-05 16:54:42Z michal_h21 $
+% $Id: mktex4ht-cnf.tex 1502 2024-04-18 12:55:56Z michal_h21 $
% Manually-maintained file, listing *.4ht files created by tex4ht-4ht.tex.
% Read by tex4ht-cond4ht.
%
@@ -200,6 +200,8 @@
\AddFile{9}{slidesec}
\AddFile{9}{texpower}
\AddFile{9}{xy}
+\AddFile{9}{xyling}
+\AddFile{9}{xyling-hooks}
\AddFile{9}{pictex}
\AddFile{9}{diagrams}
\AddFile{9}{pstricks}
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index 1de97046468..e615b9603e2 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 1499 2024-04-07 14:55:22Z karl $
+% $Id: tex4ht-4ht.tex 1502 2024-04-18 12:55:56Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2024 TeX Users Group
@@ -27548,6 +27548,59 @@ xypic assum catcodes of 7 and 8 for sup and sub.
>>>
%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\Section{xyling.sty}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\<add to usepackage\><<<
+\Configure{PackageHooks}{xyling.sty}{xyling-hooks.4ht}
+>>>
+
+
+\<xyling-hooks.4ht\><<<
+% xyling-hooks.4ht (|version), generated from |jobname.tex
+% Copyright 2024 TeX Users Group
+|<TeX4ht license text|>
+|<Xyling save Link|>
+\:AtEndOfPackage{%
+|<Xyling restore Link|>
+}
+\endinput
+>>> \AddFile{9}{xyling-hooks}
+
+Xyling defines its own version of the \Verb+\Link+ command,
+which breaks lot of things in TeX4ht. We must suppress this
+version and use it only inside Xyling diagrams.
+
+\<Xyling save Link\><<<
+\let\orix:xylingLink\Link
+\let\Link\relax
+>>>
+
+\<Xyling restore Link\><<<
+ \let\xyling:Link\Link
+ \let\Link\orig:xylingLink
+>>>
+
+\<xyling.4ht\><<<
+% xyling.4ht (|version), generated from |jobname.tex
+% Copyright 2024 TeX Users Group
+|<TeX4ht license text|>
+|<patch Xyling Tree|>
+\Hinput{xyling}
+\endinput
+>>> \AddFile{9}{xyling}
+
+Restore the Link command inside Xyling graph drawing commands
+
+\<patch Xyling Tree\><<<
+\newcommand\xyling:Tree[2][0]{\bgroup\let\Link\xyling:Link\o:Tree:[#1]{#2}\egroup}
+\newcommand\xyling:Treek[3][0]{\bgroup\let\Link\xyling:Link\o:Treek:[#1]{#2}{#3}\egroup}
+\HLet\Tree\xyling:Tree
+\HLet\Treek\xyling:Treek
+>>>
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\Section{PicTeX}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-fonts-noncjk.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-fonts-noncjk.tex
index 377e2ec3d55..2838f6ee38c 100644
--- a/Master/texmf-dist/source/generic/tex4ht/tex4ht-fonts-noncjk.tex
+++ b/Master/texmf-dist/source/generic/tex4ht/tex4ht-fonts-noncjk.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-fonts-noncjk.tex 1486 2024-03-04 13:32:16Z michal_h21 $
+% $Id: tex4ht-fonts-noncjk.tex 1501 2024-04-18 12:13:27Z michal_h21 $
% tex tex4ht-fonts-noncjk
% or ht tex tex4ht-fonts-noncjk
%
@@ -44706,6 +44706,142 @@ xymisc 0 103
\AddFont{xymisc}{iso8859/1/xypic/xymisc}
+\SubSection{xycirc}
+
+\<xycirc\><<<
+xycirc 0 127
+'' '1' 0 `<version 0`>
+'' '1' 1 % xycirc.htf `version %
+'' '1' 2 % Copyright 2024 TeX Users Group %
+'' '1' 3 `<version 2`>
+'' '1' 4 `<version 3`>
+'' '1' 5 `<version 4`>
+'' '1' 6 `<version 5`>
+'' '1' 7 `<version 6`>
+'' '1' 8 `<version 7`>
+'' '1' 9 `<version 8`>
+'' '1' 10 `<version 9`>
+'' '1' 11 `<version 10`>
+'' '1' 12 `<version 11`>
+'' '1' 13 `<version 12`>
+'' '1' 14 `<version 13`>
+'' '1' 15 `<version 14`>
+'' '1' 16 `<version 15`>
+'' '1' 17 `<version 16`>
+'' '1' 18 `<version 17`>
+'' '1' 19 `<version 18`>
+'' '1' 20
+'' '1' 21
+'' '1' 22
+'' '1' 23
+'' '1' 24
+'' '1' 25
+'' '1' 26
+'' '1' 27
+'' '1' 28
+'' '1' 29
+'' '1' 30
+'' '1' 31
+'' '1' 32
+'' '1' 33
+'' '1' 34
+'' '1' 35
+'' '1' 36
+'' '1' 37
+'' '1' 38
+'' '1' 39
+'' '1' 40
+'' '1' 41
+'' '1' 42
+'' '1' 43
+'' '1' 44
+'' '1' 45
+'' '1' 46
+'' '1' 47
+'' '1' 48
+'' '1' 49
+'' '1' 50
+'' '1' 51
+'' '1' 52
+'' '1' 53
+'' '1' 54
+'' '1' 55
+'' '1' 56
+'' '1' 57
+'' '1' 58
+'' '1' 59
+'' '1' 60
+'' '1' 61
+'' '1' 62
+'' '1' 63
+'' '1' 64
+'' '1' 65
+'' '1' 66
+'' '1' 67
+'' '1' 68
+'' '1' 69
+'' '1' 70
+'' '1' 71
+'' '1' 72
+'' '1' 73
+'' '1' 74
+'' '1' 75
+'' '1' 76
+'' '1' 77
+'' '1' 78
+'' '1' 79
+'' '1' 80
+'' '1' 81
+'' '1' 82
+'' '1' 83
+'' '1' 84
+'' '1' 85
+'' '1' 86
+'' '1' 87
+'' '1' 88
+'' '1' 89
+'' '1' 90
+'' '1' 91
+'' '1' 92
+'' '1' 93
+'' '1' 94
+'' '1' 95
+'' '1' 96
+'' '1' 97
+'' '1' 98
+'' '1' 99
+'' '1' 100
+'' '1' 101
+'' '1' 102
+'' '1' 103
+'' '1' 104
+'' '1' 105
+'' '1' 106
+'' '1' 107
+'' '1' 108
+'' '1' 109
+'' '1' 110
+'' '1' 111
+'' '1' 112
+'' '1' 113
+'' '1' 114
+'' '1' 115
+'' '1' 116
+'' '1' 117
+'' '1' 118
+'' '1' 119
+'' '1' 120
+'' '1' 121
+'' '1' 122
+'' '1' 123
+'' '1' 124
+'' '1' 125
+'' '1' 126
+'' '1' 127
+xycirc 0 127
+>>>
+
+\AddFont{xycirc}{iso8859/1/xypic/xycirc}
%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
index 3b1a755b373..fa01702929e 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
@@ -1,4 +1,4 @@
-% usepackage.4ht (2024-03-05-14:34), generated from tex4ht-4ht.tex
+% usepackage.4ht (2024-04-18-14:01), generated from tex4ht-4ht.tex
% Copyright 2003-2009 Eitan M. Gurari
% Copyright 2009-2024 TeX Users Group
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2024-03-05-14:34}
+\immediate\write-1{version 2024-04-18-14:01}
\def\:temp{tex4ht}\ifx \:temp\@currname
\:warning{\string\usepackage{tex4ht} again?}
@@ -86,6 +86,7 @@
\Configure{PackageHooks}{mathtools.sty}{mathtools-hooks.4ht}
\Configure{PackageHooks}{babel.sty}{babel-sty-hooks.4ht}
\Configure{PackageHooks}{minted.sty}{minted-sty-hooks.4ht}
+\Configure{PackageHooks}{xyling.sty}{xyling-hooks.4ht}
\Configure{PackageHooks}{graphics.sty}{graphics-hooks.4ht}
\Configure{PackageHooks}{graphbox.sty}{graphbox-hooks.4ht}
\Configure{PackageHooks}{xcolor.sty}{xcolor-hooks.4ht}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/xyling-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/xyling-hooks.4ht
new file mode 100644
index 00000000000..41da233cd38
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/tex4ht/xyling-hooks.4ht
@@ -0,0 +1,30 @@
+% xyling-hooks.4ht (2024-04-18-14:01), generated from tex4ht-4ht.tex
+% Copyright 2024 TeX Users Group
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3c of this license or (at your option) any
+% later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions
+% of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% The Current Maintainer of this work
+% is the TeX4ht Project <http://tug.org/tex4ht>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.
+\immediate\write-1{version 2024-04-18-14:01}
+
+\let\orix:xylingLink\Link
+\let\Link\relax
+
+\:AtEndOfPackage{%
+ \let\xyling:Link\Link
+ \let\Link\orig:xylingLink
+
+}
+\endinput
+
diff --git a/Master/texmf-dist/tex/generic/tex4ht/xyling.4ht b/Master/texmf-dist/tex/generic/tex4ht/xyling.4ht
new file mode 100644
index 00000000000..aea9885c298
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/tex4ht/xyling.4ht
@@ -0,0 +1,28 @@
+% xyling.4ht (2024-04-18-14:01), generated from tex4ht-4ht.tex
+% Copyright 2024 TeX Users Group
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3c of this license or (at your option) any
+% later version. The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions
+% of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% The Current Maintainer of this work
+% is the TeX4ht Project <http://tug.org/tex4ht>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.
+\immediate\write-1{version 2024-04-18-14:01}
+
+\newcommand\xyling:Tree[2][0]{\bgroup\let\Link\xyling:Link\o:Tree:[#1]{#2}\egroup}
+\newcommand\xyling:Treek[3][0]{\bgroup\let\Link\xyling:Link\o:Treek:[#1]{#2}{#3}\egroup}
+\HLet\Tree\xyling:Tree
+\HLet\Treek\xyling:Treek
+
+\Hinput{xyling}
+\endinput
+
diff --git a/Master/texmf-dist/tex4ht/ht-fonts/iso8859/1/xypic/xycirc.htf b/Master/texmf-dist/tex4ht/ht-fonts/iso8859/1/xypic/xycirc.htf
new file mode 100644
index 00000000000..4c7a8ea5a42
--- /dev/null
+++ b/Master/texmf-dist/tex4ht/ht-fonts/iso8859/1/xypic/xycirc.htf
@@ -0,0 +1,131 @@
+xycirc 0 127
+'' '1' 0 %
+'' '1' 1 % xycirc.htf 2024-04-18-14:01 %
+'' '1' 2 % Copyright 2024 TeX Users Group %
+'' '1' 3 %
+'' '1' 4 % This work may be distributed and/or modified under the conditions
+'' '1' 5 % of the LaTeX Project Public License, either version 1.3 of this
+'' '1' 6 % license or (at your option) any later version. The latest version
+'' '1' 7 % of this license is in http://www.latex-project.org/lppl.txt and
+'' '1' 8 % version 1.3 or later is part of all distributions of LaTeX version
+'' '1' 9 % 2003/12/01 or later.
+'' '1' 10 % This work has the LPPL maintenance status "maintained".
+'' '1' 11 % Current Maintainer of this work is the TeX4ht Project.
+'' '1' 12 %
+'' '1' 13 % If you modify this file, changing the
+'' '1' 14 % version identification would be appreciated.
+'' '1' 15 %
+'' '1' 16 % tex4ht@tug.org
+'' '1' 17 % https://tug.org/tex4ht
+'' '1' 18 %
+'' '1' 19
+'' '1' 20
+'' '1' 21
+'' '1' 22
+'' '1' 23
+'' '1' 24
+'' '1' 25
+'' '1' 26
+'' '1' 27
+'' '1' 28
+'' '1' 29
+'' '1' 30
+'' '1' 31
+'' '1' 32
+'' '1' 33
+'' '1' 34
+'' '1' 35
+'' '1' 36
+'' '1' 37
+'' '1' 38
+'' '1' 39
+'' '1' 40
+'' '1' 41
+'' '1' 42
+'' '1' 43
+'' '1' 44
+'' '1' 45
+'' '1' 46
+'' '1' 47
+'' '1' 48
+'' '1' 49
+'' '1' 50
+'' '1' 51
+'' '1' 52
+'' '1' 53
+'' '1' 54
+'' '1' 55
+'' '1' 56
+'' '1' 57
+'' '1' 58
+'' '1' 59
+'' '1' 60
+'' '1' 61
+'' '1' 62
+'' '1' 63
+'' '1' 64
+'' '1' 65
+'' '1' 66
+'' '1' 67
+'' '1' 68
+'' '1' 69
+'' '1' 70
+'' '1' 71
+'' '1' 72
+'' '1' 73
+'' '1' 74
+'' '1' 75
+'' '1' 76
+'' '1' 77
+'' '1' 78
+'' '1' 79
+'' '1' 80
+'' '1' 81
+'' '1' 82
+'' '1' 83
+'' '1' 84
+'' '1' 85
+'' '1' 86
+'' '1' 87
+'' '1' 88
+'' '1' 89
+'' '1' 90
+'' '1' 91
+'' '1' 92
+'' '1' 93
+'' '1' 94
+'' '1' 95
+'' '1' 96
+'' '1' 97
+'' '1' 98
+'' '1' 99
+'' '1' 100
+'' '1' 101
+'' '1' 102
+'' '1' 103
+'' '1' 104
+'' '1' 105
+'' '1' 106
+'' '1' 107
+'' '1' 108
+'' '1' 109
+'' '1' 110
+'' '1' 111
+'' '1' 112
+'' '1' 113
+'' '1' 114
+'' '1' 115
+'' '1' 116
+'' '1' 117
+'' '1' 118
+'' '1' 119
+'' '1' 120
+'' '1' 121
+'' '1' 122
+'' '1' 123
+'' '1' 124
+'' '1' 125
+'' '1' 126
+'' '1' 127
+xycirc 0 127
+