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

Fix #2229, any-role and `-W` option are conflicted

Browse Source
This commit is contained in:
Takeshi KOMIYA 2016-01-12 13:35:52 +09:00
parent b1715eb0b5
commit ca896755a9
4 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sphinx/domains/std.py
View File

@ -453,7 +453,7 @@ class StandardDomain(Domain):
'productionlist': ProductionList, 'productionlist': ProductionList,
} }
roles = { roles = {
'option': OptionXRefRole(), 'option': OptionXRefRole(warn_dangling=True),
'envvar': EnvVarXRefRole(), 'envvar': EnvVarXRefRole(),
# links to tokens in grammar productions # links to tokens in grammar productions
'token': XRefRole(), 'token': XRefRole(),
@ -491,6 +491,7 @@ class StandardDomain(Domain):
'the label must precede a section header)', 'the label must precede a section header)',
'numref': 'undefined label: %(target)s', 'numref': 'undefined label: %(target)s',
'keyword': 'unknown keyword: %(target)s', 'keyword': 'unknown keyword: %(target)s',
'option': 'unknown option: %(target)s',
} }
def clear_doc(self, docname): def clear_doc(self, docname):
@ -675,8 +676,6 @@ class StandardDomain(Domain):
if docname: if docname:
break break
else: else:
env.warn(fromdocname, 'unknown option: %s' % (contnode.astext()),
lineno=node.line)
return None return None
return make_refnode(builder, fromdocname, docname, return make_refnode(builder, fromdocname, docname,

8
tests/test_build_html.py
View File

@ -39,14 +39,6 @@ HTML_WARNINGS = ENV_WARNINGS + """\
%(root)s/images.txt:20: WARNING: no matching candidate for image URI u'foo.\\*' %(root)s/images.txt:20: WARNING: no matching candidate for image URI u'foo.\\*'
None:\\d+: WARNING: citation not found: missing None:\\d+: WARNING: citation not found: missing
%(root)s/markup.txt:158: WARNING: unknown option: &option %(root)s/markup.txt:158: WARNING: unknown option: &option
%(root)s/markup.txt:395: WARNING: unknown option: headings
%(root)s/markup.txt:395: WARNING: unknown option: objects
%(root)s/markup.txt:395: WARNING: unknown option: modules
%(root)s/markup.txt:395: WARNING: unknown option: classes
%(root)s/markup.txt:400: WARNING: unknown option: JS
%(root)s/markup.txt:401: WARNING: unknown option: C
%(root)s/markup.txt:402: WARNING: unknown option: myobj
%(root)s/markup.txt:403: WARNING: unknown option: n::Array
%(root)s/markup.txt:: WARNING: invalid single index entry u'' %(root)s/markup.txt:: WARNING: invalid single index entry u''
%(root)s/markup.txt:: WARNING: invalid pair index entry u'' %(root)s/markup.txt:: WARNING: invalid pair index entry u''
%(root)s/markup.txt:: WARNING: invalid pair index entry u'keyword; ' %(root)s/markup.txt:: WARNING: invalid pair index entry u'keyword; '

10
tests/test_build_latex.py
View File

@ -24,15 +24,7 @@ from test_build_html import ENV_WARNINGS
LATEX_WARNINGS = ENV_WARNINGS + """\ LATEX_WARNINGS = ENV_WARNINGS + """\
%(root)s/markup.txt:: WARNING: unknown option: &option None:None: WARNING: unknown option: &option
%(root)s/markup.txt:: WARNING: unknown option: headings
%(root)s/markup.txt:: WARNING: unknown option: objects
%(root)s/markup.txt:: WARNING: unknown option: modules
%(root)s/markup.txt:: WARNING: unknown option: classes
%(root)s/markup.txt:: WARNING: unknown option: JS
%(root)s/markup.txt:: WARNING: unknown option: C
%(root)s/markup.txt:: WARNING: unknown option: myobj
%(root)s/markup.txt:: WARNING: unknown option: n::Array
None:None: WARNING: citation not found: missing None:None: WARNING: citation not found: missing
None:None: WARNING: no matching candidate for image URI u'foo.\\*' None:None: WARNING: no matching candidate for image URI u'foo.\\*'
WARNING: invalid pair index entry u'' WARNING: invalid pair index entry u''

10
tests/test_build_texinfo.py
View File

@ -23,15 +23,7 @@ from test_build_html import ENV_WARNINGS
TEXINFO_WARNINGS = ENV_WARNINGS + """\ TEXINFO_WARNINGS = ENV_WARNINGS + """\
%(root)s/markup.txt:: WARNING: unknown option: &option None:None: WARNING: unknown option: &option
%(root)s/markup.txt:: WARNING: unknown option: headings
%(root)s/markup.txt:: WARNING: unknown option: objects
%(root)s/markup.txt:: WARNING: unknown option: modules
%(root)s/markup.txt:: WARNING: unknown option: classes
%(root)s/markup.txt:: WARNING: unknown option: JS
%(root)s/markup.txt:: WARNING: unknown option: C
%(root)s/markup.txt:: WARNING: unknown option: myobj
%(root)s/markup.txt:: WARNING: unknown option: n::Array
None:None: WARNING: citation not found: missing None:None: WARNING: citation not found: missing
None:None: WARNING: no matching candidate for image URI u'foo.\\*' None:None: WARNING: no matching candidate for image URI u'foo.\\*'
None:None: WARNING: no matching candidate for image URI u'svgimg.\\*' None:None: WARNING: no matching candidate for image URI u'svgimg.\\*'