IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Close #8619: html: kbd role generates customizable HTML tags for compound keys

Browse Source
This commit is contained in:
Takeshi KOMIYA 2020-12-30 20:36:06 +09:00
parent 21698c1446
commit 8e5f4e5616
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -19,6 +19,7 @@ Features added
* #8022: autodoc: autodata and autoattribute directives does not show right-hand * #8022: autodoc: autodata and autoattribute directives does not show right-hand
value of the variable if docstring contains ``:meta hide-value:`` in value of the variable if docstring contains ``:meta hide-value:`` in
info-field-list info-field-list
* #8619: html: kbd role generates customizable HTML tags for compound keys
* #8132: Add :confval:`project_copyright` as an alias of :confval:`copyright` * #8132: Add :confval:`project_copyright` as an alias of :confval:`copyright`
Bugs fixed Bugs fixed

3
sphinx/builders/html/transforms.py
View File

@ -28,7 +28,7 @@ class KeyboardTransform(SphinxPostTransform):
After:: After::
<literal class="kbd"> <literal class="kbd compound">
<literal class="kbd"> <literal class="kbd">
Control Control
- -
@ -46,6 +46,7 @@ class KeyboardTransform(SphinxPostTransform):
if len(parts) == 1: if len(parts) == 1:
continue continue
node['classes'].append('compound')
node.pop() node.pop()
while parts: while parts:
key = parts.pop(0) key = parts.pop(0)

4
tests/test_markup.py
View File

@ -244,7 +244,7 @@ def get_verifier(verify, verify_re):
# kbd role # kbd role
'verify', 'verify',
':kbd:`Control+X`', ':kbd:`Control+X`',
('<p><kbd class="kbd docutils literal notranslate">' ('<p><kbd class="kbd compound docutils literal notranslate">'
'<kbd class="kbd docutils literal notranslate">Control</kbd>' '<kbd class="kbd docutils literal notranslate">Control</kbd>'
'+' '+'
'<kbd class="kbd docutils literal notranslate">X</kbd>' '<kbd class="kbd docutils literal notranslate">X</kbd>'
@ -255,7 +255,7 @@ def get_verifier(verify, verify_re):
# kbd role # kbd role
'verify', 'verify',
':kbd:`M-x M-s`', ':kbd:`M-x M-s`',
('<p><kbd class="kbd docutils literal notranslate">' ('<p><kbd class="kbd compound docutils literal notranslate">'
'<kbd class="kbd docutils literal notranslate">M</kbd>' '<kbd class="kbd docutils literal notranslate">M</kbd>'
'-' '-'
'<kbd class="kbd docutils literal notranslate">x</kbd>' '<kbd class="kbd docutils literal notranslate">x</kbd>'