summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2025-08-21 14:09:21 -0600
committerJonathan Corbet <corbet@lwn.net>2025-08-21 14:09:21 -0600
commitee9a6691935490dc39605882b41b9452844d5e4e (patch)
tree7d194907cb483929a865fdc22c5b63e76f36d0d8 /scripts
parentf51fe3b7e48ca81a9cee15c0146e4fb7d3000d3a (diff)
parentc6e23912855d4848883080200e09551b6dcbc7df (diff)
Merge branch 'mauro-pdf' into docs-mw
Here it is the second version of the PDF series. I opted to split one of the patches in 3, to have a clearer changelog and description. Also, archlinux LXC image download started working again, so I added an extra patch addressing texlive packae dependencies. This series is taking me a way more time than antecipated. This series as 3 goals: 1. Fix a pre-Sphinx 1.7 PDF variable that got renamed, but our Makefile still uses the old one that is not supported since Sphinx 1.7; 2. Fix broken or incomplete texlive dependencies on several distros; 4. "modernize" conf.py to solve font conflicts related to UTF-8 and non-UTF fonts from [T1]{fontenc} LaTeX package. Using fontenc with xelatex is problematic, as documented at https://www.sphinx-doc.org/en/master/latex.html Please notice that: - It doesn't pretend to fix all PDF issues. It focus only at the above; - there are still distros where PDF builds fail either partially or as a hole. On my checks, those are due to problematic texlive packages shipped on such distros; - it doesn't touch/address/alter anyhing related to kfigure.py. as such, it doesn't touch/change/improve/drop anything with regards ImageMagick and/or Inkscape.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/sphinx-pre-install46
1 files changed, 37 insertions, 9 deletions
diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
index b8474848df4e..954ed3dc0645 100755
--- a/scripts/sphinx-pre-install
+++ b/scripts/sphinx-pre-install
@@ -764,9 +764,6 @@ class SphinxDependencyChecker(MissingCheckers):
if self.pdf:
pdf_pkgs = {
- "texlive-lang-chinese": [
- "/usr/share/texlive/texmf-dist/tex/latex/ctex/ctexhook.sty",
- ],
"fonts-dejavu": [
"/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf",
],
@@ -775,6 +772,15 @@ class SphinxDependencyChecker(MissingCheckers):
"/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc",
"/usr/share/fonts/opentype/noto/NotoSerifCJK-Regular.ttc",
],
+ "tex-gyre": [
+ "/usr/share/texmf/tex/latex/tex-gyre/tgtermes.sty"
+ ],
+ "texlive-fonts-recommended": [
+ "/usr/share/texlive/texmf-dist/fonts/tfm/adobe/zapfding/pzdr.tfm",
+ ],
+ "texlive-lang-chinese": [
+ "/usr/share/texlive/texmf-dist/tex/latex/ctex/ctexhook.sty",
+ ],
}
for package, files in pdf_pkgs.items():
@@ -895,7 +901,7 @@ class SphinxDependencyChecker(MissingCheckers):
"dot": "graphviz",
"python-sphinx": "python3-sphinx",
"virtualenv": "python3-virtualenv",
- "xelatex": "texlive-xetex-bin",
+ "xelatex": "texlive-xetex-bin texlive-dejavu",
"yaml": "python3-pyyaml",
}
@@ -931,7 +937,7 @@ class SphinxDependencyChecker(MissingCheckers):
self.recommend_python = True
progs.update({
- "python-sphinx": "python311-Sphinx",
+ "python-sphinx": "python311-Sphinx python311-Sphinx-latex",
"virtualenv": "python311-virtualenv",
"yaml": "python311-PyYAML",
})
@@ -939,7 +945,7 @@ class SphinxDependencyChecker(MissingCheckers):
# Tumbleweed defaults to Python 3.11
progs.update({
- "python-sphinx": "python313-Sphinx",
+ "python-sphinx": "python313-Sphinx python313-Sphinx-latex",
"virtualenv": "python313-virtualenv",
"yaml": "python313-PyYAML",
})
@@ -973,18 +979,26 @@ class SphinxDependencyChecker(MissingCheckers):
tex_pkgs = [
"texlive-fontsextra",
+ "texlive-fonts-asian",
+ "fonts-ttf-dejavu",
]
if re.search(r"OpenMandriva", self.system_release):
packager_cmd = "dnf install"
noto_sans = "noto-sans-cjk-fonts"
- tex_pkgs = ["texlive-collection-fontsextra"]
+ tex_pkgs = [
+ "texlive-collection-basic",
+ "texlive-collection-langcjk",
+ "texlive-collection-fontsextra",
+ "texlive-collection-fontsrecommended"
+ ]
# Tested on OpenMandriva Lx 4.3
progs["convert"] = "imagemagick"
progs["yaml"] = "python-pyyaml"
progs["python-virtualenv"] = "python-virtualenv"
progs["python-sphinx"] = "python-sphinx"
+ progs["xelatex"] = "texlive"
self.check_program("python-virtualenv", DepManager.PYTHON_MANDATORY)
@@ -998,7 +1012,9 @@ class SphinxDependencyChecker(MissingCheckers):
if not self.distro_msg:
self.distro_msg = \
- "Note: for venv, ensurepip could be broken, preventing its install method."
+ "Notes:\n"\
+ "1. for venv, ensurepip could be broken, preventing its install method.\n" \
+ "2. at least on OpenMandriva LX 4.3, texlive packages seem broken"
else:
packager_cmd = "urpmi"
@@ -1032,7 +1048,12 @@ class SphinxDependencyChecker(MissingCheckers):
}
archlinux_tex_pkgs = [
+ "texlive-basic",
+ "texlive-binextra",
"texlive-core",
+ "texlive-fontsrecommended",
+ "texlive-langchinese",
+ "texlive-langcjk",
"texlive-latexextra",
"ttf-dejavu",
]
@@ -1052,12 +1073,19 @@ class SphinxDependencyChecker(MissingCheckers):
"""
Provide package installation hints for Gentoo.
"""
+ texlive_deps = [
+ "dev-texlive/texlive-fontsrecommended",
+ "dev-texlive/texlive-latexextra",
+ "dev-texlive/texlive-xetex",
+ "media-fonts/dejavu",
+ ]
+
progs = {
"convert": "media-gfx/imagemagick",
"dot": "media-gfx/graphviz",
"rsvg-convert": "gnome-base/librsvg",
"virtualenv": "dev-python/virtualenv",
- "xelatex": "dev-texlive/texlive-xetex media-fonts/dejavu",
+ "xelatex": " ".join(texlive_deps),
"yaml": "dev-python/pyyaml",
"python-sphinx": "dev-python/sphinx",
}