diff options
author | Karl Berry <karl@freefriends.org> | 2024-03-05 22:35:26 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2024-03-05 22:35:26 +0000 |
commit | 26d8aa932cbda63fa73562679c3fcbe13a5dde31 (patch) | |
tree | 1e2f0f02f2ca739e0d3cdc1dd5d340722330f7be | |
parent | 52894b7d935ea9106536d463a4e34da6feab8898 (diff) |
multibib fixes, tex4ht r1487
git-svn-id: svn://tug.org/texlive/trunk@70429 c570f23f-e606-0410-a88d-b1316a301751
6 files changed, 81 insertions, 5 deletions
diff --git a/Master/texmf-dist/source/generic/tex4ht/ChangeLog b/Master/texmf-dist/source/generic/tex4ht/ChangeLog index b9d40771c1c..a464b4218f7 100644 --- a/Master/texmf-dist/source/generic/tex4ht/ChangeLog +++ b/Master/texmf-dist/source/generic/tex4ht/ChangeLog @@ -1,4 +1,10 @@ -2024-03-01 Michal Hoftich <michal.h21@gmail.com> +2024-03-05 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-4ht.tex (multibib.4ht, multibib-hooks.4ht): fixed clashes + between .bbl files and .4ht files. + https://tug.org/pipermail/tex4ht/2024q1/003546.html + +2024-03-04 Michal Hoftich <michal.h21@gmail.com> * tex4ht-fonts-noncjk.tex ( ./tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/ams/cyrillic/wncyr.htf diff --git a/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex b/Master/texmf-dist/source/generic/tex4ht/mktex4ht-cnf.tex index 953ee65cece..4cb4c4b6e41 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 1483 2024-03-01 13:57:26Z michal_h21 $ +% $Id: mktex4ht-cnf.tex 1487 2024-03-05 16:54:42Z michal_h21 $ % Manually-maintained file, listing *.4ht files created by tex4ht-4ht.tex. % Read by tex4ht-cond4ht. % @@ -23,6 +23,8 @@ \AddFile{6}{biblatex} \AddFile{6}{biblatex-chicago} \AddFile{6}{backref} +\AddFile{9}{multibib} +\AddFile{9}{multibib-hooks} \AddFile{6}{reading} \AddFile{5}{debug} \AddFile{5}{footnote-dw} diff --git a/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex b/Master/texmf-dist/source/generic/tex4ht/tex4ht-4ht.tex index 079c5a12483..84bc452c391 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 1484 2024-03-01 21:17:29Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1487 2024-03-05 16:54:42Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2024 TeX Users Group @@ -2949,6 +2949,41 @@ Fix backlink support in BibLaTeX >>> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\SubSection{multibib.4ht} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +\<multibib.4ht\><<< +% multibib.4ht (|version), generated from |jobname.tex +% Copyright 2024 TeX Users Group +|<TeX4ht license text|> +\Hinput{multibib} +\endinput +>>> \AddFile{9}{multibib} + +\<add to usepackage\><<< +\Configure{PackageHooks}{multibib.sty}{multibib-hooks.4ht} +>>> + + +\<multibib-hooks.4ht\><<< +% multibib.4ht (|version), generated from |jobname.tex +% Copyright 2024 TeX Users Group +\:AtEndOfPackage{ +|<multibib newcites|> +} +\endinput +>>> \AddFile{9}{multibib-hooks} + +The \Verb"newcites" command uses the \Verb"\@input@" command to load the .bbl file internally. It causes TeX4ht +to load a corresponding .4ht file named as the .bbl file. For example, when you have book.bbl, it will load +book.4ht. It can lead to a fatal error if the document uses a different class than book. + +\<multibib newcites\><<< + \let\orig:newcites\newcites + \renewcommand\newcites[2]{\let\orig:@input@\@input@\let\@input@\@input\orig:newcites{#1}{#2}\let\@input@\orig:@input@} +>>> + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \SubSection{reading.4ht} \<reading.4ht\><<< diff --git a/Master/texmf-dist/tex/generic/tex4ht/multibib-hooks.4ht b/Master/texmf-dist/tex/generic/tex4ht/multibib-hooks.4ht new file mode 100644 index 00000000000..6bb622e10e3 --- /dev/null +++ b/Master/texmf-dist/tex/generic/tex4ht/multibib-hooks.4ht @@ -0,0 +1,9 @@ +% multibib.4ht (2024-03-05-14:34), generated from tex4ht-4ht.tex +% Copyright 2024 TeX Users Group +\:AtEndOfPackage{ + \let\orig:newcites\newcites + \renewcommand\newcites[2]{\let\orig:@input@\@input@\let\@input@\@input\orig:newcites{#1}{#2}\let\@input@\orig:@input@} + +} +\endinput + diff --git a/Master/texmf-dist/tex/generic/tex4ht/multibib.4ht b/Master/texmf-dist/tex/generic/tex4ht/multibib.4ht new file mode 100644 index 00000000000..99a23e0d781 --- /dev/null +++ b/Master/texmf-dist/tex/generic/tex4ht/multibib.4ht @@ -0,0 +1,23 @@ +% multibib.4ht (2024-03-05-14:34), 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-03-05-14:34} + +\Hinput{multibib} +\endinput + diff --git a/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht b/Master/texmf-dist/tex/generic/tex4ht/usepackage.4ht index 4cf12f108d7..3b1a755b373 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-01-14:08), generated from tex4ht-4ht.tex +% usepackage.4ht (2024-03-05-14:34), 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-01-14:08} +\immediate\write-1{version 2024-03-05-14:34} \def\:temp{tex4ht}\ifx \:temp\@currname \:warning{\string\usepackage{tex4ht} again?} @@ -41,6 +41,7 @@ \else \let\:temp=\use:package \fi \fi \:temp} \Configure{PackageHooks}{titlesec.sty}{titlesec-hooks.4ht} +\Configure{PackageHooks}{multibib.sty}{multibib-hooks.4ht} \Configure{PackageHooks}{biblatex-chicago.sty}{biblatex-chicago-hooks.4ht} \Configure{PackageHooks}{cleveref.sty}{cleveref-hooks.4ht} \Configure{PackageHooks}{xr.sty}{xr-hooks.4ht} |