docs: pdfdocs: Move CJK monospace font setting to main conf.py

As LaTeX macros for CJK font settings can have Latin-script font
settings as well, settings under Documentation/translations/ can
be moved to the main conf.py.

By this change, translations.pdf built by top-level "make pdfdocs"
can have properly aligned ascii-art diagrams except for Korean
ones.

For the reason of remaining misalignment in Korean diagrams, see
changelog of commit a90dad8f610a ("docs: pdfdocs: Add conf.py
local to translations for ascii-art alignment").

Signed-off-by: Akira Yokosawa <akiyks@gmail.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Link: https://lore.kernel.org/r/eb87790a-03f4-9f29-c8a3-ef2c3e78ca18@gmail.com
Signed-off-by: Jonathan Corbet <corbet@lwn.net>

diff --git a/Documentation/conf.py b/Documentation/conf.py
index 62cd0e4..fb8f69f 100644 (file)
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -521,6 +521,8 @@ latex_elements['preamble']  += '''
            \\renewcommand{\\CJKsfdefault}{SCsans}%
            \\renewcommand{\\CJKttdefault}{SCmono}%
            \\xeCJKsetup{CJKspace = false}%
+           % For CJK ascii-art alignment
+           \\setmonofont{Noto Sans Mono CJK SC}[AutoFakeSlant]%
        }
        \\newcommand{\\kerneldocEndSC}{\\endgroup}
        \\newcommand{\\kerneldocBeginTC}{%
@@ -532,6 +534,8 @@ latex_elements['preamble']  += '''
            \\renewcommand{\\CJKsfdefault}{TCsans}%
            \\renewcommand{\\CJKttdefault}{TCmono}%
            \\xeCJKsetup{CJKspace = false}%
+           % For CJK ascii-art alignment
+           \\setmonofont{Noto Sans Mono CJK TC}[AutoFakeSlant]%
        }
        \\newcommand{\\kerneldocEndTC}{\\endgroup}
        \\newcommand{\\kerneldocBeginKR}{%
@@ -541,6 +545,8 @@ latex_elements['preamble']  += '''
            \\renewcommand{\\CJKsfdefault}{KRsans}%
            \\renewcommand{\\CJKttdefault}{KRmono}%
            % \\xeCJKsetup{CJKspace = true} % true by default
+           % For CJK ascii-art alignment (still misaligned for Hangul)
+           \\setmonofont{Noto Sans Mono CJK KR}[AutoFakeSlant]%
        }
        \\newcommand{\\kerneldocEndKR}{\\endgroup}
        \\newcommand{\\kerneldocBeginJP}{%
@@ -550,6 +556,8 @@ latex_elements['preamble']  += '''
            \\renewcommand{\\CJKsfdefault}{JPsans}%
            \\renewcommand{\\CJKttdefault}{JPmono}%
            \\xeCJKsetup{CJKspace = false}%
+           % For CJK ascii-art alignment
+           \\setmonofont{Noto Sans Mono CJK JP}[AutoFakeSlant]%
        }
        \\newcommand{\\kerneldocEndJP}{\\endgroup}
        % Single spacing in literal blocks

diff --git a/Documentation/translations/conf.py b/Documentation/translations/conf.py
deleted file mode 100644 (file)
index 92cdbba..0000000
--- a/Documentation/translations/conf.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-# SPDX-License-Identifier: GPL-2.0
-
-# -- Additinal options for LaTeX output ----------------------------------
-# font config for ascii-art alignment
-
-latex_elements['preamble']  += '''
-    \\IfFontExistsTF{Noto Sans CJK SC}{
-       % For CJK ascii-art alignment
-       \\setmonofont{Noto Sans Mono CJK SC}[AutoFakeSlant]
-    }{}
-'''