Commit 70ff1fe6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'docs-6.8-fixes3' of git://git.lwn.net/linux 

Pull two documentation build fixes from Jonathan Corbet:

 - The XFS online fsck documentation uses incredibly deeply nested
   subsection and list nesting; that broke the PDF docs build. Tweak a
   parameter to tell LaTeX to allow the deeper nesting.

 - Fix a 6.8 PDF-build regression

* tag 'docs-6.8-fixes3' of git://git.lwn.net/linux:
  docs: translations: use attribute to store current language
  docs: Instruct LaTeX to cope with deeper nesting
parents c46ac50e b7b2ffc3

Documentation/conf.py

+6 −0
Original line number Diff line number Diff line
@@ -388,6 +388,12 @@ latex_elements = { 
        verbatimhintsturnover=false,

    ''',



    #

    # Some of our authors are fond of deep nesting; tell latex to

    # cope.

    #

    'maxlistdepth': '10',



    # For CJK One-half spacing, need to be in front of hyperref

    'extrapackages': r'\usepackage{setspace}',

Documentation/sphinx/translations.py

+4 −6
Original line number Diff line number Diff line
@@ -29,10 +29,7 @@ all_languages = { 
}



class LanguagesNode(nodes.Element):

    def __init__(self, current_language, *args, **kwargs):

        super().__init__(*args, **kwargs)



        self.current_language = current_language

    pass



class TranslationsTransform(Transform):

    default_priority = 900
@@ -49,7 +46,8 @@ class TranslationsTransform(Transform): 
            # normalize docname to be the untranslated one

            docname = os.path.join(*components[2:])



        new_nodes = LanguagesNode(all_languages[this_lang_code])

        new_nodes = LanguagesNode()

        new_nodes['current_language'] = all_languages[this_lang_code]



        for lang_code, lang_name in all_languages.items():

            if lang_code == this_lang_code:
@@ -84,7 +82,7 @@ def process_languages(app, doctree, docname): 


        html_content = app.builder.templates.render('translations.html',

            context={

                'current_language': node.current_language,

                'current_language': node['current_language'],

                'languages': languages,

            })