docs-rst: fix LaTeX \DURole renewcommand with Sphinx 1.3+ (e2a91f4f) · Commits · 戴 / test

PDF build on Kernel 4.9-rc? returns an error with Sphinx 1.3.x and Sphinx 1.4.x, when trying to solve some cross-references. The solution is to redefine the \DURole macro. However, this is redefined too late. Move such redefinition to LaTeX preamble and bind it to just the Sphinx versions where the error is known to be present. Tested by building the documentation on interactive mode: make PDFLATEX=xelatex -C Documentation/output/./latex Fixes: ("[media] index.rst: Fix LaTeX error in interactive mode on Sphinx 1.4.x") Signed-off-by:

Mauro Carvalho Chehab <mchehab@s-opensource.com> Signed-off-by:

Jonathan Corbet <corbet@lwn.net>

Documentation/conf.py

+5 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ from load_config import loadConfig
		extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain']

		# The name of the math extension changed on Sphinx 1.4
		if minor > 3:
		if major == 1 and minor > 3:
		extensions.append("sphinx.ext.imgmath")
		else:
		extensions.append("sphinx.ext.pngmath")
		@@ -332,6 +332,10 @@ latex_elements = {
		'''
		}

		# Fix reference escape troubles with Sphinx 1.4.x
		if major == 1 and minor > 3:
		latex_elements['preamble'] += '\\renewcommand*{\\DUrole}[2]{ #2 }\n'

		# Grouping the document tree into LaTeX files. List of tuples
		# (source start file, target name, title,
		# author, documentclass [howto, manual, or own class]).

Documentation/media/index.rst

+0 −5

Original line number	Diff line number	Diff line
		Linux Media Subsystem Documentation
		===================================

		.. Sphinx 1.4.x has a definition for DUrole that doesn't work on alltt blocks
		.. raw:: latex

		\renewcommand*{\DUrole}[2]{ #2 }

		Contents:

		.. toctree::

Admin message