Received: by 2002:a19:ef0c:0:0:0:0:0 with SMTP id n12csp951528lfh; Tue, 1 Feb 2022 12:54:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJxzQk1DorF2QkZKJ/GuAOBv2vCwzwzHOwyF5kjWjDf3NUtgDqBOomJ50NYQvz7yWR6xK8R4 X-Received: by 2002:a17:90b:4b4f:: with SMTP id mi15mr4373601pjb.218.1643748875791; Tue, 01 Feb 2022 12:54:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643748875; cv=none; d=google.com; s=arc-20160816; b=u39XleU1XxTjc85puNvAZ59X0k8mZYohlqlbEjtMo+9B/TYnPV19JfEGZf3yC9yKJX vqT6kkaZRjKJ+3FWKpBh69AssvxnfhwLMjMnT1xjiKI03J2UEa6UDbeWujKi9IfUX+uH PV1y3FtaM1k+aTwwVGZ99QJ0E8t4vvC20o8LOdu7JVmM2u1FAn1WDppRQY2GPAfhhbDr Z9a1EYLInctkcbQsQujHsngS6q5RB68pdUA+s2/nB8UJ8bcnUJ1NXrUc9cyDK8mPAY5p BY7UnTcLdUGHCinwDevDDvtZyfD286NU7Gwc0NNLNuFoFLONwFXo8dqfz9cuSk2TCTrx 34Gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id:dkim-signature; bh=GLOHoY1dKulHTeMDIa0XS5wbWpIlVfyrhIiTKyT03qg=; b=fRGNdL8yU/mMfhpYm+S1acEhwEdCDRHPEM+e+gA4TjWI3L3ep9chWMzpmkh3mZXx33 v+Q5OXXYhnoO+zKlbd9LRmEyDqkWbADKD5lcFQaDd8x//do0cKoMMpUFgqVJjXhgYpBO yr8JSvjs/8o8//ta+vflVyvoz5i9aczjQ+q699NIiJIU2b3tj/joVxhaPw9yKivJcmgS WZiTnp3VGSzGCJc0J4hhOjTClD4nfTwKoqS2z6vz1Zqvhw2NwIyXwd1WiWADwIbP/8s0 UmSDzdO0Rbcy/J7PuQ0C0irhXsxeBq8afl9LyLl/Pq3SdqFewrpSWNT99RMElY/qBAzp Apmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=q13L8wwt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o5si19516833plg.26.2022.02.01.12.54.23; Tue, 01 Feb 2022 12:54:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=q13L8wwt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230051AbiBAAFp (ORCPT + 99 others); Mon, 31 Jan 2022 19:05:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230037AbiBAAFo (ORCPT ); Mon, 31 Jan 2022 19:05:44 -0500 Received: from mail-pf1-x434.google.com (mail-pf1-x434.google.com [IPv6:2607:f8b0:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22C95C061714; Mon, 31 Jan 2022 16:05:44 -0800 (PST) Received: by mail-pf1-x434.google.com with SMTP id 192so14303900pfz.3; Mon, 31 Jan 2022 16:05:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :cc:references:from:in-reply-to:content-transfer-encoding; bh=GLOHoY1dKulHTeMDIa0XS5wbWpIlVfyrhIiTKyT03qg=; b=q13L8wwtqt32L9uGLqVXs2KNtcJGVvTB6VKIKNcAoCOmWkgxB1MB+wCnu3POczUwXu I8DOk85GMeAOq1Sgr4iAk1hPOJ7De8neoCHDCJh/6l1lYnZ5bCqQvL9tqsoKL5IVFaxA eZq6531/CB5WRIkmfm1u9xsRAX4edqKg93PqzDrm+zlTKcr9A9dJ2Q0tWjRieFhIxIAE qsG+BNgW69TnFeO9m+b0BVGIYWbn13sCRmgItldelS95cCK//y405GalDzIZRdSadtIW jMMlMUOm3p8dU14iZAxtZxgC2yW5u0gZrGbTUQbJroX5l2FNI7QZfG6P8O0JkTlL5A+Q 9QGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=GLOHoY1dKulHTeMDIa0XS5wbWpIlVfyrhIiTKyT03qg=; b=CwataCMMWyh8NRdLzprPYTXFSeVMsQMO3ngtaAgxbzGQ6c9QqBpAU4lnXiflaR3WfR jryCJI1E97511LzYJIiyLjqT/xEw1SRDP3lFbovnssDZzpL4tBbEEUMWJw9qzsTW628+ 9Uky4ycqkdbBc1SCoJC8A+b1t6cEqwaW9Zdv31nd+oerhBiaNcyVe3WNXXS7lt3jn6Pd PYv4CK/M9/kMF2TgXBt/9yyr8VOXYdYZZhj1p8e8zK1ELz4xutncYLA4UsKLoxYyyTyf N7KFapleAoQJR4FsvToj/wC/OuEl4oZBryDggwklusYKTHVUuC3Gxl+CS4L3+n42MdXi TDAA== X-Gm-Message-State: AOAM530lYScyvPkUV8xj6QSMR64l7xhJ/q+UjwJeT9PDmvc2b/qg2lAF GrjTJhHsXGI1nHMGWDOWDhI= X-Received: by 2002:a62:3303:: with SMTP id z3mr22193512pfz.54.1643673943707; Mon, 31 Jan 2022 16:05:43 -0800 (PST) Received: from [192.168.11.5] (KD106167171201.ppp-bb.dion.ne.jp. [106.167.171.201]) by smtp.gmail.com with ESMTPSA id k3sm20828742pfu.180.2022.01.31.16.05.42 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 31 Jan 2022 16:05:43 -0800 (PST) Message-ID: Date: Tue, 1 Feb 2022 09:05:40 +0900 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.0 Subject: [PATCH 5/5] docs: pdfdocs: Move CJK monospace font setting to main conf.py Content-Language: en-US To: Jonathan Corbet Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Akira Yokosawa References: From: Akira Yokosawa In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Cc: Jonathan Corbet --- Documentation/conf.py | 8 ++++++++ Documentation/translations/conf.py | 12 ------------ 2 files changed, 8 insertions(+), 12 deletions(-) delete mode 100644 Documentation/translations/conf.py diff --git a/Documentation/conf.py b/Documentation/conf.py index 62cd0e472b3b..fb8f69fc4d38 100644 --- 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 index 92cdbba74229..000000000000 --- 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] - }{} -''' -- 2.17.1