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

merge with 1.0

Browse Source
This commit is contained in:
Georg Brandl 2011-01-09 00:47:48 +01:00
commit 87b0ac63ed
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/config.rst
View File

@ -412,8 +412,6 @@ Options for HTML output
These options influence HTML as well as HTML Help output, and other builders These options influence HTML as well as HTML Help output, and other builders
that use Sphinx' HTMLWriter class. that use Sphinx' HTMLWriter class.
.. XXX document html_context
.. confval:: html_theme .. confval:: html_theme
The "theme" that the HTML output should use. See the :doc:`section about The "theme" that the HTML output should use. See the :doc:`section about
@ -461,6 +459,14 @@ that use Sphinx' HTMLWriter class.
.. versionadded:: 0.4 .. versionadded:: 0.4
.. confval:: html_context
A dictionary of values to pass into the template engine's context for all
pages. Single values can also be put in this dictionary using the
:option:`-A` command-line option of ``sphinx-build``.
.. versionadded:: 0.5
.. confval:: html_logo .. confval:: html_logo
If given, this must be the name of an image file that is the logo of the If given, this must be the name of an image file that is the logo of the

4
doc/ext/autodoc.rst
View File

@ -121,8 +121,8 @@ inserting them into the page source under a suitable :rst:dir:`py:module`,
.. versionadded:: 1.1 .. versionadded:: 1.1
* For classes and exceptions, members inherited from base classes will be * For classes and exceptions, members inherited from base classes will be
left out, unless you give the ``inherited-members`` flag option, in left out when documenting all members, unless you give the
addition to ``members``:: ``inherited-members`` flag option, in addition to ``members``::
.. autoclass:: Noodle .. autoclass:: Noodle
:members: :members:

4
sphinx/directives/__init__.py
View File

@ -33,7 +33,7 @@ except AttributeError:
# RE to strip backslash escapes # RE to strip backslash escapes
nl_escape_re = re.compile(r'\\\n') nl_escape_re = re.compile(r'\\\n')
strip_backslash_re = re.compile(r'\\(?=[^\\])') strip_backslash_re = re.compile(r'\\(.)')
class ObjectDescription(Directive): class ObjectDescription(Directive):
@ -63,7 +63,7 @@ class ObjectDescription(Directive):
""" """
lines = nl_escape_re.sub('', self.arguments[0]).split('\n') lines = nl_escape_re.sub('', self.arguments[0]).split('\n')
# remove backslashes to support (dummy) escapes; helps Vim highlighting # remove backslashes to support (dummy) escapes; helps Vim highlighting
return [strip_backslash_re.sub('', line.strip()) for line in lines] return [strip_backslash_re.sub(r'\1', line.strip()) for line in lines]
def handle_signature(self, sig, signode): def handle_signature(self, sig, signode):
""" """

2
tests/root/markup.txt
View File

@ -158,8 +158,8 @@ Tables
.. tabularcolumns:: |L|p{5cm}|R| .. tabularcolumns:: |L|p{5cm}|R|
.. _my-table: .. _my-table:
.. table:: my table .. table:: my table
+----+----------------+----+ +----+----------------+----+