From e5ca43f7439d850f4193a932455792429cff61eb Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 21 Jun 2021 03:01:17 +0000 Subject: CTAN sync 202106210301 --- support/TeX4ht/source/ChangeLog | 33 ++++++++++++++++++++ support/TeX4ht/source/tex4ht-4ht.tex | 34 +++++++++------------ support/TeX4ht/source/tex4ht-fonts-noncjk.tex | 42 +++++++++++++------------- support/TeX4ht/source/tex4ht-html4.tex | 4 +-- support/TeX4ht/source/tex4ht-mkht.tex | 10 +++--- support/TeX4ht/source/tex4ht-options.tex | 12 ++------ support/ctanbib/README.md | 2 +- support/ctanbib/ctanbib | 27 ++++++++++++----- support/ctanbib/ctanbib-doc.pdf | Bin 34681 -> 35575 bytes support/ctanbib/ctanbib-doc.tex | 6 +++- support/ctanbib/ctanbib.1 | 2 ++ 11 files changed, 107 insertions(+), 65 deletions(-) (limited to 'support') diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog index 9629802255..baa1258a67 100644 --- a/support/TeX4ht/source/ChangeLog +++ b/support/TeX4ht/source/ChangeLog @@ -1,3 +1,36 @@ +2021-06-20 Karl Berry + + * Makefile (tex4ht_html4_derived): no more html4-uni.4ht. + +2021-06-20 Michal Hoftich + + * tex4ht-html4.tex (html4-uni.4ht), + * tex4ht-options.tex (tex4ht.4ht): removed unused html4-uni.4ht file. + + * tex4ht-fonts-noncjk.tex ( + tex4ht.dir/texmf/tex4ht/ht-fonts/unicode/misc/SkakNew.htf + ): fixed wrong characters, some characters need to be converted to pictures. + +2021-06-20 Karl Berry + + * tex4ht-4ht.tex (mathtools.4ht, multicol.4ht, multirow.4ht, + mwart.4ht, mwbk.4ht, mwrep.4ht): \write-1 version. + * tex4ht-mkht.tex: copyright 2021. + +2021-06-19 Michal Hoftich + + * tex4ht-4ht.tex (latex.4ht), + * tex4ht-unicode.tex (unicode.4ht): fixed support for \nobreakspace and + \textellipsis in the picture mode. + +2021-06-18 Michal Hoftich + + * tex4ht-mkht.tex (\ourtoks): rename from \toks (should not have + used a TeX primitive originally), to fix mysterious + error that appeared after LaTeX update: +! TeX capacity exceeded, sorry [input stack size=5000].! TeX capacity exceeded, sorry [input stack size=5000]. + \mode_if_inner:F + 2021-06-17 Karl Berry * tex4ht-4ht.tex, diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex index 7eb8e40b0b..fe1d15b359 100644 --- a/support/TeX4ht/source/tex4ht-4ht.tex +++ b/support/TeX4ht/source/tex4ht-4ht.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-4ht.tex 954 2021-06-19 19:34:56Z michal_h21 $ +% $Id: tex4ht-4ht.tex 955 2021-06-20 16:36:07Z karl $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2021 TeX Users Group @@ -10285,8 +10285,8 @@ handling. Michal \<<< % multirow.4ht (|version), generated from |jobname.tex -% Copyright (C) |CopyYear.2004. Eitan M. Gurari -| +% Copyright |CopyYear.2004. Eitan M. Gurari +| | \Hinput{multirow} \endinput @@ -15867,10 +15867,9 @@ UnDFexyz}% %%%%%%%%%%%%%%% \<<< -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% mwart.4ht |version % -% Copyright (C) |CopyYear.2003. Eitan M. Gurari % -| +% mwart.4ht (|version), generated from |jobname.tex +% Copyright |CopyYear.2003. Eitan M. Gurari +| | | | @@ -16156,10 +16155,9 @@ UnDFexyz>>> %%%%%%%%%%%%%%% \<<< -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% mwrep.4ht |version % -% Copyright (C) |CopyYear.2003. Eitan M. Gurari % -| +% mwrep.4ht (|version), generated from |jobname.tex +% Copyright |CopyYear.2003. Eitan M. Gurari +| | | | @@ -20492,10 +20490,9 @@ $\m@th\displaystyle{{}#}$% %%%%%%%%%%%%%%% \<<< -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% mathtools.4ht |version % -% Copyright (C) |CopyYear.2007. Eitan M. Gurari % -| +% mathtools.4ht (|version), generated from |jobname.tex +% Copyright |CopyYear.2007. Eitan M. Gurari +| | \edef\cat:underscore{% \noexpand\catcode`\noexpand\_=\the\catcode`\_ } @@ -31649,10 +31646,9 @@ We must fix some exerquiz issues before we load the package itself. \Section{multicol.sty} \<<< -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% multicol.4ht |version % -% Copyright (C) |CopyYear.1997. Eitan M. Gurari % -| +% multicol.4ht (|version), generated from |jobname.tex +% Copyright |CopyYear.1997. Eitan M. Gurari +| \append:def\set@floatcmds{\let\end@dblfloat|=\end@float} \def\slocitlum#1{\let\endslocitlum|=\empty diff --git a/support/TeX4ht/source/tex4ht-fonts-noncjk.tex b/support/TeX4ht/source/tex4ht-fonts-noncjk.tex index f412697757..081b7a8002 100644 --- a/support/TeX4ht/source/tex4ht-fonts-noncjk.tex +++ b/support/TeX4ht/source/tex4ht-fonts-noncjk.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-fonts-noncjk.tex 942 2021-05-31 20:59:04Z karl $ +% $Id: tex4ht-fonts-noncjk.tex 956 2021-06-20 21:30:02Z michal_h21 $ % tex tex4ht-fonts-noncjk % or ht tex tex4ht-fonts-noncjk % @@ -39343,7 +39343,7 @@ bbold 0 127 'ℾ' '' `% Gamma `% 0 ` 'Δ' '' `% Delta `% 1 % bbold.htf `version 'Θ' '' `% Theta `% 2 % Copyright `CopyYear.2009. Eitan M. Gurari -'Λ' '' `% Lambda `% 3 % Copyright 2009-2021 TeX Users Group> +'Λ' '' `% Lambda `% 3 % Copyright 2009-2021 TeX Users Group 'Ξ' '' `% Xi `% 4 ` 'ℿ' '' `% Pi `% 5 ` '⅀' '' `% Pi `% 6 ` @@ -47577,7 +47577,7 @@ dsrom 49 107 \<<< SkakNew 32 121 ` '' '' 32 % SkakNew.htf `version -'!' '' 33 % Copyright 2017 TeX Users Group +'!' '' 33 % Copyright 2021 TeX Users Group '”' '' 34 % Released under LPPL 1.3c+. '#' '' 35 % See tex4ht-cpright.tex for license text. '$' '' 36 @@ -47648,24 +47648,24 @@ SkakNew 32 121 ` '∓' '' 101 '⩲' '' 102 '⩱' '' 103 -'h' '' % I cannot find it, it is plus followed by minus -'i' '' % minus followed by plus -'=' '' 106 -'k' '' 107 -'l' '' 108 -'#' '' 109 -'n' '' 110 -'o' '' 111 -'p' '' 112 -'q' '' 113 -'r' '' 114 -'s' '' 115 -'t' '' 116 -'u' '' 117 -'v' '' 118 -'w' '' 119 -'x' '' 120 -'y' '' 121 +'+-' '' 104 +'-+' '' 105 +'=' '' 10 +'∞' '' 107 +'⎯' '1' 108 +'⌗' '' 109 +'=∞' '1' 110 +'o' '1' 111 +'♙' '' 112 +'q' '1' 113 +'r' '1' 114 +'s' '1' 115 +'t' '1' 116 +'u' '1' 117 +'v' '1' 118 +'w' '1' 119 +'╳' '' 120 +'◯' '' 121 SkakNew 32 121 >>> \AddFont{skak-new}{unicode/misc/SkakNew} diff --git a/support/TeX4ht/source/tex4ht-html4.tex b/support/TeX4ht/source/tex4ht-html4.tex index da6bbb2dcc..035e5ea0ec 100644 --- a/support/TeX4ht/source/tex4ht-html4.tex +++ b/support/TeX4ht/source/tex4ht-html4.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-html4.tex 951 2021-06-17 16:29:22Z michal_h21 $ +% $Id: tex4ht-html4.tex 957 2021-06-20 21:36:38Z michal_h21 $ % Compile 4 times: latex tex4ht-html4 % Copy html4.4ht into the work directory before all but the last compilation. % @@ -8,7 +8,7 @@ % See tex4ht-cpright.tex for license text. \ifx \HTML\UnDef - \def\HTML{html4,html4-math,html4-uni,html4-l2-url,html4-russian-accents} + \def\HTML{html4,html4-math,html4-l2-url,html4-russian-accents} \def\CONFIG{\jobname} \def\MAKETITLE{\author{Eitan M. Gurari}} \def\next{\input mktex4ht.4ht \endinput} diff --git a/support/TeX4ht/source/tex4ht-mkht.tex b/support/TeX4ht/source/tex4ht-mkht.tex index 9e957719e1..9e4303d5a9 100644 --- a/support/TeX4ht/source/tex4ht-mkht.tex +++ b/support/TeX4ht/source/tex4ht-mkht.tex @@ -1,9 +1,9 @@ -% $Id: tex4ht-mkht.tex 845 2020-11-23 18:05:43Z karl $ +% $Id: tex4ht-mkht.tex 955 2021-06-20 16:36:07Z karl $ % (1) latex tex4ht-mkht % (2) perl -c mk4ht.perl (checking correctness) % (3) latex mkht-scripts.4ht % -% Copyright 2009-2020 TeX Users Group +% Copyright 2009-2021 TeX Users Group % Copyright 1997-2009 Eitan M. Gurari % Released under LPPL 1.3c+. % See tex4ht-cpright.tex for license text. @@ -16,6 +16,7 @@ \Preamble{xhtml} \input ProTex.sty \AlProTex{4ht,<<<>>>,?,title,list} + \AtBeginDocument{\EndPreamble} \else \Configure{ProTex}{4ht,<<<>>>,?,title,list,[[]]} \fi @@ -29,8 +30,9 @@ \def\mkhtNote{ } -\newtoks\toks -\expandafter\toks\expandafter{\mkhtNote} +\newtoks\ourtoks + +\expandafter\ourtoks\expandafter{\mkhtNote} %%%%%%%%%%%%%%%%%%%%% end definitions %%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/support/TeX4ht/source/tex4ht-options.tex b/support/TeX4ht/source/tex4ht-options.tex index 3640505250..c19e0ce444 100644 --- a/support/TeX4ht/source/tex4ht-options.tex +++ b/support/TeX4ht/source/tex4ht-options.tex @@ -1,7 +1,7 @@ -% $Id: tex4ht-options.tex 724 2020-06-05 17:34:50Z karl $ +% $Id: tex4ht-options.tex 959 2021-06-20 22:33:23Z karl $ % latex tex4ht-options or xhlatex tex4ht-options % -% Copyright 2009-2020 TeX Users Group +% Copyright 2009-2021 TeX Users Group % Copyright 2000-2009 Eitan M. Gurari % Released under LPPL 1.3c+. % See tex4ht-cpright.tex for license text. @@ -49,7 +49,7 @@ tail>>> \string:RestoreCatcodes\endcsname{\catcode`\%|=\the \catcode`\%}\catcode`\%|=14\fi % tex4ht.4ht (|version), generated from |jobname.tex -% Copyright 2009-2018 TeX Users Group +% Copyright 2009-2021 TeX Users Group % Copyright |CopyYear.1997. Eitan M. Gurari | | @@ -145,7 +145,6 @@ tail>>> \Hinclude[*]{html4.4ht}% \Hinclude[*]{html4-math.4ht}% \Hinclude[*]{unicode.4ht} - \Hinclude[*]{html4-uni.4ht}% \:CheckOption{svg}% \if:Option \else\:CheckOption{svg-}\fi \if:Option \else\:CheckOption{svg-obj}\fi @@ -163,7 +162,6 @@ tail>>> \Hinclude[*]{unicode.4ht}% \Hinclude[*]{mathml.4ht}% \Hinclude[*]{html-mml.4ht}% - \Hinclude[*]{html4-uni.4ht}% \:CheckOption{svg}% \if:Option \else\:CheckOption{svg-}\fi \if:Option \else\:CheckOption{svg-obj}\fi @@ -428,7 +426,6 @@ Allows cleanup using xtpipes. \Hinclude[*]{infoht4.4ht}\fi \Hinclude[*]{html4.4ht}% \Hinclude[*]{unicode.4ht}% - \Hinclude[*]{html4-uni.4ht}% \Hinclude[*]{mathltx.4ht}% \Hinclude[*]{html-mltx.4ht}% } @@ -440,7 +437,6 @@ Allows cleanup using xtpipes. \Hinclude[*]{infoht4.4ht}\fi \Hinclude[*]{html4.4ht}% \Hinclude[*]{unicode.4ht}% - \Hinclude[*]{html4-uni.4ht}% \Hinclude[*]{mathltx.4ht}% \Hinclude[*]{html-mltx.4ht}% \Hinclude[*]{jsmath.4ht}% @@ -457,7 +453,6 @@ Allows cleanup using xtpipes. \Hinclude[*]{infoht4.4ht}\fi \Hinclude[*]{html4.4ht}% \Hinclude[*]{unicode.4ht}% - \Hinclude[*]{html4-uni.4ht}% \Hinclude[*]{mathml.4ht}% \Hinclude[*]{html-mml.4ht}% \Hinclude[*]{html-speech.4ht}% @@ -473,7 +468,6 @@ Allows cleanup using xtpipes. \Hinclude[*]{infoht4.4ht}\fi \Hinclude[*]{html4.4ht}% \Hinclude[*]{unicode.4ht}% - \Hinclude[*]{html4-uni.4ht}% \Hinclude[*]{mathml.4ht}% \Hinclude[*]{html-mml.4ht}% \Hinclude[*]{jsml.4ht}% diff --git a/support/ctanbib/README.md b/support/ctanbib/README.md index edd016e561..263cd82a1a 100644 --- a/support/ctanbib/README.md +++ b/support/ctanbib/README.md @@ -10,7 +10,7 @@ This script can generate BibTeX records for LaTeX packages hosted on CTAN. More details can be found on [TeX.sx](https://tex.stackexchange.com/a/200856/2891) -Copyright: 2018 Michal Hoftich +Copyright: 2019 Michal Hoftich This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3 diff --git a/support/ctanbib/ctanbib b/support/ctanbib/ctanbib index 21adfd4679..a16976acdc 100755 --- a/support/ctanbib/ctanbib +++ b/support/ctanbib/ctanbib @@ -16,26 +16,38 @@ kpse.set_program_name("luatex") -- The Current Maintainer of this work is Michal Hoftich local bibtype = "manual" +local pkgurl = false if #arg < 1 or arg[1]=="--help" or arg[1]=="-h" then print([[ctanbib - convert ctan package information to bibtex format Usage: ctanbib [options] Available options: - -c,--ctan Use @ctan type instead of @manual + -c,--ctan Use @ctan type instead of @manual and long url + -C,--CTAN Use @ctan type and short ... /pkg/url -h,--help Print this message -v,--version Print version info ]]) - os.exit(1) + os.exit(0) elseif arg[1]=="--version" or arg[1]=="-v" then - print "ctanbib version 0.1d" - os.exit(1) + print "ctanbib version 0.1e" + os.exit(0) elseif arg[1]=="--ctan" or arg[1]=="-c" then table.remove(arg, 1) bibtype = "ctan" +elseif arg[1]=="--CTAN" or arg[1]=="-C" then + table.remove(arg, 1) + bibtype = "ctan" + pkgurl = true end local pkgname = arg[1] -local url = "https://www.ctan.org/xml/2.0/pkg/" .. pkgname .. "?author-name=true" + +if not pkgname then + print "[ctanbib] Error: missing package name" + os.exit(1) +end + +local url = "https://ctan.org/xml/2.0/pkg/" .. pkgname .. "?author-name=true" local authors_url = "https://ctan.org/xml/2.0/authors" -- change that for different title scheme @@ -55,7 +67,6 @@ version = {$version} local dom = require('luaxml-domobject') - local load_xml = function(url) -- local command = io.popen("wget -qO- ".. url,"r") local command = io.popen("curl -sS ".. url,"r") @@ -142,7 +153,7 @@ end local get_url = function(record) local home = record:query_selector("home")[1] if home then return home:get_attribute("href") end - return "http://www.ctan.org/pkg/"..pkgname + return "https://ctan.org/pkg/"..pkgname end local get_caption = function(record) @@ -191,7 +202,7 @@ e.title = get_title(record) e.subtitle = get_caption(record) e.url = get_url(record) -- use the CTAN path as url for the CTAN type -if bibtype == "ctan" then +if (bibtype == "ctan") and not pkgurl then e.url = ctan_url(record) end e.version, e.date = get_version(record) diff --git a/support/ctanbib/ctanbib-doc.pdf b/support/ctanbib/ctanbib-doc.pdf index b665ab7762..ec58084d27 100644 Binary files a/support/ctanbib/ctanbib-doc.pdf and b/support/ctanbib/ctanbib-doc.pdf differ diff --git a/support/ctanbib/ctanbib-doc.tex b/support/ctanbib/ctanbib-doc.tex index 651d0058e6..89b99279b5 100644 --- a/support/ctanbib/ctanbib-doc.tex +++ b/support/ctanbib/ctanbib-doc.tex @@ -36,6 +36,7 @@ The \texttt{curl} utility needs to be installed on the user's system in order to \item[-c,-\/-ctan] use the \texttt{@ctan} type instead of \texttt{@manual}. The difference between the two is that the url field contains packages CTAN path, instead of a link to the package. + \item[-C,-\/-CTAN] like \verb|--ctan| option, but use original url instead of CTAN path. \item[-h,-\/-help] print the help message. \item[-v,-\/-version] print the version info. \end{description} @@ -93,12 +94,15 @@ under the terms of the \LaTeX\ Project Public License, version 1.3. This package was created thanks to TeX.sx user Daniel\footnote{\url{https://tex.stackexchange.com/users/3751/daniel}}. Lukas C.~Bossert had useful comments which led to update of the original script and -it's eventual release on CTAN. +it's eventual release on CTAN. Herbert Voss added the \verb|--CTAN| option. \newpage \section{Changelog} \begin{changelog} + \change{2021-06-20}{Added \verb|--CTAN| option, thanks to Herbert Voss} + \change{2019-12-23}{Don't return non-zero exit codes for non-error runs} + \change{2019-12-23}{Test for the packagename with the \texttt{-c} option} \change{2019-09-21}{Try to find the author in full CTAN author list if the author cannot be found in the package info} \change{2019-09-16}{Use the CTAN API 2.0 to fetch the package info} \change{2019-05-04}{Version 0.1c released} diff --git a/support/ctanbib/ctanbib.1 b/support/ctanbib/ctanbib.1 index baa40b1190..54544054c8 100644 --- a/support/ctanbib/ctanbib.1 +++ b/support/ctanbib/ctanbib.1 @@ -13,6 +13,8 @@ CTAN in the BibTeX format. .IP -c,--ctan use @ctan type instead of @manual. The difference between the two is that the url field contains package CTAN path, instead of link to the package. +.IP -C,--CTAN +like --ctan option, but use original url instead of CTAN path. .IP -h,--help print the help message. .IP -v,--version -- cgit v1.2.3