diff options
author | Norbert Preining <norbert@preining.info> | 2022-03-23 03:01:06 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2022-03-23 03:01:06 +0000 |
commit | 8a64caefc9bb0d4afe66b6bf09cf8f283a5e386e (patch) | |
tree | c6574d20d0007892968e557a7984fbfb1a5e7664 /support | |
parent | 51119d11f3700a5be7da086dacad56dd219a5c90 (diff) |
CTAN sync 202203230301
Diffstat (limited to 'support')
-rw-r--r-- | support/TeX4ht/source/ChangeLog | 6 | ||||
-rw-r--r-- | support/TeX4ht/source/mktex4ht-cnf.tex | 3 | ||||
-rw-r--r-- | support/TeX4ht/source/tex4ht-4ht.tex | 30 | ||||
-rw-r--r-- | support/checkcites/README | 13 | ||||
-rw-r--r-- | support/checkcites/checkcites-doc.pdf | bin | 288397 -> 290255 bytes | |||
-rw-r--r-- | support/checkcites/checkcites-doc.tex | 33 | ||||
-rw-r--r-- | support/checkcites/checkcites.lua | 27 | ||||
-rw-r--r-- | support/make4ht/changelog.tex | 19 | ||||
-rw-r--r-- | support/make4ht/extensions/make4ht-ext-preprocess_input.lua | 5 | ||||
-rw-r--r-- | support/make4ht/formats/make4ht-odt.lua | 4 | ||||
-rwxr-xr-x | support/make4ht/make4ht | 2 | ||||
-rw-r--r-- | support/make4ht/make4ht-doc.pdf | bin | 153809 -> 154182 bytes | |||
-rw-r--r-- | support/make4ht/mkparams.lua | 14 |
13 files changed, 115 insertions, 41 deletions
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog index 295e80887e..c69257cad6 100644 --- a/support/TeX4ht/source/ChangeLog +++ b/support/TeX4ht/source/ChangeLog @@ -1,3 +1,9 @@ +2021-03-21 Michal Hoftich <michal.h21@gmail.com> + + * tex4ht-4ht.tex (arydshln.4ht): added basic support for the + Arydshln package. + https://tex.stackexchange.com/a/637897/2891 + 2021-03-20 Michal Hoftich <michal.h21@gmail.com> * tex4ht-4ht.tex (graphics.4ht): don't execute graphics rules when diff --git a/support/TeX4ht/source/mktex4ht-cnf.tex b/support/TeX4ht/source/mktex4ht-cnf.tex index 5a6e07e4ec..65fe3c1881 100644 --- a/support/TeX4ht/source/mktex4ht-cnf.tex +++ b/support/TeX4ht/source/mktex4ht-cnf.tex @@ -1,4 +1,4 @@ -% $Id: mktex4ht-cnf.tex 1087 2022-03-08 09:45:01Z michal_h21 $ +% $Id: mktex4ht-cnf.tex 1095 2022-03-21 13:29:42Z michal_h21 $ % Manually-maintained file, listing *.4ht files created by tex4ht-4ht.tex. % Read by tex4ht-cond4ht. % @@ -49,6 +49,7 @@ \AddFile{8}{tabulary-a} \AddFile{7}{tabularx} \AddFile{9}{tabu} +\AddFile{7}{arydshln} \AddFile{9}{threeparttable} \AddFile{9}{mdwtab} \AddFile{9}{multirow} diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex index 7786213f1d..b4ce6fa169 100644 --- a/support/TeX4ht/source/tex4ht-4ht.tex +++ b/support/TeX4ht/source/tex4ht-4ht.tex @@ -1,4 +1,4 @@ -% $Id: tex4ht-4ht.tex 1094 2022-03-20 20:29:43Z michal_h21 $ +% $Id: tex4ht-4ht.tex 1095 2022-03-21 13:29:42Z michal_h21 $ % tex tex4ht-4ht or ht tex tex4ht-4ht % % Copyright 2009-2022 TeX Users Group @@ -10445,6 +10445,34 @@ the recursive macro \`'\inspect:cline' checks the digits separately. \endinput >>> \AddFile{7}{tabularx} + +%%%%%%%%%%%%%%%%%%%%%%%% +\Section{Arydshln} +%%%%%%%%%%%%%%%%%%%%%%%% + +We don't support any features yet, we just try to avoid +compilation errors + +\<arydshln.4ht\><<< +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% arydshln.4ht (|version), generated from |jobname.tex +% Copyright 2022 TeX Users Group +|<TeX4ht license text|> +% this is a copy of code that arydshln inserts to \@array +\def\:new:array{\adl@everyvbox\everyvbox + \everyvbox{\adl@arrayinit \the\adl@everyvbox \everyvbox\adl@everyvbox}% + \ifadl@inactive \adl@inactivate \else \adl@activate \fi + \let\adl@noalign\noalign} +\ifcsname n:@array:\endcsname% if \@array was already patched by TeX4ht + \let\orig:n@array\n:@array: + \def\n:@array:{\:new:array\orig:n@array} +\else + \pend:def\@array{\:new:array} +\fi +\Hinput{arydshln} +\endinput +>>> \AddFile{7}{arydshln} + %%%%%%%%%%%%%%%%%%%%%%%% \Section{Tabu} %%%%%%%%%%%%%%%%%%%%%%%% diff --git a/support/checkcites/README b/support/checkcites/README index c673a23200..2b52dc0bbd 100644 --- a/support/checkcites/README +++ b/support/checkcites/README @@ -1,13 +1,14 @@ -checkcites.lua -- Version 2.4 from September 3, 2019. -===================================================== +checkcites.lua -- Version 2.5 from March 22, 2022 +================================================= License ------- -Copyright (c) 2012, 2019 Enrico Gregorio, Paulo Roberto Massa Cereda +Copyright (c) 2012, 2019, Enrico Gregorio, Paulo Cereda +Copyright (c) 2022, Enrico Gregorio, Island of TeX - Enrico dot Gregorio at univr dot it -- cereda at users dot sf dot net +- https://gitlab.com/islandoftex This script is licensed under the LaTeX Project Public License. If you want to support LaTeX development by a donation, the best @@ -92,6 +93,8 @@ time checkcites also looks for bibliography data, in the form of extract the bibliography data and add them to a table. Again, no duplicate values are allowed. Stick with this backend if you are using BibLaTeX with the default options or with the 'backend=biber' option explicitly set. +It is important to note, however, that the 'glob=true' option is not +supported yet. Open a terminal and run checkcites: @@ -146,4 +149,4 @@ That is it, folks! Official code repository ------------------------ -http://github.com/cereda/checkcites +http://gitlab.com/islandoftex/checkcites diff --git a/support/checkcites/checkcites-doc.pdf b/support/checkcites/checkcites-doc.pdf Binary files differindex 3fac0e8309..4265f23822 100644 --- a/support/checkcites/checkcites-doc.pdf +++ b/support/checkcites/checkcites-doc.pdf diff --git a/support/checkcites/checkcites-doc.tex b/support/checkcites/checkcites-doc.tex index 5de54fbd99..a0a976d6b0 100644 --- a/support/checkcites/checkcites-doc.tex +++ b/support/checkcites/checkcites-doc.tex @@ -15,12 +15,12 @@ \usepackage[svgnames]{xcolor} \usepackage[colorlinks, linkcolor={blue}, urlcolor={blue}]{hyperref} -\usepackage{tcolorbox} +\usepackage[breakable]{tcolorbox} \tcbuselibrary{listings} \newcommand{\checkcites}{\texttt{checkcites}} \newcommand{\email}[1]{\small\texttt{#1}} -\newcommand{\version}{Version 2.4 from September 3, 2019.} +\newcommand{\version}{Version 2.5 from March 22, 2022.} \newenvironment{infoblock}[1] {\par\addvspace{\medskipamount} @@ -34,8 +34,8 @@ \title{The \checkcites\footnote{\version}\ \ script} \author{% - Enrico Gregorio\\\email{Enrico dot Gregorio at univr dot it}\\[3ex] - Paulo Roberto Massa Cereda\\\email{cereda at users dot sf dot net}% + Enrico Gregorio\\\email{Enrico.Gregorio@univr.it}\\[3ex] + Island of \TeX\\\email{https://gitlab.com/islandoftex}% } \date{} @@ -103,7 +103,8 @@ citation table contains no duplicate values. At the same time script will extract the bibliography data and add them to a table. Again, no duplicate values are allowed. Stick with this backend if you are using Bib\LaTeX\ with the default options or with the -\verb|backend=biber| option explicitly set. +\verb|backend=biber| option explicitly set. It is important to note, +however, that the \verb|glob=true| option is not supported yet. \end{description} \begin{infoblock}{Attention!} @@ -150,7 +151,7 @@ sample bibliography file \verb|example.bib|, with five fictional entries. \begin{tcblisting}{colframe=DarkTurquoise,coltitle=black,listing only, - title=Bibliography file, fonttitle=\bfseries, + title=Bibliography file, fonttitle=\bfseries, breakable, listing options={columns=fullflexible,basicstyle=\ttfamily}} @BOOK{foo:2012a, title = {My Title One}, @@ -227,8 +228,9 @@ $ checkcites | _| | -_| _| '_| _| | _| -_|_ -| |___|_|_|___|___|_,_|___|_|_| |___|___| -checkcites.lua -- a reference checker script (v2.4) -Copyright (c) 2012, 2019, Enrico Gregorio, Paulo Roberto Massa Cereda +checkcites.lua -- a reference checker script (v2.5) +Copyright (c) 2012, 2019, Enrico Gregorio, Paulo Cereda +Copyright (c) 2022, Enrico Gregorio, Island of TeX -------------------------------------------------------------------------- I am sorry, but you have not provided any command line argument, including @@ -263,8 +265,9 @@ $ checkcites --help | _| | -_| _| '_| _| | _| -_|_ -| |___|_|_|___|___|_,_|___|_|_| |___|___| -checkcites.lua -- a reference checker script (v2.1) -Copyright (c) 2012, 2019, Enrico Gregorio, Paulo Roberto Massa Cereda +checkcites.lua -- a reference checker script (v2.5) +Copyright (c) 2012, 2019, Enrico Gregorio, Paulo Cereda +Copyright (c) 2022, Enrico Gregorio, Island of TeX Usage: checkcites.lua [ [ --all | --unused | --undefined ] [ --backend <arg> ] <file> [ <file 2> ... <file n> ] | --help | --version ] @@ -324,8 +327,9 @@ $ checkcites document.aux | _| | -_| _| '_| _| | _| -_|_ -| |___|_|_|___|___|_,_|___|_|_| |___|___| -checkcites.lua -- a reference checker script (v2.4) -Copyright (c) 2012, 2019, Enrico Gregorio, Paulo Roberto Massa Cereda +checkcites.lua -- a reference checker script (v2.5) +Copyright (c) 2012, 2019, Enrico Gregorio, Paulo Cereda +Copyright (c) 2022, Enrico Gregorio, Island of TeX Great, I found 4 citations in 1 file. I also found 1 bibliography file. Let me check this file and extract the references. Please wait a moment. @@ -465,8 +469,9 @@ $ checkcites --backend biber document.bcf | _| | -_| _| '_| _| | _| -_|_ -| |___|_|_|___|___|_,_|___|_|_| |___|___| -checkcites.lua -- a reference checker script (v2.4) -Copyright (c) 2012, 2019, Enrico Gregorio, Paulo Roberto Massa Cereda +checkcites.lua -- a reference checker script (v2.5) +Copyright (c) 2012, 2019, Enrico Gregorio, Paulo Cereda +Copyright (c) 2022, Enrico Gregorio, Island of TeX Great, I found 4 citations in 1 file. I also found 1 bibliography file. Let me check this file and extract the references. Please wait a moment. diff --git a/support/checkcites/checkcites.lua b/support/checkcites/checkcites.lua index 6191ca284a..1ab7b9fa6d 100644 --- a/support/checkcites/checkcites.lua +++ b/support/checkcites/checkcites.lua @@ -1,7 +1,8 @@ #!/usr/bin/env texlua -- ----------------------------------------------------------------- -- checkcites.lua --- Copyright 2012, 2019, Enrico Gregorio, Paulo Roberto Massa Cereda +-- Copyright 2012, 2019, Enrico Gregorio, Paulo Cereda +-- Copyright 2022, Enrico Gregorio, Island of TeX -- -- This work may be distributed and/or modified under the conditions -- of the LaTeX Project Public License, either version 1.3 of this @@ -14,11 +15,11 @@ -- and version 1.3 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 maintainers of this work are the original authors. This +-- This work has the LPPL maintenance status `maintained'. The +-- current maintainers of this work are the Island of TeX. This -- work consists of the file checkcites.lua. -- --- Project repository: http://github.com/cereda/checkcites +-- Project repository: https://gitlab.com/islandoftex/checkcites -- ----------------------------------------------------------------- -- Checks if the table contains the element. @@ -387,7 +388,7 @@ backends.biber = function(lines, _) end else hit = string.match(line, '^%s*<bcf:datasource type="file" ' .. - 'datatype="%w+">(.+)</bcf:datasource>$') + 'datatype="%w+" glob="false">(.+)</bcf:datasource>$') if hit then parts = split(hit, '[^,%s]+') for _, v in ipairs(parts) do @@ -485,10 +486,9 @@ print("| _| | -_| _| '_| _| | _| -_|_ -|") print("|___|_|_|___|___|_,_|___|_|_| |___|___|") print() print(wrap('checkcites.lua -- a reference ' .. - 'checker script (v2.4)', 74)) - print(wrap('Copyright (c) 2012, 2019, ' .. - 'Enrico Gregorio, Paulo ' .. - 'Roberto Massa Cereda', 74)) + 'checker script (v2.5)', 74)) + print(wrap('Copyright (c) 2012, 2019, Enrico Gregorio, Paulo Cereda', 74)) + print(wrap('Copyright (c) 2022, Enrico Gregorio, Island of TeX', 74)) end -- Operation namespace @@ -670,8 +670,8 @@ local function checkcites(args) if keys['version'] or keys['help'] then if keys['version'] then print() - print(wrap('checkcites.lua, version 2.4 (dated September ' .. - '3, 2019)', 74)) + print(wrap('checkcites.lua, version 2.5 (dated March ' .. + '22, 2022)', 74)) print(pad('-', 74)) print(wrap('You can find more details about this ' .. @@ -679,13 +679,12 @@ local function checkcites(args) 'in the official source code repository:', 74)) print() - print('https://github.com/cereda/checkcites') + print('https://gitlab.com/islandoftex/checkcites') print() print(wrap('The checkcites.lua script is licensed ' .. 'under the LaTeX Project Public License, ' .. - 'version 1.3. The current maintainers ' .. - 'are the original authors.', 74)) + 'version 1.3.', 74)) else print() print(wrap('Usage: ' .. args[0] .. ' [ [ --all | --unused | ' .. diff --git a/support/make4ht/changelog.tex b/support/make4ht/changelog.tex index d4a50d29cf..1d579d4514 100644 --- a/support/make4ht/changelog.tex +++ b/support/make4ht/changelog.tex @@ -3,6 +3,25 @@ \begin{itemize} \item + 2022/02/22 + + \begin{itemize} + \tightlist + \item + version \texttt{0.3l} released. + \item + fixed issues with filenames on Windows. + \end{itemize} +\item + 2022/03/01 + + \begin{itemize} + \tightlist + \item + use \texttt{rmarkdown} package to process \texttt{.rmd} files in the + \texttt{preprocess\_input} extension (thanks to James Clawson). + \end{itemize} +\item 2022/02/18 \begin{itemize} diff --git a/support/make4ht/extensions/make4ht-ext-preprocess_input.lua b/support/make4ht/extensions/make4ht-ext-preprocess_input.lua index 3155a8a781..306c7bf772 100644 --- a/support/make4ht/extensions/make4ht-ext-preprocess_input.lua +++ b/support/make4ht/extensions/make4ht-ext-preprocess_input.lua @@ -5,12 +5,13 @@ local mkutils = require "mkutils" local commands = { knitr = { command = 'Rscript -e "library(knitr); knit(\'${tex_file}\', output=\'${tmp_file}\')"'}, - pandoc = { command = 'pandoc -f ${input_format} -s -o \'${tmp_file}\' -t latex \'${tex_file}\''} + pandoc = { command = 'pandoc -f ${input_format} -s -o \'${tmp_file}\' -t latex \'${tex_file}\''}, + render = { command = 'Rscript -e "library(rmarkdown); render(\'${tex_file}\', output_file=\'${tmp_file}\')"'} } local filetypes = { rnw = {sequence = {"knitr"} }, rtex = {sequence = {"knitr"}}, - rmd = {sequence = {"knitr", "pandoc"}, options = {input_format = "markdown"}}, + rmd = {sequence = {"render"}}, rrst = {sequence = {"knitr", "pandoc"}, options = {input_format = "rst"}}, md = {sequence = {"pandoc"}, options = {input_format = "markdown"}}, rst = {sequence = {"pandoc"}, options = {input_format = "rst"}}, diff --git a/support/make4ht/formats/make4ht-odt.lua b/support/make4ht/formats/make4ht-odt.lua index 01a587aff4..3f0ee3aaa8 100644 --- a/support/make4ht/formats/make4ht-odt.lua +++ b/support/make4ht/formats/make4ht-odt.lua @@ -73,10 +73,10 @@ function Odtfile:pack() lfs.chdir(self.archivelocation) -- make temporary mime type file self:make_mimetype() - mkutils.execute(zip_command .. " -q0X '" .. self.name .. "' " .. self.mimetypename) + mkutils.execute(zip_command .. ' -q0X "' .. self.name .. '" ' .. self.mimetypename) -- remove it, so the next command doesn't overwrite it self:remove_mimetype() - mkutils.execute(zip_command .." -r '" .. self.name .. "' *") + mkutils.execute(zip_command ..' -r "' .. self.name .. '" *') lfs.chdir(currentdir) mkutils.cp(self.archivelocation .. "/" .. self.name, self.name) mkutils.delete_dir(self.archivelocation) diff --git a/support/make4ht/make4ht b/support/make4ht/make4ht index b938fdede1..7d579fafea 100755 --- a/support/make4ht/make4ht +++ b/support/make4ht/make4ht @@ -29,7 +29,7 @@ make4ht [options] filename ["tex4ht.sty op." "tex4ht op." "t4ht op" "latex op"] -- set version number. the template should be replaced by the -- actual version number by the build script -local version = "v0.3k" +local version = "v0.3l" mkparams.version_number = version local args = mkparams.get_args() diff --git a/support/make4ht/make4ht-doc.pdf b/support/make4ht/make4ht-doc.pdf Binary files differindex 665ad1fea4..bf3b9a4795 100644 --- a/support/make4ht/make4ht-doc.pdf +++ b/support/make4ht/make4ht-doc.pdf diff --git a/support/make4ht/mkparams.lua b/support/make4ht/mkparams.lua index e330b6a0ab..ed766f9770 100644 --- a/support/make4ht/mkparams.lua +++ b/support/make4ht/mkparams.lua @@ -93,6 +93,18 @@ local function get_format_extensions(format_string) return format, extensions end + +-- try to make safe filename +local function escape_filename(input) + -- quoting don't work on Windows, so we will just + if os.type == "windows" then + return '"' .. input .. '"' + else + -- single quotes are safe in Unix + return "'" .. input .. "'" + end +end + -- detect if user specified -jobname in arguments to the TeX engine -- or used the --jobname option for make4ht local function handle_jobname(input, args) @@ -108,7 +120,7 @@ local function handle_jobname(input, args) input = input:match("([^%/^%\\]+)$") -- input also cannot contain spaces, replace them with underscores input = input:gsub("%s", "_") - table.insert(latex_params,"-jobname='"..input.. "'") + table.insert(latex_params,"-jobname=".. escape_filename(input)) else -- when user specifies -jobname, we must change name of the input file, -- in order to be able to process correct dvi file with tex4ht and t4ht |