diff mbox series

docs: conf.py: adjust the LaTeX document output

Message ID 911fbac185dd09c7df715cf4153361b81f04b7ad.1614787053.git.mchehab+huawei@kernel.org
State Accepted
Commit 3b4c963243b1cac1882c2a557152d5444580a751
Headers show
Series docs: conf.py: adjust the LaTeX document output | expand

Commit Message

Mauro Carvalho Chehab March 3, 2021, 3:58 p.m. UTC 
Changeset f546ff0c0c07 ("Move our minimum Sphinx version to 1.7")
cleaned up some compatibility issues with previous Sphinx
versions, but it also dropped the PDF margin sets.

Without that, the media documentation won't build fine, as
the margins are too wide to display texts with monospaced
fonts.

While here, align the  "latex_elements = {" values, and add
a few other sphinxsetup configs in order to allow Sphinx to
wrap long lines on literal blocks.

Fixes: f546ff0c0c07 ("Move our minimum Sphinx version to 1.7")
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

 Documentation/conf.py | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

Comments

Jonathan Corbet March 9, 2021, 12:20 a.m. UTC | #1 
Mauro Carvalho Chehab <mchehab+huawei@kernel.org> writes:

> Changeset f546ff0c0c07 ("Move our minimum Sphinx version to 1.7")

> cleaned up some compatibility issues with previous Sphinx

> versions, but it also dropped the PDF margin sets.

>

> Without that, the media documentation won't build fine, as

> the margins are too wide to display texts with monospaced

> fonts.

>

> While here, align the  "latex_elements = {" values, and add

> a few other sphinxsetup configs in order to allow Sphinx to

> wrap long lines on literal blocks.

>

> Fixes: f546ff0c0c07 ("Move our minimum Sphinx version to 1.7")

> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

>

>  Documentation/conf.py | 31 +++++++++++++++++++------------

>  1 file changed, 19 insertions(+), 12 deletions(-)


Applied, thanks.

jon
diff mbox series

Patch

diff --git a/Documentation/conf.py b/Documentation/conf.py
index fd65168c10f8..879e86dbea66 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -331,27 +331,34 @@  htmlhelp_basename = 'TheLinuxKerneldoc'
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-'papersize': 'a4paper',
+    # The paper size ('letterpaper' or 'a4paper').
+    'papersize': 'a4paper',
 
-# The font size ('10pt', '11pt' or '12pt').
-'pointsize': '11pt',
+    # The font size ('10pt', '11pt' or '12pt').
+    'pointsize': '11pt',
 
-# Latex figure (float) alignment
-#'figure_align': 'htbp',
+    # Latex figure (float) alignment
+    #'figure_align': 'htbp',
 
-# Don't mangle with UTF-8 chars
-'inputenc': '',
-'utf8extra': '',
+    # Don't mangle with UTF-8 chars
+    'inputenc': '',
+    'utf8extra': '',
 
-# Additional stuff for the LaTeX preamble.
+    # Set document margins
+    'sphinxsetup': '''
+        hmargin=0.5in, vmargin=1in,
+        parsedliteralwraps=true,
+        verbatimhintsturnover=false,
+    ''',
+
+    # Additional stuff for the LaTeX preamble.
     'preamble': '''
-	% Use some font with UTF-8 support with XeLaTeX
+        % Use some font with UTF-8 support with XeLaTeX
         \\usepackage{fontspec}
         \\setsansfont{DejaVu Sans}
         \\setromanfont{DejaVu Serif}
         \\setmonofont{DejaVu Sans Mono}
-     '''
+     ''',
 }
 
 # At least one book (translations) may have Asian characters