Merge pull request #9990 from tk0miya/9961_nested_kbd_in_html_related_builders

tk0miya · web-flow · commit 7d59c4060871 · 2021-12-23T02:59:51.000+09:00
Close #9961: html: Support nested <kbd> HTML elements in other HTML builders
diff --git a/CHANGES b/CHANGES
@@ -22,6 +22,7 @@ Features added
   this behavior with the ``--respect-module-all`` switch.
 * #9800: extlinks: Emit warning if a hardcoded link is replaceable
   by an extlink, suggesting a replacement.
+* #9961: html: Support nested <kbd> HTML elements in other HTML builders
 * #9815: html theme: Wrap sidebar components in div to allow customizing their
   layout via CSS
 * #9899: py domain: Allows to specify cross-reference specifier (``.`` and
diff --git a/sphinx/builders/html/transforms.py b/sphinx/builders/html/transforms.py
@@ -36,7 +36,7 @@ class KeyboardTransform(SphinxPostTransform):
                 x
     """
     default_priority = 400
-    builders = ('html',)
+    formats = ('html',)
     pattern = re.compile(r'(?<=.)(-|\+|\^|\s+)(?=.)')
     multiwords_keys = (('caps', 'lock'),
                        ('page' 'down'),

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class KeyboardTransform(SphinxPostTransform):`
`36`	`36`	`x`
`37`	`37`	`"""`
`38`	`38`	`default_priority = 400`
`39`		`- builders = ('html',)`
	`39`	`+ formats = ('html',)`
`40`	`40`	`pattern = re.compile(r'(?<=.)(-\|\+\|\^\|\s+)(?=.)')`
`41`	`41`	`multiwords_keys = (('caps', 'lock'),`
`42`	`42`	`('page' 'down'),`