summaryrefslogtreecommitdiff
path: root/support
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2022-11-19 03:01:37 +0000
committerNorbert Preining <norbert@preining.info>2022-11-19 03:01:37 +0000
commit71a2e00f473ea9e10dd2d9439159a4917afb266f (patch)
treeac3f1206810a83cbff3ceab1be542162f4994d3b /support
parent8141bb63ac908014fe5b6bc7ebed4d2889c014d4 (diff)
CTAN sync 202211190301
Diffstat (limited to 'support')
-rw-r--r--support/TeX4ht/source/ChangeLog9
-rw-r--r--support/TeX4ht/source/Makefile2
-rw-r--r--support/TeX4ht/source/mktex4ht-cnf.tex4
-rw-r--r--support/TeX4ht/source/tex4ht-4ht.tex46
-rw-r--r--support/spix/CHANGELOG.md14
-rw-r--r--support/spix/README.md12
-rw-r--r--support/spix/spix.pdfbin1528250 -> 1526423 bytes
-rwxr-xr-xsupport/spix/spix.py12
8 files changed, 86 insertions, 13 deletions
diff --git a/support/TeX4ht/source/ChangeLog b/support/TeX4ht/source/ChangeLog
index 2a6f3ec1a4..28e098577f 100644
--- a/support/TeX4ht/source/ChangeLog
+++ b/support/TeX4ht/source/ChangeLog
@@ -1,3 +1,12 @@
+2022-11-17 Michal Hoftich <michal.h21@gmail.com>
+
+ * tex4ht-4ht.tex (
+ usepackage.4ht, footnotebackref-hooks.4ht, footnotebackref.4ht
+ ): disable the package Footnotebackref.
+
+ * tex4ht-4ht.tex (caption-hooks.4ht): don't use Caption's version of
+ \@caption, as it doesn't work with \index command included inside.
+
2022-11-16 Michal Hoftich <michal.h21@gmail.com>
* tex4ht-mathml.tex (mathml.4ht): use displaystyle=true attribute in
diff --git a/support/TeX4ht/source/Makefile b/support/TeX4ht/source/Makefile
index 79637cb8f5..f901ebbb4f 100644
--- a/support/TeX4ht/source/Makefile
+++ b/support/TeX4ht/source/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 1236 2022-11-15 12:28:12Z michal_h21 $
+# $Id: Makefile 1239 2022-11-16 22:27:35Z karl $
# This file is public domain. Originally written 2010, Karl Berry.
# Assumes GNU make.
diff --git a/support/TeX4ht/source/mktex4ht-cnf.tex b/support/TeX4ht/source/mktex4ht-cnf.tex
index bb78f1e571..80aac32c78 100644
--- a/support/TeX4ht/source/mktex4ht-cnf.tex
+++ b/support/TeX4ht/source/mktex4ht-cnf.tex
@@ -1,4 +1,4 @@
-% $Id: mktex4ht-cnf.tex 1235 2022-11-04 15:46:19Z michal_h21 $
+% $Id: mktex4ht-cnf.tex 1241 2022-11-17 18:48:36Z michal_h21 $
% Manually-maintained file, listing *.4ht files created by tex4ht-4ht.tex.
% Read by tex4ht-cond4ht.
%
@@ -62,6 +62,8 @@
\AddFile{9}{subfigure}
\AddFile{9}{caption}
\AddFile{9}{subcaption}
+\AddFile{9}{footnotebackref}
+\AddFile{9}{footnotebackref-hooks}
\AddFile{9}{floatrow}
\AddFile{9}{makeidx}
\AddFile{9}{splitidx}
diff --git a/support/TeX4ht/source/tex4ht-4ht.tex b/support/TeX4ht/source/tex4ht-4ht.tex
index b78484d8a0..f846cebdac 100644
--- a/support/TeX4ht/source/tex4ht-4ht.tex
+++ b/support/TeX4ht/source/tex4ht-4ht.tex
@@ -1,4 +1,4 @@
-% $Id: tex4ht-4ht.tex 1237 2022-11-15 15:09:44Z michal_h21 $
+% $Id: tex4ht-4ht.tex 1241 2022-11-17 18:48:36Z michal_h21 $
% tex tex4ht-4ht or ht tex tex4ht-4ht
%
% Copyright 2009-2022 TeX Users Group
@@ -12294,7 +12294,7 @@ Foo
\long\def\caption@If@Package@Loaded#1[#2]#3#4{}
\renewcommand*\caption@redefine{%
\let\caption\caption@caption%
- \let\@caption\caption@@caption%
+ % \let\@caption\caption@@caption%
}%
}
>>> \AddFile{9}{caption-hooks}
@@ -12377,6 +12377,48 @@ prevent this issue.
\endinput
>>> \AddFile{9}{subcaption}
+
+%%%%%%%%%%%%%
+\Section{footnotebackref.sty}
+%%%%%%%%%%%%%
+
+Dummy package for footnotebackref. We need to disable it completely.
+
+\<footnotebackref.4ht\><<<
+% footnotebackref.4ht (|version), generated from |jobname.tex
+% Copyright 2022 TeX Users Group
+|<TeX4ht license text|>
+\Hinput{footnotebackref}
+\endinput
+>>> \AddFile{9}{footnotebackref}
+
+\<add to usepackage\><<<
+\Configure{PackageHooks}{footnotebackref.sty}{footnotebackref-hooks.4ht}
+>>>
+
+We disable the package, but still support the package options, as
+other packages (such as tablefootnote.sty) rely on them.
+
+\<footnotebackref-hooks.4ht\><<<
+\:dontusepackage{footnotebackref}
+\RequirePackage{kvoptions}% v3.10
+\@ifpackageloaded{hyperref}{}{\RequirePackage{hyperref}}
+
+\SetupKeyvalOptions{family=FootnoteBackref, prefix=FootnoteBackref@}
+
+% The symbol between the footnotenumber and the footnotetext
+% If empty no symbol will be printed
+\DeclareStringOption{symbol}
+
+% Option to hyperlink the footnotenumber
+\DeclareBoolOption[true]{numberlinked}
+\ProcessKeyvalOptions*
+\endinput
+>>> \AddFile{9}{footnotebackref-hooks}
+
+
+
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\Section{floatrow.sty}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/support/spix/CHANGELOG.md b/support/spix/CHANGELOG.md
index 59fbcaeb63..9e5ed3b4ca 100644
--- a/support/spix/CHANGELOG.md
+++ b/support/spix/CHANGELOG.md
@@ -1,3 +1,17 @@
+* spix 1.3.0 (2022-11-18)
+
+ * Add Python3.11 support.
+ * Add tests.
+ * Flush output: it could lead to output lines being shuffled.
+
+ -- Louis Paternault <spalax@gresille.org>
+
+* spix 1.2.0 (2021-11-27)
+
+ * Add Python3.10 support.
+
+ -- Louis Paternault <spalax@gresille.org>
+
* spix 1.1.0 (2020-07-23)
* Python 3.9 support.
diff --git a/support/spix/README.md b/support/spix/README.md
index a12fc8686f..ec5cb68cff 100644
--- a/support/spix/README.md
+++ b/support/spix/README.md
@@ -49,18 +49,22 @@ To compile it from source, download and run:
## What's new?
-See [changelog](https://framagit.org/spalax/spix/blob/master/CHANGELOG.md).
+See [changelog](https://framagit.org/spalax/spix/blob/main/CHANGELOG.md).
## Download and install
-The preferred way to install SpiX used pip:
+* The preferred way to get `SpiX` working is by using your distribution package manager. With Debian (and Ubuntu, and surely other distributions that inherit from Debian), it is in package [`texlive-extra-utils`](https://packages.debian.org/search?keywords=texlive-extra-utils) (since version 2020.20210202-3)::
+
+ sudo apt install texlive-extra-utils
+
+* Otherwise, you can install SpiX using pip:
python3 -m pip install spix
-Other installation methods can be found in the [documentation](https://spix.readthedocs.io/en/latest/install/).
+* Other installation methods can be found in the [documentation](https://spix.readthedocs.io/en/latest/install/).
## License
-*Copyright 2020 Louis Paternault*
+*Copyright 2020-2021 Louis Paternault*
SpiX is licensed under the [Gnu GPL 3 license](https://www.gnu.org/licenses/gpl-3.0.html), or any later version.
diff --git a/support/spix/spix.pdf b/support/spix/spix.pdf
index 699bacd9cc..089c822f3a 100644
--- a/support/spix/spix.pdf
+++ b/support/spix/spix.pdf
Binary files differ
diff --git a/support/spix/spix.py b/support/spix/spix.py
index 1369703a7a..69dd981582 100755
--- a/support/spix/spix.py
+++ b/support/spix/spix.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
-# Copyright 2020 Louis Paternault
+# Copyright 2020-2022 Louis Paternault
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ import subprocess
import sys
NAME = "SpiX"
-VERSION = "1.1.0"
+VERSION = "1.3.0"
RE_EMPTY = re.compile("^ *$")
RE_COMMENT = re.compile("^ *%")
@@ -75,9 +75,11 @@ def compiletex(filename, *, dryrun=False):
env["basename"] = filename.stem
try:
+ # pylint: disable=unspecified-encoding
with open(filename, errors="ignore") as file:
for snippet in parse_lines(file.readlines()):
print(snippet)
+ sys.stdout.flush()
if dryrun:
continue
@@ -86,10 +88,10 @@ def compiletex(filename, *, dryrun=False):
cwd=(pathlib.Path.cwd() / filename).parent,
env=env,
)
- except subprocess.CalledProcessError:
- raise SpixError()
+ except subprocess.CalledProcessError as error:
+ raise SpixError() from error
except IsADirectoryError as error:
- raise SpixError(str(error))
+ raise SpixError(str(error)) from error
def commandline_parser():