Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752389AbdICTMy (ORCPT ); Sun, 3 Sep 2017 15:12:54 -0400 Received: from ec2-52-27-115-49.us-west-2.compute.amazonaws.com ([52.27.115.49]:52351 "EHLO osg.samsung.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751287AbdICTMv (ORCPT ); Sun, 3 Sep 2017 15:12:51 -0400 From: Mauro Carvalho Chehab To: Linux Doc Mailing List , Jonathan Corbet Cc: Mauro Carvalho Chehab , Mauro Carvalho Chehab , linux-kernel@vger.kernel.org Subject: [PATCH 0/2] Two cleanups for Sphinx conf.py Date: Sun, 3 Sep 2017 16:12:44 -0300 Message-Id: X-Mailer: git-send-email 2.13.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1585 Lines: 48 Hi Jon, Those patches are just cleanups for Documentation/conf.py. The first one removes a package usage directive for a LateX package that it is not used. The second one moves some LaTeX preamble code that it is used only on Sphinx 1.4 and 1.5 to a separate if. On Sphinx 1.6, the macros there are silently ignored. While the conf.py becomes a little bit more complex, it clearly marks the backward-compatible code, with IMHO, it is a good idea, specially as some day, we may drop support for older Sphinx versions. None of those patches are mandatory. Feel free to apply any time you want (or discard them, if you don't thing it is worth). Please notice that the second patch will trivially conflict with a patch I sent before, removing \\usepackage{adjustbox}. I suspect that, if you apply those two patches before the one I sent eariler, you'll avoid the conflict. Anyway, if you apply all tree patches, you'll have a Latex Sphinx-independent preamble with just: 'preamble': ''' % Use some font with UTF-8 support with XeLaTeX \\usepackage{fontspec} \\setsansfont{DejaVu Serif} \\setromanfont{DejaVu Sans} \\setmonofont{DejaVu Sans Mono} ''' } And all version-dependent preamble inserted after testing for the Sphinx version. Mauro Carvalho Chehab (2): docs-rst: conf.py: remove lscape from LaTeX preamble docs-rst: conf.py: only setup notice box colors if Sphinx < 1.6 Documentation/conf.py | 65 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 22 deletions(-) -- 2.13.5