Commit 0df46e09 authored by Akira Yokosawa's avatar Akira Yokosawa Committed by Jonathan Corbet
Browse files

docs: kerneldoc-preamble.sty: Remove code for Sphinx <2.4 



Now that Sphinx 2.4.4 or better is required, get rid of
\providecommand{}'s for compatibility with Sphinx 1.7.9.

While at it, reword the comment on \sphinxtableofcontentshook
for better description of why it needs to be emptied.

Signed-off-by: default avatarAkira Yokosawa <akiyks@gmail.com>
Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
Message-ID: <ed1ec6f2-0050-46f6-807d-8679f26427e9@gmail.com>
parent fe256258

Documentation/sphinx/kerneldoc-preamble.sty

+1 −6
Original line number Diff line number Diff line
@@ -54,9 +54,7 @@ 
\renewcommand*\l@section{\@dottedtocline{1}{2.4em}{3.2em}}

\renewcommand*\l@subsection{\@dottedtocline{2}{5.6em}{4.3em}}

\makeatother

%% Sphinx < 1.8 doesn't have \sphinxtableofcontentshook

\providecommand{\sphinxtableofcontentshook}{}

%% Undefine it for compatibility with Sphinx 1.7.9

%% Prevent default \sphinxtableofcontentshook from overwriting above tweaks.

\renewcommand{\sphinxtableofcontentshook}{} % Empty the hook



% Prevent column squeezing of tabulary.  \tymin is set by Sphinx as:
@@ -136,9 +134,6 @@ 
    }

    \newCJKfontfamily[JPsans]\jpsans{Noto Sans CJK JP}[AutoFakeSlant]

    \newCJKfontfamily[JPmono]\jpmono{Noto Sans Mono CJK JP}[AutoFakeSlant]

    % Dummy commands for Sphinx < 2.3 (no 'extrapackages' support)

    \providecommand{\onehalfspacing}{}

    \providecommand{\singlespacing}{}

    % Define custom macros to on/off CJK

    %% One and half spacing for CJK contents

    \newcommand{\kerneldocCJKon}{\makexeCJKactive\onehalfspacing}