From: Jonathan Corbet <corbet@lwn.net>
To: Akira Yokosawa <akiyks@gmail.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: linux-doc@vger.kernel.org,
Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
linux-kernel@vger.kernel.org, Akira Yokosawa <akiyks@gmail.com>
Subject: Re: [PATCH v2 2/3] docs/conf.py: Respect env variable SPHINX_IMGMATH
Date: Thu, 18 Aug 2022 11:24:49 -0600 [thread overview]
Message-ID: <87sfltbh26.fsf@meer.lwn.net> (raw)
In-Reply-To: <736e39fd-b068-80dd-b383-70e061e71bf5@gmail.com>
Akira Yokosawa <akiyks@gmail.com> writes:
> On some distros with coarse-grained packaging policy, dvipng is
> installed along with latex. In such cases, math rendering will
> use imgmath by default. It is possible to override the choice by
> specifying the option string of "-D html_math_renderer='mathjax'"
> to sphinx-build (Sphinx >= 1.8).
>
> To provide developers an easier-to-use knob, add code for an env
> variable "SPHINX_IMGMATH" which overrides the automatic choice
> of math renderer for html docs.
>
> SPHINX_IMGMATH=yes : Load imgmath even if dvipng is not found
> SPHINX_IMGMATH=no : Don't load imgmath (fall back to mathjax)
>
> Signed-off-by: Akira Yokosawa <akiyks@gmail.com>
> Acked-by: Mauro Carvalho Chehab <mchehab@kernel.org>
> ---
> Changes since v1:
> - No logical changes.
> - Renames:
> LOAD_IMGMATH -> SPHINX_IMGMATH (Mauro),
> opt_load_imgmath -> env_sphinx_imgmath.
> - Acked-by from Mauro.
>
> --
> Documentation/conf.py | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/conf.py b/Documentation/conf.py
> index 3ec1f845c839..0b8f20e8e22c 100644
> --- a/Documentation/conf.py
> +++ b/Documentation/conf.py
> @@ -128,8 +128,20 @@ autosectionlabel_maxdepth = 2
> # mathjax is the default math renderer since Sphinx 1.8.
> have_latex = have_command('latex', '--version', 'pdfTeX')
> have_dvipng = have_command('dvipng', '--version', 'dvipng')
> -load_imgmath = ((have_latex and have_dvipng)
> - or (major == 1 and minor < 8)
> +load_imgmath = have_latex and have_dvipng
> +
> +# Respect SPHINX_IMGMATH (for html docs only)
> +if 'SPHINX_IMGMATH' in os.environ:
> + env_sphinx_imgmath = os.environ['SPHINX_IMGMATH']
> + if 'yes' in env_sphinx_imgmath:
> + load_imgmath = True
> + elif 'no' in env_sphinx_imgmath:
> + load_imgmath = False
> + else: # otherwide, auto selection
> + pass
That "else: pass" sequence does nothing, of course, and could be taken
out.
Otherwise fine,
jon
next prev parent reply other threads:[~2022-08-18 17:26 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-08 8:49 [PATCH v2 0/3] docs: conf.py: Reduce texlive dependency Akira Yokosawa
2022-08-08 8:51 ` [PATCH v2 1/3] docs/conf.py: Treat mathjax as fallback math renderer Akira Yokosawa
2022-08-18 17:22 ` Jonathan Corbet
2022-08-19 13:50 ` Akira Yokosawa
2022-08-08 8:52 ` [PATCH v2 2/3] docs/conf.py: Respect env variable SPHINX_IMGMATH Akira Yokosawa
2022-08-18 17:24 ` Jonathan Corbet [this message]
2022-08-08 8:53 ` [PATCH v2 3/3] docs: kerneldoc-preamble: Test xeCJK.sty before loading Akira Yokosawa
2022-08-11 15:33 ` Akira Yokosawa
2022-08-18 17:28 ` Jonathan Corbet
2022-10-18 4:24 ` Akira Yokosawa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87sfltbh26.fsf@meer.lwn.net \
--to=corbet@lwn.net \
--cc=akiyks@gmail.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab+huawei@kernel.org \
--cc=mchehab@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).