summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-07-06 21:27:35 +0000
committerKarl Berry <karl@freefriends.org>2021-07-06 21:27:35 +0000
commit9614db05716d2f66b55c8ca602a11e5e6347628b (patch)
treead2b78294a593efe7e8ef7c0efbff1b0c61515cf
parent62451427e17807f8d8fef06f7c54dc9662704bab (diff)
mw caption support, tex4ht r968
git-svn-id: svn://tug.org/texlive/trunk@59860 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/ChangeLog6
-rw-r--r--Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex10
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/mwart.4ht5
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/mwbk.4ht5
-rw-r--r--Master/texmf-dist/tex/generic/tex4ht/mwrep.4ht5
5 files changed, 24 insertions, 7 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
index caa6abe8c55..3ced5d91b16 100644
--- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog
+++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog
@@ -1,3 +1,9 @@
+2021-07-06 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (mwart.4ht, mwbk.4ht, mwrep.4ht): fixed caption support for
+ MW classes.
+ https://github.com/jsbien/repertuarXVI/issues/1
+
2021-07-05 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-4ht.tex (biblatex.4ht): updated redefinitions of \MakeUppercase and
diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex
index a3071442679..168d463a492 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 967 2021-07-05 18:46:07Z michal_h21 $
+% $Id: tex4ht-4ht.tex 968 2021-07-06 19:00:54Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2021 TeX Users Group
@@ -16042,6 +16042,14 @@ UnDFexyz}%
\Configure{UndefinedSec}{likesubsection}
>>>
+
+MW classes redefine caption when hyperref is active. This doesn't really provide
+useful value for the HTML export, it even provides unfortunate side effect that
+it introduces an error in the .xref file for each caption used in the document.
+\<mwcls divs\><<<
+\let\mw@caption@hyperref\@caption
+>>>
+
\<mwart tocs\><<<
\let\mw@markandtoc=\empty
\def\tableofcontents{%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/mwart.4ht b/Master/texmf-dist/tex/generic/tex4ht/mwart.4ht
index e5a5383038c..703e302ee50 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/mwart.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/mwart.4ht
@@ -1,4 +1,4 @@
-% mwart.4ht (2021-06-20-09:36), generated from tex4ht-4ht.tex
+% mwart.4ht (2021-07-06-14:22), generated from tex4ht-4ht.tex
% Copyright 2003-2009 Eitan M. Gurari
% Copyright 2009-2021 TeX Users Group
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2021-06-20-09:36}
+\immediate\write-1{version 2021-07-06-14:22}
\NewConfigure{caption}[4]{\c:def\cptA:{#1}\c:def\cptB:{#2}%
\c:def\cptC:{#3}\c:def\cptD:{#4}}
@@ -242,6 +242,7 @@ A script of the form
\Configure{UndefinedSec}{likechapter}
\Configure{UndefinedSec}{likesection}
\Configure{UndefinedSec}{likesubsection}
+\let\mw@caption@hyperref\@caption
\def\:tableofcontents{\futurelet\:temp\:TOC}
\def\Auto:ent#1{%
diff --git a/Master/texmf-dist/tex/generic/tex4ht/mwbk.4ht b/Master/texmf-dist/tex/generic/tex4ht/mwbk.4ht
index b784b2fd12d..09a828a4dfe 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/mwbk.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/mwbk.4ht
@@ -1,4 +1,4 @@
-% mwbk.4ht (2021-06-27-08:11), generated from tex4ht-4ht.tex
+% mwbk.4ht (2021-07-06-14:22), generated from tex4ht-4ht.tex
% Copyright (C) 2003-2009 Eitan M. Gurari
% Copyright 2009-2021 TeX Users Group
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2021-06-27-08:11}
+\immediate\write-1{version 2021-07-06-14:22}
\NewConfigure{caption}[4]{\c:def\cptA:{#1}\c:def\cptB:{#2}%
\c:def\cptC:{#3}\c:def\cptD:{#4}}
@@ -242,6 +242,7 @@ A script of the form
\Configure{UndefinedSec}{likechapter}
\Configure{UndefinedSec}{likesection}
\Configure{UndefinedSec}{likesubsection}
+\let\mw@caption@hyperref\@caption
\let\no:chapter\chapter
\Def:Section\chapter{\thechapter}{#1}
diff --git a/Master/texmf-dist/tex/generic/tex4ht/mwrep.4ht b/Master/texmf-dist/tex/generic/tex4ht/mwrep.4ht
index 94095f5b173..d942cd7ccdd 100644
--- a/Master/texmf-dist/tex/generic/tex4ht/mwrep.4ht
+++ b/Master/texmf-dist/tex/generic/tex4ht/mwrep.4ht
@@ -1,4 +1,4 @@
-% mwrep.4ht (2021-06-20-09:36), generated from tex4ht-4ht.tex
+% mwrep.4ht (2021-07-06-14:22), generated from tex4ht-4ht.tex
% Copyright 2003-2009 Eitan M. Gurari
% Copyright 2009-2021 TeX Users Group
%
@@ -17,7 +17,7 @@
%
% If you modify this program, changing the
% version identification would be appreciated.
-\immediate\write-1{version 2021-06-20-09:36}
+\immediate\write-1{version 2021-07-06-14:22}
\NewConfigure{caption}[4]{\c:def\cptA:{#1}\c:def\cptB:{#2}%
\c:def\cptC:{#3}\c:def\cptD:{#4}}
@@ -242,6 +242,7 @@ A script of the form
\Configure{UndefinedSec}{likechapter}
\Configure{UndefinedSec}{likesection}
\Configure{UndefinedSec}{likesubsection}
+\let\mw@caption@hyperref\@caption
\let\no:chapter\chapter
\Def:Section\chapter{\thechapter}{#1}