From d999da47ff375df843c0c9bbfd5911236dd9d40a Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 17 May 2021 03:02:10 +0000 Subject: CTAN sync 202105170302 --- support/TeX4ht/source/Makefile | 11 ++++++---- support/TeX4ht/source/tex4ht-4ht.tex | 37 ++++++++++++++++---------------- support/TeX4ht/source/tex4ht-bibtex2.tex | 10 ++++----- 3 files changed, 30 insertions(+), 28 deletions(-) (limited to 'support/TeX4ht/source') diff --git a/support/TeX4ht/source/Makefile b/support/TeX4ht/source/Makefile index 702bc156fa..8c81e9990f 100644 --- a/support/TeX4ht/source/Makefile +++ b/support/TeX4ht/source/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 924 2021-05-02 22:55:22Z karl $ +# $Id: Makefile 936 2021-05-16 16:21:01Z karl $ # This file is public domain. Originally written 2010, Karl Berry. # Assumes GNU make. @@ -804,19 +804,22 @@ diff-derived: # Check that anything with a \version of this year # also has a copyright of this year. inst-check-copyright: + @echo '>>> $@' -cd $(inst_dir_4ht) && for f in *; do \ if grep "version.*`date +%Y`" $$f >/dev/null; then \ grep "Copyright.*`date +%Y`" $$f >/dev/null || echo $$f; fi; done # Check that all *.4ht in dev are installed. Other file types are -# difficult, but all 4ht's should be present. +# difficult, but all 4ht's should be present, except mktex4ht.4ht. inst-check-files: + @echo '>>> $@' cd $(inst_dir_4ht) && ls -1 *.4ht >/tmp/instlist - ls -1 *.4ht >/tmp/devlist + ls -1 *.4ht | fgrep -v mktex4ht.4ht >/tmp/devlist comm -3 /tmp/devlist /tmp/instlist -# missing version identifications. +# Check for missing version identifications. inst-check-version: + @echo '>>> $@' -cd $(inst_dir_4ht) && for f in *; do \ grep 'write-1.*version' $$f >/dev/null || echo $$f; done diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex index 7db5a69105..21444abee4 100644 --- a/support/TeX4ht/source/tex4ht-4ht.tex +++ b/support/TeX4ht/source/tex4ht-4ht.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-4ht.tex 934 2021-05-09 15:03:45Z karl $ +% $Id: tex4ht-4ht.tex 937 2021-05-16 16:55:43Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2021 TeX Users Group @@ -338,9 +338,9 @@ to include the above (new) ``TeX4ht license text''. I don't understand. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \<<< -% book.4ht |version % -% Copyright (C) |CopyYear.1997. Eitan M. Gurari % -| +% book.4ht (|version), generated from |jobname.tex +% Copyright |CopyYear.1997. Eitan M. Gurari +| | | | @@ -378,10 +378,9 @@ to include the above (new) ``TeX4ht license text''. I don't understand. >>> \AddFile{2}{report} \<<< -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% article.4ht |version % -% Copyright (C) |CopyYear.1997. Eitan M. Gurari % -| +% article.4ht (|version), generated from |jobname.tex +% Copyright |CopyYear.1997. Eitan M. Gurari +| | | @@ -5080,6 +5079,8 @@ produce invalid HTML \Hy@GlobalStepCount\Hy@linkcounter \xdef\@currentHref{likesection.\the\Hy@linkcounter}% \Hy@raisedlink{\hyper@anchorstart{\@currentHref}\hyper@anchorend}% + \edef\@currentlabel{\the\Hy@linkcounter}% + \AnchorLabel% } >>> @@ -11442,7 +11443,7 @@ Foo \<<< % caption.4ht (|version), generated from |jobname.tex % Copyright |CopyYear.2007. Eitan M. Gurari -| +| | | | @@ -11457,8 +11458,8 @@ Foo \<<< % caption-hooks.4ht (|version), generated from |jobname.tex -% Copyright 2020 TeX Users Group -| +% Copyright 2020-2021 TeX Users Group +| \:AtEndOfPackage{% \long\def\caption@If@Package@Loaded#1[#2]#3#4{} \renewcommand*\caption@redefine{% @@ -22787,10 +22788,9 @@ This modification is needed since Stefan \Link[http://babel.alis.com:8080/]{}{}Create your own multilingual Web\EndLink \<<< -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% babel.4ht |version % -% Copyright (C) |CopyYear.1999. Eitan M. Gurari % -| +% babel.4ht (|version), generated from |jobname.tex +% Copyright |CopyYear.1999. Eitan M. Gurari +| | \Hinput{babel} @@ -24710,10 +24710,9 @@ A \''\relax' is prepended to the start of the definitions %%%%%%%%%%%%% \<<< -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% beamer.4ht |version % -% Copyright (C) |CopyYear.2003. Eitan M. Gurari % -| +% beamer.4ht (|version), generated from |jobname.tex +% Copyright |CopyYear.2003. Eitan M. Gurari +| | \ifx \beamer@version\:UnDef | diff --git a/support/TeX4ht/source/tex4ht-bibtex2.tex b/support/TeX4ht/source/tex4ht-bibtex2.tex index 62d6de5b8c..36cb50a6ea 100644 --- a/support/TeX4ht/source/tex4ht-bibtex2.tex +++ b/support/TeX4ht/source/tex4ht-bibtex2.tex @@ -1,8 +1,8 @@ -% $Id: tex4ht-bibtex2.tex 65 2010-11-17 19:16:45Z karl $ +% $Id: tex4ht-bibtex2.tex 936 2021-05-16 16:21:01Z karl $ % compile: latex tex4ht-bibtex2 % -% Copyright (C) 2009-2010 TeX Users Group -% Copyright (C) 2000-2009 Eitan M. Gurari +% Copyright 2009-2021 TeX Users Group +% Copyright 2000-2009 Eitan M. Gurari % Released under LPPL 1.3c+. % See tex4ht-cpright.tex for license text. @@ -17,8 +17,8 @@ \<<< % bibtex2.4ht (|version), generated from |jobname.tex -% Copyright (C) 2009-2010 TeX Users Group -% Copyright (C) |CopyYear.2001. Eitan M. Gurari +% Copyright 2009-2021 TeX Users Group +% Copyright |CopyYear.2001. Eitan M. Gurari | \catcode`\/=0 \catcode`\\=12 -- cgit v1.2.3