Skip to content

Commit 882b4b7

Browse files
brechtmbrechtm
committed
sphinx_inline_markup test: handle pre/post Sphinx 8.2 output
Record min/max Sphinx version in the .rst docinfo instead of in test_rst.py.
1 parent 9b752fc commit 882b4b7

12 files changed

Lines changed: 543 additions & 52 deletions

‎tests_regression/rst/sphinx_admonition.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11

2+
:sphinx-minversion: 7.3
3+
24
.. seealso:: This other place.
35

46
.. versionadded:: 3 Don't try to use this in an older version!

‎tests_regression/rst/sphinx_collapsible.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11

2+
:sphinx-minversion: 8.2
3+
24
.. note::
35
:collapsible:
46

‎tests_regression/rst/sphinx_domain.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11

2+
:sphinx-minversion: 7.1
3+
24
.. py:function:: Timer.repeat(source: str, repeat: int = 3, hurry: Literal[True, False] = True, ab: Literal['a', 'b'] = 'a')
35
46
Not sure what this is supposed to do.

‎tests_regression/rst/sphinx_inline_markup.pdf‎

-2.67 KB
Binary file not shown.

‎tests_regression/rst/sphinx_inline_markup.pxml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<document rinoh_regression_test="True" source="/Users/brechtm/Code/rinohtype/tests_regression/rst/index.rst">
1+
<document rinoh_regression_test="True" source="/Users/brechtm/Code/rinohtype/tests_regression/rst/index.rst" translation_progress="{'total': 0, 'translated': 0}">
22
<paragraph>
33
Inline Markup roles:
44
<field_list>
@@ -57,7 +57,10 @@
5757
<field_body>
5858
<paragraph>
5959
<literal classes="kbd">
60-
Control-x
60+
Control
61+
-
62+
<literal classes="kbd">
63+
x
6164
,
6265
<literal classes="kbd">
6366
page up

‎tests_regression/rst/sphinx_inline_markup.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
:sphinx-minversion: 8.2
12
:warnings:
23
No definition given for 'FIFO' glossary term
34

‎tests_regression/rst/sphinx_inline_markup.stylelog‎

Lines changed: 38 additions & 34 deletions
Large diffs are not rendered by default.

‎tests_regression/rst/sphinx_inline_markup_oldsphinx.pdf‎

231 KB
Binary file not shown.

‎tests_regression/rst/sphinx_inline_markup_oldsphinx.pxml‎

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
<document rinoh_regression_test="True" source="/Users/brechtm/Code/rinohtype/tests_regression/rst/index.rst" translation_progress="{'total': 0, 'translated': 0}">
2+
<paragraph>
3+
Inline Markup roles:
4+
<field_list>
5+
<field>
6+
<field_name>
7+
abbr
8+
<field_body>
9+
<paragraph>
10+
<abbreviation explanation="last-in, first-out">
11+
LIFO
12+
;
13+
<abbreviation>
14+
FIFO
15+
;
16+
<abbreviation explanation="keep it simple, stupid">
17+
KISS
18+
;
19+
<abbreviation>
20+
LIFO
21+
<field>
22+
<field_name>
23+
command
24+
<field_body>
25+
<paragraph>
26+
<literal_strong classes="command">
27+
rm
28+
<field>
29+
<field_name>
30+
dfn
31+
<field_body>
32+
<paragraph>
33+
<emphasis classes="dfn">
34+
definition
35+
<field>
36+
<field_name>
37+
file
38+
<field_body>
39+
<paragraph>
40+
<literal classes="file" role="file">
41+
README.txt
42+
,
43+
<literal classes="file" role="file">
44+
Makefile
45+
<field>
46+
<field_name>
47+
guilabel
48+
<field_body>
49+
<paragraph>
50+
<inline classes="guilabel" rawtext=":guilabel:`&Cancel`">
51+
<inline classes="accelerator">
52+
C
53+
ancel
54+
<field>
55+
<field_name>
56+
kbd
57+
<field_body>
58+
<paragraph>
59+
<literal classes="kbd">
60+
Control-x
61+
,
62+
<literal classes="kbd">
63+
page up
64+
,
65+
<literal classes="kbd">
66+
+
67+
<field>
68+
<field_name>
69+
mailheader
70+
<field_body>
71+
<paragraph>
72+
<literal_emphasis classes="mailheader">
73+
Content-Type
74+
<field>
75+
<field_name>
76+
makevar
77+
<field_body>
78+
<paragraph>
79+
<literal_strong classes="makevar">
80+
var
81+
<field>
82+
<field_name>
83+
manpage
84+
<field_body>
85+
<paragraph>
86+
<manpage classes="manpage" page="ls" path="ls(1)" section="1" xml:space="preserve">
87+
ls(1)
88+
<field>
89+
<field_name>
90+
menuselection
91+
<field_body>
92+
<paragraph>
93+
<inline classes="menuselection" rawtext=":menuselection:`Menu --> Item`">
94+
Menu ‣ Item
95+
<field>
96+
<field_name>
97+
mimetype
98+
<field_body>
99+
<paragraph>
100+
<literal_emphasis classes="mimetype">
101+
png
102+
<field>
103+
<field_name>
104+
newsgroup
105+
<field_body>
106+
<paragraph>
107+
<literal_emphasis classes="newsgroup">
108+
comp.lang.python
109+
<field>
110+
<field_name>
111+
program
112+
<field_body>
113+
<paragraph>
114+
<literal_strong classes="program">
115+
rinoh
116+
<field>
117+
<field_name>
118+
regexp
119+
<field_body>
120+
<paragraph>
121+
<literal classes="regexp">
122+
.*
123+
<field>
124+
<field_name>
125+
samp
126+
<field_body>
127+
<paragraph>
128+
<literal classes="samp" role="samp">
129+
print 1+
130+
<emphasis>
131+
variable

‎tests_regression/rst/sphinx_inline_markup_oldsphinx.rst‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
:sphinx-maxversion: 8.1.100
2+
:warnings:
3+
No definition given for 'FIFO' glossary term
4+
5+
Inline Markup roles:
6+
7+
:abbr: :abbr:`LIFO (last-in, first-out)`; :abbr:`FIFO`;
8+
:abbr:`KISS (keep it simple, stupid)`; :abbr:`LIFO`
9+
:command: :command:`rm`
10+
:dfn: :dfn:`definition`
11+
:file: :file:`README.txt`, :file:`Makefile`
12+
:guilabel: :guilabel:`&Cancel`
13+
:kbd: :kbd:`Control-x`, :kbd:`page up`, :kbd:`+`
14+
:mailheader: :mailheader:`Content-Type`
15+
:makevar: :makevar:`var`
16+
:manpage: :manpage:`ls(1)`
17+
:menuselection: :menuselection:`Menu --> Item`
18+
:mimetype: :mimetype:`png`
19+
:newsgroup: :newsgroup:`comp.lang.python`
20+
:program: :program:`rinoh`
21+
:regexp: :regexp:`.*`
22+
:samp: :samp:`print 1+{variable}`

0 commit comments

Comments
 (0)