summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-02-10 21:51:21 +0000
committerKarl Berry <karl@freefriends.org>2022-02-10 21:51:21 +0000
commit63bd165e5b475a8cd005c95258e440929b4ed9c1 (patch)
tree49e8468182ee8ced536ffcde66495932e0c7957a /Master/texmf-dist
parentef4a791cfef99df6f7b9043051d3ba25255db354 (diff)
breakurl support, tex4ht r1076
git-svn-id: svn://tug.org/texlive/trunk@61975 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/mktex4ht-cnf.tex3
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex26
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-fonts-noncjk.tex284
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/breakurl-hooks.4ht27
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht5
6 files changed, 74 insertions, 277 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index d311b5455e0..8c0e114eb37 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,9 @@
+2022-02-10 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (usepackage.4ht, breakurl-hooks.4ht): fixed
+ compilation error with the Breakurl package.
+ https://puszcza.gnu.org.ua/bugs/?552
+
2022-02-06 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-fonts-noncjk.tex (
diff --git a/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex b/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex
index 5696ebd3e97..8a53ec01f68 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 1069 2022-02-02 14:31:53Z michal_h21 $
+% $Id: mktex4ht-cnf.tex 1076 2022-02-10 16:55:31Z michal_h21 $
% Manually-maintained file, listing *.4ht files created by tex4ht-4ht.tex.
% Read by tex4ht-cond4ht.
%
@@ -35,6 +35,7 @@
\AddFile{7}{xr}
\AddFile{7}{xr-hyper}
\AddFile{7}{url}
+\AddFile{7}{breakurl-hooks}
\AddFile{9}{path}
\AddFile{7}{hyperref}
\AddFile{9}{hypcap}
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index 8ae5eb4d257..72be0a6972d 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 1069 2022-02-02 14:31:53Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1076 2022-02-10 16:55:31Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2022 TeX Users Group
@@ -4785,6 +4785,30 @@ the command: \psppath.
\EndVerbatim\EndHPage{}]
%%%%%%%%%%%%%%%%%%
+\Section{breakurl.sty}
+%%%%%%%%%%%%%%%%%%
+
+The Breakurl package adds some PostScript code to the
+DVI output and TeX4ht doesn't like it. We disable the
+AtBeginDvi command temporarily as a work around.
+
+\<add to usepackage\><<<
+\Configure{PackageHooks}{breakurl.sty}{breakurl-hooks.4ht}
+>>>
+
+\<breakurl-hooks.4ht\><<<
+% breakurl-hooks.4ht (|version), generated from |jobname.tex
+% Copyright 2022 TeX Users Group
+|<TeX4ht license text|>
+\let\orig:AtBeginDvi\AtBeginDvi
+\def\AtBeginDvi#1{}
+\:AtEndOfPackage{%
+ \let\AtBeginDvi\orig:AtBeginDvi
+}
+\endinput
+>>> \AddFile{7}{breakurl-hooks}
+
+%%%%%%%%%%%%%%%%%%
\Section{path.sty}
%%%%%%%%%%%%%%%%%%
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 a371030eb66..081bd491fa8 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 1065 2022-01-30 21:57:50Z karl $
+% $Id: tex4ht-fonts-noncjk.tex 1075 2022-02-06 20:16:50Z michal_h21 $
% tex tex4ht-fonts-noncjk
% or ht tex tex4ht-fonts-noncjk
%
@@ -40583,288 +40583,26 @@ TeX\EndLink{} from Basil K. Malyshev with free stuff about Russian.
\SubSection{wnti: MS-Windows}
+The following two font
+tables originally used 256 bit encoding, and it produced wrong
+text in UTF-8. As Wnti uses the same characters as Wncyr, we
+can just reference this HTF file.
+
\<wnti\><<<
-wnti 0 127
-'&#0338;' '' 0 `<version 0`>
-'&#0352;' '' 1 % wnti.htf windows `version %
-'\143\' '' 2 % Copyright `CopyYear.2000. Eitan M. Gurari %
-'\221\' '' 3 `<version 2`>
-'\178\' '' 4 `<version 3`>
-'\170\' '' 5 `<version 4`>
-'\142\' '' 6 `<version 5`>
-'\128\' '' 7 `<version 6`>
-'&#0339;' '' 8 `<version 7`>
-'&#0353;' '' 9 `<version 8`>
-'\211\' '' 10 `<version 9`>
-'\246\' '1' 11 `<version 10`>
-'\179\' '' 12 `<version 11`>
-'\186\' '' 13 `<version 12`>
-'\158\' '' 14 `<version 13`>
-'\144\' '' 15 `<version 14`>
-'\222\' '' 16 `<version 15`>
-'\198\' '' 17 `<version 16`>
-'\201\' '' 18 `<version 17`>
-'\168\' '' 19 `<version 18`>
-'V' '1' 20
-'O' '1' 21
-'S' '' 22
-'\223\' '' 23
-'\254\' '' 24
-'\230\' '' 25
-'\233\' '' 26
-'\184\' '' 27
-'v' '1' 28
-'o' '1' 29
-'s' '' 30
-'\255\' '' 31
-'-' '' 32
-'!' '' 33
-'&#8221;' '' 34
-'b' '1' 35
-'' '' 36
-'%' '' 37
-'\39\' '' 38
-'&#8217;' '' 39
-'(' '' 40
-')' '' 41
-'*' '' 42
-'D' '1' 43
-',' '' 44
-'-' '' 45
-'.' '' 46
-'/' '' 47
-'0' '' 48
-'1' '' 49
-'2' '' 50
-'3' '' 51
-'4' '' 52
-'5' '' 53
-'6' '' 54
-'7' '' 55
-'8' '' 56
-'9' '' 57
-':' '' 58
-';' '' 59
-'&#x00AB;' '' 60
-'i' '1' 61
-'&#x00BB;' '' 62
-'?' '' 63
-'' '' 64
-'\192\' '' 65
-'\193\' '' 66
-'\214\' '' 67
-'\196\' '' 68
-'\197\' '' 69
-'\212\' '' 70
-'\195\' '' 71
-'\213\' '' 72
-'\200\' '' 73
-'\163\' '' 74
-'\202\' '' 75
-'\203\' '' 76
-'\204\' '' 77
-'\205\' '' 78
-'\206\' '' 79
-'\214\' '' 80
-'\215\' '' 81
-'\208\' '' 82
-'\209\' '' 83
-'\210\' '' 84
-'\211\' '' 85
-'\194\' '' 86
-'\217\''' 87
-'\216\' '' 88
-'\219\' '' 89
-'\199\' '' 90
-'[' '' 91
-'&quot;' '' 92
-']' '' 93
-'\220\' '' 94
-'\218\' '' 95
-'&#8216;' '' 96
-'\224\' '' 97
-'\225\' '' 98
-'\246\' '' 99
-'6' '1' 100
-'\186\' '' 101
-'\244\' '' 102
-'s' '1' 103
-'\245\' '' 104
-'\246\' '' 105
-'\188\' '' 106
-'\234\' '' 107
-'\235\' '' 108
-'\236\' '' 109
-'\237\' '' 110
-'\238\' '' 111
-'\239\' '' 112
-'\247\' '' 113
-'\240\' '' 114
-'\241\' '' 115
-'m' '' 116
-'\243\' '' 117
-'\226\' '' 118
-'\249\' '' 119
-'\248\' '' 120
-'\251\' '' 121
-'\253\' '' 122
-'&#8211;' '' 123
-'&#8212;''' 124
-'\185\' '' 125
-'\252\' '' 126
-'\250\' '' 127
-wnti 0 127
-htfcss: wnti font-style: italic;
+.wncyr
+htfcss: wnti font-style: italic;
>>>
-
-
\AddFont{wnti}{win/1251/cm/sauter/wnti}
-
-
-
-
-
-
\SubSection{iso-8859-5: wnti}
+
\<wnti-iso\><<<
-wnti 0 127
-'\170\' '' 0 `<version 0`>
-'\169\' '' 1 % wnti.htf iso-8859-5 `version %
-'\175\' '' 2 % Copyright `CopyYear.2000. Eitan M. Gurari %
-'\205\' '' 3 `<version 2`>
-'\166\' '' 4 `<version 3`>
-'\164\' '' 5 `<version 4`>
-'&#x00AB;' '' 6 `<version 5`>
-'\162\' '' 7 `<version 6`>
-'\250\' '' 8 `<version 7`>
-'\249\' '' 9 `<version 8`>
-'\227\' '' 10 `<version 9`>
-'\237\' '' 11 `<version 10`>
-'\246\' '' 12 `<version 11`>
-'\244\' '' 13 `<version 12`>
-'\251\' '' 14 `<version 13`>
-'\242\' '' 15 `<version 14`>
-'\206\' '' 16 `<version 15`>
-'\182\' '' 17 `<version 16`>
-'\185\' '' 18 `<version 17`>
-'\161\' '' 19 `<version 18`>
-'V' '1' 20
-'Q' '1' 21
-'S' '' 22
-'\207\' '' 23
-'\238\' '' 24
-'\214\' '' 25
-'\217\' '' 26
-'' '' 27
-'' '' 28
-'&#x00AB;' '' 29
-'&#x00BB;' '' 30
-'\239\' '' 31
-'' '' 32
-'!' '' 33
-'&quot;' '' 34
-'b' '1' 35
-'' '' 36
-'%' '' 37
-'\39\' '' 38
-'\39\' '' 39
-'&#x0028;' '' 40
-'&#x0029;' '' 41
-'*' '' 42
-'D' '1' 43
-',' '' 44
-'-' '' 45
-'.' '' 46
-'/' '' 47
-'0' '' 48
-'1' '' 49
-'2' '' 50
-'3' '' 51
-'4' '' 52
-'5' '' 53
-'6' '' 54
-'7' '' 55
-'8' '' 56
-'9' '' 57
-':' '' 58
-';' '' 59
-'&#x003C;&#x003C;' '1' 60
-'i' '1' 61
-'&#x003E;&#x003E;' '1' 62
-'?' '' 63
-'' '' 64
-'\176\' '' 65
-'\177\' '' 66
-'\198\' '' 67
-'\180\' '' 68
-'\181\' '' 69
-'\196\' '' 70
-'\179\' '' 71
-'\197\' '' 72
-'\184\' '' 73
-'\168\' '' 74
-'\186\' '' 75
-'&#x00BB;' '' 76
-'\188\' '' 77
-'\189\' '' 78
-'&#0382;' '' 79
-'\198\' '' 80
-'\199\' '' 81
-'\192\' '' 82
-'\193\' '' 83
-'\194\' '' 84
-'\195\' '' 85
-'\178\' '' 86
-'\201\' '' 87
-'\200\' '' 88
-'\203\' '' 89
-'\205\' '' 90
-'[' '' 91
-'&quot;' '' 92
-']' '' 93
-'\204\' '' 94
-'\202\' '' 95
-'\96\' '' 96
-'\208\' '' 97
-'\209\' '' 98
-'\230\' '' 99
-'6' '1' 100
-'\213\' '' 101
-'\228\' '' 102
-'s' '1' 103
-'\229\' '' 104
-'\104\' '' 105
-'\248\' '' 106
-'\218\' '' 107
-'\212\' '' 108
-'\220\' '' 109
-'\221\' '' 110
-'\222\' '' 111
-'\223\' '' 112
-'\231\' '' 113
-'\224\' '' 114
-'\225\' '' 115
-'m' '' 116
-'\227\' '' 117
-'\210\' '' 118
-'\233\' '' 119
-'\232\' '' 120
-'\235\' '' 121
-'\237\' '' 122
-'-' '' 123
-'-' '' 124
-'\240\' '' 125
-'\236\' '' 126
-'\234\' '' 127
-wnti 0 127
-htfcss: wnti font-style: italic;
+.wncyr
+htfcss: wnti font-style: italic;
>>>
-
-
\AddFont{wnti-iso}{iso8859/5/cm/sauter/wnti}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/breakurl-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/breakurl-hooks.4ht
new file mode 100644
index 00000000000..7f37999e13f
--- /dev/null
+++ b/Master/texmf-dist/tex/generic/tex4ht/breakurl-hooks.4ht
@@ -0,0 +1,27 @@
+% breakurl-hooks.4ht (2022-02-10-13:40), generated from tex4ht-4ht.tex
+% Copyright 2022 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 2022-02-10-13:40}
+
+\let\orig:AtBeginDvi\AtBeginDvi
+\def\AtBeginDvi#1{}
+\:AtEndOfPackage{%
+ \let\AtBeginDvi\orig:AtBeginDvi
+}
+\endinput
+
diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht
index 85e18c9e920..87e14c8173a 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 (2022-01-11-14:12), generated from tex4ht-4ht.tex
+% usepackage.4ht (2022-02-10-13:40), generated from tex4ht-4ht.tex
% Copyright 2003-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-01-11-14:12}
+\immediate\write-1{version 2022-02-10-13:40}
\def\:temp{tex4ht}\ifx \:temp\@currname
\:warning{\string\usepackage{tex4ht} again?}
@@ -61,6 +61,7 @@
\Configure{PackageHooks}{fontspec.sty}{fontspec-hooks.4ht}
\Configure{PackageHooks}{tikz.sty}{tikz-hooks.4ht}
\Configure{PackageHooks}{pdfbase.sty}{pdfbase-hooks.4ht}
+\Configure{PackageHooks}{breakurl.sty}{breakurl-hooks.4ht}
\Configure{PackageHooks}{hyperref.sty}{hyperref-hooks.4ht}
\Configure{PackageHooks}{caption.sty}{caption-hooks.4ht}
\Configure{PackageHooks}{minted.sty}{minted-sty-hooks.4ht}