Skip to content

Commit e20d8d6

Browse files
committed
Merge branch 'mr/cardao/fix-sphinx-doc' into 'master'
Update documentation to support sphinx 6.2.1 See merge request eng/das/test/aunit!1
2 parents 62f7eca + c51c420 commit e20d8d6

File tree

5 files changed

+30
-1969
lines changed

5 files changed

+30
-1969
lines changed

doc/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ clean:
5454

5555
%.pdf:
5656
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/$*/pdf
57-
cp $(SOURCEDIR)/share/sphinx.sty $(BUILDDIR)/$*/pdf
5857
$(MAKE) -C $(BUILDDIR)/$*/pdf all-pdf LATEXOPTS="-interaction=nonstopmode"
5958

6059
%.txt:

doc/aunit_cb/restricted_runtimes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Additional restrictions relevant to the default ZFP profile include:
7272

7373
* AUnit requires ``GNAT.IO`` provided in :samp:`g-io.ad{?}` in the full or cert
7474
profile run-time library sources (or as implemented by the user). Since this
75-
is a run-time library unit it must be compiled with the gnatmake :option:`-a`
75+
is a run-time library unit it must be compiled with the gnatmake :samp:`-a`
7676
switch.
7777

7878
.. index:: Secondary stack, memcpy, memset

doc/share/conf.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,16 +79,17 @@ def get_version():
7979
if os.path.isfile('favicon.ico'):
8080
html_favicon = 'favicon.ico'
8181

82-
html_static_path = ['_static']
83-
8482
latex_elements = {
8583
'preamble': latex_elements.TOC_DEPTH +
8684
latex_elements.PAGE_BLANK +
8785
latex_elements.TOC_CMD +
8886
latex_elements.LATEX_HYPHEN +
89-
latex_elements.doc_settings(DOCS[doc_name]['title'],
90-
get_version()),
91-
'tableofcontents': latex_elements.TOC}
87+
latex_elements.doc_settings(DOCS[doc_name]['title'], get_version()) +
88+
latex_elements.FOOTER,
89+
'tableofcontents': latex_elements.TOC
90+
}
91+
92+
latex_table_style = ["standard", "colorrows"]
9293

9394
latex_documents = [
9495
(master_doc, '%s.tex' % doc_name, project, u'AdaCore', 'manual')]
@@ -99,5 +100,5 @@ def get_version():
99100

100101

101102
def setup(app):
102-
app.add_lexer('ada', ada_pygments.AdaLexer())
103-
app.add_lexer('gpr', ada_pygments.GNATProjectLexer())
103+
app.add_lexer('ada', ada_pygments.AdaLexer)
104+
app.add_lexer('gpr', ada_pygments.GNATProjectLexer)

doc/share/latex_elements.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,27 @@
5757
\tolerance=1000
5858
'''
5959

60+
FOOTER = r"""
61+
\usepackage{titleref}
62+
63+
\makeatletter
64+
\@ifundefined{fancyhf}{}{
65+
\fancypagestyle{normal}{
66+
\fancyhf{}
67+
% Define footers
68+
\fancyfoot[LE,RO]{{\py@HeaderFamily\thepage}}
69+
\fancyfoot[LO,RE]{\TR@currentTitle}
70+
}
71+
\fancypagestyle{plain}{
72+
\fancyhf{}
73+
% Define footers
74+
\fancyfoot[LE,RO]{{\py@HeaderFamily\thepage}}
75+
\fancyfoot[LO,RE]{\TR@currentTitle}
76+
}
77+
}
78+
\makeatother
79+
"""
80+
6081

6182
def doc_settings(full_document_name, version):
6283
return '\n'.join([

0 commit comments

Comments
 (0)