Merge with http://bitbucket.org/tpowers/sphinx/ (rewriting the external/internal distinction code)

In HTML output, references now get the class ``internal`` if they are internal to the whole project, as opposed to internal to the current page.

The ``menuselection`` and ``guilabel`` roles now support ampersand accelerators.

tests/root/markup.txt

@@ -70,6 +70,8 @@ Body directives
    b
 
 
+.. _admonition-section:
+
 Admonitions
 ^^^^^^^^^^^
 
@@ -84,6 +86,8 @@ Admonitions
 
    Warning text.
 
+.. _some-label:
+
 .. tip::
    Tip text.
 
@@ -95,7 +99,7 @@ Inline markup
 
 * :command:`command`
 * :dfn:`dfn`
-* :guilabel:`guilabel`
+* :guilabel:`guilabel with &accelerator`
 * :kbd:`kbd`
 * :mailheader:`mailheader`
 * :makevar:`makevar`
@@ -105,6 +109,7 @@ Inline markup
 * :program:`program`
 * :regexp:`regexp`
 * :menuselection:`File --> Close`
+* :menuselection:`&File --> &Print`
 * :file:`a/{varpart}/b`
 * :samp:`print {i}`
 
@@ -115,6 +120,8 @@ Inline markup
 * :envvar:`HOME`
 * :keyword:`with`
 * :token:`try statement <try_stmt>`
+* :ref:`admonition-section`
+* :ref:`here <some-label>`
 * :doc:`subdir/includes`
 * ``:download:`` is tested in includes.txt
 * :option:`Python -c option <python -c>`

tests/test_build_html.py

@@ -104,13 +104,20 @@ HTML_XPATH = {
         ".//li/tt/span[@class='pre']": '^a/$',
         ".//li/tt/em/span[@class='pre']": '^varpart$',
         ".//li/tt/em/span[@class='pre']": '^i$',
-        ".//a[@href='http://www.python.org/dev/peps/pep-0008']/strong": 'PEP 8',
-        ".//a[@href='http://tools.ietf.org/html/rfc1.html']/strong": 'RFC 1',
-        ".//a[@href='objects.html#envvar-HOME']/tt/span[@class='pre']": 'HOME',
-        ".//a[@href='#with']/tt/span[@class='pre']": '^with$',
-        ".//a[@href='#grammar-token-try_stmt']/tt/span": '^statement$',
-        ".//a[@href='subdir/includes.html']/em": 'Including in subdir',
-        ".//a[@href='objects.html#cmdoption-python-c']/em": 'Python -c option',
+        ".//a[@href='http://www.python.org/dev/peps/pep-0008']"
+            "[@class='pep reference external']/strong": 'PEP 8',
+        ".//a[@href='http://tools.ietf.org/html/rfc1.html']"
+            "[@class='rfc reference external']/strong": 'RFC 1',
+        ".//a[@href='objects.html#envvar-HOME']"
+            "[@class='reference internal']/tt/span[@class='pre']": 'HOME',
+        ".//a[@href='#with']"
+            "[@class='reference internal']/tt/span[@class='pre']": '^with$',
+        ".//a[@href='#grammar-token-try_stmt']"
+            "[@class='reference internal']/tt/span": '^statement$',
+        ".//a[@href='subdir/includes.html']"
+            "[@class='reference internal']/em": 'Including in subdir',
+        ".//a[@href='objects.html#cmdoption-python-c']"
+            "[@class='reference internal']/em": 'Python -c option',
         # abbreviations
         ".//abbr[@title='abbreviation']": '^abbr$',
         # version stuff
@@ -139,7 +146,7 @@ HTML_XPATH = {
     'objects.html': {
         ".//dt[@id='mod.Cls.meth1']": '',
         ".//dt[@id='errmod.Error']": '',
-        ".//a[@href='#mod.Cls']": '',
+        ".//a[@href='#mod.Cls'][@class='reference internal']": '',
         ".//dl[@class='userdesc']": '',
         ".//dt[@id='userdesc-myobj']": '',
         ".//a[@href='#userdesc-myobj']": '',
@@ -168,7 +175,8 @@ HTML_XPATH = {
         ".//li[@class='toctree-l2']/a": 'Inline markup',
         ".//title": 'Sphinx <Tests>',
         ".//div[@class='footer']": 'Georg Brandl & Team',
-        ".//a[@href='http://python.org/']": '',
+        ".//a[@href='http://python.org/']"
+            "[@class='reference external']": '',
         ".//li/a[@href='genindex.html']/em": 'Index',
         ".//li/a[@href='py-modindex.html']/em": 'Module Index',
         ".//li/a[@href='search.html']/em": 'Search Page',

tests/test_markup.py

@@ -97,6 +97,12 @@ def test_inline():
            u'<p><em class="menuselection">a \N{TRIANGULAR BULLET} b</em></p>',
            '\\emph{a \\(\\rightarrow\\) b}')
 
+    # interpolation of ampersands in guilabel/menuselection
+    yield (verify, ':guilabel:`&Foo -&&- &Bar`',
+           u'<p><em class="guilabel"><span class="accelerator">F</span>oo '
+           '-&amp;- <span class="accelerator">B</span>ar</em></p>',
+           '\\emph{\\DUspan{accelerator}{F}oo -\\&- \\DUspan{accelerator}{B}ar}')
+
     # non-interpolation of dashes in option role
     yield (verify_re, ':option:`--with-option`',
            '<p><em( class="xref std std-option")?>--with-option</em></p>$',