From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id 6CC2B3858418; Mon, 7 Nov 2022 12:38:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6CC2B3858418 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667824726; bh=zX0iZP8zXAJfO0ya6PEbEWV7JdsH409JTK0GZypXDo8=; h=From:To:Subject:Date:From; b=GCe3EimUhFvOTE0SqazQdJDNagS3KtroGzWSSZ5mdDgSJ+pykpTuWQD42a4SM7jZ4 icCCkVx0jiQA/zGwEQXhuRz1HpS7qSBxgOyjtkDCkqGZCxI+bYvr6wUgnWg3lHlY9T SopGbKVsiGj+0cOxTVU0S9e9pRbH7z5ol6KY0A0U= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/marxin/heads/sphinx-final)] fixup! sphinx, ada: port to Sphinx X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/users/marxin/heads/sphinx-final X-Git-Oldrev: 79018fe06f5af457c1c39700d074130e3d2eb149 X-Git-Newrev: d35404f4dc77c567e40cad75708afe598019f89d Message-Id: <20221107123846.6CC2B3858418@sourceware.org> Date: Mon, 7 Nov 2022 12:38:46 +0000 (GMT) List-Id: https://gcc.gnu.org/g:d35404f4dc77c567e40cad75708afe598019f89d commit d35404f4dc77c567e40cad75708afe598019f89d Author: Martin Liska Date: Mon Sep 26 15:35:21 2022 +0200 fixup! sphinx,ada: port to Sphinx Diff: --- gcc/ada/doc/gnat-style/conf.py | 2 +- gcc/ada/doc/gnat_rm/conf.py | 2 +- gcc/ada/doc/gnat_ugn/conf.py | 2 +- gcc/ada/doc/share/adabaseconf.py | 18 +++++++----------- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/gcc/ada/doc/gnat-style/conf.py b/gcc/ada/doc/gnat-style/conf.py index f9793b08054..a413d2632eb 100644 --- a/gcc/ada/doc/gnat-style/conf.py +++ b/gcc/ada/doc/gnat-style/conf.py @@ -9,7 +9,7 @@ name = 'gnat-style' project = 'GNAT Coding Style: A Guide for GNAT Developers' authors = 'AdaCore' -set_latex_elements(project) +set_latex_elements(latex_elements, project) # Grouping the document tree into Texinfo files. List of tuples # (source start file, target name, title, author, diff --git a/gcc/ada/doc/gnat_rm/conf.py b/gcc/ada/doc/gnat_rm/conf.py index f2abffc9f35..e99d1e6bd13 100644 --- a/gcc/ada/doc/gnat_rm/conf.py +++ b/gcc/ada/doc/gnat_rm/conf.py @@ -9,7 +9,7 @@ name = 'gnat_rm' project = 'GNAT Reference Manual' authors = 'AdaCore' -set_latex_elements(project) +set_latex_elements(latex_elements, project) # Grouping the document tree into Texinfo files. List of tuples # (source start file, target name, title, author, diff --git a/gcc/ada/doc/gnat_ugn/conf.py b/gcc/ada/doc/gnat_ugn/conf.py index d5d8b9e5ae1..94e3c07e836 100644 --- a/gcc/ada/doc/gnat_ugn/conf.py +++ b/gcc/ada/doc/gnat_ugn/conf.py @@ -9,7 +9,7 @@ name = 'gnat_ugn' project = "GNAT User's Guide for Native Platforms" authors = 'AdaCore' -set_latex_elements(project) +set_latex_elements(latex_elements, project) # Grouping the document tree into Texinfo files. List of tuples # (source start file, target name, title, author, diff --git a/gcc/ada/doc/share/adabaseconf.py b/gcc/ada/doc/share/adabaseconf.py index ce97ff80f7d..4a80a838c63 100644 --- a/gcc/ada/doc/share/adabaseconf.py +++ b/gcc/ada/doc/share/adabaseconf.py @@ -15,7 +15,6 @@ import ada_latex_elements import ada_pygments -texi_fsf = True # Set to False when FSF doc is switched to sphinx by default gnatvsn_content = read_file('ada/gnatvsn.ads') @@ -26,10 +25,7 @@ def get_gnat_version(): if m: return m.group(1).strip() else: - if texi_fsf: - return '' - else: - return gcc_BASEVER + return gcc_BASEVER def get_gnat_build_type(): @@ -54,7 +50,7 @@ if os.path.isfile('adacore_transparent.png'): if os.path.isfile('favicon.ico'): html_favicon = 'favicon.ico' -latex_additional_files = ['gnat.sty'] +latex_additional_files = ['../share/gnat.sty'] copyright_macros = { 'date': time.strftime('%b %d, %Y'), @@ -65,19 +61,19 @@ copyright_macros = { 'version': version} -def set_latex_elements(title): - global latex_elements - - latex_elements = { +def set_latex_elements(latex_elements, title): + elements = { 'preamble': '\\usepackage{gnat}\n' + ada_latex_elements.TOC_DEPTH + ada_latex_elements.PAGE_BLANK + ada_latex_elements.TOC_CMD + ada_latex_elements.LATEX_HYPHEN + - ada_latex_elements.ENCLOSE + ada_latex_elements.doc_settings(title, get_gnat_version()), 'tableofcontents': ada_latex_elements.TOC % copyright_macros } + for key, value in elements.items(): + latex_elements.setdefault(key, '') + latex_elements[key] += value def setup(app):